From 2448d81d67aaf87bd5e5135aba3c96b66f8e41e1 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 21 May 2024 16:16:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95--=E7=94=A8id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index e2920d06c..eddcebe8a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -261,7 +261,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => // 获取子表数据 getBomDisassemble // PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailList({ PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailListToRepeat({ - masterId: val[0]['masterId'] + masterId: val[0]['id'] }).then((res) => { if (res) tableData.value = res tableData.value.forEach((item) => { From 3c5f69c54fd87b310e7da61b66728926dc9b95df Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 21 May 2024 16:16:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countManage/count/countPlanMain/countPlanMain.data.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 4fa492220..3bd8e9fef 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -76,7 +76,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ } }, { - label: '物料忽略名单', + label: '物料选择名单', field: 'ignoreListOfItem', sort: 'custom', table: { @@ -86,7 +86,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ componentProps: { isSearchList: true, // 开启查询弹窗 multiple:true,//是否可以多选 - searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本 + searchListPlaceholder: '请选择物料选择名单', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '物料信息', // 查询弹窗标题 searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 @@ -477,6 +477,9 @@ export const CountPlanMainRules = reactive({ type: [ { required: true, message: '请选择盘点类型', trigger: 'change' } ], + ignoreListOfItem: [ + { required: true, message: '请选物料选择名单', trigger: 'change' } + ], crontab: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], From 5fa1dcd7e317cc58a3b3915d1a752e739b22000e Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 21 May 2024 16:34:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=8D=A2id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index eddcebe8a..e2920d06c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -261,7 +261,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => // 获取子表数据 getBomDisassemble // PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailList({ PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailListToRepeat({ - masterId: val[0]['id'] + masterId: val[0]['masterId'] }).then((res) => { if (res) tableData.value = res tableData.value.forEach((item) => {