lighter 1 year ago
parent
commit
0592ff7014
2 changed files with 8 additions and 12 deletions
  1. 3 1
      src/views/examination/AdiconQuery.vue
  2. 5 11
      src/views/examination/MixLabelPrinter.vue

+ 3 - 1
src/views/examination/AdiconQuery.vue

@@ -89,14 +89,16 @@ function queryList() {
 const pdfSrc = ref('')
 function handleClickRow(row) {
   // let barcode = row.customerBarcode
+  // inquiry.barcodeType = 'CUSTOMER'
   // if (!barcode || barcode.length < 5) {
   //   barcode = row.adiconBarcode
+  //   inquiry.barcodeType = 'ADICON'
   // }
   // inquiry.barcode = barcode
   // inquiry.reportType = row.reportType
   // inquiry.key = key.value
   // getReportItems(inquiry).then(res => {
-  //   reportItems.value = res
+  //   console.log(res)
   // })
 
   inquiry.key = key.value

+ 5 - 11
src/views/examination/MixLabelPrinter.vue

@@ -118,11 +118,7 @@ const begnPrint = async () => {
       return
     }
     const label = currentLabelRange.value.prefix + labelIndex
-    await executePrint(label)
-        .then((res) => {
-        })
-        .catch((e) => {
-        })
+    await executePrint(label).then((res) => {}).catch((e) => {})
   }
 
   selectBeginLabel(labelTableName.value).then((begin) => {
@@ -159,13 +155,11 @@ const executePrint = (label) => {
             type: 'warning',
             confirmButtonText: '确定',
             cancelButtonText: '取消',
+          }).then(() => {
+            executeReprint(origin, resolve)
+          }).catch(() => {
+            reject(label)
           })
-              .then(() => {
-                executeReprint(origin, resolve)
-              })
-              .catch(() => {
-                reject(label)
-              })
         }
       }
     })