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>