fix: 多个模块bug修改

src/views/biz/engineer/other/data.ts

@@ -1,5 +1,6 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { listDictModel, uploadApi } from '/@/api/common';
+import dayjs from 'dayjs';
 
 export const columns: BasicColumn[] = [
   {
@@ -50,6 +51,7 @@ export const dataFormSchema: FormSchema[] = [
   {
     label: '设备编号',
     field: 'uniqueCode',
+    required: true,
     component: 'Input',
     componentProps: {
       placeholder: '请输入设备编码',
@@ -67,6 +69,7 @@ export const dataFormSchema: FormSchema[] = [
   {
     label: '设备类型',
     field: 'deviceType',
+    required: true,
     component: 'ApiSelect',
     componentProps: {
       api: listDictModel,
@@ -79,6 +82,7 @@ export const dataFormSchema: FormSchema[] = [
   {
     label: '厂家',
     field: 'manufacturer',
+    required: true,
     component: 'Input',
     componentProps: {
       placeholder: '请输入设备厂家',
@@ -125,9 +129,11 @@ export const dataFormSchema: FormSchema[] = [
   {
     label: '保修期限(年)',
     field: 'warrantyPeriod',
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入保修期限',
+      min: 0,
+      step: 1,
     },
   },
 ];
@@ -175,6 +181,7 @@ export const maintenanceDataFormSchema: FormSchema[] = [
   {
     label: '维修时间',
     field: 'maintenanceTime',
+    required: true,
     component: 'DatePicker',
     componentProps: {
       format: 'YYYY-MM-DD HH:mm:ss',
@@ -183,6 +190,7 @@ export const maintenanceDataFormSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
+    defaultValue: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   },
 
   {
@@ -304,6 +312,7 @@ export const upkeepDataFormSchema: FormSchema[] = [
   {
     label: '保养时间',
     field: 'maintainTime',
+    required: true,
     component: 'DatePicker',
     componentProps: {
       format: 'YYYY-MM-DD HH:mm:ss',
@@ -312,6 +321,7 @@ export const upkeepDataFormSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
+    defaultValue: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   },
   {
     label: '保养内容',

src/views/biz/engineer/other/maintenanceList/index.vue

@@ -139,6 +139,10 @@
       bizDictOptions[filter.key] = res[i];
     }
     const types = bizDictOptions.dmc;
+    dictsOption.value.push({
+      label: '全部',
+      value: '',
+    });
     types.forEach(item => {
       dictsOption.value.push({
         label: item.label,

src/views/biz/engineer/other/upkeepList/index.vue

@@ -138,6 +138,10 @@
       bizDictOptions[filter.key] = res[i];
     }
     const types = bizDictOptions.dmc;
+    dictsOption.value.push({
+      label: '全部',
+      value: '',
+    });
     types.forEach(item => {
       dictsOption.value.push({
         label: item.label,

src/views/biz/engineer/upkeep/data.ts

@@ -1,5 +1,6 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { listDictModel, uploadApi } from '/@/api/common';
+import dayjs from 'dayjs';
 
 export const columns: BasicColumn[] = [
   {
@@ -57,6 +58,7 @@ export const dataFormSchema: FormSchema[] = [
   {
     label: '保养时间',
     field: 'maintainTime',
+    required: true,
     component: 'DatePicker',
     componentProps: {
       placeholder: '请输入上传日期',
@@ -65,6 +67,7 @@ export const dataFormSchema: FormSchema[] = [
       format: 'YYYY-MM-DD HH:mm:ss',
       showTime: true,
     },
+    defaultValue: dayjs().format('YYYY-MM-DD HH:mm:ss'),
     colProps: {
       span: 12,
     },

src/views/biz/engineer/upkeep/formDrawer.vue

@@ -109,7 +109,6 @@
       } else {
         updateVal = { ...detailData.value, ...values };
       }
-      debugger;
       !unref(isUpdate)
         ? await upkeepAdd({ ...values })
         : await upkeepEdit({ ...updateVal, id: rowId.value });
@@ -120,6 +119,7 @@
         values: { ...values, id: rowId.value },
       });
     } finally {
+      deviceSelIds.value = [];
       setDrawerProps({ confirmLoading: false });
     }
   }

src/views/biz/engineer/upkeep/index.vue

@@ -16,7 +16,11 @@
     <BasicTable @register="registerTable">
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'picture'">
-          <Image :width="80" :src="record.files ? record.files[0]?.absolutePath : null" />
+          <Image
+            v-if="record.files && record.files.length > 0"
+            :width="80"
+            :src="record.files ? record.files[0]?.absolutePath : null"
+          />
         </template>
         <template v-if="column.key === 'maintainCompany'">
           <span> {{ formatDictValue(typeCategoryOptions, record.maintainCompany) }}</span>
@@ -166,8 +170,8 @@
       await upkeepRemove([record.id]);
       createMessage.success('记录删除成功！');
       clearSelectedRowKeys();
-      await reload();
       await getTab();
+      await reload();
     }
   }
   // 表格点击字段排序
@@ -230,22 +234,24 @@
       hasBracket: true,
     });
     typeOptions.value = typeList;
-    tabSelected.value = typeOptions.value[0].key;
+    if (tabSelected.value === undefined) {
+      tabSelected.value = typeOptions.value[0].key;
+    }
   }
 
   //取消按钮事件
   async function handleCancel() {
     clearSelectedRowKeys();
-    await reload();
     await getTab();
+    await reload();
   }
 
   // 弹窗回调事件
   async function callSuccess({ isUpdate, values }) {
     console.log(isUpdate);
     console.log(values);
-    await reload();
     await getTab();
+    await reload();
   }
   // 选项卡组件回调
   async function callTab(data) {

src/views/biz/engineer/water/data.ts

@@ -1,5 +1,6 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { listDictModel, uploadApi } from '/@/api/common';
+import dayjs from 'dayjs';
 
 export const columns: BasicColumn[] = [
   {
@@ -136,9 +137,11 @@ export const dataFormSchema: FormSchema[] = [
   {
     label: '保修期限(年)',
     field: 'warrantyPeriod',
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入保修期限',
+      min: 0,
+      step: 1,
     },
   },
   {
@@ -194,6 +197,7 @@ export const maintenanceDataFormSchema: FormSchema[] = [
   {
     label: '维修时间',
     field: 'maintenanceTime',
+    required: true,
     component: 'DatePicker',
     componentProps: {
       format: 'YYYY-MM-DD HH:mm:ss',
@@ -334,6 +338,7 @@ export const upkeepDataFormSchema: FormSchema[] = [
   {
     label: '保养时间',
     field: 'maintainTime',
+    required: true,
     component: 'DatePicker',
     componentProps: {
       format: 'YYYY-MM-DD HH:mm:ss',
@@ -342,6 +347,7 @@ export const upkeepDataFormSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
+    defaultValue: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
   },
   {
     label: '保养内容',

src/views/biz/engineer/water/maintenanceList/index.vue

@@ -139,6 +139,10 @@
       bizDictOptions[filter.key] = res[i];
     }
     const types = bizDictOptions.dmc;
+    dictsOption.value.push({
+      label: '全部',
+      value: '',
+    });
     types.forEach(item => {
       dictsOption.value.push({
         label: item.label,

src/views/biz/engineer/water/upkeepList/index.vue

@@ -138,6 +138,10 @@
       bizDictOptions[filter.key] = res[i];
     }
     const types = bizDictOptions.dmc;
+    dictsOption.value.push({
+      label: '全部',
+      value: '',
+    });
     types.forEach(item => {
       dictsOption.value.push({
         label: item.label,

src/views/biz/inventory/pharmaceuticals/index.vue

@@ -199,10 +199,14 @@
   async function handleDelete(record: Recordable) {
     if (record) {
       await pharmaceuticalsDel(record.id);
-      createMessage.success('停用成功！');
+      let message = '停用成功！';
+      if (record.disable === 1) {
+        message = '启用成功！';
+      }
+      createMessage.success(message);
       clearSelectedRowKeys();
-      await reload();
       await getTab();
+      await reload();
     }
   }
 
@@ -253,22 +257,24 @@
       hasBracket: true,
     });
     typeOptions.value = typeList;
-    tabSelected.value = typeOptions.value[0].key;
+    if (tabSelected.value === undefined) {
+      tabSelected.value = typeOptions.value[0].key;
+    }
   }
 
   //取消按钮事件
   async function handleCancel() {
     clearSelectedRowKeys();
-    await reload();
     await getTab();
+    await reload();
   }
 
   // 弹窗回调事件
   async function callSuccess({ isUpdate, values }) {
     console.log(isUpdate);
     console.log(values);
-    await reload();
     await getTab();
+    await reload();
   }
   // 选项卡组件回调
   async function callTab(data) {

src/views/biz/inventory/supplies/index.vue

@@ -200,10 +200,14 @@
   async function handleDelete(record: Recordable) {
     if (record) {
       await suppliesDel(record.id);
-      createMessage.success('停用成功！');
+      let message = '停用成功！';
+      if (record.disable === 1) {
+        message = '启用成功！';
+      }
+      createMessage.success(message);
       clearSelectedRowKeys();
-      await reload();
       await getTab();
+      await reload();
     }
   }
   // 表格点击字段排序
@@ -266,22 +270,24 @@
       hasBracket: true,
     });
     typeOptions.value = typeList;
-    tabSelected.value = typeOptions.value[0].key;
+    if (tabSelected.value === undefined) {
+      tabSelected.value = typeOptions.value[0].key;
+    }
   }
 
   //取消按钮事件
   async function handleCancel() {
     clearSelectedRowKeys();
-    await reload();
     await getTab();
+    await reload();
   }
 
   // 弹窗回调事件
   async function callSuccess({ isUpdate, values }) {
     console.log(isUpdate);
     console.log(values);
-    await reload();
     await getTab();
+    await reload();
   }
   // 选项卡组件回调
   async function callTab(data) {

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

@@ -69,11 +69,6 @@
                 ></template>
                 <BasicTable @register="registerTable">
                   <template #bodyCell="{ column, record }">
-                    <!-- <template v-if="column.key === 'disable'">
-                <Tag :color="formatDictColor(disableOptions, record.disable)">
-                  {{ formatDictValue(disableOptions, record.disable) }}
-                </Tag>
-              </template> -->
                     <template v-if="column.key === 'action'">
                       <TableAction
                         :actions="[
@@ -272,7 +267,7 @@
         },
         {
           label: '排序',
-          value: complication.sort,
+          value: complication.sort + '',
         },
         {
           label: '并发症描述',

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

@@ -29,7 +29,7 @@
                 v-if="editableData[record.key]"
                 v-model:value="editableData[record.key][column.dataIndex]"
                 :min="0"
-                :max="365"
+                :max="360"
                 placeholder="请输入参数内容"
               />
               <template v-else> {{ record.contents }} </template>