|
|
@@ -203,7 +203,7 @@
|
|
|
pageSize: 5
|
|
|
},
|
|
|
|
|
|
- contractInfo:{},
|
|
|
+ contractInfo:{businessDesc:''},
|
|
|
returnMsg:"",
|
|
|
contractId:'',
|
|
|
totalPrice:0,
|
|
|
@@ -268,13 +268,13 @@
|
|
|
bargainObj = {}
|
|
|
auditForm = {
|
|
|
// 审批流
|
|
|
- auditFlow: this.contractInfo.paymentMethod === '1' || this.contractInfo.paymentRatio !=='1' ? 3 :4,
|
|
|
+ auditFlow: this.contractInfo.businessDesc,
|
|
|
// 业务id 合同id
|
|
|
businessId: this.contractId,
|
|
|
// 审批结果
|
|
|
status: 30,
|
|
|
// 备注
|
|
|
- remark: '合同审批打回',
|
|
|
+ remark: '合同驳回成功',
|
|
|
// 业务参数
|
|
|
businessObj: bargainObj
|
|
|
}
|
|
|
@@ -286,7 +286,7 @@
|
|
|
}
|
|
|
auditForm = {
|
|
|
// 审批流
|
|
|
- auditFlow: this.contractInfo.paymentMethod === '1' || this.contractInfo.paymentRatio !=='1' ? 3 :4,
|
|
|
+ auditFlow: this.contractInfo.businessDesc,
|
|
|
// 业务id 报价id
|
|
|
businessId: this.contractId,
|
|
|
// 审批结果
|
|
|
@@ -309,20 +309,19 @@
|
|
|
this.$set(this.contractInfo,"approveStatus","1")
|
|
|
updateContract({...this.contractInfo}).then(res1=>{
|
|
|
if(res1 && res1.code == 200){
|
|
|
- nowTitle = "合同打回成功"
|
|
|
+ nowTitle = "操作成功"
|
|
|
this.approveOpen = false
|
|
|
}else{
|
|
|
- nowTitle = "合同打回失败"
|
|
|
+ nowTitle = "操作失败"
|
|
|
}
|
|
|
})
|
|
|
}else{
|
|
|
console.log("开始合同审批的操作")
|
|
|
- this.$set(this.contractInfo,"approveStatus","2")
|
|
|
editFlow({...this.contractInfo}).then(res2=>{
|
|
|
if(res2 && res2.code == 200){
|
|
|
- nowTitle = "合同审批成功"
|
|
|
+ nowTitle = "操作成功"
|
|
|
}else{
|
|
|
- nowTitle = "合同审批失败"
|
|
|
+ nowTitle = "操作失败"
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
@@ -391,6 +390,8 @@
|
|
|
this.totalPrice += ((item.unitPrice + item.additionalCost) * item.count)
|
|
|
})
|
|
|
}
|
|
|
+ let nowflow = this.contractInfo.version > 1 || this.contractInfo.paymentMethod === '1' || this.contractInfo.paymentRatio !=='1' ? 3 : 4
|
|
|
+ this.$set(this.contractInfo,'businessDesc',nowflow)
|
|
|
}
|
|
|
})
|
|
|
},
|
chenj