From c8319c6524c665e443df19850752b10cbb5ca00b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Sun, 17 Mar 2024 14:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=A7=E8=AE=B0=E5=BD=95=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

---
 .../customerreturnRecordMain.data.ts            |  9 +++++++++
 .../customerreturnRecordMain/index.vue          | 17 ++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
index 574780e6f..e764f4d15 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
@@ -338,6 +338,15 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
 ]))
 
 //表单校验
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
index 7ebd79ee1..b08876cbc 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.mainListPointBtn(null), // 标签打印
+]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'point') { // 标签打印
+    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/929216638195793920?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&id='+row.id)
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {