From b7fee54919549ab31be19c8db47a57f89bf3c536 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Mon, 30 Mar 2020 15:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=9A=E5=91=98=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/party-review.vue       |   4 +
 .../user/party-wait-authentication.vue        |   4 -
 src/views/modules/user/partymembers.vue       | 111 +++++++-----------
 src/views/modules/user/real-name-repeat.vue   |   2 +-
 4 files changed, 48 insertions(+), 73 deletions(-)

diff --git a/src/views/modules/user/party-review.vue b/src/views/modules/user/party-review.vue
index e84ab0c5..261d79f8 100644
--- a/src/views/modules/user/party-review.vue
+++ b/src/views/modules/user/party-review.vue
@@ -138,6 +138,9 @@ export default {
         ],
         identityNo: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        partyFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -171,6 +174,7 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+        this.dataForm.partyFlag = ''
         this.dataForm.tagIds = []
       }).catch(() => { })
       this.$http.get(`/app-user/usergrid/listUserGrid/${this.dataForm.id}`).then(({ data: res }) => {
diff --git a/src/views/modules/user/party-wait-authentication.vue b/src/views/modules/user/party-wait-authentication.vue
index b4bb1513..a50a8060 100644
--- a/src/views/modules/user/party-wait-authentication.vue
+++ b/src/views/modules/user/party-wait-authentication.vue
@@ -81,10 +81,6 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column type="selection"
-                         header-align="center"
-                         align="center"
-                         width="50"></el-table-column>
         <el-table-column label="序号"
                          width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
         <el-table-column prop="realName"
diff --git a/src/views/modules/user/partymembers.vue b/src/views/modules/user/partymembers.vue
index f0798ad4..1cc40ad1 100755
--- a/src/views/modules/user/partymembers.vue
+++ b/src/views/modules/user/partymembers.vue
@@ -12,52 +12,6 @@
                        clearable>
           </el-cascader>
         </el-form-item>
-        <!-- <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId"
-                     clearable
-                     placeholder="请选择"
-                     @change="getCommunityList">
-            <el-option v-for="item in streetOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId"
-                     clearable
-                     placeholder="请选择"
-                     @change="getGridList">
-            <el-option v-for="item in communityOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId"
-                     clearable
-                     placeholder="请选择">
-            <el-option v-for="item in gridOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
-        <!-- <el-form-item label="注册状态">
-          <el-select v-model="dataForm.registFlag"
-                     clearable
-                     placeholder="请选择">
-            <el-option v-for="item in registOptions"
-                       :key="item.dictValue"
-                       :label="item.dictName"
-                       :value="item.dictValue">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
         <br>
         <el-form-item label="姓名">
           <el-input v-model="dataForm.realName"
@@ -85,6 +39,16 @@
           </el-select>
         </el-form-item>
         <br>
+        <el-form-item label="注册状态">
+          <el-select v-model="dataForm.registFlag"
+                     placeholder="请选择">
+            <el-option v-for="item in registFlagOptions"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                       :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="注册时间">
           <el-date-picker v-model="timeRange"
                           type="daterange"
@@ -161,14 +125,14 @@
                          :formatter="formatCadre"
                          header-align="center"
                          align="center"></el-table-column>
-        <!-- <el-table-column prop="tagName"
-                         label="角色"
-                         header-align="center"
-                         align="center"></el-table-column> -->
         <el-table-column prop="partyOrganization"
                          label="所在党委"
                          header-align="center"
                          align="center"></el-table-column>
+        <el-table-column prop="registFlag"
+                         label="注册状态"
+                         header-align="center"
+                         align="center" :formatter="formatregistFlag"></el-table-column>
         <el-table-column prop="registTime"
                          label="认证时间"
                          header-align="center"
@@ -257,11 +221,27 @@ export default {
         startTime: '',
         endTime: ''
       },
-      // streetOptions: [],
       communityOptions: [],
       gridOptions: [],
       registOptions: [],
-      // postOptions: [],
+      registFlagOptions: [
+        {
+          dictName: '全部',
+          dictValue: ''
+        },
+        {
+          dictName: '未注册',
+          dictValue: '0'
+        },
+        {
+          dictName: '自动认证',
+          dictValue: '1'
+        },
+        {
+          dictName: '手动认证',
+          dictValue: '2'
+        }
+      ],
       timeRange: [],
       upLoadUrl: '',
       faultDataVisible: false,
@@ -317,14 +297,6 @@ export default {
       this.dataForm.startTime = this.timeRange[0]
       this.dataForm.endTime = this.timeRange[1]
     },
-    // getStreetList () {
-    //   this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
-    //     if (res.code !== 0) {
-    //       return this.$message.error(res.msg)
-    //     }
-    //     this.streetOptions = res.data
-    //   }).catch(() => { })
-    // },
     getCommunityList () {
       if (this.dataForm.streetId === '') {
         this.communityOptions = []
@@ -364,20 +336,22 @@ export default {
         this.registOptions = res.data
       }).catch(() => { })
     },
-    // getPostOptions () {
-    //   this.$http.get(`/sys/dict/sublist/1168770417290366977`).then(({ data: res }) => {
-    //     if (res.code !== 0) {
-    //       return this.$message.error(res.msg)
-    //     }
-    //     this.postOptions = res.data
-    //   }).catch(() => { })
-    // },
     formatCadre: function (row, column) {
       return row.cadreFlag === '1' ? '是' : row.cadreFlag === '0' ? '否' : '未知'
     },
     formatRegist: function (row, column) {
       return row.registFlag === '1' ? '是' : row.registFlag === '0' ? '否' : '未知'
     },
+    formatregistFlag (row, column) {
+      let registFlag = row.registFlag
+      if (registFlag === '0') {
+        return '未注册'
+      } else if (registFlag === '1') {
+        return '自动认证'
+      } else if (registFlag === '2') {
+        return '手动认证'
+      }
+    },
     importData () {
     },
     // 获取数据列表
@@ -387,6 +361,7 @@ export default {
         this.dataForm.endTime = ''
       }
       this.dataListLoading = true
+      console.log(JSON.stringify(this.dataForm))
       this.$http.get(
         this.mixinViewModuleOptions.getDataListURL,
         {
diff --git a/src/views/modules/user/real-name-repeat.vue b/src/views/modules/user/real-name-repeat.vue
index 56f495bb..46a903b2 100644
--- a/src/views/modules/user/real-name-repeat.vue
+++ b/src/views/modules/user/real-name-repeat.vue
@@ -41,7 +41,7 @@
                                  align="center"></el-table-column>
             </el-table>
             <p style="font-size: 13px;color: red;">
-                注意：“通过”通过则将该用户作为新党员认证通过，并加入到已认证党员列表；“通过并更新党员库”会将党员库中的原始数据更新，并将用户认证通过为党员同时加入已认证党员列表；请确认用户信息后谨慎操作。
+                注意：“通过”则将该用户作为新党员认证通过，并加入到已认证党员列表；“通过并更新党员库”会将党员库中的原始数据更新，并将用户认证通过为党员同时加入已认证党员列表；请确认用户信息后谨慎操作。
             </p>
         </el-form>
         <template slot="footer">