瀏覽代碼

Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

ccjgmwz 3 年之前
父節點
當前提交
824de77f45

+ 381 - 99
public/static/payprint.html

@@ -5,8 +5,6 @@
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
     <title></title>
     <style>
-      table,
-      table tr th,
       table tr td {
         border: 2px solid #333333;
         padding: 5px 0;
@@ -19,20 +17,13 @@
 
       .content {
         width: 1000px;
-        /* height: 583px; */
         margin: auto;
-        /* position: absolute; */
-        /* top: -5vh; */
-        /* bottom: 0;
-        left: 0;
-        right: 0; */
       }
 
       table {
         width: 100%;
         text-align: center;
         border-collapse: collapse;
-        border: 3px solid #333333;
       }
 
       .col-bgc {
@@ -144,65 +135,45 @@
         justify-content: space-between;
       }
 
-      .sfcard {}
+      .sfcard {
+        background: red;
+      }
 
       .sfcard-content {
-        display: flex;
+        /*        display: flex;
         align-items: center;
-        justify-content: space-evenly;
+        justify-content: space-evenly; */
       }
 
       .sfcard-content img {
-        width: 45%;
-        height: 58vh;
+        width: 100%;
+        height: 130vh;
       }
 
       .sfcard-title {
         font-size: 28px;
         text-align: center;
-        margin: 10px 0;
       }
 
-      .avatar {
-        /* margin-bottom: 120px; */
+      .center {
+        height: 145vh;
       }
 
-      .avatar:nth-of-type(2) {
-        /* margin-bottom: 140px; */
+      .part2 {
+        height: 135vh;
+        background: red;
       }
 
-      .center {
-        height: 120vh;
-      }
-     /* .onlypz-center{
+      /* .onlypz-center{
         height: 130vh;
       } */
     </style>
   </head>
   <body>
     <div id="app">
-      <div v-if='selectPrint'>
+      <div v-if="selectPrint">
         <div v-for="(item,index) in printData1" :key="index">
           <div class="content">
-            <div class="sfcard" v-if="isShowPrintType1">
-              <div class="sfcard-title">
-                {{ printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
-              </div>
-              <div class="sfcard-content">
-                <img :src="customerList1[index].imgURl.imageUrl1" class="avatar" />
-                <img :src="customerList1[index].imgURl.imageUrl2" class="avatar" />
-              </div>
-            </div>
-            <div class="bankcard" v-if="isShowPrintType2">
-              <div class="sfcard-title">
-                {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
-              </div>
-              <div class="sfcard-content">
-                <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" />
-                <img :src="customerList1[index].imgURl.imageUrl4" class="avatar" />
-              </div>
-            </div>
-
             <div class="center" v-if="isShowPrintType3">
               <div class="header1">{{ printData1[index].compName}}结算凭证</div>
               <div class="line"></div>
@@ -218,28 +189,39 @@
               <div class="header-top">
                 <div>开票日期:{{printData1[index].createDate}}</div>
                 <!-- <div>开票日期:{{new Date(yyyy,mm,dd)}}</div> -->
-                <div class="number">{{dealNo(printData1[index].paymentNo)}}</div>
+                <div class="number">
+                  {{dealNo(printData1[index].paymentNo)}}
+                </div>
               </div>
               <table class="table">
                 <tr class="row">
                   <td rowspan="4" class="col col-bgc">买方</td>
                   <td class="col col-bgc">单位名称</td>
-                  <td class="col" colspan="3">{{ printData1[index].compName}}</td>
+                  <td class="col" colspan="3">
+                    {{ printData1[index].compName}}
+                  </td>
                   <td rowspan="4" class="col col-bgc">卖方</td>
                   <td class="col col-bgc">姓名</td>
-                  <td class="col" colspan="4">{{ printData1[index].customerName}}</td>
+                  <td class="col" colspan="4">
+                    {{ printData1[index].customerName}}
+                  </td>
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">税务登记号</td>
-                  <td class="col" colspan="3">{{ printData1[index].taxRegistrationNo}}</td>
+                  <td class="col" colspan="3">
+                    {{ printData1[index].taxRegistrationNo}}
+                  </td>
                   <td class="col col-bgc">身份证号</td>
                   <td class="col" colspan="4">
-                    {{ printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                    {{
+                    printData1[index].identityAuthenticationInfo.customerNumberCard}}
                   </td>
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">业务编号</td>
-                  <td class="col" colspan="3">{{ printData1[index].paymentNo}}</td>
+                  <td class="col" colspan="3">
+                    {{ printData1[index].paymentNo}}
+                  </td>
                   <td class="col col-bgc">卡号</td>
                   <td class="col" colspan="4">
                     {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
@@ -247,7 +229,9 @@
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">收货仓库</td>
-                  <td class="col" colspan="3">{{printData1[index].warehouseName}}</td>
+                  <td class="col" colspan="3">
+                    {{printData1[index].warehouseName}}
+                  </td>
                   <td class="col col-bgc">地址</td>
                   <td class="col" colspan="4">
                     {{printData1[index].identityAuthenticationInfo.compAddress}}
@@ -272,7 +256,8 @@
                     {{ printData1[index].qualityInspectionManagement.grade}}
                   </td>
                   <td class="col">
-                    {{ printData1[index].qualityInspectionManagement.waterContent}}
+                    {{
+                    printData1[index].qualityInspectionManagement.waterContent}}
                   </td>
                   <td class="col">
                     {{ printData1[index].qualityInspectionManagement.impurity}}
@@ -280,7 +265,8 @@
                   <td class="col">{{ printData1[index].grossWeight}}</td>
                   <td class="col">{{ printData1[index].tare}}</td>
                   <td class="col">
-                    {{ printData1[index].weighingManagement.buckleMiscellaneous}}
+                    {{
+                    printData1[index].weighingManagement.buckleMiscellaneous}}
                   </td>
                   <td class="col">{{ printData1[index].netWeight}}</td>
                   <td class="col">{{ printData1[index].pureWeight}}</td>
@@ -289,7 +275,9 @@
                   <td class="col col-bgc" v-if="printData1[index].type == '潮粮'">
                     净重单价
                   </td>
-                  <td class="col col-bgc" v-if="printData1[index].type == '干粮'">单价</td>
+                  <td class="col col-bgc" v-if="printData1[index].type == '干粮'">
+                    单价
+                  </td>
                   <td class="col col-bgc">扣单价</td>
                   <td class="col col-bgc">粮款</td>
                   <td class="col col-bgc">称重补助</td>
@@ -334,18 +322,27 @@
                   <td class="col " v-if="printData1[index].type == '潮粮'">
                     {{ printData1[index].solidGrainPrice}}
                   </td>
-                  <td class="col ">{{ printData1[index].calculationPayable}}</td>
                   <td class="col ">
-                    {{ printData1[index].qualityInspectionManagement.natureOfGrainPurchase}}
+                    {{ printData1[index].calculationPayable}}
+                  </td>
+                  <td class="col ">
+                    {{
+                    printData1[index].qualityInspectionManagement.natureOfGrainPurchase}}
                   </td>
                   <td class="col ">{{ printData1[index].carNo}}</td>
-                  <td class="col " colspan="5">{{ printData1[index].remarks}}</td>
+                  <td class="col " colspan="5">
+                    {{ printData1[index].remarks}}
+                  </td>
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">实付金额</td>
-                  <td class="col " colspan="2">{{printData1[index].actualPayment}}</td>
+                  <td class="col " colspan="2">
+                    {{printData1[index].actualPayment}}
+                  </td>
                   <td class="col col-bgc" colspan="3">人民币(大写)</td>
-                  <td class="col " colspan="4">{{printData1[index].capitalize}}</td>
+                  <td class="col " colspan="4">
+                    {{printData1[index].capitalize}}
+                  </td>
                 </tr>
               </table>
 
@@ -353,12 +350,16 @@
                 <div class="bottom-row1">
                   <div>
                     质检:{{
-                      printData1[index].qualityInspectionManagement.qualityInspector}}
+                    printData1[index].qualityInspectionManagement.qualityInspector}}
                   </div>
                   <div>
-                    毛检:{{ printData1[index].weighingManagement.secretaryWeigher}}
+                    毛检:{{
+                    printData1[index].weighingManagement.secretaryWeigher}}
+                  </div>
+                  <div>
+                    皮检:{{
+                    printData1[index].weighingManagement.skinInspector}}
                   </div>
-                  <div>皮检:{{ printData1[index].weighingManagement.skinInspector}}</div>
                   <div>结算:{{ printData1[index].settlementClerk}}</div>
                   <div>付款:{{ printData1[index].cashier}}</div>
                   <div>复点:{{ }}</div>
@@ -379,29 +380,149 @@
                </div> -->
               </div>
             </div>
+            <div v-if="isShowPrintType4" class="part2">
+              <div class="title">入库检斤单</div>
+              <div class="number">{{printData1[index].weighingManagement.number}}</div>
+              <table class="table">
+                <tr class="row">
+                  <td class="col col-bgc">客户姓名</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.customer}}</td>
+                  <td class="col col-bgc">客户电话</td>
+                  <td class="col">{{printData1[index].weighingManagement.customerPhone}}</td>
+                  <td class="col col-bgc">车牌号</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.carNumber}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">收货单位</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.compName}}</td>
+                  <td class="col col-bgc">联系人</td>
+                  <td class="col">{{printData1[index].weighingManagement.person}}</td>
+                  <td class="col col-bgc">联系电话</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.personPhone}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">货名</td>
+                  <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
+                  <td class="col col-bgc">类型</td>
+                  <td class="col">{{printData1[index].weighingManagement.type}}</td>
+                  <td class="col col-bgc">容量(克/升)</td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}
+                  </td>
+                  <td class="col col-bgc">不完善粒(%)</td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.imperfectGrain:''}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">等级</td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.grade:''}}
+                  </td>
+                  <td class="col col-bgc">水分(%)</td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.waterContent:''}}
+                  </td>
+                  <td class="col col-bgc">热损伤(%)</td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.jiaorenli:''}}
+                  </td>
+                  <td class="col col-bgc">质检时间</td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.qualityDate:''}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">杂质(%)</td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.impurity:''}}
+                  </td>
+                  <td class="col col-bgc">霉变粒(%)</td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.mildewGrain:''}}
+                  </td>
+                  <td class="col col-bgc">扣杂</td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.buckleMiscellaneous:''}}
+                  </td>
+                  <td class="col " colspan="2"></td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">毛重(公斤)</td>
+                  <td class="col">{{printData1[index].weighingManagement.grossWeight}}</td>
+                  <td class="col col-bgc">皮重(公斤)</td>
+                  <td class="col">{{printData1[index].weighingManagement.tare}}</td>
+                  <td class="col col-bgc">扣重(公斤)</td>
+                  <td class="col">{{printData1[index].weighingManagement.buckleMiscellaneous}}</td>
+                  <td class="col col-bgc">净重(公斤)</td>
+                  <td class="col">{{printData1[index].weighingManagement.netWeight}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.grossDate}}</td>
+                  <td class="col col-bgc" colspan="2">皮重检斤时间</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.tareDate}}</td>
+                </tr>
+              </table>
+
+              <div class="bottom">
+                <div class="bottom-row1">
+                  <div>毛检:{{printData1[index].weighingManagement.secretaryWeigher}}</div>
+                  <div style="margin-left:60px">
+                    皮检:{{printData1[index].weighingManagement.skinInspector}}
+                  </div>
+                  <!-- <div>{{tableData.qualityDate}}</div> -->
+                </div>
+                <div class="bottom-row2">
+                  <!-- <div class="left">
+                    <img src="../img/add.png" alt="">
+                  </div> -->
+                  <div class="config">收货单位签名或盖章:</div>
+                  <div class="autograph">客户签名:</div>
+                </div>
+                <!-- <div class="bottom-row3">扫一扫</div> -->
+              </div>
+            </div>
+
+            <div class="part1" v-if="isShowPrintType1">
+              <div class="sfcard-content">
+                <div class="sfcard-title">
+                  {{
+                  printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl1" class="avatar" />
+              </div>
+              <div class="sfcard-content">
+                <div class="sfcard-title">
+                  {{
+                  printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl2" class="avatar" />
+              </div>
+            </div>
+            <div class="bankcard" v-if="isShowPrintType2">
+
+              <div class="sfcard-content part2">
+                <div class="sfcard-title">
+                  {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" />
+              </div>
+              <div class="sfcard-content part2">
+                <div class="sfcard-title">
+                  {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl4" class="avatar" />
+              </div>
+            </div>
+
+
           </div>
         </div>
       </div>
 
       <div class="content" v-else>
-        <div class="sfcard" v-if="isShowPrintType1">
-          <div class="sfcard-title">
-            {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}}</div>
-          <div class="sfcard-content">
-            <img :src="imageUrl1" class="avatar" />
-            <img :src="imageUrl2" class="avatar" />
-          </div>
-        </div>
-        <div class="bankcard" v-if="isShowPrintType2">
-          <div class="sfcard-title">
-            {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</div>
-          <div class="sfcard-content">
-            <img :src="imageUrl3" class="avatar" />
-            <img :src="imageUrl4" class="avatar" />
-          </div>
-        </div>
-
-        <div class="center" v-if="isShowPrintType3">
+        <div class="center part1" v-if="isShowPrintType3">
           <div class="header1">{{ printData.compName}}结算凭证</div>
           <div class="line"></div>
           <div class="line"></div>
@@ -546,7 +667,6 @@
               <td class="col " colspan="4">{{printData.capitalize}}</td>
             </tr>
           </table>
-
           <div class="bottom">
             <div class="bottom-row1">
               <div>
@@ -577,7 +697,145 @@
            </div> -->
           </div>
         </div>
+
+        <div v-if="isShowPrintType4" class="part2">
+          <div class="title">入库检斤单</div>
+          <div class="number">{{tableData.number}}</div>
+          <table class="table">
+            <tr class="row">
+              <td class="col col-bgc">客户姓名</td>
+              <td class="col" colspan="2">{{tableData.customer}}</td>
+              <td class="col col-bgc">客户电话</td>
+              <td class="col">{{tableData.customerPhone}}</td>
+              <td class="col col-bgc">车牌号</td>
+              <td class="col" colspan="2">{{tableData.carNumber}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">收货单位</td>
+              <td class="col" colspan="2">{{tableData.compName}}</td>
+              <td class="col col-bgc">联系人</td>
+              <td class="col">{{tableData.person}}</td>
+              <td class="col col-bgc">联系电话</td>
+              <td class="col" colspan="2">{{tableData.personPhone}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">货名</td>
+              <td class="col">{{tableData.goodsName}}</td>
+              <td class="col col-bgc">类型</td>
+              <td class="col">{{tableData.type}}</td>
+              <td class="col col-bgc">容量(克/升)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
+              </td>
+              <td class="col col-bgc">不完善粒(%)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">等级</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.grade:''}}
+              </td>
+              <td class="col col-bgc">水分(%)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.waterContent:''}}
+              </td>
+              <td class="col col-bgc">热损伤(%)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.jiaorenli:''}}
+              </td>
+              <td class="col col-bgc">质检时间</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.qualityDate:''}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">杂质(%)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.impurity:''}}
+              </td>
+              <td class="col col-bgc">霉变粒(%)</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.mildewGrain:''}}
+              </td>
+              <td class="col col-bgc">扣杂</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.buckleMiscellaneous:''}}
+              </td>
+              <td class="col " colspan="2"></td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">毛重(公斤)</td>
+              <td class="col">{{tableData.grossWeight}}</td>
+              <td class="col col-bgc">皮重(公斤)</td>
+              <td class="col">{{tableData.tare}}</td>
+              <td class="col col-bgc">扣重(公斤)</td>
+              <td class="col">{{tableData.buckleMiscellaneous}}</td>
+              <td class="col col-bgc">净重(公斤)</td>
+              <td class="col">{{tableData.netWeight}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+              <td class="col" colspan="2">{{tableData.grossDate}}</td>
+              <td class="col col-bgc" colspan="2">皮重检斤时间</td>
+              <td class="col" colspan="2">{{tableData.tareDate}}</td>
+            </tr>
+          </table>
+
+          <div class="bottom">
+            <div class="bottom-row1">
+              <div>毛检:{{tableData.secretaryWeigher}}</div>
+              <div style="margin-left:60px">
+                皮检:{{tableData.skinInspector}}
+              </div>
+              <!-- <div>{{tableData.qualityDate}}</div> -->
+            </div>
+            <div class="bottom-row2">
+              <!-- <div class="left">
+                <img src="../img/add.png" alt="">
+              </div> -->
+              <div class="config">收货单位签名或盖章:</div>
+              <div class="autograph">客户签名:</div>
+            </div>
+            <!-- <div class="bottom-row3">扫一扫</div> -->
+          </div>
+        </div>
+
+        <div class="sfcard part3" v-if="isShowPrintType1">
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{ printData.customerName}}{{
+              printData.identityAuthenticationInfo.customerNumberCard}}
+            </div>
+            <img :src="imageUrl1" class="avatar" />
+          </div>
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{ printData.customerName}}{{
+              printData.identityAuthenticationInfo.customerNumberCard}}
+            </div>
+            <img :src="imageUrl2" class="avatar" />
+          </div>
+        </div>
+
+        <div class="bankcard part4" v-if="isShowPrintType2">
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
+            </div>
+            <img :src="imageUrl3" class="avatar" />
+          </div>
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
+            </div>
+            <img :src="imageUrl4" class="avatar" />
+          </div>
+
+        </div>
       </div>
+
       <div class="small-content" v-if="smallContent">
         <div class="small-title">
           <div>
@@ -782,7 +1040,8 @@
         identity: [],
         bank: [],
         selectPrint: false,
-        onlyShowPz:false,
+        onlyShowPz: false,
+        tableData: []
       },
       computed: {},
       methods: {
@@ -818,14 +1077,30 @@
         this.date = new Date().toLocaleString()
         let _data = decodeURIComponent(this.getQueryVariable('dataList'))
         if (!_data) {
-          this.selectPrint = true;
-          this.printData1 = JSON.parse(localStorage.getItem('selectPrint_selectPrintList'))
+          this.selectPrint = true
+          this.printData1 = JSON.parse(
+            localStorage.getItem('selectPrint_selectPrintList')
+          )
+          for (let i = 0; i < this.printData1.length; i++) {
+            if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 28) {
+              this.printData1[i].identityAuthenticationInfo.compAddress = this.printData1[i]
+                .identityAuthenticationInfo
+                .compAddress.substring(0, 28)
+            }
+          }
         } else {
           this.printData = JSON.parse(_data)
-          this.selectPrint = false;
+          //地址过长截取
+          if (this.printData.identityAuthenticationInfo.compAddress.length > 28) {
+            this.printData.identityAuthenticationInfo.compAddress = this.printData.identityAuthenticationInfo
+              .compAddress.substring(0, 28)
+          }
+          this.selectPrint = false
         }
         let _type = decodeURIComponent(this.getQueryVariable('type'))
-        this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
+        this.showType = decodeURIComponent(
+          this.getQueryVariable('printTypeList')
+        )
         // this.pzList = this.showType.split(',')
         // if((this.showType.indexOf('打印结算凭证')>-1)&&this.pzList.length==1){
         //   this.onlyShowPz = true
@@ -833,13 +1108,15 @@
         // this.pageType = decodeURIComponent(this.getQueryVariable('printTypeList'))
         let _data1 = decodeURIComponent(this.getQueryVariable('customerList'))
         if (!_data1) {
-          this.customerList1 = JSON.parse(localStorage.getItem('selectPrint_selectCustomerList'))
+          this.customerList1 = JSON.parse(
+            localStorage.getItem('selectPrint_selectCustomerList')
+          )
         } else {
           this.customerList = JSON.parse(_data1)
         }
         console.log('cwprint', localStorage.getItem('cwprint'))
         var cwprint = localStorage.getItem('cwprint')
-        if (cwprint == "true") {
+        if (cwprint == 'true') {
           if (this.selectPrint) {
             for (let i = 0; i < this.customerList1.length; i++) {
               let _url1 = this.customerList1[i].cardAddressUrl.split(',')
@@ -851,16 +1128,20 @@
                 imageUrl4: _url2[0]
               }
             }
-
           } else {
-            this.identity = this.customerList.cardAddressUrl.split(',')
-            this.bank = this.customerList.payeeAddressUrl.split(',')
-            this.imageUrl1 = this.identity[0]
-            this.imageUrl2 = this.identity[1]
-            this.imageUrl3 = this.bank[0]
-            this.imageUrl4 = this.bank[1]
-          }
+            if (this.customerList.cardAddressUrl) {
+              this.identity = this.customerList.cardAddressUrl.split(',')
+              this.imageUrl1 = this.identity[0]
+              this.imageUrl2 = this.identity[1]
+            }
+            if (this.customerList.payeeAddressUrl) {
+              this.bank = this.customerList.payeeAddressUrl.split(',')
 
+              this.imageUrl3 = this.bank[0]
+              this.imageUrl4 = this.bank[1]
+            }
+            this.tableData = this.printData.weighingManagement
+          }
           let _lsit = this.showType.split(',')
           for (let i = 0; i < _lsit.length; i++) {
             switch (_lsit[i]) {
@@ -872,7 +1153,8 @@
                 break
               case '打印结算凭证':
                 this.isShowPrintType3 = !this.isShowPrintType3
-              case '打印发票':
+                break
+              case '打印检斤单':
                 this.isShowPrintType4 = !this.isShowPrintType4
                 break
             }
@@ -887,11 +1169,11 @@
           this.smallContent = true
           this.bigContent = false
         }
-        if(this.printData.compName==undefined) this.printData.compName=''
+        if (this.printData.compName == undefined) this.printData.compName = ''
         document.title = this.printData.compName + '结算凭证'
         window.print()
-          // sessionStorage.removeItem('selectPrint_selectPrintList');
-          // sessionStorage.removeItem('selectPrint_selectCustomerList');
+        // sessionStorage.removeItem('selectPrint_selectPrintList');
+        // sessionStorage.removeItem('selectPrint_selectCustomerList');
         window.onafterprint = function(event) {
           window.history.back(-1)
         }

+ 0 - 1
src/layout/index/top/index.vue

@@ -395,7 +395,6 @@ export default {
         localStorage.removeItem('ws-pf_organMonetaryValue')
         localStorage.removeItem('ws-pf_vessels')
         localStorage.removeItem('ws-pf_isLandBasedFlag')
-        debugger
         await this.$store.dispatch('user/logout')
         this.$router.push(
           process.env.VUE_APP_PACKAGE_ENV === 'ship' ? '/ship_login' : '/login'

+ 2 - 0
src/main.js

@@ -26,6 +26,8 @@ import $ from 'jquery'
 import Warehouse from './common.js'
 Vue.prototype.WAREHOUSE = Warehouse.houseName
 Vue.prototype.common = Warehouse
+import axios from "axios";
+Vue.prototype.$axios = axios;
 // 初始化vue-amap
 // AMap.initAMapApiLoader({
 //   // 高德key

+ 6 - 4
src/views/houseSelfCollect/inspectInfo.vue

@@ -99,11 +99,11 @@
                 maxlength="10" size="small" :disabled="disabled2" />
             </ws-form-item>
             <el-row>
-              <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检'">
-                <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" />
+              <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检' || statusShow == '已复检'">
+                <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-if="statusShow != '已复检'" />
+                <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-else disabled />
               </ws-form-item>
             </el-row>
-
           </ws-info-table>
 
           <div class="title">质检数据</div>
@@ -231,6 +231,7 @@
         num: 0,
         tipFlag: true,
         allowEdit: 0,
+        statusShow :""
       }
     },
     activated() {
@@ -256,11 +257,13 @@
       this.warehouseName = this.$route.query.warehouseName
       this.cangNo = this.$route.query.warehouseNo
       this.count = Number(this.$route.query.count) + 1
+      this.statusShow = this.$route.query.status
       // this.purchasePriceList = this.$route.query.purchasePriceList
       this.id = this.$route.query.id
       if (this.types == 2) {
         this.disabled = true
         this.disabled1 = true
+        this.disabled2 = true
         this.disabledName = true
         this.information = '查看质检'
       } else if (this.types == 3) {
@@ -298,7 +301,6 @@
               postCheck({id:this.id,flag:2})
                 .toPromise()
                 .then((response) => {
-                  debugger
                   if(response == "OK"){
                       this.$message.success('提交成功')
                         this.$router.push({path: 'inspectionManagement' })

+ 2 - 1
src/views/houseSelfCollect/inspectionManagement.vue

@@ -209,7 +209,8 @@
 						warehouseName: this.warehouseName,
 						count: this.warehouseCount,
 						warehouseNo: this.warehouseNo,
-						allowEdit:this.allowEdit
+						allowEdit:this.allowEdit,
+						status:row.status
 					},
 				})
 			},

+ 1164 - 1348
src/views/houseSelfCollect/paymentManagement.vue

@@ -7,24 +7,11 @@
         <div class="print-type-title">打印凭证</div>
         <div class="print-type-checkbox">
           <el-checkbox-group v-model="ruleForm.type">
-            <el-checkbox
-              label="打印身份证(正反面)"
-              name="type"
-              class="label-width"
-              @change="selectType"
-            ></el-checkbox>
-            <el-checkbox
-              label="打印银行卡(正反面)"
-              name="type"
-              class="label-width"
-              @change="selectType"
-            ></el-checkbox>
-            <el-checkbox
-              label="打印结算凭证"
-              name="type"
-              class="label-width"
-              @change="selectType($event)"
-            ></el-checkbox>
+            <el-checkbox label="打印身份证(正反面)" name="type" class="label-width" @change="selectType"></el-checkbox>
+            <el-checkbox label="打印银行卡(正反面)" name="type" class="label-width" @change="selectType"></el-checkbox>
+            <el-checkbox label="打印结算凭证" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
+            <el-checkbox label="打印检斤单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
+            <el-checkbox label="打印付款单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
             <!-- <el-checkbox label="打印发票" name="type" class="label-width" @change="selectType($event)"></el-checkbox> -->
           </el-checkbox-group>
         </div>
@@ -39,74 +26,32 @@
         <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button>-->
-        <ws-button :type="searchType == '' ? 'primary' : ''" @click="screen(-1)"
-          >全部</ws-button
-        >
-        <ws-button :type="searchType == 1 ? 'primary' : ''" @click="screen(1)"
-          >待审核</ws-button
-        >
+        <ws-button :type="searchType == '' ? 'primary' : ''" @click="screen(-1)">全部</ws-button>
+        <ws-button :type="searchType == 1 ? 'primary' : ''" @click="screen(1)">待审核</ws-button>
         <div v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">
-          <ws-button :type="searchType == 7 ? 'primary' : ''" @click="screen(7)"
-            >待付款</ws-button
-          >
+          <ws-button :type="searchType == 7 ? 'primary' : ''" @click="screen(7)">待付款</ws-button>
         </div>
-        <ws-button
-          :type="searchType == 2 ? 'primary' : ''"
-          @click="screen(2)"
-          v-hasPermission="`acquisitionManagement.acquisitionPay.add`"
-          >待结算</ws-button
-        >
-        <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)"
-          >未开票</ws-button
-        >
+        <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)"
+          v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
+        <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button>
       </template>
       <template slot="right">
-        <el-select
-          class="warehouse_select"
-          v-model="warehouseNameKey"
-          placeholder="请选择仓库"
-          @change="warehouseChange"
-          style="margin: 0 10px"
-        >
-          <el-option
-            v-for="item in warehouseList"
-            :key="item.id"
-            :label="item.warehouseName"
-            :value="item.id"
-          >
+        <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
+          style="margin: 0 10px">
+          <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
           </el-option>
         </el-select>
-        <el-date-picker
-          style="margin: 0 10px 0 0"
-          value-format="yyyy-MM-dd"
-          v-model="value2"
-          @change="datechange"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="结算时间起"
-          end-placeholder="结算时间止"
-        >
+        <el-date-picker style="margin: 0 10px 0 0" value-format="yyyy-MM-dd" v-model="value2" @change="datechange"
+          type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="结算时间起"
+          end-placeholder="结算时间止">
         </el-date-picker>
         <div></div>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按编号、客户名、车牌号查找"
-          clearable
-          maxlength="500"
-          type="input"
-        >
+        <ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
         </ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()">
-          <img
-            width="16"
-            height="16"
-            style="vertical-align: text-top; position: relative; top: 0px"
-            src="../../../public/img/sousuo.png"
-            alt
-          />
+          <img width="16" height="16" style="vertical-align: text-top; position: relative; top: 0px"
+            src="../../../public/img/sousuo.png" alt />
         </ws-button>
       </template>
     </BaseHeaderLayout>
@@ -118,163 +63,56 @@
 
         <ws-button type="primary" @click="reject">驳回</ws-button>
         <ws-button type="primary" @click="adopt">通过</ws-button>
-        <ws-button
-          type="primary"
-          @click="invoicingClick"
-          v-hasPermission="`acquisitionManagement.acquisitionPay.finace`"
-          >开票</ws-button
-        >
-        <ws-button
-          type="primary"
-          @click="exportlist"
-          v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
-          >导出
+        <ws-button type="primary" @click="invoicingClick"
+          v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
+        <ws-button type="primary" @click="exportlist" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">导出
         </ws-button>
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
-        <ws-button
-          type="primary"
-          @click="payment"
-          v-hasPermission="`acquisitionManagement.acquisitionPay.pay`"
-          >付款
+        <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款
         </ws-button>
         <!-- v-hasPermission="`acquisitionManagement.acquisitionPay.finace`" -->
-        <ws-button type="primary" @click="selectPrint(1)"
-          >财务批量打印
+        <ws-button type="primary" @click="selectPrint(1)" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">财务批量打印
         </ws-button>
       </template>
       <template slot="right"> </template>
     </BaseHeaderLayout>
-    <el-table
-      :data="paymentList"
-      ref="table"
-      style="width: 100%; margin-top: 20px"
-      border
-      height="600"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      :summary-method="getSummaries"
-      show-summary
-    >
-      <el-table-column
-        :selectable="selectInit"
-        type="selection"
-        width="30"
-      ></el-table-column>
+    <el-table :data="paymentList" ref="table" style="width: 100%; margin-top: 20px" border height="600"
+      @row-click="handleRowClick" @selection-change="handleSelectionChange" :summary-method="getSummaries" show-summary>
+      <el-table-column :selectable="selectInit" type="selection" width="30"></el-table-column>
       <el-table-column type="index" label="序号" width="50">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="paymentNo"
-        width="90"
-        label="编号"
-        sortable
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="customerName"
-        label="客户"
-        sortable
-      >
+      <el-table-column class="table_td" prop="paymentNo" width="90" label="编号" sortable></el-table-column>
+      <el-table-column class="table_td" prop="customerName" label="客户" sortable>
         <template slot-scope="scope">
           <div @click.stop="customer(scope.row)">
             <span class="text_css">{{ scope.row.customerName }}</span>
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="carNo"
-        label="车牌号"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="goodsName"
-        width="60"
-        label="货名"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="type"
-        width="60"
-        label="类型"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="tidalGrainPrice"
-        width="140"
-        label="净重单价(元/公斤)"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="unitDeduction"
-        width="130"
-        label="扣单价(元/公斤)"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="solidGrainPrice"
-        width="140"
-        label="纯重单价(元/公斤)"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="netWeight"
-        width="100"
-        label="净重(公斤)"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="pureWeight"
-        width="100"
-        label="纯重(公斤)"
-      ></el-table-column>
-       <el-table-column
-        class="table_td"
-        prop="bulkDensity"
-        width="60"
-        label="容重"
-      ></el-table-column>
-       <el-table-column
-        class="table_td"
-        prop="waterContent"
-        width="60"
-        label="水分"
-      ></el-table-column>
-       <el-table-column
-        class="table_td"
-        prop="mildewGrain"
-        width="50"
-        label="霉变"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="amountIngPayable"
-        width="80"
-        label="应付款(元)"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="amountEdPayable"
-        width="80"
-        label="已付款(元)"
-      >
+      <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
+      <el-table-column class="table_td" prop="goodsName" width="60" label="货名"></el-table-column>
+      <el-table-column class="table_td" prop="type" width="60" label="类型"></el-table-column>
+      <el-table-column class="table_td" prop="tidalGrainPrice" width="140" label="净重单价(元/公斤)"></el-table-column>
+      <el-table-column class="table_td" prop="unitDeduction" width="130" label="扣单价(元/公斤)"></el-table-column>
+      <el-table-column class="table_td" prop="solidGrainPrice" width="140" label="纯重单价(元/公斤)"></el-table-column>
+      <el-table-column class="table_td" prop="netWeight" width="100" label="净重(公斤)"></el-table-column>
+      <el-table-column class="table_td" prop="pureWeight" width="100" label="纯重(公斤)"></el-table-column>
+      <el-table-column class="table_td" prop="bulkDensity" width="60" label="容重"></el-table-column>
+      <el-table-column class="table_td" prop="waterContent" width="60" label="水分"></el-table-column>
+      <el-table-column class="table_td" prop="mildewGrain" width="50" label="霉变"></el-table-column>
+      <el-table-column class="table_td" prop="amountIngPayable" width="80" label="应付款(元)"></el-table-column>
+      <el-table-column class="table_td" prop="amountEdPayable" width="80" label="已付款(元)">
         <template slot-scope="scope">
           <div @click="showPayImg(scope.row)">
             {{ scope.row.amountEdPayable }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="updateDate"
-        label="更新时间"
-        width="150"
-        sortable
-      ></el-table-column>
+      <el-table-column class="table_td" prop="updateDate" label="更新时间" width="150" sortable></el-table-column>
       <el-table-column class="table_td" prop="status" width="80" label="状态">
         <template scope="scope">
           <span v-if="scope.row.approveStatus">{{
@@ -283,79 +121,44 @@
           <span v-else>{{ scope.row.status }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="status"
-        width="80"
-        label="是否开票"
-      >
+      <el-table-column class="table_td" prop="status" width="80" label="是否开票">
         <template scope="scope">
           <span v-if="scope.row.invoicing == '0'">未开票</span>
           <span v-else>已开票</span>
         </template>
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="collectionEdPayable"
-        label="操作"
-        width="300"
-      >
+      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="300">
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
-            <el-button
-              v-if="
+            <el-button v-if="
                 (!scope.row.approveStatus ||
                   scope.row.approveStatus == '待结算') &&
                 (scope.row.status == '待结算' || scope.row.status == '已驳回' )
-              "
-              @click="settlement(1, scope.row)"
-              >结算</el-button
-            >
+              " @click="settlement(1, scope.row)">结算</el-button>
           </span>
-          <el-button
-            @click="settlement(2, scope.row)"
-            v-hasPermission="`acquisitionManagement.acquisitionPay.view`"
-            >查看</el-button
-          >
-          <el-button
-            v-if="
+          <el-button @click="settlement(2, scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.view`">查看
+          </el-button>
+          <el-button v-if="
               scope.row.approveStatus ||
               (scope.row.status != '待结算' && !scope.row.approveStatus)
-            "
-            @click="print(scope.row)"
-            v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
-            >打印</el-button
-          >
-          <el-button
-            v-if="
+            " @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">打印</el-button>
+          <el-button v-if="
               scope.row.approveStatus ||
               (scope.row.status != '待结算' && !scope.row.approveStatus)
-            "
-            @click="print1(scope.row)"
-            v-hasPermission="`acquisitionManagement.acquisitionPay.finace`"
-            >财务打印
+            " @click="print1(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">财务打印
+          </el-button>
+          <el-button @click="previewPayOrder(scope.row)" class="my-pre" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">预览付款单
           </el-button>
-          <el-button
-            type="danger"
-            v-if="
+          <el-button type="danger" v-if="
               (!scope.row.approveStatus ||
                 scope.row.approveStatus == '待结算') &&
               scope.row.status == '待结算'
-            "
-            @click="del(scope.row)"
-            v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
-            >删除</el-button
-          >
+            " @click="del(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.delete`">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 付款弹窗 -->
-    <el-dialog
-      width="40%"
-      :visible.sync="paymentForm"
-      :append-to-body="true"
-      title="付款"
-    >
+    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true" title="付款">
       <div class="tanchuang">
         <ws-form>
           <ws-info-table>
@@ -363,33 +166,16 @@
               {{ payments.amountNotPayable }}
             </ws-form-item>
             <ws-form-item label="本次付款金额(元)" prop="money">
-              <ws-input
-                type="number"
-                @mousewheel.native.prevent
-                v-model="payments.money"
-                placeholder="请输入本次付款金额(元)"
-                maxlength="100"
-                size="small"
-              />
+              <ws-input type="number" @mousewheel.native.prevent v-model="payments.money" placeholder="请输入本次付款金额(元)"
+                maxlength="100" size="small" />
             </ws-form-item>
             <ws-form-item label="付款日期" prop=" paymentDate">
-              <el-date-picker
-                v-model="payments.paymentDate"
-                type="date"
-                placeholder="选择日期"
-              ></el-date-picker>
+              <el-date-picker v-model="payments.paymentDate" type="date" placeholder="选择日期"></el-date-picker>
             </ws-form-item>
-            <ws-form-item
-              label="上传截图"
-              prop=" paymentScreenshot"
-            ></ws-form-item>
+            <ws-form-item label="上传截图" prop=" paymentScreenshot"></ws-form-item>
             <div class="upLoad">
-              <el-upload
-                class="avatar-uploader"
-                action="https://www.zthymaoyi.com/upload/admin"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccess"
-              >
+              <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+                :on-success="handleAvatarSuccess">
                 <img v-if="imageUrl" :src="imageUrl" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
@@ -403,12 +189,7 @@
       </div>
     </el-dialog>
     <!-- 付款截图 -->
-    <el-dialog
-      width="50%"
-      :visible.sync="showPayImgs"
-      :append-to-body="true"
-      title="付款截图"
-    >
+    <el-dialog width="50%" :visible.sync="showPayImgs" :append-to-body="true" title="付款截图">
       <div v-for="(item, index) in payImg" :key="index" class="pay_img">
         <img :src="item" alt class="img" />
       </div>
@@ -417,64 +198,32 @@
       </div>
     </el-dialog>
     <div style="text-align: center">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"
-      ></el-pagination>
-      <el-dialog
-        width="70%"
-        class="table-content"
-        center
-        :visible.sync="isShowPrint"
-        :title="printData.compName + '结算凭证'"
-      >
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"></el-pagination>
+      <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint"
+        :title="printData.compName + '结算凭证'">
         <!-- selectCustomerList:[],
         selectPrintList: [], -->
-        <paymentPrint
-          :printData="printData"
-          :customerInfo="customerList"
-          :showType="ruleForm.type"
-        ></paymentPrint>
+        <paymentPrint :printData="printData" :customerInfo="customerList" :showType="ruleForm.type"></paymentPrint>
         <div style="text-align: center">
-          <el-button type="primary" @click="isShowPrint = false"
-            >关闭</el-button
-          >
+          <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
           <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
           <el-button type="primary" @click="printBig">打印单据</el-button>
         </div>
       </el-dialog>
     </div>
     <!--客户信息-->
-    <el-dialog
-      width="50%"
-      title="客户信息"
-      :visible.sync="customerInfo"
-      :append-to-body="true"
-      :close="customerclose"
-    >
+    <el-dialog width="50%" title="客户信息" :visible.sync="customerInfo" :append-to-body="true" :close="customerclose">
       <el-form class="customer">
         <div class="flex">
           <div style="flex: 1; text-align: center">
             <h4>身份证正面</h4>
-            <img
-              width="100%"
-              :src="customerlist.cardAddressUrl1"
-              alt
-              class="img_css"
-            />
+            <img width="100%" :src="customerlist.cardAddressUrl1" alt class="img_css" />
           </div>
           <div style="flex: 1; text-align: center">
             <h4>身份证反面</h4>
-            <img
-              width="100%"
-              :src="customerlist.cardAddressUrl2"
-              alt
-              class="img_css"
-            />
+            <img width="100%" :src="customerlist.cardAddressUrl2" alt class="img_css" />
           </div>
         </div>
         <el-form-item label="姓名">
@@ -486,21 +235,11 @@
         <div class="flex">
           <div style="flex: 1; text-align: center">
             <h4>银行卡正面</h4>
-            <img
-              width="100%"
-              :src="customerlist.payeeAddressUrls[0]"
-              alt
-              class="img_css"
-            />
+            <img width="100%" :src="customerlist.payeeAddressUrls[0]" alt class="img_css" />
           </div>
           <div style="flex: 1; text-align: center">
             <h4>银行卡反面</h4>
-            <img
-              width="100%"
-              :src="customerlist.payeeAddressUrls[1]"
-              alt
-              class="img_css"
-            />
+            <img width="100%" :src="customerlist.payeeAddressUrls[1]" alt class="img_css" />
           </div>
         </div>
         <el-form-item label="银行卡号" label-width="100px">
@@ -512,18 +251,10 @@
         <el-form-item label="开户支行" label-width="100px">
           {{ customerlist.bankDepositBranch }}
         </el-form-item>
-        <el-form-item
-          label="收款人姓名"
-          label-width="100px"
-          v-if="customerlist.customerTypeFlag == '1'"
-        >
+        <el-form-item label="收款人姓名" label-width="100px" v-if="customerlist.customerTypeFlag == '1'">
           {{ customerlist.payeeName }}
         </el-form-item>
-        <el-form-item
-          label="收款人身份证号"
-          label-width="120px"
-          v-if="customerlist.customerTypeFlag == '1'"
-        >
+        <el-form-item label="收款人身份证号" label-width="120px" v-if="customerlist.customerTypeFlag == '1'">
           {{ customerlist.payeeNumberCard }}
         </el-form-item>
         <el-form-item label="手机号" label-width="100px">
@@ -537,1099 +268,1184 @@
         <el-button @click="customerclose">取 消</el-button>
       </div>
     </el-dialog>
+   <el-dialog width="50%" title="付款回执单" :visible.sync="isPreviewPayOrder" :close="paymentReceiptClose">
+     <div class="no-messege" v-if="!paymentReceipt">暂未上传付款回执单</div>  
+     <el-image
+          class="my-img"
+          ref="myImg"
+          v-if="paymentReceipt"
+          :src="paymentReceipt"
+          :preview-src-list="[paymentReceipt]">
+      </el-image>
+    </el-dialog>
+    
   </div>
 </template>
 <script>
-import { dayjs, EventBus } from 'base-core-lib'
-import { downloadFile } from '@/utils/batchDown'
-import JSZip from 'jszip'
-import FileSaver from 'file-saver'
-import {
-  getpayment,
-  selectWarehouseSelf,
-  delpayment,
-  auditpayment,
-  getpaymentexamine,
-  getCustomerLook,
-  paymentCommit,
-  getJurisdiction,
-  invoicing,
-  export1,
-} from '@/model/houseSelfCollect/index'
-import { posthandle } from '@/model/purchasingManagement/index'
-import paymentPrint from './component/paymentPrint.vue'
-import { getHp } from '@/utils/getHasPermission'
-import download from '../../components/WsDownload/download'
-export default {
-  components: {
-    paymentPrint,
-  },
-  watch: {},
-  data() {
-    return {
-      printType: 0,
-      isShowPrintType1: true,
-      isShowPrintType2: true,
-      isShowPrintType3: true,
-      isShowPrintType4: true,
-      customerInfo: false,
-      form: {},
-      formLabelWidth: '300px',
-      invoicing: '',
-      customerlist: {
-        payeeAddressUrls: [],
-      },
-      ruleForm: {
-        type: [
-          '打印身份证(正反面)',
-          '打印银行卡(正反面)',
-          '打印结算凭证',
-          // '打印发票'
-        ],
-      },
-      row: {},
-      isShowPrintType: false,
-      customerList: {
-        customerName: '',
-        customerNumberCard: '',
-        bankCard: '',
-        bankDeposit: '',
-      },
-      selectCustomerList: [],
-      selectPrintList: [],
-      identity: [],
-      //分页
-      currentPage: 1,
-      pageSize: 10,
-      paymentList: [],
-      deptCircularPage: {},
-      deptBudgetTotal: 0,
-      paymentForm: false,
-      searchType: '',
-      searchTypeText: '',
-      searchKeyWord: '',
-      warehouseList: [],
-      warehouseNameKey: '',
-      warehouseName: '',
-      isShowPrint: false,
-      printData: {},
-      warehouse: [],
-      value1: '', //付款日期
-      modification: [],
-      userJurisdiction: true,
-      payments: {
-        amountNotPayable: 0,
-        paymentDate: '',
-      },
-      showPayImgs: false,
-      isShowAdopt: false,
-      //上传截图路径
-      imageUrl: '',
-      payImg: [],
-      rowData: {},
-      value2: [],
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-    }
-  },
-  activated() {
-    this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
-    this.getPassYearFormatDate()
-    this.getWarehouse()
-
-    // this.getList()
-  },
-  updated() {
-    this.$nextTick(() => {
-      this.$refs['table'].doLayout()
-    })
-  },
-  methods: {
-    datechange() {
-      this.getList()
+  import {
+    dayjs,
+    EventBus
+  } from 'base-core-lib'
+  import {
+    downloadFile
+  } from '@/utils/batchDown'
+  import JSZip from 'jszip'
+  import FileSaver from 'file-saver'
+  import {
+    getpayment,
+    selectWarehouseSelf,
+    delpayment,
+    auditpayment,
+    getpaymentexamine,
+    getCustomerLook,
+    paymentCommit,
+    getJurisdiction,
+    invoicing,
+    export1,
+  } from '@/model/houseSelfCollect/index'
+  import {
+    posthandle
+  } from '@/model/purchasingManagement/index'
+  import paymentPrint from './component/paymentPrint.vue'
+  import {
+    getHp
+  } from '@/utils/getHasPermission'
+  import download from '../../components/WsDownload/download'
+  export default {
+    components: {
+      paymentPrint,
     },
-    getPassYearFormatDate() {
-      var nowDate = new Date()
-      nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
-      var seperator1 = '-'
-      var year = nowDate.getFullYear()
-      var month = nowDate.getMonth() + 1
-      var strDate = nowDate.getDate()
-      if (month >= 1 && month <= 9) {
-        month = '0' + month
-      }
-      if (strDate >= 0 && strDate <= 9) {
-        strDate = '0' + strDate
+    watch: {},
+    data() {
+      return {
+        paymentReceipt:'',
+        isPreviewPayOrder:false,
+        printType: 0,
+        isShowPrintType1: true,
+        isShowPrintType2: true,
+        isShowPrintType3: true,
+        isShowPrintType4: true,
+        customerInfo: false,
+        form: {},
+        formLabelWidth: '300px',
+        invoicing: '',
+        customerlist: {
+          payeeAddressUrls: [],
+        },
+        ruleForm: {
+          type: [
+            '打印身份证(正反面)',
+            '打印银行卡(正反面)',
+            '打印结算凭证',
+            '打印检斤单',
+            '打印付款单'
+            // '打印发票'
+          ],
+        },
+        row: {},
+        isShowPrintType: false,
+        customerList: {
+          customerName: '',
+          customerNumberCard: '',
+          bankCard: '',
+          bankDeposit: '',
+        },
+        selectCustomerList: [],
+        selectPrintList: [],
+        identity: [],
+        //分页
+        currentPage: 1,
+        pageSize: 10,
+        paymentList: [],
+        deptCircularPage: {},
+        deptBudgetTotal: 0,
+        paymentForm: false,
+        searchType: '',
+        searchTypeText: '',
+        searchKeyWord: '',
+        warehouseList: [],
+        warehouseNameKey: '',
+        warehouseName: '',
+        isShowPrint: false,
+        printData: {},
+        warehouse: [],
+        value1: '', //付款日期
+        modification: [],
+        userJurisdiction: true,
+        payments: {
+          amountNotPayable: 0,
+          paymentDate: '',
+        },
+        showPayImgs: false,
+        isShowAdopt: false,
+        //上传截图路径
+        imageUrl: '',
+        payImg: [],
+        rowData: {},
+        value2: [],
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
+        },
       }
-      var formatDate = year + seperator1 + month + seperator1 + strDate
-      this.getNowFormatDate(formatDate)
     },
-    /* 获取现在时间,并接受过去时间的值 */
-    getNowFormatDate(formatDate) {
-      var date = new Date()
-      date.setTime(date.getTime() + 24 * 60 * 60 * 1000)
-      var seperator1 = '-'
-      var year = date.getFullYear()
-      var month = date.getMonth() + 1
-      var strDate = date.getDate()
-      if (month >= 1 && month <= 9) {
-        month = '0' + month
-      }
-      if (strDate >= 0 && strDate <= 9) {
-        strDate = '0' + strDate
-      }
-      var nowData = year + seperator1 + month + seperator1 + strDate
-      this.value2 = [formatDate, nowData] // 默认赋值一年时间
+    activated() {
+      this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
+      this.getPassYearFormatDate()
+      this.getWarehouse()
+
+      // this.getList()
     },
-    selectPrint() {
-      console.log('批量打印数据', this.modification)
-      this.printType = 1
-      this.isShowPrintType = true
+    updated() {
+      this.$nextTick(() => {
+        this.$refs['table'].doLayout()
+      })
     },
-    async exportlist() {
-      console.log('导出数据', this.modification)
-      let _data = {
-        paymentManagementList: this.modification,
-      }
-      const { data } = await export1(
-        _data,
-        {},
-        {
-          responseType: 'blob',
+    methods: {
+      previewPayOrder(val){debugger
+      this.paymentReceipt = val.paymentScreenshot
+      this.isPreviewPayOrder = true
+     console.log(val.paymentScreenshot)
+        
+      },
+      paymentReceiptClose(){
+      },
+      datechange() {
+        this.getList()
+      },
+      getPassYearFormatDate() {
+        var nowDate = new Date()
+        nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
+        var seperator1 = '-'
+        var year = nowDate.getFullYear()
+        var month = nowDate.getMonth() + 1
+        var strDate = nowDate.getDate()
+        if (month >= 1 && month <= 9) {
+          month = '0' + month
+        }
+        if (strDate >= 0 && strDate <= 9) {
+          strDate = '0' + strDate
+        }
+        var formatDate = year + seperator1 + month + seperator1 + strDate
+        this.getNowFormatDate(formatDate)
+      },
+      /* 获取现在时间,并接受过去时间的值 */
+      getNowFormatDate(formatDate) {
+        var date = new Date()
+        date.setTime(date.getTime() + 24 * 60 * 60 * 1000)
+        var seperator1 = '-'
+        var year = date.getFullYear()
+        var month = date.getMonth() + 1
+        var strDate = date.getDate()
+        if (month >= 1 && month <= 9) {
+          month = '0' + month
+        }
+        if (strDate >= 0 && strDate <= 9) {
+          strDate = '0' + strDate
         }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
+        var nowData = year + seperator1 + month + seperator1 + strDate
+        this.value2 = [formatDate, nowData] // 默认赋值一年时间
+      },
+      selectPrint() {
+        console.log('批量打印数据', this.modification)
+        this.printType = 1
+        this.isShowPrintType = true
+      },
+      async exportlist() {
+        console.log('导出数据', this.modification)
+        let _data = {
+          paymentManagementList: this.modification,
+        }
+        const {
+          data
+        } = await export1(
+          _data, {}, {
+            responseType: 'blob',
+          }
+        ).toPromise()
+        downloadFile({
+          res: data,
+          fileName: `${
           this.date.year + (this.date.month ? `-${this.date.month}` : '')
         }结算凭证`,
-        type: 'xls',
-      })
-    },
-    /**文件打包
-     * arrImages:文件list:[{fileUrl:文件url,renameFileName:文件名}]
-     * filename 压缩包名
-     * */
-    filesToRar(arrImages, filename) {
-      let _this = this
-      let zip = new JSZip()
-      let cache = {}
-      let promises = []
-      _this.title = '正在加载压缩文件'
-      for (let item of arrImages) {
-        const promise = _this.getImgArrayBuffer(item.fileUrl).then((data) => {
-          // 下载文件, 并存成ArrayBuffer对象(blob)
-          zip.file(item.renameFileName, data, { binary: true }) // 逐个添加文件
-          cache[item.renameFileName] = data
+          type: 'xls',
         })
-        promises.push(promise)
-      }
-      Promise.all(promises)
-        .then(() => {
-          zip.generateAsync({ type: 'blob' }).then((content) => {
-            _this.title = '正在压缩'
-            // 生成二进制流
-            FileSaver.saveAs(content, filename) // 利用file-saver保存文件 自定义文件名
-            _this.title = '压缩完成'
+      },
+      /**文件打包
+       * arrImages:文件list:[{fileUrl:文件url,renameFileName:文件名}]
+       * filename 压缩包名
+       * */
+      filesToRar(arrImages, filename) {
+        let _this = this
+        let zip = new JSZip()
+        let cache = {}
+        let promises = []
+        _this.title = '正在加载压缩文件'
+        for (let item of arrImages) {
+          const promise = _this.getImgArrayBuffer(item.fileUrl).then((data) => {
+            // 下载文件, 并存成ArrayBuffer对象(blob)
+            zip.file(item.renameFileName, data, {
+              binary: true
+            }) // 逐个添加文件
+            cache[item.renameFileName] = data
           })
-        })
-        .catch((res) => {
-          _this.$message.error('文件压缩失败')
-        })
-    },
-    //获取文件blob
-    getImgArrayBuffer(url) {
-      let _this = this
-      return new Promise((resolve, reject) => {
-        //通过请求获取文件blob格式
-        let xmlhttp = new XMLHttpRequest()
-        xmlhttp.open('GET', url, true)
-        xmlhttp.responseType = 'blob'
-        xmlhttp.onload = function () {
-          if (this.status == 200) {
-            resolve(this.response)
-          } else {
-            reject(this.status)
-          }
+          promises.push(promise)
         }
-        xmlhttp.send()
-      })
-    },
-    invoicingClick() {
-      // let data = JSON.stringify({
-      //   paymentManagementList : this.modification
-      // })
-      // //开票
-      //   invoicing(data)
-      //   .toPromise()
-      //   .then(response => {
-      //     console.log(response)
-      //   })
-
-      let data = {
-        paymentManagementList: this.modification,
-      }
-      for (let i = 0; i < this.modification.length; i++) {
-        if (
-          this.modification[i].status != '全部付款' &&
-          this.modification[i].status != '部分付款' &&
-          this.modification[i].status != '已通过'
-        ) {
-          this.$message.error('开票只能选择全部付款或部分付款或已通过!')
-          return
-        }
-      }
-      //开票
-      invoicing(data)
-        .toPromise()
-        .then((response) => {
-          if (response.length > 0) {
-            var arr = []
-            for (let i = 0; i < response.length; i++) {
-              arr.push({
-                fileUrl: response[i],
-                renameFileName: '发票' + i + '.xml',
-              })
+        Promise.all(promises)
+          .then(() => {
+            zip.generateAsync({
+              type: 'blob'
+            }).then((content) => {
+              _this.title = '正在压缩'
+              // 生成二进制流
+              FileSaver.saveAs(content, filename) // 利用file-saver保存文件 自定义文件名
+              _this.title = '压缩完成'
+            })
+          })
+          .catch((res) => {
+            _this.$message.error('文件压缩失败')
+          })
+      },
+      //获取文件blob
+      getImgArrayBuffer(url) {
+        let _this = this
+        return new Promise((resolve, reject) => {
+          //通过请求获取文件blob格式
+          let xmlhttp = new XMLHttpRequest()
+          xmlhttp.open('GET', url, true)
+          xmlhttp.responseType = 'blob'
+          xmlhttp.onload = function() {
+            if (this.status == 200) {
+              resolve(this.response)
+            } else {
+              reject(this.status)
             }
-            this.filesToRar(arr, '开票XML文件')
           }
+          xmlhttp.send()
         })
-        .catch(() => {})
-    },
-    customer(row) {
-      getCustomerLook({
-        id: row.identityId,
-        authenticationStatusKey: 7,
-      })
-        .toPromise()
-        .then((response) => {
-          this.customerInfo = true
-          this.customerlist = response
-          this.customerlist.cardAddressUrl1 =
-            this.customerlist.cardAddressUrl.split(',')[0]
-          this.customerlist.cardAddressUrl2 =
-            this.customerlist.cardAddressUrl.split(',')[1]
-          this.customerlist.payeeAddressUrls =
-            this.customerlist.payeeAddressUrl.split(',')
-        })
-    },
-    customerclose(e) {
-      //  row.textcss = false
-      this.customerInfo = false
-    },
-    //合计
-    getSummaries(param) {
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '合计'
-        } else if (
-          index === 10 ||
-          index === 11 ||index === 15 || index === 16
+      },
+      invoicingClick() {
+        // let data = JSON.stringify({
+        //   paymentManagementList : this.modification
+        // })
+        // //开票
+        //   invoicing(data)
+        //   .toPromise()
+        //   .then(response => {
+        //     console.log(response)
+        //   })
 
-        ) {
-          const values = data.map((item) => Number(item[column.property]))
-          if (!values.every((value) => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] = sums[index].toFixed(3)
-          } else {
-            sums[index] = '元'
-          }
-        } else {
-          sums[index] = '--'
+        let data = {
+          paymentManagementList: this.modification,
         }
-      })
-      // sums[6]=sums[6].toFixed(2)
-      // sums[sums.length-2]=sums[sums.length-2].toFixed(2)
-      return sums
-    },
-    selectType(val) {
-      for (let i = 0; i < this.ruleForm.type.length; i++) {
-        switch (this.ruleForm.type[i]) {
-          case '打印身份证(正反面)':
-            this.isShowPrintType1 = !this.isShowPrintType1
-            break
-          case '打印银行卡(正反面)':
-            this.isShowPrintType2 = !this.isShowPrintType2
-            break
-          case '打印结算凭证':
-            this.isShowPrintType3 = !this.isShowPrintType3
-          case '打印发票':
-            this.isShowPrintType4 = !this.isShowPrintType4
-            break
-        }
-      }
-    },
-    typePrintCannelClick() {
-      this.isShowPrintType = false
-    },
-    typePrintClick(type) {
-      // type 1批量打印 0单个打印
-      //  this.isShowPrint = true
-      this.selectCustomerList = []
-      this.selectPrintList = []
-      if (type == 1) {
-        let index1 = 0
-        let index2 = 0
         for (let i = 0; i < this.modification.length; i++) {
-          getCustomerLook({
-            id: this.modification[i].identityId,
-            authenticationStatusKey: 7,
-          })
-            .toPromise()
-            .then((response) => {
-              this.selectCustomerList.push(response)
-              index2++
-              if (
-                index1 == this.modification.length &&
-                index2 == this.modification.length
-              ) {
-                this.printData.compName = ''
-                // this.isShowPrint = true
-                this.printBig()
-              }
-              getpaymentexamine({
-                id: this.modification[i].id,
-              })
-                .toPromise()
-                .then((response) => {
-                  index1++
-                  let date = new Date()
-                  response.currentTime =
-                    date.getFullYear() +
-                    '年' +
-                    Number(date.getMonth() + 1) +
-                    '月' +
-                    date.getDate() +
-                    '日'
-                  this.selectPrintList.push(response)
-                  if (
-                    index1 == this.modification.length &&
-                    index2 == this.modification.length
-                  ) {
-                    this.printData.compName = ''
-                    // this.isShowPrint = true
-                    this.printBig()
-                  }
-                })
-            })
+          if (
+            this.modification[i].status != '全部付款' &&
+            this.modification[i].status != '部分付款' &&
+            this.modification[i].status != '已通过'
+          ) {
+            this.$message.error('开票只能选择全部付款或部分付款或已通过!')
+            return
+          }
         }
-      } else {
+        //开票
+        invoicing(data)
+          .toPromise()
+          .then((response) => {
+            if (response.length > 0) {
+              var arr = []
+              for (let i = 0; i < response.length; i++) {
+                arr.push({
+                  fileUrl: response[i],
+                  renameFileName: '发票' + i + '.xml',
+                })
+              }
+              this.filesToRar(arr, '开票XML文件')
+            }
+          })
+          .catch(() => {})
+      },
+      customer(row) {
         getCustomerLook({
-          id: this.rowData.identityId,
-          authenticationStatusKey: 7,
-        })
+            id: row.identityId,
+            authenticationStatusKey: 7,
+          })
           .toPromise()
           .then((response) => {
-            this.customerList = response
-            getpaymentexamine({
-              id: this.rowData.id,
-            })
+            this.customerInfo = true
+            this.customerlist = response
+            this.customerlist.cardAddressUrl1 =
+              this.customerlist.cardAddressUrl.split(',')[0]
+            this.customerlist.cardAddressUrl2 =
+              this.customerlist.cardAddressUrl.split(',')[1]
+            this.customerlist.payeeAddressUrls =
+              this.customerlist.payeeAddressUrl.split(',')
+          })
+      },
+      customerclose(e) {
+        //  row.textcss = false
+        this.customerInfo = false
+      },
+      //合计
+      getSummaries(param) {
+        const {
+          columns,
+          data
+        } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+          } else if (
+            index === 10 ||
+            index === 11 || index === 15 || index === 16
+
+          ) {
+            const values = data.map((item) => Number(item[column.property]))
+            if (!values.every((value) => isNaN(value))) {
+              sums[index] = values.reduce((prev, curr) => {
+                const value = Number(curr)
+                if (!isNaN(value)) {
+                  return prev + curr
+                } else {
+                  return prev
+                }
+              }, 0)
+              sums[index] = sums[index].toFixed(3)
+            } else {
+              sums[index] = '元'
+            }
+          } else {
+            sums[index] = '--'
+          }
+        })
+        // sums[6]=sums[6].toFixed(2)
+        // sums[sums.length-2]=sums[sums.length-2].toFixed(2)
+        return sums
+      },
+      selectType(val) {
+        for (let i = 0; i < this.ruleForm.type.length; i++) {
+          switch (this.ruleForm.type[i]) {
+            case '打印身份证(正反面)':
+              this.isShowPrintType1 = !this.isShowPrintType1
+              break
+            case '打印银行卡(正反面)':
+              this.isShowPrintType2 = !this.isShowPrintType2
+              break
+            case '打印结算凭证':
+              this.isShowPrintType3 = !this.isShowPrintType3
+            case '打印检斤单':
+              this.isShowPrintType4 = !this.isShowPrintType4
+              break
+          }
+        }
+      },
+      typePrintCannelClick() {
+        this.isShowPrintType = false
+      },
+      typePrintClick(type) {
+        // type 1批量打印 0单个打印
+        //  this.isShowPrint = true
+        this.selectCustomerList = []
+        this.selectPrintList = []
+        if (type == 1) {
+          let index1 = 0
+          let index2 = 0
+          for (let i = 0; i < this.modification.length; i++) {
+            getCustomerLook({
+                id: this.modification[i].identityId,
+                authenticationStatusKey: 7,
+              })
               .toPromise()
               .then((response) => {
-                this.printData = response
-                this.isShowPrint = true
-                // if(this.printData.solidGrainPrice){
-                //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
-                // }
-                let date = new Date()
-                this.printData.currentTime =
-                  date.getFullYear() +
-                  '年' +
-                  Number(date.getMonth() + 1) +
-                  '月' +
-                  date.getDate() +
-                  '日'
+                this.selectCustomerList.push(response)
+                index2++
+                if (
+                  index1 == this.modification.length &&
+                  index2 == this.modification.length
+                ) {
+                  this.printData.compName = ''
+                  // this.isShowPrint = true
+                  this.printBig()
+                }
+                getpaymentexamine({
+                    id: this.modification[i].id,
+                  })
+                  .toPromise()
+                  .then((response) => {
+                    index1++
+                    let date = new Date()
+                    response.currentTime =
+                      date.getFullYear() +
+                      '年' +
+                      Number(date.getMonth() + 1) +
+                      '月' +
+                      date.getDate() +
+                      '日'
+                    this.selectPrintList.push(response)
+                    if (
+                      index1 == this.modification.length &&
+                      index2 == this.modification.length
+                    ) {
+                      this.printData.compName = ''
+                      // this.isShowPrint = true
+                      this.printBig()
+                    }
+                  })
               })
+          }
+        } else {
+          let _url1 = process.env.VUE_APP_BASE_API + "/identityAuthenticationInfo/api/getIdentityAuthenticationInfo"
+          let _url2 = process.env.VUE_APP_BASE_API + "/paymentManagement/getInfo"
+          this.$axios.all([
+            this.$axios.get(_url1, {
+              params: {
+                id: this.rowData.identityId,
+                authenticationStatusKey: 7,
+              }
+            }).then(res => res.data),
+            this.$axios.get(_url2, {
+              params: {
+                id: this.rowData.id
+              }
+            }).then(res => res.data)
+          ]).then(
+            this.$axios.spread((val1, val2) => {
+              // val 是数组中每个接口返回的值 res.data
+              console.log('两个接口全部加载完成', val1, val2);
+              this.printData = val2.data
+              this.isShowPrint = true
+              // if(this.printData.solidGrainPrice){
+              //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
+              // }
+              let date = new Date()
+              this.printData.currentTime =
+                date.getFullYear() +
+                '年' +
+                Number(date.getMonth() + 1) +
+                '月' +
+                date.getDate() +
+                '日'
+            })
+          ).catch(err => {
+            console.log(err);
           })
-      }
-    },
-    handleRowClick(row) {
-      // if (row.status != '已驳回') {
-      //   if (
-      //     row.taskId == null &&
-      //     row.status != '已通过' &&
-      //     row.status != '部分付款'
-      //   ) {
-      //     return false
-      //   } else {
-      //     this.$refs.paymentList.toggleRowSelection(row)
-      //     return true
-      //   }
-      // } else {
-      //   this.$refs.paymentList.toggleRowSelection(row)
-      //   return true
-      // }
-      return true
-    },
-    handlepass() {
-      var that = this
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要通过的条目')
-      } else {
-        this.$confirm(`审核通过后,任务将发送给财务,是否确定通过?`, {
-          cancelButtonText: '取消',
-          confirmButtonText: '确定',
-          type: 'warning',
-        }).then(() => {
-          that.audit(this.modification[0], 0, true, 2)
-        })
-      }
-    },
-    //查看付款截图
-    showPayImg(row) {
-      if (!row.paymentScreenshot) {
-        this.$message({
-          message: '暂无付款截图!',
-          type: 'warning',
-        })
-        return
-      } else {
-        this.showPayImgs = true
-        this.payImg = row.paymentScreenshot.split('$')
-      }
-    },
-    getWarehouse() {
-      let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
-      _wareHouse = JSON.parse(_wareHouse)
-      selectWarehouseSelf({
-        compId: localStorage.getItem('ws-pf_compId'),
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseList = response
-          if (this.$route.query.warehouseName) {
-            //判断是否在任务页面进来
-            this.warehouseName = this.$route.query.warehouseName
-            this.warehouseNameKey = this.$route.query.warehouseName
-          } else {
-            if (_wareHouse) {
-              this.warehouseNameKey = _wareHouse.value
-              this.warehouseName = _wareHouse.value
+          // getCustomerLook({
+          //     id: this.rowData.identityId,
+          //     authenticationStatusKey: 7,
+          //   })
+          //   .toPromise()
+          //   .then((response) => {
+          //     this.customerList = response
+          //     getpaymentexamine({
+          //         id: this.rowData.id,
+          //       })
+          //       .toPromise()
+          //       .then((response) => {
+          //         this.printData = response
+          //         this.isShowPrint = true
+          //         // if(this.printData.solidGrainPrice){
+          //         //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
+          //         // }
+          //         let date = new Date()
+          //         this.printData.currentTime =
+          //           date.getFullYear() +
+          //           '年' +
+          //           Number(date.getMonth() + 1) +
+          //           '月' +
+          //           date.getDate() +
+          //           '日'
+          //       })
+          //   })
+        }
+      },
+      handleRowClick(row) {
+        // if (row.status != '已驳回') {
+        //   if (
+        //     row.taskId == null &&
+        //     row.status != '已通过' &&
+        //     row.status != '部分付款'
+        //   ) {
+        //     return false
+        //   } else {
+        //     this.$refs.paymentList.toggleRowSelection(row)
+        //     return true
+        //   }
+        // } else {
+        //   this.$refs.paymentList.toggleRowSelection(row)
+        //   return true
+        // }
+        return true
+      },
+      handlepass() {
+        var that = this
+        if (this.modification.length == 0) {
+          this.$message.warning('请选择要通过的条目')
+        } else {
+          this.$confirm(`审核通过后,任务将发送给财务,是否确定通过?`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          }).then(() => {
+            that.audit(this.modification[0], 0, true, 2)
+          })
+        }
+      },
+      //查看付款截图
+      showPayImg(row) {
+        if (!row.paymentScreenshot) {
+          this.$message({
+            message: '暂无付款截图!',
+            type: 'warning',
+          })
+          return
+        } else {
+          this.showPayImgs = true
+          this.payImg = row.paymentScreenshot.split('$')
+        }
+      },
+      getWarehouse() {
+        let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
+        _wareHouse = JSON.parse(_wareHouse)
+        selectWarehouseSelf({
+            compId: localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+          .then((response) => {
+            this.warehouseList = response
+            if (this.$route.query.warehouseName) {
+              //判断是否在任务页面进来
+              this.warehouseName = this.$route.query.warehouseName
+              this.warehouseNameKey = this.$route.query.warehouseName
             } else {
-              this.warehouseNameKey = this.warehouseList[0].id
-              if (this.warehouseName) {
-                this.warehouseNameKey = this.WAREHOUSE[3].payname
+              if (_wareHouse) {
+                this.warehouseNameKey = _wareHouse.value
+                this.warehouseName = _wareHouse.value
               } else {
-                this.WAREHOUSE[3].payname = this.warehouseList[0].id
-                this.warehouseName = this.warehouseList[0].warehouseName
+                this.warehouseNameKey = this.warehouseList[0].id
+                if (this.warehouseName) {
+                  this.warehouseNameKey = this.WAREHOUSE[3].payname
+                } else {
+                  this.WAREHOUSE[3].payname = this.warehouseList[0].id
+                  this.warehouseName = this.warehouseList[0].warehouseName
+                }
               }
             }
-          }
-          this.getList()
-        })
-    },
-    //上传付款截图
-    handleAvatarSuccess(e) {
-      this.imageUrl = e.url
-    },
-    printSmall() {
-      window.open(
-        '../../../../../static/payprint.html?type=1&dataList=' +
+            this.getList()
+          })
+      },
+      //上传付款截图
+      handleAvatarSuccess(e) {
+        this.imageUrl = e.url
+      },
+      printSmall() {
+        window.open(
+          '../../../../../static/payprint.html?type=1&dataList=' +
           JSON.stringify(this.printData)
-      )
-    },
-    printBig() {
-      let _list1 = []
-      let _list2 = []
-      if (this.printType == 1) {
-        localStorage.setItem('cwprint', true)
-        // 财务批量打印数据
-        localStorage.setItem(
-          'selectPrint_selectPrintList',
-          JSON.stringify(this.selectPrintList)
         )
-        localStorage.setItem(
-          'selectPrint_selectCustomerList',
-          JSON.stringify(this.selectCustomerList)
-        )
-      } else if (this.printType == 0) {
-        localStorage.setItem('cwprint', true)
-        _list1 = JSON.stringify(this.printData)
-        _list2 = JSON.stringify(this.customerList)
-      } else {
-        _list1 = JSON.stringify(this.printData)
-        _list2 = JSON.stringify(this.customerList)
-      }
-      window.open(
-        '../../../../../static/payprint.html?type=2&dataList=' +
+      },
+      printBig() {
+        let _list1 = []
+        let _list2 = []
+        if (this.printType == 1) {
+          localStorage.setItem('cwprint', true)
+          // 财务批量打印数据
+          localStorage.setItem(
+            'selectPrint_selectPrintList',
+            JSON.stringify(this.selectPrintList)
+          )
+          localStorage.setItem(
+            'selectPrint_selectCustomerList',
+            JSON.stringify(this.selectCustomerList)
+          )
+        } else if (this.printType == 0) {
+          localStorage.setItem('cwprint', true)
+          _list1 = JSON.stringify(this.printData)
+          _list2 = JSON.stringify(this.customerList)
+        } else {
+          _list1 = JSON.stringify(this.printData)
+          _list2 = JSON.stringify(this.customerList)
+        }
+        window.open(
+          '../../../../../static/payprint.html?type=2&dataList=' +
           _list1 +
           '&customerList=' +
           _list2 +
           '&printTypeList=' +
           this.ruleForm.type,
-        '结算凭证'
-      )
-    },
-    getList() {
-      this.payments = {
-        amountNotPayable: 0,
-        paymentDate: '',
-      }
-      var searchParam = ''
-      if (this.searchType != -1) {
-        searchParam = this.searchType
-      }
-      var startDate = ''
-      var endDate = ''
-      if (this.value2) {
-        startDate = this.value2[0] ? this.value2[0] : ''
-        endDate = this.value2[1] ? this.value2[1] : ''
-      }
-
-      getpayment({
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        startDate: startDate,
-        endDate: endDate,
-        searchKeyWord: this.searchKeyWord,
-        searchType: searchParam,
-        warehouseName: this.warehouseName,
-        managementType: 1,
-        invoicing: this.invoicing,
-        compId: localStorage.getItem('ws-pf_compId'),
-      })
-        .toPromise()
-        .then((response) => {
-          this.paymentList = response.records
-          this.deptBudgetTotal = response.total
-        })
-      // getJurisdiction({
-      //   managementType: 1,
-      //   warehouseName: this.warehouseName,
-      //   compId: localStorage.getItem('ws-pf_compId')
-      // })
-      //   .toPromise()
-      //   .then(response => {
-      //     this.isShowAdopt = response
-      //   })
-    },
-    del(row) {
-      this.$confirm(
-        '对应的质检和检斤记录将一并删除,是否确定删除操作?',
-        '提示',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
+          '结算凭证'
+        )
+      },
+      getList() {
+        this.payments = {
+          amountNotPayable: 0,
+          paymentDate: '',
         }
-      )
-        .then(() => {
-          delpayment({
-            id: row.id,
+        var searchParam = ''
+        if (this.searchType != -1) {
+          searchParam = this.searchType
+        }
+        var startDate = ''
+        var endDate = ''
+        if (this.value2) {
+          startDate = this.value2[0] ? this.value2[0] : ''
+          endDate = this.value2[1] ? this.value2[1] : ''
+        }
+
+        getpayment({
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            startDate: startDate,
+            endDate: endDate,
+            searchKeyWord: this.searchKeyWord,
+            searchType: searchParam,
+            warehouseName: this.warehouseName,
+            managementType: 1,
+            invoicing: this.invoicing,
+            compId: localStorage.getItem('ws-pf_compId'),
           })
-            .toPromise()
-            .then((response) => {
-              this.$message.success('删除成功')
-              this.getList()
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    screen(num) {
-      if (num == 0) {
-        this.searchType = -1
-        this.invoicing = num
-      } else {
-        this.invoicing = ''
-        this.searchType = num
-      }
-      this.currentPage=1
-      this.getList()
-    },
-    find() {
-      this.getList()
-    },
-    settlement(index, row) {
-      if (row.goodsName) {
-        localStorage.setItem('paymentManagementReturn', false)
-        this.$router.push({
-          path: 'settlement',
-          query: {
-            type: index,
-            id: row.id,
-          },
-        })
-      }
-    },
-    payment() {
-      this.imageUrl = ''
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要付款的条目')
-      } else {
-        for (let i = 0; i < this.modification.length; i++) {
-          if (this.modification[i].status != '已驳回') {
-            if (
-              this.modification[i].approveStatus == '待决策人审核' || this.modification[i].approveStatus == '待财务审核'||
-              this.modification[i].status == '全部付款'
-            ) {
-              this.$message.error(
-                '请选择状态为已通过且待结算或者部分付款的条目'
-              )
-              return false
-            } else {
+          .toPromise()
+          .then((response) => {
+            this.paymentList = response.records
+            this.deptBudgetTotal = response.total
+          })
+        // getJurisdiction({
+        //   managementType: 1,
+        //   warehouseName: this.warehouseName,
+        //   compId: localStorage.getItem('ws-pf_compId')
+        // })
+        //   .toPromise()
+        //   .then(response => {
+        //     this.isShowAdopt = response
+        //   })
+      },
+      del(row) {
+        this.$confirm(
+            '对应的质检和检斤记录将一并删除,是否确定删除操作?',
+            '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
             }
-          } else {
-            this.$message.error('状态为已驳回的条目不能付款')
+          )
+          .then(() => {
+            delpayment({
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.$message.success('删除成功')
+                this.getList()
+              })
+          })
+          .catch(() => {
             return false
+          })
+      },
+      screen(num) {
+        if (num == 0) {
+          this.searchType = -1
+          this.invoicing = num
+        } else {
+          this.invoicing = ''
+          this.searchType = num
+        }
+        this.currentPage = 1
+        this.getList()
+      },
+      find() {
+        this.getList()
+      },
+      settlement(index, row) {
+        if (row.goodsName) {
+          localStorage.setItem('paymentManagementReturn', false)
+          this.$router.push({
+            path: 'settlement',
+            query: {
+              type: index,
+              id: row.id,
+            },
+          })
+        }
+      },
+      payment() {
+        this.imageUrl = ''
+        if (this.modification.length == 0) {
+          this.$message.warning('请选择要付款的条目')
+        } else {
+          for (let i = 0; i < this.modification.length; i++) {
+            if (this.modification[i].status != '已驳回') {
+              if (
+                this.modification[i].approveStatus == '待决策人审核' || this.modification[i].approveStatus == '待财务审核' ||
+                this.modification[i].status == '全部付款'
+              ) {
+                this.$message.error(
+                  '请选择状态为已通过且待结算或者部分付款的条目'
+                )
+                return false
+              } else {}
+            } else {
+              this.$message.error('状态为已驳回的条目不能付款')
+              return false
 
+            }
           }
+          let sum = 0
+          let count = 0
+          for (let i = 0; i < this.modification.length; i++) {
+            sum += this.modification[i].amountIngPayable
+            count += this.modification[i].amountEdPayable
+          }
+          this.payments.amountNotPayable = (sum - count).toFixed(2)
+          this.paymentForm = true
         }
-        let sum = 0
-        let count = 0
-        for (let i = 0; i < this.modification.length; i++) {
-          sum += this.modification[i].amountIngPayable
-          count += this.modification[i].amountEdPayable
+      },
+      paymentSubmit() {
+        if (!this.payments.money) {
+          this.$message({
+            message: '付款金额不能为空',
+            type: 'warning',
+          })
+          return
         }
-        this.payments.amountNotPayable = (sum - count).toFixed(2)
-        this.paymentForm = true
-      }
-    },
-    paymentSubmit() {
-      if (!this.payments.money) {
-        this.$message({
-          message: '付款金额不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        Number(this.payments.money) > Number(this.payments.amountNotPayable)
-      ) {
-        this.$message({
-          message: '付款金额不能超过未付金额',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.payments.paymentDate) {
-        this.$message({
-          message: '付款日期不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.imageUrl) {
-        this.$message({
-          message: '请上传付款截图 ',
-          type: 'warning',
-        })
-        return
-      }
-      this.payments.paymentScreenshot = this.imageUrl
-      this.payments.cashier = localStorage.getItem('ws-pf_staffName')
-      this.payments.paymentManagementList = this.modification
-      this.$confirm('确定提交付款信息?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          //付款提交
-          paymentCommit(this.payments)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '付款成功',
-              })
-              this.paymentForm = false
-              this.getList()
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    reject() {
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要驳回的条目')
-      } else {
-        this.$confirm('是否确定驳回?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
+        if (
+          Number(this.payments.money) > Number(this.payments.amountNotPayable)
+        ) {
+          this.$message({
+            message: '付款金额不能超过未付金额',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.payments.paymentDate) {
+          this.$message({
+            message: '付款日期不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.imageUrl) {
+          this.$message({
+            message: '请上传付款截图 ',
+            type: 'warning',
+          })
+          return
+        }
+        this.payments.paymentScreenshot = this.imageUrl
+        this.payments.cashier = localStorage.getItem('ws-pf_staffName')
+        this.payments.paymentManagementList = this.modification
+        this.$confirm('确定提交付款信息?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
           .then(() => {
-            this.audit(this.modification[0], 0, false, '', '')
+            //付款提交
+            paymentCommit(this.payments)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '付款成功',
+                })
+                this.paymentForm = false
+                this.getList()
+              })
           })
           .catch(() => {
             return false
           })
-      }
-    },
-    audit(item, index, status, status2, reason) {
-      if (index < this.modification.length) {
-        if (status == true && item.status == '已驳回') {
-          auditpayment({
-            compId: localStorage.getItem('ws-pf_compId'),
-            id: item.id,
-          })
-            .toPromise()
-            .then((response) => {
-              this.audit(
-                this.modification[index + 1],
-                index + 1,
-                status,
-                status2,
-                reason
-              )
-            })
+      },
+      reject() {
+        if (this.modification.length == 0) {
+          this.$message.warning('请选择要驳回的条目')
         } else {
-          posthandle({
-            taskId: item.taskId,
-            approved: status,
-            auditMind: reason != undefined ? '已驳回' : '34',
-            needReapply: status2 != undefined ? true : false,
-          })
-            .toPromise()
-            .then((response) => {
-              this.audit(
-                this.modification[index + 1],
-                index + 1,
-                status,
-                status2,
-                reason
-              )
+          this.$confirm('是否确定驳回?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
             })
-            .catch((req) => {
-              this.$message.warning(req.message)
+            .then(() => {
+              this.audit(this.modification[0], 0, false, '', '')
+            })
+            .catch(() => {
+              return false
             })
         }
-      } else {
-        if (status == true) {
-          this.$message.success('通过成功')
-          this.getList()
-        } else if (status == false) {
-          this.$message.success('驳回成功')
-          this.getList()
+      },
+      audit(item, index, status, status2, reason) {
+        if (index < this.modification.length) {
+          if (status == true && item.status == '已驳回') {
+            auditpayment({
+                compId: localStorage.getItem('ws-pf_compId'),
+                id: item.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.audit(
+                  this.modification[index + 1],
+                  index + 1,
+                  status,
+                  status2,
+                  reason
+                )
+              })
+          } else {
+            posthandle({
+                taskId: item.taskId,
+                approved: status,
+                auditMind: reason != undefined ? '已驳回' : '34',
+                needReapply: status2 != undefined ? true : false,
+              })
+              .toPromise()
+              .then((response) => {
+                this.audit(
+                  this.modification[index + 1],
+                  index + 1,
+                  status,
+                  status2,
+                  reason
+                )
+              })
+              .catch((req) => {
+                this.$message.warning(req.message)
+              })
+          }
+        } else {
+          if (status == true) {
+            this.$message.success('通过成功')
+            this.getList()
+          } else if (status == false) {
+            this.$message.success('驳回成功')
+            this.getList()
+          }
         }
-      }
-    },
-    adopt() {
-      var that = this
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要通过的条目')
-      } else {
-        this.$confirm('是否确定通过?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {
-            this.audit(this.modification[0], 0, true)
-          })
-          .catch(() => {
-            return false
+      },
+      adopt() {
+        var that = this
+        if (this.modification.length == 0) {
+          this.$message.warning('请选择要通过的条目')
+        } else {
+          this.$confirm('是否确定通过?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            })
+            .then(() => {
+              this.audit(this.modification[0], 0, true)
+            })
+            .catch(() => {
+              return false
+            })
+        }
+      },
+      print1(row) {
+        this.printType = 0
+        this.isShowPrintType = true
+        this.rowData = row
+        localStorage.setItem('cwprint', true)
+      },
+      print(row) {
+        this.printType = 2
+        localStorage.setItem('cwprint', false)
+        getpaymentexamine({
+            id: row.id,
           })
-      }
-    },
-    print1(row) {
-      this.printType = 0
-      this.isShowPrintType = true
-      this.rowData = row
-      localStorage.setItem('cwprint', true)
-    },
-    print(row) {
-      this.printType = 2
-      localStorage.setItem('cwprint', false)
-      getpaymentexamine({
-        id: row.id,
-      })
-        .toPromise()
-        .then((response) => {
-          this.printData = response
-          this.isShowPrint = true
-          // if(this.printData.solidGrainPrice){
-          //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
-          // }
-          let date = new Date()
-          this.printData.currentTime =
-            date.getFullYear() +
-            '年' +
-            Number(date.getMonth() + 1) +
-            '月' +
-            date.getDate() +
-            '日'
-        })
-    },
-    examine() {
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要审核的条目')
-      } else {
-        this.$confirm('审核通过后,任务将发送给财务,是否确定通过?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {})
-          .catch(() => {
-            return false
+          .toPromise()
+          .then((response) => {
+            this.printData = response
+            this.isShowPrint = true
+            // if(this.printData.solidGrainPrice){
+            //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
+            // }
+            let date = new Date()
+            this.printData.currentTime =
+              date.getFullYear() +
+              '年' +
+              Number(date.getMonth() + 1) +
+              '月' +
+              date.getDate() +
+              '日'
           })
-      }
-    },
-    selectInit(row) {
-      //在这里一定要记得类型匹配的上。
-      // if (row.status != '已驳回') {
-      //   if (
-      //     row.taskId == null &&
-      //     row.status != '已通过' &&
-      //     row.status != '部分付款'
-      //   ) {
-      //     return false
-      //   } else {
-      //     return true
-      //   }
-      // } else {
-      //   return true
-      // }
-      return true
-    },
-    handleSelectionChange(val) {
-      this.modification = val
-    },
-    warehouseChange(e) {
-      for (let i = 0; i < this.warehouseList.length; i++) {
-        if (this.warehouseList[i].id == this.warehouseNameKey) {
-          this.warehouseName = this.warehouseList[i].warehouseName
-          localStorage.setItem( 'houseSelfCollect_house1',
-            JSON.stringify({
-              value: this.warehouseList[i].warehouseName,
-              warehouseId: this.warehouseList[i].id,
-              allowEdit: this.warehouseList[i].allowEdit,
-              monitorUrl1: this.warehouseList[i].monitorUrl1,
-              monitorUrl2: this.warehouseList[i].monitorUrl2,
-              warehouseNo: this.warehouseList[i].commonWarehouseNo,
+      },
+      examine() {
+        if (this.modification.length == 0) {
+          this.$message.warning('请选择要审核的条目')
+        } else {
+          this.$confirm('审核通过后,任务将发送给财务,是否确定通过?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            })
+            .then(() => {})
+            .catch(() => {
+              return false
             })
-          )
-          this.WAREHOUSE[3].payname = this.warehouseList[i].id
         }
-      }
-      this.getList()
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
+      },
+      selectInit(row) {
+        //在这里一定要记得类型匹配的上。
+        // if (row.status != '已驳回') {
+        //   if (
+        //     row.taskId == null &&
+        //     row.status != '已通过' &&
+        //     row.status != '部分付款'
+        //   ) {
+        //     return false
+        //   } else {
+        //     return true
+        //   }
+        // } else {
+        //   return true
+        // }
+        return true
+      },
+      handleSelectionChange(val) {
+        this.modification = val
+      },
+      warehouseChange(e) {
+        for (let i = 0; i < this.warehouseList.length; i++) {
+          if (this.warehouseList[i].id == this.warehouseNameKey) {
+            this.warehouseName = this.warehouseList[i].warehouseName
+            localStorage.setItem('houseSelfCollect_house1',
+              JSON.stringify({
+                value: this.warehouseList[i].warehouseName,
+                warehouseId: this.warehouseList[i].id,
+                allowEdit: this.warehouseList[i].allowEdit,
+                monitorUrl1: this.warehouseList[i].monitorUrl1,
+                monitorUrl2: this.warehouseList[i].monitorUrl2,
+                warehouseNo: this.warehouseList[i].commonWarehouseNo,
+              })
+            )
+            this.WAREHOUSE[3].payname = this.warehouseList[i].id
+          }
+        }
+        this.getList()
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.ws-info-table {
-  border: none;
-}
+  .ws-info-table {
+    border: none;
+  }
 
-.ws-info-table .el-form-item {
-  width: 50%;
-  border: none;
-}
+  .ws-info-table .el-form-item {
+    width: 50%;
+    border: none;
+  }
 
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
-  min-width: 125px;
-  text-align: center;
-  background: #ffffff;
-  color: #8890b1;
-}
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 30%;
+    min-width: 125px;
+    text-align: center;
+    background: #ffffff;
+    color: #8890b1;
+  }
 
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
 
-/deep/.el-dialog__title {
-  font-size: 24px !important;
-}
+  /deep/.el-dialog__title {
+    font-size: 24px !important;
+  }
 
-/deep/.el-dialog__header {
-  text-align: center !important;
-  padding: 10px 0 !important;
-  height: auto !important;
-  // border-bottom: none !important;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
+  /deep/.el-dialog__header {
+    text-align: center !important;
+    padding: 10px 0 !important;
+    height: auto !important;
+    // border-bottom: none !important;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+  }
 
-.title {
-  font-size: 16px;
-  font-weight: 600;
-}
+  .title {
+    font-size: 16px;
+    font-weight: 600;
+  }
 
-table,
-table tr th,
-table tr td {
-  border: 2px solid #333333;
-  padding: 5px 0;
-}
+  table,
+  table tr th,
+  table tr td {
+    border: 2px solid #333333;
+    padding: 5px 0;
+  }
 
-table {
-  width: 100%;
-  min-height: 25px;
-  line-height: 25px;
-  text-align: center;
-  border-collapse: collapse;
-  border: 3px solid #333333;
-}
+  table {
+    width: 100%;
+    min-height: 25px;
+    line-height: 25px;
+    text-align: center;
+    border-collapse: collapse;
+    border: 3px solid #333333;
+  }
 
-.formItem {
-  width: 70% !important;
-}
+  .formItem {
+    width: 70% !important;
+  }
 
-/deep/.el-table .el-table__header .cell,
-/deep/.el-table .cell {
-  text-align: center;
-  line-height: 15px;
-}
+  /deep/.el-table .el-table__header .cell,
+  /deep/.el-table .cell {
+    text-align: center;
+    line-height: 15px;
+  }
 
-/deep/.el-table--enable-row-transition .el-table__body td {
-  text-align: center;
-}
+  /deep/.el-table--enable-row-transition .el-table__body td {
+    text-align: center;
+  }
 
-.title {
-  padding: 10px;
-  text-align: center;
-}
+  .title {
+    padding: 10px;
+    text-align: center;
+  }
 
-.tanchuang {
-  margin: 0 auto;
-}
+  .tanchuang {
+    margin: 0 auto;
+  }
 
-.tanchuang .ws-info-table {
-  display: initial;
-}
+  .tanchuang .ws-info-table {
+    display: initial;
+  }
 
-.tanchuang .ws-info-table .el-form-item {
-  margin: 0 auto;
-  text-align: center;
-}
+  .tanchuang .ws-info-table .el-form-item {
+    margin: 0 auto;
+    text-align: center;
+  }
 
-.upLoad {
-  width: 40%;
-  margin: 0 auto;
-  // border: 1px solid #8890b1;
-  // border-radius: 3px;
-}
+  .upLoad {
+    width: 40%;
+    margin: 0 auto;
+    // border: 1px solid #8890b1;
+    // border-radius: 3px;
+  }
 
-// .avatar{
-//   width: 150px;
-//   height: 150px;
-// }
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
+  // .avatar{
+  //   width: 150px;
+  //   height: 150px;
+  // }
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
 
-.avatar-uploader .el-upload:hover {
-  border-color: #409eff;
-}
+  .avatar-uploader .el-upload:hover {
+    border-color: #409eff;
+  }
 
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-  border: 1px solid #8890b1;
-  border-radius: 5px;
-}
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+    border: 1px solid #8890b1;
+    border-radius: 5px;
+  }
 
-.avatar {
-  width: 178px;
-  height: 178px;
-  border: 1px solid #8890b1;
-  border-radius: 5px;
-  display: block;
-}
+  .avatar {
+    width: 178px;
+    height: 178px;
+    border: 1px solid #8890b1;
+    border-radius: 5px;
+    display: block;
+  }
 
-.pay_img {
-  width: 50%;
-  // display: flex;
-  display: inline-block;
+  .pay_img {
+    width: 50%;
+    // display: flex;
+    display: inline-block;
 
-  .img {
-    height: 350px;
+    .img {
+      height: 350px;
+      width: 100%;
+    }
+  }
+
+  .print-type {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 200px;
+    height: 250px;
+    background: white;
+    border-radius: 10px;
+    z-index: 999;
+  }
+
+  .label-width {
     width: 100%;
   }
-}
 
-.print-type {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  margin: auto;
-  width: 200px;
-  height: 200px;
-  background: white;
-  border-radius: 10px;
-  z-index: 999;
-}
+  .mask {
+    background: black;
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    z-index: 99;
+    opacity: 0.3;
+  }
+
+  .print-type-title {
+    text-align: center;
+    font-size: 18px;
+    margin: 20px;
+  }
 
-.label-width {
-  width: 100%;
-}
+  .bottom-btn {
+    margin: 20px 0;
+    text-align: center;
+  }
 
-.mask {
-  background: black;
-  width: 100vw;
-  height: 100vh;
-  position: fixed;
-  top: 0;
-  z-index: 99;
-  opacity: 0.3;
-}
+  .print-type-checkbox {
+    padding-left: 20px;
+  }
 
-.print-type-title {
-  text-align: center;
-  font-size: 18px;
-  margin: 20px;
-}
+  .img_css {
+    width: 90%;
+    height: 220px;
+  }
 
-.bottom-btn {
-  margin: 20px;
-}
+  .text_css {
+    color: #5878e8;
+  }
 
-.print-type-checkbox {
-  padding-left: 20px;
-}
+  /deep/.base_header_layout {
+    height: 48px;
+  }
 
-.img_css {
-  width: 90%;
-  height: 220px;
-}
+  .warehouse_select {
+    width: 100%;
+  }
 
-.text_css {
-  color: #5878e8;
-}
-/deep/.base_header_layout {
-  height: 48px;
-}
-.warehouse_select {
-  width: 100%;
-}
-.el-button {
-  margin: 5px;
-}
+  .el-button {
+    margin: 5px;
+  }
+  .no-messege{
+    text-align: center;
+    font-size: 30px;
+    padding: 50px;
+  }
+   .my-img{
+            width: 200px;
+            height: 200px;
+        }
 </style>

+ 1 - 1
src/views/login/index.vue

@@ -148,7 +148,7 @@
               <el-form-item prop="companyName">
                 <!-- <el-input v-model="loginForm.companyName" :placeholder="$t('login.verification08')" /> -->
                 <el-select v-model="loginForm.companyName" filterable placeholder="请选择" class="comp-select">
-                  <el-option v-for="item in compOptionList" :key="item.compName" :label="item.compName" :value="item.compName">
+                  <el-option v-for="(item,index) in compOptionList" :key="index" :label="item.compName" :value="item.compName">
                   </el-option>
                 </el-select>
               </el-form-item>

+ 0 - 1
src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -109,7 +109,6 @@
     },
     activated() {
         localStorage.removeItem("pageUp")//删除出入库跳返回时数据刷新的问题
-      // debugger
       // let i = localStorage.getItem('warehouseReceiptRegulation_selectShowType')
       // console.log(i)
       // console.log(1212121121)

+ 0 - 1
src/views/warehouse/warehouseManagementList.vue

@@ -541,7 +541,6 @@ export default {
                         pro.netWeight += Number(increment)
                         pro.grossWeight = Number((pro.tare + pro.netWeight).toFixed(2))
                         increment = 0
-                        
                          warehousePrint.push(pro)
                           }else{
                             increment -= pro.netWeight