Merge branch 'master' of http://dev.ccwin-in.com:3000/eam/eam-ui

src/components/Descriptions/src/Descriptions.vue

@@ -36,7 +36,7 @@ const props = defineProps({
     default: () => ({})
   }
 })
-
+console.log('schema',props.schema)
 const { getPrefixCls } = useDesign()
 
 const prefixCls = getPrefixCls('descriptions')

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

@@ -8,6 +8,8 @@ import {  validateNum100, validateNum } from '@/utils/validator'
 const factoryList = await selectAllFactoryArea()
 const userList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '', flag: 1 })
 const dutyUserList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '', flag: null })
+import * as UserApi from '@/api/system/user'
+
 
 // 表单校验
 export const DeviceMaintainOrderMainRules = reactive({
@@ -151,27 +153,23 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: '150',
     },
+    isDetail:false
   },
   {
-    label: '接单时间',
+    label: '接单人员',
-    field: 'receiveTime',
+    field: 'maintenanceName',
     sort: 'custom',
     isSearch: false,
     table: {
       width: '150',
     },
-    formatter: dateFormatter,
+    isForm:false,
-    form: {
+    isDetail:true,
-      component: 'DatePicker',
+    isTable:false,
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
   },
   {
-    label: '完成时间',
+    label: '接单时间',
-    field: 'finishedTime',
+    field: 'receiveTime',
     sort: 'custom',
     isSearch: false,
     table: {
@@ -185,10 +183,13 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x'
       }
     },
+    detail:{
+      dateFormat:'YYYY-MM-DD HH:mm:ss'
+    }
   },
   {
-    label: '验证时间',
+    label: '完成时间',
-    field: 'verifyTime',
+    field: 'finishedTime',
     sort: 'custom',
     isSearch: false,
     table: {
@@ -202,6 +203,9 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x'
       }
     },
+    detail:{
+      dateFormat:'YYYY-MM-DD HH:mm:ss'
+    }
   },
   {
     label: '操作',

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

@@ -111,6 +111,7 @@ import * as DeviceMaintainOrderMainApi from '@/api/eam/device/deviceMaintainOrde
 import * as DeviceMaintainOrderDetailApi from '@/api/eam/device/deviceMaintainOrderDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { useUserStore } from '@/store/modules/user'
+import * as UserApi from '@/api/system/user'
 
 defineOptions({ name: 'DeviceMaintainOrderMain' })
 const message = useMessage() // 消息弹窗
@@ -280,7 +281,9 @@ const openForm = (type: string, row?: any) => {
 
 /** 详情操作 */
 const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
+const openDetail =async (row: any, titleName: any, titleValue: any) => {
+  const userListAll = await UserApi.getSimpleUserList()
+  row.maintenanceName = userListAll.find((account) => account.id == row.maintenance)?.nickname
   detailRef.value.openDetail(row, titleName, titleValue,'DeviceMaintainOrderMain')
 }
 

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

@@ -282,6 +282,8 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = async (row: any, titleName: any, titleValue: any) => {
+  const userListAll = await UserApi.getSimpleUserList()
+  row.maintenanceName = userListAll.find((account) => account.id == row.maintenance)?.nickname
   const factoryList = await selectAllFactoryArea()
   row.factoryAreaNumber1 = factoryList.find((account) => account.id == row.factoryAreaNumber)?.name
   detailRef.value.openDetail(row, titleName, titleValue,'MoldMaintainOrderMain')

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

@@ -143,41 +143,23 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: '150',
     },
+    isDetail:false
   },
   {
-    label: '接单时间',
+    label: '接单人员',
-    field: 'receiveTime',
+    field: 'maintenanceName',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: '150',
-    },
-    formatter: dateFormatter,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '工程师',
-    field: 'engineer',
     sort: 'custom',
     isSearch: false,
     table: {
       width: '150',
     },
-    form: {
+    isForm:false,
-      component: 'InputNumber',
+    isDetail:true,
-      value: 0
+    isTable:false,
-    },
   },
-
   {
-    label: '指派时间',
+    label: '接单时间',
-    field: 'assignTime',
+    field: 'receiveTime',
     sort: 'custom',
     isSearch: false,
     table: {
@@ -191,7 +173,11 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x'
       }
     },
+    detail:{
+      dateFormat:'YYYY-MM-DD HH:mm:ss'
+    }
   },
+
   {
     label: '完成时间',
     field: 'finishedTime',
@@ -208,24 +194,10 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x'
       }
     },
-  },
+    detail:{
-  {
+      dateFormat:'YYYY-MM-DD HH:mm:ss'
-    label: '验证时间',
-    field: 'verifyTime',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: '150',
-    },
-    formatter: dateFormatter,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
     }
   },
-  },
 
   // {
   //   label: '创建时间',
@@ -442,6 +414,9 @@ export const MoldMaintainOrderDetail = useCrudSchemas(reactive<CrudSchema[]>([
         type: 'datetime',
         valueFormat: 'x'
       }
+    },
+    detail:{
+      dateFormat:'YYYY-MM-DD HH:mm:ss'
     }
   },
   {