diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue index 9f3c36eca..e5ded0269 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue @@ -254,6 +254,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['fromLocationCode'] = val[0]['locationCode'] row['produceDate'] = val[0]['produceDate'] row['expireDate'] = val[0]['expireDate'] + row['bomVersion'] = '' + row['childList'] = [] } else { row[formField] = val[0][searchField] } @@ -280,6 +282,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['fromLocationCode'] = val[0]['locationCode'] setV['produceDate'] = val[0]['produceDate'] setV['expireDate'] = val[0]['expireDate'] + setV['bomVersion'] = '' + setV['childList'] = [] }else if(formField == 'bomVersion') { setV['bomVersion'] = val[0]['version'] } diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index 1dc259f70..51d8b6d4a 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -230,6 +230,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['uom'] = val[0]['uom'] row['inventoryStatus'] = val[0]['inventoryStatus'] row['fgFromLocationCode'] = val[0]['locationCode'] + row['bomVersion'] = '' + row['childList'] = [] } else if(formField == 'productionLineCode'){ row['productionLineCode'] = val[0]['code'] } else if(formField == 'workStationCode'){ @@ -263,6 +265,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['inventoryStatus'] = val[0]['inventoryStatus'] setV['fgFromLocationCode'] = val[0]['locationCode'] // setV['fromLocationCode'] = val[0]['locationCode'] + setV['bomVersion'] = '' + setV['childList'] = [] } else if(formField == 'productionLineCode'){ setV['productionLineCode'] = val[0]['code'] } else if(formField == 'workStationCode'){ diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 6fba186a5..4968e0166 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -555,6 +555,11 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive }, tableForm: { disabled: true + }, + form: { + componentProps:{ + disabled: true + } } }, { @@ -603,6 +608,11 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive }, tableForm: { disabled: true + }, + form: { + componentProps:{ + disabled: true + } } }, { @@ -641,6 +651,11 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive }, tableForm: { disabled: true + }, + form: { + componentProps:{ + disabled: true + } } }, { @@ -652,6 +667,11 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive }, tableForm: { disabled: true + }, + form: { + componentProps:{ + disabled: true + } } }, { @@ -663,6 +683,11 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive }, tableForm: { disabled: true + }, + form: { + componentProps:{ + disabled: true + } } }, @@ -679,6 +704,11 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive tableForm: { disabled: true, type: 'Select' + }, + form: { + componentProps:{ + disabled: true + } } }, { @@ -695,7 +725,6 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive } } }, - { label: '备注', field: 'remark', @@ -927,6 +956,9 @@ export const ProductrepairRequestDetailaRules = reactive({ itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], + bomVersion: [ + { required: true, message: '请选择Bom版本', trigger: 'change' } + ], remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index cb4705de9..0479c040a 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -248,6 +248,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['processCode'] = val[0]['code'] }else if(formField == 'itemCode'){ row['itemCode'] = val[0]['itemCode'] + row['bomVersion'] = '' + row['childList'] = [] }else if(formField == 'bomVersion'){ row['bomVersion'] = val[0]['version'] } @@ -273,6 +275,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['processCode'] = val[0]['code'] }else if(formField == 'itemCode'){ setV['itemCode'] = val[0]['itemCode'] + setV['bomVersion'] = '' + setV['childList'] = [] }else if(formField == 'bomVersion'){ setV['bomVersion'] = val[0]['version'] } diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 36f2535ca..4c92bd4d9 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -986,6 +986,9 @@ export const ProductscrapRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], + bomVersion: [ + { required: true, message: '请选择Bom版本', trigger: 'change' } + ], remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ],