Merge remote-tracking branch 'origin/feature/identityTag'

# Conflicts:
#	src/views/modules/user/party-review.vue

src/views/modules/user/party-review.vue

@@ -56,6 +56,16 @@
                 </p>
             </el-form-item>
             <el-form-item label="扫码支部">
+          <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%">
                     <el-table-column prop="allDeptNames"
@@ -122,12 +132,16 @@ export default {
         totalFailNum: '',
         realName: '',
         mobile: '',
-        identityNo: ''
+        identityNo: '',
+        partyTagIds: []
+
       },
       authenticateHistoryVisible: false,
       cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
-      tagOptions: [],
-      userGridList: []
+      tagOptions: [
+
+      ],
+      userGridList: [],
     }
   },
   computed: {
@@ -160,11 +174,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(() => { })
     },
     // 获取信息
@@ -179,6 +200,9 @@ 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) {
@@ -203,6 +227,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 }) => {