Merge branch 'dev' of http://222.90.211.174:3000/suf/domestic--e-commerc-b into dev

package.json

@@ -35,7 +35,7 @@
     "vue-clipboard2": "^0.3.3",
     "vue-router": "3.0.6",
     "vue-ueditor-wrap": "^2.5.6",
-    "vue2-countdown": "^1.0.8",
+    "vue2-countdown": "1.0.8",
     "vuex": "3.1.0"
   },
   "devDependencies": {

src/router/moudules/enterpriseManage.js

@@ -22,7 +22,7 @@ export default {
     },
     {
       path: '/enterpriseEntry',
-      name: 'ESign', // EnterpriseEntry
+      name: 'EnterpriseEntry',
       component: () => import('@/views/enterpriseManage/enterpriseEntry/index.vue'),
       meta: { title: '企业准入列表' },
       hidden: false,

src/views/enterpriseManage/enterpriseEntry/components/AuditContent.vue

@@ -446,8 +446,41 @@ export default {
     }
   },
   methods: {
+    // 一键测算之前的校验
+    validateCalc() {
+      const beforeValideFeilds = [
+        'creditStatus',
+        'zhuichangAmt',
+        'overdueAmt',
+        'daikuanAmt',
+        'danbaoAmt',
+        'lpOverdueNum',
+        'lpOverdueMonth',
+        'lpOverdueAmt',
+        'lpCardStatus',
+        'lpExistXingshi',
+        'lpExistJinrong',
+        'lrOverdueNum',
+        'lrOverdueMonth',
+        'lrOverdueAmt',
+        'lrCardStatus',
+        'lrExistXingshi',
+        'lrExistJinrong'
+      ]
+
+      for (let i = 0; i < beforeValideFeilds.length - 1; i++) {
+        if (!this.ruleForm[beforeValideFeilds[i]]) {
+          return false
+        }
+      }
+      return true
+    },
     // 一键测算
     async handlerCalc() {
+      if (!this.validateCalc()) {
+        this.$message.warning('请填写完成的企业征信情况、法人征信及相关案件情况、 实际控制人征信及相关案件情况才能测算')
+        return
+      }
       const {
         creditStatus,
         zhuichangAmt,

yarn.lock

@@ -12259,9 +12259,9 @@ vue-ueditor-wrap@^2.5.6:
   resolved "https://registry.yarnpkg.com/vue-ueditor-wrap/-/vue-ueditor-wrap-2.5.6.tgz#1dca4b1790830f228c08d1c8e07ae7d0a420f1f2"
   integrity sha512-EJkYLyyzgOJTxGreiZ9wrmXthIMVVRSeFTzV6n0OR9w4aeqW79Prvog4jZ4G0kkmW3TTTBbZtHM9VNHEl6LJDA==
 
-vue2-countdown@^1.0.8:
+vue2-countdown@1.0.8:
   version "1.0.8"
-  resolved "https://registry.npmmirror.com/vue2-countdown/-/vue2-countdown-1.0.8.tgz#e0f20b6af6badb33cf99c8cc3df51d2c77f2ef35"
+  resolved "https://registry.yarnpkg.com/vue2-countdown/-/vue2-countdown-1.0.8.tgz#e0f20b6af6badb33cf99c8cc3df51d2c77f2ef35"
   integrity sha512-75LHeGwf5Qe+07N5RASVURtzqJknp4w/3UGnFCmQVTZbyvyk8Z5wqBh7oAcvWFlsyA1/QaiNr99QdqNTK/jTqw==
 
 vue@2.6.10: