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

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_POST_INVOICING = '/paymentManagement/readXmlManagement'
+export const API_GET_INVOICING = '/paymentManagement/readXmlManagement'

src/model/houseSelfCollect/index.js

@@ -43,7 +43,7 @@ import {
   API_GET_CUSTOMER_CODEJY,
   API_GET_INSPECT_GETDRYGRAINPRICE,
   API_GET_INSPECT_GETJURISDICTION,
-  API_POST_INVOICING
+  API_GET_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.post(API_POST_INVOICING, errorCatcher, errorHandle, filter)
+export const invoicing  = appRx.get(API_GET_INVOICING, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/paymentManagement.vue

@@ -337,8 +337,11 @@ export default {
   },
   methods: {
     invoicingClick(){
-      let data = JSON.stringify(this.modification)
-      console.log("开票",this.modification)
+      
+      let data = JSON.stringify({
+        paymentManagement :this.modification
+      })
+      console.log("开票",data)
       //开票
         invoicing(data)
         .toPromise()

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -543,7 +543,7 @@
 				this.stockSaleReceiptReport.money = this.money
 				this.stockSaleReceiptReport.collectionDate = this.collectionDate
 				if (
-					this.money < 0 ||
+					this.money == 0 ||
 					(String(this.money).indexOf('.') != -1 &&
 						String(this.money).length - (String(this.money).indexOf('.') + 1) >
 						2)
@@ -570,13 +570,13 @@
 					})
 					return
 				}
-				if (this.money > this.uncollectedAmount) {
+				if (this.money >= 0&&this.money > this.uncollectedAmount) {
 					this.$message({
 						message: '收款金额不能大于未收金额！',
 						type: 'warning',
 					})
 					return
-				}
+			    }
 				this.$confirm(`确定提交收款信息？`, {
 					cancelButtonText: '取消',
 					confirmButtonText: '确定',