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