Commit 26b4e91f authored by zhangtong5@yidian-inc.com's avatar zhangtong5@yidian-inc.com

update:合并冲突

parents 49a5f22c 558bec75
const API_INTERNAL_URI = require("../config.js").API_INTERNAL_URI; const API_INTERNAL_URI = require("../config.js").API_INTERNAL_URI;
const req = require("../utils/request").httpReq; const req = require("../utils/request").httpReq;
// 获取企业信息验证 // 获取企业信息列表
exports.entCheck = async ctx => { exports.auditList = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/inner/ent_check`; const url = `${API_INTERNAL_URI}/merchant/inner/audit_list`;
// const url = `http://bp-test.ini.yidian-inc.com/merchant/inner/ent_check`;
const { user_id } = ctx.request.query;
const opts = { const opts = {
url: url, url,
method: "GET", method: "POST",
qs: { json: true,
user_id body: ctx.request.body
}
}; };
ctx.body = await req(ctx, opts); ctx.body = await req(ctx, opts);
}; };
// 企业信息提交 // 企业认证获取验证码
exports.entCommit = async ctx => { exports.sendCode = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/inner/ent_commit`; const url = `${API_INTERNAL_URI}/merchant/lifeinner/send_code`;
const opts = { const opts = {
url, url,
method: "POST", method: "POST",
...@@ -28,21 +25,21 @@ exports.entCommit = async ctx => { ...@@ -28,21 +25,21 @@ exports.entCommit = async ctx => {
ctx.body = await req(ctx, opts); ctx.body = await req(ctx, opts);
}; };
// 生活号检查 // 企业认证校验验证码
exports.checkLife = async ctx => { exports.checkCode = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/enterprise/check_life`; const url = `${API_INTERNAL_URI}/merchant/lifeinner/check_code`;
const opts = { const opts = {
url, url,
method: "POST", method: "POST",
json: true, json: true,
body: ctx.request.body body: ctx.request.body
}; };
ctx.body = await req(ctx, opts); ctx.body = await req(ctx, opts)
}; };
// 创建生活号 // 企业信息提交
exports.createLife = async ctx => { exports.entCommit = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/enterprise/create_life`; const url = `${API_INTERNAL_URI}/merchant/inner/ent_commit`;
const opts = { const opts = {
url, url,
method: "POST", method: "POST",
......
...@@ -10,11 +10,7 @@ const API_VERSION = "/api/v1"; ...@@ -10,11 +10,7 @@ const API_VERSION = "/api/v1";
// router.post(`${API_VERSION}/login`, system.login); // router.post(`${API_VERSION}/login`, system.login);
router.get(`${API_VERSION}/fetch_user`, system.fetch_user); router.get(`${API_VERSION}/fetch_user`, system.fetch_user);
router.get(`${API_VERSION}/user/:type`, user.query) router.get(`${API_VERSION}/user/:type`, user.query);
router.get(`${API_VERSION}/certification`, enterprise.entCheck);
router.post(`${API_VERSION}/emterprise_commit`, enterprise.entCommit);
router.post(`${API_VERSION}/check_life`, enterprise.checkLife);
router.post(`${API_VERSION}/create_life`, enterprise.createLife);
//角色 //角色
router.post(`${API_VERSION}/merchant/authority/role_list`, role.getRole_list) router.post(`${API_VERSION}/merchant/authority/role_list`, role.getRole_list)
router.post(`${API_VERSION}/merchant/authority/add_role`, role.getAdd_role) router.post(`${API_VERSION}/merchant/authority/add_role`, role.getAdd_role)
...@@ -22,6 +18,12 @@ router.post(`${API_VERSION}/merchant/authority/update_role`, role.getUpdate_role ...@@ -22,6 +18,12 @@ router.post(`${API_VERSION}/merchant/authority/update_role`, role.getUpdate_role
router.post(`${API_VERSION}/merchant/authority/get_role_list`, role.getAll_role_list) router.post(`${API_VERSION}/merchant/authority/get_role_list`, role.getAll_role_list)
router.post(`${API_VERSION}/merchant/authority/get_role_info`, role.get_role_info) router.post(`${API_VERSION}/merchant/authority/get_role_info`, role.get_role_info)
router.post(`${API_VERSION}/merchant/authority/delete_role`, role.getDelete_role) 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}/merchant/lifeinner/life_info`, life.get_life_info) router.post(`${API_VERSION}/merchant/lifeinner/life_info`, life.get_life_info)
router.get(`${API_VERSION}/merchant/lifeinner/life_list`, life.get_life_list) router.get(`${API_VERSION}/merchant/lifeinner/life_list`, life.get_life_list)
......
import { createApp } from 'vue'; import { createApp } from "vue";
import App from './App.vue'; import App from "./App.vue";
import router from './router'; import router from "./router";
import store from './store'; import store from "./store";
import ElementPlus from 'element-plus'; import ElementPlus from "element-plus";
import 'element-plus/lib/theme-chalk/index.css'; import "element-plus/lib/theme-chalk/index.css";
import 'dayjs/locale/zh-cn'; import "dayjs/locale/zh-cn";
import locale from 'element-plus/lib/locale/lang/zh-cn'; import locale from "element-plus/lib/locale/lang/zh-cn";
import { fetchCurrentUser } from './service/user'; /* import { fetchCurrentUser } from "./service/user";
import { checkPathAuth } from './utils/authUtil'; import { checkPathAuth } from "./utils/authUtil";
import { redirectToLogin } from './utils/util'; import { redirectToLogin } from "./utils/util"; */
// 处理路由权限 // 处理路由权限
router.beforeResolve(async (to, from, next) => { /* router.beforeResolve(async (to, from, next) => {
if (to.meta.requireAuth && !store.state.permissions) { if (to.meta.requireAuth && !store.state.permissions) {
const { status, user } = await fetchCurrentUser(); const { status, user } = await fetchCurrentUser();
if (status === 'success') { if (status === 'success') {
...@@ -31,10 +31,10 @@ router.beforeResolve(async (to, from, next) => { ...@@ -31,10 +31,10 @@ router.beforeResolve(async (to, from, next) => {
} else { } else {
next() next()
} }
}) }) */
createApp(App) createApp(App)
.use(router) .use(router)
.use(store) .use(store)
.use(ElementPlus, { locale }) .use(ElementPlus, { locale })
.mount('#app'); .mount("#app");
...@@ -290,17 +290,6 @@ ...@@ -290,17 +290,6 @@
align="center" align="center"
prop="adminId" prop="adminId"
></el-table-column> ></el-table-column>
<el-table-column
label="创建生活号"
align="center"
>
<template #default="scope">
<el-button
type="primary"
@click="onCreateLife(scope.row)"
>创建生活号</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<!-- 查看详情__创建生活号表单 --> <!-- 查看详情__创建生活号表单 -->
......
...@@ -17,31 +17,22 @@ ...@@ -17,31 +17,22 @@
> >
<!-- 查询信息区域 --> <!-- 查询信息区域 -->
<div class="formItem"> <div class="formItem">
<el-form-item <el-form-item label="企业注册名称:">
label="企业注册名称:"
prop="name"
>
<el-input v-model="enterpriseForm.name"></el-input> <el-input v-model="enterpriseForm.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="注册码:">
label="注册码:"
prop="code"
>
<el-input v-model="enterpriseForm.code"></el-input> <el-input v-model="enterpriseForm.code"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="法人或经营者姓名:" label="法人或经营者姓名:"
prop="userName" prop="userName"
> >
<el-input v-model="enterpriseForm.userName"></el-input> <el-input v-model="enterpriseForm.legal_person"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="审核状态:">
label="审核状态:"
prop="statusValue"
>
<el-select <el-select
placeholder="请选择审核状态" placeholder="请选择审核状态"
v-model="enterpriseForm.statusValue" v-model="enterpriseForm.audit_status"
> >
<el-option <el-option
v-for="item in enterpriseForm.statusOptions" v-for="item in enterpriseForm.statusOptions"
...@@ -51,12 +42,9 @@ ...@@ -51,12 +42,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="提交类型:">
label="提交类型:"
prop="typeValue"
>
<el-select <el-select
v-model="enterpriseForm.typeValue" v-model="enterpriseForm.data_form"
placeholder="请选择提交类型" placeholder="请选择提交类型"
> >
<el-option <el-option
...@@ -67,14 +55,8 @@ ...@@ -67,14 +55,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="提交人账号:">
label="提交人账号:" <el-input v-model="enterpriseForm.proxy_user_name"></el-input>
prop="number"
>
<el-input
type="text"
v-model="enterpriseForm.number"
></el-input>
</el-form-item> </el-form-item>
</div> </div>
<!-- 按钮区域 --> <!-- 按钮区域 -->
...@@ -83,6 +65,7 @@ ...@@ -83,6 +65,7 @@
<el-button <el-button
type="primary" type="primary"
class="inquire" class="inquire"
@click="queryMessage"
>查询</el-button> >查询</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -100,14 +83,20 @@ ...@@ -100,14 +83,20 @@
> >
<el-table-column <el-table-column
label="ID" label="ID"
prop="id" prop="enterprise_auth_record_id"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="审核状态" label="审核状态"
prop="status"
align="center" align="center"
></el-table-column> >
<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 === 20">审核成功</span>
<span v-if="scope.row.audit_status === 30">审核失败</span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="企业注册名称" label="企业注册名称"
prop="name" prop="name"
...@@ -120,23 +109,28 @@ ...@@ -120,23 +109,28 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="法人或经营者姓名" label="法人或经营者姓名"
prop="userName" prop="legal_person"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="提交日期" label="提交日期"
prop="date" prop="audit_time"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="提交类型" label="提交类型"
prop="type"
align="center" align="center"
></el-table-column> >
<template #default="scope">
<span v-if="scope.row.data_from === 1">生活圈c端</span>
<span v-if="scope.row.data_from === 2">销售端b端</span>
<span v-if="scope.row.data_from === 3">内部代提交</span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="提交人账号" label="提交人账号"
prop="number"
align="center" align="center"
prop="proxy_user_name"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
...@@ -147,22 +141,31 @@ ...@@ -147,22 +141,31 @@
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="goAuditPage('AUDIT', scope.row.id)" @click="goAuditPage('AUDIT', scope.row.enterprise_auth_record_id)"
>审核</el-button> >审核</el-button>
<el-button <el-button
:disabled="scope.row.status === 4 ? true : false"
size="mini" size="mini"
type="success" type="success"
@click="goAuditPage('EDIT', scope.row.id)" @click="goAuditPage('EDIT', scope.row.enterprise_auth_record_id)"
>修改提交</el-button> >修改提交</el-button>
<el-button <el-button
size="mini" size="mini"
type="warning" type="warning"
@click="goAuditPage('DETAIL', scope.row.id)" @click="
goAuditPage('DETAIL', scope.row.enterprise_auth_record_id)
"
>查看详情</el-button> >查看详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页 -->
<el-pagination
@current-change="handleCurrentChange"
v-model:currentPage="currentPage"
layout="total,prev,pager,next"
:page-size="pageSize"
:total="totalCount"
></el-pagination>
</el-card> </el-card>
<!-- 修改提交验证码弹框 --> <!-- 修改提交验证码弹框 -->
<el-dialog <el-dialog
...@@ -172,6 +175,7 @@ ...@@ -172,6 +175,7 @@
<el-input <el-input
style="width:50%" style="width:50%"
placeholder="请输入您收到的验证码" placeholder="请输入您收到的验证码"
v-model="checkIsCode"
></el-input> ></el-input>
<el-button <el-button
type="primary" type="primary"
...@@ -190,7 +194,7 @@ ...@@ -190,7 +194,7 @@
<script> <script>
import Layout from "@/layouts"; import Layout from "@/layouts";
import { entCheck } from "@/service/enterprise"; import { auditList, sendCode, checkCode } from "@/service/enterprise";
export default { export default {
name: "Certification", name: "Certification",
components: { Layout }, components: { Layout },
...@@ -200,16 +204,16 @@ export default { ...@@ -200,16 +204,16 @@ export default {
enterpriseForm: { enterpriseForm: {
name: "", name: "",
code: "", code: "",
userName: "", legal_person: "",
status: "", audit_status: null,
type: "", data_form: null,
number: "", proxy_user_name: null,
statusOptions: [ statusOptions: [
{ value: 1, label: "待审核" }, { value: 5, label: "编辑中" },
{ value: 2, label: "通过" }, { value: 10, label: "身份证校验通过待平台审核" },
{ value: 3, label: "拒绝" } { value: 20, label: "审核成功" },
{ value: 30, label: "审核失败" }
], ],
statusValue: "",
typeOptions: [ typeOptions: [
{ value: 1, label: "生活圈c端" }, { value: 1, label: "生活圈c端" },
{ value: 2, label: "销售端b端" }, { value: 2, label: "销售端b端" },
...@@ -218,37 +222,54 @@ export default { ...@@ -218,37 +222,54 @@ export default {
}, },
// 企业认证管理列表 // 企业认证管理列表
enterpriseList: [ enterpriseList: [],
{
id: 1, detailDialogVisible: false, // 跳转详情页弹窗
status: 1, currentPage: 1, // 当前页
code: 1, pageSize: 20, // 每页条数
name: "一点资讯", totalCount: 0, // 总条数
userName: "蒙文昊",
date: "2021-05-24",
type: 1,
number: 18147683288
}
],
// 跳转详情页弹窗 auditId: 0, // 要操作的企业信息id
detailDialogVisible: false
checkIsCode: "" // 用户修改操作的验证码
}; };
}, },
created () { created () {
this.onEntCheck(); this.getEnterpriseList();
console.log("userInfo:", this.$store.state.userInfo);
}, },
methods: { methods: {
// 获取商户认证检查信息 // 获取商户认证检查信息
async onEntCheck () { async getEnterpriseList () {
this.enterpriseList = []; // 重置表格
const {
name,
code,
legal_person,
audit_status,
data_form,
proxy_user_name
} = this.enterpriseForm;
const params = {
page: this.currentPage, // 当前页
limit: this.pageSize, // 每页条数
name, // 企业注册名称
code, // 注册码
legal_person, // 法人或经营者姓名
audit_status, // 审核状态
data_form, // 提交类型
proxy_user_name // 提交人账号
};
try { try {
const res = await entCheck(510232747179); const res = await auditList(params);
console.log("res:----", res); if (res.code !== 0) return this.$message.error(res.result);
} catch (error) { this.enterpriseList = res.result.data;
console.log("error:", error); this.totalCount = res.result.count;
console.log(res);
} catch (err) {
this.$message.error("发生未知错误");
console.log(err);
} }
}, },
...@@ -265,6 +286,8 @@ export default { ...@@ -265,6 +286,8 @@ export default {
// 跳转到审核页面 // 跳转到审核页面
goAuditPage (pageStatus, auditId) { goAuditPage (pageStatus, auditId) {
if (pageStatus === "EDIT") { if (pageStatus === "EDIT") {
console.log(auditId);
this.auditId = auditId;
return (this.detailDialogVisible = true); return (this.detailDialogVisible = true);
} else { } else {
this.$router.push({ name: "Audit", params: { pageStatus, auditId } }); this.$router.push({ name: "Audit", params: { pageStatus, auditId } });
...@@ -272,11 +295,46 @@ export default { ...@@ -272,11 +295,46 @@ export default {
}, },
// 获取验证码 // 获取验证码
getAuthCode () { async getAuthCode () {
console.log(this.auditId);
try {
const res = await sendCode(this.auditId);
console.log(res);
} catch (err) {
console.log(err);
}
}, },
// 校验验证码 // 校验验证码
checkAuthCode () { async checkAuthCode () {
this.$router.push({ name: "Audit", params: { pageStatus: "EDIT", auditId: 1 } }) 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);
} catch (error) {
console.log(error);
}
this.$router.push({
name: "Audit",
params: { pageStatus: "EDIT", auditId: this.auditId }
});
}
},
// 换页操作
handleCurrentChange (e) {
this.currentPage = e; // 更换页码
this.getEnterpriseList(); // 加载数据
},
// 查询列表
queryMessage () {
this.getEnterpriseList(); // 加载数据
} }
} }
}; };
......
...@@ -14,12 +14,16 @@ ...@@ -14,12 +14,16 @@
ref="establishFormRef" ref="establishFormRef"
:model="establishForm" :model="establishForm"
> >
<h3>营业执照信息</h3>
<!-- 商户类型 --> <!-- 商户类型 -->
<el-form-item <el-form-item
label="商户类型" label="商户类型"
prop="data_type" prop="dataType"
> >
<el-select v-model="establishForm.data_type"> <el-select
placeholder="请选择商户类型"
v-model="establishForm.dataType"
>
<el-option <el-option
label="个体工商户" label="个体工商户"
:value="1" :value="1"
...@@ -30,7 +34,7 @@ ...@@ -30,7 +34,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- --> <!-- 营业执照金山云key -->
<el-form-item <el-form-item
label="营业执照:" label="营业执照:"
ref="licenseChange" ref="licenseChange"
...@@ -51,33 +55,69 @@ ...@@ -51,33 +55,69 @@
>点击上传</el-button> >点击上传</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<!-- 企业注册名称 -->
<el-form-item <el-form-item
label="企业注册名称:" label="企业注册名称:"
prop="name" prop="name"
> >
<el-input v-model.trim="establishForm.name"></el-input> <el-input v-model.trim="establishForm.name"></el-input>
</el-form-item> </el-form-item>
<!-- 企业代码 -->
<el-form-item <el-form-item
label="统一社会信用代码(注册码):" label="统一社会信用代码(注册码):"
prop="code" prop="code"
> >
<el-input v-model.trim="establishForm.code"></el-input> <el-input v-model.trim="establishForm.code"></el-input>
</el-form-item> </el-form-item>
<!-- 数据来源 -->
<el-form-item
label="数据来源:"
prop="data_from"
>
<el-select
v-model="establishForm.data_from"
placeholder="请选择数据来源"
>
<el-option
label="C端"
:value="1"
></el-option>
<el-option
label="B端"
:value="2"
></el-option>
<el-option
label="OP后台代提交"
:value="3"
></el-option>
</el-select>
</el-form-item>
<!-- =================普通企业法人/个体工商户身份认证信息========== -->
<h3>身份信息</h3>
<!-- 企业营业执照号 -->
<el-form-item
label="企业营业执照号"
prop="enterpriseCode"
>
<el-input
placeholder="请输入企业营业执照号"
v-model="establishForm.enterpriseCode"
></el-input>
</el-form-item>
<!-- 身份证正面照片 -->
<el-form-item <el-form-item
label="经营者(法人)身份证照片:" label="身份证正面照"
ref="idcardPhotoChange" prop="front_img"
prop="legalPhoto"
> >
<el-upload <el-upload
action="" action=""
multiple multiple
show-file-list show-file-list
:auto-upload="false" :auto-upload="false"
:file-list="establishForm.idcardPhoto" :file-list="establishForm.licenseList"
:on-change="onIdPhoneChange" :on-change="onLicenseChange"
:on-remove="onIdPhoneRemove" :on-remove="onLicenseRemove"
> >
<el-button <el-button
size="small" size="small"
...@@ -85,20 +125,135 @@ ...@@ -85,20 +125,135 @@
>点击上传</el-button> >点击上传</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<!-- 身份证反面照片 -->
<el-form-item <el-form-item
label="经营者(法人)姓名:" label="身份证反面照"
prop="pers" prop="bak_img"
> >
<el-input v-model.trim="establishForm.pers"></el-input> <el-upload
action=""
multiple
show-file-list
:auto-upload="false"
:file-list="establishForm.licenseList"
:on-change="onLicenseChange"
:on-remove="onLicenseRemove"
>
<el-button
size="small"
type="primary"
>点击上传</el-button>
</el-upload>
</el-form-item> </el-form-item>
<!-- orc照片正面完整度 -->
<el-form-item
label="orc正面完整度"
prop="front_completeness"
>
<el-input v-model="establishForm.front_completeness"></el-input>
</el-form-item>
<!-- orc照片反面完整度 -->
<el-form-item
label="orc反面完整度"
prop="bak_completeness"
>
<el-input v-model="establishForm.bak_completeness"></el-input>
</el-form-item>
<!-- 身份证号 -->
<el-form-item
label="身份证号"
prop="idcard_number"
>
<el-input v-model="establishForm.idcard_number"></el-input>
</el-form-item>
<!-- 姓名 -->
<el-form-item <el-form-item
label="经营者(法人)身份证号:" label="经营者(法人)姓名"
prop="idcardNumber" prop="userName"
> >
<el-input v-model.trim="establishForm.idcardNumber"></el-input> <el-input v-model="establishForm.userName"></el-input>
</el-form-item> </el-form-item>
<!-- ====================== 非必填项 =============================== -->
<!-- 营业执照企业类型 -->
<!-- <el-form-item label="营业执照上企业类型:">
<el-input
placeholder="如:有限责任公司,个体工商户等文字描述"
v-model.trim="establishForm.type"
></el-input>
</el-form-item> -->
<!-- 企业注册地址 -->
<!-- <el-form-item label="企业注册地址:">
<el-input v-model.trim="establishForm.addr"></el-input>
</el-form-item> -->
<!-- 经营范围 -->
<!-- <el-form-item label="经营范围:">
<el-input v-model.trim="establishForm.scope"></el-input>
</el-form-item> -->
<!-- 有效期 -->
<!-- <el-form-item label="有效期:">
<el-input v-model.trim="establishForm.time"></el-input>
</el-form-item> -->
<!-- 注册资本 -->
<!-- <el-form-item label="注册资本:">
<el-input v-model.trim="establishForm.regi"></el-input>
</el-form-item> -->
<!-- 主管单位 -->
<!-- <el-form-item label="主管单位:">
<el-input v-model.trim="establishForm.organizer"></el-input>
</el-form-item> -->
<!-- 成立时间 -->
<!-- <el-form-item label="成立时间:">
<el-input v-model.trim="establishForm.date"></el-input>
</el-form-item> -->
<!-- 登记机关 -->
<!-- <el-form-item label="登记机关:">
<el-input v-model.trim="establishForm.comp"></el-input>
</el-form-item> -->
<!-- 登记号 -->
<!-- <el-form-item label="登记号:">
<el-input v-model.trim="establishForm.num"></el-input>
</el-form-item> -->
<!-- 组成形式 -->
<!-- <el-form-item label="组成形式:">
<el-input v-model.trim="establishForm.form"></el-input>
</el-form-item> -->
<!-- 经费来源 -->
<!-- <el-form-item label="经费来源:">
<el-input v-model.trim="establishForm.funding"></el-input>
</el-form-item> -->
<!-- 发证日期 -->
<!-- <el-form-item label="发证日期:">
<el-input v-model.trim="establishForm.issue_date"></el-input>
</el-form-item> -->
<!-- 生活号id -->
<!-- <el-form-item label="生活号id:">
<el-input v-model.trim="establishForm.life_account_id"></el-input>
</el-form-item> -->
<!-- 代提交人名 -->
<!-- <el-form-item label="代提交人名:">
<el-input v-model.trim="establishForm.proxy_user_name"></el-input>
</el-form-item> -->
<!-- 代提交,被提交人手机号 -->
<!-- <el-form-item label="代提交/被提交用户手机号:">
<el-input v-model.trim="establishForm.phone"></el-input>
</el-form-item> -->
<!-- 代提交标识位 -->
<!-- <el-form-item label="发证日期:">
<el-select
placeholder="是否为代提交"
v-model="establishForm.is_agent"
>
<el-option
label="代提交"
:value="1"
></el-option>
<el-option
label="非代提交"
:value="null"
></el-option>
</el-select>
</el-form-item> -->
<el-form-item> <el-form-item>
<el-button @click="handelCancel('establishFormRef')">取消</el-button> <el-button @click="handelCancel('establishFormRef')">取消</el-button>
<el-button <el-button
...@@ -128,19 +283,19 @@ export default { ...@@ -128,19 +283,19 @@ export default {
callback(); callback();
} }
}; };
// 身份证照片校验规则 /* // 身份证照片校验规则
let idPhotoRules = (rule, value, callback) => { let idPhotoRules = (rule, value, callback) => {
if (this.establishForm.idcardPhoto.length === 0) { if (this.establishForm.idcardPhoto.length === 0) {
callback(new Error("请上传身份证照片")); callback(new Error("请上传身份证照片"));
} else { } else {
callback(); callback();
} }
}; }; */
// 身份证号校验规则 // 身份证号校验规则
let idcardNumberRules = (rule, value, 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]$/; 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]$/;
let IDre15 = /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/; let IDre15 = /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/;
let idNumber = this.establishForm.idcardNumber; let idNumber = this.establishForm.idcard_number;
if (idNumber.length === 0) { if (idNumber.length === 0) {
callback(new Error("身份证号不可为空")); callback(new Error("身份证号不可为空"));
} else if (!(IDRe18.test(idNumber) || IDre15.test(idNumber))) { } else if (!(IDRe18.test(idNumber) || IDre15.test(idNumber))) {
...@@ -152,9 +307,12 @@ export default { ...@@ -152,9 +307,12 @@ export default {
return { return {
// 表单输入项 // 表单输入项
establishForm: { establishForm: {
user_id: null, // 用户id user_id: null, // 用户id(!)
code: null, // 企业代码 code: null, // 企业代码(!)
name: null, // 企业名称 name: null, // 企业名称(!)
entterprise_image: null, // 金山云key(!)
data_from: null, // 数据来源(!)
dataType: null, // 企业认证类型(!)
type: null, // 营业执照上的企业类型 type: null, // 营业执照上的企业类型
addr: null, // 企业注册地址 addr: null, // 企业注册地址
pers: null, // 法人 pers: null, // 法人
...@@ -168,13 +326,24 @@ export default { ...@@ -168,13 +326,24 @@ export default {
form: null, // 组成形式 form: null, // 组成形式
funding: null, // 经费来源 funding: null, // 经费来源
issue_date: null, // 发证日期 issue_date: null, // 发证日期
entterprise_image: null, // 金山云key life_account_id: null, // 生活号id
data_from: 0, // 数据来源
data_type: 0, // 企业认证类型
proxy_user_name: null, // OP后台代提交人姓名 proxy_user_name: null, // OP后台代提交人姓名
licenseList: [], // 营业执照 phone: null, // 代提交 被提交用户手机号
idcardPhoto: [], // 身份证照片 is_agent: null, // 代提交标识位
idcardNumber: "" // 法人身份证号 /* *********身份认证信息********* */
enterpriseCode: "", // 企业营业执照(!)
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: "" // 签发机关
}, },
// 表单校验规则 // 表单校验规则
...@@ -195,28 +364,43 @@ export default { ...@@ -195,28 +364,43 @@ export default {
trigger: "blur" trigger: "blur"
} }
], ],
// 法人照片 // 商户类型
legalPhoto: [ dataType: [
{ required: true, validator: idPhotoRules, trigger: "change" } { required: true, message: "请选择商户类型", trigger: "change" }
], ],
// 法人姓名 // 数据来源
pers: [ data_from: [
{ { required: true, message: "请选择数据来源", trigger: "blur" }
required: true,
message: "请输入经营者(法人)姓名",
trigger: "blur"
}
], ],
// 法人身份证号 /* ****************法人/个体用户身份校验***************** */
idcardNumber: [ // 企业营业执照号
{ enterpriseCode: [
required: true, { required: true, message: "请输入企业营业执照号", trigger: "blur" }
validator: idcardNumberRules,
trigger: "blur"
}
], ],
// 商户类型 // 身份证正面照
data_type: [{ required: true, message: "请选择商户类型", trigger: "change" }] front_img: [
{ required: true, message: "请上传身份证正面照", trigger: "change" }
],
// 身份证反面照
bak_img: [
{ required: true, message: "请上传身份证反面照", trigger: "change" }
],
// 正面完整度
front_completeness: [
{ required: true, message: "请填写orc正面完整度", trigger: "blur" }
],
// 反面完整度
bak_completeness: [
{ required: true, message: "请填写orc反面完整度", trigger: "blur" }
],
// 身份证号
idcard_number: [
{ required: true, validator: idcardNumberRules, trigger: "blur" }
],
// 经营者/法人姓名
userName: [
{ required: true, message: "请填写经营者(法人姓名)", trigger: "blur" }
]
} }
}; };
}, },
...@@ -291,9 +475,7 @@ export default { ...@@ -291,9 +475,7 @@ export default {
this.$message.error("表单未填写完整!"); this.$message.error("表单未填写完整!");
} }
}); });
}, }
} }
}; };
</script> </script>
...@@ -3,31 +3,36 @@ ...@@ -3,31 +3,36 @@
*/ */
import axios from "../utils/request"; import axios from "../utils/request";
// 获取审核列表 /**
// export async function auditList (params) { * 获取企业信息列表
// const res = await axios.post(``) * @param query
// } */
export async function auditList (params) {
// 企业信息检查 const res = await axios.post(`/api/v1/certification`, params);
export async function entCheck (user_id) {
const res = await axios.get(`/api/v1/certification`, { params: { user_id } });
return res; return res;
} }
// 发送企业信息认证 /**
export async function entCommit (query) { * 企业认证审核获取验证码
const res = await axios.post(`/api/v1/emterprise_commit`, { query }); * @param enterprise_auth_record_id 企业认证审核id
*/
export async function sendCode (enterprise_auth_record_id) {
const res = await axios.post(`/api/v1/send_code`, enterprise_auth_record_id);
return res; return res;
} }
// 检查生活号信息唯一性 /**
export async function checkLife (life_account_name) { * 企业认证检测验证码
const res = await axios.post(`/api/v1/check_life`, { life_account_name }); * @param enterprise_auth_record_id 企业认证审核id
* @param code 验证码
*/
export async function checkCode (params) {
const res = await axios.post(`/api/v1/check_code`, params);
return res; return res;
} }
// 创建生活号 // 发送企业信息认证
export async function createLife (params) { export async function entCommit (query) {
const res = await axios.post(`/api/v1/create_life`, { params }); const res = await axios.post(`/api/v1/emterprise_commit`, query);
return res; return res;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment