From d3667850909da91079410b4c33ca980d9d5d15e1 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Wed, 23 Oct 2024 14:45:03 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](pet)=20?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA=E5=91=98=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/group/centerUserInfo/index.vue     | 12 ++++-------
 src/views/system/group/user/index.vue         | 21 +++++++++++++++----
 src/views/system/group/userCenter/index.vue   |  5 +++--
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/views/system/group/centerUserInfo/index.vue b/src/views/system/group/centerUserInfo/index.vue
index 325eb6f..7fa1adb 100644
--- a/src/views/system/group/centerUserInfo/index.vue
+++ b/src/views/system/group/centerUserInfo/index.vue
@@ -109,11 +109,6 @@
         <el-table-column type="index" label="序号" width="50" align="center"/>
         <el-table-column prop="NAME" label="用户名" align="center"/>
         <el-table-column prop="CREATTIME" label="新增时间" align="center"/>
-        <el-table-column prop="CREATORNAME" label="新增人" align="center">
-          <template slot-scope="{row}">
-            <span>{{row.CREATORNAME ? row.CREATORNAME : row.NAMEX ? row.NAMEX : row.NAMER}}</span>
-          </template>
-        </el-table-column>
         <el-table-column prop="REMARKS" label="记录" align="center"/>
       </el-table>
     </el-dialog>
@@ -144,7 +139,7 @@
           <el-radio v-model="pd.SEX" :label="'1'">女</el-radio>
         </el-form-item>
         <el-form-item label="手机号" prop="PHONE">
-          <el-input v-model="pd.PHONE" placeholder="这里输入手机号..."/>
+          <el-input v-model="pd.PHONE" placeholder="这里输入手机号..." @blur="goCheck()"/>
         </el-form-item>
         <!--        <el-form-item label="部门级别" prop="deptTypeID"> &lt;!&ndash;（目的是选择部门到这个级别）  &ndash;&gt;-->
         <!--          <el-select v-model="pd.deptTypeID" placeholder="请选择" class="filter-item" >-->
@@ -526,7 +521,8 @@ export default {
             'user/goCheck',
             {
               CARD_NO: this.pd.USER_ID_CARD,
-              USERNAME: this.pd.USERNAME
+              USERNAME: this.pd.USERNAME,
+              PHONE: this.pd.PHONE
             }
           ).then((data) => {
             if (data.result === 'success') {
@@ -563,7 +559,7 @@ export default {
           CITY: this.keyShudi[1] || '',
           COUNTRY: this.keyShudi[2] || '',
           VILLAGE: this.keyShudi[3] || '',
-          ISPUSH: '0'
+          ISPUSH: '1'
         }
       ).then((data) => {
         this.listLoading = false
diff --git a/src/views/system/group/user/index.vue b/src/views/system/group/user/index.vue
index 5d2ba5e..0219a25 100644
--- a/src/views/system/group/user/index.vue
+++ b/src/views/system/group/user/index.vue
@@ -118,14 +118,14 @@
 <!--          <el-input v-model="pd.userPASSWORD" show-password placeholder="这里输入密码..." />-->
 <!--        </el-form-item>-->
         <el-form-item label="身份证号" prop="USER_ID_CARD">
-          <el-input v-model="pd.USER_ID_CARD" placeholder="这里输入身份证号..." @blur="goCheck()"/>
+          <el-input v-model="pd.USER_ID_CARD" placeholder="这里输入身份证号..."/>
         </el-form-item>
         <el-form-item label="性别" prop="SEX">
           <el-radio v-model="pd.SEX" :label="'0'">男</el-radio>
           <el-radio v-model="pd.SEX" :label="'1'">女</el-radio>
         </el-form-item>
         <el-form-item label="手机号" prop="PHONE">
-          <el-input v-model="pd.PHONE" placeholder="这里输入手机号..." />
+          <el-input v-model="pd.PHONE" placeholder="这里输入手机号..." @blur="goCheck()"/>
         </el-form-item>
         <!--        <el-form-item label="部门级别" prop="deptTypeID"> &lt;!&ndash;（目的是选择部门到这个级别）  &ndash;&gt;-->
         <!--          <el-select v-model="pd.deptTypeID" placeholder="请选择" class="filter-item" >-->
@@ -276,7 +276,9 @@ export default {
         ROLE_ID: [
           { required: true, message: '角色不能为空', trigger: 'blur' }
         ],
-
+        USERNAME: [
+          { required: true, message: '用户名不能为空', trigger: 'blur' }
+        ],
         NAME: [
           { required: true, message: '姓名不能为空', trigger: 'blur' },
           { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
@@ -343,7 +345,9 @@ export default {
         ISASSESS: '',
         JOB: '', // 职务
         USER_ID_CARD: '', //身份证号
-        NATION: '' //民族
+        NATION: '', //民族
+        CARD_NO: '' //身份证号
+
       },
       roleList: [],
       multipleSelectionAll: [], // 所有选中的数据包含跨页数据
@@ -740,6 +744,15 @@ export default {
       if (this.pd.VILLAGE) {
         areaRefID.push(this.pd.VILLAGE)
       }
+      if (this.pd.CARD_NO){
+        areaRefID.push(this.pd.CARD_NO)
+      }
+      if (this.pd.USERNAME){
+        areaRefID.push(this.pd.USERNAME)
+      }
+      if (this.pd.PHONE){
+        areaRefID.push(this.pd.PHONE)
+      }
       this.$set(this.pd, 'shudi', areaRefID)
 
       const refDeptLevelVal = {}
diff --git a/src/views/system/group/userCenter/index.vue b/src/views/system/group/userCenter/index.vue
index 1d84b19..49e29e8 100644
--- a/src/views/system/group/userCenter/index.vue
+++ b/src/views/system/group/userCenter/index.vue
@@ -125,7 +125,7 @@
           <el-radio v-model="pd.SEX" :label="'1'">女</el-radio>
         </el-form-item>
         <el-form-item label="手机号" prop="PHONE">
-          <el-input v-model="pd.PHONE" placeholder="这里输入手机号..." />
+          <el-input v-model="pd.PHONE" placeholder="这里输入手机号..." @blur="goCheck()"/>
         </el-form-item>
         <!--        <el-form-item label="部门级别" prop="deptTypeID"> &lt;!&ndash;（目的是选择部门到这个级别）  &ndash;&gt;-->
         <!--          <el-select v-model="pd.deptTypeID" placeholder="请选择" class="filter-item" >-->
@@ -497,7 +497,8 @@ export default {
             {
               CARD_NO: this.pd.USER_ID_CARD,
               USERNAME: this.pd.PHONE,
-              USER_ID: this.pd.USER_ID
+              USER_ID: this.pd.USER_ID,
+              PHONE: this.pd.PHONE
             }
           ).then((data) => {
             if (data.result === 'success') {