From f3a4cd90b15d2318f9b4de01c77570536dbdd902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 22 May 2024 14:06:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 07f908d37..5e6e2f3ae 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ auto-*.d.ts .idea .history /sfms3.0 +/sfms3.0-ui From fa12a2c7c61fb6626b56aa2343b2ac4701f5de55 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 22 May 2024 14:13:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=B6=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/purchasePackage/index.vue | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 728e69d6e..77bf9b4c2 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -253,10 +253,31 @@ const handleExport = async () => { } const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL -const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) -// 标签打印 +const labelType = ref('') // 标签类别 采购还是制造等 const handlePoint = async (row) => { - window.open(src.value+'&asn_number='+row.relateNumber) + console.log(row.packingNumber,445555555555555); + PackageApi.getBalanceToPackage(row.relateNumber).then(res => { + console.log(777,res); + if (res.productionLineCode != null) { + labelType.value = 'zz' + } else { + labelType.value = 'cg' + } + PackageApi.batchPrintingLable((res.number)).then((resLable) =>{ + console.log(159,resLable ) + // 判断是采购还是制造 + if (labelType.value == 'cg') { + const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + console.log(159,resLable ) + window.open(src.value+'&asn_number='+resLable) + } else { + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+resLable) + } + }) + }).catch(err => { + console.log(err) + }) } // form表单提交 @@ -304,4 +325,4 @@ onMounted(async () => { getList() }) -@/api/wms/itempackage \ No newline at end of file +@/api/wms/itempackage