Browse Source

[SBBJ-1214]PC端检修工单新增明细中实际分钟数、是否完成、未完成原因不必填

master
zengqinyuan 3 days ago
parent
commit
98d66e2e41
  1. 14
      src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts
  2. 70
      src/views/eam/device/deviceinspectionjob/index.vue
  3. 70
      src/views/eam/mold/moldinspectionjob/index.vue
  4. 16
      src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts

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

@ -482,11 +482,11 @@ export const DeviceInspectionDetailRules = reactive({
{ validator: validateNum, message: '请输入正整数', trigger: 'blur' } { validator: validateNum, message: '请输入正整数', trigger: 'blur' }
], ],
number: [required], number: [required],
status: [required], // status: [required],
actualMinutes: [required, { validator: validateNum, message: '请输入正整数', trigger: 'blur' }], // actualMinutes: [required, { validator: validateNum, message: '请输入正整数', trigger: 'blur' }],
maintenance: [required], maintenance: [required],
completionTime: [{ required: false, message: '该项为必填项', trigger: 'blur' }], // completionTime: [{ required: false, message: '该项为必填项', trigger: 'blur' }],
uncompleted: [{ required: false, message: '该项为必填项', trigger: 'blur' }] // uncompleted: [{ required: false, message: '该项为必填项', trigger: 'blur' }]
}) })
export const DeviceInspectionDetail = useCrudSchemas( export const DeviceInspectionDetail = useCrudSchemas(
@ -762,10 +762,10 @@ export const DeviceInspectionAddDetailRules = reactive({
{ validator: validateNum, message: '请输入正整数', trigger: 'blur' } { validator: validateNum, message: '请输入正整数', trigger: 'blur' }
], ],
number: [required], number: [required],
status: [required], // status: [required],
actualMinutes: [required, { validator: validateNum, message: '请输入正整数', trigger: 'blur' }], // actualMinutes: [required, { validator: validateNum, message: '请输入正整数', trigger: 'blur' }],
maintenance: [required], maintenance: [required],
uncompleted: [{ required: true, message: '该项为必填项', trigger: 'blur' }] // uncompleted: [{ required: true, message: '该项为必填项', trigger: 'blur' }]
}) })
export const DeviceInspectionAddDetail = useCrudSchemas( export const DeviceInspectionAddDetail = useCrudSchemas(

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

@ -651,45 +651,45 @@ const submitForm = async (formType, data) => {
function detailOnChange(field, cur, item, formRef) { function detailOnChange(field, cur, item, formRef) {
console.log(2233,field) console.log(2233,field)
if (field == 'status') { // if (field == 'status') {
if (cur == '1') { // if (cur == '1') {
DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false // DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true // DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
formRef.setValues({completionTime:''}) // formRef.setValues({completionTime:''})
item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.uncompleted = [{ required: true, message: '' , trigger: ['blur','change']}]
item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.completionTime = [{ required: false, message: '' , trigger: ['blur','change']}]
} else { // } else {
DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true // DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false // DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
formRef.setValues({uncompleted:''}) // formRef.setValues({uncompleted:''})
item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }] // item.tableFormRules.uncompleted = [{ required: false, message: '', trigger: ['blur', 'change'] }]
item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.completionTime = [{ required: true, message: '' , trigger: ['blur','change']}]
} // }
} // }
} }
const openFormCallBack = (type, row, masterParmas, callback) => { const openFormCallBack = (type, row, masterParmas, callback) => {
if (row == undefined || row == null) { // if (row == undefined || row == null) {
DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true // DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false // DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'status').value = '0' // DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'status').value = '0'
item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }] // item.tableFormRules.uncompleted = [{ required: false, message: '', trigger: ['blur', 'change'] }]
item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.completionTime = [{ required: true, message: '' , trigger: ['blur','change']}]
} else { // } else {
if (row.status == '1') { // if (row.status == '1') {
DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false // DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true // DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项', trigger: ['blur', 'change'] }] // item.tableFormRules.uncompleted = [{ required: true, message: '', trigger: ['blur', 'change'] }]
item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.completionTime = [{ required: false, message: '' , trigger: ['blur','change']}]
} else { // } else {
DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true // DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false // DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }] // item.tableFormRules.uncompleted = [{ required: false, message: '', trigger: ['blur', 'change'] }]
item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.completionTime = [{ required: true, message: '' , trigger: ['blur','change']}]
} // }
} // }
callback() // callback()
} }
function buttonControllFunction(row, val) { function buttonControllFunction(row, val) {

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

@ -635,44 +635,44 @@ const submitForm = async (formType, data) => {
function detailOnChange(field, cur, item,formRef) { function detailOnChange(field, cur, item,formRef) {
if (field == 'status') { // if (field == 'status') {
if (cur == '1') { // if (cur == '1') {
MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
formRef.setValues({completionTime:''}) // formRef.setValues({completionTime:''})
item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.uncompleted = [{ required: true, message: '' , trigger: ['blur','change']}]
item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.completionTime = [{ required: false, message: '' , trigger: ['blur','change']}]
} else { // } else {
MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
formRef.setValues({uncompleted:''}) // formRef.setValues({uncompleted:''})
item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.uncompleted = [{ required: true, message: '' , trigger: ['blur','change']}]
item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.completionTime = [{ required: true, message: '' , trigger: ['blur','change']}]
} // }
} // }
} }
const openFormCallBack = (type, row, masterParmas, callback) => { const openFormCallBack = (type, row, masterParmas, callback) => {
if (row == undefined || row == null) { // if (row == undefined || row == null) {
MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'status').value = '0' // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'status').value = '0'
item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.uncompleted = [{ required: true, message: '' , trigger: ['blur','change']}]
item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.completionTime = [{ required: false, message: '' , trigger: ['blur','change']}]
} else { // } else {
if (row.status == '1') { // if (row.status == '1') {
MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.uncompleted = [{ required: true, message: '' , trigger: ['blur','change']}]
item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.completionTime = [{ required: false, message: '' , trigger: ['blur','change']}]
} else { // } else {
MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false // MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.uncompleted = [{ required: false, message: '' , trigger: ['blur','change']}]
item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] // item.tableFormRules.completionTime = [{ required: true, message: '' , trigger: ['blur','change']}]
} // }
} // }
callback() // callback()
} }
function buttonControllFunction(row, val) { function buttonControllFunction(row, val) {

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

@ -437,10 +437,10 @@ export const MoldInspectionDetailRules = reactive({
{ validator:validateNum, message: '请输入正整数', trigger: 'blur'} { validator:validateNum, message: '请输入正整数', trigger: 'blur'}
], ],
number: [required], number: [required],
actualMinutes: [ // actualMinutes: [
required, // required,
{ validator:validateNum, message: '请输入正整数', trigger: 'blur'} // { validator:validateNum, message: '请输入正整数', trigger: 'blur'}
], // ],
maintenance: [required], maintenance: [required],
}) })
@ -718,10 +718,10 @@ export const MoldInspectionAddDetailRules = reactive({
{ validator:validateNum, message: '请输入正整数', trigger: 'blur'} { validator:validateNum, message: '请输入正整数', trigger: 'blur'}
], ],
number: [required], number: [required],
actualMinutes: [ // actualMinutes: [
required, // required,
{ validator:validateNum, message: '请输入正整数', trigger: 'blur'} // { validator:validateNum, message: '请输入正整数', trigger: 'blur'}
], // ],
maintenance: [required], maintenance: [required],
}) })

Loading…
Cancel
Save