mxx 3 éve
szülő
commit
1a834fc638

+ 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)

+ 46 - 53
src/views/houseSelfCollect/paymentManagement.vue

@@ -179,14 +179,18 @@
       </el-dialog>
     </div>
     <!--客户信息-->
-    <el-dialog
-      width="50%"
-      title="客户信息"
-      :visible.sync="customerInfo"
-      :append-to-body="true"
-    >
-      <el-form class="customer" :model="customer">
-
+    <el-dialog width="50%" title="客户信息" :visible.sync="customerInfo" :append-to-body="true">
+      <el-form class="customer" :model="form">
+        <div v-if="customerlist.customerTypeFlag == '2'">
+          <h4>营业执照</h4>
+          <img width="50%" :src="customerlist.businessLicenseAddressUrl" alt class="img_css" />
+          <el-form-item label="公司名称" label-width="100px">
+            {{ customerlist.compName }}
+          </el-form-item>
+          <el-form-item label="纳税人识别号" label-width="100px">
+            {{ customerlist.payTaxesCard }}
+          </el-form-item>
+        </div>
         <div class="flex">
           <div style="flex: 1; text-align: center">
             <h4>身份证正面</h4>
@@ -249,9 +253,6 @@ import {
   import {
     downloadFile
   } from '@/utils/batchDown'
-  import {
-    export1,
-  } from '@/model/contarct/index'
   import {
     getpayment,
     selectWarehouseSelf,
@@ -262,6 +263,7 @@ import {
     paymentCommit,
     getJurisdiction,
     invoicing,
+    export1
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle
@@ -351,20 +353,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({
@@ -374,7 +368,6 @@ import {
         }结算凭证`,
             type: 'xls',
           })
-        }
 
       },
       invoicingClick() {
@@ -388,7 +381,7 @@ import {
         //     console.log(response)
         //   })
         let data = {
-          paymentManagementList: this.modification
+          paymentManagementList:this.modification
         }
         console.log('开票', data)
         //开票
@@ -623,33 +616,32 @@ import {
           searchParam = this.searchType
         }
 
-      getpayment({
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchKeyWord: this.searchKeyWord,
-        searchType: searchParam,
-        warehouseName: this.warehouseName,
-        managementType: 1,
-        compId: sessionStorage.getItem('ws-pf_compId')
-      })
-        .toPromise()
-        .then(response => {
-          this.paymentList = response.records
-          for(let i = 0 ; i < this.paymentList.length ; i++){
-            this.paymentList.textcss = ""
-          }
-          this.deptBudgetTotal = response.total
-        })
-      getJurisdiction({
-        managementType: 1,
-        warehouseName: this.warehouseName,
-        compId: sessionStorage.getItem('ws-pf_compId')
-      })
-        .toPromise()
-        .then(response => {
-          this.isShowAdopt = response
-        })
-
+        getpayment({
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+            searchType: searchParam,
+            warehouseName: this.warehouseName,
+            managementType: 1,
+            compId: sessionStorage.getItem('ws-pf_compId')
+          })
+          .toPromise()
+          .then(response => {
+            this.paymentList = response.records
+            for (let i = 0; i < this.paymentList.length; i++) {
+              this.paymentList.textcss = ""
+            }
+            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,
@@ -1116,6 +1108,7 @@ import {
   .label-width {
     width: 100%;
   }
+
   .mask {
     background: black;
     width: 100vw;