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

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

@@ -4,6 +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'
 const factoryList = await selectAllFactoryArea()
 const userList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '', flag: 1 })
 const dutyUserList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '', flag: null })
@@ -221,9 +222,21 @@ export const DeviceMaintainOrderDetailRules = reactive({
     concurrencyStamp: [required],
     name: [required],
     number: [required],
-    peoples: [required],
+    peoples: [
-    estimatedMinutes: [required],
+      
-    actualMinutes: [required],
+    required,
+    { validator:validateNum, message: '请输入正整数', trigger: 'blur'},
+    ],
+    estimatedMinutes: [
+      
+    required,
+    { validator:validateNum, message: '请输入正整数', trigger: 'blur'},
+    ],
+    actualMinutes: [
+      
+    required,
+    { validator:validateNum, message: '请输入正整数', trigger: 'blur'},
+    ],
     chargePeoples: [required],
     completionTime: [required],
     engineer: [required],

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

@@ -4,6 +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'
 const factoryList = await selectAllFactoryArea()
 const userList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: 1 })
 const dutyUserList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: undefined })
@@ -282,9 +283,18 @@ export const MoldMaintainOrderDetailRules = reactive({
   concurrencyStamp: [required],
   name: [required],
   number: [required],
-    peoples: [required],
+  peoples: [
-    estimatedMinutes: [required],
+    required,
-    actualMinutes: [required],
+    { validator: validateNum, message: '请输入正整数', trigger: 'blur' },
+  ],
+  estimatedMinutes: [
+    required,
+    { validator: validateNum, message: '请输入正整数', trigger: 'blur' },
+  ],
+  actualMinutes: [
+    required,
+    { validator: validateNum, message: '请输入正整数', trigger: 'blur' },
+  ],
   chargePeoples: [required],
   completionTime: [required],
   engineer: [required],