From 29c001df4595e846ca300fc50d807925dfd7ebc5 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Tue, 1 Dec 2020 19:01:40 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86=E3=80=91-=E3=80=90?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A0=87=E7=AD=BE=20-=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=A0=87=E7=AD=BE=E3=80=91=E9=AD=8F=E5=87=AF?=
 =?UTF-8?q?=202020-12-01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/party-user-tag.vue     |   1 -
 .../modules/user/pass-authentication.vue      |  20 +-
 src/views/modules/user/user-tag1.vue          | 181 ++++++++++++++++++
 3 files changed, 200 insertions(+), 2 deletions(-)
 create mode 100644 src/views/modules/user/user-tag1.vue

diff --git a/src/views/modules/user/party-user-tag.vue b/src/views/modules/user/party-user-tag.vue
index feb3600..454cde5 100644
--- a/src/views/modules/user/party-user-tag.vue
+++ b/src/views/modules/user/party-user-tag.vue
@@ -154,7 +154,6 @@ export default {
     },
     // 确定
     dataFormSubmitHandle: debounce(function () {
-      debugger
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
diff --git a/src/views/modules/user/pass-authentication.vue b/src/views/modules/user/pass-authentication.vue
index 52e9e42..aa54856 100644
--- a/src/views/modules/user/pass-authentication.vue
+++ b/src/views/modules/user/pass-authentication.vue
@@ -133,6 +133,9 @@
             <el-button type="text"
                        size="small"
                        @click="userGridHandle(scope.row.id)">管理支部</el-button>
+            <el-button type="text"
+                       size="small"
+                       @click="partyReview(scope.row.id)">身份标签管理</el-button>
             <el-button type="text"
                        size="small"
                        @click="userDetailHandle(scope.row.id)">查看</el-button>
@@ -156,6 +159,10 @@
       <user-grid v-if="userGridVisible"
                  ref="userGrid"
                  @refreshDataList="getDataList"></user-grid>
+
+      <user-tag v-if="userDetailVisible1"
+                   ref="userDetail"
+                   @refreshDataList="getDataList"></user-tag>
     </div>
   </el-card>
 </template>
@@ -164,6 +171,7 @@
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './user-add-or-update'
 import UserDetail from './user-detail'
+import UserTag from './user-tag1'
 import UserGrid from './user-grid'
 export default {
   mixins: [mixinViewModule],
@@ -208,6 +216,7 @@ export default {
       deptIdList: [],
       options: [],
       userDetailVisible: false,
+      userDetailVisible1: false,
       userGridVisible: false,
       streetOptions: [],
       communityOptions: [],
@@ -386,11 +395,20 @@ export default {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
       this.dataForm.mobile = e.target.value
     },
+    partyReview(userId){
+      this.userDetailVisible1 = true
+      this.$nextTick(() => {
+        this.$refs.userDetail.dataForm.id = userId
+        this.$refs.userDetail.init()
+      })
+    }
   },
   components: {
     AddOrUpdate,
     UserDetail,
-    UserGrid
+    UserGrid,
+    UserTag
   }
+
 }
 </script>
diff --git a/src/views/modules/user/user-tag1.vue b/src/views/modules/user/user-tag1.vue
new file mode 100644
index 0000000..47409f2
--- /dev/null
+++ b/src/views/modules/user/user-tag1.vue
@@ -0,0 +1,181 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             title="用户详情"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="真实姓名"
+                    prop="realName" v-if="dataForm.realName">
+        <span>{{dataForm.realName}}</span>
+      </el-form-item>
+      <el-form-item label="手机号"
+                    prop="mobile" v-if="dataForm.mobile">
+        <span>{{dataForm.mobile}}</span>
+      </el-form-item>
+      <el-form-item label="身份证号"
+                    prop="identityNo" v-if="dataForm.identityNo">
+        <span>{{dataForm.identityNo}}</span>
+      </el-form-item>
+      <el-form-item label="居民住址"
+                    prop="address" v-if="dataForm.address">
+        <span>{{dataForm.address}}</span>
+      </el-form-item>
+      <el-form-item label="是否党员" v-if="false"
+                    prop="partyFlag">
+        <span v-if="dataForm.partyFlag === '0'">否</span>
+        <span v-if="dataForm.partyFlag === '1'">是</span>
+      </el-form-item>
+      <el-form-item label="通过审核"
+                    prop="state" v-if="dataForm.state==='3'||dataForm.state==='2'">
+        <span v-if="dataForm.state === '3'">是</span>
+        <span v-if="dataForm.state === '2'">否</span>
+      </el-form-item>
+      <el-form-item v-if="dataForm.state === '2' && dataForm.remark"
+                    label="审核备注"
+                    prop="remark">
+        <span>{{dataForm.remark}}</span>
+      </el-form-item>
+      <el-form-item label="扫码支部">
+        <el-table :data="userGridList"
+                  style="width: 100%">
+          <el-table-column prop="id"
+                           label="主键" v-if="false">
+          </el-table-column>
+          <el-table-column prop="allDeptNames"
+                           label="街道-社区-支部">
+          </el-table-column>
+          <el-table-column prop="dept"
+                           label="部门名称" v-if="false">
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+      <el-form-item  label="身份标签" >
+        <el-select v-model="dataForm.tagIds" 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>
+    <template slot="footer">
+      <el-button @click="dataFormSubmitHandle()"
+                 type="primary">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        partyFlag: '',
+        cadreFlag: '',
+        state: '',
+        tagIds: [],
+        remark: ''
+      },
+      partyFlagOptions: [{ id: '0', name: '不是' }, { id: '1', name: '是' }],
+      cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
+      tagOptions: [],
+      userGridList: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+          this.queryUserGridList()
+        }
+      })
+      this.getTagOptions()
+    },
+    getTagOptions () {
+      this.$http.get(`/app-user/usertag/list`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.tagOptions = res.data
+      }).catch(() => { })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/user/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.dataForm.tagIds = []
+      }).catch(() => { })
+    },
+    // 获取用户网格列表
+    queryUserGridList () {
+      this.$http.get(`/app-user/usergrid/listUserGrid/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.userGridList = res.data
+      }).catch(() => { })
+    },
+    showLeaderFlagFormatter (row, column, cellValue, index) {
+      console.log(cellValue)
+      if (cellValue === '1') {
+        return '是'
+      } else {
+        return '否'
+      }
+    },
+    // 确定
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.isAble = true
+        let postData = {
+          userId: this.dataForm.id,
+          tagIds: this.dataForm.tagIdsNew
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'post']('/app-user/usertagrelation/addTag/', postData).then(({ data: res }) => {
+          this.isAble = false
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message({
+              message: this.$t('prompt.success'),
+              type: 'success',
+              duration: 500,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refreshDataList')
+              }
+            })
+          }
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+  }
+}
+</script>