From 265a01cba7d2fa9075e479d6932e32d3f321f237 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Tue, 28 May 2024 16:34:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartsrequisitionRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index 31482c978..8cc95d37f 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -69,7 +69,7 @@ :detailAllSchemasRules="UnplannedissueRequestDetailRules" :apiCreate="UnplannedissueRequestDetailApi.createUnplannedissueRequestDetail" :apiUpdate="UnplannedissueRequestDetailApi.updateUnplannedissueRequestDetail" - :apiPage="UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPage" + :apiPage="UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPageSpare" :apiDelete="UnplannedissueRequestDetailApi.deleteUnplannedissueRequestDetail" :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" From 27bd41da7c7141206ae767644069cfe89780d7ab Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 28 May 2024 16:40:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BFid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/purchasereceiptManage/putaway/putawayJobMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue index 524fd6a1e..2c7d02847 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue @@ -280,7 +280,7 @@ const buttonTableClick = async (val, row) => { } const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL -const src = ref(BASE_URL + '/jmreport/view/954878108028801024?token=' + getAccessToken()) +const src = ref(BASE_URL + '/jmreport/view/955350408322154496?token=' + getAccessToken()) const handleDocumentPrint = async (row) => { window.open(src.value+'&id='+row.masterId) } From 77928ed270f887d60b0416dacc8a6d5d17ba8270 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Tue, 28 May 2024 16:41:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AF=A6=E7=BB=86=E6=95=B0=E6=8D=AE=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartsrequisitionRecordMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue index e2b52a2f2..f3fa14b88 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue @@ -57,7 +57,7 @@ :allSchemas="UnplannedissueRecordMain.allSchemas" :detailAllSchemas="UnplannedissueRecordDetail.allSchemas" :detailAllSchemasRules="UnplannedissueRecordDetailRules" - :apiPage="UnplannedissueRecordDetailApi.getUnplannedissueRecordDetailPage" + :apiPage="UnplannedissueRecordDetailApi.getUnplannedissueRecordDetailPageSpare" /> From 12e7754d0d8e173a55f53d2e2d5b25c5648956d5 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 28 May 2024 17:01:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturn/customerreturnRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 2fd8a1768..639e766d7 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -203,7 +203,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['customerDockCode'] = val[0]['customerDockCode'] // 获取子表数据 - DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['id']}) + DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['masterId']}) .then(res => { res.list.forEach(obj => {