Merge branch 'deli_scp' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into deli_scp

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -55,7 +55,8 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBaseMore :showMoreLength="wsCache.get('lang')=='en-US'?2:3"
+        <ButtonBaseMore
+          :showMoreLength="wsCache.get('lang') == 'en-US' ? 2 : 3"
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />
@@ -99,7 +100,9 @@
   <!-- 详情 -->
   <Detail
     ref="detailRef"
-    :annexTable="switchCurriculumVitae?[
+    :annexTable="
+      switchCurriculumVitae
+        ? [
             annexInspectionDetail,
             {
               label: '履历表',
@@ -111,11 +114,11 @@
               hiddenDelete: false,
               fileType: ['pdf'],
               limit: 999999,
-        align: 'left',
+              align: 'left'
             }
-    ]:[
+          ]
-      annexInspectionDetail
+        : [annexInspectionDetail]
-    ]"
+    "
     :isBasic="false"
     :allSchemas="SupplierdeliverRequestMain.allSchemas"
     :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
@@ -263,14 +266,12 @@ const annexInspectionDetail = ref({
     pageSize: 10,
     currentPage: 1
   }
-  
 })
 const tableColumns = ref([
   ...SupplierdeliverRequestMain.allSchemas.tableColumns,
   ...SupplierdeliverRequestDetail.allSchemas.tableMainColumns
 ])
 
-
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -674,7 +675,9 @@ const buttonTableClick = async (val, row) => {
     tableObject.loading = true
     ElMessageBox.confirm(
       `<div>
-    <strong style="color:red;font-size:18px">${t(`ts.${'重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！'}`)}</strong>
+    <strong style="color:red;font-size:18px">${t(
+      `ts.${'重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！'}`
+    )}</strong>
     <br>
     <span>${t(`ts.${'重新生成标签会删除上次生成的标签，是否确认继续？'}`)}</span>
     </div>`,
@@ -987,9 +990,6 @@ const handleUploadQualityReport = async (row) => {
   //uploadQualityReportTableData.value = [tableFormKeys]
 }
 
-
-
-
 const submitFormUploadQualityReport = async (formType, data) => {
   delete data.number
   data.subList = uploadQualityReportTableData.value // 拼接子表数据参数
@@ -1191,25 +1191,26 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
 
-  await PackageApi.batchPrintingLablesForDL(val.map((item1) => item1.number).join(','))
+  await PackageApi.batchPrintingLablesForDL(val.map((item1) => item1.number).join(',')).then(
-    .then((res) => {
+    (res) => {
       console.log(res)
-          if (res.zzLabel) {
+      if (res.zzLabel) {
-        //制造标签
+        //制造标签
-        const src = ref(BASE_URL + '/jmreport/view/1037887334228496384?token=' + getAccessToken())
+        const src = ref(BASE_URL + '/jmreport/view/1037887334228496384?token=' + getAccessToken())
-        window.open(src.value + '&asn_number=' + res.zzLabel)
+        window.open(src.value + '&asn_number=' + res.zzLabel)
-      }
+      }
-      if (res.cgLabel) {
+      if (res.cgLabel) {
-        //采购标签
+        //采购标签
-        const src = ref(BASE_URL + '/jmreport/view/1038243804040212480?token=' + getAccessToken())
+        const src = ref(BASE_URL + '/jmreport/view/1038243804040212480?token=' + getAccessToken())
-        window.open(src.value + '&asn_number=' + res.cgLabel)
+        window.open(src.value + '&asn_number=' + res.cgLabel)
-      }
+      }
-      if (res.hsjLabel) {
+      if (res.hsjLabel) {
-        //回收件
+        //回收件
-        const src = ref(BASE_URL + '/jmreport/view/1038602906075467776?token=' + getAccessToken())
+        const src = ref(BASE_URL + '/jmreport/view/1038602906075467776?token=' + getAccessToken())
-        window.open(src.value + '&asn_number=' + res.hsjLabel)
+        window.open(src.value + '&asn_number=' + res.hsjLabel)
-      }
+      }
-    })
+    }
+  )
 }
 
 const print = async () => {