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

server/controllers/enterprise.js

 const API_INTERNAL_URI = require("../config.js").API_INTERNAL_URI;
 const req = require("../utils/request").httpReq;
+const controller_utils = require("./utils");
 
 // 获取企业信息列表
 exports.auditList = async ctx => {
@@ -46,7 +47,27 @@ exports.getRecordInfo = async ctx => {
     json: true,
     body: ctx.request.body
   };
-  ctx.body = await req(ctx, opts);
+  let permission = await controller_utils.getUserPermission(ctx);
+  permission = JSON.parse(permission);
+  const request = await req(ctx, opts);
+  if (permission.is_sensitive_data !== 1) {
+    request.result.record.entterprise_image = null; // 营业执照照片
+    request.result.record.legal_person = "********"; // 法人姓名
+    request.result.record.legal_id_card = "********"; // 法人身份证号
+    request.result.record.legal_validity_start_time = "********"; // 法人身份证开始时间
+    request.result.record.legal_validity_end_time = "********"; // 法人身份证结束时间
+    request.result.record.legal_front_id_card = null; // 法人身份证正面照
+    request.result.record.legal_back_id_card = null; // 法人身份证反面照
+    request.result.record.legal_id_card_hash = "********"; // 法人身份证哈希值
+    request.result.record.enterprice_address = "********"; // 企业地址
+    request.result.record.legal_issued_by = "********"; // 法人身份证地址
+    request.result.record.legal_nationality = "********"; // 法人民族
+    request.result.record.mobile = "********"; // 法人电话
+    request.result.record.sensitiveWord = false; // 是否有查看敏感词权限
+  } else {
+    request.result.record.sensitiveWord = true; // 是否有查看敏感词权限
+  }
+  ctx.body = request;
 };
 
 // 历史提交审核日志详情页
@@ -61,9 +82,33 @@ exports.getLog = async ctx => {
   ctx.body = await req(ctx, opts);
 };
 
-// 企业信息提交
-exports.entCommit = async ctx => {
-  const url = `${API_INTERNAL_URI}/merchant/inner/ent_commit`;
+// 企业资料审核
+exports.postAudit = async ctx => {
+  const url = `${API_INTERNAL_URI}/merchant/inner/audit`;
+  const opts = {
+    url,
+    method: "POST",
+    json: true,
+    body: ctx.request.body
+  };
+  ctx.body = await req(ctx, opts);
+};
+
+// 商户上传营业执照信息
+exports.postBusiness = async ctx => {
+  const url = `${API_INTERNAL_URI}/merchant/inner/op_business_commit`;
+  const opts = {
+    url,
+    method: "POST",
+    json: true,
+    body: ctx.request.body
+  };
+  ctx.body = await req(ctx, opts);
+};
+
+// 商户信息代提交(op后台)
+exports.opCommit = async ctx => {
+  const url = `${API_INTERNAL_URI}/merchant/inner/op_commit`;
   const opts = {
     url,
     method: "POST",

server/router.js

@@ -26,11 +26,13 @@ router.post(`${API_VERSION}/merchant/authority/get_role_info`, role.get_role_inf
 router.post(`${API_VERSION}/merchant/authority/delete_role`, role.getDelete_role)
 /* 企业认证 */
 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.post(`${API_VERSION}/audit`, enterprise.postAudit);
+router.post(`${API_VERSION}/business`, enterprise.postBusiness)
+router.post(`${API_VERSION}/op_commit`, enterprise.opCommit);
 
 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/Audit/index.css

@@ -29,6 +29,9 @@
   background-color: lightblue;
   color: #000;
 }
+.audit .history_area {
+  margin-bottom: 20px;
+}
 .mgtb20 {
   margin: 20px 0;
 }

src/pages/Enterprise/Audit/index.less

@@ -30,6 +30,9 @@
       color: #000;
     }
   }
+  .history_area{
+    margin-bottom: 20px;
+  }
 }
 .mgtb20{
   margin: 20px 0;

src/pages/Enterprise/Certification/index.vue

@@ -2,6 +2,7 @@
   <layout>
     <!-- 企业信息提交 -->
     <el-button
+      :disabled="!permission.get('create')"
       type="primary"
       class="setUp"
       @click="goEstablish"
@@ -17,19 +18,28 @@
       >
         <!-- 查询信息区域 -->
         <div class="formItem">
-          <el-form-item label="企业注册名称：">
+          <el-form-item
+            label="企业注册名称："
+            prop="name"
+          >
             <el-input v-model="enterpriseForm.name"></el-input>
           </el-form-item>
-          <el-form-item label="注册码：">
+          <el-form-item
+            label="注册码："
+            prop="code"
+          >
             <el-input v-model="enterpriseForm.code"></el-input>
           </el-form-item>
           <el-form-item
             label="法人或经营者姓名："
-            prop="userName"
+            prop="legal_person"
           >
             <el-input v-model="enterpriseForm.legal_person"></el-input>
           </el-form-item>
-          <el-form-item label="审核状态：">
+          <el-form-item
+            label="审核状态："
+            prop="audit_status"
+          >
             <el-select
               placeholder="请选择审核状态"
               v-model="enterpriseForm.audit_status"
@@ -42,9 +52,12 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="提交类型：">
+          <el-form-item
+            label="提交类型："
+            prop="data_from"
+          >
             <el-select
-              v-model="enterpriseForm.data_form"
+              v-model="enterpriseForm.data_from"
               placeholder="请选择提交类型"
             >
               <el-option
@@ -55,7 +68,10 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="提交人账号：">
+          <el-form-item
+            label="提交人账号："
+            prop="proxy_user_name"
+          >
             <el-input v-model="enterpriseForm.proxy_user_name"></el-input>
           </el-form-item>
         </div>
@@ -92,7 +108,7 @@
         >
           <template #default="scope">
             <span v-if="scope.row.audit_status === 5">编辑中</span>
-            <span v-if="scope.row.audit_status === 10">身份证校验通过待平台审核</span>
+            <span v-if="scope.row.audit_status === 10">待审核</span>
             <span v-if="scope.row.audit_status === 20">审核成功</span>
             <span v-if="scope.row.audit_status === 30">审核失败</span>
           </template>
@@ -141,9 +157,12 @@
             <el-button
               size="mini"
               type="primary"
+              :disabled="!permission.get('audit')"
               @click="goAuditPage('AUDIT', scope.row.enterprise_auth_record_id)"
             >审核</el-button>
+
             <el-button
+              :disabled="!permission.get('edit') || scope.row.audit_status !== 30 ? true : false"
               size="mini"
               type="success"
               @click="goAuditPage('EDIT', scope.row.enterprise_auth_record_id)"
@@ -206,11 +225,11 @@ export default {
         code: "",
         legal_person: "",
         audit_status: null,
-        data_form: null,
+        data_from: null,
         proxy_user_name: null,
         statusOptions: [
           { value: 5, label: "编辑中" },
-          { value: 10, label: "身份证校验通过待平台审核" },
+          { value: 10, label: "待审核" },
           { value: 20, label: "审核成功" },
           { value: 30, label: "审核失败" }
         ],
@@ -237,11 +256,12 @@ export default {
 
   created () {
     this.getEnterpriseList();
+    console.log(this.$store);
   },
 
   computed: {
     // 使用示例： permission.get("audit") 获取是否有审核权限
-    permission() {
+    permission () {
       const modulePermissions = this.$store.getters.moduleSubPermissions('enterprise') || [];
       console.log('Current page func-permissions:', modulePermissions);
       return new Map(modulePermissions.map(ele => [ele.name, true]))
@@ -257,7 +277,7 @@ export default {
         code,
         legal_person,
         audit_status,
-        data_form,
+        data_from,
         proxy_user_name
       } = this.enterpriseForm;
       const params = {
@@ -267,7 +287,7 @@ export default {
         code, // 注册码
         legal_person, // 法人或经营者姓名
         audit_status, // 审核状态
-        data_form, // 提交类型
+        data_from, // 提交类型
         proxy_user_name // 提交人账号
       };
       try {
@@ -285,6 +305,7 @@ export default {
     // 重置表单
     resetForm (formName) {
       this.$refs[formName].resetFields();
+      this.getEnterpriseList();
     },
 
     // 跳转到企业信息提交
@@ -317,22 +338,18 @@ export default {
       if (this.checkIsCode.length === 0) {
         return this.$message.error("验证码不可为空");
       } else {
-        try {
-          const parasm = {
-            enterprise_auth_record_id: this.auditId,
-            code: parseInt(this.checkIsCode)
-          };
-          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);
-        }
+        const parasm = {
+          enterprise_auth_record_id: this.auditId,
+          code: parseInt(this.checkIsCode)
+        };
+        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 }
+        });
       }
     },
 

src/pages/Role/add-role.vue

@@ -121,7 +121,7 @@ export default {
     }
 
   },
-  created () {
+  activated () {
     this.getGetRole_list()
     this.getPermissionsAll()
   },

src/pages/Role/manage-role.vue

@@ -189,7 +189,7 @@ export default {
       permissionsUpdate: []
     }
   },
-  created () {
+  activated () {
     this.getGetRole_list()
     this.getPermissionsAll()
   },

src/service/enterprise.js

@@ -48,8 +48,30 @@ export async function getLog (params) {
   return res;
 }
 
-// 发送企业信息认证
-export async function entCommit (query) {
-  const res = await axios.post(`/api/v1/emterprise_commit`, query);
+/**
+ * 企业资料审核
+ * @param param 企业资料审核参数
+ */
+export async function postAudit (params) {
+  const res = axios.post(`/api/v1/audit`, params);
+  return res;
+}
+
+/**
+ * 414-1商户营业执照代提交(op后台)
+ * @param query 上传执照参数信息
+ */
+export async function postBusiness (query) {
+  const res = await axios.post(`/api/v1/business`, query);
   return res;
 }
+
+/**
+ * 414-2商户信息代提交(op后台)
+ * @param params 法人信息
+ */
+export async function opCommit (params) {
+  const res = await axios.post(`/api/v1/op_commit`, params);
+  return res;
+}
+