From 5c55ac928e8b7b53da81d247c793e3a1274e49bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 11 Dec 2019 19:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=20=E5=85=9A=E5=91=98=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/partymembers-add-or-update.vue       |   1 +
 .../modules/user/pass-authentication.vue      | 201 ++++++++++++------
 2 files changed, 140 insertions(+), 62 deletions(-)

diff --git a/src/views/modules/user/partymembers-add-or-update.vue b/src/views/modules/user/partymembers-add-or-update.vue
index 926f94ea..d79a9750 100755
--- a/src/views/modules/user/partymembers-add-or-update.vue
+++ b/src/views/modules/user/partymembers-add-or-update.vue
@@ -150,6 +150,7 @@ export default {
         } else {
           this.dataForm.allDeptIds = []
           this.dataForm.cadreFlag = []
+          this.dataForm.tagIds = []
         }
       })
     },
diff --git a/src/views/modules/user/pass-authentication.vue b/src/views/modules/user/pass-authentication.vue
index 9ee070eb..0c03021e 100644
--- a/src/views/modules/user/pass-authentication.vue
+++ b/src/views/modules/user/pass-authentication.vue
@@ -1,63 +1,140 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-epdc__user}">
-              <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-                <el-form-item label="所属机构">
-                  <el-cascader
-                    v-model="deptIdList"
-                    :options="options"
-                    :props="{ checkStrictly: true }"
-                    clearable>
-                  </el-cascader>
-                </el-form-item>
-                <el-form-item label="街道" v-if="false">
-                  <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
-                    <el-option v-for="(item, index) in streetOptions" :key="index" :label="item.name" :value="item.id"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="社区" v-if="false">
-                  <el-select v-model="dataForm.communityId" clearable placeholder="请选择" @change="getGridList">
-                    <el-option v-for="(item,index) in communityOptions" :key="index" :label="item.name" :value="item.id"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="网格" v-if="false">
-                  <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
-                    <el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
-                  </el-select>
-                </el-form-item>
-                <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>
-                <div class="block">
-                  <el-form-item label="是否是党员">
-                    <el-select v-model="dataForm.partyFlag" clearable placeholder="请选择" >
-                      <el-option v-for="(item,index) in partyFlagOptions" :key="index" :label="item.name" :value="item.id"></el-option>
-                    </el-select>
-                  </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-item>
-                  <el-form-item><el-button v-if="$hasPermission('epdc:user:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button></el-form-item>
-                </div>
-              </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 label="序号" width="70px"><template slot-scope="scope"> {{scope.$index+1}} </template></el-table-column>
-                <el-table-column prop="realName" 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="registerTime" 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  type="text" size="small" @click="userGridHandle(scope.row.id)">管理网格</el-button>
-                    <el-button  type="text" size="small" @click="userDetailHandle(scope.row.id)">查看</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>
-        <!-- 弹窗, 新增 / 修改 -->
-        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-        <user-detail v-if="userDetailVisible" ref="userDetail" @refreshDataList="getDataList"></user-detail>
-        <user-grid v-if="userGridVisible" ref="userGrid" @refreshDataList="getDataList"></user-grid>
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="街道"
+                      v-if="false">
+          <el-select v-model="dataForm.streetId"
+                     clearable
+                     placeholder="请选择"
+                     @change="getCommunityList">
+            <el-option v-for="(item, index) in streetOptions"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="社区"
+                      v-if="false">
+          <el-select v-model="dataForm.communityId"
+                     clearable
+                     placeholder="请选择"
+                     @change="getGridList">
+            <el-option v-for="(item,index) in communityOptions"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="网格"
+                      v-if="false">
+          <el-select v-model="dataForm.gridId"
+                     clearable
+                     placeholder="请选择">
+            <el-option v-for="(item,index) in gridOptions"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <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>
+        <div class="block">
+          <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-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('epdc:user:export')"
+                       type="primary"
+                       @click="exportHandle()">{{ $t('export') }}</el-button>
+          </el-form-item>
+        </div>
+      </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 label="序号"
+                         width="70px"><template slot-scope="scope"> {{scope.$index+1}} </template></el-table-column>
+        <el-table-column prop="realName"
+                         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="registerTime"
+                         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 type="text"
+                       size="small"
+                       @click="userGridHandle(scope.row.id)">管理网格</el-button>
+            <el-button type="text"
+                       size="small"
+                       @click="userDetailHandle(scope.row.id)">查看</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
+      <user-detail v-if="userDetailVisible"
+                   ref="userDetail"
+                   @refreshDataList="getDataList"></user-detail>
+      <user-grid v-if="userGridVisible"
+                 ref="userGrid"
+                 @refreshDataList="getDataList"></user-grid>
     </div>
   </el-card>
 </template>
@@ -114,7 +191,7 @@ export default {
         }
         this.options = res.data.options
       })
-      .catch(() => {})
+      .catch(() => { })
   },
   watch: {
     'deptIdList': function (val) {
@@ -147,7 +224,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.streetOptions = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     getCommunityList () {
       this.communityOptions = this.gridOptions = []
@@ -158,7 +235,7 @@ export default {
             return this.$message.error(res.msg)
           }
           this.communityOptions = res.data
-        }).catch(() => {})
+        }).catch(() => { })
       }
     },
     getGridList () {
@@ -170,7 +247,7 @@ export default {
             return this.$message.error(res.msg)
           }
           this.gridOptions = res.data
-        }).catch(() => {})
+        }).catch(() => { })
       }
     },
     setRegistTime () {