测试bug修复

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

@@ -34,7 +34,7 @@ export const getMoldInspectionMain = async (id: number) => {
 
 // 新增检修工单主
 export const createMoldInspectionMain = async (data: MoldInspectionMainVO) => {
-  return await request.post({ url: `/eam/device-inspection-job-main/create`, data })
+  return await request.post({ url: `/eam/device-inspection-job-main/createPC`, data })
 }
 
 // 修改检修工单主

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

@@ -73,7 +73,7 @@ export const orderClickFinish = (id: number) => {
 
 // 验证
 export const orderClickApprove = (id: number,status: string,verifyContent: string) => {
-  return request.get({ url: '/eam/device-maintain-job-main/orderClickApprove?id=' + id + '&status=' + status + '&approveOpinion=' + verifyContent })
+  return request.get({ url: '/eam/device-maintain-job-main/orderClickVerify?id=' + id + '&status=' + status + '&approveOpinion=' + verifyContent })
 }
 
 

src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts

@@ -178,10 +178,10 @@ export const DeviceInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     search: {
       show: true,
       component: 'Select',
-      api: () => userListAll,
+      api: () => dutyUserList,
       componentProps: {
         optionsAlias: {
-          labelField: 'nickname',
+          labelField: 'name',
           valueField: 'id'
         },
         filterable: true,
@@ -189,11 +189,11 @@ export const DeviceInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'Select',
-      api: () => userListAll,
+      api: () => dutyUserList,
       componentProps: {
         disabled: false,
         optionsAlias: {
-          labelField: 'nickname',
+          labelField: 'name',
           valueField: 'id'
         },
         filterable: true,

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

@@ -211,7 +211,7 @@ const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
     DeviceInspectionMain.allSchemas.formSchema.find(item => {
       return item.field ==  'status'
-    }).value = 'PECEIVED'
+    }).value = 'PROCCED'
     DeviceInspectionMain.allSchemas.formSchema.find(item => {
       return item.field ==  'type'
     }).value = 'DEVICE'
@@ -636,6 +636,7 @@ function isReceiver(orderPerson) {
 // 验证
 function verifyOrder(row) {
   openRowValue.value = row
+  verifyFormValue.value.verifyContent = ''
   verifyDialogVisible.value = true
 }
 

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

@@ -625,6 +625,7 @@ const judgeIsTheClassEngineer = (row) => {
 
 const openDialog = (row) => {
   dialogRowData.value = row
+  updateFormValue.value.verifyContent = ''
   dialogVisible.value = true
 }
 

src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts

@@ -5,7 +5,7 @@ import { useUserStore } from '@/store/modules/user'
 import { ItemSearchTable } from '../../basic/item/item.data'
 import * as ItemApi from '@/api/eam/basic/item'
 import * as UserApi from '@/api/system/user'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { getStrDictOptions } from '@/utils/dict'
 import { selecUserByType } from '@/api/system/dept'
 const userStore = useUserStore()
 const factoryList = await selectAllFactoryArea()
@@ -258,10 +258,9 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: '150',
     },
-    isDetail: false,
     isSearch: true,
     dictType: DICT_TYPE.MAINTENANCE_SHIFT,
-    dictClass: 'number',
+    dictClass: 'string',
     form: {
       component: 'Select'
     },
@@ -886,7 +885,7 @@ export const DeviceMaintenanceMainSec = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     dictType: DICT_TYPE.MAINTENANCE_SHIFT,
-    dictClass: 'number',
+    dictClass: 'string',
     form: {
       component: 'Select'
     },

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

@@ -813,15 +813,15 @@ const detailRef = ref()
 const openDetail = async (row: any, titleName: any, titleValue: any) => {
   const userListAll = await UserApi.getSimpleUserList()
   const factoryList = await selectAllFactoryArea()
-  const moldAllList = await MoldAccountsApi.getMoldAccountsAllNoPage({})
+const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({})
   const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE)
   row.typeDetail = deviceMoldTypeList.find((account) => account.value == row.type)?.label
-  row.deviceNumberDetail = moldAllList.find((account) => account.number == row.deviceNumber)?.name
+  row.deviceNumberDetail = deviceListAll.find((account) => account.number == row.deviceNumber)?.name
   row.factoryAreaNumberDetail = factoryList.find((account) => account.id == row.factoryAreaNumber)?.name
   row.maintenanceDetail = userListAll.find((account) => account.id == row.maintenance)?.nickname
   row.declarerDetail = userListAll.find((account) => account.id == row.declarer)?.nickname
   row.verifyerDetail = userListAll.find((account) => account.id == row.verifyer)?.nickname
-  console.log(row)
+  row.classes = row.classes+''
   operatRecord.value = row;
   detailRef.value.openDetail(row, titleName, titleValue,'DeviceMaintenanceMain')
 }
@@ -918,6 +918,7 @@ function confirmFinish(row) {
 // 验证
 function verifyOrder(row) {
   openRowValue.value = row
+  verifyFormValue.value.verifyContent = ''
   verifyDialogVisible.value = true
 }
 
@@ -946,6 +947,7 @@ function verifyCancel(row) {
 // 确认
 function confirmOrder(row) {
   openRowValue.value = row
+  verifyFormValue.value.verifyContent = ''
   confirmDialogVisible.value = true
 }
 

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

@@ -639,6 +639,7 @@ function isReceiver(orderPerson) {
 // 验证
 function verifyOrder(row) {
   openRowValue.value = row
+  verifyFormValue.value.verifyContent = ''
   verifyDialogVisible.value = true
 }
 

src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts

@@ -170,7 +170,7 @@ export const MoldInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: true
   },
   {
-    label: '维修人',
+    label: '检修人',
     field: 'maintenance',
     sort: 'custom',
     isDetail: false,
@@ -204,12 +204,12 @@ export const MoldInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
           valueField: 'id'
         },
         filterable: true,
-        placeholder: "请选择维修人"
+        placeholder: "请选择检修人"
       },
     }
   },
   {
-    label: '维修人',
+    label: '检修人',
     field: 'maintenance1',
     sort: 'custom',
     isSearch: false,

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

@@ -635,6 +635,7 @@ const judgeIsTheClassEngineer = (row) => {
 
 const openDialog = (row) => {
   dialogRowData.value = row
+  updateFormValue.value.verifyContent = ''
   dialogVisible.value = true
 }
 

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

@@ -537,6 +537,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
   row.maintenanceDetail = userListAll.find((account) => account.id == row.maintenance)?.nickname
   row.declarerDetail = userListAll.find((account) => account.id == row.declarer)?.nickname
   row.verifyerDetail = userListAll.find((account) => account.id == row.verifyer)?.nickname
+  row.classes = row.classes+''
   operatRecord.value = row;
   detailRef.value.openDetail(row, titleName, titleValue,'MoldMaintenanceMain')
 }
@@ -630,6 +631,7 @@ function confirmFinish(row) {
 // 验证
 function verifyOrder(row) {
   openRowValue.value = row
+  verifyFormValue.value.verifyContent = ''
   verifyDialogVisible.value = true
 }
 
@@ -658,6 +660,7 @@ function verifyCancel(row) {
 // 确认
 function confirmOrder(row) {
   openRowValue.value = row
+  verifyFormValue.value.verifyContent = ''
   confirmDialogVisible.value = true
 }
 

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

@@ -6,7 +6,7 @@ import { selecUserByType } from '@/api/system/dept'
 import { ItemSearchTable } from '../../basic/item/item.data'
 import * as ItemApi from '@/api/eam/basic/item'
 import * as UserApi from '@/api/system/user'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { getStrDictOptions } from '@/utils/dict'
 const userListAll = await UserApi.getSimpleUserList()
 console.log(userListAll)
 const userStore = useUserStore()
@@ -257,7 +257,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     dictType: DICT_TYPE.MAINTENANCE_SHIFT,
-    dictClass: 'number',
+    dictClass: 'string',
     form: {
       component: 'Select'
     },
@@ -837,7 +837,7 @@ export const MoldMaintenanceMainSec = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: false,
     dictType: DICT_TYPE.MAINTENANCE_SHIFT,
-    dictClass: 'number',
+    dictClass: 'string',
     form: {
       component: 'Select'
     },