ccjgmwz 3 years ago
parent
commit
c6cc597394

+ 8 - 4
pageA/product/business_buy.vue

@@ -217,6 +217,8 @@
 				packingMoney: 0,
 				packing: '散装',
 				packingFee: null,
+				invoiceFeeCompany:0,
+				invoiceFeePerson:0
 				// choice : false,
 			};
 		},
@@ -238,6 +240,8 @@
 			this.purchaseOrder.procurementPlanType = options.procurementPlanType
 			this.purchaseOrder.procurementPlan = options.procurementPlan
 			this.purchaseOrder.compId = options.compId
+			this.invoiceFeeCompany = options.invoiceFeeCompany
+			this.invoiceFeePerson = options.invoiceFeePerson
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
@@ -257,12 +261,12 @@
 					if (res.data.code == 200) {
 						this.goods = res.data.data
 						if (this.goods.customerTypeFlag == 1) {
-							this.purchaseOrder.invoiceFee = -20
-							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) - Number(this
+							this.purchaseOrder.invoiceFee = this.invoiceFeePerson
+							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this
 								.purchaseOrder.invoiceFee)
 						} else {
-							this.purchaseOrder.invoiceFee = 0
-							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) - Number(this
+							this.purchaseOrder.invoiceFee = this.invoiceFeeCompany
+							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this
 								.purchaseOrder.invoiceFee)
 						}
 					}

+ 7 - 3
pageA/product/business_sale.vue

@@ -207,7 +207,9 @@
 					invoiceMoney:0,
 					unloadingFee:0,
 					packingMoney:0,
-					packing:'散装'
+					packing:'散装',
+					invoiceFeeCompany:0,
+					invoiceFeePerson:0
 				};
 			},
 			onLoad(options) {
@@ -230,6 +232,8 @@
 				// this.purchaseOrder.baggingNotes=options.baggingNotes
 				this.purchaseOrder.sendWarehouse = options.sendWarehouse
 				this.purchaseOrder.compId=options.compId
+				this.invoiceFeeCompany = options.invoiceFeeCompany
+				this.invoiceFeePerson = options.invoiceFeePerson
 			},
 			computed: {
 				...mapState(['hasLogin','userInfo']),
@@ -246,10 +250,10 @@
 					if(res.data.code==200){
 						this.goods=res.data.data
 						if(this.goods.customerTypeFlag==1){
-							// this.purchaseOrder.invoiceFee=-20
+							this.purchaseOrder.invoiceFee = this.invoiceFeePerson
 							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
 						}else{
-							// this.purchaseOrder.invoiceFee=0
+							this.purchaseOrder.invoiceFee = this.invoiceFeeCompany
 							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
 						}
 					}

+ 2 - 1
pageA/product/detail.vue

@@ -410,7 +410,8 @@
 								url: `/pageA/product/business_buy?id=${this.goods.id}&receiveArea=${this.goods.receiveArea}&minimumVolume=${this.goods.minimumVolume}
 										&goodsName=${this.goods.goodsName}&receiveCity=${this.goods.receiveCity}&receivePrivate=${this.goods.receivePrivate}&buyer=${this.goods.buyer}
 										&basisPrice=${this.goods.basisPrice}&procurementPrice=${this.goods.procurementPrice}&receiveWarehouse=${this.goods.receiveWarehouse}
-										&procurementPlanType=${this.goods.procurementPlanType}&procurementPlan=${this.goods.procurementPlanNo}&compId=${this.goods.compId}`
+										&procurementPlanType=${this.goods.procurementPlanType}&procurementPlan=${this.goods.procurementPlanNo}&compId=${this.goods.compId}
+										&invoiceFeeCompany=${this.goods.invoiceFeeCompany}&invoiceFeePerson=${this.goods.invoiceFeePerson}`
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}
 							// 	&companyId=${this.goods.companyId}&sellerPhone=${this.goods.sellerPhone}&minSale=${this.goods.minSale}

+ 2 - 1
pageA/product/sales_detail.vue

@@ -401,7 +401,8 @@
 								url: `/pageA/product/business_sale?id=${this.goods.id}&sendArea=${this.goods.sendArea}&minimumVolume=${this.goods.minimumVolume}
 										&goodsName=${this.goods.goodsName}&sendCity=${this.goods.sendCity}&sendPrivate=${this.goods.sendPrivate}&seller=${this.goods.seller}
 										&basisPrice=${this.goods.basisPrice}&salePrice=${this.goods.salePrice}&sendWarehouse=${this.goods.sendWarehouse}
-										&salePlanType=${this.goods.salePlanType}&salePlan=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}&compId=${this.goods.compId}`
+										&salePlanType=${this.goods.salePlanType}&salePlan=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}&compId=${this.goods.compId}
+										&invoiceFeeCompany=${this.goods.invoiceFeeCompany}&invoiceFeePerson=${this.goods.invoiceFeePerson}`
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}
 							// 	&companyId=${this.goods.companyId}&sellerPhone=${this.goods.sellerPhone}&minSale=${this.goods.minSale}