From a2c29e8ddab812cdae98a7b2dfd50fda933a5486 Mon Sep 17 00:00:00 2001 From: zcx <377075991@qq.com> Date: Fri, 20 Oct 2023 17:22:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/zs/sign/columns.js | 8 ++ .../CheckDialog/components/SignForm.vue | 16 +-- .../zs/sign/components/SettlementDialog.vue | 104 ++++++++++++++++++ .../zs/sign/components/SignFormDialog.vue | 14 --- src/views/zs/sign/index.vue | 26 ++++- 5 files changed, 141 insertions(+), 27 deletions(-) create mode 100644 src/views/zs/sign/components/SettlementDialog.vue diff --git a/src/views/zs/sign/columns.js b/src/views/zs/sign/columns.js index 2eb0da5..6dbe716 100644 --- a/src/views/zs/sign/columns.js +++ b/src/views/zs/sign/columns.js @@ -160,5 +160,13 @@ export const defaultColumns = [{ width: 140, visible: true, overflow: true + }, + { + key: 21, + prop: 'settlementMoney', + label: '结算金额', + width: 140, + visible: true, + overflow: true } ]; diff --git a/src/views/zs/sign/components/CheckDialog/components/SignForm.vue b/src/views/zs/sign/components/CheckDialog/components/SignForm.vue index 3a24846..7440c68 100644 --- a/src/views/zs/sign/components/CheckDialog/components/SignForm.vue +++ b/src/views/zs/sign/components/CheckDialog/components/SignForm.vue @@ -121,13 +121,15 @@ - + + + + + + + + + diff --git a/src/views/zs/sign/components/SettlementDialog.vue b/src/views/zs/sign/components/SettlementDialog.vue new file mode 100644 index 0000000..4b089cd --- /dev/null +++ b/src/views/zs/sign/components/SettlementDialog.vue @@ -0,0 +1,104 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/zs/sign/components/SignFormDialog.vue b/src/views/zs/sign/components/SignFormDialog.vue index baf6f1b..a11765a 100644 --- a/src/views/zs/sign/components/SignFormDialog.vue +++ b/src/views/zs/sign/components/SignFormDialog.vue @@ -124,13 +124,6 @@ - @@ -141,13 +134,6 @@ - - - - - - - diff --git a/src/views/zs/sign/index.vue b/src/views/zs/sign/index.vue index fb69537..c1c8a32 100644 --- a/src/views/zs/sign/index.vue +++ b/src/views/zs/sign/index.vue @@ -21,17 +21,18 @@ - + @@ -43,10 +44,13 @@ - + + + + @@ -58,6 +62,7 @@ import SearchForm from './components/SearchForm.vue'; import SignFormDialog from './components/SignFormDialog.vue'; import { defaultColumns } from './columns.js'; import UploadDialog from './components/UploadDialog.vue'; +import SettlementDialog from './components/SettlementDialog.vue'; export default { name: 'Sign', @@ -65,7 +70,8 @@ export default { SearchForm, CheckDialog, SignFormDialog, - UploadDialog + UploadDialog, + SettlementDialog }, data() { return { @@ -97,7 +103,8 @@ export default { dialog: { signVisible: false, checkVisible: false, - uploadVisible: false + uploadVisible: false, + settlementVisible: true }, options: { userOptions: [], @@ -225,6 +232,13 @@ export default { this.$nextTick(() => { this.$refs.checkDialogForm.init(item); }); + }, + //结算 + handleSettlement(item){ + this.dialog.settlementVisible = true + this.$nextTick(() => { + this.$refs.SettlementDialog.init(item); + }) } } };