Skip to content

O
op-web-service
Commit 175b3470 authored by zhangtong5@yidian-inc.com's avatar zhangtong5@yidian-inc.com
Browse files
Options

update:合并

parents 1141b317 3b2bcf3e
Show whitespace changes
Inline Side-by-side
Showing with 273 additions and 206 deletions
ks3-js-sdk @ ea6ab311
Subproject commit ea6ab311ebfa69725e824a5cc28bd53d93681d34
src/main.js
View file @ 175b3470
......@@ -23,9 +23,11 @@ router.beforeResolve(async (to, from, next) => {
router.push('/403')
}
})
next()
} else {
redirectToLogin();
}
return false;
} else {
next()
}
......
src/pages/Enterprise/Audit/index.vue
View file @ 175b3470
......@@ -80,6 +80,21 @@
ref="establish_form"
:model="messageList[0]"
>
<el-form-item
label="商户类型"
prop="merchantsType"
>
<el-select v-model="messageList[0].merchantsType">
<el-option
label="个体工商户"
:value="1"
></el-option>
<el-option
label="普通企业"
:value="2"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label="营业执照："
ref="licenseChange"
......@@ -393,10 +408,10 @@ export default {
return {
pageStatus: null, // 哪个按钮进入
auditId: null, // 传入的企业id
// 审核/修改详情/查看详情-企业信息
messageList: [
{
merchantsType: null,
status: 1,
id: 1221,
code: 112211,
......@@ -429,7 +444,6 @@ export default {
],
// 审核-审核意见
opinionArea: "",
// 创建生活号表单是否弹出
isDialogShow: false,
// 生活号-生活号信息
......@@ -487,7 +501,13 @@ export default {
validator: idcardNumberRules,
trigger: "blur"
}
]
],
// 商户类型
merchantsType: [{
required: true,
message: "请选择商户类型",
trigger: "change"
}]
},
// 生活号状态
......
src/pages/Enterprise/Certification/index.vue
View file @ 175b3470
......@@ -6,7 +6,7 @@
class="setUp"
@click="goEstablish"
>企业信息提交</el-button>
<div>
<!-- 企业认证管理列表 -->
<el-card class="enterprise_card">
<!-- 企业认证筛选 -->
<el-form
......@@ -150,6 +150,7 @@
@click="goAuditPage('AUDIT', scope.row.id)"
>审核</el-button>
<el-button
:disabled="scope.row.status === 4 ? true : false"
size="mini"
type="success"
@click="goAuditPage('EDIT', scope.row.id)"
......@@ -163,21 +164,39 @@
</el-table-column>
</el-table>
</el-card>
</div>
<!-- 修改提交验证码弹框 -->
<el-dialog
title="获取验证码"
v-model="detailDialogVisible"
>
<el-input
style="width:50%"
placeholder="请输入您收到的验证码"
></el-input>
<el-button
type="primary"
style="margin-left:10px"
@click="getAuthCode"
>获取校验码</el-button>
<el-button
@click="checkAuthCode"
type="warning"
>已有验证码,点击验证</el-button>
</el-dialog>
</layout>
</template>
<style lang="less" src="./index.less" scope></style>
<script>
import Layout from '@/layouts'
import { entCheck } from '../../../service/enterprise'
import Layout from "@/layouts";
import { entCheck } from "@/service/enterprise";
export default {
name: "Certification",
components: { Layout },
data () {
return {
// 表单数据
// 企业认证管理筛选
enterpriseForm: {
name: "",
code: "",
......@@ -198,7 +217,7 @@ export default {
]
},
// 表格信息
// 企业认证管理列表
enterpriseList: [
{
id: 1,
......@@ -210,12 +229,16 @@ export default {
type: 1,
number: 18147683288
}
]
],
// 跳转详情页弹窗
detailDialogVisible: false
};
},
created () {
this.onEntCheck();
console.log("userInfo:", this.$store.state.userInfo);
},
methods: {
......@@ -223,10 +246,9 @@ export default {
async onEntCheck () {
try {
const res = await entCheck(510232747179);
console.log('res:----', res);
}
catch (error) {
console.log('error:', error);
console.log("res:----", res);
} catch (error) {
console.log("error:", error);
}
},
......@@ -235,20 +257,26 @@ export default {
this.$refs[formName].resetFields();
},
// 跳转到企业信息提交
goEstablish () {
this.$router.push({ name: "Establish" });
},
// 跳转到审核页面
goAuditPage (pageStatus, auditId) {
this.$router.push({
name: "Audit",
params: {
pageStatus,
auditId
if (pageStatus === "EDIT") {
return (this.detailDialogVisible = true);
} else {
this.$router.push({ name: "Audit", params: { pageStatus, auditId } });
}
});
},
// 跳转到企业信息提交
goEstablish () {
this.$router.push({ name: "Establish" });
// 获取验证码
getAuthCode () {
},
// 校验验证码
checkAuthCode () {
this.$router.push({ name: "Audit", params: { pageStatus: "EDIT", auditId: 1 } })
}
}
};
......
src/pages/Enterprise/Establish/index.vue
View file @ 175b3470
......@@ -14,21 +14,23 @@
ref="establishFormRef"
:model="establishForm"
>
<!-- 商户类型 -->
<el-form-item
label="商户类型"
prop="merchantsType"
prop="data_type"
>
<el-select v-model="establishForm.merchantsType">
<el-select v-model="establishForm.data_type">
<el-option
label="个体工商户"
value="1"
:value="1"
></el-option>
<el-option
label="普通企业"
value="2"
:value="2"
></el-option>
</el-select>
</el-form-item>
<!-- -->
<el-form-item
label="营业执照："
ref="licenseChange"
......@@ -52,16 +54,16 @@
<el-form-item
label="企业注册名称："
prop="registeredName"
prop="name"
>
<el-input v-model.trim="establishForm.registeredName"></el-input>
<el-input v-model.trim="establishForm.name"></el-input>
</el-form-item>
<el-form-item
label="统一社会信用代码（注册码）："
prop="registrationCode"
prop="code"
>
<el-input v-model.trim="establishForm.registrationCode"></el-input>
<el-input v-model.trim="establishForm.code"></el-input>
</el-form-item>
<el-form-item
label="经营者（法人）身份证照片："
......@@ -86,9 +88,9 @@
<el-form-item
label="经营者（法人）姓名："
prop="legalName"
prop="pers"
>
<el-input v-model.trim="establishForm.legalName"></el-input>
<el-input v-model.trim="establishForm.pers"></el-input>
</el-form-item>
<el-form-item
......@@ -150,12 +152,28 @@ export default {
return {
// 表单输入项
establishForm: {
merchantsType: null, // 商户类型
user_id: null, // 用户id
code: null, // 企业代码
name: 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, // 发证日期
entterprise_image: null, // 金山云key
data_from: 0, // 数据来源
data_type: 0, // 企业认证类型
proxy_user_name: null, // OP后台代提交人姓名
licenseList: [], // 营业执照
registeredName: "", // 注册名称
registrationCode: "", // 注册码
idcardPhoto: [], // 身份证照片
legalName: "", // 法人姓名
idcardNumber: "" // 法人身份证号
},
......@@ -166,11 +184,11 @@ export default {
{ required: true, validator: businessRules, trigger: "change" }
],
// 企业注册名称
registeredName: [
name: [
{ required: true, message: "请输入企业注册名称", trigger: "blur" }
],
// 注册码
registrationCode: [
code: [
{
required: true,
message: "请输入统一社会信用代码（注册码）",
......@@ -182,7 +200,7 @@ export default {
{ required: true, validator: idPhotoRules, trigger: "change" }
],
// 法人姓名
legalName: [
pers: [
{
required: true,
message: "请输入经营者（法人）姓名",
......@@ -198,7 +216,7 @@ export default {
}
],
// 商户类型
merchantsType: [{ required: true, message: "请选择商户类型", trigger: "change" }]
data_type: [{ required: true, message: "请选择商户类型", trigger: "change" }]
}
};
},
......@@ -242,8 +260,8 @@ export default {
console.log(valid);
const query = {
user_id: 510232747179, // 用户id
code: parseInt(this.establishForm.registrationCode), // 企业代码
name: this.establishForm.registeredName, // 企业名称
code: parseInt(this.establishForm.code), // 企业代码
name: this.establishForm.name, // 企业名称
type: "", // 企业类型
addr: "", // 企业注册地址
pers: "", // 法人
......@@ -275,13 +293,7 @@ export default {
});
},
// 选择商户
chooseType () {
if (this.establishForm.merchantsType) {
this.$refs["merchantsTypeRef"].clearValidate();
}
console.log(this.establishForm.merchantsType);
}
}
};
</script>
src/router/index.js
View file @ 175b3470
import { createRouter, createWebHistory } from "vue-router";
import Certification from '@/pages/Enterprise/Certification'
import Audit from '@/pages/Enterprise/Audit'
import Establish from '@/pages/Enterprise/Establish'
import LifeNo from '../pages/Life-no/index.vue'
import LifeNoDetail from '../pages/Life-no/life-no-detail.vue'
......@@ -27,7 +31,7 @@ const routes = [
{
path: '/enterprise/certification',
name: 'Certification',
component: () => import(/* webpackChunkName: "enterprise" */ '@/pages/Enterprise/Certification'),
component: Certification,
meta: {
requireAuth: true,
},
......@@ -35,7 +39,7 @@ const routes = [
{
path: '/enterprise/audit',
name: 'Audit',
component: () => import(/* webpackChunkName: "enterprise" */ '@/pages/Enterprise/Audit'),
component: Audit,
meta: {
requireAuth: true,
}
......@@ -43,7 +47,7 @@ const routes = [
{
path: '/enterprise/establish',
name: 'Establish',
component: () => import(/* webpackChunkName: "enterprise" */ '@/pages/Enterprise/Establish'),
component: Establish,
meta: {
requireAuth: true,
}
......
src/utils/oss.js
View file @ 175b3470
import moment from "moment";
import CommonServer from "@/api/common";
import CommonServer from "./common";
import axios from "axios";
import { ElMessage } from "element-plus";
......
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