Merge branch 'dev' of https://git.yidian-inc.com:8021/bp/op-web-service into dev

server/controllers/enterprise.js

@@ -34,7 +34,31 @@ exports.checkCode = async ctx => {
     json: true,
     body: ctx.request.body
   };
-  ctx.body = await req(ctx, opts)
+  ctx.body = await req(ctx, opts);
+};
+
+// 审核列表详情页回显信息列表
+exports.getRecordInfo = async ctx => {
+  const url = `${API_INTERNAL_URI}/merchant/inner/get_record_info`;
+  const opts = {
+    url,
+    method: "POST",
+    json: true,
+    body: ctx.request.body
+  };
+  ctx.body = await req(ctx, opts);
+};
+
+// 历史提交审核日志详情页
+exports.getLog = async ctx => {
+  const url = `${API_INTERNAL_URI}/merchant/inner/get_log`;
+  const opts = {
+    url,
+    method: "POST",
+    json: true,
+    body: ctx.request.body
+  };
+  ctx.body = await req(ctx, opts);
 };
 
 // 企业信息提交

server/router.js

@@ -29,6 +29,8 @@ router.post(`${API_VERSION}/certification`, enterprise.auditList);
 router.post(`${API_VERSION}/emterprise_commit`, enterprise.entCommit);
 router.post(`${API_VERSION}/send_code`, enterprise.sendCode);
 router.post(`${API_VERSION}/check_code`, enterprise.checkCode);
+router.post(`${API_VERSION}/get_record_info`, enterprise.getRecordInfo);
+router.post(`${API_VERSION}/get_log`, enterprise.getLog);
 
 router.get(`${API_VERSION}/image/get_image_id`, image.get_obj_id)
 router.get(`${API_VERSION}/image/get_bucket`, image.get_bucket)

src/pages/Enterprise/Certification/index.vue

@@ -234,6 +234,9 @@ export default {
       checkIsCode: "" // 用户修改操作的验证码
     };
   },
+  computed: {
+
+  },
 
   created () {
     this.getEnterpriseList();
@@ -272,7 +275,7 @@ export default {
       };
       try {
         const res = await auditList(params);
-        if (res.code !== 0) return this.$message.error(res.result);
+        if (res.code !== 0) return this.$message.error(res.reason);
         this.enterpriseList = res.result.data;
         this.totalCount = res.result.count;
         console.log(res);
@@ -305,10 +308,9 @@ export default {
 
     // 获取验证码
     async getAuthCode () {
-      console.log(this.auditId);
       try {
-        const res = await sendCode(this.auditId);
-        console.log(res);
+        const res = await sendCode({ enterprise_auth_record_id: this.auditId });
+        if (res.code !== 0) return this.$message.error(res.reason);
       } catch (err) {
         console.log(err);
       }
@@ -325,13 +327,15 @@ export default {
           };
           const res = await checkCode(parasm);
           console.log(res);
+          if (res.code !== 0) return this.$message.error(res.reason);
+          this.$message.success("验证码校验成功!");
+          this.$router.push({
+            name: "Audit",
+            params: { pageStatus: "EDIT", auditId: this.auditId }
+          });
         } catch (error) {
           console.log(error);
         }
-        this.$router.push({
-          name: "Audit",
-          params: { pageStatus: "EDIT", auditId: this.auditId }
-        });
       }
     },
 

src/pages/Enterprise/Establish/index.vue

@@ -64,7 +64,7 @@
         </el-form-item>
         <!-- 企业代码 -->
         <el-form-item
-          label="统一社会信用代码（注册码）："
+          label="统一社会信用代码（注册码："
           prop="code"
         >
           <el-input v-model.trim="establishForm.code"></el-input>
@@ -92,6 +92,24 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <!-- 代提交人手机号 -->
+        <el-form-item
+          label="待提交人手机号："
+          prop="mobile"
+        >
+          <el-input v-model.number="establishForm.mobile"></el-input>
+        </el-form-item>
+        <el-form-item
+          label="代提交标识"
+          prop="is_agent"
+        >
+          <el-select v-model="establishForm.is_agent">
+            <el-option
+              label="代提交"
+              :value="1"
+            ></el-option>
+          </el-select>
+        </el-form-item>
 
         <!-- =================普通企业法人/个体工商户身份认证信息========== -->
         <h3>身份信息</h3>
@@ -370,7 +388,7 @@ export default {
         ],
         // 数据来源
         data_from: [
-          { required: true, message: "请选择数据来源", trigger: "blur" }
+          { required: true, message: "请选择数据来源", trigger: "change" }
         ],
         /* ****************法人/个体用户身份校验***************** */
         // 企业营业执照号
@@ -400,7 +418,9 @@ export default {
         // 经营者/法人姓名
         userName: [
           { required: true, message: "请填写经营者(法人姓名)", trigger: "blur" }
-        ]
+        ],
+        mobile: [{ required: true, message: "请填写待提交人手机号", trigger: "blur" }],
+        is_agent: [{ required: true, message: "请填写是否代提交", trigger: "change" }]
       }
     };
   },

src/service/enterprise.js

@@ -31,6 +31,23 @@ export async function checkCode (params) {
   return res;
 }
 
+/**
+ * 获取审核列表详情
+ * @param enterprise_auth_record_id 审核记录id
+ */
+export async function getRecordInfo (params) {
+  const res = axios.post(`/api/v1/get_record_info`, params);
+  return res;
+}
+/**
+ * 获取提交审核日志
+ * @param enterprise_auth_record_id 审核记录id
+ */
+export async function getLog (params) {
+  const res = axios.post(`/api/v1/get_log`, params);
+  return res;
+}
+
 // 发送企业信息认证
 export async function entCommit (query) {
   const res = await axios.post(`/api/v1/emterprise_commit`, query);