Browse Source

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

# Conflicts:
#	src/views/houseSelfCollect/paymentManagement.vue
ccjgmwz 3 years ago
parent
commit
ab29157f9d

+ 269 - 22
public/static/payprint.html

@@ -2,10 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <link
-      rel="stylesheet"
-      href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"
-    />
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
     <title></title>
     <style>
       table,
@@ -116,67 +113,285 @@
       .sign {
         margin-right: 100px;
       }
+
       .header {
         display: flex;
         justify-content: space-between;
         font-size: 16px;
         margin: 10px 0;
       }
+
       .header1 {
         font-size: 24px;
         margin: 30px 60px 10px 60px;
         display: flex;
         justify-content: center;
       }
+
       .line {
         height: 2px;
         width: 410px;
         margin: 3px auto;
         background: black;
       }
+
       .line:nth-of-type(3) {
         margin-bottom: 30px;
       }
+
       .header-top {
         display: flex;
         justify-content: space-between;
       }
-      .sfcard {
-      }
+
+      .sfcard {}
+
       .sfcard-content {
         display: flex;
         align-items: center;
         justify-content: space-evenly;
       }
+
       .sfcard-content img {
         width: 45%;
         height: 50vh;
       }
+
       .sfcard-title {
         font-size: 28px;
         text-align: center;
         margin: 10px 0;
       }
+
       .avatar {
         margin-bottom: 120px;
       }
+
       .avatar:nth-of-type(2) {
         margin-bottom: 140px;
       }
+
+      .center {
+        height: 140vh;
+      }
     </style>
   </head>
   <body>
     <div id="app">
-      <div class="content" v-if="bigContent">
+      <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>
+              <div class="line"></div>
+              <div class="header">
+                <div>单位名称:{{ printData1[index].compName}}</div>
+                <!-- <div>税务登记编号:91230230MA1BNL7Q93</div> -->
+              </div>
+              <div class="header-top">
+                <div>单位:公斤/元</div>
+                <div>No.</div>
+              </div>
+              <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>
+              <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 rowspan="4" class="col col-bgc">卖方</td>
+                  <td class="col col-bgc">姓名</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 col-bgc">身份证号</td>
+                  <td class="col" colspan="4">
+                    {{ 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 col-bgc">卡号</td>
+                  <td class="col" colspan="4">
+                    {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">收货仓库</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}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">货名</td>
+                  <td class="col col-bgc">类型</td>
+                  <td class="col col-bgc">等级</td>
+                  <td class="col col-bgc">水分%</td>
+                  <td class="col col-bgc">杂质%</td>
+                  <td class="col col-bgc">毛重</td>
+                  <td class="col col-bgc">皮重</td>
+                  <td class="col col-bgc">扣杂重</td>
+                  <td class="col col-bgc">净重</td>
+                  <td class="col col-bgc">纯重</td>
+                </tr>
+                <tr class="row">
+                  <td class="col">{{ printData1[index].goodsName}}</td>
+                  <td class="col">{{ printData1[index].type}}</td>
+                  <td class="col">
+                    {{ printData1[index].qualityInspectionManagement.grade}}
+                  </td>
+                  <td class="col">
+                    {{ printData1[index].qualityInspectionManagement.waterContent}}
+                  </td>
+                  <td class="col">
+                    {{ printData1[index].qualityInspectionManagement.impurity}}
+                  </td>
+                  <td class="col">{{ printData1[index].grossWeight}}</td>
+                  <td class="col">{{ printData1[index].tare}}</td>
+                  <td class="col">
+                    {{ printData1[index].weighingManagement.buckleMiscellaneous}}
+                  </td>
+                  <td class="col">{{ printData1[index].netWeight}}</td>
+                  <td class="col">{{ printData1[index].pureWeight}}</td>
+                </tr>
+                <tr class="row">
+                  <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>
+                  <td class="col col-bgc">运费补助</td>
+                  <td class="col col-bgc">卸车补助</td>
+                  <td class="col col-bgc">其他补助</td>
+                  <td class="col col-bgc">称重扣款</td>
+                  <td class="col col-bgc">运费扣款</td>
+                  <td class="col col-bgc">卸车扣款</td>
+                </tr>
+                <tr class="row">
+                  <td class="col " v-if="printData1[index].type == '潮粮'">
+                    {{printData1[index].tidalGrainPrice}}
+                  </td>
+                  <td class="col " v-if="printData1[index].type == '干粮'">
+                    {{printData1[index].qualityInspectionManagement.dryGrainPrice}}
+                  </td>
+                  <td class="col ">{{ printData1[index].unitDeduction}}</td>
+                  <td class="col ">{{ printData1[index].grainMoney}}</td>
+                  <td class="col ">{{ printData1[index].weighingSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].freightSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].unloadSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].otherSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].weighingDeduction}}</td>
+                  <td class="col ">{{ printData1[index].freightDeduction}}</td>
+                  <td class="col ">{{ printData1[index].unloadDeduction}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">质量扣款</td>
+                  <td class="col col-bgc">其他扣款</td>
+                  <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                    纯重单价
+                  </td>
+                  <td class="col col-bgc">合计应付</td>
+                  <td class="col col-bgc">购粮性质</td>
+                  <td class="col col-bgc">车牌号</td>
+                  <td class="col col-bgc" colspan="5">记事</td>
+                </tr>
+                <tr class="row">
+                  <td class="col ">{{ printData1[index].qualityDeduction}}</td>
+                  <td class="col ">{{ printData1[index].otherDeduction}}</td>
+                  <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}}
+                  </td>
+                  <td class="col ">{{ printData1[index].carNo}}</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 col-bgc" colspan="3">人民币(大写)</td>
+                  <td class="col " colspan="4">{{printData1[index].capitalize}}</td>
+                </tr>
+              </table>
+
+              <div class="bottom">
+                <div class="bottom-row1">
+                  <div>
+                    质检:{{
+                      printData1[index].qualityInspectionManagement.qualityInspector}}
+                  </div>
+                  <div>
+                    毛检:{{ printData1[index].weighingManagement.secretaryWeigher}}
+                  </div>
+                  <div>皮检:{{ printData1[index].weighingManagement.skinInspector}}</div>
+                  <div>结算:{{ printData1[index].settlementClerk}}</div>
+                  <div>付款:{{ printData1[index].cashier}}</div>
+                  <div>复点:{{ }}</div>
+                  <div></div>
+                </div>
+                <div class="bottom-row2">
+                  <!-- <div class="left">
+                   <img src="../../../../public/img/add.png" alt="" />
+                 </div> -->
+                  <div class="config">收货单位签名或盖章</div>
+                  <div class="">客户签名</div>
+                </div>
+                <!-- <div class="bottom-row3">扫一扫</div> -->
+                <!-- <div class="bottom-row4">
+                 <el-button type="primary">关闭</el-button> 
+                  <el-button type="primary" @click="printSmall">打印小票</el-button> 
+                  <el-button type="primary" @click="printBig">打印单据</el-button>
+               </div> -->
+              </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-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-title">
+            {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</div>
           <div class="sfcard-content">
             <img :src="imageUrl3" class="avatar" />
             <img :src="imageUrl4" class="avatar" />
@@ -550,7 +765,9 @@
         isShowPrintType4: false,
         showType: [],
         printData: {},
+        printData1: [],
         customerList: {},
+        customerList1: [],
         name: '',
         bigContent: false,
         smallContent: false,
@@ -560,14 +777,18 @@
         imageUrl3: '',
         imageUrl4: '',
         identity: [],
-        bank: []
+        bank: [],
+        selectPrint: false,
       },
       computed: {},
       methods: {
         dealNo(str) {
           return str.slice(4)
         },
-        tableRowClassName({ row, rowIndex }) {
+        tableRowClassName({
+          row,
+          rowIndex
+        }) {
           if (rowIndex === 1) {
             return 'warning-row'
           } else if (rowIndex === 3) {
@@ -592,19 +813,45 @@
       mounted() {
         this.date = new Date().toLocaleString()
         let _data = decodeURIComponent(this.getQueryVariable('dataList'))
-        this.printData = JSON.parse(_data)
+        if (!_data) {
+          this.selectPrint = true;
+          this.printData1 = JSON.parse(sessionStorage.getItem('selectPrint_selectPrintList'))
+        } else {
+          this.printData = JSON.parse(_data)
+          this.selectPrint = false;
+        }
         let _type = decodeURIComponent(this.getQueryVariable('type'))
         this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
-        this.customerList = JSON.parse(decodeURIComponent(this.getQueryVariable('customerList')))
-        console.log('cwprint',sessionStorage.getItem('cwprint'))
+        let _data1 = decodeURIComponent(this.getQueryVariable('customerList'))
+        if (!_data1) {
+          this.customerList1 = JSON.parse(sessionStorage.getItem('selectPrint_selectCustomerList'))
+        } else {
+          this.customerList = JSON.parse(_data1)
+        }
+        console.log('cwprint', sessionStorage.getItem('cwprint'))
         var cwprint = sessionStorage.getItem('cwprint')
         if (cwprint == "true") {
-          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.selectPrint) {
+            for (let i = 0; i < this.customerList1.length; i++) {
+              let _url1 = this.customerList1[i].cardAddressUrl.split(',')
+              let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
+              this.customerList1[i].imgURl = {
+                imageUrl1: _url1[0],
+                imageUrl2: _url1[1],
+                imageUrl3: _url2[0],
+                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]
+          }
+
           let _lsit = this.showType.split(',')
           for (let i = 0; i < _lsit.length; i++) {
             switch (_lsit[i]) {
@@ -621,7 +868,7 @@
                 break
             }
           }
-        }else{
+        } else {
           this.isShowPrintType3 = true
         }
         if (_type == 2) {
@@ -633,7 +880,7 @@
         }
 
         document.title = this.printData.compName + '结算凭证'
-        window.print()
+        // window.print()
         window.onafterprint = function(event) {
           window.history.back(-1)
         }

+ 8 - 0
src/views/houseSelfCollect/component/paymentPrint.vue

@@ -155,6 +155,12 @@
       },
       showType:{
         type: Array
+      },
+       selectPrintList:{
+        type: Array
+      },
+       selectCustomerList:{
+        type: Array
       },
       billingDate:'',
     },
@@ -166,6 +172,8 @@
     activated() {
       let date = new Date()
       console.log( date.getFullYear())
+      console.log(this.selectPrintList)
+      console.log(this.selectCustomerList)
     },
     methods: {
       dealNo(str){

+ 188 - 118
src/views/houseSelfCollect/paymentManagement.vue

@@ -34,13 +34,15 @@
 
         <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>
-        <!-- <a href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/7313fc0f25ed41879826bba5c737d688.xml" download='112'>立即下载</a> -->
-        <ws-button type="primary" @click="exportlist" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">导出</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>
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
         <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款
         </ws-button>
-        <ws-button type="primary" @click="selectPrint(1)" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">财务批量打印
+        <ws-button type="primary" @click="selectPrint(1)"
+          v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">财务批量打印
         </ws-button>
       </template>
       <template slot="right">
@@ -70,7 +72,7 @@
       <el-table-column class="table_td" prop="paymentNo" width="100" 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.textcss }">{{scope.row.customerName}}</span></div>
+          <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>
@@ -171,6 +173,8 @@
         :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>
         <div style="text-align: center">
           <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
@@ -180,13 +184,7 @@
       </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">
 
 
@@ -245,13 +243,15 @@
   </div>
 </template>
 <script>
-import {
+  import {
     dayjs,
     EventBus
   } from 'base-core-lib'
   import {
     downloadFile
   } from '@/utils/batchDown'
+  import JSZip from 'jszip'
+  import FileSaver from 'file-saver'
   import {
     getpayment,
     selectWarehouseSelf,
@@ -271,6 +271,7 @@ import {
   import {
     getHp
   } from '@/utils/getHasPermission'
+import download from '../../components/WsDownload/download'
   export default {
     components: {
       paymentPrint
@@ -278,7 +279,7 @@ import {
     watch: {},
     data() {
       return {
-        printType:0,
+        printType: 0,
         isShowPrintType1: true,
         isShowPrintType2: true,
         isShowPrintType3: true,
@@ -305,7 +306,8 @@ import {
           bankCard: '',
           bankDeposit: ''
         },
-        selectCustomerList:[],
+        selectCustomerList: [],
+        selectPrintList: [],
         identity: [],
         //分页
         currentPage: 1,
@@ -322,7 +324,6 @@ import {
         warehouseName: '',
         isShowPrint: false,
         printData: {},
-        selectPrintList: [],
         warehouse: [],
         value1: '', //付款日期
         modification: [],
@@ -349,31 +350,77 @@ import {
       // this.getList()
     },
     methods: {
-      selectPrint(){
+      selectPrint() {
         console.log('批量打印数据', this.modification)
         this.printType = 1
-         this.isShowPrintType = true
-
+        this.isShowPrintType = true
       },
-       async exportlist() {
+      async exportlist() {
         console.log('导出数据', this.modification)
-          let _data = {
+        let _data = {
           paymentManagementList: this.modification
         }
-          const {
-            data
-          } = await export1(_data, {}, {
-            responseType: 'blob'
-          }).toPromise()
-          downloadFile({
-            res: data,
-            fileName: `${
+        const {
+          data
+        } = await export1(_data, {}, {
+          responseType: 'blob'
+        }).toPromise()
+        downloadFile({
+          res: data,
+          fileName: `${
           this.date.year + (this.date.month ? `-${this.date.month}` : '')
         }结算凭证`,
-            type: 'xls',
-          })
+          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;
+   });
+   promises.push(promise);
+  }
+  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);
+   }
+   }
+   xmlhttp.send();
+  });
+  },
       invoicingClick() {
         // let data = JSON.stringify({
         //   paymentManagementList : this.modification
@@ -385,7 +432,7 @@ import {
         //     console.log(response)
         //   })
         let data = {
-          paymentManagementList:this.modification
+          paymentManagementList: this.modification
         }
         console.log('开票', data)
         //开票
@@ -394,14 +441,28 @@ import {
           .then(response => {
             console.log(response)
             if (response.length > 0) {
+              
+              var arr=[]
               for (let i = 0; i < response.length; i++) {
+                arr.push({fileUrl:response[i],renameFileName:'发票'+i})
                 //创建标签下载文件
-                let a = document.createElement('a');
-                a.href = '#';
-                a.setAttribute('download', response[i]);
-                a.click();
-                a.remove();
+                // window.open(response[i],)
+                // let a = document.createElement('a');
+                // // a.href = response[i];
+                // a.setAttribute('target', 'blank');
+                // a.setAttribute('download', response[i]);
+                // a.setAttribute('href', response[i]);
+                // a.click();
+                // a.remove();
+                // let b = document.createElement('a');
+                // // b.href = response[i];
+                // b.setAttribute('target', 'blank');
+                // b.setAttribute('download', response[i]);
+                // b.setAttribute('href', response[i]);
+                // b.click();
+                // b.remove();
               }
+              this.filesToRar(arr, 'download')
             }
             //未完成,接口调通后替换假数据
             // response = {
@@ -435,25 +496,16 @@ import {
           .catch(() => {})
       },
       customer(row) {
-        for(let i = 0 ; i < this.paymentList.length ; i++){
-          if(row.id == this.paymentList[i].id){
-            row.textcss = true
-          }else{
-            this.paymentList[i].textcss = false
-          }
-        }
-        row.textcss = true
         this. customerInfo = true
         this.customerlist = row.identityAuthenticationInfo
         this.customerlist.cardAddressUrl1 = this.customerlist.cardAddressUrl.split(',')[0]
         this.customerlist.cardAddressUrl2 = this.customerlist.cardAddressUrl.split(',')[1]
         this.customerlist.payeeAddressUrls = this.customerlist.payeeAddressUrl.split(',')
-        this.$forceUpdate();
       },
-      customerclose(e){
+      customerclose(e) {
         console.log(e)
-          //  row.textcss = false
-              this. customerInfo = false
+        //  row.textcss = false
+        this.customerInfo = false
 
       },
       //合计
@@ -515,68 +567,82 @@ import {
       typePrintCannelClick() {
         this.isShowPrintType = false
       },
-      typePrintClick(type) {debugger
+      typePrintClick(type) {
         // type 1批量打印 0单个打印
         //  this.isShowPrint = true
-        if(type==1){
-          for(let i =0;i<this.modification.length;i++){
-                 getCustomerLook({
-            id: this.modification[i].identityAuthenticationInfo.id,
-            authenticationStatusKey: 7
-          })
-          .toPromise()
-          .then(response => {
-            this.selectCustomerList.push(response)
-            getpaymentexamine({
-                id: this.modification[i].id
+        if (type == 1) {
+          let index1 = 0;
+          let index2 = 0;
+          for (let i = 0; i < this.modification.length; i++) {
+            getCustomerLook({
+                id: this.modification[i].identityAuthenticationInfo.id,
+                authenticationStatusKey: 7
               })
               .toPromise()
               .then(response => {
-                     let date = new Date()
-               response.currentTime =
-                  date.getFullYear() +
-                  '年' +
-                  Number(date.getMonth() + 1) +
-                  '月' +
-                  date.getDate() +
-                  '日'
-                this.selectPrintList.push(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();
+                    }
+
+                  })
               })
-          })
           }
-  // console.log('批量打印客户list',this.selectCustomerList)
-  // console.log('批量打印凭证list',this.selectPrintList)
-        }else{
-     getCustomerLook({
-            id: this.rowData.identityAuthenticationInfo.id,
-            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() +
-                  '日'
-              })
-          })
+          // console.log('批量打印客户list',this.selectCustomerList)
+          // console.log('批量打印凭证list',this.selectPrintList)
+        } else {
+          getCustomerLook({
+              id: this.rowData.identityAuthenticationInfo.id,
+              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 != '已驳回') {
@@ -653,15 +719,24 @@ import {
         )
       },
       printBig() {
-        window.open(
-          '../../../../../static/payprint.html?type=2&dataList=' +
-          JSON.stringify(this.printData) +
-          '&customerList=' +
-          JSON.stringify(this.customerList) +
-          '&printTypeList=' +
-          this.ruleForm.type,
-          '结算凭证'
-        )
+        console.log(this.printType)
+        let _list1 = []
+        let _list2 = []
+        if (this.printType == 1) {
+          sessionStorage.setItem('cwprint', true)
+          // 财务批量打印数据
+          sessionStorage.setItem('selectPrint_selectPrintList', JSON.stringify(this.selectPrintList))
+          sessionStorage.setItem('selectPrint_selectCustomerList', JSON.stringify(this.selectCustomerList))
+        } else if (this.printType == 0) {
+          sessionStorage.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 = {
@@ -685,9 +760,6 @@ import {
         .toPromise()
         .then(response => {
           this.paymentList = response.records
-          for(let i = 0 ; i < this.paymentList.length ; i++){
-            this.paymentList.textcss = false
-          }
           this.deptBudgetTotal = response.total
         })
       // getJurisdiction({
@@ -699,8 +771,6 @@ import {
       //   .then(response => {
       //     this.isShowAdopt = response
       //   })
-
-
       },
       del(row) {
         this.$confirm(
@@ -1175,6 +1245,6 @@ import {
   }
 
   .text_css {
-    color: #2c29e7;
+    color: #5878e8;
   }
 </style>

+ 1 - 1
src/views/statisticalReport/autoSettlementList.vue

@@ -371,7 +371,7 @@
             </div>
           </template></el-table-column
         >
-        <el-table-column label="状态" prop="status">
+        <el-table-column label="状态" prop="status" width="100px">
           <template slot-scope="scope">
             <span v-if="scope.row.approveStatus != null">{{
               scope.row.approveStatus

+ 1 - 1
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -794,7 +794,7 @@
 						return
 					}
 					if (
-						this.dataList.bulkDensity < 500 ||
+						this.dataList.bulkDensity < 0 ||
 						this.dataList.bulkDensity > 1000
 					) {
 						this.$message({

+ 3 - 3
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -994,7 +994,7 @@ export default {
           return
         }
         if (
-          this.dataList.bulkDensity < 500 ||
+          this.dataList.bulkDensity < 0 ||
           this.dataList.bulkDensity > 1000
         ) {
           this.$message({
@@ -1130,7 +1130,7 @@ export default {
           return
         }
         if (
-          this.dataList1.bulkDensity < 500 ||
+          this.dataList1.bulkDensity < 0 ||
           this.dataList1.bulkDensity > 1000
         ) {
           this.$message({
@@ -1280,7 +1280,7 @@ export default {
           return
         }
         if (
-          this.dataList1.bulkDensity < 500 ||
+          this.dataList1.bulkDensity < 0 ||
           this.dataList1.bulkDensity > 1000
         ) {
           this.$message({

+ 6 - 5
src/views/tranManagement/tranManagementFireFeedback.vue

@@ -95,7 +95,7 @@
         <div style="width: 100%" class="flex position" v-for="(item, index) in freightspace" :key="index">
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">车厢-{{ index + 1 }}</div>
+            <div class="catNos">车厢-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>
@@ -683,10 +683,11 @@
         let that = this;
         that.$forceUpdate();
         that.freightspace[that.index].imgCount++
-        console.log(that.freightspace[that.index].imgCount)
-        that.freightspace[that.index].loadPoundImg += e.url + ","
-        console.log(that.freightspace[that.index].loadPoundImg)
-
+        if(that.freightspace[that.index].loadPoundImg){
+             that.freightspace[that.index].loadPoundImg += "," + e.url  
+        }else{
+             that.freightspace[that.index].loadPoundImg += e.url 
+        }
       }
     }
   }

+ 1 - 1
src/views/tranManagement/tranManagementFireFeedbackLook.vue

@@ -125,7 +125,7 @@
         >
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">车厢-{{ index + 1 }}</div>
+            <div class="catNos">车厢-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>

+ 7 - 2
src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -149,7 +149,7 @@
         >
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">车厢-{{ index + 1 }}</div>
+            <div class="catNos">车厢-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>
@@ -759,7 +759,12 @@ export default {
         that.$forceUpdate();
         that.freightspace[that.index].imgCount++
         console.log(that.freightspace[that.index].imgCount)
-        that.freightspace[that.index].unloadPoundImg += e.url + ','
+        debugger
+        if( that.freightspace[that.index].unloadPoundImg){
+           that.freightspace[that.index].unloadPoundImg += ',' + e.url
+        }else{
+          that.freightspace[that.index].unloadPoundImg += e.url
+        }
     },
   },
 }

+ 1 - 1
src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -130,7 +130,7 @@
         >
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">车厢-{{ index + 1 }}</div>
+            <div class="catNos">车厢-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>

+ 1 - 1
src/views/tranManagement/tranManagementReceivingloading.vue

@@ -84,7 +84,7 @@
             >
             <!--最晚发货日期-->
             <ws-form-item
-              label="最晚货日期"
+              label="最晚货日期"
               span="1"
               prop="inOutDate"
               class="deliverydate"

+ 1 - 1
src/views/tranManagement/tranManagementShippingLook.vue

@@ -49,7 +49,7 @@
               </ws-form-item>
 
               <!--发船日期-->
-              <ws-form-item label="发日期" span="1" prop="deliveryDateStart">{{ deptBudgetList.deliveryDateStart }}
+              <ws-form-item label="发日期" span="1" prop="deliveryDateStart">{{ deptBudgetList.deliveryDateStart }}
               </ws-form-item>
 
               <!--最晚发货日期-->

+ 1 - 1
src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -71,7 +71,7 @@
               {{ deptBudgetList.deliveryDateStart }}
             </ws-form-item>
             <ws-form-item
-              label="最晚货日期"
+              label="最晚货日期"
               span="1"
               prop="inOutDate"
               class="deliverydate"