mxx 3 лет назад
Родитель
Сommit
4d8efa96de

+ 2 - 0
src/api/V2/houseSelfCollect/index.js

@@ -82,3 +82,5 @@ export const API_POST_PAYMENT_SETTLEMENTEDIT = '/paymentManagement/api/editColle
 export const API_GET_INSPECT_GETDRYGRAINPRICE = '/purchasePrice/dryGrainPrice'
 //付款权限查询
 export const API_GET_INSPECT_GETJURISDICTION = '/paymentManagement/selectTaskId'
+//财务开票
+export const API_POST_INVOICING = '/paymentManagement/readXmlManagement'

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

@@ -42,7 +42,8 @@ import {
   API_GET_CUSTOMER_CODE,
   API_GET_CUSTOMER_CODEJY,
   API_GET_INSPECT_GETDRYGRAINPRICE,
-  API_GET_INSPECT_GETJURISDICTION
+  API_GET_INSPECT_GETJURISDICTION,
+  API_POST_INVOICING
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -128,3 +129,5 @@ 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)
+//财务开票
+export const invoicing  = appRx.post(API_POST_INVOICING, errorCatcher, errorHandle, filter)

+ 24 - 3
src/views/houseSelfCollect/paymentManagement.vue

@@ -15,7 +15,7 @@
               class="label-width"
               @change="selectType($event)"
             ></el-checkbox>
-            <el-checkbox label="打印发票" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
+            <!-- <el-checkbox label="打印发票" name="type" class="label-width" @change="selectType($event)"></el-checkbox> -->
           </el-checkbox-group>
         </div>
       </div>
@@ -43,6 +43,7 @@
         <ws-button :type="searchType == -1 ? 'primary' : ''" @click="screen(-1)">全部</ws-button>
         <ws-button type="primary" @click="reject" v-if="isShowAdopt">驳回</ws-button>
         <ws-button type="primary" @click="adopt" v-if="isShowAdopt">通过</ws-button>
+        <ws-button type="primary" @click="invoicingClick" v-if="isShowAdopt" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
         <ws-button
           type="primary"
@@ -149,6 +150,14 @@
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
           >打印</el-button>
+             <el-button
+            v-if="
+              scope.row.approveStatus ||
+              (scope.row.status != '待结算' && !scope.row.approveStatus)
+            "
+            @click="print(scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.finace`"
+          >财务打印</el-button>
           <el-button
             type="danger"
             v-if="
@@ -249,7 +258,8 @@ import {
   getpaymentexamine,
   getCustomerLook,
   paymentCommit,
-  getJurisdiction
+  getJurisdiction,
+  invoicing
 } from '@/model/houseSelfCollect/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import paymentPrint from './component/paymentPrint.vue'
@@ -320,6 +330,17 @@ export default {
     // this.getList()
   },
   methods: {
+    invoicingClick(){
+      let data = JSON.stringify(this.modification)
+      console.log("开票",this.modification)
+      //开票
+        invoicing(data)
+        .toPromise()
+        .then(response => {
+          console.log(response)
+    
+        })
+    },
     selectType(val) {
       console.log(val)
       console.log(this.ruleForm.type)
@@ -919,7 +940,7 @@ table {
   right: 0;
   margin: auto;
   width: 200px;
-  height: 215px;
+  height: 200px;
   background: white;
   border-radius: 10px;
   z-index: 999;

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

@@ -545,7 +545,6 @@ export default {
           for (let i = 0; i < _this.excelFreightspace.length; i++) {
             _ispushData = true
             for (let k = 0; k < _this.deptBudgetList.tranCarInfoList.length; k++) {
-              debugger
               if (
                 _this.excelFreightspace[i].driverPhone ==
                 _this.deptBudgetList.tranCarInfoList[k].driverPhone