From 84124f4a1edf373a7aec778290b08e3666018a93 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Sun, 26 Sep 2021 16:04:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81=E6=AD=A3?=
 =?UTF-8?q?=E5=88=99=EF=BC=8C=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/validate.js                                    | 9 +++++++++
 .../modules/BusinessManagementModule.vue                 | 6 +++++-
 .../ProjectPaymentStatisticsList.vue                     | 4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/utils/validate.js b/src/utils/validate.js
index 78d9034..d9126a0 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -79,3 +79,12 @@ export function number(s) {
 export function money(s) {
   return /^[0-9](\d{1,9})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,9}$|^0$/.test(s)
 }
+
+/**
+ * 信用代码 15、18位
+ * @param s
+ * @returns {boolean}
+ */
+export function dutyCode(s) {
+  return /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/.test(s)
+}
diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue
index da5db6e..514f9b1 100644
--- a/src/views/businessManagement/modules/BusinessManagementModule.vue
+++ b/src/views/businessManagement/modules/BusinessManagementModule.vue
@@ -106,7 +106,7 @@
 </template>
 
 <script>
-import { postcode, phoneReg, isPhone, number } from '@/utils/validate'
+import { postcode, phoneReg, isPhone, number, dutyCode } from '@/utils/validate'
 import pick from 'lodash.pick'
 import { httpAction } from '@api/manage'
 import { duplicateCheck } from '@api/api'
@@ -300,6 +300,10 @@ export default {
      */
     checkDutyCode(rules, value, callback) {
       if (value) {
+        if (!dutyCode(value)) {
+          callback('请输入15位、18位数字和大写英文字母')
+          return
+        }
         if (!this.model.id) {
           const params = {
             confusionCode: 'pay_company_duty_code',
diff --git a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
index efa03df..46ba664 100644
--- a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
+++ b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
@@ -154,8 +154,8 @@ export default {
         sm: { span: 10 }
       },
       url: {
-        list: '/statistics/allProjectStatistics/list',
-        exportXlsUrl: '/statistics/allProjectStatistics/statistics/excel'
+        list: '/statistics/allProjectStatistics/listProject',
+        exportXlsUrl: '/statistics/allProjectStatistics/statistics/excelProject'
       },
       columns: [
         {