diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index c22b5bcc2..9ca00d4f1 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -790,6 +790,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive isTableForm: false, isForm: false }, + { label: '从货主代码', field: 'fromOwnerCode', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index de6e10bc9..8b55a2efd 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -125,7 +125,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['customerCode'] = val[0]['customerCode'] setV['customerDockCode'] = val[0]['customerDockCode'] // 获取子表数据 getBomDisassemble - DeliverRecordDetailApi.getDeliverRecordDetailPage(val[0]['id']) + DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['id']}) .then(res => { console.log(555,res) if (res) tableData.value = res.list diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 3bb821590..ac0dcc229 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -509,9 +509,9 @@ export const DeliverRequestMainRules = reactive({ customerCode: [ { required: true, message: '请选择客户代码', trigger: 'change' } ], - // customerDockCode: [ - // { required: true, message: '请选择客户月台代码', trigger: 'change' } - // ], + customerDockCode: [ + { required: true, message: '请选择客户月台代码', trigger: 'change' } + ], // fromWarehouseCode: [ // { required: true, message: '请选择从仓库代码', trigger: 'change' } // ],