修复测试bug

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/orderClickVerify?id=' + id + '&status=' + status + '&approveOpinion=' + verifyContent })
+  return request.get({ url: '/eam/device-maintain-job-main/orderClickVerify?id=' + id + '&status=' + status + '&verifyContent=' + verifyContent })
 }
 
 

src/views/eam/basic/fixedAssets/fixedAssets.data.ts

@@ -149,6 +149,7 @@ export const FixedAssets = useCrudSchemas(reactive<CrudSchema[]>([
           labelField: 'name',
           valueField: 'number'
         },
+        filterable: true,
         placeholder: "请选择供应商"
       }
     }

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

@@ -15,7 +15,7 @@ const factoryList = await selectAllFactoryArea()
 const factoryListSelf = factoryList.filter(item => item.id == userStore.userSelfInfo.dept.parentId)
 const deviceList = await DeviceAccountsApi.getDeviceAccountsNoPage({})
 const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({})
-const deviceListByFactory = deviceListAll.filter(item => item.factoryAreaNumber == userStore.userSelfInfo.dept.parentId)
+const deviceListByFactory = deviceListAll.filter(item => item.factoryAreaNumber == userStore.userSelfInfo.deptId)
 // const deviceListByFactoryAndStatus = deviceListByFactory.filter(item => item.status == '0')
 const userList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '', flag: 1 })
 const dutyUserList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '' })
@@ -140,7 +140,7 @@ export const DeviceInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     search: {
       show: true,
       component: 'Select',
-      api: () => deviceListAll,
+      api: () => deviceListByFactory,
       componentProps: {
         optionsAlias: {
           labelField: 'name',

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

@@ -338,6 +338,8 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'declarer',
     sort: 'custom',
     isDetail: false,
+    isForm: false,
+    isSearch: true,
     table: {
       width: '150',
     },
@@ -345,20 +347,6 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userListAll.find((account) => account.id == cellValue)?.nickname
     },
-    form: {
-      component: 'Select',
-      api: () => userListAll,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'nickname',
-          valueField: 'id'
-        },
-        filterable: true,
-        placeholder: "请先选择设备"
-      },
-    },
-    isSearch: true,
     search: {
       component: 'Select',
       api: () => userListAll,
@@ -390,6 +378,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '报修人意见',
     field: 'applyContent',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     }
@@ -399,6 +388,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'verifyer',
     sort: 'custom',
     isDetail: false,
+    isForm: false,
     table: {
       width: '150',
     },
@@ -406,19 +396,6 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userListAll.find((account) => account.id == cellValue)?.nickname
     },
-    form: {
-      component: 'Select',
-      api: () => userListAll,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'nickname',
-          valueField: 'id'
-        },
-        filterable: true,
-        placeholder: "请先选择设备"
-      },
-    },
     isSearch: true,
     search: {
       component: 'Select',
@@ -451,6 +428,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '验证人意见',
     field: 'verifyContent',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     }

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

@@ -947,7 +947,8 @@ function verifyCancel(row) {
 // 确认
 function confirmOrder(row) {
   openRowValue.value = row
-  verifyFormValue.value.verifyContent = ''
+  confirmFormValue.value.confirmContent = ''
+  confirmFormValue.value.confirmStatus = 'APPLYPASS'
   confirmDialogVisible.value = true
 }
 

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

@@ -14,7 +14,7 @@ const userListAll = await UserApi.getSimpleUserList()
 const factoryList = await selectAllFactoryArea()
 const moldList = await MoldAccountsApi.getMoldAccountsNoPage({})
 const moldListAll = await MoldAccountsApi.getMoldAccountsAllNoPage({})
-const moldListByFactory = moldListAll.filter(item => item.factoryAreaNumber == userStore.userSelfInfo.dept.parentId)
+const moldListByFactory = moldListAll.filter(item => item.factoryAreaNumber == userStore.userSelfInfo.deptId)
 const userList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: 1 })
 const dutyUserList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: null })
 const engineerList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: 2})
@@ -101,7 +101,7 @@ export const MoldInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     search: {
       show: true,
       component: 'Select',
-      api: () => moldList,
+      api: () => moldListByFactory,
       componentProps: {
         optionsAlias: {
           labelField: 'name',

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

@@ -660,7 +660,8 @@ function verifyCancel(row) {
 // 确认
 function confirmOrder(row) {
   openRowValue.value = row
-  verifyFormValue.value.verifyContent = ''
+  confirmFormValue.value.confirmContent = ''
+  confirmFormValue.value.confirmStatus = 'APPLYPASS'
   confirmDialogVisible.value = true
 }
 

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

@@ -334,6 +334,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'declarer',
     sort: 'custom',
     isDetail: false,
+    isForm: false,
     table: {
       width: '150',
     },
@@ -341,19 +342,6 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userListAll.find((account) => account.id == cellValue)?.nickname
     },
-    form: {
-      component: 'Select',
-      api: () => userListAll,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'nickname',
-          valueField: 'id'
-        },
-        filterable: true,
-        placeholder: "请先选择设备"
-      },
-    },
     isSearch: true,
     search: {
       component: 'Select',
@@ -386,6 +374,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '报修人意见',
     field: 'applyContent',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     }
@@ -395,6 +384,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'verifyer',
     sort: 'custom',
     isDetail: false,
+    isForm: false,
     table: {
       width: '150',
     },
@@ -402,19 +392,6 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userListAll.find((account) => account.id == cellValue)?.nickname
     },
-    form: {
-      component: 'Select',
-      api: () => userListAll,
-      componentProps: {
-        disabled: true,
-        optionsAlias: {
-          labelField: 'nickname',
-          valueField: 'id'
-        },
-        filterable: true,
-        placeholder: "请先选择设备"
-      },
-    },
     isSearch: true,
     search: {
       component: 'Select',
@@ -447,6 +424,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '验证人意见',
     field: 'verifyContent',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     }