From 59094f688e817348f9004b45ea86507153d15f90 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 14 Aug 2024 13:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE+=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnRequestMain/index.vue            |  3 +--
 .../supplierdeliverRequestMain/index.vue           | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 57a386960..fbb7aa3bc 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -339,8 +339,7 @@ const butttondata = (row,$index) => {
         {
       label: '生成标签',
       name: 'ssbq',
-      // hide: isShowMainButton(row, ['3','6']),
-      hide: isShowMainButton(row, ['3']),
+      hide: isShowMainButton(row, ['3','6']),
       type: 'primary',
       icon: '',
       color: '',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 9dc9bf340..619b878e1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -622,9 +622,19 @@ const buttonTableClick = async (val, row) => {
     formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
   } else if (val == 'ressbq') {
     console.log('重新生成标签')
-    ElMessageBox.confirm(t('ts.重新生成标签会删除上次生成的标签，是否确认继续？'), '提示', {
+    // ElMessageBox.confirm(`<div style="color:red">
+    //   重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！
+    //   </div>`,'提示',{
+    //   dangerouslyUseHTMLString: true,
+    // })
+    ElMessageBox.confirm(`<div>
+    <strong style="color:red;font-size:18px">重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！</strong>
+    <br>
+    <span>重新生成标签会删除上次生成的标签，是否确认继续？</span>
+    </div>`, '提示', {
       confirmButtonText: t('ts.确 认'),
-      cancelButtonText: t('ts.取 消')
+      cancelButtonText: t('ts.取 消'),
+      dangerouslyUseHTMLString: true
     })
       .then(() => {
         SupplierdeliverRequestMainApi.deleteOldLabels(row.masterId).then(async (res) => {