Commit 2029a281 authored by zhuangxinwei's avatar zhuangxinwei

修改bug

parent 9b705cc6
...@@ -201,19 +201,19 @@ ...@@ -201,19 +201,19 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="登录名" prop="username"> <el-form-item label="登录名" prop="username">
<el-input v-model="form.username" placeholder="请输入登录名" maxlength="30" show-word-limit/> <el-input v-model="form.username" placeholder="请输入登录名" maxlength="30" show-word-limit />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证号" prop="idNumber"> <el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" show-word-limit/> <el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" show-word-limit />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户昵称" prop="nickName"> <el-form-item label="用户昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" show-word-limit/> <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" show-word-limit />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="邮箱" prop="email"> <el-form-item label="邮箱" prop="email">
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" show-word-limit/> <el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" show-word-limit />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -260,16 +260,16 @@ ...@@ -260,16 +260,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="labelHeight" label="角色" prop="roleList"> <el-form-item class="labelHeight" label="角色" prop="roleList">
<el-select v-model="form.roleList" style="width: 100%" multiple placeholder="请选择角色"> <el-select v-model="form.roleList" style="width: 100%" multiple placeholder="请选择角色">
<el-option <el-option
v-for="(item,index) in roleOptions" v-for="(item,index) in roleOptions"
:key="index" :key="index"
:label="item.roleName" :label="item.roleName"
:value="item.businessId" :value="item.businessId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm" :loading="priLoading">确 定</el-button> <el-button type="primary" :loading="priLoading" @click="submitForm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 用户导入对话框 --> <!-- 用户导入对话框 -->
...@@ -390,7 +390,7 @@ export default { ...@@ -390,7 +390,7 @@ export default {
if (value === '' || value === null || value === undefined) { if (value === '' || value === null || value === undefined) {
callback() callback()
} else { } else {
const stuCardReg = /^[0-9]{17}[0-9,X,x]{1}/; const stuCardReg = /^[0-9]{17}[0-9,X,x]{1}/
if (stuCardReg.test(value)) { if (stuCardReg.test(value)) {
callback() callback()
} else { } else {
...@@ -402,7 +402,7 @@ export default { ...@@ -402,7 +402,7 @@ export default {
if (value === '' || value === null || value === undefined) { if (value === '' || value === null || value === undefined) {
callback() callback()
} else { } else {
const stuCardReg = /^1[0-9]{10}/; const stuCardReg = /^1[0-9]{10}/
if (stuCardReg.test(value)) { if (stuCardReg.test(value)) {
callback() callback()
} else { } else {
...@@ -634,7 +634,7 @@ export default { ...@@ -634,7 +634,7 @@ export default {
// { min: 18, max: 18, message: '长度18字符', trigger: 'blur' }, // { min: 18, max: 18, message: '长度18字符', trigger: 'blur' },
// { validator: idNumber, trigger: 'blur' } // { validator: idNumber, trigger: 'blur' }
// ] // ]
}, }
} }
}, },
...@@ -1039,6 +1039,9 @@ export default { ...@@ -1039,6 +1039,9 @@ export default {
} else if (res.code === 41020) { } else if (res.code === 41020) {
this.$message.info('上传超时,请重新上传') this.$message.info('上传超时,请重新上传')
this.importLoading = false this.importLoading = false
} else if (res.code === 502) {
this.$message.info('导入模板格式错误')
this.importLoading = false
} }
this.importLoading = false this.importLoading = false
}).catch(err => { }).catch(err => {
......
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