dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:cd535d5c0b3642131fb785c6e4f1c360512129fb
Branches Tags
dianliang:master
dianliang:driver
dianliang:insp
dianliang:repair
dianliang:dev
..
compare: dianliang:71129b0f0c2217f4adf209ba4e1a1852a4032cb1
Branches Tags
dianliang:driver
dianliang:insp
dianliang:master
dianliang:repair
dianliang:dev

No commits in common. "cd535d5c0b3642131fb785c6e4f1c360512129fb" and "71129b0f0c2217f4adf209ba4e1a1852a4032cb1" have entirely different histories.
cd535d5c0b ... 71129b0f0c

4 changed files with 24 additions and 46 deletions
Show Stats Expand all files Collapse all files

18
src/views/base/company/form/CompanyForm.vue
View File

@ -58,12 +58,12 @@
<el-row :gutter="2">
<el-col :span="12">
<el-form-item v-if="formData.id === undefined" label="管理员登录账号" prop="loginAccount">
<el-input v-model="formData.loginAccount" placeholder="请输入管理员登录账号" maxlength="16" />
<el-input v-model="formData.loginAccount" placeholder="请输入管理员登录账号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="formData.id === undefined" label="管理员登录密码" prop="password">
<el-input v-model="formData.password" placeholder="请输入管理员登录密码" type="password" maxlength="16" show-password />
<el-input v-model="formData.password" placeholder="请输入管理员登录密码" type="password" show-password />
</el-form-item>
</el-col>
</el-row>
@ -148,18 +148,8 @@ export default {
{ required: true, message: '联系方式不能为空', trigger: 'blur' },
{ pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,message: '请输入正确的联系方式', trigger: ["blur", "change"] },
],
loginAccount: [{ required: true, message: '管理员登录账号不能为空', trigger: 'blur' }, {
min: 4,
max: 16,
message: '管理员登录账号长度在4到16个字符',
trigger: 'blur'
}],
password: [{ required: true, message: '管理员登录密码不能为空', trigger: 'blur' }, {
min: 4,
max: 16,
message: '管理员登录密码长度在4到16个字符',
trigger: 'blur'
}]
loginAccount: [{ required: true, message: '管理员登录账号不能为空', trigger: 'blur' }],
password: [{ required: true, message: '管理员登录密码不能为空', trigger: 'blur' }]
}
}
},

8
src/views/company/property/position/index.vue
View File

@ -2,6 +2,14 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="企业id" prop="corpId">
<el-input v-model="queryParams.corpId" placeholder="请输入企业id（base_company表中的id）" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> -->
<el-form-item label="存放地名称" prop="posName" label-width="100">
<el-input v-model="queryParams.posName" placeholder="请输入存放地名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>

18
src/views/company/staff/form/StaffForm.vue
View File

@ -60,12 +60,12 @@
<el-row :gutter="2">
<el-col :span="12">
<el-form-item v-if="formData.id === undefined" label="登录账号" prop="loginAccount">
<el-input v-model="formData.loginAccount" placeholder="请输入登录账号" maxlength="16" />
<el-input v-model="formData.loginAccount" placeholder="请输入登录账号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="formData.id === undefined" label="登录密码" prop="password">
<el-input v-model="formData.password" placeholder="请输入登录密码" type="password" maxlength="16" show-password />
<el-input v-model="formData.password" placeholder="请输入登录密码" type="password" show-password />
</el-form-item>
</el-col>
</el-row>
@ -169,18 +169,8 @@ export default {
workYear: [{required: true, message: "工龄不能为空", trigger: 'blur'}],
joinedYear: [{required: true, message: "司龄不能为空", trigger: 'blur'}],
education: [{required: true, message: "学历不能为空", trigger: 'blur'}],
loginAccount: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }, {
min: 4,
max: 16,
message: '登录账号长度在4到16个字符',
trigger: 'blur'
}],
password: [{ required: true, message: '登录密码不能为空', trigger: 'blur' }, {
min: 4,
max: 16,
message: '登录密码长度在4到16个字符',
trigger: 'blur'
}],
loginAccount: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
password: [{ required: true, message: '登录密码不能为空', trigger: 'blur' }],
workDate: [{ required: true, message: '工作日期不能为空', trigger: 'blur' }],
joinedDate: [{ required: true, message: '入职日期不能为空', trigger: 'blur' }],
},

26
src/views/system/tenant/index.vue
View File

@ -88,8 +88,8 @@
@pagination="getList"/>
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="140px">
<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-form-item>
@ -104,11 +104,11 @@
<el-form-item label="联系手机" prop="contactMobile">
<el-input v-model="form.contactMobile" placeholder="请输入联系手机" />
</el-form-item>
<el-form-item v-if="form.id === undefined" label="管理员登录账号" prop="username">
<el-input v-model="form.username" placeholder="请输入管理员登录账号" maxlength="16" />
<el-form-item v-if="form.id === undefined" label="用户名称" prop="username">
<el-input v-model="form.username" placeholder="请输入用户名称" />
</el-form-item>
<el-form-item v-if="form.id === undefined" label="管理员登录密码" prop="password">
<el-input v-model="form.password" placeholder="请输入管理员登录密码" type="password" maxlength="16" show-password />
<el-form-item v-if="form.id === undefined" label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" show-password />
</el-form-item>
<el-form-item label="账号额度" prop="accountCount">
<el-input-number v-model="form.accountCount" placeholder="请输入账号额度" controls-position="right" :min="0" />
@ -183,18 +183,8 @@ export default {
accountCount: [{ required: true, message: "账号额度不能为空", trigger: "blur" }],
expireTime: [{ required: true, message: "过期时间不能为空", trigger: "blur" }],
website: [{ required: true, message: "绑定域名不能为空", trigger: "blur" }],
username: [{ required: true, message: '管理员登录账号不能为空', trigger: 'blur' }, {
min: 4,
max: 16,
message: '管理员登录账号长度在4到16个字符',
trigger: 'blur'
}],
password: [{ required: true, message: '管理员登录密码不能为空', trigger: 'blur' }, {
min: 4,
max: 16,
message: '管理员登录密码长度在4到16个字符',
trigger: 'blur'
}]
username: [{ required: true, message: "用户名称不能为空", trigger: "blur" }],
password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }],
}
};
},