Merge branch 'master' of http://192.168.100.32:3000/fanfan/xt-front

src/views/biz/management/parameter/index.vue

@@ -62,7 +62,7 @@
               {
                 auth: ['bizSys:params:add', 'bizSys:params:edit', 'bizSys:params:remove'],
                 ifShow: editableData[record.key] ? false : true,
-                icon: 'icon-edit|iconfont',
+                icon: 'icon-xt-details_edit_default|iconfont',
                 tooltip: '编辑',
                 label: '',
                 onClick: handleEdit.bind(null, record),
@@ -224,7 +224,7 @@
             typeName: 'HB最小值(g/L)',
             contents: res[value],
             typeIndex: value,
-            key: 1,
+            key: 10,
           };
           dataList.value.push(data);
           break;
@@ -235,7 +235,7 @@
             typeName: 'HB最大值(g/L)',
             contents: res[value],
             typeIndex: value,
-            key: 1,
+            key: 11,
           };
           dataList.value.push(data);
           break;
@@ -245,7 +245,7 @@
             typeName: 'IPTH最小值(ng/dL)',
             contents: res[value],
             typeIndex: value,
-            key: 1,
+            key: 12,
           };
           dataList.value.push(data);
           break;
@@ -255,7 +255,7 @@
             typeName: 'IPTH最大值(ng/dL)',
             contents: res[value],
             typeIndex: value,
-            key: 1,
+            key: 13,
           };
           dataList.value.push(data);
           break;
@@ -265,7 +265,7 @@
             typeName: 'Ca最小值(mmol/L)',
             contents: res[value],
             typeIndex: value,
-            key: 1,
+            key: 14,
           };
           dataList.value.push(data);
           break;
@@ -275,7 +275,7 @@
             typeName: 'Ca最大值(mmol/L)',
             contents: res[value],
             typeIndex: value,
-            key: 1,
+            key: 15,
           };
           dataList.value.push(data);
           break;
@@ -285,7 +285,7 @@
             typeName: 'P最小值(mmol/L)',
             contents: res[value],
             typeIndex: value,
-            key: 1,
+            key: 16,
           };
           dataList.value.push(data);
           break;
@@ -296,7 +296,7 @@
             typeName: 'P最大值(mmol/L)',
             contents: res[value],
             typeIndex: value,
-            key: 1,
+            key: 17,
           };
           dataList.value.push(data);
           break;
@@ -307,7 +307,7 @@
             typeName: '钙磷乘积最小值(mg2/dl2)',
             contents: res[value],
             typeIndex: value,
-            key: 1,
+            key: 18,
           };
           dataList.value.push(data);
           break;
@@ -318,7 +318,7 @@
             typeName: '钙磷乘积中间值(mg2/dl2)',
             contents: res[value],
             typeIndex: value,
-            key: 1,
+            key: 19,
           };
           dataList.value.push(data);
           break;
@@ -399,3 +399,8 @@
     reload();
   }
 </script>
+<style lang="less" scoped>
+  ::v-deep(.ant-btn-link) {
+    color: rgb(61 65 85 / 100%);
+  }
+</style>

src/views/biz/management/ward/index.vue

@@ -67,12 +67,16 @@
                   <template v-if="column.key === 'action'">
                     <TableAction
                       :actions="[
+                        {
+                          auth: 'bizSys:wardInfo:edit',
+                          icon: 'icon-xt-details_edit_default|iconfont',
+                          tooltip: '编辑',
+                          onClick: handleEdit.bind(null, record),
+                        },
                         {
                           auth: 'bizSys:wardInfo:status',
-                          icon: 'icon-minus-square|iconfont',
+                          icon: 'icon-xt-details_delete_default|iconfont',
                           tooltip: '停用',
-                          label: '',
-                          color: 'error',
                           ifShow: record.disable == 0,
                           popConfirm: {
                             title: '是否确认停用',
@@ -86,20 +90,12 @@
                           tooltip: '启用',
                           label: '',
                           ifShow: record.disable == 1,
-                          color: 'error',
                           popConfirm: {
                             title: '是否确认启用',
                             placement: 'left',
                             confirm: handleChangeState.bind(null, record),
                           },
                         },
-                        {
-                          auth: 'bizSys:wardInfo:edit',
-                          icon: 'icon-edit|iconfont',
-                          tooltip: '编辑',
-                          label: '',
-                          onClick: handleEdit.bind(null, record),
-                        },
                       ]"
                     />
                   </template>
@@ -115,7 +111,7 @@
             <Card title="工作日配置" style="height: 680px">
               <template #extra
                 ><Button shape="circle" v-auth="['bizSys:workday:edit']" @click="handleEditWorkDay">
-                  <Icon icon="icon-edit|iconfont" :size="14" /></Button
+                  <Icon icon="icon-xt-details_edit_default|iconfont" :size="14" /></Button
               ></template>
               <Row v-for="(item, index) in workDays" :key="index">
                 <div class="wrak-day">{{ item.label }}</div>
@@ -127,7 +123,7 @@
             <Card title="班次配置" style="height: 680px">
               <template #extra
                 ><Button v-auth="['bizSys:wardInfo:add']" @click="handleAddSailing" shape="circle"
-                  ><Icon icon="icon-edit|iconfont" :size="14" /></Button
+                  ><Icon icon="icon-xt-details_edit_default|iconfont" :size="14" /></Button
               ></template>
               <BasicTable @register="registerSailingsTable">
                 <template #bodyCell="{ column, record }">
@@ -139,6 +135,13 @@
                   <template v-if="column.key === 'action'">
                     <TableAction
                       :actions="[
+                        {
+                          auth: 'bizSys:wardInfo:edit',
+                          icon: 'icon-xt-details_edit_default|iconfont',
+                          tooltip: '编辑',
+                          label: '',
+                          onClick: handleEdit.bind(null, record),
+                        },
                         {
                           auth: 'bizSys:wardInfo:status',
                           icon: 'icon-minus-square|iconfont',
@@ -165,13 +168,6 @@
                             confirm: handleChangeState.bind(null, record),
                           },
                         },
-                        {
-                          auth: 'bizSys:wardInfo:edit',
-                          icon: 'icon-edit|iconfont',
-                          tooltip: '编辑',
-                          label: '',
-                          onClick: handleEdit.bind(null, record),
-                        },
                       ]"
                     />
                   </template>
@@ -329,15 +325,9 @@
   // 停用启用病区方法
   async function handleChangeState(record) {
     const notes = record.disable == 0 ? '停用' : '启用';
-    createConfirm({
-      content: '是否确定要' + notes + '此病区',
-      iconType: 'warning',
-      onOk: async () => {
-        await changeStatus(record.id);
-        createMessage.success('病区' + notes + '成功！');
-        reload();
-      },
-    });
+    await changeStatus(record.id);
+    createMessage.success('病区' + notes + '成功！');
+    reload();
   }
 
   // 保存成功回调事件
@@ -495,4 +485,8 @@
     color: #000a18;
     line-height: 20px;
   }
+
+  ::v-deep(.ant-btn-link) {
+    color: rgb(61 65 85 / 100%);
+  }
 </style>

src/views/biz/management/ward/sailingsEditFormModal.vue

@@ -110,10 +110,15 @@
   // 删除当前行
   async function handleDel(record) {
     const data = getDataSource();
-    const index = data.findIndex(item => item.key === record.key);
+    const index = data.findIndex(item => item.sort === record.sort);
     tableDatas.value.splice(index, 1);
     await setTableData(tableDatas.value);
   }
 
   function callEditChange() {}
 </script>
+<style type="less" scoped>
+  ::v-deep(.ant-btn-link) {
+    color: rgb(61 65 85 / 100%);
+  }
+</style>

src/views/sys/sysRole/data.ts

@@ -18,11 +18,6 @@ export const columns: BasicColumn[] = [
     title: '状态',
     dataIndex: 'disable',
   },
-  {
-    title: '数据范围',
-    dataIndex: 'dataScope',
-    width: 150,
-  },
   {
     title: '排序',
     dataIndex: 'sort',
@@ -97,23 +92,6 @@ export const dataFormSchema: FormSchema[] = [
       ];
     },
   },
-  {
-    field: 'dataScope',
-    label: '数据范围',
-    component: 'ApiSelect',
-    itemProps: {
-      validateTrigger: 'blur',
-    },
-    required: true,
-    componentProps: {
-      placeholder: '请选择数据范围',
-      api: listDictModel,
-      params: {
-        dictCode: 'sys_data_scope',
-      },
-    },
-    defaultValue: '1',
-  },
   {
     field: 'orgIds',
     label: '数据权限',