From 68a62bdd3f95d1fc8032f0498a4ea078ccdc4149 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 29 Mar 2024 15:11:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ah-jjzhgd-web/src/views/system/user/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ah-jjzhgd-web/src/views/system/user/index.vue b/ah-jjzhgd-web/src/views/system/user/index.vue
index e69315c..3683b47 100644
--- a/ah-jjzhgd-web/src/views/system/user/index.vue
+++ b/ah-jjzhgd-web/src/views/system/user/index.vue
@@ -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()
   },

From 34ff0fb7c935511df65069ac214a6a38efd77494 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 29 Mar 2024 15:20:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=AD=A3?=
 =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ah-jjzhgd-web/src/utils/validate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ah-jjzhgd-web/src/utils/validate.js b/ah-jjzhgd-web/src/utils/validate.js
index a48c4d7..92572c7 100644
--- a/ah-jjzhgd-web/src/utils/validate.js
+++ b/ah-jjzhgd-web/src/utils/validate.js
@@ -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)
 }