diff --git a/src/api/out/index.js b/src/api/out/index.js index 4702dae..eecfe4c 100644 --- a/src/api/out/index.js +++ b/src/api/out/index.js @@ -22,10 +22,7 @@ export function httpCurl(params,noloading = true,s= '/Api/flowDetail',method='GE data: { url: url || process.env.VUE_APP_OUT_OLD, method, - params: { - s, - ...params - } + params }, noloading }) @@ -52,4 +49,4 @@ export function getOaToken () { url: "/api/admin/oa/get-oa-token", noloading: true }) -} \ No newline at end of file +} diff --git a/src/settings.js b/src/settings.js index 9c61878..fd32f33 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: '江苏省苏州环境监测中心内控管理平台', + title: '江苏省宿迁环境监测中心内控管理平台', /** * @type {boolean} true | false diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue index 66ec3bf..f5e2b5c 100644 --- a/src/views/contract/components/contractSign.vue +++ b/src/views/contract/components/contractSign.vue @@ -536,13 +536,14 @@ }, async getOutContract() { - const res = await httpCurl({ tbname: 'hetong', out_contract_id: this.contract.id }) + let url = `${process.env.VUE_APP_OUT_URL}/flow/view/${this.form.join_last_flow_id}` + const res = await httpCurl({ auth_token: this.$store.getters.oa_token ,get_raw:1 },true,"/Api/flowDetail", "GET",url) console.log(res) - if (res.flow.serial) this.form.number = "HT-"+res.flow?.serial - if (res.flow_detail.total) this.form.money = Number(res.flow_detail?.total) - if (res.flow_detail.yifang) this.form.supply = res.flow_detail?.yifang - if (res.flow.dept_name) this.form.carryDepartment = res.flow?.dept_name - if (res.flow_detail.contract_content) this.form.content = res.flow_detail.contract_content + if (res.flow["合同编号"]) this.form.number = "HT-"+res.flow["合同编号"] + if (res.flow["合同金额"]) this.form.money = Number(res.flow["合同金额"]) + if (res.flow["合同乙方"]) this.form.supply = res.flow["合同乙方"] + //if (res.flow.dept_name) this.form.carryDepartment = res.flow?.dept_name + if (res.flow["合同主要内容"]) this.form.content = res.flow["合同主要内容"] }, //获取oa合同信息 // async getOaContractInfo() { diff --git a/src/views/contract/components/printRegistration.vue b/src/views/contract/components/printRegistration.vue index 0c06836..0893d29 100644 --- a/src/views/contract/components/printRegistration.vue +++ b/src/views/contract/components/printRegistration.vue @@ -3,7 +3,7 @@