zhangbowen
/
trace-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码同步 02.18

Browse Source
master
张博文 5 months ago
parent 620ce5147c
commit 4a863cbc38
3 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File

12
src/views/basic/businessInfo/index.vue
Unescape Escape View File

@ -65,29 +65,29 @@
<el-dialog :title="title" :visible.sync="openedit" width="500px" v-dialogDrag append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-position="top" >
<el-form-item label="商户名称" prop="businessName" >
<el-input v-model="form.businessName" placeholder="请输入商户名称" />
<el-input v-model="form.businessName" placeholder="请输入商户名称" maxlength="64" />
</el-form-item>
<el-form-item label="所属行政区" prop="area">
<!-- 下拉框地区操作先财要求修改的功能 <div style="display: flex;">
<CascaderArea style="flex: 1;" :pca="areaList" :isValue="form.area" ref="cascaderArea" v-model="form.area" @transfer="getArea"></CascaderArea>
</div> -->
<el-input v-model="form.area" placeholder="请输入所属行政区地址" />
<el-input v-model="form.area" placeholder="请输入所属行政区地址" maxlength="12" />
</el-form-item>
<el-form-item label="认证方式" prop="verifyType">
企业认证
</el-form-item>
<el-form-item label="企业名称" prop="companiesName">
<el-input v-model="form.companiesName" placeholder="请输入企业名称" />
<el-input v-model="form.companiesName" placeholder="请输入企业名称" maxlength="64" />
</el-form-item>
<el-form-item label="统一社会信用代码" prop="businessCode">
<el-input v-model="form.businessCode" placeholder="请输入商户统一信用代码" />
<el-input v-model="form.businessCode" placeholder="请输入商户统一信用代码" maxlength="20" />
</el-form-item>
<el-form-item label="法人姓名" prop="legalName">
<el-input v-model="form.legalName" placeholder="请输入法人姓名" />
<el-input v-model="form.legalName" placeholder="请输入法人姓名" maxlength="64" />
</el-form-item>
<el-form-item label="法人身份证" prop="legalIdCard">
<el-input v-model="form.legalIdCard" placeholder="请输入法人身份证" />
<el-input v-model="form.legalIdCard" placeholder="请输入法人身份证" maxlength="32" />
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />

8
src/views/production/setting/miniProConfig.vue
Unescape Escape View File

@ -642,10 +642,10 @@
// 环节
this.linkInfos = linkInfos.map(item => {
const { operateDetails } = item;
operateDetails.map(items=>{
if(items.type == 7 || items.type == 10 || detail.type == 14 || detail.type == 15) {
items.content = JSON.parse(items.content);
items.mapContent = items.content;
operateDetails.map(detail => {
if(detail.type == 7 || detail.type == 10 || detail.type == 14 || detail.type == 15) {
detail.content = JSON.parse(detail.content);
detail.mapContent = detail.content;
}
});
return {

32
src/views/system/tenant/index.vue
Unescape Escape View File

@ -128,12 +128,6 @@
<span>{{ parseTime(scope.row.expireTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="绑定域名"
align="center"
prop="domain"
width="180"
/>
<el-table-column label="租户状态" align="center" prop="status">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
@ -187,7 +181,7 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="租户名" prop="name">
<el-input v-model="form.name" placeholder="请输入租户名" />
<el-input v-model="form.name" placeholder="请输入租户名" maxlength="30" />
</el-form-item>
<el-form-item label="租户套餐" prop="packageId">
<el-select
@ -205,28 +199,29 @@
</el-select>
</el-form-item>
<el-form-item label="联系人" prop="contactName">
<el-input v-model="form.contactName" placeholder="请输入联系人" />
<el-input v-model="form.contactName" placeholder="请输入联系人" maxlength="64" />
</el-form-item>
<el-form-item label="联系手机" prop="contactMobile">
<el-input v-model="form.contactMobile" placeholder="请输入联系手机" />
<el-input v-model="form.contactMobile" placeholder="请输入联系手机" maxlength="16" />
</el-form-item>
<el-form-item
v-if="form.id === undefined"
label="用户名称"
label="账号"
prop="username"
>
<el-input v-model="form.username" placeholder="请输入用户名称" />
<el-input v-model="form.username" placeholder="请输入账号" maxlength="20"/>
</el-form-item>
<el-form-item
v-if="form.id === undefined"
label="用户密码"
label="密码"
prop="password"
>
<el-input
v-model="form.password"
placeholder="请输入用户密码"
placeholder="请输入密码"
type="password"
show-password
maxlength="20"
/>
</el-form-item>
<el-form-item label="账号额度" prop="accountCount">
@ -235,6 +230,7 @@
placeholder="请输入账号额度"
controls-position="right"
:min="0"
:max="999999999"
/>
</el-form-item>
<el-form-item label="过期时间" prop="expireTime">
@ -247,9 +243,6 @@
placeholder="请选择过期时间"
/>
</el-form-item>
<el-form-item label="绑定域名" prop="domain">
<el-input v-model="form.domain" placeholder="请输入绑定域名" />
</el-form-item>
<el-form-item label="租户状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
@ -336,14 +329,11 @@ export default {
expireTime: [
{ required: true, message: "过期时间不能为空", trigger: "blur" },
],
domain: [
{ required: true, message: "绑定域名不能为空", trigger: "blur" },
],
username: [
{ required: true, message: "用户名称不能为空", trigger: "blur" },
{ required: true, message: "账号不能为空", trigger: "blur" },
],
password: [
{ required: true, message: "用户密码不能为空", trigger: "blur" },
{ required: true, message: "密码不能为空", trigger: "blur" },
],
contactMobile: [
{

Write Preview
Loading…
Cancel
Save