From 97ebd9b6ca2dbafa4154240b3482e405afba8857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
<153298343@qq.com>
Date: Wed, 16 Nov 2022 17:04:49 +0800
Subject: [PATCH] up
---
.../components/detailPaymentRegistration.vue | 699 ++++++++++--------
.../components/paymentRegistration.vue | 19 +-
.../contract/components/printRegistration.vue | 2 +-
.../contract/paymentRegistrationList.vue | 206 +++---
src/views/contract/seeContract.vue | 43 +-
5 files changed, 532 insertions(+), 437 deletions(-)
diff --git a/src/views/contract/components/detailPaymentRegistration.vue b/src/views/contract/components/detailPaymentRegistration.vue
index e70f6c3..0c1805a 100644
--- a/src/views/contract/components/detailPaymentRegistration.vue
+++ b/src/views/contract/components/detailPaymentRegistration.vue
@@ -1,328 +1,373 @@
-
-
-
-
-
-
受款单位
-
{{form.contract.supply}}
-
-
-
合同名称
-
{{form.contract.name}}
-
-
-
合同金额
-
{{moneyFormat(form.contract.money)}} (元)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- *款项类型
-
-
-
-
-
-
-
-
-
-
-
-
- *是否为最后一笔
-
-
- e ? form.is_end = 1 : form.is_end = 0"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index e78f477..5ecd1c3 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -65,9 +65,19 @@
-
@@ -197,7 +207,8 @@
isShowPaymentRegistration: false,
paymentRegistrationForm: {
applyMoney: "",
- deductionMoney: "",
+ deductionMoney: "",
+ audit_money:"",
type: "",
isLast: false,
plan: [],
diff --git a/src/views/contract/components/printRegistration.vue b/src/views/contract/components/printRegistration.vue
index 6c869ae..29d3a01 100644
--- a/src/views/contract/components/printRegistration.vue
+++ b/src/views/contract/components/printRegistration.vue
@@ -29,7 +29,7 @@
B
审计金额
-
+ {{priceFormat(registration.audit_money)}}
C
前期累计已支付
diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue
index 371701c..e30bca6 100644
--- a/src/views/contract/paymentRegistrationList.vue
+++ b/src/views/contract/paymentRegistrationList.vue
@@ -117,106 +117,128 @@
width: 120
},
{
- prop: 'status',
- label: '状态',
- width: 120,
- formatter: (cell, data, value) => {
- if (value === 0) return '待审核'
- else return '已审核'
- }
- },
- {
- label: "次数",
- prop: "pay_count",
- width: 95,
- formatter: (cell, data, value) => {
- return value + 1;
- }
- },
- {
- label: "是否为最后一笔",
- prop: "is_end",
- width: 145,
- formatter: (cell, data, value) => {
- return value == 1 ? "是" : "否"
+ label: "预算计划",
+ width: 320,
+ align: "left",
+ customFn: (row) => {
+ {
+ if (row.act_plan_link.length > 0) {
+ return row.act_plan_link.map(item => {
+ return ( < div > [{
+ item.plan.year
+ }] - {
+ item.plan.name
+ } < br / > [使用金额] {
+ item.use_money
+ }
+ 元 < /div>)
+ })
+ }
+ }
+
+ }
+ },
+ {
+ prop: 'status',
+ label: '状态',
+ width: 120,
+ formatter: (cell, data, value) => {
+ if (value === 0) return '待审核'
+ else return '已审核'
+ }
+ },
+ {
+ label: "次数",
+ prop: "pay_count",
+ width: 95,
+ formatter: (cell, data, value) => {
+ return value + 1;
+ }
+ },
+ {
+ label: "是否为最后一笔",
+ prop: "is_end",
+ width: 145,
+ formatter: (cell, data, value) => {
+ return value == 1 ? "是" : "否"
+ }
+ },
+ {
+ label: "经办人",
+ minWidth: 160,
+ prop: 'admin.name',
+ align: 'center'
+ },
+ {
+ label: "业务科室",
+ minWidth: 160,
+ prop: 'department.name',
+ align: 'center'
+ },
+ {
+ label: "备注",
+ minWidth: 460,
+ prop: 'remark',
+ align: 'left'
+ },
+ {
+ label: "创建信息",
+ prop: "created_at",
+ width: 160,
+ formatter: (cell, data, value) => {
+ return parseTime(new Date(value), '{y}-{m}-{d}')
+ }
}
+ ]
+ }
+ },
+ methods: {
+ pageSizeChange(e) {
+ this.pageSize = e;
+ this.pageIndex = 1;
+ this.getFundLogs()
},
- {
- label: "经办人",
- minWidth: 160,
- prop: 'admin.name',
- align: 'center'
- },
- {
- label: "业务科室",
- minWidth: 160,
- prop: 'department.name',
- align: 'center'
+ pageChange(e) {
+ this.pageIndex = e
+ this.getFundLogs()
},
- {
- label: "备注",
- minWidth: 460,
- prop: 'remark',
- align: 'left'
+
+ async getFundLogs() {
+ const res = await getFundLog({
+ page_size: this.pageSize,
+ page: this.pageIndex,
+ contract_id: this.contractId,
+ keyword: this.keywords,
+ date: this.selectDate,
+ is_auth: this.is_auth,
+ status: this.status,
+ })
+ this.list = res.data
+ this.total = res.total
},
- {
- label: "创建信息",
- prop: "created_at",
- width: 160,
- formatter: (cell, data, value) => {
- return parseTime(new Date(value), '{y}-{m}-{d}')
- }
- }
- ]
- }
- },
- methods: {
- pageSizeChange(e) {
- this.pageSize = e;
- this.pageIndex = 1;
- this.getFundLogs()
- },
- pageChange(e) {
- this.pageIndex = e
- this.getFundLogs()
- },
- async getFundLogs() {
- const res = await getFundLog({
- page_size: this.pageSize,
- page: this.pageIndex,
- contract_id: this.contractId,
- keyword: this.keywords,
- date: this.selectDate,
- is_auth: this.is_auth,
- status: this.status,
- })
- this.list = res.data
- this.total = res.total
- },
+ deleteFundLog(row) {
+ delFundLog({
+ id: row.id
+ }).then(res => {
+ Message({
+ type: 'success',
+ message: '操作成功'
+ })
+ this.getFundLogs()
+ })
+ }
+ },
+ mounted() {
+ this.contractId = this.$route.query.contractId
- deleteFundLog(row) {
- delFundLog({
- id: row.id
- }).then(res => {
- Message({
- type: 'success',
- message: '操作成功'
- })
this.getFundLogs()
- })
- }
- },
- mounted() {
- this.contractId = this.$route.query.contractId
-
- this.getFundLogs()
- },
- created() {
- let type = parseInt(this.$route.path.split("_")[1]);
- this.type = this.is_auth = type;
+ },
+ created() {
+ let type = parseInt(this.$route.path.split("_")[1]);
+ this.type = this.is_auth = type;
+ }
}
- }