From 046858ba8e1f5346e68b6319a586d480332f1800 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 22 Oct 2020 18:12:01 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E7=AE=A1=E7=90=86=20=E3=80=91-=E3=80=90?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=9A=E5=91=98=E8=BA=AB=E4=BB=BD=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E9=9D=A2=E3=80=91=E9=AD=8F=E5=87=AF=202020-1?=
 =?UTF-8?q?0-22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/identityTag.vue | 381 +++++++++++++++++++++++++
 1 file changed, 381 insertions(+)
 create mode 100644 src/views/modules/user/identityTag.vue

diff --git a/src/views/modules/user/identityTag.vue b/src/views/modules/user/identityTag.vue
new file mode 100644
index 0000000..46a124e
--- /dev/null
+++ b/src/views/modules/user/identityTag.vue
@@ -0,0 +1,381 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-__hasAuthenticationpartymembers.vue}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
+          </el-cascader>
+        </el-form-item>
+        <br>
+        <el-form-item label="姓名" label-width="68px">
+          <el-input v-model="dataForm.realName"
+                    placeholder=""
+                    @keyup.native="btKeyUpRealName"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="dataForm.mobile"
+                    placeholder=""
+                    @keyup.native="btKeyUpMobile"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="身份证号">
+          <el-input v-model="dataForm.identityNo"
+                    placeholder=""
+                    @keyup.native="btKeyUpIdentityNo"
+                    clearable></el-input>
+        </el-form-item>
+        <br>
+        <el-form-item label="注册时间" prop="startTime" label-width="70px">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px" @change="changeTime">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至" prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px" @change="changeTime">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('epdc:user:export')"
+                     type="success"
+                     @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
+        <br>
+
+      </el-form>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="realName"
+                         label="姓名"
+                         header-align="center"
+                         align="center"
+                         width="120"></el-table-column>
+        <el-table-column prop="mobile"
+                         label="手机号"
+                         header-align="center"
+                         align="center"
+                         width="150"></el-table-column>
+        <el-table-column prop="identityNo"
+                         label="身份证号"
+                         header-align="center"
+                         align="center"
+                         width="200"></el-table-column>
+        <el-table-column prop="post"
+                         label="职务"
+                         header-align="center"
+                         align="center"
+                         v-if="false"></el-table-column>
+        <el-table-column prop="cadreFlag"
+                         label="干部下沉"
+                         :formatter="formatCadre"
+                         header-align="center"
+                         align="center"
+                         v-if="false"></el-table-column>
+        <el-table-column prop="tagName"
+                         label="角色"
+                         header-align="center"
+                         align="center"
+                         v-if="false"></el-table-column>
+        <el-table-column prop="registFlag"
+                         label="注册状态"
+                         :formatter="formatRegist"
+                         header-align="center"
+                         align="center"
+                         width="120"></el-table-column>
+        <el-table-column prop="registTime"
+                         label="认证时间"
+                         header-align="center"
+                         align="center"
+                         width="180"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="注册时间"
+                         header-align="center"
+                         align="center"
+                         width="180"></el-table-column>
+        <el-table-column prop="allDeptNames"
+                         label="街道-社区-网格"
+                         header-align="center"
+                         align="center"
+                         min-width="350"
+                         show-overflow-tooltip> </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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/partymembers/optimizeHasAuthenticationPartyPage',
+        getDataListIsPage: true,
+        exportURL: '/app-user/partymembers/hasAuthenticationexport'
+      },
+      dataForm: {
+        id: '',
+        realName: '',
+        mobile: '',
+        streetId: '',
+        identityNo: '',
+        communityId: '',
+        deptId: '',
+        registFlag: '',
+        postId: '',
+        startTime: '',
+        endTime: ''
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      // streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      registOptions: [],
+      // postOptions: [],
+      timeRange: [],
+      upLoadUrl: '',
+      faultDataVisible: false,
+      errordataList: [],
+      options: [],
+      deptIdList: []
+    }
+  },
+  components: {
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.deptId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.deptId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.deptId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.deptId = this.deptIdList[2]
+      }
+    }
+  },
+  created: function () {
+    this.$http
+        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => { })
+    this.initTime()
+    // this.getStreetList()
+    this.getRegistOptions()
+    // this.getPostOptions()
+  },
+  methods: {
+    initTime () {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+      this.timeRange = [start, end]
+      let year = start.getFullYear()
+      let month = start.getMonth() + 1
+      if (month < 10) {
+        month = '0' + month
+      }
+      let date = start.getDate()
+      if (date < 10) {
+        date = '0' + date
+      }
+      let startDate = year + '-' + month + '-' + date
+      let yearend = end.getFullYear()
+      let monthend = end.getMonth() + 1
+      if (monthend < 10) {
+        monthend = '0' + monthend
+      }
+      let dateend = end.getDate()
+      if (dateend < 10) {
+        dateend = '0' + dateend
+      }
+      let endDate = yearend + '-' + monthend + '-' + dateend
+      this.dataForm.startTime = startDate
+      this.dataForm.endTime = endDate
+    },
+    // 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(() => { })
+    // },
+    btKeyUpRealName (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.realName = e.target.value
+    },
+    btKeyUpMobile (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.mobile = e.target.value
+    },
+    btKeyUpIdentityNo (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.identityNo = e.target.value
+    },
+    getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.deptId = ''
+        return
+      }
+      this.dataForm.communityId = ''
+      this.dataForm.deptId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => { })
+    },
+    getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.deptId = ''
+        return
+      }
+      this.dataForm.deptId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => { })
+    },
+    getRegistOptions () {
+      this.$http.get(`/sys/dict/sublist/1168769645576179713`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        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) {
+      if (row.registFlag === '1') {
+        return '自动认证'
+      } else if (row.registFlag === '0') {
+        return '未认证'
+      } else if (row.registFlag === '2') {
+        return '手动认证'
+      } else {
+        return '未认证'
+      }
+    },
+    importData () {
+    },
+    // 获取数据列表
+    getDataList () {
+      if (this.timeRange === null) {
+        this.dataForm.startTime = ''
+        this.dataForm.endTime = ''
+      }
+      this.dataListLoading = true
+      this.$http.get(
+          this.mixinViewModuleOptions.getDataListURL,
+          {
+            params: {
+              order: this.order,
+              orderField: this.orderField,
+              page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+              limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+              ...this.dataForm
+            }
+          }
+      ).then(({ data: res }) => {
+        this.dataListLoading = false
+        if (res.code !== 0) {
+          this.dataList = []
+          this.total = 0
+          return this.$message.error(res.msg)
+        }
+        this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
+        this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
+      }).catch(() => {
+        this.dataListLoading = false
+      })
+    }
+  }
+}
+</script>
\ No newline at end of file

From eb20671ae33078f1bf9f7cba40bb82081ad8be27 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 22 Oct 2020 18:42:24 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E7=A8=8B=E5=BA=8F=E7=A0=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=BF=AE=E6=94=B9=E3=80=91=E9=AD=8F=E5=87=AF=202020-1?=
 =?UTF-8?q?0-22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/identityTag.vue | 46 +++++++++++++++++---------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/user/identityTag.vue b/src/views/modules/user/identityTag.vue
index 46a124e..108b01c 100644
--- a/src/views/modules/user/identityTag.vue
+++ b/src/views/modules/user/identityTag.vue
@@ -58,7 +58,8 @@
         <el-form-item>
           <el-button v-if="$hasPermission('epdc:user:export')"
                      type="success"
-                     @click="exportHandle()">{{ $t('export') }}</el-button>
+                     @click="exportHandle()">{{ $t('export') }}
+          </el-button>
         </el-form-item>
         <br>
 
@@ -70,7 +71,7 @@
                 style="width: 100%;">
         <el-table-column label="序号" header-align="center" align="center" width="50px">
           <template slot-scope="scope">
-            {{scope.$index+1}}
+            {{ scope.$index + 1 }}
           </template>
         </el-table-column>
         <el-table-column prop="realName"
@@ -120,12 +121,21 @@
                          header-align="center"
                          align="center"
                          width="180"></el-table-column>
-        <el-table-column prop="allDeptNames"
-                         label="街道-社区-网格"
+        <!--        <el-table-column prop="allDeptNames"-->
+        <!--                         label="街道-社区-网格"-->
+        <!--                         header-align="center"-->
+        <!--                         align="center"-->
+        <!--                         min-width="350"-->
+        <!--                         show-overflow-tooltip> </el-table-column>-->
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
                          header-align="center"
-                         align="center"
-                         min-width="350"
-                         show-overflow-tooltip> </el-table-column>
+                         width="150"
+                         align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small">身份标签管理</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <el-pagination :current-page="page"
                      :page-sizes="[10, 20, 50, 100]"
@@ -141,6 +151,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
+
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -192,8 +203,7 @@ export default {
       deptIdList: []
     }
   },
-  components: {
-  },
+  components: {},
   watch: {
     'deptIdList': function (val) {
       if (val.length === 0) {
@@ -227,7 +237,8 @@ export default {
           }
           this.options = res.data.options
         })
-        .catch(() => { })
+        .catch(() => {
+        })
     this.initTime()
     // this.getStreetList()
     this.getRegistOptions()
@@ -271,15 +282,15 @@ export default {
     //   }).catch(() => { })
     // },
     btKeyUpRealName (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
       this.dataForm.realName = e.target.value
     },
     btKeyUpMobile (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
       this.dataForm.mobile = e.target.value
     },
     btKeyUpIdentityNo (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
       this.dataForm.identityNo = e.target.value
     },
     getCommunityList () {
@@ -297,7 +308,8 @@ export default {
           return this.$message.error(res.msg)
         }
         this.communityOptions = res.data
-      }).catch(() => { })
+      }).catch(() => {
+      })
     },
     getGridList () {
       if (this.dataForm.communityId === '') {
@@ -311,7 +323,8 @@ export default {
           return this.$message.error(res.msg)
         }
         this.gridOptions = res.data
-      }).catch(() => { })
+      }).catch(() => {
+      })
     },
     getRegistOptions () {
       this.$http.get(`/sys/dict/sublist/1168769645576179713`).then(({ data: res }) => {
@@ -319,7 +332,8 @@ export default {
           return this.$message.error(res.msg)
         }
         this.registOptions = res.data
-      }).catch(() => { })
+      }).catch(() => {
+      })
     },
     // getPostOptions () {
     //   this.$http.get(`/sys/dict/sublist/1168770417290366977`).then(({ data: res }) => {

From 3182e4fe9e83d6a167d057654b7329d940a1b7bd Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Fri, 23 Oct 2020 11:01:54 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E7=A8=8B=E5=BA=8F=E7=A0=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=BF=AE=E6=94=B9=E3=80=91=E9=AD=8F=E5=87=AF=202020-1?=
 =?UTF-8?q?0-22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/identityTag.vue | 36 ++++++--------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/user/identityTag.vue b/src/views/modules/user/identityTag.vue
index 108b01c..bc4f04d 100644
--- a/src/views/modules/user/identityTag.vue
+++ b/src/views/modules/user/identityTag.vue
@@ -55,13 +55,13 @@
         <el-form-item>
           <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('epdc:user:export')"
-                     type="success"
-                     @click="exportHandle()">{{ $t('export') }}
-          </el-button>
-        </el-form-item>
-        <br>
+<!--        <el-form-item>-->
+<!--          <el-button v-if="$hasPermission('epdc:user:export')"-->
+<!--                     type="success"-->
+<!--                     @click="exportHandle()">{{ $t('export') }}-->
+<!--          </el-button>-->
+<!--        </el-form-item>-->
+<!--        <br>-->
 
       </el-form>
       <el-table v-loading="dataListLoading"
@@ -105,12 +105,6 @@
                          header-align="center"
                          align="center"
                          v-if="false"></el-table-column>
-        <el-table-column prop="registFlag"
-                         label="注册状态"
-                         :formatter="formatRegist"
-                         header-align="center"
-                         align="center"
-                         width="120"></el-table-column>
         <el-table-column prop="registTime"
                          label="认证时间"
                          header-align="center"
@@ -121,12 +115,6 @@
                          header-align="center"
                          align="center"
                          width="180"></el-table-column>
-        <!--        <el-table-column prop="allDeptNames"-->
-        <!--                         label="街道-社区-网格"-->
-        <!--                         header-align="center"-->
-        <!--                         align="center"-->
-        <!--                         min-width="350"-->
-        <!--                         show-overflow-tooltip> </el-table-column>-->
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
@@ -157,7 +145,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/app-user/partymembers/optimizeHasAuthenticationPartyPage',
+        getDataListURL: '/app-user/partymembers/optimizeIdentity',
         getDataListIsPage: true,
         exportURL: '/app-user/partymembers/hasAuthenticationexport'
       },
@@ -335,14 +323,6 @@ export default {
       }).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' ? '否' : '未知'
     },

From 013dc63ff2d8aacd313abb5b9cee4d8620540a2f Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Sat, 24 Oct 2020 13:30:57 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20?=
 =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98=20=E3=80=91-?=
 =?UTF-8?q?=E3=80=90=E5=9B=A0=E6=AD=A4=E6=B3=A8=E5=86=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=91=E9=AD=8F=E5=87=AF=202020-10-24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/identityTag.vue | 375 -------------------------
 1 file changed, 375 deletions(-)
 delete mode 100644 src/views/modules/user/identityTag.vue

diff --git a/src/views/modules/user/identityTag.vue b/src/views/modules/user/identityTag.vue
deleted file mode 100644
index bc4f04d..0000000
--- a/src/views/modules/user/identityTag.vue
+++ /dev/null
@@ -1,375 +0,0 @@
-<template>
-  <el-card shadow="never"
-           class="aui-card--fill">
-    <div class="mod-__hasAuthenticationpartymembers.vue}">
-      <el-form :inline="true"
-               :model="dataForm"
-               @keyup.enter.native="getDataListSearch()">
-        <el-form-item label="所属机构">
-          <el-cascader v-model="deptIdList"
-                       :options="options"
-                       :props="{ checkStrictly: true }"
-                       clearable>
-          </el-cascader>
-        </el-form-item>
-        <br>
-        <el-form-item label="姓名" label-width="68px">
-          <el-input v-model="dataForm.realName"
-                    placeholder=""
-                    @keyup.native="btKeyUpRealName"
-                    clearable></el-input>
-        </el-form-item>
-        <el-form-item label="手机号">
-          <el-input v-model="dataForm.mobile"
-                    placeholder=""
-                    @keyup.native="btKeyUpMobile"
-                    clearable></el-input>
-        </el-form-item>
-        <el-form-item label="身份证号">
-          <el-input v-model="dataForm.identityNo"
-                    placeholder=""
-                    @keyup.native="btKeyUpIdentityNo"
-                    clearable></el-input>
-        </el-form-item>
-        <br>
-        <el-form-item label="注册时间" prop="startTime" label-width="70px">
-          <el-date-picker v-model="dataForm.startTime"
-                          type="date"
-                          :picker-options="pickerBeginDateBefore"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间"
-                          style="width:200px" @change="changeTime">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="至" prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
-                          type="date"
-                          :picker-options="pickerBeginDateAfter"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间"
-                          style="width:200px" @change="changeTime">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
-        </el-form-item>
-<!--        <el-form-item>-->
-<!--          <el-button v-if="$hasPermission('epdc:user:export')"-->
-<!--                     type="success"-->
-<!--                     @click="exportHandle()">{{ $t('export') }}-->
-<!--          </el-button>-->
-<!--        </el-form-item>-->
-<!--        <br>-->
-
-      </el-form>
-      <el-table v-loading="dataListLoading"
-                :data="dataList"
-                border
-                @selection-change="dataListSelectionChangeHandle"
-                style="width: 100%;">
-        <el-table-column label="序号" header-align="center" align="center" width="50px">
-          <template slot-scope="scope">
-            {{ scope.$index + 1 }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="realName"
-                         label="姓名"
-                         header-align="center"
-                         align="center"
-                         width="120"></el-table-column>
-        <el-table-column prop="mobile"
-                         label="手机号"
-                         header-align="center"
-                         align="center"
-                         width="150"></el-table-column>
-        <el-table-column prop="identityNo"
-                         label="身份证号"
-                         header-align="center"
-                         align="center"
-                         width="200"></el-table-column>
-        <el-table-column prop="post"
-                         label="职务"
-                         header-align="center"
-                         align="center"
-                         v-if="false"></el-table-column>
-        <el-table-column prop="cadreFlag"
-                         label="干部下沉"
-                         :formatter="formatCadre"
-                         header-align="center"
-                         align="center"
-                         v-if="false"></el-table-column>
-        <el-table-column prop="tagName"
-                         label="角色"
-                         header-align="center"
-                         align="center"
-                         v-if="false"></el-table-column>
-        <el-table-column prop="registTime"
-                         label="认证时间"
-                         header-align="center"
-                         align="center"
-                         width="180"></el-table-column>
-        <el-table-column prop="createdTime"
-                         label="注册时间"
-                         header-align="center"
-                         align="center"
-                         width="180"></el-table-column>
-        <el-table-column :label="$t('handle')"
-                         fixed="right"
-                         header-align="center"
-                         width="150"
-                         align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small">身份标签管理</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>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module'
-
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/app-user/partymembers/optimizeIdentity',
-        getDataListIsPage: true,
-        exportURL: '/app-user/partymembers/hasAuthenticationexport'
-      },
-      dataForm: {
-        id: '',
-        realName: '',
-        mobile: '',
-        streetId: '',
-        identityNo: '',
-        communityId: '',
-        deptId: '',
-        registFlag: '',
-        postId: '',
-        startTime: '',
-        endTime: ''
-      },
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      // streetOptions: [],
-      communityOptions: [],
-      gridOptions: [],
-      registOptions: [],
-      // postOptions: [],
-      timeRange: [],
-      upLoadUrl: '',
-      faultDataVisible: false,
-      errordataList: [],
-      options: [],
-      deptIdList: []
-    }
-  },
-  components: {},
-  watch: {
-    'deptIdList': function (val) {
-      if (val.length === 0) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.deptId = ''
-      }
-      if (val.length === 1) {
-        this.dataForm.streetId = this.deptIdList[0]
-        this.dataForm.communityId = ''
-        this.dataForm.deptId = ''
-      }
-      if (val.length === 2) {
-        this.dataForm.streetId = this.deptIdList[0]
-        this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.deptId = ''
-      }
-      if (val.length === 3) {
-        this.dataForm.streetId = this.deptIdList[0]
-        this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.deptId = this.deptIdList[2]
-      }
-    }
-  },
-  created: function () {
-    this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.options = res.data.options
-        })
-        .catch(() => {
-        })
-    this.initTime()
-    // this.getStreetList()
-    this.getRegistOptions()
-    // this.getPostOptions()
-  },
-  methods: {
-    initTime () {
-      const end = new Date()
-      const start = new Date()
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-      this.timeRange = [start, end]
-      let year = start.getFullYear()
-      let month = start.getMonth() + 1
-      if (month < 10) {
-        month = '0' + month
-      }
-      let date = start.getDate()
-      if (date < 10) {
-        date = '0' + date
-      }
-      let startDate = year + '-' + month + '-' + date
-      let yearend = end.getFullYear()
-      let monthend = end.getMonth() + 1
-      if (monthend < 10) {
-        monthend = '0' + monthend
-      }
-      let dateend = end.getDate()
-      if (dateend < 10) {
-        dateend = '0' + dateend
-      }
-      let endDate = yearend + '-' + monthend + '-' + dateend
-      this.dataForm.startTime = startDate
-      this.dataForm.endTime = endDate
-    },
-    // 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(() => { })
-    // },
-    btKeyUpRealName (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.realName = e.target.value
-    },
-    btKeyUpMobile (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.mobile = e.target.value
-    },
-    btKeyUpIdentityNo (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.identityNo = e.target.value
-    },
-    getCommunityList () {
-      if (this.dataForm.streetId === '') {
-        this.communityOptions = []
-        this.gridOptions = []
-        this.dataForm.communityId = ''
-        this.dataForm.deptId = ''
-        return
-      }
-      this.dataForm.communityId = ''
-      this.dataForm.deptId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.communityOptions = res.data
-      }).catch(() => {
-      })
-    },
-    getGridList () {
-      if (this.dataForm.communityId === '') {
-        this.gridOptions = []
-        this.dataForm.deptId = ''
-        return
-      }
-      this.dataForm.deptId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.gridOptions = res.data
-      }).catch(() => {
-      })
-    },
-    getRegistOptions () {
-      this.$http.get(`/sys/dict/sublist/1168769645576179713`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.registOptions = res.data
-      }).catch(() => {
-      })
-    },
-    formatCadre: function (row, column) {
-      return row.cadreFlag === '1' ? '是' : row.cadreFlag === '0' ? '否' : '未知'
-    },
-    formatRegist: function (row, column) {
-      if (row.registFlag === '1') {
-        return '自动认证'
-      } else if (row.registFlag === '0') {
-        return '未认证'
-      } else if (row.registFlag === '2') {
-        return '手动认证'
-      } else {
-        return '未认证'
-      }
-    },
-    importData () {
-    },
-    // 获取数据列表
-    getDataList () {
-      if (this.timeRange === null) {
-        this.dataForm.startTime = ''
-        this.dataForm.endTime = ''
-      }
-      this.dataListLoading = true
-      this.$http.get(
-          this.mixinViewModuleOptions.getDataListURL,
-          {
-            params: {
-              order: this.order,
-              orderField: this.orderField,
-              page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
-              limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
-              ...this.dataForm
-            }
-          }
-      ).then(({ data: res }) => {
-        this.dataListLoading = false
-        if (res.code !== 0) {
-          this.dataList = []
-          this.total = 0
-          return this.$message.error(res.msg)
-        }
-        this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
-        this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
-      }).catch(() => {
-        this.dataListLoading = false
-      })
-    }
-  }
-}
-</script>
\ No newline at end of file

From 5d7884bd659aa4706e63d59317e0973739e737a5 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Sat, 24 Oct 2020 16:42:04 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20?=
 =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98=20=E3=80=91-?=
 =?UTF-8?q?=E3=80=90=E5=9B=A0=E6=AD=A4=E6=B3=A8=E5=86=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=91=E9=AD=8F=E5=87=AF=202020-10-24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/party-review.vue | 34 ++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/user/party-review.vue b/src/views/modules/user/party-review.vue
index 10f7afd..a405a71 100644
--- a/src/views/modules/user/party-review.vue
+++ b/src/views/modules/user/party-review.vue
@@ -55,6 +55,15 @@
                     选“否”该用户会认证为居民，并加入已认证居民列表
                 </p>
             </el-form-item>
+          <el-form-item v-if="dataForm.partyFlag == 1" label="身份标签" >
+            <el-select v-model="dataForm.partyTagIds" multiple collapse-tags placeholder="请选择身份标签">
+              <el-option v-for="item in tagOptions"
+                         :key="item.id"
+                         :label="item.tagName"
+                         :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
             <el-form-item label="扫码网格">
                 <el-table :data="userGridList"
                           style="width: 100%">
@@ -115,19 +124,23 @@ export default {
         partyFlag: '',
         cadreFlag: '',
         state: '',
-        tagIds: [],
+        tagIds: '',
         remark: '',
         totalSubmitNum: '',
         totalPassSubmitNum: '',
         totalFailNum: '',
         realName: '',
         mobile: '',
-        identityNo: ''
+        identityNo: '',
+        partyTagIds: []
+
       },
       authenticateHistoryVisible: false,
       cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
-      tagOptions: [],
-      userGridList: []
+      tagOptions: [
+
+      ],
+      userGridList: [],
     }
   },
   computed: {
@@ -160,11 +173,18 @@ export default {
       this.getTagOptions()
     },
     getTagOptions () {
-      this.$http.get(`/app-user/usertag/list`).then(({ data: res }) => {
+      this.$http.get(`/app-user/usertag/partyTag`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         this.tagOptions = res.data
+        // this.tagOptions =[
+        //   {id:"11125",tagName:"党员"},
+        //   {id:"11124",tagName:"入党积极分子"},
+        //   {id:"11123",tagName:"双认证党员"},
+        //   {id:"11122",tagName:"基层干部"},
+        //   {id:"11121",tagName:"书记"}
+        // ]
       }).catch(() => { })
     },
     // 获取信息
@@ -178,7 +198,8 @@ export default {
           ...res.data
         }
         this.dataForm.partyFlag = ''
-        this.dataForm.tagIds = []
+        this.dataForm.tagIds = ''
+        this.dataForm.partyTagIds = []
       }).catch(() => { })
       this.$http.get(`/app-user/usergrid/listUserGrid/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -203,6 +224,7 @@ export default {
           remark: this.dataForm.remark,
           realName: this.dataForm.realName,
           mobile: this.dataForm.mobile,
+          partyTagIds: this.dataForm.partyTagIds,
           identityNo: this.dataForm.identityNo
         }
         this.$http[!this.dataForm.id ? 'post' : 'post']('/app-user/user/partyReview/', postData).then(({ data: res }) => {