update:合并

ks3-js-sdk @ ea6ab311

+Subproject commit ea6ab311ebfa69725e824a5cc28bd53d93681d34

src/main.js

@@ -23,9 +23,11 @@ router.beforeResolve(async (to, from, next) => {
           router.push('/403')
         }
       })
+      next()
     } else {
       redirectToLogin();
     }
+    return false;
   } else {
     next()
   }

src/pages/Enterprise/Audit/index.vue

@@ -80,6 +80,21 @@
           ref="establish_form"
           :model="messageList[0]"
         >
+          <el-form-item
+            label="商户类型"
+            prop="merchantsType"
+          >
+            <el-select v-model="messageList[0].merchantsType">
+              <el-option
+                label="个体工商户"
+                :value="1"
+              ></el-option>
+              <el-option
+                label="普通企业"
+                :value="2"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item
             label="营业执照："
             ref="licenseChange"
@@ -393,10 +408,10 @@ export default {
     return {
       pageStatus: null, // 哪个按钮进入
       auditId: null, // 传入的企业id
-
       // 审核/修改详情/查看详情-企业信息
       messageList: [
         {
+          merchantsType: null,
           status: 1,
           id: 1221,
           code: 112211,
@@ -429,7 +444,6 @@ export default {
       ],
       // 审核-审核意见
       opinionArea: "",
-
       // 创建生活号表单是否弹出
       isDialogShow: false,
       // 生活号-生活号信息
@@ -487,7 +501,13 @@ export default {
             validator: idcardNumberRules,
             trigger: "blur"
           }
-        ]
+        ],
+        // 商户类型
+        merchantsType: [{
+          required: true,
+          message: "请选择商户类型",
+          trigger: "change"
+        }]
       },
 
       // 生活号状态

src/pages/Enterprise/Establish/index.vue

@@ -14,21 +14,23 @@
         ref="establishFormRef"
         :model="establishForm"
       >
+        <!-- 商户类型 -->
         <el-form-item
           label="商户类型"
-          prop="merchantsType"
+          prop="data_type"
         >
-          <el-select v-model="establishForm.merchantsType">
+          <el-select v-model="establishForm.data_type">
             <el-option
               label="个体工商户"
-              value="1"
+              :value="1"
             ></el-option>
             <el-option
               label="普通企业"
-              value="2"
+              :value="2"
             ></el-option>
           </el-select>
         </el-form-item>
+        <!--  -->
         <el-form-item
           label="营业执照："
           ref="licenseChange"
@@ -52,16 +54,16 @@
 
         <el-form-item
           label="企业注册名称："
-          prop="registeredName"
+          prop="name"
         >
-          <el-input v-model.trim="establishForm.registeredName"></el-input>
+          <el-input v-model.trim="establishForm.name"></el-input>
         </el-form-item>
 
         <el-form-item
           label="统一社会信用代码（注册码）："
-          prop="registrationCode"
+          prop="code"
         >
-          <el-input v-model.trim="establishForm.registrationCode"></el-input>
+          <el-input v-model.trim="establishForm.code"></el-input>
         </el-form-item>
         <el-form-item
           label="经营者（法人）身份证照片："
@@ -86,9 +88,9 @@
 
         <el-form-item
           label="经营者（法人）姓名："
-          prop="legalName"
+          prop="pers"
         >
-          <el-input v-model.trim="establishForm.legalName"></el-input>
+          <el-input v-model.trim="establishForm.pers"></el-input>
         </el-form-item>
 
         <el-form-item
@@ -150,12 +152,28 @@ export default {
     return {
       // 表单输入项
       establishForm: {
-        merchantsType: null, // 商户类型
+        user_id: null, // 用户id
+        code: null, // 企业代码
+        name: null, // 企业名称
+        type: null, // 营业执照上的企业类型
+        addr: null, // 企业注册地址
+        pers: null, // 法人
+        scope: null, // 经营范围
+        time: null, // 有效期
+        regi: null, // 注册资本
+        organizer: null, // 主管单位
+        date: null, // 成立时间
+        comp: null, // 登记机关
+        num: null, // 登记号,
+        form: null, // 组成形式
+        funding: null, // 经费来源
+        issue_date: null, // 发证日期
+        entterprise_image: null, // 金山云key
+        data_from: 0, // 数据来源
+        data_type: 0, // 企业认证类型
+        proxy_user_name: null, // OP后台代提交人姓名
         licenseList: [], // 营业执照
-        registeredName: "", // 注册名称
-        registrationCode: "", // 注册码
         idcardPhoto: [], // 身份证照片
-        legalName: "", // 法人姓名
         idcardNumber: "" // 法人身份证号
       },
 
@@ -166,11 +184,11 @@ export default {
           { required: true, validator: businessRules, trigger: "change" }
         ],
         // 企业注册名称
-        registeredName: [
+        name: [
           { required: true, message: "请输入企业注册名称", trigger: "blur" }
         ],
         // 注册码
-        registrationCode: [
+        code: [
           {
             required: true,
             message: "请输入统一社会信用代码（注册码）",
@@ -182,7 +200,7 @@ export default {
           { required: true, validator: idPhotoRules, trigger: "change" }
         ],
         // 法人姓名
-        legalName: [
+        pers: [
           {
             required: true,
             message: "请输入经营者（法人）姓名",
@@ -198,7 +216,7 @@ export default {
           }
         ],
         // 商户类型
-        merchantsType: [{ required: true, message: "请选择商户类型", trigger: "change" }]
+        data_type: [{ required: true, message: "请选择商户类型", trigger: "change" }]
       }
     };
   },
@@ -242,8 +260,8 @@ export default {
         console.log(valid);
         const query = {
           user_id: 510232747179, // 用户id
-          code: parseInt(this.establishForm.registrationCode), // 企业代码
-          name: this.establishForm.registeredName, // 企业名称
+          code: parseInt(this.establishForm.code), // 企业代码
+          name: this.establishForm.name, // 企业名称
           type: "", // 企业类型
           addr: "", // 企业注册地址
           pers: "", // 法人
@@ -275,13 +293,7 @@ export default {
       });
     },
 
-    // 选择商户
-    chooseType () {
-      if (this.establishForm.merchantsType) {
-        this.$refs["merchantsTypeRef"].clearValidate();
-      }
-      console.log(this.establishForm.merchantsType);
-    }
+
   }
 };
 </script>

src/router/index.js

 import { createRouter, createWebHistory } from "vue-router";
 
+import Certification from '@/pages/Enterprise/Certification'
+import Audit from '@/pages/Enterprise/Audit'
+import Establish from '@/pages/Enterprise/Establish'
+
 import LifeNo from '../pages/Life-no/index.vue'
 import LifeNoDetail from '../pages/Life-no/life-no-detail.vue'
 
@@ -27,7 +31,7 @@ const routes = [
   {
     path: '/enterprise/certification',
     name: 'Certification',
-    component: () => import(/* webpackChunkName: "enterprise" */ '@/pages/Enterprise/Certification'),
+    component: Certification,
     meta: {
       requireAuth: true,
     },
@@ -35,7 +39,7 @@ const routes = [
   {
     path: '/enterprise/audit',
     name: 'Audit',
-    component: () => import(/* webpackChunkName: "enterprise" */ '@/pages/Enterprise/Audit'),
+    component: Audit,
     meta: {
       requireAuth: true,
     }
@@ -43,7 +47,7 @@ const routes = [
   {
     path: '/enterprise/establish',
     name: 'Establish',
-    component: () => import(/* webpackChunkName: "enterprise" */ '@/pages/Enterprise/Establish'),
+    component: Establish,
     meta: {
       requireAuth: true,
     }

src/utils/oss.js

 import moment from "moment";
-import CommonServer from "@/api/common";
+import CommonServer from "./common";
 import axios from "axios";
 import { ElMessage } from "element-plus";