Przeglądaj źródła

fix: 床位管理bug调整

Tong 2 lat temu
rodzic
commit
67fcfa1584

+ 5 - 3
src/views/biz/management/complication/index.vue

@@ -18,7 +18,7 @@
                 <template #overlay>
                   <a-menu @click="handleMenuClick">
                     <a-menu-item key="1">添加并发症</a-menu-item>
-                    <a-menu-item key="2">批量导入</a-menu-item>
+                    <!-- <a-menu-item key="2">批量导入</a-menu-item> -->
                     <a-menu-item key="3">批量导出</a-menu-item>
                   </a-menu>
                 </template>
@@ -43,12 +43,12 @@
           <Col :span="18">
             <Card :title="detailName">
               <template #extra>
-                <Button shape="circle" v-auth="['bizSys:wardInfo:add']" @click="handleEditInfo"
+                <Button shape="circle" v-auth="['bizSys:complication:edit']" @click="handleEditInfo"
                   ><Icon icon="icon-xt-details_edit_default|iconfont" :size="14"
                 /></Button>
                 <Button
                   shape="circle"
-                  v-auth="['bizSys:wardInfo:add']"
+                  v-auth="['bizSys:complication:remove']"
                   @click="handleDel(detailForm.id)"
                   style="margin-left: 20px"
                   ><Icon icon="icon-xt-details_delete_default|iconfont" :size="14"
@@ -200,6 +200,7 @@
   async function getDataList(params?: object) {
     const res = await getComplicationList({
       ...params,
+      page: { current: 1, size: 999 },
       orders: [{ field: 'sort', direction: 'DESC' }],
     });
     complicationList.value = res.data;
@@ -373,6 +374,7 @@
 
   ::v-deep(.ant-card) {
     height: 800px;
+    overflow: auto;
   }
 
   ::v-deep(.ant-table-body) {

+ 1 - 0
src/views/biz/management/complication/noteFormModal.vue

@@ -94,6 +94,7 @@
       component: 'InputNumber',
       componentProps: {
         placeholder: '请输入排序',
+        min: 0,
         onFocus: function () {
           treeDis.value = true;
         },

+ 35 - 1
src/views/biz/management/parameter/index.vue

@@ -7,6 +7,14 @@
       </Input> -->
       <BasicTable @register="registerTable">
         <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'typeName' && record.typeName.indexOf('天') != -1">
+            <div style="display: flex">
+              {{ record.typeName }}
+              <a-tooltip color="orange" :title="record.typeName + ': 不可超过360天'">
+                <div class="tips">?</div>
+              </a-tooltip>
+            </div>
+          </template>
           <template
             v-if="
               column.key === 'contents' &&
@@ -16,10 +24,21 @@
               record.key != 4
             "
           >
-            <div>
+            <div v-if="record.typeName.indexOf('天') != -1">
+              <a-input-number
+                v-if="editableData[record.key]"
+                v-model:value="editableData[record.key][column.dataIndex]"
+                :min="0"
+                :max="365"
+                placeholder="请输入参数内容"
+              />
+              <template v-else> {{ record.contents }} </template>
+            </div>
+            <div v-else>
               <a-input-number
                 v-if="editableData[record.key]"
                 v-model:value="editableData[record.key][column.dataIndex]"
+                :min="0"
                 placeholder="请输入参数内容"
               />
               <template v-else> {{ record.contents }} </template>
@@ -399,6 +418,8 @@
       editObj[editableData[key].typeIndex] = Number(
         parseFloat(editableData[key].contents).toFixed(2),
       );
+    } else {
+      editObj[editableData[key].typeIndex] = editableData[key].contents;
     }
     await editParameter(resObj.value);
     delete editableData[key];
@@ -443,4 +464,17 @@
   ::v-deep(.fan-basic-table-action.center) {
     justify-content: left !important;
   }
+
+  .tips {
+    width: 14px;
+    height: 14px;
+    margin: 5px 0 0 8px;
+    line-height: 14px;
+    text-align: center;
+    border: solid 1px #696969;
+    border-radius: 50%;
+    background-color: #696969;
+    color: #fff;
+    font-size: 3px;
+  }
 </style>

+ 3 - 0
src/views/biz/management/ward/data.ts

@@ -9,14 +9,17 @@ export const wardInfoColumns: BasicColumn[] = [
   {
     title: '病区属性',
     dataIndex: 'propertiesName',
+    width: 260,
   },
   {
     title: '状态',
     dataIndex: 'disable',
+    width: 150,
   },
   {
     title: '排序',
     dataIndex: 'sort',
+    width: 120,
   },
 ];
 

+ 9 - 3
src/views/biz/management/ward/index.vue

@@ -63,7 +63,10 @@
                   <BasicTable @register="registerTable">
                     <template #bodyCell="{ column, record }">
                       <template v-if="column.key === 'disable'">
-                        <Tag :color="formatDictColor(disableOptions, record.disable)">
+                        <Tag
+                          :color="formatDictColor(disableOptions, record.disable)"
+                          :style="'color:' + formatDictFontColor(disableOptions, record.disable)"
+                        >
                           {{ formatDictValue(disableOptions, record.disable) }}
                         </Tag>
                       </template>
@@ -215,7 +218,7 @@
   import { useModal } from '/@/components/Modal';
   import { listDictModel } from '/@/api/common';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { formatDictColor, formatDictValue } from '/@/utils';
+  import { formatDictColor, formatDictFontColor, formatDictValue } from '/@/utils';
   const { createConfirm, createMessage } = useMessage();
   const tabList = ref([
     { key: 0, tab: '病区管理', type: 'WARD' },
@@ -250,7 +253,7 @@
     },
     useSearchForm: false,
     actionColumn: {
-      width: 320,
+      width: 120,
       title: '操作',
       dataIndex: 'action',
     },
@@ -466,6 +469,9 @@
 <style lang="less" scoped>
   ::v-deep(.ant-card-head) {
     background-color: #f6f8fa !important;
+    color: #000a18;
+    font-weight: 600;
+    font-size: 18px;
   }
 
   .type-title {