From 176eb8136da2bf4d64e8f012c4c9942746b20d88 Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Thu, 13 Feb 2025 14:47:25 +0800
Subject: [PATCH] =?UTF-8?q?SBBJ-812=E4=BF=9D=E5=85=BB=E9=A1=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/basic/moldMaintenanceConfig/index.ts  | 12 +++++++++
 .../eam/basic/moldMaintenanceConfig/index.vue | 25 +++++++++++--------
 .../moldMaintenanceConfig.data.ts             |  1 +
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/api/eam/basic/moldMaintenanceConfig/index.ts b/src/api/eam/basic/moldMaintenanceConfig/index.ts
index bc05e86..609ae7e 100644
--- a/src/api/eam/basic/moldMaintenanceConfig/index.ts
+++ b/src/api/eam/basic/moldMaintenanceConfig/index.ts
@@ -43,4 +43,16 @@ export const exportMoldMaintenanceConfig = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/eam/device-mold-maintenance-config/get-import-template' })
+}
+
+export const getDeviceMoldItemsPage = async (params) => {
+  params.type="DEVICE"
+  params.status = "MAINTAIN"
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/device-mold-maintenance-config/senior', data })
+  } else {
+    return await request.get({ url: `/eam/device-mold-maintenance-config/pageDetail`, params })
+  }
 }
\ No newline at end of file
diff --git a/src/views/eam/basic/moldMaintenanceConfig/index.vue b/src/views/eam/basic/moldMaintenanceConfig/index.vue
index 43c7012..0d337aa 100644
--- a/src/views/eam/basic/moldMaintenanceConfig/index.vue
+++ b/src/views/eam/basic/moldMaintenanceConfig/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #deviceNumber="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.deviceNumber)">
+          <span>{{ row.deviceNumber }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -65,10 +65,10 @@
     ref="detailRef"
     :isBasic="false"
     :allSchemas="MoldMaintenanceConfig.allSchemas"
-    :detailAllSchemas="DeviceMaintenance.allSchemas"
+    :detailAllSchemas="DeviceMaintenanceTwo.allSchemas"
     :apiCreate="DeviceMaintenanceApi.createDeviceMoldItems"
     :apiUpdate="DeviceMaintenanceApi.updateDeviceMoldItems"
-    :apiPage="DeviceMaintenanceApi.getDeviceMoldItemsPage"
+    :apiPage="MoldMaintenanceConfigApi.getDeviceMoldItemsPage"
     :apiDelete="DeviceMaintenanceApi.deleteDeviceMoldItems"
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />
@@ -145,7 +145,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      if (formField == 'deviceName') {
+      if (formField == 'deviceNumber') {
         setV['deviceName'] = val[0].name
       }
       formRef.setValues(setV)
@@ -157,18 +157,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const submitForm = async (formType, submitData) => {
   let data = {...submitData}
   if(data.masterId){
-    data.id = data.masterId
+    data.id = data.masterId    
   }
+  data.type = 'DEVICE'
+  data.subList = tableData.value // 拼接子表数据参数
+  data.maintenanceItemId = data.subList.map(item=>item.id).join(',')
   formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       console.log(data)
-      await InventorychangeRequestMainApi.createInventorychangeRequestMain(data)
+      await MoldMaintenanceConfigApi.createMoldMaintenanceConfig(data)
       message.success(t('common.createSuccess'))
     } else {
       console.log('data',data);
       data.id = data.masterId
-      await InventorychangeRequestMainApi.updateInventorychangeRequestMain(data)
+      await MoldMaintenanceConfigApi.updateMoldMaintenanceConfig(data)
       message.success(t('common.updateSuccess'))
     }
     formRef.value.dialogVisible = false
@@ -251,8 +254,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:moldMaintenanceConfig:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'eam:moldMaintenanceConfig:delete'}), // 删除
+  defaultButtons.mainListEditBtn(null), // 编辑
+  defaultButtons.mainListDeleteBtn(null), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/eam/basic/moldMaintenanceConfig/moldMaintenanceConfig.data.ts b/src/views/eam/basic/moldMaintenanceConfig/moldMaintenanceConfig.data.ts
index 518176b..1021c6e 100644
--- a/src/views/eam/basic/moldMaintenanceConfig/moldMaintenanceConfig.data.ts
+++ b/src/views/eam/basic/moldMaintenanceConfig/moldMaintenanceConfig.data.ts
@@ -5,6 +5,7 @@ import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
 // 表单校验
 export const MoldMaintenanceConfigRules = reactive({
   deviceNumber: [required],
+  executionCycle: [required],
 })
 
 export const DeviceMOLD = useCrudSchemas(reactive<CrudSchema[]>([