Merge remote-tracking branch 'origin/feature/addTag' into feature/addTag

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({

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>