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

src/utils/validator.ts

@@ -208,6 +208,17 @@ export function validateNum(rule, value, callback) {
         callback()
     }
 }
+export function validateNum100(rule, value, callback) {
+    if (value) {
+        if (value<=100) {
+            callback()
+        } else {
+            callback(new Error('预估人数不得超出100'))
+        }
+    } else {
+        callback()
+    }
+}
 
 //数字和小数点
 export function validateNumDot(rule, value, callback) {
@@ -749,6 +760,7 @@ export default {
     validateChinese,
     validatePostCode,
     validateNum,
+    validateNum100,
     validateNumDot,
     validateZYS,
     validateOrganization,

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

@@ -6,7 +6,7 @@ import * as DeviceMaintenanceMainApi from '@/api/eam/device/deviceMaintenanceMai
 import { dateFormatter } from '@/utils/formatTime'
 import { ItemSearchTable } from '../../basic/item/item.data'
 import * as ItemApi from '@/api/eam/basic/item'
-import { validateHanset, validateInteger, validateNum } from '@/utils/validator'
+import { validateHanset, validateNum, validateNum100 } from '@/utils/validator'
 import * as UserApi from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
@@ -316,6 +316,11 @@ export const DeviceInspectionDetailRules = reactive({
   chargePeoples: [
     required,
   ],
+  peoples: [
+    required,
+    { validator: validateNum, message: '请输入正整数', trigger: 'blur' },
+    { validator: validateNum100, message: '预估人数不得超出100', trigger: 'blur' },
+  ],
   estimatedMinutes: [
     required,
     { validator: validateNum, message: '请输入正整数', trigger: 'blur' },
@@ -395,7 +400,7 @@ export const DeviceInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '人数',
+    label: '预估人数',
     field: 'peoples',
     sort: 'custom',
     table: {

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

@@ -331,18 +331,18 @@ function handleFinishOrder(row) {
       if (response.list.length == 0) {
         message.error(t('请先填写并完成检修明细内容！'))
       } else {
-        let unFinishedList = response.list.filter(item => {
-          return item.status == 1
-        })
-        if (unFinishedList != null && unFinishedList.length > 0) {
-          message.error(t('请先完成各检修明细内容！'))
-          return
-        } else {
+        // let unFinishedList = response.list.filter(item => {
+        //   return item.status == 1
+        // })
+        // if (unFinishedList != null && unFinishedList.length > 0) {
+        //   message.error(t('请先完成各检修明细内容！'))
+        //   return
+        // } else {
           DeviceInspectionMainApi.finishInspection(row.id).then(res => {
             message.success(t('common.finishSuccess'))
             getList()
           })
-        }
+        // }
       }  
     } else {
       message.error(t('common.finishFail'))

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

@@ -4,7 +4,7 @@ import { selecUserByType } from '@/api/system/dept'
 import { dateFormatter } from '@/utils/formatTime'
 import { ItemSearchTable } from '../../basic/item/item.data'
 import * as ItemApi from '@/api/eam/basic/item'
-import { validateHanset, validateInteger, validateNum } from '@/utils/validator'
+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 })
@@ -226,6 +226,8 @@ export const DeviceMaintainOrderDetailRules = reactive({
       
     required,
     { validator:validateNum, message: '请输入正整数', trigger: 'blur'},
+    { validator:validateNum100, message: '预估人数不得超出100', trigger: 'blur'},
+    
     ],
     estimatedMinutes: [
       

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

@@ -82,6 +82,7 @@
     @detailOpenForm="detailOpenForm"
     :detailValidate="detailValidate"
     @detailSubmitForm="detailSubmitForm"
+    :openFormCallBack="openFormCallBack"
     :isSearchTableItem="true"
     :buttonControllFunction="buttonControllFunction"
     @detailOnChange="detailOnChange"
@@ -523,14 +524,10 @@ function buttonControllFunction(row, val) {
       return true
     }
   } else if(val == 'add') {
-    if (row.status == 'COMPLETED' || row.status == 'VERIFIED' ||  row.status == 'REJECTED' || !isReceiver(row.maintenance)) {
     return false
   } else {
     return true
   }
-  } else {
-    return true
-  }
 }
 
 function isReceiver(orderPerson) {

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

@@ -182,6 +182,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return deviceMoldTypeList.find((account) => account.value == cellValue)?.label
     },
+    dictType: DICT_TYPE.APP_DEVICE_MOLD_TYPE,
     isSearch: true,
     search: {
       component: 'Select',

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

@@ -525,6 +525,10 @@ const openFormSec =  async (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  
+  const deviceMoldType = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE)
+  row.typeName = deviceMoldType.find((account) => account.value == row.type)?.label
+  console.log(row)
   operatRecord.value = row;
   detailRef.value.openDetail(row, titleName, titleValue,'DeviceMaintenanceMain')
 }

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

@@ -322,18 +322,18 @@ function handleFinishOrder(row) {
       if (response.list.length == 0) {
         message.error(t('请先填写并完成检修明细内容！'))
       } else {
-        let unFinishedList = response.list.filter(item => {
-          return item.status == 1
-        })
-        if (unFinishedList != null && unFinishedList.length > 0) {
-          message.error(t('请先完成各检修明细内容！'))
-          return
-        } else {
+        // let unFinishedList = response.list.filter(item => {
+        //   return item.status == 1
+        // })
+        // if (unFinishedList != null && unFinishedList.length > 0) {
+        //   message.error(t('请先完成各检修明细内容！'))
+        //   return
+        // } else {
           DeviceInspectionMainApi.finishInspection(row.id).then(res => {
             message.success(t('common.finishSuccess'))
             getList()
           })
-        }
+        // }
       }  
     } else {
       message.error(t('common.finishFail'))

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

@@ -8,7 +8,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import { ItemSearchTable } from '../../basic/item/item.data'
 import * as ItemApi from '@/api/eam/basic/item'
 import * as UserApi from '@/api/system/user'
-import { validateHanset, validateNumDot, validateNum, validateEmail } from '@/utils/validator'
+import { validateHanset, validateNum, validateNum100 } from '@/utils/validator'
 const userStore = useUserStore()
 const userListAll = await UserApi.getSimpleUserList()
 const factoryList = await selectAllFactoryArea()
@@ -311,6 +311,11 @@ export const MoldInspectionDetailRules = reactive({
   chargePeoples:[
     required,
   ],
+  peoples: [
+    required,
+    { validator: validateNum, message: '请输入正整数', trigger: 'blur' },
+    { validator: validateNum100, message: '预估人数不得超出100', trigger: 'blur' },
+  ],
   estimatedMinutes:[
     required,
     { validator:validateNum, message: '请输入正整数', trigger: 'blur'}

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

@@ -83,6 +83,7 @@
     :detailValidate="detailValidate"
     @detailSubmitForm="detailSubmitForm"
     :isSearchTableItem="true"
+    :openFormCallBack="openFormCallBack"
     :buttonControllFunction="buttonControllFunction"
     @detailOnChange="detailOnChange"
   />

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

@@ -4,7 +4,7 @@ import { selecUserByType } from '@/api/system/dept'
 import { dateFormatter } from '@/utils/formatTime'
 import { ItemSearchTable } from '../../basic/item/item.data'
 import * as ItemApi from '@/api/eam/basic/item'
-import { validateNum } from '@/utils/validator'
+import { validateNum,validateNum100 } from '@/utils/validator'
 const factoryList = await selectAllFactoryArea()
 const userList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: 1 })
 const dutyUserList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: undefined })
@@ -286,6 +286,7 @@ export const MoldMaintainOrderDetailRules = reactive({
   peoples: [
     required,
     { validator: validateNum, message: '请输入正整数', trigger: 'blur' },
+    { validator: validateNum100, message: '预估人数不得超出100', trigger: 'blur' },
   ],
   estimatedMinutes: [
     required,

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

@@ -603,7 +603,7 @@ const detailValidate = (data) => {
   }
 }
 // 子表提交
-const detailSubmitForm= async (formType,data,getList,formRef,tableList) => {
+const detailSubmitForm= async (formType,data,formRef,tableList) => {
   try {
     let data1 = {
       id:data.id,
@@ -625,7 +625,7 @@ const detailSubmitForm= async (formType,data,getList,formRef,tableList) => {
     }
     formRef.dialogVisible = false
     // 刷新当前列表
-    await getList()
+    await detailRef.value.getList()
     detailRef.value.tableObject.tableList.forEach(item=>{
       if (item.itemNumbers?.length>0) {
         let str = ''