From ae4f1242238d7de4375e3b5ef44bdf2cc6281519 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 11 Sep 2024 15:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=AD=E5=8F=B0bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20-=20=E7=94=A8=E6=88=B7=E6=96=B0=E5=A2=9E,?=
 =?UTF-8?q?=20=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91,=20=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=B0=91?=
 =?UTF-8?q?=E6=97=8F=E9=82=AE=E7=AE=B1=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/group/user/index.vue       | 44 +++++++++++----------
 src/views/system/group/userCenter/index.vue |  2 +-
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/views/system/group/user/index.vue b/src/views/system/group/user/index.vue
index 62fcc94..d7bd0ec 100644
--- a/src/views/system/group/user/index.vue
+++ b/src/views/system/group/user/index.vue
@@ -180,8 +180,8 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormEdit = false">取 消</el-button>
-        <el-button v-show="ISCHECK" type="primary" @click="confirm">确 定</el-button>
-        <el-button v-show="!ISCHECK" type="primary" @click="goCheck">校 验</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+        <!-- <el-button v-show="!ISCHECK" type="primary" @click="goCheck">校 验</el-button> -->
       </div>
     </el-dialog>
   </div>
@@ -259,19 +259,20 @@ export default {
       keyDeptType: '',
       keyDepeName: '',
       keyJobLeven: '',
-      ISCHECK: false,
+      // 9.11修改 原ISCHECK = false
+      ISCHECK: true,
       dialogFormEdit: false,
       editloading: false,
       dialogType: 'add',
       rules: {
-        EMAIL: [
-          { required: true, message: '请输入邮箱', trigger: 'blur' },
-          {
-            pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/,
-            message: '请输入正确的邮箱'
-          },
-          { validator: hasEmail, trigger: 'blur' }
-        ],
+        // EMAIL: [
+        //   { required: true, message: '请输入邮箱', trigger: 'blur' },
+        //   {
+        //     pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/,
+        //     message: '请输入正确的邮箱'
+        //   },
+        //   { validator: hasEmail, trigger: 'blur' }
+        // ],
         ROLE_ID: [
           { required: true, message: '角色不能为空', trigger: 'blur' }
         ],
@@ -283,9 +284,9 @@ export default {
         SEX: [
           { required: true, message: '请选择性别', trigger: 'blur' }
         ],
-        NATION: [
-          { required: true, message: '请选择民族', trigger: 'blur' }
-        ],
+        // NATION: [
+        //   { required: true, message: '请选择民族', trigger: 'blur' }
+        // ],
         PHONE: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
           { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
@@ -309,12 +310,12 @@ export default {
         ISASSESS: [
           { required: true, message: '请选择是否审核人员', trigger: 'blur' }
         ],
-        USER_ID_CARD: [{ required: true, message: '身份证号不能为空', trigger: 'blur' },
-          {
-            pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/,
-            message: '请输入正确的身份证号'
-          }
-        ]
+        // USER_ID_CARD: [{ required: true, message: '身份证号不能为空', trigger: 'blur' },
+        //   {
+        //     pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/,
+        //     message: '请输入正确的身份证号'
+        //   }
+        // ]
       },
       uesrInfoDic: {
         minzuList: [], // 民族 0a0e406f27f74ee698fe9979d25f62dd
@@ -598,7 +599,8 @@ export default {
     },
     handleAdd() {
       this.dialogFormEdit = true
-      this.ISCHECK = false
+      // 9.11 修改 原:ISCHECK = false
+      this.ISCHECK = true
       this.pd = {}
       this.dialogType = 'saveUser'
       this.pd.PASSWORD = 'Aa@123456789'
diff --git a/src/views/system/group/userCenter/index.vue b/src/views/system/group/userCenter/index.vue
index cf14c79..14467fc 100644
--- a/src/views/system/group/userCenter/index.vue
+++ b/src/views/system/group/userCenter/index.vue
@@ -85,7 +85,7 @@
               <el-button v-show="edit && row.STATUS === '99'" type="warning" icon="el-icon-unlock" size="mini" @click="unLockUser(row.USER_ID, row.NAME)">帐号解锁</el-button>
               <el-button v-show="row.STATUS== 0" type="primary" icon="el-icon-edit" size="mini" @click="handleEditStatus(row,'1', row.USER_ID)">禁用</el-button>
               <el-button v-show="row.STATUS== 1" type="primary" icon="el-icon-edit" size="mini" @click="handleEditStatus(row,'0', row.USER_ID)">启用</el-button>
-              <el-button v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row)">删除</el-button>
+              <!-- <el-button v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row)">删除</el-button> -->
               <el-button v-if="row.ISPUSH != '1'" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>
             </template>
           </el-table-column>