From 389584674ab27a002f4ec6c53e8531fb3b00afa6 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 6 Jul 2024 07:41:57 +0800
Subject: [PATCH] md

---
 .../emis/EmisBaseTools/TanexPrinterPanel.vue  | 15 +++++++++-----
 .../EmisBaseTools/TransProductCasPicker.vue   |  4 ++--
 src/views/emis/emisWaybill/waybillModify.vue  |  2 +-
 src/views/emis/emisWaybill/waybillRecord.vue  | 20 +++++++++++--------
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
index 324ab100..4655bb83 100644
--- a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
+++ b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
@@ -336,11 +336,16 @@
         })
 
         let orderSeqMap = new Map();
-        let newOrderList=printDataList.orderList.split(",");
-        for(let i=0; i<newOrderList.length; i++){
-          let billCodeItem=newOrderList[i];
-          orderSeqMap[billCodeItem]=i+1;
-        }
+        // console.log("printPreviewAdv===>",printDataList);
+
+        let j=0;
+        printDataList.forEach(item=>{
+            let billArr = item.orderList.split(",");
+            billArr.forEach(objBillCodeStr=>{
+              orderSeqMap[objBillCodeStr]=j+1;
+              j++;
+            });
+        });
 
         that.pdfList=[];
         that.showCounter=0;
diff --git a/src/views/emis/EmisBaseTools/TransProductCasPicker.vue b/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
index 8c527b55..451e78a3 100644
--- a/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
+++ b/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
@@ -50,8 +50,8 @@ export default {
       prodCode:null,
       searchVal:null,
       props: {
-        checkStrictly: true,
-        emitPath: true,
+        // checkStrictly: true,
+        // emitPath: true,
         lazy: true,
         lazyLoad: (node, resolve) => {
           const nodes = [];
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index fadf3f4e..c1787250 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -769,7 +769,7 @@ import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.
 import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 
-import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
+import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasAdvPicker.vue';
 import feeItemForm from './feeItemForm.vue';
 
 import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 9afe84b0..7e0b2c81 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -771,7 +771,11 @@ import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.
 import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 
-import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
+import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasAdvPicker.vue';
+
+// import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
+
+
 import feeItemForm from './feeItemForm.vue';
 
 import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
@@ -1150,12 +1154,12 @@ methods: {
           orderList.push(this.form.billCode);
 
            // 客户联
-          //  let customerItem ={
-          //     "tplCode":"TAN-CM-130",
-          //     "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
-          //     "orderList":orderList.toString()
-          //   }
-          //   printDataList.push(customerItem);
+           let customerItem ={
+              "tplCode":"TAN-CM-130",
+              "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
+              "orderList":orderList.toString()
+            }
+            printDataList.push(customerItem);
 
             // 主单
             let mainBillItem ={
@@ -2042,7 +2046,7 @@ methods: {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 
 .el-form-item__label {
     color: #000;