瀏覽代碼

Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

gjy 3 年之前
父節點
當前提交
031ec1b17a
共有 2 個文件被更改,包括 49 次插入17 次删除
  1. 0 3
      public/static/payprint.html
  2. 49 14
      src/views/houseSelfCollect/paymentManagement.vue

+ 0 - 3
public/static/payprint.html

@@ -168,9 +168,6 @@
   <body>
   <body>
     <div id="app">
     <div id="app">
       <div class="content" v-if="bigContent">
       <div class="content" v-if="bigContent">
-        <div class="page1">
-
-        </div>
         <div class="sfcard" v-if="isShowPrintType1">
         <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">
           <div class="sfcard-content">

+ 49 - 14
src/views/houseSelfCollect/paymentManagement.vue

@@ -15,7 +15,7 @@
         </div>
         </div>
       </div>
       </div>
       <div class="bottom-btn">
       <div class="bottom-btn">
-        <el-button @click="typePrintClick">确定</el-button>
+        <el-button @click="typePrintClick(printType)">确定</el-button>
         <el-button @click="typePrintCannelClick">取消</el-button>
         <el-button @click="typePrintCannelClick">取消</el-button>
       </div>
       </div>
     </div>
     </div>
@@ -35,10 +35,12 @@
         <ws-button type="primary" @click="reject">驳回</ws-button>
         <ws-button type="primary" @click="reject">驳回</ws-button>
         <ws-button type="primary" @click="adopt">通过</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="invoicingClick" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
-        <ws-button type="primary" @click="exportlist" 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="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>
         </ws-button>
+        <ws-button type="primary" @click="selectPrint(1)" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">财务批量打印
+        </ws-button>
       </template>
       </template>
       <template slot="right">
       <template slot="right">
         <el-select v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange" style="margin: 0 10px">
         <el-select v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange" style="margin: 0 10px">
@@ -275,6 +277,7 @@ import {
     watch: {},
     watch: {},
     data() {
     data() {
       return {
       return {
+        printType:0,
         isShowPrintType1: true,
         isShowPrintType1: true,
         isShowPrintType2: true,
         isShowPrintType2: true,
         isShowPrintType3: true,
         isShowPrintType3: true,
@@ -295,16 +298,13 @@ import {
         },
         },
         row: {},
         row: {},
         isShowPrintType: false,
         isShowPrintType: false,
-        imageUrl1: '',
-        imageUrl2: '',
-        imageUrl3: '',
-        imageUrl4: '',
         customerList: {
         customerList: {
           customerName: '',
           customerName: '',
           customerNumberCard: '',
           customerNumberCard: '',
           bankCard: '',
           bankCard: '',
           bankDeposit: ''
           bankDeposit: ''
         },
         },
+        selectCustomerList:[],
         identity: [],
         identity: [],
         //分页
         //分页
         currentPage: 1,
         currentPage: 1,
@@ -321,6 +321,7 @@ import {
         warehouseName: '',
         warehouseName: '',
         isShowPrint: false,
         isShowPrint: false,
         printData: {},
         printData: {},
+        selectPrintList: [],
         warehouse: [],
         warehouse: [],
         value1: '', //付款日期
         value1: '', //付款日期
         modification: [],
         modification: [],
@@ -347,6 +348,12 @@ import {
       // this.getList()
       // this.getList()
     },
     },
     methods: {
     methods: {
+      selectPrint(){
+        console.log('批量打印数据', this.modification)
+        this.printType = 1
+         this.isShowPrintType = true
+
+      },
        async exportlist() {
        async exportlist() {
         console.log('导出数据', this.modification)
         console.log('导出数据', this.modification)
           let _data = {
           let _data = {
@@ -507,21 +514,46 @@ import {
       typePrintCannelClick() {
       typePrintCannelClick() {
         this.isShowPrintType = false
         this.isShowPrintType = false
       },
       },
-      typePrintClick() {
+      typePrintClick(type) {debugger
+        // type 1批量打印 0单个打印
         //  this.isShowPrint = true
         //  this.isShowPrint = true
-        getCustomerLook({
+        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
+              })
+              .toPromise()
+              .then(response => {
+                     let date = new Date()
+               response.currentTime =
+                  date.getFullYear() +
+                  '年' +
+                  Number(date.getMonth() + 1) +
+                  '月' +
+                  date.getDate() +
+                  '日'
+                this.selectPrintList.push(response)
+           
+              })
+          })
+          }
+  // console.log('批量打印客户list',this.selectCustomerList)
+  // console.log('批量打印凭证list',this.selectPrintList)
+        }else{
+     getCustomerLook({
             id: this.rowData.identityAuthenticationInfo.id,
             id: this.rowData.identityAuthenticationInfo.id,
             authenticationStatusKey: 7
             authenticationStatusKey: 7
           })
           })
           .toPromise()
           .toPromise()
           .then(response => {
           .then(response => {
             this.customerList = response
             this.customerList = response
-            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]
             getpaymentexamine({
             getpaymentexamine({
                 id: this.rowData.id
                 id: this.rowData.id
               })
               })
@@ -542,6 +574,8 @@ import {
                   '日'
                   '日'
               })
               })
           })
           })
+        }
+   
       },
       },
       handleRowClick(row) {
       handleRowClick(row) {
         if (row.status != '已驳回') {
         if (row.status != '已驳回') {
@@ -864,6 +898,7 @@ import {
         }
         }
       },
       },
       print1(row) {
       print1(row) {
+        this.printType = 0
         this.isShowPrintType = true
         this.isShowPrintType = true
         this.rowData = row
         this.rowData = row
         sessionStorage.setItem('cwprint', true)
         sessionStorage.setItem('cwprint', true)