修改打印单

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -5760,7 +5760,7 @@
             class="print_form"
         >
           <div v-if="form.fShipper">
-            客户名称：{{ form.fShipper | fShipperFormat(fMblnoOptions) }}
+            客户名称：{{ form.fShipper }}
           </div>
           <div v-else>客户名称：{{ form.fCorpidName }}</div>
           <div>存货地点：{{ stockName }}</div>

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -2856,7 +2856,7 @@
           class="print_form"
         >
           <div>
-            <div>业务编号：{{ form.fCustomno }}</div>
+            <div>业务编号：{{ form.fBillno }}</div>
             <div>调拨日期：{{ form.fChargedate }}</div>
           </div>
           <div>

src/views/finance/contrast/index.vue

@@ -2155,14 +2155,14 @@ export default {
         },
         {
           surface: "19",
-          label: "fSrcBillno",
+          label: "fBillno",
           name: "业务编号",
           checked: 0,
           width: 120,
         },
         {
           surface: "20",
-          label: "fInvoiceNo",
+          label: "invoiceNo",
           name: "发票号",
           checked: 0,
           width: 120,
@@ -3477,12 +3477,17 @@ export default {
         if (valid) {
           if (this.DzfeeList.length) {
             let fMblnoList = []; // 定义存储列表的提单号
+            let fBillnoList = [];
             this.DzfeeList.map(e => {
               const repeat = fMblnoList.some(item => item == e.fMblno)
+              const repeat1 = fMblnoList.some(item => item == e.fBillno)
               if (!repeat) fMblnoList.push(e.fMblno)
+              if (!repeat1) fBillnoList.push(e.fBillno)
             })
             this.queryParams.tMblno = fMblnoList.join(',');
+            this.$set(this.queryParams, 'fSrcBillno', fBillnoList.join(','));
             if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno = this.queryParams.tMblno.slice(0, 199)
+            if (this.queryParams.fSrcBillno.length > 200) this.queryParams.fSrcBillno = this.queryParams.fSrcBillno.slice(0, 199)
             // this.queryParams.fBillstatus = '4'
             let formDate = new window.FormData();
             formDate.append("tFee", JSON.stringify(this.queryParams));
@@ -4785,12 +4790,17 @@ export default {
       this.$refs["ruless"].validate((valid) => {
         if (valid) {
           let fMblnoList = []; // 定义存储列表的提单号
+          let fBillnoList = [];
           this.DzfeeList.map(e => {
             const repeat = fMblnoList.some(item => item == e.fMblno)
+            const repeat1 = fMblnoList.some(item => item == e.fBillno)
             if (!repeat) fMblnoList.push(e.fMblno)
+            if (!repeat1) fBillnoList.push(e.fBillno)
           })
           this.queryParams.tMblno = fMblnoList.join(',');
+          this.$set(this.queryParams, 'fSrcBillno', fBillnoList.join(','));
           if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno = this.queryParams.tMblno.slice(0, 199)
+          if (this.queryParams.fSrcBillno.length > 200) this.queryParams.fSrcBillno = this.queryParams.fSrcBillno.slice(0, 199)
           if (!this.queryParams.fId || this.queryParams.fId == null) {
             // this.queryParams.fBillstatus = "1";
             let formData = new window.FormData();