Merge branch 'master' of http://101.200.220.49:8001/xiuli.gao/playlet

project/src/components/assembly/tagGroup.vue

@@ -5,7 +5,7 @@
     :append-to-body="true"
     class="addLable_dialog"
     width="40%">
-    <div class="groupCon">
+    <div class="groupCon" v-loading="loading">
       <div class="group_item">
         <div class="lable">标签组名称:</div>
         <div class="opaArea">
@@ -57,8 +57,8 @@
       <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>
+          <el-button :disabled="loading" size="mini" @click="lableGroup = false">取 消</el-button>
+          <el-button :disabled="loading" size="mini" type="primary" @click="source == 'add' ? addTagGroup() : editTagGroup()">确 定</el-button>
         </div>
       </div>
     </div>
@@ -72,6 +72,7 @@ export default {
   data(){
     return{
       lableGroup:false,
+      loading:false,
       groupName:'',
       groupId:'',
       moreLable:[{tag_id:0,tag_name:''}],//添加标签组时,新增标签的数据列表,传给后台
@@ -84,6 +85,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.loading = true
         this.$axios.post(this.URL.BASEURL + this.URL.dele_tag_group, {
           group_id: this.groupId
         }).then((res) => {
@@ -96,6 +98,13 @@ export default {
             message: res.err,
             type: "warning"
           })
+          this.loading = false
+        }).catch(err=>{
+          this.$message({
+            message: '服务故障,请稍候再试',
+            type: "warning"
+          })
+          this.loading = false
         })
       })
     },
@@ -107,17 +116,24 @@ export default {
         })
         return false
       }
+      let tagFlag=false
       this.moreLable.forEach(m=>{
         if(m.tag_name==''){
           this.$message({
             message: '标签名称不能为空',
             type: "warning"
           })
+          tagFlag = true
           return false
         }
       })
+      if(tagFlag){
+        return false
+      }
+      this.loading = true
       this.$axios.post(this.URL.BASEURL + this.URL.edit_tag_group, {
         group_name: this.groupName,
+        group_id: this.groupId,
         tag_list:this.moreLable
       }).then((res) => {
         var res = res.data
@@ -129,9 +145,16 @@ export default {
           message: res.err,
           type: "warning"
         })
+        this.loading = false
+      }).catch(err=>{
+        this.$message({
+          message: '服务故障,请稍候再试',
+          type: "warning"
+        })
+        this.loading = false
       })
     },
-    addTagGroup(){
+    addTagGroup(){ //
       if(this.groupName==''){
         this.$message({
           message: '标签组名称不能为空',
@@ -139,15 +162,21 @@ export default {
         })
         return false
       }
+      let tagFlag=false
       this.moreLable.forEach(m=>{
         if(m.tag_name==''){
           this.$message({
             message: '标签名称不能为空',
             type: "warning"
           })
+          tagFlag = true
           return false
         }
       })
+      if(tagFlag){
+        return false
+      }
+      this.loading = true
       this.$axios.post(this.URL.BASEURL + this.URL.add_tag_group, {
         group_name: this.groupName,
         tag_list:this.moreLable
@@ -161,6 +190,13 @@ export default {
           message: res.err,
           type: "warning"
         })
+        this.loading = false
+      }).catch(err=>{
+        this.$message({
+          message: '服务故障,请稍候再试',
+          type: "warning"
+        })
+        this.loading = false
       })
     },
     // 上移

project/src/components/detials/index.vue

@@ -70,9 +70,13 @@
       <!--      <chatGroup v-if="acIdx == 3"></chatGroup>-->
       <order v-if="acIdx == 4" :rowProp="rowProp"></order>
     </div>
-
-    <el-dialog v-loading="dialogLoading" title="选择企业标签" :visible.sync="comLableShow" :append-to-body="true" class="addLable_dialog" width="30%">
-      <div class="addLableBox">
+    <el-dialog
+      title="选择企业标签"
+      :visible.sync="comLableShow"
+      :append-to-body="true"
+      class="addLable_dialog"
+      width="30%">
+      <div class="addLableBox" v-loading="dialogLoading">
         <!--后台说先不做-->
         <template v-if="false">
           <div class="add" @click="iptshow = true,addLableVal = ''">+ 添加</div>
@@ -96,8 +100,8 @@
           +新建标签组
         </div>
         <div>
-          <el-button size="mini" @click="comLableShow = false">取 消</el-button>
-          <el-button size="mini" type="primary" @click="edit_tag">确 定</el-button>
+          <el-button :disabled="dialogLoading" size="mini" @click="comLableShow = false">取 消</el-button>
+          <el-button :disabled="dialogLoading" size="mini" type="primary" @click="edit_tag">确 定</el-button>
         </div>
       </div>
     </el-dialog>
@@ -209,14 +213,8 @@ export default {
     chatRecord,
     order,
   },
-  methods: {
-    onPerson () {
-
-    },
-    nextPerson () {
-
-    },
-    edit_tag () {//选择企业标签框的确定
+  methods:{
+    edit_tag(){//选择企业标签框的确定
       // this.comLableShow = true
       this.dialogLoading = true
       this.$axios.post(this.URL.BASEURL + this.URL.tag_detial_edit, {
@@ -237,27 +235,32 @@ export default {
         this.dialogLoading = false
       })
     },
-    init_tag () {
+    init_tag(){//点击企业标签编辑,初始化标签列表
       this.comLableShow = true
-      this.$axios.get(this.URL.BASEURL + this.URL.tag_detial_list, {
-        params: {
-          customer_id: this.rowProp.customer_id,
-          user_id: this.rowProp.user_id
+      this.dialogLoading = true
+      this.$axios.get(this.URL.BASEURL + this.URL.tag_detial_list,{
+        params:{
+          customer_id:this.rowProp.customer_id,
+          user_id:this.rowProp.user_id
         }
       }).then((res) => {
         res = res.data
         this.lableArr = res.rst
-
-        this.lableArr_checked = []
-        res.rst.forEach(l => {
-          l.tag_list.forEach(t => {
-            if (t.selected == 1) {
+        this.lableArr_checked=[]
+        res.rst.forEach(l=>{
+          l.tag_list.forEach(t=>{
+            if(t.selected == 1){
               this.lableArr_checked.push(t.tag_id)
             }
           })
         })
-        console.log(this.lableArr_checked, ' this.lableArr_checked');
-
+        this.dialogLoading = false
+      }).catch(err=>{
+        this.$message({
+          message: '服务故障,请稍候再试',
+          type: "warning"
+        })
+        this.dialogLoading = false
       })
     },
     init () {

project/src/components/manage/memberManage.vue

@@ -17,9 +17,9 @@
           部门信息
         </div>
         <div>
-          <div v-for="c in depart_List" :key="c.department_id" class="tMar20 flex-align-center">
-            <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>
+          <div v-for="c in depart_List" :key="c.department_id" class="tMar20 flex-align-center pointer" @click="checkDepartId(c.department_id)">
+            <i class="el-icon-success c-00B38A f16 rMar7" v-if="checkVals.indexOf(c.department_id)>-1" ></i>
+            <i class="el-icon-circle rMar7" v-else></i>
             {{c.department_id}}
           </div>
         </div>