From 1696e625beeec726c946f68f1db47e355d38b601 Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Mon, 9 Sep 2024 16:30:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=BF=98=E5=8E=9F=E4=BA=BA=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/corpInfo/user/components/edit.vue       |  2 +-
 src/views/corpInfo/user/components/list.vue       | 11 +++++------
 src/views/corpInfo/userCenter/components/list.vue |  8 ++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue
index 7240fca..60dc0bc 100644
--- a/src/views/corpInfo/user/components/edit.vue
+++ b/src/views/corpInfo/user/components/edit.vue
@@ -812,7 +812,7 @@ export default {
         DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }],
         SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }],
         NATION: [{ required: false, trigger: 'blur' }],
-        SEX: [{ required: false,  trigger: 'blur' }],
+        SEX: [{ required: false, trigger: 'blur' }],
         POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }],
         DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }],
         DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }],
diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue
index c18353d..7e19783 100644
--- a/src/views/corpInfo/user/components/list.vue
+++ b/src/views/corpInfo/user/components/list.vue
@@ -50,9 +50,9 @@
                 </el-button>
                 <!--导入功能未同步人员中台，暂时屏蔽-->
                 <!--plain @click="dialogFormDaoru = true"-->
-<!--                <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" >-->
-<!--                  导入-->
-<!--                </el-button>-->
+                <!--                <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" >-->
+                <!--                  导入-->
+                <!--                </el-button>-->
                 <el-button v-waves size="mini" plain type="info" icon="el-icon-right" @click="goExcel">
                   导出
                 </el-button>
@@ -96,7 +96,7 @@
               </template>
               <el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
               <el-button v-show="del && row.ISMAIN=='0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.USER_ID, row.NAME, row.ISPUSH)">删除</el-button>
-              <el-button v-if="row.ISPUSH == '0'" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>
+              <!--              <el-button v-if="row.ISPUSH == '0'" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>-->
             </template>
           </el-table-column>
         </el-table>
@@ -797,8 +797,7 @@ export default {
           SHIFTDUTYONE: this.SHIFTDUTYONE,
           SHIFTDUTYTWO: this.SHIFTDUTYTWO,
           IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER,
-          USER_ID: this.USER_ID,
-          ISPUSH: '2'
+          USER_ID: this.USER_ID
         }
       ).then((data) => {
         this.listLoading = false
diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue
index 5902be6..7a22021 100644
--- a/src/views/corpInfo/userCenter/components/list.vue
+++ b/src/views/corpInfo/userCenter/components/list.vue
@@ -48,10 +48,10 @@
                 <el-button v-waves v-if="LOGIN_USER === 'f0c2c728c85446b0b96a370f5f8da38f'" class="filter-item" type="warning" icon="el-icon-bottom-right" size="mini" @click="resetPassword">
                   一键密码重置
                 </el-button>
-                    <!--暂时取消导入功能-->
-<!--                <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true">-->
-<!--                  导入-->
-<!--                </el-button>-->
+                <!--暂时取消导入功能-->
+                <!--                <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true">-->
+                <!--                  导入-->
+                <!--                </el-button>-->
                 <el-button v-waves size="mini" plain type="info" icon="el-icon-right" @click="goExcel">
                   导出
                 </el-button>