diff --git a/src/api/out/index.js b/src/api/out/index.js index f2747bf..da9f7db 100644 --- a/src/api/out/index.js +++ b/src/api/out/index.js @@ -1,5 +1,5 @@ import request from "@/utils/request" -export function getOutDetail({ tbname,out_caigou_id,out_contract_id,out_pay_id }) { +export function getOutDetail({ tbname,out_caigou_id,out_contract_id,out_pay_id,out_zhaobiao_id }) { return request({ method: 'get', url: '/index.php', @@ -9,7 +9,8 @@ export function getOutDetail({ tbname,out_caigou_id,out_contract_id,out_pay_id } tbname, out_caigou_id, out_contract_id, - out_pay_id + out_pay_id, + out_zhaobiao_id } }) } diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index b22ccce..1495cce 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -1548,13 +1548,14 @@ export default { }, //招标文件审查 async bidding(row) { + this.setNowContract(row,'zhaobiao') let baseInfo = { - "项目名称": row?.name, - "项目预算(元)": row?.plan_price + "title": row?.name, + "out_zhaobiao_id": row.id, } //let res = await getOatoken() let url = - `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/8&oatoken=${res.oatoken}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}` + `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/30&id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}&out_zhaobiao_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}` let bidding = window.open(url, 'bidding', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` ) @@ -1990,15 +1991,20 @@ export default { case "hetong": select['out_contract_id'] = this.nowContract.id; break; + case "zhaobiao": + select['out_zhaobiao_id'] = this.nowContract.id; + break; } const res = await getOutDetail(select) let flowIdMap = new Map([ ['caigou',8], - ['hetong',9] + ['hetong',9], + ['zhaobiao',30] ]) let flowTypeMap = new Map([ ['caigou',2], - ['hetong',3] + ['hetong',3], + ['zhaobiao',27] ]) let getStatus = (status) => { if(status === 'end') { diff --git a/src/views/finance/evaluateConfirm.vue b/src/views/finance/evaluateConfirm.vue new file mode 100644 index 0000000..1f9066c --- /dev/null +++ b/src/views/finance/evaluateConfirm.vue @@ -0,0 +1,17 @@ + + + + +