From 38735f196b677aedfb5803986656104f2fcf82ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 18 Mar 2024 14:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E8=AE=B0=E5=BD=95=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnRecordMain/index.vue          | 17 ++++++++++++++---
 .../deliver/deliverRecordMain/index.vue         | 17 ++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
index 7ebd79ee1..ad56e650d 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
@@ -62,6 +62,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
 import { CustomerreturnRecordMain,CustomerreturnRecordMainRules,CustomerreturnRecordDetail,CustomerreturnRecordDetailRules } from './customerreturnRecordMain.data'
 import * as CustomerreturnRecordMainApi from '@/api/wms/customerreturnRecordMain'
 import * as CustomerreturnRecordDetailApi from '@/api/wms/customerreturnRecordDetail'
@@ -125,12 +126,15 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
-  return []
-}
+const butttondata = (row) => [
+  defaultButtons.mainListDocumentPrintBtn(null), // 标签打印
+]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'documentPrint') { // 标签打印
+    handlePoint(row)
+  }
 }
 
 /** 详情操作 */
@@ -164,6 +168,13 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/929216638195793920?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&id='+row.id)
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
index 616278d21..b30a36e8c 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
@@ -62,6 +62,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
 import { DeliverRecordMain,DeliverRecordMainRules,DeliverRecordDetail,DeliverRecordDetailRules } from './deliverRecordMain.data'
 import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
 import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
@@ -125,12 +126,15 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
-  return []
-}
+const butttondata = (row) => [
+  defaultButtons.mainListDocumentPrintBtn(null), // 标签打印
+]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'documentPrint') { // 标签打印
+    handlePoint(row)
+  }
 }
 
 /** 详情操作 */
@@ -155,6 +159,13 @@ const handleExport = async () => {
   }
 }
 
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/929209659733770240?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&id='+row.id)
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {