测试bug修复

src/api/eam/device/deviceMaintenanceMain/index.ts

@@ -79,3 +79,13 @@ export const finishOrder = async (params) => {
   return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params})
 }
 
+
+
+// 校验维修工单
+export const verifyOrder = async (params) => {
+  return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params})
+}
+
+
+
+

src/api/eam/mold/moldMaintenanceMain/index.ts

@@ -78,3 +78,9 @@ export const getMoldMainTempList = async (type: String) => {
 export const finishOrder = async (params) => {
   return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params})
 }
+
+
+// 校验维修工单
+export const verifyOrder = async (params) => {
+  return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params})
+}

src/components/BasicForm/src/BasicForm.vue

@@ -548,7 +548,7 @@ const inpuFocus = (headerItem, row, index) => {
  * @param cur 改变后值
  */
 const onChange = (field, cur, item) => {
-  emit('onChange', field, cur, item)
+  emit('onChange', field, cur, item,formRef.value)
 }
 
 // 修改盘点类型

src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts

@@ -120,7 +120,7 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '类型',
     field: 'type',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     table: {
       width: '150',
     },

src/views/eam/device/devicemaintenancejob/index.vue

@@ -297,6 +297,8 @@ const buttonTableClick = async (val, row) => {
     openForm('turnOrder', row)
   } else if (val == 'finish') {
     finishOrder(row)
+  } else if (val == 'verifyOrder') {
+    verifyOrder(row)
   } else if (val == 'picture') {
     showView.value = true
     urls.value = row.filePathList
@@ -393,7 +395,18 @@ function finishOrder(row) {
   })
 }
 // 验证
-function verifyOrder() {}
+function verifyOrder(row) {
+  let param = {
+    id: row.id,
+    number: row.number,
+    status: row.status,
+    requestNumber: row.requestNumber,
+  }
+  DeviceMaintenanceMainApi.verifyOrder(param).then(res => {
+    getList()
+    message.success('操作成功')
+  })
+}
 // 维修
 function repair() {}
 

src/views/eam/mold/moldinspectionjob/index.vue

@@ -181,7 +181,7 @@ const butttondata = (row) => {
     // defaultButtons.mainListEditBtn({hasPermi:'eam:moldInspectionMain:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hasPermi:'eam:moldInspectionMain:delete'}), // 删除
     defaultButtons.mainListEditBtn(null), // 编辑
-    defaultButtons.maintenanceOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //检修
+    defaultButtons.mainInspectionOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //检修
     defaultButtons.finishOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //完成
   ]
 }
@@ -190,8 +190,8 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
     openForm('update', row)
-  } else if (val == 'maintenanceOrder') { // 检修
-    handleMaintenanceOrder(row)
+  } else if (val == 'mainInspectionOrder') { // 检修
+    openDetail(row, '代码', row.number)
   } else if (val == 'finishOrder') { // 完成
     handleFinishOrder(row)
   }
@@ -297,12 +297,12 @@ function handleFinishOrder(row) {
 
 const onChange = (field, cur, item) => {
   // 当有效天数 和 生效时间 发生变化
-  if (field == 'moldNumber') {
+  if (field == 'deviceNumber') {
     basicFormRef.value.formRef.formModel.factoryAreaNumber = Number(item.componentProps.options.find(element => element.number == cur).factoryAreaNumber)
     basicFormRef.value.formRef.formModel.maintenance = String(userStore?.getUser?.id)
     basicFormRef.value.formRef.formModel.maintenanceNumber = ''
   } else if (field == 'maintenanceNumber') {
-    basicFormRef.value.formRef.formModel.moldNumber = item.componentProps.options.find(element => element.number == cur).moldNumber
+    basicFormRef.value.formRef.formModel.deviceNumber = item.componentProps.options.find(element => element.number == cur).deviceNumber
     basicFormRef.value.formRef.formModel.factoryAreaNumber = Number(item.componentProps.options.find(element => element.number == cur).factoryAreaNumber)
     basicFormRef.value.formRef.formModel.maintenance = String(userStore?.getUser?.id)
   }

src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts

@@ -103,7 +103,7 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '类型',
     field: 'type',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     table: {
       width: '150',
     },

src/views/eam/mold/moldmaintenancejob/index.vue

@@ -292,7 +292,9 @@ const buttonTableClick = async (val, row) => {
     openForm('turnOrder', row)
   } else if (val == 'finishOrder') {
     finishOrder(row)
-  }  else if (val == 'repair') {
+  } else if (val == 'verifyOrder') {
+    verifyOrder(row) 
+  } else if (val == 'repair') {
     openDetail(row, '代码', row.code)
   } else if (val == 'picture') {
     showView.value = true
@@ -388,7 +390,18 @@ function finishOrder(row) {
   })
 }
 // 验证
-function verifyOrder() {}
+function verifyOrder(row) {
+  let param = {
+    id: row.id,
+    number: row.number,
+    status: row.status,
+    requestNumber: row.requestNumber,
+  }
+  MoldMaintenanceMainApi.verifyOrder(param).then(res => {
+    getList()
+    message.success('操作成功')
+  })
+}
 // 维修
 function repair() {}
 

src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts

@@ -141,7 +141,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: '150',
     },
-    isSearch: true,
+    isSearch: false,
     isForm: true,
     dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
     dictClass: 'string',