From 30205bbf3ca9bf47c7393a9f9d7c81eeba7cc70f Mon Sep 17 00:00:00 2001 From: sunzehua Date: Fri, 8 Nov 2024 13:59:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/finance/feeSettlement/columns.tsx | 10 ++++++---- .../paymentSettlementFree/columns.tsx | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/views/finance/feeSettlement/columns.tsx b/src/views/finance/feeSettlement/columns.tsx index 72ff7f66..6f047f81 100644 --- a/src/views/finance/feeSettlement/columns.tsx +++ b/src/views/finance/feeSettlement/columns.tsx @@ -407,7 +407,8 @@ export const detailForm: FormSchema[] = [ } GetClientBankList(data).then((res) => { res.data.forEach(item => { - item.showName = item.bankName + ' ' + item.account + item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :'' + item.showName = item.bankName + ' ' + item.bankAccountNo }) resolve(res) }) @@ -420,7 +421,7 @@ export const detailForm: FormSchema[] = [ onChange: (e, obj) => { if (obj) { formModel.customerBankId = obj.id - formModel.customerAccount = obj.account + formModel.customerAccount = obj.bankAccountNo } if (!obj && !e) { formModel.customerBankId = '' @@ -495,8 +496,9 @@ export const detailForm: FormSchema[] = [ } getBankList(data).then(res => { res.data.forEach(item=>{ - item.label = item.bankName + ' ' + item.account - item.value = item.bankName + ' ' + item.account + item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :'' + item.label = item.bankName + ' ' + item.bankAccountNo + item.value = item.bankName + ' ' + item.bankAccountNo }) bankList.value = res.data }) diff --git a/src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx b/src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx index 66ed1e5a..b34f797d 100644 --- a/src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx +++ b/src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx @@ -402,7 +402,8 @@ export const detailForm: FormSchema[] = [ } GetClientBankList(data).then((res) => { res.data.forEach(item => { - item.showName = item.bankName + ' ' + item.account + item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :'' + item.showName = item.bankName + ' ' + item.bankAccountNo }) resolve(res) }) @@ -415,7 +416,7 @@ export const detailForm: FormSchema[] = [ onChange: (e, obj) => { if (obj) { formModel.customerBankId = obj.id - formModel.customerAccount = obj.account + formModel.customerAccount = obj.bankAccountNo } if (!obj && !e) { formModel.customerBankId = '' @@ -490,8 +491,9 @@ export const detailForm: FormSchema[] = [ } getBankList(data).then(res => { res.data.forEach(item=>{ - item.label = item.bankName + ' ' + item.account - item.value = item.bankName + ' ' + item.account + item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :'' + item.label = item.bankName + ' ' + item.bankAccountNo + item.value = item.bankName + ' ' + item.bankAccountNo }) bankList.value = res.data }) From 13ca72aa7a5a32563cfd7bf45a89aef327b4c612 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Fri, 8 Nov 2024 14:36:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/operation/invoiceIssue/detail/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/operation/invoiceIssue/detail/index.vue b/src/views/operation/invoiceIssue/detail/index.vue index fa863fa3..2a61955e 100644 --- a/src/views/operation/invoiceIssue/detail/index.vue +++ b/src/views/operation/invoiceIssue/detail/index.vue @@ -579,7 +579,7 @@ const detailForm = [ }, }, { - field: 'isSetRed', + field: 'isSetRedName', label: '是否冲红', component: 'Input', dynamicDisabled: true, @@ -804,10 +804,10 @@ function getDetail() { res.data.isLockedName = '否' } if (res.data.isSetRed) { - res.data.isSetRed = '是' + res.data.isSetRedName = '是' res.data.invoiceType = '红票' } else { - res.data.isSetRed = '否' + res.data.isSetRedName = '否' res.data.invoiceType = '正票' } if (res.data.invoiceNO) { From cac1df091c1fba11d9328f1760b04acfd9876086 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Fri, 8 Nov 2024 14:47:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/invoiceIssue/detail/index.vue | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/src/views/operation/invoiceIssue/detail/index.vue b/src/views/operation/invoiceIssue/detail/index.vue index 2a61955e..6360aaa0 100644 --- a/src/views/operation/invoiceIssue/detail/index.vue +++ b/src/views/operation/invoiceIssue/detail/index.vue @@ -340,18 +340,7 @@
- - + @@ -547,11 +536,13 @@ const detailForm = [ { field: 'cellPhoneNOFlag', component: 'Input', + defaultValue: true, show: false, colProps: { span: 24 }, }, { field: 'emailFlag', + defaultValue: true, show: false, component: 'Input', colProps: { span: 24 }, @@ -560,14 +551,12 @@ const detailForm = [ field: 'email', label: '邮箱', component: 'Input', - slot: 'email', colProps: { span: 24 }, }, { field: 'cellPhoneNO', label: '手机', component: 'Input', - slot: 'cellPhoneNO', colProps: { span: 24 }, }, { @@ -817,14 +806,6 @@ function getDetail() { } res.data.emailFlag = false res.data.cellPhoneNOFlag = false - res.data.pushModeValues.forEach(item => { - if (item == 1) { - res.data.emailFlag = true - } - if (item == 2) { - res.data.cellPhoneNOFlag = true - } - }) res.data.applyAmount = numberThousandFormat(res.data.applyAmount, 2, false) res.data.otherInvoiceAmount = numberThousandFormat(res.data.otherInvoiceAmount, 2, false) res.data.invoiceAmount = numberThousandFormat(res.data.invoiceAmount, 2, false)