From cd07bf67c3bd0db25245766e7702d19bf666d8e3 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Wed, 19 Apr 2023 17:14:52 +0800 Subject: [PATCH] 2023-4-19 --- src/api/out/index.js | 5 +- .../contract/components/contractSign.vue | 133 ++++++++++++++--- .../contract/components/detailContract.vue | 141 ++++++++++++------ src/views/contract/contractList.vue | 36 ++++- 4 files changed, 241 insertions(+), 74 deletions(-) diff --git a/src/api/out/index.js b/src/api/out/index.js index 5188cf6..f2747bf 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 }) { +export function getOutDetail({ tbname,out_caigou_id,out_contract_id,out_pay_id }) { return request({ method: 'get', url: '/index.php', @@ -8,7 +8,8 @@ export function getOutDetail({ tbname,out_caigou_id,out_contract_id }) { s: "/Api/flowDetail", tbname, out_caigou_id, - out_contract_id + out_contract_id, + out_pay_id } }) } diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue index d0ede1a..2826761 100644 --- a/src/views/contract/components/contractSign.vue +++ b/src/views/contract/components/contractSign.vue @@ -46,7 +46,7 @@ *合同金额
- +
@@ -129,6 +129,14 @@ diff --git a/src/views/contract/components/detailContract.vue b/src/views/contract/components/detailContract.vue index 417e442..6a9f852 100644 --- a/src/views/contract/components/detailContract.vue +++ b/src/views/contract/components/detailContract.vue @@ -146,6 +146,43 @@ +
+
付款信息
+
+
状态
+
+ {{ statusFormat(outPayDetail.flow.current_step) }} +
+
+
+
总价
+
+ {{ moneyFormat(outPayDetail.flow_detail.zongjia) }} +
+
（元）
+
+
+
+
已支付次数
+
+ {{ outPayDetail.flow_detail.yizhifucishu }} +
+
+
+
已支付金额
+
+ {{ outPayDetail.flow_detail.yizhifujine }} +
+
（元）
+
+
+
总支付次数
+
+ {{ outPayDetail.flow_detail.zhifucishu }} +
+
+
+
付款计划
-
-
相关流程进展查看
-
-
- 采购流程查看 -
-
- 合同会签流程查看 -
- - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
日志
{ const typeSwitch = (type) => { - { - let res = this.planTypes.filter((item) => { - return item.id === type; - }); - return res[0]?.value || "未知"; - } + let res = this.planTypes.filter((item) => { + return item.id === type; + }); + return res[0]?.value || "未知"; }; return (
@@ -385,6 +420,7 @@ export default { //out获取到信息 outContractDetail: {}, outCaigouDetail: {}, + outPayDetail: {}, }; }, methods: { @@ -540,6 +576,17 @@ export default { return moneyFormatter(money); }; }, + statusFormat() { + return function (status) { + if(status === 'end') { + return "已办结" + } + if(Number(status)) { + return "进行中" + } + return "待办理" + } + } }, watch: { isShowDetail(val) { @@ -554,6 +601,11 @@ export default { this.outCaigouDetail = res; } ); + getOutDetail({ tbname: "pay", out_pay_id: this.id }).then( + (res) => { + this.outPayDetail = res; + } + ); } }, }, @@ -563,6 +615,9 @@ export default { this.window.top = (window.screen.height - 30 - this.window.height) / 2; this.window.left = (window.screen.width - 10 - this.window.width) / 2; }, + created() { + this.getPlanTypes(); + } }; diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index ef6882a..8057163 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -163,15 +163,23 @@ @@ -228,7 +236,7 @@ @@ -1571,6 +1579,24 @@ export default { `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` ) }, + //付款流程 + async paying(row) { + // this.setNowContract(row,'pay') + let baseInfo = { + "title": row?.name, + "type": this.type.filter(item => { + return item.value === row.type + })[0]?.label, + "hetongbianhao": row?.number, + "out_pay_id": row.id, + //"承包商\\供应商":row.supply + } + let url = + `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/24&id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}` + let signProcess = window.open(url, 'signProcess', + `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` + ) + }, //请示流程 async askProcess(row) { let res = await getOatoken()