开发标签管理

project/src/assets/config/interface_api.js

@@ -57,6 +57,7 @@ var api = {
   add_tag_group: "/api/tag/addTagGroup",
   order_tag_group: "/api/tag/updateTagGroupOrder",
   dele_tag_group: "/api/tag/deleteTagGroup",
+  edit_tag_group: "/api/tag/updateTagGroup",
 };
 
 export { api };

project/src/components/assembly/tagGroup.vue

@@ -33,29 +33,34 @@
       <div class="group_item" style="align-items: baseline;margin-top: 10px">
         <div class="lable">标签名称:</div>
         <div class="opaArea">
-          <div v-for="(m,mIdx) in moreLable" :key="m.id" class="flex">
-            <el-input class="ipt_group tMar10" v-model="m.name" placeholder="请输入标签名称"></el-input>
+          <div v-for="(m,mIdx) in moreLable" :key="m.tag_id" class="flex">
+            <el-input class="ipt_group tMar10" v-model="m.tag_name" placeholder="请输入标签名称"></el-input>
             <span v-if="moreLable&&moreLable.length>1" class="flex">
-               <el-tooltip effect="light" content="删除该标签" placement="top-start">
+               <el-tooltip effect="light" content="删除该标签" placement="left">
                 <span class="minusIptGroup" @click="moreLable.splice(mIdx,1)">-</span>
                </el-tooltip>
                 <img src="../../assets/img/upNone.png" alt="" v-if="mIdx == 0" style="width: 20px;margin: 0 8px;cursor: pointer">
-               <el-tooltip effect="light" content="上移" placement="top-start">
+               <el-tooltip effect="light" content="上移" placement="left">
                  <img src="../../assets/img/up.png" alt="" v-if="mIdx > 0" @click="upClick(mIdx)" style="width: 20px;margin: 0 8px;cursor: pointer">
                </el-tooltip>
                 <img src="../../assets/img/downNone.png" alt="" v-if="mIdx == moreLable.length-1" style="width: 20px;cursor: pointer">
-               <el-tooltip effect="light" content="下移" placement="top-start">
+               <el-tooltip effect="light" content="下移" placement="left">
                  <img src="../../assets/img/down.png" alt="" v-if="mIdx < moreLable.length-1" @click="downClick(mIdx)" style="width: 20px;cursor: pointer">
                </el-tooltip>
               </span>
           </div>
-          <div class="addIptGroup" @click="moreLable.push({id:moreLable.length,name:''})">+ 添加标签</div>
+          <div class="addIptGroup" @click="moreLable.push({tag_id:moreLable.length,tag_name:''})">+ 添加标签</div>
         </div>
       </div>
     </div>
     <div slot="footer">
-      <el-button size="mini" @click="lableGroup = false">取 消</el-button>
-      <el-button size="mini" type="primary" @click="addTagGroup()">确 定</el-button>
+      <div class="flex">
+        <div class="f14 c-00B38A pointer" @click="deleTagGroup()" v-if="source == 'edit'">删除该标签组</div>
+        <div class="lMarauto">
+          <el-button size="mini" @click="lableGroup = false">取 消</el-button>
+          <el-button size="mini" type="primary" @click="source == 'add' ? addTagGroup() : editTagGroup()">确 定</el-button>
+        </div>
+      </div>
     </div>
   </el-dialog>
 </template>
@@ -68,11 +73,81 @@ export default {
     return{
       lableGroup:false,
       groupName:'',
-      moreLable:[{id:0,name:''}],//添加标签组时,新增标签的数据列表,传给后台
+      groupId:'',
+      moreLable:[{tag_id:0,tag_name:''}],//添加标签组时,新增标签的数据列表,传给后台
     }
   },
   methods:{
+    deleTagGroup(){
+      this.$confirm('是否删除该标签组?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$axios.post(this.URL.BASEURL + this.URL.dele_tag_group, {
+          group_id: this.groupId
+        }).then((res) => {
+          var res = res.data
+          if (res && res.errno == 0) {
+            this.lableGroup = false
+            this.$parent.init(1)
+          }
+          this.$message({
+            message: res.err,
+            type: "warning"
+          })
+        })
+      })
+    },
+    editTagGroup(){
+      if(this.groupName==''){
+        this.$message({
+          message: '标签组名称不能为空',
+          type: "warning"
+        })
+        return false
+      }
+      this.moreLable.forEach(m=>{
+        if(m.tag_name==''){
+          this.$message({
+            message: '标签名称不能为空',
+            type: "warning"
+          })
+          return false
+        }
+      })
+      this.$axios.post(this.URL.BASEURL + this.URL.edit_tag_group, {
+        group_name: this.groupName,
+        tag_list:this.moreLable
+      }).then((res) => {
+        var res = res.data
+        if (res && res.errno == 0) {
+          this.lableGroup = false
+          this.$parent.init(1)
+        }
+        this.$message({
+          message: res.err,
+          type: "warning"
+        })
+      })
+    },
     addTagGroup(){
+      if(this.groupName==''){
+        this.$message({
+          message: '标签组名称不能为空',
+          type: "warning"
+        })
+        return false
+      }
+      this.moreLable.forEach(m=>{
+        if(m.tag_name==''){
+          this.$message({
+            message: '标签名称不能为空',
+            type: "warning"
+          })
+          return false
+        }
+      })
       this.$axios.post(this.URL.BASEURL + this.URL.add_tag_group, {
         group_name: this.groupName,
         tag_list:this.moreLable
@@ -172,7 +247,7 @@ export default {
       align-items: center;
       margin-top: 20px;
       .lable{
-        width: 24%;
+        width: 19%;
         text-align: right;
       }
       .opaArea{

project/src/components/detials/index.vue

@@ -3,18 +3,16 @@
     <div class="title padCon">
       <div class="flex">
         客户详情
-<!--
-      <span class="lMar8">
-          <el-tooltip effect="light" content="上一位" placement="bottom">
-            <i class="el-icon-arrow-left f16"></i>
-          </el-tooltip>
-        </span>
-        <span class="lMar8">
-           <el-tooltip effect="light" content="下一位" placement="bottom">
-            <i class="el-icon-arrow-right f16"></i>
-          </el-tooltip>
-        </span>
--->
+<!--      <span class="lMar8">-->
+<!--        <el-tooltip effect="light" content="上一位" placement="bottom">-->
+<!--          <i class="el-icon-arrow-left f16" @click="onPerson()"></i>-->
+<!--        </el-tooltip>-->
+<!--      </span>-->
+<!--      <span class="lMar8">-->
+<!--         <el-tooltip effect="light" content="下一位" placement="bottom">-->
+<!--          <i class="el-icon-arrow-right f16" @click="nextPerson()"></i>-->
+<!--        </el-tooltip>-->
+<!--      </span>-->
       </div>
       <div class="flex-align-center">
         <img src="../../assets/img/fullScreen.png" alt="" style="width: 13px;margin-right: 6px;cursor: pointer"  @click="changeWidth">
@@ -74,6 +72,7 @@
     </div>
 
     <el-dialog
+      v-loading="dialogLoading"
       title="选择企业标签"
       :visible.sync="comLableShow"
       :append-to-body="true"
@@ -85,8 +84,8 @@
           <div class="add" @click="iptshow = true,addLableVal = ''">+ 添加</div>
           <el-input v-if="iptshow" v-focus class="ipt" v-model="addLableVal" placeholder="请输入标签" @blur="iptBlur"></el-input>
         </template>
-        <div class="tMar10" v-for="l in lableArr" :key="l.group_id">
-          <div>
+        <div v-for="(l,lidx) in lableArr" :key="l.group_id" :class="lidx ==0 ? '' : 'tMar20'">
+          <div class="f16 fWeight600">
             {{l.group_name}}
           </div>
           <div class="lableItem_dad">
@@ -172,6 +171,7 @@ export default {
       // selfLableShow:false,
       acIdx:0,
       loading:false,
+      dialogLoading:false,
       iptshow:false,
       tabList:[
         {
@@ -218,8 +218,15 @@ export default {
     order,
   },
   methods:{
-    edit_tag(){
-      this.comLableShow = true
+    onPerson(){
+
+    },
+    nextPerson(){
+
+    },
+    edit_tag(){//选择企业标签框的确定
+      // this.comLableShow = true
+      this.dialogLoading = true
       this.$axios.post(this.URL.BASEURL + this.URL.tag_detial_edit,{
         external_userid:this.resInfo.external_userid,
         customer_id:this.rowProp.customer_id,
@@ -235,7 +242,7 @@ export default {
           this.comLableShow = false
           this.init()
         }
-
+        this.dialogLoading = false
       })
     },
     init_tag(){
@@ -317,6 +324,9 @@ export default {
 </script>
 <style lang="scss">
 .addLable_dialog{
+  .el-dialog__body{
+    padding: 15px 20px;
+  }
   .addLableBox{
 
     .add{

project/src/components/manage/memberManage.vue

@@ -18,7 +18,7 @@
         </div>
         <div>
           <div v-for="c in depart_List" :key="c.department_id" class="tMar20 flex-align-center">
-            <i class="el-icon-circle-check c-00B38A f16 rMar7 pointer" v-if="checkVals.indexOf(c.department_id)>-1" @click="checkDepartId(c.department_id)"></i>
+            <i class="el-icon-success c-00B38A f16 rMar7 pointer" v-if="checkVals.indexOf(c.department_id)>-1" @click="checkDepartId(c.department_id)"></i>
             <i class="el-icon-circle rMar7 pointer" @click="checkDepartId(c.department_id)" v-else></i>
             {{c.department_id}}
           </div>

project/src/components/manage/tagManage.vue

@@ -38,16 +38,14 @@
             <img src="../../assets/img/down.png" alt="" v-if="mIdx < tableData.length-1">
             上移
           </div>
-          <div class="pointer flex-align-center" @click="addLableGroup('edit')">
+          <div class="pointer flex-align-center" @click="addLableGroup('edit',item)">
             <img src="../../assets/img/edit.png" alt="">
             修改
           </div>
         </div>
-
       </div>
     </div>
-    <tagGroup ref="tagRef" :source="editOpa"></tagGroup>
-
+    <tagGroup ref="tagRef" :source="source"></tagGroup>
   </div>
 </template>
 <script>
@@ -62,8 +60,7 @@ export default {
       tableData: [],
       resetFlag: false,//重置
       input_keyword: '',
-      editOpa:'add',//判断是新增标签组还是修改标签组
-
+      source: 'add',//何种方式打开标签组
     }
   },
   directives:{
@@ -86,10 +83,19 @@ export default {
     addTag(){
 
     },
-    addLableGroup(opa){
-      this.editOpa = opa
+    addLableGroup(opa,item){
+      this.source = opa
       this.$nextTick(()=>{
         this.$refs.tagRef.lableGroup = true
+        if(opa=='edit'){
+          this.$refs.tagRef.groupName = item.group_name
+          this.$refs.tagRef.groupId = item.group_id
+          this.$refs.tagRef.moreLable = JSON.parse(JSON.stringify(item.tag_list))
+        }else if(opa=='add'){
+          this.$refs.tagRef.groupName = ''
+          this.$refs.tagRef.groupId = ''
+          this.$refs.tagRef.moreLable = [{tag_id:0,tag_name:''}]
+        }
       })
     },
     addLable(item){