eam
/
eam-ui
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

SBBJ-1217模具、设备，明细编辑、新增，选择完成，完成时间应是必填项；选择未完成，未完成原因应是必填项

master
张立 3 days ago
parent
b7f4753b3c
commit
503b17dcec
4 changed files with 83 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/components/Detail/src/Detail.vue
  2. 78
      src/views/eam/device/deviceinspectionjob/index.vue
  3. 85
      src/views/eam/mold/moldinspectionjob/index.vue
  4. 7
      src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts

4
src/components/Detail/src/Detail.vue
View File

@ -569,7 +569,7 @@ const openForm = async (type: string, row?: number) => {
if (await props.openFormCallBack) { if (await props.openFormCallBack) {
props.openFormCallBack(type, row, masterParmas.value, () => { props.openFormCallBack(type, row, masterParmas.value, () => {
formRef.value.open(type, row, masterParmas.value) formRef.value.open(type, row, masterParmas.value)
}) },detailAllSchemasRef.value)
} else { } else {
formRef.value.open(type, row, masterParmas.value); formRef.value.open(type, row, masterParmas.value);
} }
@ -680,7 +680,7 @@ watch(
) )
function onChange(field, cur, item,formRef) { function onChange(field, cur, item,formRef) {
emit('detailOnChange', field, cur, item,formRef) emit('detailOnChange', field, cur, item,formRef,detailAllSchemasRef.value )
} }
</script> </script>

78
src/views/eam/device/deviceinspectionjob/index.vue
View File

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

85
src/views/eam/mold/moldinspectionjob/index.vue
View File

@ -576,8 +576,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
} }
const detailOpenForm = (type, row) => { const detailOpenForm = (type, row) => {
console.log('type', type)
console.log('row', row)
MoldInspectionDetail.allSchemas.tableFormColumns.map((item) => {}) MoldInspectionDetail.allSchemas.tableFormColumns.map((item) => {})
} }
@ -588,7 +586,6 @@ const detailValidate = (data) => {
} }
// 子表提交 // 子表提交
const detailSubmitForm = async (formType, data, formRef, tableList) => { const detailSubmitForm = async (formType, data, formRef, tableList) => {
console.log('data', data)
try { try {
let data1 = { let data1 = {
id: data.id, id: data.id,
@ -608,21 +605,16 @@ const detailSubmitForm = async (formType, data, formRef, tableList) => {
uncompleted: data.uncompleted, uncompleted: data.uncompleted,
itemNumbers: data.itemNumbers itemNumbers: data.itemNumbers
} }
console.log('data1', data1)
if (formType === 'create') { if (formType === 'create') {
console.log('create', data1)
await MoldInspectionDetailApi.createMoldInspectionDetail(data1) await MoldInspectionDetailApi.createMoldInspectionDetail(data1)
console.log('finish', data1)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
} else { } else {
await MoldInspectionDetailApi.updateMoldInspectionDetail(data1) await MoldInspectionDetailApi.updateMoldInspectionDetail(data1)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }
formRef.dialogVisible = false formRef.dialogVisible = false
console.log('before', data1)
// 刷新当前列表 // 刷新当前列表
await detailRef.value.getList() await detailRef.value.getList()
console.log('after', data1)
detailRef.value.tableObject.tableList.forEach((item) => { detailRef.value.tableObject.tableList.forEach((item) => {
if (item.itemNumbers?.length > 0) { if (item.itemNumbers?.length > 0) {
let str = '' let str = ''
@ -661,7 +653,6 @@ const submitForm = async (formType, data) => {
item.chargePeoples = item.chargePeoples.join(',') item.chargePeoples = item.chargePeoples.join(',')
return item return item
}) // 拼接子表数据参数 }) // 拼接子表数据参数
console.log(data.subList)
try { try {
if (formType === 'create') { if (formType === 'create') {
await MoldInspectionMainApi.createMoldInspectionMain(data) await MoldInspectionMainApi.createMoldInspectionMain(data)
@ -678,44 +669,44 @@ const submitForm = async (formType, data) => {
} }
} }
function detailOnChange(field, cur, item, formRef) { function detailOnChange(field, cur, item, formRef, detailAllSchemas) {
// if (field == 'status') { if (field == 'status') {
// if (cur == '1') { if (cur == '1') {
// MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false detailAllSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
// MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true detailAllSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
// formRef.setValues({completionTime:''}) formRef.setValues({completionTime:''})
// item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] MoldInspectionDetailRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
// item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] MoldInspectionDetailRules.completionTime = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }]
// } else { } else {
// MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true detailAllSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
// MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false detailAllSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
// formRef.setValues({uncompleted:''}) formRef.setValues({uncompleted:''})
// item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] MoldInspectionDetailRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
// item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] MoldInspectionDetailRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
// } }
// } }
} }
const openFormCallBack = (type, row, masterParmas, callback) => { const openFormCallBack = (type, row, masterParmas, callback,detailAllSchemasRef) => {
// if (row == undefined || row == null) { if (row == undefined || row == null) {
// MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true detailAllSchemasRef.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
// MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false detailAllSchemasRef.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
// MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'status').value = '0' detailAllSchemasRef.formSchema.find(item => item.field == 'status').value = '0'
// item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] MoldInspectionDetailRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
// item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] MoldInspectionDetailRules.completionTime = [{ required: true, 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 detailAllSchemasRef.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
// MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true detailAllSchemasRef.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
// item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] MoldInspectionDetailRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
// item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] MoldInspectionDetailRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
// } else { } else {
// MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true detailAllSchemasRef.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
// MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false detailAllSchemasRef.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
// item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}] MoldInspectionDetailRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
// item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}] MoldInspectionDetailRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
// } }
// } }
callback() callback()
} }

7
src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts
View File

@ -442,6 +442,8 @@ export const MoldInspectionDetailRules = reactive({
// { validator:validateNum, message: '请输入正整数', trigger: 'blur'} // { validator:validateNum, message: '请输入正整数', trigger: 'blur'}
// ], // ],
maintenance: [required], maintenance: [required],
completionTime: [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }],
uncompleted: [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }]
}) })
@ -608,7 +610,8 @@ export const MoldInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
type: 'datetime', type: 'datetime',
valueFormat: 'x' valueFormat: 'x',
disabled: false,
} }
}, },
tableForm: { tableForm: {
@ -626,7 +629,7 @@ export const MoldInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'Input', component: 'Input',
componentProps: { componentProps: {
type: 'textarea', type: 'textarea',
// disabled: true, disabled: false,
} }
} }
}, },

Write Preview
Loading…
Cancel
Save