haozq
/
ah_jjzhgd_webservice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
cool 2024-03-29 15:51:34 +08:00
parent 29bdc6f5b0 34ff0fb7c9
commit c5aeef61bf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ah-jjzhgd-web/src/utils/validate.js
View File

@ -92,7 +92,7 @@ export function isArray(arg) {
* @returns {Boolean}
*/
export function validPhone(phone) {
const reg = /^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\d{8}$/
const reg = /^(0|86|17951)?(13[0-9]|19[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/
return reg.test(phone)
}

10
ah-jjzhgd-web/src/views/system/user/index.vue
View File

@ -116,14 +116,14 @@
<el-form-item v-if="dialogStatus === 'create'" label="密码" prop="password">
<el-input v-model="temp.password" type="password" placeholder="请输入密码" show-password :maxlength="16" />
</el-form-item>
<el-form-item label="组织机构" prop="orgId">
<treeselect v-model="temp.orgId" :options="orgOptions" :show-count="true" placeholder="请选择组织机构" />
</el-form-item>
<!-- <el-form-item label="组织机构" prop="orgId">
<treeselect v-model="temp.orgId" :options="orgOptions" :show-count="true" placeholder="请选择组织机构" />
</el-form-item> -->
<el-form-item label="组织机构" prop="orgId">
<el-select v-model="temp.orgId" placeholder="请选择组织机构" class="filter-item" style="width: 100%">
<el-option v-for="item in buildArr" :key="item.orgId" :label="item.name" :value="item.orgId"></el-option>
</el-select>
</el-form-item> -->
</el-form-item>
<el-form-item label="登录权限" prop="loginType">
<el-checkbox-group v-model="loginType">
<el-checkbox v-for="item in loginTypeArr" :key="item.value" :label="item.value">{{ item.name }}</el-checkbox>
@ -325,7 +325,7 @@ export default {
},
created() {
this.getList()
this.getOrgList()
// this.getOrgList()
this.getRoleList()
this.getBuildList()
},