From 7aa049c0c5005e326d1dfe55e8da695d74072406 Mon Sep 17 00:00:00 2001
From: zhang_li
Date: Tue, 27 May 2025 09:46:31 +0800
Subject: [PATCH 1/4] =?UTF-8?q?YT-2645=20=E8=A6=81=E8=B4=A7=E9=A2=84?=
=?UTF-8?q?=E6=B5=8B=E7=89=88=E6=9C=AC=E5=8F=B7=E5=8F=98=E6=9B=B4=20=20?=
=?UTF-8?q?=E5=86=85=E7=A4=BA=E6=9C=88=E4=BB=BD=E5=88=9D=E5=A7=8B=E5=8C=96?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../demandforecastingMain.data.ts | 13 ++-----------
.../demandforecastingMain.data.ts | 13 ++-----------
2 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index caeb563ea..0ceee171b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -300,21 +300,12 @@ hiddenSearchHigh:true,
isForm: false,
search: {
component: 'DatePicker',
+ value: dayjs().format('YYYY-MM'),
componentProps: {
- clearable:false,
- type: 'month',
valueFormat: 'YYYY-MM',
+ type: 'month',
}
},
- // search: {
- // component: 'DatePicker',
- // value: [dayjs(), dayjs().subtract(-3,'month')],
- // componentProps: {
- // valueFormat: 'YYYY-MM-DD',
- // type: 'daterange',
- // defaultTime: [new Date('1 '), new Date('1 ')]
- // }
- // },
},
{
label: '操作',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index dc3697ef7..b2377c6af 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -206,21 +206,12 @@ hiddenSearchHigh:true,
isForm: false,
search: {
component: 'DatePicker',
+ value: dayjs().format('YYYY-MM'),
componentProps: {
- clearable:false,
- type: 'month',
valueFormat: 'YYYY-MM',
+ type: 'month',
}
},
- // search: {
- // value: [dayjs(), dayjs().subtract(-3,'month')],
- // component: 'DatePicker',
- // componentProps: {
- // valueFormat: 'YYYY-MM-DD',
- // type: 'daterange',
- // defaultTime: [new Date('1 '), new Date('1 ')]
- // }
- // },
}
]))
From 4b5cbe4dc5c42c7b2294dcb6220837156445f0fe Mon Sep 17 00:00:00 2001
From: zhang_li
Date: Tue, 27 May 2025 11:01:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?YT-2652=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3?=
=?UTF-8?q?=E8=AF=B7=E7=9A=84=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E2=80=9C=E7=AE=B1=E6=95=B0=E2=80=9D=20?=
=?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=EF=BC=9A1.=E8=A6=81=E8=B4=A7?=
=?UTF-8?q?=E8=AE=A1=E5=88=92=E6=98=8E=E7=BB=86=EF=BC=9A=E7=AE=B1=E6=95=B0?=
=?UTF-8?q?=3D=E8=AE=A1=E5=88=92=E9=87=87=E8=B4=AD=E6=95=B0=E9=87=8F=20/?=
=?UTF-8?q?=20=E9=87=87=E8=B4=AD=E6=A0=87=E5=8C=85=E6=95=B0=E9=87=8F?=
=?UTF-8?q?=EF=BC=8C=E8=AE=A1=E7=AE=97=E7=BB=93=E6=9E=9C=E4=B8=BA=E6=95=B4?=
=?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=90=91=E4=B8=8A=E5=8F=96=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierdeliver/purchasePlanMain/index.vue | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 725d5e109..fcaf7e333 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -116,8 +116,13 @@
fieldTableColumn="poLine"
@detailOpenForm="detailOpenForm"
@handleSubmitForm="handleDetailSubmitForm"
+ @detailBasicFormOnChange="detailBasicFormOnChange"
- />
+ >
+
+ {{ Math.ceil(Number(row.planQty) / Number(row.purchaseStdQty))}}
+
+
@@ -1068,8 +1073,16 @@ const handleSelectionPublish = async ()=>{
// 数字输入-改变事件
const inputNumberChange = (field, index, row, val) => {
console.log('inputNumberChange', field, index, row, val)
- row.planQty = row.boxQty * row.purchaseStdQty
+ if (field == 'boxQty') {
+ row.planQty = row.boxQty * row.purchaseStdQty
+ }
}
+const detailBasicFormOnChange =(field, val) => {
+ if (field == 'boxQty') {
+ detailRef.value.formRef.formRef.formModel.planQty = detailRef.value.formRef.formRef.formModel.boxQty * detailRef.value.formRef.formRef.formModel.purchaseStdQty
+ }
+}
+
/** 初始化 **/
onMounted(async () => {
getList()
From f8703dc49719578d02ae06e79b5e74e484436938 Mon Sep 17 00:00:00 2001
From: wangxianlei <542787045@qq.com>
Date: Tue, 27 May 2025 11:09:57 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
=?UTF-8?q?=E8=B4=A7=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0JasperReport?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/wms/package/index.ts | 4 ++
.../supplierdeliverRequestMain/index.vue | 48 ++++++++++++++++++-
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index e6f4942f1..7e77373b1 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -176,3 +176,7 @@ export const getBalanceToPackageSelection = async (data: any) => {
export const getPackageByBarbasic = async (relateNumber) => {
return await request.get({ url: `/wms/package/getPackageByBarbasic?relateNumber=${relateNumber}`})
}
+
+export const jasperExportAll = async(params: any) => {
+ return await request.download({url: `/wms/package/jasperExportAll`, params})
+}
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 191820308..3593ea35f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -181,6 +181,8 @@
打印全部
+ 打印全部
+
{
})
}
+/** 导出明细按钮操作 */
+const printAllLoading = ref(false) // 导出的加载中
+
+const doHandlePrintAllExport = async (asnNumber) => {
+ try {
+ // 发起导出导出明细
+ printAllLoading.value = true
+ let params = {
+ pageNo: 1,
+ relateNumber: asnNumber,
+ pageSize: 99999999,
+ }
+ const excelTitle = ref(route.meta.title)
+ const data = await PackageApi.jasperExportAll(params)
+ download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.pdf`)
+ } catch {
+ } finally {
+ printAllLoading.value = false
+ }
+}
+const handlePrintAllExport = async () => {
+ let res = await PackageApi.getLabelDetailPage({
+ moduleName: 'supplier',
+ recordNumber: printRow.value.number,
+ pageSize: 1000,
+ pageNo: 1,
+ })
+
+ await PackageApi.batchPrintingLablesForYT(res.list)
+ .then(res => {
+ let asnNumber
+ if(res.xdpLabel){
+ //协定品标签
+ asnNumber = res.xdpLabel;
+ }
+ if (res.cgLabel) {
+ //采购标签
+ asnNumber = res.cgLabel;
+ }
+ doHandlePrintAllExport(asnNumber);
+ }).catch(err => {
+ message.error(t('ts.创建标签失败'))
+ })
+}
// 批量打印--供应商发货申请
const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
@@ -1481,4 +1527,4 @@ onMounted(async () => {
display: flex!important;
opacity: 1;
}
-
\ No newline at end of file
+
From 38ac4c47a73232f3ddc53cc2ed8af452fbc763c5 Mon Sep 17 00:00:00 2001
From: wangxianlei <542787045@qq.com>
Date: Tue, 27 May 2025 11:28:09 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
=?UTF-8?q?=E8=B4=A7=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0JasperReport?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierdeliver/supplierdeliverRequestMain/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 3593ea35f..de729046c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -180,7 +180,7 @@
- 打印全部
+
打印全部