From 56d93f6bcd953f91ce99eb4a52c0ce80414715e6 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Tue, 1 Dec 2020 15:53:01 +0800
Subject: [PATCH 01/17] =?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=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/tag-property.vue | 139 ++++++++++++++++++++++++
 src/views/modules/user/usertag.vue      |  33 +++++-
 2 files changed, 170 insertions(+), 2 deletions(-)
 create mode 100644 src/views/modules/user/tag-property.vue

diff --git a/src/views/modules/user/tag-property.vue b/src/views/modules/user/tag-property.vue
new file mode 100644
index 0000000..e22a068
--- /dev/null
+++ b/src/views/modules/user/tag-property.vue
@@ -0,0 +1,139 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             title="选择标签属性"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false"
+             width="80%"
+             height="90%">
+    <el-card shadow="never" class="aui-card--fill">
+      <div class="mod-sys__user">
+        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+          <el-form-item label="标签属性名称">
+            <el-input v-model="dataForm.dictName"
+                      :placeholder="$t('dict.dictName')"
+                      @keyup.native="btKeyUpDictName"
+                      clearable></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="dataListLoading" :data="dataList" max-height="450" style="width: 100%;" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+          <el-table-column
+              type="index"
+              header-align="center"
+              align="center"
+              width="50"
+              label='序号'
+          ></el-table-column>
+          <el-table-column prop="dictName"
+                           :label="$t('dict.dictName')"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="remark"
+                           :label="$t('dict.remark')"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="createDate"
+                           :label="$t('dict.createDate')"
+                           sortable="custom"
+                           header-align="center"
+                           align="center"
+                           width="180"></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>
+        <el-form>
+          <el-button type="primary" @click="getInfo()" style="margin-left:48%" class="end">{{"确定"}}</el-button>
+        </el-form>
+      </div>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/sys/dict/page',
+        getDataListIsPage: true,
+        deleteURL: '/sys/user',
+        deleteIsBatch: true,
+        exportURL: '/sys/user/export'
+      },
+      visible: false,
+      dataForm: {
+        pid: '1333600380046565377',
+        dictName: '',
+        dictType: 'tag_property',
+        dictValue: ''
+      },
+      responseData: []
+    }
+  },
+  methods: {
+    btKeyUpDictName (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.dictName = e.target.value
+    },
+    btKeyUpRealname (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.realname = e.target.value
+    },
+    btKeyUpEmail (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\-+=<>?:"{}|~！#￥%……&*（）——={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.email = e.target.value
+    },
+    btKeyUpMobile (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_=<>?:"{}|·~！@#￥%……&*（）——={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.mobile = e.target.value
+    },
+    getDataListOverWrite () {
+      this.page = 1
+      this.getDataList()
+    },
+    // 获取数据列表
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.getDataList()
+      })
+    },
+    handleSelectionChange (val) {
+      this.responseData = val
+    },
+    getInfo () {
+      if (this.responseData.length === 0) {
+        this.$message({
+          message: '请选择用户！',
+          type: 'warning'
+        })
+        return false
+      }
+      this.$emit('connectResponse', this.responseData)
+      this.visible = false
+    }
+  }
+}
+</script>
+<style scoped lang='scss'>
+.el-form{
+  .end{
+    margin-top: 10px;
+  }
+}
+.el-button--success{
+  margin-top: 0px!important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/user/usertag.vue b/src/views/modules/user/usertag.vue
index c1de2f7..3a13543 100644
--- a/src/views/modules/user/usertag.vue
+++ b/src/views/modules/user/usertag.vue
@@ -26,6 +26,7 @@
         <el-table-column prop="createdTime" 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="addProperty(scope.row.id)">配置属性</el-button>
             <el-button v-if="$hasPermission('usertag:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('usertag:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
@@ -42,6 +43,8 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <!-- 弹框，选择属性 -->
+      <master-user v-if="masterUserVisible" ref="masterUser" @refreshDataList="getDataList" v-on:connectResponse="connectResponse"></master-user>
     </div>
   </el-card>
 </template>
@@ -49,6 +52,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './usertag-add-or-update'
+import MasterUser from "@/views/modules/user/tag-property";
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -61,11 +65,36 @@ export default {
       },
       dataForm: {
         id: ''
-      }
+      },
+      masterUserVisible: false,
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    MasterUser
+  },
+  methods: {
+    addProperty(id){
+      this.masterUserVisible = true
+      this.$nextTick(() => {
+        this.$refs.masterUser.init()
+      })
+    },
+    // dialog回调函数
+    connectResponse (connectResponse) {
+      for (var i = 0; i < connectResponse.length; i++) {
+        let item = connectResponse[i]
+        let nickname = item.username
+        this.$set(item, 'nickName', nickname)
+      }
+      // 打开数据校验
+      this.dataCheckAble = true
+      if (connectResponse.length === 1) {
+        this.formData.splice(this.updateIndex, 1, connectResponse[0])
+      } else {
+        this.formData = connectResponse
+      }
+    },
   }
 }
 </script>

From d1682561663e096e2ca328eab5fb39d697328830 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Tue, 1 Dec 2020 18:38:14 +0800
Subject: [PATCH 02/17] =?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    |  44 +++-
 src/views/modules/user/party-review.vue       |   9 -
 src/views/modules/user/party-user-tag.vue     | 222 ++++++++++++++++++
 3 files changed, 254 insertions(+), 21 deletions(-)
 create mode 100644 src/views/modules/user/party-user-tag.vue

diff --git a/src/views/modules/user/hasAuthenticationpartymembers.vue b/src/views/modules/user/hasAuthenticationpartymembers.vue
index 7106cd5..9a6a99f 100644
--- a/src/views/modules/user/hasAuthenticationpartymembers.vue
+++ b/src/views/modules/user/hasAuthenticationpartymembers.vue
@@ -12,17 +12,6 @@
                        clearable>
           </el-cascader>
         </el-form-item>
-        <!-- <el-form-item label="注册状态">
-          <el-select v-model="dataForm.registFlag"
-                     clearable
-                     placeholder="请选择">
-            <el-option v-for="item in registOptions"
-                       :key="item.dictValue"
-                       :label="item.dictName"
-                       :value="item.dictValue">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
         <br>
         <el-form-item label="姓名" label-width="68px">
           <el-input v-model="dataForm.realName"
@@ -137,6 +126,17 @@
                          align="center"
                          min-width="350"
                          show-overflow-tooltip> </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="partyReview(scope.row.id)">身份标签管理</el-button>
+        </template>
+        </el-table-column>
       </el-table>
       <el-pagination :current-page="page"
                      :page-sizes="[10, 20, 50, 100]"
@@ -147,11 +147,17 @@
                      @current-change="pageCurrentChangeHandle">
       </el-pagination>
     </div>
+    <!-- 党员认证 -->
+    <party-review v-if="partyReviewVisible"
+                  @firstDialogCallBack="firstDialogCallBack"
+                  ref="partyReview"
+                  @refreshDataList="getDataList"></party-review>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
+import PartyReview from './party-user-tag'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -174,6 +180,7 @@ export default {
         startTime: '',
         endTime: ''
       },
+      partyReviewVisible: false,
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           let beginDateVal = this.dataForm.endTime
@@ -204,6 +211,7 @@ export default {
     }
   },
   components: {
+    PartyReview
   },
   watch: {
     'deptIdList': function (val) {
@@ -387,7 +395,19 @@ export default {
       }).catch(() => {
         this.dataListLoading = false
       })
-    }
+    },
+    firstDialogCallBack (value) {
+      if (value) {
+        this.getDataList()
+      }
+    },
+    partyReview (userId) {
+      this.partyReviewVisible = true
+      this.$nextTick(() => {
+        this.$refs.partyReview.dataForm.id = userId
+        this.$refs.partyReview.init()
+      })
+    },
   }
 }
 </script>
diff --git a/src/views/modules/user/party-review.vue b/src/views/modules/user/party-review.vue
index 5015e20..126eff3 100644
--- a/src/views/modules/user/party-review.vue
+++ b/src/views/modules/user/party-review.vue
@@ -55,15 +55,6 @@
                     选“否”该用户会认证为居民，并加入已认证居民列表
                 </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-form-item label="扫码网格">
                 <el-table :data="userGridList"
diff --git a/src/views/modules/user/party-user-tag.vue b/src/views/modules/user/party-user-tag.vue
new file mode 100644
index 0000000..feb3600
--- /dev/null
+++ b/src/views/modules/user/party-user-tag.vue
@@ -0,0 +1,222 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             title="身份标签管理"
+             :modal-append-to-body="false"
+             :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">
+        <el-input v-model="dataForm.realName"
+                  placeholder="请输入"
+                  clearable></el-input>
+      </el-form-item>
+      <el-form-item label="手机号"
+                    prop="mobile">
+        <el-input v-model="dataForm.mobile"
+                  placeholder="请输入"
+                  clearable></el-input>
+      </el-form-item>
+      <el-form-item label="身份证号"
+                    prop="identityNo">
+        <el-input v-model="dataForm.identityNo"
+                  placeholder="请输入"
+                  clearable></el-input>
+      </el-form-item>
+      <el-form-item label="认证支部"
+                    prop="allDeptNames">
+        <span>{{dataForm.allDeptNames}}</span>
+      </el-form-item>
+      <el-form-item  label="身份标签" >
+        <el-select v-model="dataForm.tagIdsNew" 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="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 :disabled="isAble"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+
+export default {
+  name: 'party-user-tag',
+  data () {
+    return {
+      visible: false,
+      identityNoRepeatVisible: false,
+      realNameRepeatVisible: false,
+      isAble: false,
+      dataForm: {
+        id: '',
+        partyFlag: '1',
+        cadreFlag: '',
+        state: '',
+        tagIds: [],
+        remark: '',
+        totalSubmitNum: '',
+        totalPassSubmitNum: '',
+        totalFailNum: '',
+        realName: '',
+        mobile: '',
+        identityNo: '',
+        tagIdsNew:[],
+
+      },
+      authenticateHistoryVisible: false,
+      cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
+      tagOptions: [
+
+      ],
+      userGridList: [],
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        realName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        identityNo: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        partyFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+      this.getTagOptions()
+    },
+    getTagOptions () {
+      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(() => { })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/partymembers/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        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) {
+          return this.$message.error(res.msg)
+        }
+        this.userGridList = res.data
+      }).catch(() => { })
+    },
+    // 确定
+    dataFormSubmitHandle: debounce(function () {
+      debugger
+      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 }),
+    registerResult (userId) {
+      this.$http.get(`api/message/sms/registerResult?userId=` + userId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+      }).catch(() => { })
+    },
+    // 查看详情
+    userAuthenticateHistoryListHandle (userId) {
+      if (!this.dataForm.totalSubmitNum > 0) {
+        return this.$message.error('累计提交' + this.dataForm.totalSubmitNum + '次,没有认证历史记录')
+      }
+      this.authenticateHistoryVisible = true
+      this.$nextTick(() => {
+        this.$refs.authenticateHistory.dataForm.userId = userId
+        this.$refs.authenticateHistory.init()
+      })
+    },
+    showLeaderFlagFormatter (row, column, cellValue, index) {
+      if (cellValue === '1') {
+        return '是'
+      } else {
+        return '否'
+      }
+    },
+    secondDialogCallBack (value) {
+      if (value) {
+        this.visible = false
+        this.$emit('firstDialogCallBack', true)
+      }
+    }
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file

From 29c001df4595e846ca300fc50d807925dfd7ebc5 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Tue, 1 Dec 2020 19:01:40 +0800
Subject: [PATCH 03/17] =?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>

From c0bf6dfac01f09846438257016e23e7eeed80d06 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Wed, 2 Dec 2020 16:01:59 +0800
Subject: [PATCH 04/17] =?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

From 6386b868b0f17f06fc56d74db46528ed69473896 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Wed, 2 Dec 2020 18:39:17 +0800
Subject: [PATCH 05/17] =?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=E5=B1=9E=E6=80=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=91=E9=AD=8F=E5=87=AF=202020-12-01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/tagproperty-add-or-update.vue        | 145 ++++++++++++++++++
 src/views/modules/user/tagproperty.vue        |  75 +++++++++
 2 files changed, 220 insertions(+)
 create mode 100644 src/views/modules/user/tagproperty-add-or-update.vue
 create mode 100644 src/views/modules/user/tagproperty.vue

diff --git a/src/views/modules/user/tagproperty-add-or-update.vue b/src/views/modules/user/tagproperty-add-or-update.vue
new file mode 100644
index 0000000..3784d44
--- /dev/null
+++ b/src/views/modules/user/tagproperty-add-or-update.vue
@@ -0,0 +1,145 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :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="propertyName">
+          <el-input v-model="dataForm.propertyName" placeholder="属性名称"></el-input>
+      </el-form-item>
+          <el-form-item label="属性值" prop="propertyValue">
+          <el-input v-model="dataForm.propertyValue" placeholder="属性值"></el-input>
+      </el-form-item>
+          <el-form-item label="徽章图片地址" prop="url">
+          <el-input v-model="dataForm.url" placeholder="徽章图片地址"></el-input>
+      </el-form-item>
+          <el-form-item label="备注" prop="remanrk">
+          <el-input v-model="dataForm.remanrk" placeholder="备注"></el-input>
+      </el-form-item>
+          <el-form-item label="逻辑删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="逻辑删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        propertyName: '',
+        propertyValue: '',
+        url: '',
+        remanrk: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        propertyName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        propertyValue: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        url: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        remanrk: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/news/tagproperty/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/tagproperty/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          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>
diff --git a/src/views/modules/user/tagproperty.vue b/src/views/modules/user/tagproperty.vue
new file mode 100644
index 0000000..972c1ec
--- /dev/null
+++ b/src/views/modules/user/tagproperty.vue
@@ -0,0 +1,75 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__tagproperty}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:tagproperty:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:tagproperty:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </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 prop="id" label="ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="propertyName" label="属性名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="propertyValue" label="属性值" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="url" label="徽章图片地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="remanrk" label="备注" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="逻辑删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" 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 v-if="$hasPermission('news:tagproperty:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('news:tagproperty:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './tagproperty-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/news/tagproperty/page',
+        getDataListIsPage: true,
+        deleteURL: '/news/tagproperty',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From 45ea1a31b3c1db8f9aa821565e524e92de207fc1 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 3 Dec 2020 13:39:44 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E3=80=90=E6=A0=87=E7=AD=BE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-12-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/tag-property.vue | 139 +++++++++---------------
 src/views/modules/user/usertag.vue      |  14 +--
 2 files changed, 59 insertions(+), 94 deletions(-)

diff --git a/src/views/modules/user/tag-property.vue b/src/views/modules/user/tag-property.vue
index e22a068..060da17 100644
--- a/src/views/modules/user/tag-property.vue
+++ b/src/views/modules/user/tag-property.vue
@@ -3,56 +3,22 @@
              title="选择标签属性"
              :close-on-click-modal="false"
              :close-on-press-escape="false"
-             width="80%"
+             width="600px"
              height="90%">
     <el-card shadow="never" class="aui-card--fill">
       <div class="mod-sys__user">
-        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
-          <el-form-item label="标签属性名称">
-            <el-input v-model="dataForm.dictName"
-                      :placeholder="$t('dict.dictName')"
-                      @keyup.native="btKeyUpDictName"
-                      clearable></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
+        <el-form :inline="true" :model="dataForm">
+          <el-form-item label="">
+            <el-form-item label="标签属性" prop="tagPropertyid">
+              <el-select v-model="dataForm.tagPropertyid" placeholder="标签属性">
+                <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+                </el-option>
+              </el-select>
+            </el-form-item>
           </el-form-item>
         </el-form>
-        <el-table v-loading="dataListLoading" :data="dataList" max-height="450" style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-          <el-table-column
-              type="index"
-              header-align="center"
-              align="center"
-              width="50"
-              label='序号'
-          ></el-table-column>
-          <el-table-column prop="dictName"
-                           :label="$t('dict.dictName')"
-                           header-align="center"
-                           align="center"></el-table-column>
-          <el-table-column prop="remark"
-                           :label="$t('dict.remark')"
-                           header-align="center"
-                           align="center"></el-table-column>
-          <el-table-column prop="createDate"
-                           :label="$t('dict.createDate')"
-                           sortable="custom"
-                           header-align="center"
-                           align="center"
-                           width="180"></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>
         <el-form>
-          <el-button type="primary" @click="getInfo()" style="margin-left:48%" class="end">{{"确定"}}</el-button>
+          <el-button type="primary" @click="dataFormSubmitHandle()" style="margin-left:48%" class="end">{{"确定"}}</el-button>
         </el-form>
       </div>
     </el-card>
@@ -61,69 +27,70 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
+import debounce from 'lodash/debounce'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/sys/dict/page',
+        getDataListURL: '/app-user/tagproperty/page',
         getDataListIsPage: true,
-        deleteURL: '/sys/user',
+        deleteURL: '/app-user/tagproperty',
         deleteIsBatch: true,
-        exportURL: '/sys/user/export'
+        exportURL: '/app-user/tagproperty/export'
       },
       visible: false,
       dataForm: {
-        pid: '1333600380046565377',
-        dictName: '',
-        dictType: 'tag_property',
-        dictValue: ''
+        id: '',
+        tagid: '',
+        tagPropertyid: ''
       },
-      responseData: []
+      paramNameArr: []
     }
   },
   methods: {
-    btKeyUpDictName (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.dictName = e.target.value
-    },
-    btKeyUpRealname (e) {
-      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
-      this.dataForm.realname = e.target.value
-    },
-    btKeyUpEmail (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\-+=<>?:"{}|~！#￥%……&*（）——={}|《》？：“”【】、；‘’，。、]/g, '')
-      this.dataForm.email = e.target.value
-    },
-    btKeyUpMobile (e) {
-      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_=<>?:"{}|·~！@#￥%……&*（）——={}|《》？：“”【】、；‘’，。、]/g, '')
-      this.dataForm.mobile = e.target.value
-    },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     // 获取数据列表
-    init () {
+    init (tagId, propertyId, relationId) {
       this.visible = true
       this.$nextTick(() => {
-        this.getDataList()
+        // 调用获取标签属性下拉信息接口
+        this.getParamListInfo()
+        this.dataForm.tagid = tagId
+        if (propertyId !== '' || propertyId !== null) {
+          this.dataForm.tagPropertyid = propertyId
+        }
+        if (relationId !== '' || relationId !== null) {
+          this.dataForm.id = relationId
+        }
+        console.log(this.dataForm)
       })
     },
-    handleSelectionChange (val) {
-      this.responseData = val
+    // 获取标签属性下拉信息
+    getParamListInfo () {
+      this.$http.get(`/app-user/property/listSimple`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.paramNameArr = res.data
+      }).catch(() => {})
     },
-    getInfo () {
-      if (this.responseData.length === 0) {
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/tagproperty/', this.dataForm).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
         this.$message({
-          message: '请选择用户！',
-          type: 'warning'
+          message: this.$t('prompt.success'),
+          type: 'success',
+          duration: 500,
+          onClose: () => {
+            this.visible = false
+            this.$emit('refreshDataList')
+          }
         })
-        return false
-      }
-      this.$emit('connectResponse', this.responseData)
-      this.visible = false
-    }
+      }).catch(() => {})
+    }, 1000, { 'leading': true, 'trailing': false })
   }
 }
 </script>
@@ -136,4 +103,4 @@ export default {
 .el-button--success{
   margin-top: 0px!important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/user/usertag.vue b/src/views/modules/user/usertag.vue
index 3a13543..4a21591 100644
--- a/src/views/modules/user/usertag.vue
+++ b/src/views/modules/user/usertag.vue
@@ -26,7 +26,7 @@
         <el-table-column prop="createdTime" 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="addProperty(scope.row.id)">配置属性</el-button>
+            <el-button  type="text" size="small" @click="addProperty(scope.row.id,scope.row.propertyId,scope.row.relationId)">配置属性</el-button>
             <el-button v-if="$hasPermission('usertag:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('usertag:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
@@ -52,7 +52,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './usertag-add-or-update'
-import MasterUser from "@/views/modules/user/tag-property";
+import MasterUser from '@/views/modules/user/tag-property'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -66,7 +66,7 @@ export default {
       dataForm: {
         id: ''
       },
-      masterUserVisible: false,
+      masterUserVisible: false
     }
   },
   components: {
@@ -74,10 +74,10 @@ export default {
     MasterUser
   },
   methods: {
-    addProperty(id){
+    addProperty (id, propertyId, relationId) {
       this.masterUserVisible = true
       this.$nextTick(() => {
-        this.$refs.masterUser.init()
+        this.$refs.masterUser.init(id, propertyId, relationId)
       })
     },
     // dialog回调函数
@@ -87,14 +87,12 @@ export default {
         let nickname = item.username
         this.$set(item, 'nickName', nickname)
       }
-      // 打开数据校验
-      this.dataCheckAble = true
       if (connectResponse.length === 1) {
         this.formData.splice(this.updateIndex, 1, connectResponse[0])
       } else {
         this.formData = connectResponse
       }
-    },
+    }
   }
 }
 </script>

From 73dc1816a212b2b0f9a52b7f66082e3e62ca25e8 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 3 Dec 2020 14:12:56 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E3=80=90=E6=A0=87=E7=AD=BE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-12-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/tag-property.vue | 15 +++++++++++++--
 src/views/modules/user/usertag.vue      |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/user/tag-property.vue b/src/views/modules/user/tag-property.vue
index 060da17..1822bc1 100644
--- a/src/views/modules/user/tag-property.vue
+++ b/src/views/modules/user/tag-property.vue
@@ -18,7 +18,7 @@
           </el-form-item>
         </el-form>
         <el-form>
-          <el-button type="primary" @click="dataFormSubmitHandle()" style="margin-left:48%" class="end">{{"确定"}}</el-button>
+          <el-button type="primary" @click="dataFormSubmitHandle()" :disabled="isAble" style="margin-left:48%" class="end">{{"确定"}}</el-button>
         </el-form>
       </div>
     </el-card>
@@ -45,13 +45,15 @@ export default {
         tagid: '',
         tagPropertyid: ''
       },
-      paramNameArr: []
+      paramNameArr: [],
+      isAble: false
     }
   },
   methods: {
     // 获取数据列表
     init (tagId, propertyId, relationId) {
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         // 调用获取标签属性下拉信息接口
         this.getParamListInfo()
@@ -76,8 +78,17 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
+      if (this.dataForm.tagPropertyid === '' || this.dataForm.tagPropertyid === null) {
+        this.$message({
+          message: '请选择标签属性！',
+          type: 'warning'
+        })
+        return false
+      }
+      this.isAble = true
       this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/tagproperty/', this.dataForm).then(({ data: res }) => {
         if (res.code !== 0) {
+          this.isAble = false
           return this.$message.error(res.msg)
         }
         this.$message({
diff --git a/src/views/modules/user/usertag.vue b/src/views/modules/user/usertag.vue
index 4a21591..b49e432 100644
--- a/src/views/modules/user/usertag.vue
+++ b/src/views/modules/user/usertag.vue
@@ -24,6 +24,7 @@
         <el-table-column prop="tagCode" label="标签编码" header-align="center" align="center"></el-table-column>
         <el-table-column prop="tagDesc" label="标签描述" header-align="center" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="propertyName" 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="addProperty(scope.row.id,scope.row.propertyId,scope.row.relationId)">配置属性</el-button>

From 40aabeb14d92e70d3c800d0d14cc6aaf50be021f Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 3 Dec 2020 14:13:11 +0800
Subject: [PATCH 08/17] =?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=E5=B1=9E=E6=80=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=91=E9=AD=8F=E5=87=AF=202020-12-01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/tagproperty.vue       | 123 +++++++--
 src/views/modules/user/tagpropertyDetail.vue | 251 +++++++++++++++++++
 src/views/modules/user/tagpropertyRoute.vue  |  32 +++
 3 files changed, 386 insertions(+), 20 deletions(-)
 create mode 100644 src/views/modules/user/tagpropertyDetail.vue
 create mode 100644 src/views/modules/user/tagpropertyRoute.vue

diff --git a/src/views/modules/user/tagproperty.vue b/src/views/modules/user/tagproperty.vue
index 972c1ec..ff60c3c 100644
--- a/src/views/modules/user/tagproperty.vue
+++ b/src/views/modules/user/tagproperty.vue
@@ -2,36 +2,61 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__tagproperty}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="属性名称">
+          <el-input v-model="dataForm.propertyName" placeholder="属性名称" clearable></el-input>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-form-item label="属性值">
+          <el-input v-model="dataForm.propertyValue" placeholder="属性值" clearable></el-input>
+        </el-form-item>
+        <br>
+        <el-form-item label="注册时间" prop="startTime">
+          <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 v-if="$hasPermission('news:tagproperty:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button @click="getDataList()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:tagproperty:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button
+                     type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
       </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 prop="id" label="ID" header-align="center" align="center"></el-table-column>
+        <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="propertyName" label="属性名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="propertyValue" label="属性值" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="url" label="徽章图片地址" header-align="center" align="center"></el-table-column>
+        <el-table-column  label="徽章" header-align="center" align="center">
+          <template slot-scope="scope">
+            <img :src="scope.row.url" width="40" height="40" />
+          </template>
+        </el-table-column>
         <el-table-column prop="remanrk" label="备注" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="逻辑删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" 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 v-if="$hasPermission('news:tagproperty:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:tagproperty:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button  type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button  type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -58,18 +83,76 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/tagproperty/page',
+        getDataListURL: '/app-user/property/page',
         getDataListIsPage: true,
-        deleteURL: '/news/tagproperty',
+        deleteURL: '/app-user/property',
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
-      }
+        id: '',
+        propertyName:'',
+        propertyValue:'',
+        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()
+          }
+        }
+      },
     }
   },
   components: {
     AddOrUpdate
+  },
+  created () {
+    this.getDataList();
+    this.initTime()
+  },
+  methods:{
+    addOrUpdateHandle (id, disabled) {
+      this.$parent.selectComponent = 'UserTagPropertyDetail'
+      this.$router.push({ path: '/user-tagpropertyRoute', query: { id: id, disabled: disabled } })
+    },
+    initTime () {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+      this.time = [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
+    },
   }
 }
 </script>
diff --git a/src/views/modules/user/tagpropertyDetail.vue b/src/views/modules/user/tagpropertyDetail.vue
new file mode 100644
index 0000000..73c3010
--- /dev/null
+++ b/src/views/modules/user/tagpropertyDetail.vue
@@ -0,0 +1,251 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" >
+      <el-form-item label="属性名称" prop="propertyName" label-width="100px">
+        <el-input
+            placeholder="请输入属性名称"
+            v-model="dataForm.propertyName"
+            style="width:50%">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="属性值" prop="propertyValue" label-width="100px">
+        <el-input
+            placeholder="请输入属性值"
+            v-model="dataForm.propertyValue"
+            style="width:50%">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="徽章图片" v-loading="loading" prop="images" label-width="100px">
+        <el-upload
+            ref="upload"
+            :action="uploadUrl"
+            :class="{hide:hideUpload}"
+            list-type="picture-card"
+            :file-list="dataForm.replyPicture"
+            :limit=1
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove"
+            :on-success="handleAvatarSuccess"
+            :on-error="handelError"
+            :before-upload="beforeAvatarUpload"
+            style="width:480px">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="备注" label-width="100px">
+        <el-input
+            type="textarea"
+            :rows="3"
+            placeholder="请输入备注，100字以内"
+            v-model="dataForm.remanrk"
+            maxlength="2000"
+            style="width:50%">
+        </el-input>
+      </el-form-item>
+    </el-form>
+
+    <el-form>
+      <el-form-item style="margin-left:35px;">
+        <el-button type="primary" @click="backToUserRelationList">{{"返回"}}</el-button>
+        <el-button type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      </el-form-item>
+    </el-form>
+  </el-card>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import Cookies from 'js-cookie'
+export default {
+  data () {
+    return {
+      visible: false,
+      pove: false,
+      dataForm: {
+        id:'',
+        propertyName:'',
+        propertyValue:'',
+        replyPicture: [],
+        remanrk:'',
+      },
+      isAble: false,
+      replyInfoState: false,
+      meetTypeArr: [],
+      dailyTypeArr: [],
+      hideUpload: false,
+
+      pageDisabled: false,
+
+      uploadUrl: '',
+      loading: false,
+      dialogImageUrl: '',
+      dialogVisible: false,
+      options: []
+    }
+  },
+  created: function () {
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadImg?token=${Cookies.get('token')}`
+  },
+  computed: {
+    dataRule () {
+      return {
+        propertyName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        propertyValue: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  mounted () {
+    this.pageDisabled = this.$route.query.disabled
+    this.hideUpload = this.$route.query.disabled
+    if (this.$route.query.id !== '' && this.$route.query.id != null) {
+      this.dataForm.id = this.$route.query.id
+      this.getInfo()
+    } else {
+
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/property/${this.dataForm.id}`).then(({ data: res }) => {
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data,
+        }
+        let picture=[
+          {
+            url :  res.data.url,
+            breviaryUrl : res.data.url
+          }
+        ];
+        if (res.data.url === ''){
+          picture=[];
+        }
+        this.dataForm.replyPicture = picture;
+        if (res.data.url === ''){
+          this.hideUpload=false
+        }else {
+          this.hideUpload=true
+        }
+
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        let pageDate={
+          id:this.dataForm.id,
+          propertyName: this.dataForm.propertyName,
+          propertyValue:this.dataForm.propertyValue,
+          url: this.dataForm.replyPicture[0] === undefined ? undefined : this.dataForm.replyPicture[0].url,
+          remanrk: this.dataForm.remanrk,
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/property', pageDate).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+              this.backToUserRelationList();
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+
+    handleAvatarSuccess (res, file) {
+      this.loading = false
+      this.isAble = false
+      if (res === null || res.data === null || res.data.imgUrl === null) {
+        this.$message.error('文件上传失败！')
+        this.handleErrorRemove(file)
+        return false
+      }
+      this.dataForm.replyPicture.push({ url: res.data.imgUrl, breviaryUrl: res.data.thumbnail, fileType: 1 })
+      this.hideUpload = this.dataForm.replyPicture.length >= 1
+    },
+    handleErrorRemove (file) {
+      // 实现缩略图模板时删除文件
+      let fileList = this.$refs.upload.uploadFiles
+      for (var i = 0; i < fileList.length; i++) {
+        let item = fileList[i]
+        if (item.url === file.url) {
+          fileList.splice(i, 1)
+        }
+      }
+    },
+    handelError () {
+      this.loading = false
+      this.isAble = false
+      this.$message.error('上传文件失败!')
+    },
+    handlePictureCardPreview (file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleRemove (file, fileList) {
+      for (var i = 0; i < this.dataForm.replyPicture.length; i++) {
+        let item = this.dataForm.replyPicture[i]
+        if (item.url === file.url) {
+          this.dataForm.replyPicture.splice(i, 1)
+        }
+      }
+      this.hideUpload = this.dataForm.replyPicture.length >= 1
+    },
+    beforeAvatarUpload (file) {
+      if (this.dataForm.replyPicture.length === 1) {
+        this.$message.error('最多上传1张图片!')
+        return false
+      }
+      this.loading = true
+      this.isAble = true
+      const isJPG = file.type === 'image/jpeg'
+      const isPNG = file.type === 'image/png'
+      // const isLt1M = file.size / 1024 / 1024 < 1
+      // 判断是否符合格式要求
+      if (!isJPG && !isPNG) {
+        this.$message.error('上传文件必须是jpg、png格式!')
+        this.loading = false
+        this.isAble = false
+        return false
+      }
+    },
+    // 返回按钮点击事件
+    backToUserRelationList () {
+      this.$emit('UserTagProperty')
+      this.$parent.selectComponent = 'UserTagProperty'
+      this.$router.push({ path: '/user-tagpropertyRoute' })
+    },
+  }
+}
+</script>
+
+<style>
+.hide .el-upload--picture-card {
+  display: none;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/user/tagpropertyRoute.vue b/src/views/modules/user/tagpropertyRoute.vue
new file mode 100644
index 0000000..a8f24c5
--- /dev/null
+++ b/src/views/modules/user/tagpropertyRoute.vue
@@ -0,0 +1,32 @@
+<template>
+  <keep-alive include="UserTagPorperty">
+    <component :is="selectComponent"></component>
+  </keep-alive>
+</template>
+
+<script>
+import UserTagProperty from './tagproperty'
+import UserTagPropertyDetail from './tagpropertyDetail'
+
+export default {
+  name: 'tagpropertyRoute',
+  data () {
+    return {
+      selectComponent: UserTagProperty
+    }
+  },
+  components: {
+    UserTagProperty,
+    UserTagPropertyDetail
+  },
+  methods: {
+    init () {
+      this.selectComponent = UserTagProperty
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file

From 45493a16aaacc73ec3a5f3a42d67d57717a73253 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 3 Dec 2020 14:43:11 +0800
Subject: [PATCH 09/17] =?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=E4=BF=AE=E6=94=B9?=
 =?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-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/hasAuthenticationpartymembers.vue   |  1 -
 src/views/modules/user/party-user-tag.vue            | 12 ++++--------
 src/views/modules/user/user-tag1.vue                 |  7 +++++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/user/hasAuthenticationpartymembers.vue b/src/views/modules/user/hasAuthenticationpartymembers.vue
index 4ad3185..bc5420d 100644
--- a/src/views/modules/user/hasAuthenticationpartymembers.vue
+++ b/src/views/modules/user/hasAuthenticationpartymembers.vue
@@ -402,7 +402,6 @@ 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 eb87d90..05b777d 100644
--- a/src/views/modules/user/party-user-tag.vue
+++ b/src/views/modules/user/party-user-tag.vue
@@ -120,13 +120,6 @@ export default {
           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(() => { })
     },
     // 获取信息
@@ -157,8 +150,11 @@ export default {
           return false
         }
         this.isAble = true
+        let userIds =[
+          this.dataForm.id
+        ]
         let postData = {
-          userId: this.dataForm.id,
+          userId: userIds,
           tagIds: this.dataForm.partyTagIds
         }
         this.$http[!this.dataForm.id ? 'post' : 'post']('/app-user/usertagrelation/addTag/', postData).then(({ data: res }) => {
diff --git a/src/views/modules/user/user-tag1.vue b/src/views/modules/user/user-tag1.vue
index 59c50d1..7cc801f 100644
--- a/src/views/modules/user/user-tag1.vue
+++ b/src/views/modules/user/user-tag1.vue
@@ -75,7 +75,7 @@ export default {
       partyFlagOptions: [{ id: '0', name: '不是' }, { id: '1', name: '是' }],
       cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
       tagOptions: [],
-      userGridList: []
+      userGridList: [],
     }
   },
   computed: {
@@ -141,8 +141,11 @@ export default {
           return false
         }
         this.isAble = true
+        let userIds =[
+          this.dataForm.id
+        ]
         let postData = {
-          userId: this.dataForm.id,
+          userId: userIds,
           tagIds: this.dataForm.partyTagIds
         }
         this.$http[!this.dataForm.id ? 'post' : 'post']('/app-user/usertagrelation/addTag/', postData).then(({ data: res }) => {

From 71a9aba4141b051397c55ba88dfa1868e74cf4f9 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 3 Dec 2020 15:26:25 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E3=80=90=E6=A0=87=E7=AD=BE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E3=80=81=E5=85=9A=E5=91=98-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-12?=
 =?UTF-8?q?-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/hasAuthenticationpartymembers.vue    |  36 +++++-
 .../user/pass-authentication-dialog.vue       | 110 ++++++++++++++++++
 .../modules/user/pass-authentication.vue      |  36 +++++-
 src/views/modules/user/tag-property.vue       |   1 -
 src/views/modules/user/user-tag1.vue          |   2 +-
 5 files changed, 179 insertions(+), 6 deletions(-)
 create mode 100644 src/views/modules/user/pass-authentication-dialog.vue

diff --git a/src/views/modules/user/hasAuthenticationpartymembers.vue b/src/views/modules/user/hasAuthenticationpartymembers.vue
index 4ad3185..2ea6291 100644
--- a/src/views/modules/user/hasAuthenticationpartymembers.vue
+++ b/src/views/modules/user/hasAuthenticationpartymembers.vue
@@ -60,14 +60,19 @@
                      type="success"
                      @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="success"
+                     @click="setTagHandle()">批量打身份标签</el-button>
+        </el-form-item>
         <br>
 
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
                 border
-                @selection-change="dataListSelectionChangeHandle"
+                @selection-change="handleSelectionChange"
                 style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column label="序号" header-align="center" align="center" width="50px">
             <template slot-scope="scope">
                 {{scope.$index+1}}
@@ -152,12 +157,16 @@
                   @firstDialogCallBack="firstDialogCallBack"
                   ref="partyReview"
                   @refreshDataList="getDataList"></party-review>
+    <pass-authentication-dialog v-if="dialogVisible" ref="passAuthenticationDialog" @refreshDataList="getDataList" v-on:connectResponse="connectResponse">
+
+    </pass-authentication-dialog>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import PartyReview from './party-user-tag'
+import PassAuthenticationDialog from './pass-authentication-dialog'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -180,6 +189,8 @@ export default {
         startTime: '',
         endTime: ''
       },
+      tableSelected: [],
+      dialogVisible: false,
       partyReviewVisible: false,
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -211,7 +222,8 @@ export default {
     }
   },
   components: {
-    PartyReview
+    PartyReview,
+    PassAuthenticationDialog
   },
   watch: {
     'deptIdList': function (val) {
@@ -282,6 +294,26 @@ export default {
       this.dataForm.startTime = startDate
       this.dataForm.endTime = endDate
     },
+    handleSelectionChange (val) {
+      this.tableSelected = val
+    },
+    setTagHandle () {
+      if (this.tableSelected.length === 0) {
+        this.$message({
+          message: '请选择党员！',
+          type: 'warning'
+        })
+        return false
+      }
+      this.dialogVisible = true
+      this.$nextTick(() => {
+        var paramArr = []
+        for (var i = 0; i < this.tableSelected.length; i++) {
+          paramArr[i] = this.tableSelected[i].userId
+        }
+        this.$refs.passAuthenticationDialog.init(paramArr)
+      })
+    },
     // getStreetList () {
     //   this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
     //     if (res.code !== 0) {
diff --git a/src/views/modules/user/pass-authentication-dialog.vue b/src/views/modules/user/pass-authentication-dialog.vue
new file mode 100644
index 0000000..469a5fc
--- /dev/null
+++ b/src/views/modules/user/pass-authentication-dialog.vue
@@ -0,0 +1,110 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             title="选择身份标签"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false"
+             width="600px"
+             height="90%">
+    <el-card shadow="never" class="aui-card--fill">
+      <div class="mod-sys__user">
+        <el-form :inline="true" :model="dataForm">
+          <el-form-item label="">
+            <el-form-item label="身份标签" prop="tagIds">
+              <el-select v-model="dataForm.tagIds" placeholder="身份标签" multiple collapse-tags>
+                <el-option v-for="item in paramNameArr" :key="item.id" :label="item.tagName" :value="item.id" >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-form-item>
+        </el-form>
+        <el-form>
+          <el-button type="primary" @click="dataFormSubmitHandle()" :disabled="isAble" style="margin-left:48%" class="end">{{"确定"}}</el-button>
+        </el-form>
+      </div>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import debounce from 'lodash/debounce'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/tagproperty/page',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/tagproperty',
+        deleteIsBatch: true,
+        exportURL: '/app-user/tagproperty/export'
+      },
+      visible: false,
+      dataForm: {
+        tagIds: [],
+        userId: []
+      },
+      paramNameArr: [],
+      isAble: false
+    }
+  },
+  methods: {
+    // 获取数据列表
+    init (paramArr) {
+      this.visible = true
+      this.isAble = false
+      this.$nextTick(() => {
+        this.dataForm.tagIds = []
+        this.dataForm.userId = paramArr
+        // 调用获取标签属性下拉信息接口
+        this.getParamListInfo()
+      })
+    },
+    // 获取标签属性下拉信息
+    getParamListInfo () {
+      this.$http.get(`/app-user/usertag/partyTag`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.paramNameArr = res.data
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      if (this.dataForm.tagIds === null || this.dataForm.tagIds.length === 0) {
+        this.$message({
+          message: '请选择标签！',
+          type: 'warning'
+        })
+        return false
+      }
+      this.isAble = true
+      this.$http['post']('/app-user/usertagrelation/addTag', this.dataForm).then(({ data: res }) => {
+        if (res.code !== 0) {
+          this.isAble = false
+          return this.$message.error(res.msg)
+        }
+        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>
+<style scoped lang='scss'>
+.el-form{
+  .end{
+    margin-top: 10px;
+  }
+}
+.el-button--success{
+  margin-top: 0px!important;
+}
+</style>
diff --git a/src/views/modules/user/pass-authentication.vue b/src/views/modules/user/pass-authentication.vue
index d9357e0..4bde1d0 100644
--- a/src/views/modules/user/pass-authentication.vue
+++ b/src/views/modules/user/pass-authentication.vue
@@ -86,13 +86,18 @@
                        type="success"
                        @click="exportHandle()">{{ $t('export') }}</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button type="success"
+                       @click="setTagHandle()">批量打身份标签</el-button>
+          </el-form-item>
         </div>
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
                 border
-                @selection-change="dataListSelectionChangeHandle"
+                @selection-change="handleSelectionChange"
                 style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column label="序号" header-align="center" align="center" width="50px">
             <template slot-scope="scope">
                 {{scope.$index+1}}
@@ -159,6 +164,9 @@
       <user-grid v-if="userGridVisible"
                  ref="userGrid"
                  @refreshDataList="getDataList"></user-grid>
+      <pass-authentication-dialog v-if="dialogVisible" ref="passAuthenticationDialog" @refreshDataList="getDataList" v-on:connectResponse="connectResponse">
+
+      </pass-authentication-dialog>
 
       <user-tag v-if="tagVisble"
                    ref="userTag"
@@ -173,6 +181,7 @@ import AddOrUpdate from './user-add-or-update'
 import UserDetail from './user-detail'
 import UserTag from './user-tag1'
 import UserGrid from './user-grid'
+import PassAuthenticationDialog from './pass-authentication-dialog'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -197,6 +206,7 @@ export default {
         partyFlag: '0', // 是否是党员(0-否，1-是)
         state: '3'
       },
+      tableSelected: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           let beginDateVal = this.dataForm.endTime
@@ -218,6 +228,7 @@ export default {
       userDetailVisible: false,
       tagVisble: false,
       userGridVisible: false,
+      dialogVisible: false,
       streetOptions: [],
       communityOptions: [],
       gridOptions: [],
@@ -294,6 +305,26 @@ export default {
       this.dataForm.startTime = startDate
       this.dataForm.endTime = endDate
     },
+    handleSelectionChange (val) {
+      this.tableSelected = val
+    },
+    setTagHandle () {
+      if (this.tableSelected.length === 0) {
+        this.$message({
+          message: '请选择居民！',
+          type: 'warning'
+        })
+        return false
+      }
+      this.dialogVisible = true
+      this.$nextTick(() => {
+        var paramArr = []
+        for (var i = 0; i < this.tableSelected.length; i++) {
+          paramArr[i] = this.tableSelected[i].id
+        }
+        this.$refs.passAuthenticationDialog.init(paramArr)
+      })
+    },
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -407,7 +438,8 @@ export default {
     AddOrUpdate,
     UserDetail,
     UserGrid,
-    UserTag
+    UserTag,
+    PassAuthenticationDialog
   }
 
 }
diff --git a/src/views/modules/user/tag-property.vue b/src/views/modules/user/tag-property.vue
index 1822bc1..7a26f1c 100644
--- a/src/views/modules/user/tag-property.vue
+++ b/src/views/modules/user/tag-property.vue
@@ -64,7 +64,6 @@ export default {
         if (relationId !== '' || relationId !== null) {
           this.dataForm.id = relationId
         }
-        console.log(this.dataForm)
       })
     },
     // 获取标签属性下拉信息
diff --git a/src/views/modules/user/user-tag1.vue b/src/views/modules/user/user-tag1.vue
index 59c50d1..b07b7ab 100644
--- a/src/views/modules/user/user-tag1.vue
+++ b/src/views/modules/user/user-tag1.vue
@@ -70,7 +70,7 @@ export default {
         cadreFlag: '',
         state: '',
         remark: '',
-        partyTagIds:[],
+        partyTagIds: []
       },
       partyFlagOptions: [{ id: '0', name: '不是' }, { id: '1', name: '是' }],
       cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],

From 9ce6cbff52ebf2062f1c9fadfb938679d255be9b Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 3 Dec 2020 17:43:27 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E3=80=90=E6=A0=87=E7=AD=BE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E3=80=81=E5=85=9A=E5=91=98-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-12?=
 =?UTF-8?q?-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/tag-property.vue | 20 ++++++++------------
 src/views/modules/user/user-tag1.vue    |  2 +-
 src/views/modules/user/usertag.vue      | 22 ++++------------------
 3 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/src/views/modules/user/tag-property.vue b/src/views/modules/user/tag-property.vue
index 7a26f1c..72cc41e 100644
--- a/src/views/modules/user/tag-property.vue
+++ b/src/views/modules/user/tag-property.vue
@@ -9,8 +9,8 @@
       <div class="mod-sys__user">
         <el-form :inline="true" :model="dataForm">
           <el-form-item label="">
-            <el-form-item label="标签属性" prop="tagPropertyid">
-              <el-select v-model="dataForm.tagPropertyid" placeholder="标签属性">
+            <el-form-item label="标签属性" prop="tagPropertyids">
+              <el-select v-model="dataForm.tagPropertyids" placeholder="标签属性" multiple collapse-tags>
                 <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
                 </el-option>
               </el-select>
@@ -41,9 +41,8 @@ export default {
       },
       visible: false,
       dataForm: {
-        id: '',
         tagid: '',
-        tagPropertyid: ''
+        tagPropertyids: []
       },
       paramNameArr: [],
       isAble: false
@@ -51,18 +50,15 @@ export default {
   },
   methods: {
     // 获取数据列表
-    init (tagId, propertyId, relationId) {
+    init (tagId, propertyIds) {
       this.visible = true
       this.isAble = false
       this.$nextTick(() => {
         // 调用获取标签属性下拉信息接口
         this.getParamListInfo()
         this.dataForm.tagid = tagId
-        if (propertyId !== '' || propertyId !== null) {
-          this.dataForm.tagPropertyid = propertyId
-        }
-        if (relationId !== '' || relationId !== null) {
-          this.dataForm.id = relationId
+        if (propertyIds !== null) {
+          this.dataForm.tagPropertyids = propertyIds
         }
       })
     },
@@ -77,7 +73,7 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
-      if (this.dataForm.tagPropertyid === '' || this.dataForm.tagPropertyid === null) {
+      if (this.dataForm.tagPropertyids === null || this.dataForm.tagPropertyids.length === 0) {
         this.$message({
           message: '请选择标签属性！',
           type: 'warning'
@@ -85,7 +81,7 @@ export default {
         return false
       }
       this.isAble = true
-      this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/tagproperty/', this.dataForm).then(({ data: res }) => {
+      this.$http['post']('/app-user/tagproperty/', this.dataForm).then(({ data: res }) => {
         if (res.code !== 0) {
           this.isAble = false
           return this.$message.error(res.msg)
diff --git a/src/views/modules/user/user-tag1.vue b/src/views/modules/user/user-tag1.vue
index f671703..85d18fc 100644
--- a/src/views/modules/user/user-tag1.vue
+++ b/src/views/modules/user/user-tag1.vue
@@ -75,7 +75,7 @@ export default {
       partyFlagOptions: [{ id: '0', name: '不是' }, { id: '1', name: '是' }],
       cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
       tagOptions: [],
-      userGridList: [],
+      userGridList: []
     }
   },
   computed: {
diff --git a/src/views/modules/user/usertag.vue b/src/views/modules/user/usertag.vue
index b49e432..4bf429e 100644
--- a/src/views/modules/user/usertag.vue
+++ b/src/views/modules/user/usertag.vue
@@ -24,10 +24,9 @@
         <el-table-column prop="tagCode" label="标签编码" header-align="center" align="center"></el-table-column>
         <el-table-column prop="tagDesc" label="标签描述" header-align="center" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="propertyName" 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="addProperty(scope.row.id,scope.row.propertyId,scope.row.relationId)">配置属性</el-button>
+            <el-button  type="text" size="small" @click="addProperty(scope.row.id,scope.row.propertyIds)">配置属性</el-button>
             <el-button v-if="$hasPermission('usertag:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('usertag:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
@@ -45,7 +44,7 @@
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
       <!-- 弹框，选择属性 -->
-      <master-user v-if="masterUserVisible" ref="masterUser" @refreshDataList="getDataList" v-on:connectResponse="connectResponse"></master-user>
+      <master-user v-if="masterUserVisible" ref="masterUser" @refreshDataList="getDataList"></master-user>
     </div>
   </el-card>
 </template>
@@ -75,24 +74,11 @@ export default {
     MasterUser
   },
   methods: {
-    addProperty (id, propertyId, relationId) {
+    addProperty (id, propertyIds) {
       this.masterUserVisible = true
       this.$nextTick(() => {
-        this.$refs.masterUser.init(id, propertyId, relationId)
+        this.$refs.masterUser.init(id, propertyIds)
       })
-    },
-    // dialog回调函数
-    connectResponse (connectResponse) {
-      for (var i = 0; i < connectResponse.length; i++) {
-        let item = connectResponse[i]
-        let nickname = item.username
-        this.$set(item, 'nickName', nickname)
-      }
-      if (connectResponse.length === 1) {
-        this.formData.splice(this.updateIndex, 1, connectResponse[0])
-      } else {
-        this.formData = connectResponse
-      }
     }
   }
 }

From 41c78b6134ec2523730ec7e12ef5490d73266e06 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 4 Dec 2020 09:26:34 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E3=80=90=E6=A0=87=E7=AD=BE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E5=88=97=E8=A1=A8=E6=8D=A2=E8=A1=8C=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-12-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/usertag.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/user/usertag.vue b/src/views/modules/user/usertag.vue
index 4bf429e..e6675a9 100644
--- a/src/views/modules/user/usertag.vue
+++ b/src/views/modules/user/usertag.vue
@@ -22,7 +22,7 @@
                          label="序号" align="center"></el-table-column>
         <el-table-column prop="tagName" label="标签名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="tagCode" label="标签编码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="tagDesc" label="标签描述" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="tagDesc" label="标签描述" header-align="center" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="createdTime" 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">

From b8e6f5b4288a37071e42ecf925687e506c793c16 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 4 Dec 2020 10:49:36 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E3=80=90=E6=A0=87=E7=AD=BE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98-?=
 =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-12-04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/usertag.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/user/usertag.vue b/src/views/modules/user/usertag.vue
index e6675a9..66d20ea 100644
--- a/src/views/modules/user/usertag.vue
+++ b/src/views/modules/user/usertag.vue
@@ -33,13 +33,13 @@
         </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">
+          :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>

From 898fe2a3f81beb25be0e8e63e86d4171613694e5 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Fri, 4 Dec 2020 10:50:22 +0800
Subject: [PATCH 14/17] =?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=E4=BF=AE=E6=94=B9?=
 =?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-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/tagproperty.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/user/tagproperty.vue b/src/views/modules/user/tagproperty.vue
index ff60c3c..28a5fbc 100644
--- a/src/views/modules/user/tagproperty.vue
+++ b/src/views/modules/user/tagproperty.vue
@@ -51,7 +51,7 @@
             <img :src="scope.row.url" width="40" height="40" />
           </template>
         </el-table-column>
-        <el-table-column prop="remanrk" label="备注" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="remanrk" label="备注" header-align="center" show-overflow-tooltip align="center"></el-table-column>
         <el-table-column prop="createdTime" 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">

From 898d24911311097fd98026a360b8d9abb13e95cc Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Fri, 4 Dec 2020 13:36:38 +0800
Subject: [PATCH 15/17] =?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=E4=BF=AE=E6=94=B9?=
 =?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-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/tagpropertyDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/user/tagpropertyDetail.vue b/src/views/modules/user/tagpropertyDetail.vue
index 73c3010..6ce1498 100644
--- a/src/views/modules/user/tagpropertyDetail.vue
+++ b/src/views/modules/user/tagpropertyDetail.vue
@@ -156,7 +156,7 @@ export default {
           id:this.dataForm.id,
           propertyName: this.dataForm.propertyName,
           propertyValue:this.dataForm.propertyValue,
-          url: this.dataForm.replyPicture[0] === undefined ? undefined : this.dataForm.replyPicture[0].url,
+          url: this.dataForm.replyPicture[0] === undefined ? '' : this.dataForm.replyPicture[0].url,
           remanrk: this.dataForm.remanrk,
         }
         this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/property', pageDate).then(({ data: res }) => {

From 3acd1941793a41b1a3763d6cdcee6124311c84b0 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 7 Dec 2020 09:16:28 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86&=E5=85=9A=E5=91=98=E7=AE=A1=E7=90=86=E3=80=91?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E6=A0=87=E7=AD=BE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-12?=
 =?UTF-8?q?-07?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/hasAuthenticationpartymembers.vue    |  2 +-
 .../user/pass-authentication-dialog.vue       | 35 +++++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/user/hasAuthenticationpartymembers.vue b/src/views/modules/user/hasAuthenticationpartymembers.vue
index 33215f4..b29c41e 100644
--- a/src/views/modules/user/hasAuthenticationpartymembers.vue
+++ b/src/views/modules/user/hasAuthenticationpartymembers.vue
@@ -439,7 +439,7 @@ export default {
         this.$refs.partyReview.dataForm.id = userId
         this.$refs.partyReview.init()
       })
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/modules/user/pass-authentication-dialog.vue b/src/views/modules/user/pass-authentication-dialog.vue
index 469a5fc..fb46082 100644
--- a/src/views/modules/user/pass-authentication-dialog.vue
+++ b/src/views/modules/user/pass-authentication-dialog.vue
@@ -78,21 +78,28 @@ export default {
         })
         return false
       }
-      this.isAble = true
-      this.$http['post']('/app-user/usertagrelation/addTag', this.dataForm).then(({ data: res }) => {
-        if (res.code !== 0) {
-          this.isAble = false
-          return this.$message.error(res.msg)
-        }
-        this.$message({
-          message: this.$t('prompt.success'),
-          type: 'success',
-          duration: 500,
-          onClose: () => {
-            this.visible = false
-            this.$emit('refreshDataList')
+      this.$confirm('批量打身份标签会替换已有标签！确定提交吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // 确定逻辑
+        this.isAble = true
+        this.$http['post']('/app-user/usertagrelation/addTag', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            this.isAble = false
+            return this.$message.error(res.msg)
           }
-        })
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
       }).catch(() => {})
     }, 1000, { 'leading': true, 'trailing': false })
   }

From c33a55d124fbce2d09fa0f5cf790c4d7bb35b0e0 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 7 Dec 2020 09:33:07 +0800
Subject: [PATCH 17/17] =?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=E4=BF=AE=E6=94=B9?=
 =?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-07?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/pass-authentication-dialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/user/pass-authentication-dialog.vue b/src/views/modules/user/pass-authentication-dialog.vue
index fb46082..0cdc7b1 100644
--- a/src/views/modules/user/pass-authentication-dialog.vue
+++ b/src/views/modules/user/pass-authentication-dialog.vue
@@ -78,7 +78,7 @@ export default {
         })
         return false
       }
-      this.$confirm('批量打身份标签会替换已有标签！确定提交吗？', '提示', {
+      this.$confirm('批量打身份标签会替换已有身份标签！确定提交吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'