竞争对手新增标签，通讯录调整

src/Form/cashcouponPay/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="onShow" :disabled="data.status !== '新建'">编 辑</el-button>
+    <el-button size="mini" type="primary" @click="onShow" v-if="data.status === '新建'" >编 辑</el-button>
     <el-drawer
         title="编辑返利代金券支出"
         :visible.sync="dialogFormVisible"

src/HDrpManagement/competitor/index.vue

@@ -31,7 +31,19 @@
         </div>
       </template>
       <template v-slot:tbList="scope">
-        <div>
+        <div v-if="scope.data.column.columnname === 'tag_sys'">
+          <div v-for="item in scope.data.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-top:5px;margin-bottom: 5px">
+            <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
+              <span>{{item}}</span>
+            </el-tag>
+          </div>
+          <div v-for="item in scope.data.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-top:5px;margin-bottom: 5px">
+            <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
+              <span>{{item}}</span>
+            </el-tag>
+          </div>
+        </div>
+        <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
       </template>

src/HManagement/addressList/mycontact/index.vue

@@ -82,6 +82,7 @@ export default {
     }, 
     setGroupData (val) {
       this.group = val
+      console.log(this.group,'group')
     },
     clickGroup (val,allData) {
       this.activeGroupData = val

src/HManagement/addressList/mycontact/modules/addContact.vue

@@ -97,7 +97,7 @@
 
             <el-col :span="24">
               <el-form-item label="群组" prop="sys_phonebookgroupid">
-                <el-select v-model="form.sys_phonebookgroupid" style="width:100%">
+                <el-select v-model="form.sys_phonebookgroupid" style="width:100%" >
                   <el-option v-for="item in group" :key="item.index" :value="item.sys_phonebookgroupid" :label="item.groupname"></el-option>
                 </el-select>
               </el-form-item>
@@ -156,6 +156,7 @@ export default {
       form:{
         "sys_phonebookid":0,     //sys_phonebookid<=0时 为新增
         "sys_phonebookgroupid":"",
+        "groupname":"",
         "name": "",
         "phonenumber": "",
         "company": "",
@@ -231,7 +232,8 @@ export default {
             "isTelephone":'0',
             "fax":"",
             "areaCode":'',
-            "telephone":''
+            "telephone":'',
+            "groupname":"",
           }
           this.$emit('onAddSuccess')
         })
@@ -259,7 +261,7 @@ export default {
         "areaCode":'',
         "telephone":''
       }
-    }
+    },
   },
   mounted () {
     this.$store.dispatch('optiontypeselect','sex')

src/HManagement/addressList/mycontact/modules/edit.vue

@@ -97,14 +97,14 @@
 
             <el-col :span="24">
               <el-form-item label="群组" prop="sys_phonebookgroupid">
-                <el-select v-model="form.sys_phonebookgroupid" style="width:100%">
+                <el-select v-model="form.sys_phonebookgroupid" style="width:100%" >
                   <el-option v-for="item in group" :key="item.index" :value="item.sys_phonebookgroupid" :label="item.groupname"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="标签" prop="tags">
-                <el-select v-model="tags" style="width:100%" multiple>
+                <el-select v-model="form.tag" style="width:100%" multiple>
                   <el-option v-for="item in tagList" :key="item.index" :value="item.tag" :label="item.tag"></el-option>
                 </el-select>
               </el-form-item>
@@ -186,6 +186,7 @@ export default {
   },
   methods:{
     onShow () {
+      console.log(this.data,'data数据')
       this.form = Object.assign({},this.form,this.data.data)
       if ((this.form.phonenumber.indexOf('-')) != '-1'){
         this.form.isTelephone = '1'

src/HManagement/addressList/mycontact/modules/group.vue

@@ -77,9 +77,11 @@ export default {
         if(e.sys_phonebookgroupid !== 0)
           return e
       })
-      console.log(this.sysGroup);
-      
-      this.$emit('setGroupData',this.myGroup)
+      this.groupList = res.data.filter(e=>{
+        if(e.groupname != '客户联系人' && e.groupname != '项目联系人')
+          return e
+      })
+      this.$emit('setGroupData',this.groupList)
       fn?fn():this.clickGroup(this.sysGroup[0])
     },
     clickGroup (item) {