瀏覽代碼

前端 sdy

zhongtianhaoyuan 3 年之前
父節點
當前提交
0bc4ce1e25

+ 3 - 2
public/static/payprint.html

@@ -597,8 +597,9 @@
         let _type = decodeURIComponent(this.getQueryVariable('type'))
         this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
         this.customerList = JSON.parse(decodeURIComponent(this.getQueryVariable('customerList')))
-        
-        if (sessionStorage.getItem('cwprint')) {
+        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]

+ 3 - 4
src/api/V2/houseSelfCollect/index.js

@@ -83,7 +83,6 @@ 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_GET_INVOICING = '/paymentManagement/api/readXmlManagement'
-// export const API_POST_INVOICING ='/paymentManagement/api/readXmlManagement'
+export const API_POST_INVOICING = '/paymentManagement/api/readXmlManagement'
+export const API_POST_EXPORT = '/paymentManagement/export'
+

+ 4 - 5
src/model/houseSelfCollect/index.js

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

+ 19 - 28
src/views/houseSelfCollect/paymentManagement.vue

@@ -188,6 +188,7 @@
     >
       <el-form class="customer">
 
+
         <div class="flex">
           <div style="flex: 1; text-align: center">
             <h4>身份证正面</h4>
@@ -250,9 +251,6 @@ import {
   import {
     downloadFile
   } from '@/utils/batchDown'
-  import {
-    export1,
-  } from '@/model/contarct/index'
   import {
     getpayment,
     selectWarehouseSelf,
@@ -263,6 +261,7 @@ import {
     paymentCommit,
     getJurisdiction,
     invoicing,
+    export1
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle
@@ -284,7 +283,7 @@ import {
         isShowPrintType4: true,
         customerInfo: false,
         form: {},
-        formLabelWidth: "300px",
+        formLabelWidth: '300px',
         customerlist: {
           payeeAddressUrls: [],
         },
@@ -352,20 +351,12 @@ import {
     methods: {
        async exportlist() {
         console.log('导出数据', this.modification)
-        for (let i = 0; i < this.modification.length; i++) {
-          let {
+          let _data = {
+          paymentManagementList: this.modification
+        }
+          const {
             data
-          } = await export1({
-            compId: sessionStorage.getItem('ws-pf_compId'),
-            contractType: this.contractType,
-            goodsType: this.goodsType,
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchType: this.searchType,
-            searchKeyWord: this.searchKeyWord,
-            startDate: this.startDate,
-            endDate: this.endDate,
-          }, {}, {
+          } = await export1(_data, {}, {
             responseType: 'blob'
           }).toPromise()
           downloadFile({
@@ -375,7 +366,6 @@ import {
         }结算凭证`,
             type: 'xls',
           })
-        }
 
       },
       invoicingClick() {
@@ -389,7 +379,7 @@ import {
         //     console.log(response)
         //   })
         let data = {
-          paymentManagementList: this.modification
+          paymentManagementList:this.modification
         }
         console.log('开票', data)
         //开票
@@ -656,15 +646,15 @@ import {
           }
           this.deptBudgetTotal = response.total
         })
-      getJurisdiction({
-        managementType: 1,
-        warehouseName: this.warehouseName,
-        compId: sessionStorage.getItem('ws-pf_compId')
-      })
-        .toPromise()
-        .then(response => {
-          this.isShowAdopt = response
-        })
+      // getJurisdiction({
+      //   managementType: 1,
+      //   warehouseName: this.warehouseName,
+      //   compId: sessionStorage.getItem('ws-pf_compId')
+      // })
+      //   .toPromise()
+      //   .then(response => {
+      //     this.isShowAdopt = response
+      //   })
 
 
         //   getJurisdiction({
@@ -1132,6 +1122,7 @@ import {
   .label-width {
     width: 100%;
   }
+
   .mask {
     background: black;
     width: 100vw;

+ 1 - 1
vue.config.js

@@ -142,7 +142,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.122:9100/',
-        target: 'http://192.168.1.107:8090/',
+        target: 'http://192.168.1.108:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址