客户退货申请创建标签+供应商重新生成提示

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','6']),
-      hide: isShowMainButton(row, ['3']),
       type: 'primary',
       icon: '',
       color: '',

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) => {