From 6c276b5d5a949bf20a2d1dac64b8b323034da104 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 21 Dec 2023 10:36:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 1 + .../customerreturn/customerreturnRequestMain/index.vue | 2 +- .../deliver/deliverRequestMain/deliverRequestMain.data.ts | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) 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' } // ],