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/pages/Enterprise/components/enterpriseForm.vue

@@ -10,11 +10,11 @@
       <!-- 商户类型 -->
       <el-form-item
         label="商户类型"
-        prop="dataType"
+        prop="data_type"
       >
         <el-select
           placeholder="请选择商户类型"
-          v-model="establishForm.dataType"
+          v-model="establishForm.data_type"
         >
           <el-option
             label="个体工商户"
@@ -56,7 +56,7 @@
       </el-form-item>
       <!-- 企业代码 -->
       <el-form-item
-        label="统一社会信用代码（注册码："
+        label="企业代码："
         prop="code"
       >
         <el-input v-model.trim="establishForm.code"></el-input>
@@ -125,8 +125,8 @@
           multiple
           show-file-list
           :auto-upload="false"
-          :file-list="establishForm.licenseList"
-          :on-change="onIdPhoneChange"
+          :file-list="establishForm.idcardFontPhoto"
+          :on-change="onIdPhoneFontChange"
           :on-remove="onIdPhoneRemove"
         >
           <el-button
@@ -145,8 +145,8 @@
           multiple
           show-file-list
           :auto-upload="false"
-          :file-list="establishForm.licenseList"
-          :on-change="onIdPhoneChange"
+          :file-list="establishForm.idcardBackPhoto"
+          :on-change="onIdPhoneBackChange"
           :on-remove="onIdPhoneRemove"
         >
           <el-button
@@ -155,20 +155,6 @@
           >点击上传</el-button>
         </el-upload>
       </el-form-item>
-      <!-- ocr照片正面完整度 -->
-      <el-form-item
-        label="ocr正面完整度"
-        prop="front_completeness"
-      >
-        <el-input v-model="establishForm.front_completeness"></el-input>
-      </el-form-item>
-      <!-- ocr照片反面完整度 -->
-      <el-form-item
-        label="ocr反面完整度"
-        prop="bak_completeness"
-      >
-        <el-input v-model="establishForm.bak_completeness"></el-input>
-      </el-form-item>
       <!-- 身份证号 -->
       <el-form-item
         label="身份证号"
@@ -196,24 +182,18 @@
 </template>
 
 <style lang="less" scoped>
-// 标题
-.title {
-  padding: 20px;
-}
 // 主体区域
 .establish {
-  padding: 50px;
+  padding: 0;
   display: flex;
   justify-content: center;
-  .el-form {
-    width: 50%;
-  }
 }
 </style>
 
 <script>
+import { postBusiness, opCommit } from "@/service/enterprise";
 export default {
-  props: ["type"],
+  props: ["enterpriseId"],
 
   data () {
     // 营业执照校验规则
@@ -224,14 +204,22 @@ export default {
         callback();
       }
     };
-    /* // 身份证照片校验规则
-    let idPhotoRules = (rule, value, callback) => {
-      if (this.establishForm.idcardPhoto.length === 0) {
-        callback(new Error("请上传身份证照片"));
+    // 身份证照片正面校验规则
+    let idPhotoFontRules = (rule, value, callback) => {
+      if (this.establishForm.idcardFontPhoto.length === 0) {
+        callback(new Error("请上传身份正面证照片"));
       } else {
         callback();
       }
-    }; */
+    };
+    // 身份证照片反面校验规则
+    let idPhotoBackRules = (rule, value, callback) => {
+      if (this.establishForm.idcardBackPhoto.length === 0) {
+        callback(new Error("请上传身份反面证照片"));
+      } else {
+        callback();
+      }
+    };
     // 身份证号校验规则
     let idcardNumberRules = (rule, value, callback) => {
       let IDRe18 = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
@@ -248,43 +236,20 @@ export default {
     return {
       // 表单输入项
       establishForm: {
-        user_id: null, // 用户id(!)
         code: null, // 企业代码(!)
         name: null, // 企业名称(!)
         entterprise_image: null, // 金山云key(!)
         data_from: null, // 数据来源(!)
-        dataType: 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, // 发证日期
-        life_account_id: null, // 生活号id
-        proxy_user_name: null, // OP后台代提交人姓名
-        phone: null, // 代提交 被提交用户手机号
-        is_agent: null, // 代提交标识位
         /* *********身份认证信息********* */
-        enterpriseCode: "", // 企业营业执照(!)
+        record_id: null, // 企业认证id
         front_img: "", // 身份证正面照的金山云objectid(!)
         bak_img: "", // 身份证反面照的尖山云objeid(!)
-        front_completeness: "", // ocr识别身份证正面照的完整度(!)
-        bak_completeness: "", // ocr识别身份证反面的完整度(!)
-        idcard_number: "", // 身份证号(!) 用户填写的
-        gender: "", // 性别(身份证识别的:男/女)
-        userName: "", // 姓名 用户填写的(!)
-        address: "", // 地址
-        nationality: "", // 民族
-        valid_date_start: "", // 身份证有效期开始时间
-        valid_date_end: "", // 身份证有效期结束时间
-        issued_by: "" // 签发机关
+        front_completeness: 0, // orc识别身份证前面完整度
+        bak_completeness: 0, // orc识别身份证前面完整度
+        idcard_number: "", // 身份证号(!)
+        userName: "", // 用户姓名(!)
+        mobile: null, // 用户手机号
+        data_type: null // 企业类型(!)
       },
 
       // 表单校验规则
@@ -298,15 +263,9 @@ export default {
           { required: true, message: "请输入企业注册名称", trigger: "blur" }
         ],
         // 注册码
-        code: [
-          {
-            required: true,
-            message: "请输入统一社会信用代码（注册码）",
-            trigger: "blur"
-          }
-        ],
+        code: [{ required: true, message: "请输入企业代码", trigger: "blur" }],
         // 商户类型
-        dataType: [
+        data_type: [
           { required: true, message: "请选择商户类型", trigger: "change" }
         ],
         // 数据来源
@@ -320,19 +279,19 @@ export default {
         ],
         // 身份证正面照
         front_img: [
-          { required: true, message: "请上传身份证正面照", trigger: "change" }
+          { required: true, validator: idPhotoFontRules, trigger: "change" }
         ],
         // 身份证反面照
         bak_img: [
-          { required: true, message: "请上传身份证反面照", trigger: "change" }
+          { required: true, validator: idPhotoBackRules, trigger: "change" }
         ],
         // 正面完整度
         front_completeness: [
-          { required: true, message: "请填写ocr正面完整度", trigger: "blur" }
+          { required: true, message: "请填写ocr正面完整度", trigger: "change" }
         ],
         // 反面完整度
         bak_completeness: [
-          { required: true, message: "请填写ocr反面完整度", trigger: "blur" }
+          { required: true, message: "请填写ocr反面完整度", trigger: "change" }
         ],
         // 身份证号
         idcard_number: [
@@ -352,20 +311,22 @@ export default {
     };
   },
   created () {
-    console.log("企业信息修改状态:", this.type);
+    console.log("修改信息ID", this.enterpriseId);
   },
 
   methods: {
     // 上传营业执照时
     onLicenseChange (file, fileList) {
       this.establishForm.licenseList = fileList;
-      this.$refs["licenseChange"].clearValidate();
     },
 
-    // 身份证照片更改时
-    onIdPhoneChange (file, fileList) {
-      this.establishForm.idcardPhoto = fileList;
-      this.$refs["idcardPhotoChange"].clearValidate();
+    // 身份证正面照片更改时
+    onIdPhoneFontChange (file, fileList) {
+      this.establishForm.idcardFontPhoto = fileList;
+    },
+    // 身份证照片反面更改时
+    onIdPhoneBackChange (file, fileList) {
+      this.establishForm.idcardBackPhoto = fileList;
     },
 
     // 删除上传的营业执照
@@ -375,7 +336,7 @@ export default {
 
     // 删除上传的身份证照片
     onIdPhoneRemove (file, fileList) {
-      this.establishForm.idcardPhoto = fileList;
+      this.establishForm.idcardFontPhoto = fileList;
     },
 
     // 取消创建表单
@@ -386,17 +347,53 @@ export default {
     // 提交表单
     handelSubmit (formName) {
       this.$refs[formName].validate(async valid => {
-        console.log("表单校验结果!!!!!!!!!!!!!!!!!!!!1", valid);
-        // 表单校验成功后
-        if (valid) {
-          // 如果是提交表单页发送提交请求接口
-          if (this.type === "SUBMIT") {
-            this.$message({ type: "success", message: "信息提交成功!" });
-          }
-          // 如果是修改表单页,请求修改表单页接口
-          if (this.type === "EDIT") {
-            console.log("EDIT");
-          }
+        // 校验不成功
+        if (!valid) return this.$message.error("请完成表单必填项");
+        // 企业信息提交参数
+        const {
+          code,
+          name,
+          entterprise_image,
+          data_from,
+          data_type,
+          front_img,
+          bak_img,
+          idcard_number,
+          userName,
+          mobile
+        } = this.establishForm;
+        const enterpriseQuery = {
+          code,
+          name,
+          entterprise_image,
+          data_from,
+          data_type
+        };
+        // 法人信息提交参数
+        const legalQuery = {
+          record_id: this.enterpriseId ? this.enterpriseId : null,
+          front_img,
+          bak_img,
+          front_completeness: 0,
+          bak_completeness: 0,
+          idcard_number,
+          name: userName,
+          mobile,
+          data_type,
+          user_id: parseInt(this.$store.state.userInfo.userid)
+        };
+        const res = await postBusiness(enterpriseQuery);
+        const result = await opCommit(legalQuery);
+        console.log("res", res);
+        console.log("result", result);
+        if (res.code !== 0) return this.$message.error(res.reason);
+        if (result.code !== 0) return this.$message.error(result.reason);
+        if (!this.enterpriseId) {
+          this.$message.success("企业信息代提交成功!");
+          this.$router.replace({ name: "Certification" });
+        } else {
+          this.$message.success("企业信息修改成功!");
+          this.$router.replace({ name: "Certification" });
         }
       });
     }

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