From c0bf6dfac01f09846438257016e23e7eeed80d06 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Wed, 2 Dec 2020 16:01:59 +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

---
 .../user/hasAuthenticationpartymembers.vue    |  3 ++-
 src/views/modules/user/party-user-tag.vue     | 10 ++++----
 .../modules/user/pass-authentication.vue      | 12 +++++-----
 src/views/modules/user/user-tag1.vue          | 23 ++++---------------
 4 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/src/views/modules/user/hasAuthenticationpartymembers.vue b/src/views/modules/user/hasAuthenticationpartymembers.vue
index 9a6a99f..4ad3185 100644
--- a/src/views/modules/user/hasAuthenticationpartymembers.vue
+++ b/src/views/modules/user/hasAuthenticationpartymembers.vue
@@ -134,7 +134,7 @@
         <template slot-scope="scope">
           <el-button type="text"
                      size="small"
-                     @click="partyReview(scope.row.id)">身份标签管理</el-button>
+                     @click="partyReview(scope.row.userId)">身份标签管理</el-button>
         </template>
         </el-table-column>
       </el-table>
@@ -402,6 +402,7 @@ export default {
       }
     },
     partyReview (userId) {
+      debugger
       this.partyReviewVisible = true
       this.$nextTick(() => {
         this.$refs.partyReview.dataForm.id = userId
diff --git a/src/views/modules/user/party-user-tag.vue b/src/views/modules/user/party-user-tag.vue
index 454cde5..eb87d90 100644
--- a/src/views/modules/user/party-user-tag.vue
+++ b/src/views/modules/user/party-user-tag.vue
@@ -32,7 +32,7 @@
         <span>{{dataForm.allDeptNames}}</span>
       </el-form-item>
       <el-form-item  label="身份标签" >
-        <el-select v-model="dataForm.tagIdsNew" multiple collapse-tags placeholder="请选择身份标签">
+        <el-select v-model="dataForm.partyTagIds" multiple collapse-tags placeholder="请选择身份标签">
           <el-option v-for="item in tagOptions"
                      :key="item.id"
                      :label="item.tagName"
@@ -74,7 +74,7 @@ export default {
         realName: '',
         mobile: '',
         identityNo: '',
-        tagIdsNew:[],
+        partyTagIds:[],
 
       },
       authenticateHistoryVisible: false,
@@ -131,7 +131,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/app-user/partymembers/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/app-user/user/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -142,8 +142,6 @@ export default {
         this.dataForm.partyFlag = '1' // 默认是党员
         this.dataForm.tagIds = []
         this.dataForm.partyFlag = ''
-        this.dataForm.tagIds = ''
-        this.dataForm.partyTagIds = []
       }).catch(() => { })
       this.$http.get(`/app-user/usergrid/listUserGrid/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -161,7 +159,7 @@ export default {
         this.isAble = true
         let postData = {
           userId: this.dataForm.id,
-          tagIds: this.dataForm.tagIdsNew
+          tagIds: this.dataForm.partyTagIds
         }
         this.$http[!this.dataForm.id ? 'post' : 'post']('/app-user/usertagrelation/addTag/', postData).then(({ data: res }) => {
           this.isAble = false
diff --git a/src/views/modules/user/pass-authentication.vue b/src/views/modules/user/pass-authentication.vue
index aa54856..d9357e0 100644
--- a/src/views/modules/user/pass-authentication.vue
+++ b/src/views/modules/user/pass-authentication.vue
@@ -160,8 +160,8 @@
                  ref="userGrid"
                  @refreshDataList="getDataList"></user-grid>
 
-      <user-tag v-if="userDetailVisible1"
-                   ref="userDetail"
+      <user-tag v-if="tagVisble"
+                   ref="userTag"
                    @refreshDataList="getDataList"></user-tag>
     </div>
   </el-card>
@@ -216,7 +216,7 @@ export default {
       deptIdList: [],
       options: [],
       userDetailVisible: false,
-      userDetailVisible1: false,
+      tagVisble: false,
       userGridVisible: false,
       streetOptions: [],
       communityOptions: [],
@@ -396,10 +396,10 @@ export default {
       this.dataForm.mobile = e.target.value
     },
     partyReview(userId){
-      this.userDetailVisible1 = true
+      this.tagVisble = true
       this.$nextTick(() => {
-        this.$refs.userDetail.dataForm.id = userId
-        this.$refs.userDetail.init()
+        this.$refs.userTag.dataForm.id = userId
+        this.$refs.userTag.init()
       })
     }
   },
diff --git a/src/views/modules/user/user-tag1.vue b/src/views/modules/user/user-tag1.vue
index 47409f2..59c50d1 100644
--- a/src/views/modules/user/user-tag1.vue
+++ b/src/views/modules/user/user-tag1.vue
@@ -39,22 +39,8 @@
                     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-select v-model="dataForm.partyTagIds" multiple collapse-tags placeholder="请选择身份标签">
           <el-option v-for="item in tagOptions"
                      :key="item.id"
                      :label="item.tagName"
@@ -64,6 +50,7 @@
       </el-form-item>
     </el-form>
     <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
       <el-button @click="dataFormSubmitHandle()"
                  type="primary">{{ $t('confirm') }}</el-button>
     </template>
@@ -82,8 +69,8 @@ export default {
         partyFlag: '',
         cadreFlag: '',
         state: '',
-        tagIds: [],
-        remark: ''
+        remark: '',
+        partyTagIds:[],
       },
       partyFlagOptions: [{ id: '0', name: '不是' }, { id: '1', name: '是' }],
       cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
@@ -156,7 +143,7 @@ export default {
         this.isAble = true
         let postData = {
           userId: this.dataForm.id,
-          tagIds: this.dataForm.tagIdsNew
+          tagIds: this.dataForm.partyTagIds
         }
         this.$http[!this.dataForm.id ? 'post' : 'post']('/app-user/usertagrelation/addTag/', postData).then(({ data: res }) => {
           this.isAble = false