update:完善企业信息提交

server/controllers/enterprise.js

@@ -71,11 +71,23 @@ exports.postAudit = async ctx => {
     body: ctx.request.body
   };
   ctx.body = await req(ctx, opts);
-}
+};
+
+// 商户上传营业执照信息
+exports.postBusiness = async ctx => {
+  const url = `${API_INTERNAL_URI}/merchant/enterprise/business`;
+  const opts = {
+    url,
+    method: "POST",
+    json: true,
+    body: ctx.request.body
+  };
+  ctx.body = await req(ctx, opts);
+};
 
-// 企业信息提交
-exports.entCommit = async ctx => {
-  const url = `${API_INTERNAL_URI}/merchant/inner/ent_commit`;
+// 商户信息代提交(op后台)
+exports.opCommit = async ctx => {
+  const url = `${API_INTERNAL_URI}/merchant/inner/op_commit`;
   const opts = {
     url,
     method: "POST",

server/router.js

@@ -26,12 +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.vue

@@ -90,7 +90,7 @@
 
         <!-- 修改详情页 -->
         <enterprise-form
-          :type="'EDIT'"
+          :enterpriseId="auditId"
           v-if="pageStatus === 'EDIT'"
         ></enterprise-form>
       </el-card>
@@ -135,32 +135,36 @@
           <el-table-column
             align="center"
             label="提交审核时间"
-            prop="subDate"
+            prop="commit_time"
           ></el-table-column>
           <el-table-column
             align="center"
             label="提交人"
-            prop="author"
+            prop="commit_name"
           ></el-table-column>
           <el-table-column
             align="center"
             label="审核时间"
-            prop="auditDate"
+            prop="create_time"
           ></el-table-column>
           <el-table-column
             align="center"
             label="审核人"
-            prop="auditer"
+            prop="opt_user_name"
           ></el-table-column>
           <el-table-column
             align="center"
             label="审核状态"
-            prop="status"
-          ></el-table-column>
+          >
+            <template #default="scope">
+              <span v-if="scope.row.audit_status === 20">通过</span>
+              <span v-if="scope.row.audit_status === 30">审核不通过</span>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="审核意见"
-            prop="address"
+            prop="audit_opinion"
           ></el-table-column>
         </el-table>
       </el-card>
@@ -279,7 +283,7 @@ export default {
       ],
 
       // 审核-提交历史
-      historyList: [],
+      historyList: null,
 
       // 审核-审核意见
       opinionArea: ""
@@ -321,7 +325,8 @@ export default {
     // 获取提交日志信息(历史提交)
     async getHistory () {
       const res = await getLog({ enterprise_auth_record_id: this.auditId });
-      console.log("提交历史记录", res);
+      if (res.code !== 0) return this.$message.error(res.reason);
+      this.historyList = [...res.result]
     },
 
     // 审核-拒绝审核

src/pages/Enterprise/Certification/index.vue

@@ -238,6 +238,7 @@ export default {
   created () {
     this.getEnterpriseList();
     console.log(this.$store);
+    console.log("获取权限的设置", this.permission.get("audit"));
   },
 
   computed: {

src/service/enterprise.js

@@ -57,8 +57,16 @@ export async function postAudit (params) {
   return res;
 }
 
-// 发送企业信息认证
-export async function entCommit (query) {
-  const res = await axios.post(`/api/v1/emterprise_commit`, query);
+/**
+  * 商户上传营业执照信息
+  * @param query 上传执照参数信息
+ */
+export async function postBusiness (query) {
+  const res = await axios.post(`/api/v1/business`, query);
+  return res;
+}
+
+export async function opCommit (params) {
+  const res = await axios.post(`/api/v1/op_commit`, params);
   return res;
 }
\ No newline at end of file