|
@@ -617,9 +617,15 @@ export default {
|
|
|
if (e == '发运结束') {
|
|
|
data = { id: row.id, endFlag: 1 }
|
|
|
} else if (e == '已完成') {
|
|
|
- var response=await getsettlementprice({ contractNo: row.contractNo }).toPromise()
|
|
|
- data = { id: row.id, settlementPrice: response}
|
|
|
- text = `合同单价${response}元/吨,确定合同已完成?`
|
|
|
+ var response=await getsettlementprice({ contractNo: row.contractNo }).toPromise().catch(()=>{
|
|
|
+ row.status = row.currectstatus
|
|
|
+ return
|
|
|
+ })
|
|
|
+ if(row.status=='执行中'){
|
|
|
+ return
|
|
|
+ }
|
|
|
+ data = { id: row.id, settlementPrice: response}
|
|
|
+ text = `合同单价${response}元/吨,确定合同已完成?`
|
|
|
} else {
|
|
|
data = { id: row.id }
|
|
|
}
|