From 58759ed9e1da9374d56cb15f33abd93ba1bffa03 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 15 Sep 2021 17:32:06 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/util.js | 2 +- .../businessManagement/BusinessManagement.vue | 5 ++ .../modules/BusinessManagementModule.vue | 56 +++++++++++-------- .../modules/BatchIncomePaymentModule.vue | 2 - .../WorkingGroupPaymentStatisticsList.vue | 2 +- 5 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/utils/util.js b/src/utils/util.js index 2886c5e..44d06f6 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -596,7 +596,7 @@ export function isRepeat(arr) { export function addZero(e) { // (e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')} - console.log(e.target.value) + // console.log(e.target.value) // 判断是否包含 . let value = e.target.value // 判断是否包含小数点 diff --git a/src/views/businessManagement/BusinessManagement.vue b/src/views/businessManagement/BusinessManagement.vue index cabfe2e..0e4b533 100644 --- a/src/views/businessManagement/BusinessManagement.vue +++ b/src/views/businessManagement/BusinessManagement.vue @@ -120,6 +120,11 @@ export default { align: 'center', width: 180, dataIndex: 'companyPhone' + },{ + title: '状态', + align: 'center', + width: 100, + dataIndex: 'status' }, { title: '创建时间', align: 'center', diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue index 32d34b7..2ac0574 100644 --- a/src/views/businessManagement/modules/BusinessManagementModule.vue +++ b/src/views/businessManagement/modules/BusinessManagementModule.vue @@ -19,6 +19,16 @@ @change="e => {e.target.value = (e.target.value + '').trim()}"> + + + + + + + - - + + 查询邮编 - - + + - - - - - - - @@ -213,8 +213,8 @@ export default { this.form.validateFields((err, values) => { if (!err) { that.confirmLoading = true - values.dataSource = this.dataForm - values.signingUp = this.applyAdd + // values.dataSource = this.dataForm + // values.signingUp = this.applyAdd let httpurl = '' let method = 'post' if (!this.model.id) { @@ -293,21 +293,31 @@ export default { callback('请输入银行账号') }, /** - * 校验税号 + * 校验信用代码唯一性 * @param rules * @param value * @param callback */ checkDutyCode(rules, value, callback) { if (value) { - if (taxNo(value)) { - callback() - } else { - callback('请输入15位、17位、18位、20位数字和大写英文字母') + if (!this.model.id) { + const params = { + confusionCode: 'pay_company_duty_code', + fieldVal: value + } + duplicateCheck(params).then(res => { + if (res.success) { + callback() + } else { + callback('信用代码已存在') + } + }) + return } - return + callback() + } else { + callback('请输入信用代码') } - callback('请输入税号') }, /** * 企业名称唯一性校验 diff --git a/src/views/packManagement/modules/BatchIncomePaymentModule.vue b/src/views/packManagement/modules/BatchIncomePaymentModule.vue index e62e2d8..2f95db2 100644 --- a/src/views/packManagement/modules/BatchIncomePaymentModule.vue +++ b/src/views/packManagement/modules/BatchIncomePaymentModule.vue @@ -200,7 +200,6 @@ export default { }, open() { this.dataSource = this.tableData - console.log(this.dataSource) this.loadData() }, close() { @@ -262,7 +261,6 @@ export default { } } }) - console.log(this.dataSource) } , /** diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue index 82a3ec5..bf02306 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue @@ -70,7 +70,7 @@ 详情 -