From c18fbb91d53447e8270a9da01dd15c223c6515a6 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Fri, 6 Dec 2019 16:31:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/partyauthenticationfailed.vue        | 107 +++++++++++++-----
 .../user/partymembers-add-or-update.vue       |   5 -
 src/views/modules/user/partymembers.vue       |  25 ++--
 3 files changed, 92 insertions(+), 45 deletions(-)

diff --git a/src/views/modules/user/partyauthenticationfailed.vue b/src/views/modules/user/partyauthenticationfailed.vue
index 4c747c94..18c3f3f7 100644
--- a/src/views/modules/user/partyauthenticationfailed.vue
+++ b/src/views/modules/user/partyauthenticationfailed.vue
@@ -1,38 +1,91 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-user__partyauthenticationfailed}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="姓名"><el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input></el-form-item>
-        <el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item>
-        <el-form-item label="身份证号"><el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input></el-form-item>
-        <span class="demonstration">认证时间</span>&nbsp;&nbsp;
-        <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item label="姓名">
+          <el-input v-model="dataForm.realName"
+                    placeholder="请输入"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="dataForm.mobile"
+                    placeholder="请输入"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="身份证号">
+          <el-input v-model="dataForm.identityNo"
+                    placeholder="请输入"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="注册时间">
+          <el-date-picker @change='setRegistTime'
+                          v-model="time"
+                          value-format="yyyy-MM-dd"
+                          type="daterange"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"></el-date-picker>&nbsp;
+          <el-form-item>
+            <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          </el-form-item>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" 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 prop="realName" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridName" label="认证网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="认证时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="address" label="居民住址" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                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 prop="realName"
+                         label="姓名"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="identityNo"
+                         label="身份证号"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="mobile"
+                         label="手机号"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="gridName"
+                         label="认证网格"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="认证时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="address"
+                         label="居民住址"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('partyauthenticationfailed:view')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">{{ $t('look') }}</el-button>
+            <el-button v-if="$hasPermission('partyauthenticationfailed:view')"
+                       type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.userId)">{{ $t('look') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 查看 -->
       <add-or-update v-if="addOrUpdateVisible"
diff --git a/src/views/modules/user/partymembers-add-or-update.vue b/src/views/modules/user/partymembers-add-or-update.vue
index 0ad70266..926f94ea 100755
--- a/src/views/modules/user/partymembers-add-or-update.vue
+++ b/src/views/modules/user/partymembers-add-or-update.vue
@@ -102,12 +102,7 @@ export default {
         mobile: '',
         identityNo: '',
         cadreFlag: '',
-        streetId: '',
-        streetName: '',
-        communityId: '',
-        communityName: '',
         gridId: '',
-        gridName: '',
         tagIds: [],
         allDeptIds: []
       },
diff --git a/src/views/modules/user/partymembers.vue b/src/views/modules/user/partymembers.vue
index e6502126..df482352 100755
--- a/src/views/modules/user/partymembers.vue
+++ b/src/views/modules/user/partymembers.vue
@@ -47,7 +47,7 @@
             </el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="注册状态">
+        <!-- <el-form-item label="注册状态">
           <el-select v-model="dataForm.registFlag"
                      clearable
                      placeholder="请选择">
@@ -57,7 +57,7 @@
                        :value="item.dictValue">
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <br>
         <el-form-item label="姓名">
           <el-input v-model="dataForm.realName"
@@ -74,16 +74,16 @@
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
-        <!-- <el-form-item label="职务">
-          <el-select v-model="dataForm.postId" placeholder="请选择">
-            <el-option
-              v-for="item in postOptions"
-              :key="item.dictValue"
-              :label="item.dictName"
-              :value="item.dictValue">
+        <el-form-item label="职务">
+          <el-select v-model="dataForm.postId"
+                     placeholder="请选择">
+            <el-option v-for="item in postOptions"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                       :value="item.dictValue">
             </el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
         <br>
         <el-form-item label="注册时间">
           <el-date-picker v-model="timeRange"
@@ -165,9 +165,8 @@
                          label="角色"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="registFlag"
-                         label="注册状态"
-                         :formatter="formatRegist"
+        <el-table-column prop="partyOrganization"
+                         label="所在党委"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="registTime"