From d7ddca70510f08f13c30069273de8ae37f6f7dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 22 Mar 2024 17:07:52 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImportForm/src/ImportForm.vue  |  10 +-
 .../deviceMaintenance.data.ts                 |  25 ++--
 src/views/eam/basic/item/item.data.ts         | 130 ++++++++++--------
 .../moldMaintenance/moldMaintenance.data.ts   |  50 +++++--
 src/views/eam/item/countadjustWork/index.vue  |   2 +-
 .../item/itemOrderMain/itemOrderMain.data.ts  |  50 +++----
 src/views/eam/item/replaceItemDes/index.vue   |   3 +-
 .../eam/item/transaction/transaction.data.ts  |   9 ++
 8 files changed, 169 insertions(+), 110 deletions(-)

diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index 15369c6..75e95b3 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -88,8 +88,8 @@
     </el-upload>
     <template #footer>
       <div class="flex items-center">
-        <div class="flex-1 text-left">
-          <el-button type="primary" plain @click="importTemplate">
+        <div class="flex-1 text-left" >
+          <el-button type="primary" plain @click="importTemplate" v-if="isShow">
             <Icon icon="ep:download" />
             下载模板
           </el-button>
@@ -166,6 +166,12 @@ const props = defineProps({
     required: false,
     default: false
   },
+  // 是否显示下载模板按钮
+  isShow: {
+    type: Boolean,
+    required: false,
+    default: true
+  },
   outFile: {
     type: Boolean,
     required: false,
diff --git a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
index 8cfb7a8..97fa5bd 100644
--- a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
+++ b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
@@ -123,7 +123,6 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select'
     },
   },
-
   {
     label: '人数',
     field: 'peoples',
@@ -134,7 +133,11 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+      componentProps: {
+        min: 1,
+        precision: 0
+      }
+    },
   },
   {
     label: '保养所需时间（分钟）',
@@ -178,16 +181,16 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-    {
-      label: '创建时间',
-      field: 'createTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isForm: false,
-      table: {
-        width: 170
-      },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    table: {
+      width: 170
     },
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/eam/basic/item/item.data.ts b/src/views/eam/basic/item/item.data.ts
index b0dc092..f4cd403 100644
--- a/src/views/eam/basic/item/item.data.ts
+++ b/src/views/eam/basic/item/item.data.ts
@@ -3,10 +3,10 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const ItemRules = reactive({
-   name: [
-      { required: true, message: '请输入备件名称', trigger: 'blur' }, 
-      { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-    ],
+  name: [
+    { required: true, message: '请输入备件名称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
 })
 
 export const Item = useCrudSchemas(reactive<CrudSchema[]>([
@@ -27,7 +27,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width:110,
+      width: 110,
     },
   },
   {
@@ -44,7 +44,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     sort: 'custom',
     table: {
-      width:110,
+      width: 110,
     },
     tableForm: {
       type: 'Select',
@@ -64,13 +64,21 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     label: '科目',
     field: 'subject',
     sort: 'custom',
+    dictType: DICT_TYPE.ITEM_SUBJECT,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+
+  {
+    label: '科目代码',
+    field: 'subjectCode',
+    sort: 'custom',
+    isTable: true,
   },
-    {
-      label: '科目代码',
-      field: 'subjectCode',
-      sort: 'custom',
-      isTable: true,
-    },
   {
     label: '单位',
     field: 'uom',
@@ -83,18 +91,18 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
-    {
-      label: '类别',
-      field: 'category',
-      sort: 'custom',
-      dictType: DICT_TYPE.ITEM_CATEGORY,
-      dictClass: 'string',
-      isSearch: false,
-      isTable: true,
-      tableForm: {
-        type: 'Select'
-      }
-    },
+  {
+    label: '类别',
+    field: 'category',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_CATEGORY,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    tableForm: {
+      type: 'Select'
+    }
+  },
   {
     label: '备件分类',
     field: 'classification',
@@ -129,7 +137,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'reprocurement',
     sort: 'custom',
     table: {
-      width:110,
+      width: 110,
     },
     form: {
       component: 'InputNumber',
@@ -141,7 +149,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'safetyStock',
     sort: 'custom',
     table: {
-      width:110,
+      width: 110,
     },
     form: {
       component: 'InputNumber',
@@ -153,15 +161,15 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'cost',
     sort: 'custom',
     table: {
-      width:110,
-    },  
+      width: 110,
+    },
   },
   {
     label: '采购员',
     field: 'purchaser',
     sort: 'custom',
     table: {
-      width:100,
+      width: 100,
     },
   },
   {
@@ -194,31 +202,31 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-   {
-      label: '是否框架协议',
-      field: 'isFramework',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string',
-      isSearch: false,
-      isTable: true,
-      sort: 'custom',
-      table: {
-        width: 140
-      },
-      tableForm: {
-        type: 'Select',
+  {
+    label: '是否框架协议',
+    field: 'isFramework',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 140
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
         inactiveValue: 'FALSE',
-        disabled: true
-      },
-      form: {
-        component: 'Switch',
-        value: 'TRUE',
-        componentProps: {
-          inactiveValue: 'FALSE',
-          activeValue: 'TRUE'
-        }
+        activeValue: 'TRUE'
       }
-    },
+    }
+  },
   // {
   //   label: '是否可用',
   //   field: 'available',
@@ -244,16 +252,16 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   }
   // },
-    {
-      label: '创建时间',
-      field: 'createTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isForm: false,
-      table: {
-        width: 170
-      },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    table: {
+      width: 170
     },
+  },
   {
     label: '描述',
     field: 'describes',
diff --git a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
index 89fc56e..5b92e95 100644
--- a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
+++ b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
@@ -122,6 +122,38 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select'
     },
   },
+  {
+    label: '人数',
+    field: 'peoples',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 0
+      }
+    },
+  },
+  {
+    label: '保养所需时间（分钟）',
+    field: 'estimatedMinutes',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 170,
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 0
+      }
+    },
+  },
   {
     label: '是否可用',
     field: 'available',
@@ -147,16 +179,16 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-    {
-      label: '创建时间',
-      field: 'createTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isForm: false,
-      table: {
-        width: 170
-      },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    table: {
+      width: 170
     },
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/eam/item/countadjustWork/index.vue b/src/views/eam/item/countadjustWork/index.vue
index c0b46c1..3e8b981 100644
--- a/src/views/eam/item/countadjustWork/index.vue
+++ b/src/views/eam/item/countadjustWork/index.vue
@@ -42,7 +42,7 @@
     :detailButtonIsShow="true"/>
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/eam/countJobDetail/import" :importTemplateData="importTemplateData"
-    @success="importSuccess" />
+    @success="importSuccess" :isShow="false"/>
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts
index fa6c327..53bbde7 100644
--- a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts
+++ b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts
@@ -98,31 +98,31 @@ export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'dutyParagraph',
     sort: 'custom',
   },
-  {
-    label: '是否关闭',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      inactiveValue: 'FALSE',
-      disabled: true
-    },
-    form: {
-      component: 'Switch',
-      value: 'FALSE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
-  },
+  // {
+  //   label: '是否关闭',
+  //   field: 'available',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isSearch: false,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     type: 'Select',
+  //     inactiveValue: 'FALSE',
+  //     disabled: true
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'FALSE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
   {
     label: '状态',
     field: 'status',
diff --git a/src/views/eam/item/replaceItemDes/index.vue b/src/views/eam/item/replaceItemDes/index.vue
index e92eda1..480867f 100644
--- a/src/views/eam/item/replaceItemDes/index.vue
+++ b/src/views/eam/item/replaceItemDes/index.vue
@@ -138,11 +138,12 @@
   // form表单提交
   const formsSuccess = async (formType, data) => {
     data.filePathList = data.filePathListView.map(item=>item.url)
+    console.log(formType)
     if (formType === 'create') {
       await ReplaceItemDesApi.createReplaceItemDes(data)
       message.success(t('common.createSuccess'))
     } else {
-      await ReplaceItemDesApi.createReplaceItemDes(data)
+      await ReplaceItemDesApi.updateReplaceItemDes(data)
       message.success(t('common.updateSuccess'))
     }
     basicFormRef.value.dialogVisible = false
diff --git a/src/views/eam/item/transaction/transaction.data.ts b/src/views/eam/item/transaction/transaction.data.ts
index 9ab8c6f..f75af8a 100644
--- a/src/views/eam/item/transaction/transaction.data.ts
+++ b/src/views/eam/item/transaction/transaction.data.ts
@@ -61,6 +61,15 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Radio'
     },
   },
+  {
+    label: '关联单号',
+    field: 'associatedNumber',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'Radio'
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',