haugnfuli 3 yıl önce
ebeveyn
işleme
5469a557fe
1 değiştirilmiş dosya ile 1 ekleme ve 3 silme
  1. 1 3
      pageD/myRelease/sellGrain.vue

+ 1 - 3
pageD/myRelease/sellGrain.vue

@@ -558,7 +558,7 @@
 						}
 					}
 				}
-<<<<<<< HEAD
+
 				if(this.amendprice() == false){
 					this.$api.msg('验证码输入有误!')
 					return
@@ -567,13 +567,11 @@
 				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) {