更新

public/static/payprint.html

@@ -150,14 +150,13 @@
         align-items: center;
       }
       .sfcard-content img {
-        /* height: 50vh; */
         width: 45%;
         height: 50vh;
       }
       .sfcard-title {
         font-size: 28px;
         text-align: center;
-        margin: 50px 0;
+        margin: 10px 0;
       }
       .avatar {
         margin-bottom: 120px;
@@ -171,14 +170,14 @@
     <div id="app">
       <div class="content" v-if="bigContent">
         <div class="sfcard" v-if="isShowPrintType1">
-          <div class="sfcard-title">身份证</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">银行卡</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" />
@@ -596,34 +595,35 @@
         let _data = decodeURIComponent(this.getQueryVariable('dataList'))
         this.printData = JSON.parse(_data)
         let _type = decodeURIComponent(this.getQueryVariable('type'))
-        if (sessionStorage.getItem('ws-pf_roleName') == '财务') {
-          this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
-          this.customerList = JSON.parse(decodeURIComponent(this.getQueryVariable('customerList')))
-          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]) {
-              case '打印身份证（正反面）':
-                this.isShowPrintType1 = !this.isShowPrintType1
-                break
-              case '打印银行卡（正反面）':
-                this.isShowPrintType2 = !this.isShowPrintType2
-                break
-              case '打印结算凭证':
-                this.isShowPrintType3 = !this.isShowPrintType3
-              case '打印发票':
-                this.isShowPrintType4 = !this.isShowPrintType4
-                break
-            }
+        this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
+        this.customerList = JSON.parse(decodeURIComponent(this.getQueryVariable('customerList')))
+        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]) {
+            case '打印身份证（正反面）':
+              this.isShowPrintType1 = !this.isShowPrintType1
+              break
+            case '打印银行卡（正反面）':
+              this.isShowPrintType2 = !this.isShowPrintType2
+              break
+            case '打印结算凭证':
+              this.isShowPrintType3 = !this.isShowPrintType3
+            case '打印发票':
+              this.isShowPrintType4 = !this.isShowPrintType4
+              break
           }
-        }else{
-          this.isShowPrintType3 = true
         }
+        // if (sessionStorage.getItem('ws-pf_roleName') == '财务') {
+         
+        // }else{
+        //   this.isShowPrintType3 = true
+        // }
         if (_type == 2) {
           this.bigContent = true
           this.smallContent = false

src/api/V2/houseSelfCollect/index.js

@@ -83,4 +83,4 @@ export const API_GET_INSPECT_GETDRYGRAINPRICE = '/purchasePrice/dryGrainPrice'
 //付款权限查询
 export const API_GET_INSPECT_GETJURISDICTION = '/paymentManagement/selectTaskId'
 //财务开票
-export const API_GET_INVOICING = '/paymentManagement/readXmlManagement'
+export const API_POST_INVOICING = '/paymentManagement/api/readXmlManagement'

src/model/houseSelfCollect/index.js

@@ -43,7 +43,7 @@ import {
   API_GET_CUSTOMER_CODEJY,
   API_GET_INSPECT_GETDRYGRAINPRICE,
   API_GET_INSPECT_GETJURISDICTION,
-  API_GET_INVOICING
+  API_POST_INVOICING
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -130,4 +130,4 @@ export const getDryGrainPrice = appRx.get(API_GET_INSPECT_GETDRYGRAINPRICE, erro
 //付款权限查询
 export const getJurisdiction  = appRx.get(API_GET_INSPECT_GETJURISDICTION, errorCatcher, errorHandle, filter)
 //财务开票
-export const invoicing  = appRx.get(API_GET_INVOICING, errorCatcher, errorHandle, filter)
+export const invoicing  = appRx.post(API_POST_INVOICING, errorCatcher, errorHandle, filter)

src/router/index.js

@@ -215,7 +215,7 @@ router.beforeEach(async (to, from, next) => {
       }
     }
     renewalHead(data).toPromise().then(() => {
-      console.log(sessionStorage.getItem('paymentManagementReturn'))
+      console.log('paymentManagementReturn',sessionStorage.getItem('paymentManagementReturn'))
       if(to.name=='settlement'&&sessionStorage.getItem('paymentManagementReturn')=='true'){
         next(`/houseSelfCollect/paymentManagement`);
       }else{
@@ -228,6 +228,7 @@ router.beforeEach(async (to, from, next) => {
       next(`/login?redirect=${to.path}`);
     })
   } else {
+    data.routingUri = to.path
     next()
   }
 })

src/views/houseSelfCollect/component/routers/route.js

@@ -120,7 +120,7 @@ const houseSelfCollectRouter = {
       meta: {
         title: 'settlement',
         shortcutEntrance: 'settlement',
-        module: 'acquisitionManagement.acquisitionPay.add',
+        module: 'acquisitionManagement.acquisitionPay.view',
         permissicon: [],
         keepAlive: true
       },

src/views/houseSelfCollect/paymentManagement.vue

@@ -332,9 +332,10 @@ export default {
   },
   methods: {
     invoicingClick(){
-      let data = JSON.stringify({
-        paymentManagement :this.modification
-      })
+    
+      let data = {
+        paymentManagementList : this.modification
+      }
       console.log('开票',data)
       //开票
       invoicing(data)
@@ -371,6 +372,8 @@ export default {
           }
         }
       })
+      .catch(() => {
+      })
     },
     selectType(val) {
       console.log(val)

src/views/houseSelfCollect/settlement.vue

@@ -441,7 +441,6 @@ export default {
     }
   },
   activated() {
-    debugger
     this.types = this.$route.query.type
     if( this.types == 2){
          this.disabled=true