更新

public/static/payprint1.html

@@ -202,12 +202,12 @@
         <div v-if="selectPrint">
             <div v-for="(item,index) in printData1" :key="index">
                 <div class="content">
-                    <div class="part5" v-if="isShowPrintType5">
+                    <!-- <div class="part5" v-if="isShowPrintType5">
                         <div class="header1">
                             付款回执单
                         </div>
                         <img :src="printData1[index].codeUrl" class="paymentScreenshot" />
-                    </div>
+                    </div> -->
                     <div class="center" v-if="isShowPrintType3">
                         <div class="header1">{{ printData1[index].compName}}结算凭证</div>
                         <div class="line"></div>
@@ -343,9 +343,9 @@
                                 <td class="col col-bgc">卸车扣款</td>
                                 <td class="col col-bgc">质量扣款</td>
                                 <td class="col col-bgc">其他扣款</td>
-                                <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                                <!-- <td class="col col-bgc" v-if="printData.type == '潮粮'">
                                     纯重单价
-                                </td>
+                                </td> -->
                                 <td class="col col-bgc">合计应付</td>
                                 <td class="col col-bgc">购粮性质</td>
                                 <td class="col col-bgc">车牌号</td>
@@ -355,9 +355,9 @@
                                 <td class="col ">{{ printData1[index].unloadDeduction}}</td>
                                 <td class="col ">{{ printData1[index].qualityDeduction}}</td>
                                 <td class="col ">{{ printData1[index].otherDeduction}}</td>
-                                <td class="col " v-if="printData1[index].type == '潮粮'">
+                                <!-- <td class="col " v-if="printData1[index].type == '潮粮'">
                                     {{ printData1[index].solidGrainPrice}}
-                                </td>
+                                </td> -->
                                 <td class="col ">
                                     {{ printData1[index].calculationPayable}}
                                 </td>
@@ -416,9 +416,9 @@
                         <div style="height: 120px;">
 
                             <div class="title">入库检斤单</div>
-                            <div class="leftimg">
+                            <!-- <div class="leftimg">
                                 <img :src="printData1[index].weighingManagement.codeUrl" alt="">
-                            </div>
+                            </div> -->
                             <div class="number1">{{printData1[index].weighingManagement.number}}</div>
                         </div>
 
@@ -545,8 +545,11 @@
                                 {{printData1[index].bankDeposit}}{{printData1[index].bankCard}}
                             </div>
                             <!-- <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" /> -->
-                            <img :src="printData1[index].imgURl.imageUrl3" class="avatar" />
-                            <img :src="printData1[index].imgURl.imageUrl4" class="avatar" />
+                            <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl3" class="avatar" />
+                            <img v-else  class="avatar" />
+                            <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl4" class="avatar" />
+                            <img v-else  class="avatar" />
+
                         </div>
                         <!--          <div class="sfcard-content part2">
                 <div class="sfcard-title">
@@ -559,12 +562,12 @@
             </div>
         </div>
         <div class="content" v-else>
-            <div class="part5" v-if="isShowPrintType5">
+            <!-- <div class="part5" v-if="isShowPrintType5">
                 <div class="header1">
                     付款回执单
                 </div>
                 <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
-            </div>
+            </div> -->
             <div class="center part1" v-if="isShowPrintType3" :class="!selectPrint? 'simple':''">
                 <div class="header1">{{ printData.compName}}结算凭证</div>
                 <div class="line"></div>
@@ -625,7 +628,8 @@
                         <td class="col col-bgc">皮重</td>
                         <td class="col col-bgc">扣杂重</td>
                         <td class="col col-bgc">净重</td>
-                        <td class="col col-bgc">出库净重</td>
+                        <td class="col col-bgc"></td>
+                        <!-- <td class="col col-bgc">出库净重</td> -->
                         <!-- <td class="col col-bgc">纯重</td> -->
                     </tr>
                     <tr class="row">
@@ -646,7 +650,7 @@
                             {{ printData.weighingManagement.buckleMiscellaneous}}
                         </td>
                         <td class="col">{{ printData.netWeight}}</td>
-                        <td class="col">{{printData.contractManagement ? printData.contractManagement.weight : "0"}}</td>
+                        <td class="col"></td>
                         <!-- <td class="col">{{ printData.pureWeight}}</td> -->
                     </tr>
                     <tr class="row">
@@ -687,9 +691,9 @@
                         <td class="col col-bgc">卸车扣款</td>
                         <td class="col col-bgc">质量扣款</td>
                         <td class="col col-bgc">其他扣款</td>
-                        <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                        <!-- <td class="col col-bgc" v-if="printData.type == '潮粮'">
                             纯重单价
-                        </td>
+                        </td> -->
                         <td class="col col-bgc">合计应付</td>
                         <td class="col col-bgc">购粮性质</td>
                         <td class="col col-bgc">车牌号</td>
@@ -699,9 +703,9 @@
                         <td class="col ">{{ printData.unloadDeduction}}</td>
                         <td class="col ">{{ printData.qualityDeduction}}</td>
                         <td class="col ">{{ printData.otherDeduction}}</td>
-                        <td class="col " v-if="printData.type == '潮粮'">
+                        <!-- <td class="col " v-if="printData.type == '潮粮'">
                             {{ printData.solidGrainPrice}}
-                        </td>
+                        </td> -->
                         <td class="col ">{{ printData.calculationPayable}}</td>
                         <td class="col ">
                             {{ printData.qualityInspectionManagement.natureOfGrainPurchase}}
@@ -750,9 +754,9 @@
                 <div>
 
                     <div class="title">入库检斤单</div>
-                    <div class="leftimg">
+                    <!-- <div class="leftimg">
                         <img :src="tableData.codeUrl" alt="">
-                    </div>
+                    </div> -->
                     <div class="number1">{{tableData.number}}</div>
                 </div>
                 <table class="table">

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -992,10 +992,10 @@ export default {
               let customer = response
               for (let i = 0; i < response.length; i++) {
                 if (response[i].supplier) {
-                  customer = response[i].customerName + '(' + response[i].customerPhone + ')' + '-' + response[i]
+                  customer = response[i].customerName + '(' + response[i].bankCard + ')' + '-' + response[i]
                     .supplier
                 } else {
-                  customer = response[i].customerName + '(' + response[i].customerPhone + ')'
+                  customer = response[i].customerName + '(' + response[i].bankCard + ')'
                 }
                 this.customerList.push({
                   valueKey: i,

src/views/houseSelfCollect/paymentManagement.vue

@@ -1233,18 +1233,18 @@
         let _list2 = []
         if (this.printType == 1) {
           localStorage.setItem('cwprint', true)
-          if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
-            // 财务批量打印数据
-            for (let i = 0; i < this.selectPrintList.length; i++) {
-              if (this.selectPrintList[i].warehouseName.indexOf('鑫满仓') > -1) {
-                this.selectPrintList[i].compName = '黑龙江鑫满仓粮食贸易有限公司'
-                this.selectPrintList[i].taxRegistrationNo = '91230230MA1CCQ0H5R'
-              } else {
-                this.selectPrintList[i].compName = '黑龙江利润元粮食贸易有限公司'
-                this.selectPrintList[i].taxRegistrationNo = '91230230MA1C08CC6B'
-              }
-            }
-          }
+          // if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
+          //   // 财务批量打印数据
+          //   for (let i = 0; i < this.selectPrintList.length; i++) {
+          //     if (this.selectPrintList[i].warehouseName.indexOf('鑫满仓') > -1) {
+          //       this.selectPrintList[i].compName = '黑龙江鑫满仓粮食贸易有限公司'
+          //       this.selectPrintList[i].taxRegistrationNo = '91230230MA1CCQ0H5R'
+          //     } else {
+          //       this.selectPrintList[i].compName = '黑龙江利润元粮食贸易有限公司'
+          //       this.selectPrintList[i].taxRegistrationNo = '91230230MA1C08CC6B'
+          //     }
+          //   }
+          // }
           
           localStorage.setItem(
             'selectPrint_selectPrintList',