前端小程序更新sdy

pageA/product/business_sale.vue

@@ -66,7 +66,7 @@
 			<view class="con-list">
 			<picker @change="invoiceChange" :value="invoiceIndex" :range="invoiceType">
 				<view class="picker">
-					{{packingIndex>-1?invoiceType[packingIndex]:'请选择'}}
+					{{invoiceIndex>-1?invoiceType[invoiceIndex]:'请选择'}}
 				</view>
 			</picker>
 			</view>
@@ -213,7 +213,6 @@
 				};
 			},
 			onLoad(options) {
-				console.log(options)
 				this.id=options.id
 				this.purchaseOrder.planId=options.id
 				this.purchaseOrder.seller = options.seller

pageA/product/sales_detail.vue

@@ -507,7 +507,7 @@
 						// &unloadingFee=${that.goods.unloadingFee}`
 						url:`/pageA/product/business_sale?id=${that.goods.id}&buyer=${that.goods.buyer}&seller=${that.goods.seller}&sendPrivate=${that.goods.sendPrivate}
 						&sendCity=${that.goods.sendCity}&sendArea=${that.goods.sendArea}&sendWarehouse=${that.goods.sendWarehouse}&goodsName=${that.goods.goodsName}
-						&minimumVolume=${that.goods.minimumVolume}&unitPrice=${that.goods.unitPrice}&basisPrice=${that.goods.basisPrice}`
+						&minimumVolume=${that.goods.minimumVolume}&unitPrice=${that.goods.unitPrice}&basisPrice=${that.goods.basisPrice}&salePlanType=${that.goods.salePlanType}`
 					})
 				}
 			}

pageD/myRelease/sellGrain.vue

@@ -558,22 +558,19 @@
 						}
 					}
 				}
-<<<<<<< HEAD
 				if(this.amendprice() == false){
 					this.$api.msg('验证码输入有误！')
 					return
 				}
-				this.insertProcurementPlanInfo = this.deptList
-				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
-				this.insertProcurementPlanInfo.commonId = this.userInfo.id
-				this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-=======
+				// this.insertProcurementPlanInfo = this.deptList
+				// this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
+				// this.insertProcurementPlanInfo.commonId = this.userInfo.id
+				// this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				this.insertSalePlanInfo = this.deptList
 				this.insertSalePlanInfo.basisPrice = -this.insertSalePlanInfo.basisPrice
 				this.insertSalePlanInfo.commonId = this.userInfo.id
 				this.insertSalePlanInfo.salePlanNo='XSJH'+this.getdate()+this.verifyinit()
 				this.insertSalePlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
->>>>>>> cf82327deab7b10c1c2181e90bf088a14545c10f
 				this.$api.doRequest('post', '/salePlanInfo/api/insertSalePlanInfo', this
 						.insertSalePlanInfo).then(res => {
 						if (res.data.code == 200) {