解决冲突

project/src/components/assembly/tagDialog.vue

@@ -8,9 +8,9 @@
         <el-radio :label="3">无任何标签</el-radio>
       </el-radio-group>
     </div> -->
-    <div class="self-hint" style="border:none">
+    <div class="self-hint" style="border:none;margin-top:-10px">
       <i class="el-icon-message-solid"></i>
-      <span>将给选择的1个客户批量{{tagType==1?'打':'移除'}}标签，请选择标签</span>
+      <span>将给选择的{{userLength}}个客户批量{{tagType==1?'打':'移除'}}标签，请选择标签</span>
     </div>
     <template v-if="radio!=3">
       <div class="self-input">
@@ -40,6 +40,9 @@ export default {
     tagType: {
       type: Number | String,
       default: 1
+    },
+    userLength: {
+      type: Number
     }
   },
   data () {

project/src/components/customManage/customerTransfer.vue

@@ -2,8 +2,8 @@
   <div v-loading="loading">
     <div class="topTagBox flex">
       <div class="left flex-align-center">
-        <div :class="['tagItem',type==1?'tagItem_active':'']" @click="type=1;resetEvent()">离职迁移</div>
-        <div :class="['tagItem',type==2?'tagItem_active':'']" @click="type=2;resetEvent()">在职迁移</div>
+        <div :class="['tagItem',type==1?'tagItem_active':'']" @click="changeType(1);">离职迁移</div>
+        <div :class="['tagItem',type==2?'tagItem_active':'']" @click="changeType(2);">在职迁移</div>
       </div>
       <div class="right">
         <el-button type="primary" size="mini" @click="goReord"><i class="el-icon-document"></i> 分配记录</el-button>
@@ -46,19 +46,19 @@
           <!-- <div class="smalLine"></div> -->
           <!-- <el-button type="primary" plain size="mini"><i class="el-icon-refresh-right"></i> 更新数据</el-button> -->
         </div>
-        <div class="selectCustom">已择0个客户</div>
+        <div class="selectCustom">已择{{multipleArr.length}}个客户</div>
       </div>
       <div class="flex">
-        <el-button type="primary" size="mini">分配</el-button>
+        <el-button type="primary" size="mini" @click="toDistribution">分配</el-button>
       </div>
     </div>
     <!-- table -->
-    <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
+    <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange" @select-all="handleSelectAll">
       <el-table-column type="selection" width="55" align="center"></el-table-column>
       <el-table-column width="200" fixed="left">
         <template slot-scope="scope" slot="header">
-          <div class="customTitle" slot="reference">{{pageOptionValue==2?'选择当前页面客户':'选择全部客户'}}<i class="el-icon-arrow-down"></i>
-            <el-select v-model="pageOptionValue" class="customTitleSelect" placeholder="请选择" size="mini">
+          <div class="customTitle" slot="reference">{{old_pageOptionValue==2?'选择当前页面客户':'选择全部客户'}}<i class="el-icon-arrow-down"></i>
+            <el-select v-model="pageOptionValue" class="customTitleSelect" placeholder="请选择" size="mini" @change="pageOptionSelect" @visible-change="pageOptionValue=''">
               <el-option v-for="item in pageOptions" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
@@ -94,7 +94,7 @@
         <template slot-scope="scope">
           <div class="customerServiceTagBox biaoqian">
             <div class="customerServiceTag" v-if="scope.row.gender==1||scope.row.gender==2">{{scope.row.gender==1?'男':scope.row.gender==2?'女':''}}</div>
-            <div class="customerServiceTag" v-for="(item) in scope.row.tag_list" :key="item">{{item}}</div>
+            <div class="customerServiceTag" v-for="(item,index) in scope.row.tag_list" :key="index">{{item}}</div>
           </div>
         </template>
       </el-table-column>
@@ -174,6 +174,7 @@ export default {
         { name: '当前页面', id: 2 },
       ],
       pageOptionValue: 2,
+      old_pageOptionValue: 2,
       input_keyword: '',
       tableData: [],
       user_id_list: [],//客服user_id列表
@@ -189,6 +190,10 @@ export default {
       resetFlag: false,//重置
       otherData: {},
       shieldingData: {},//拉黑的数据
+      multipleSelection: {},
+      exclude_multiple_selection: {},
+      multipleArr: [],
+      isAll: false,//是否选择全部
     }
   },
   created () {
@@ -237,6 +242,17 @@ export default {
       this.pay_num_max = '';
       this.init(1)
     },
+    changeType (type) {
+      this.type = type;
+      this.multipleSelection = {};
+      this.exclude_multiple_selection = {};
+      this.multipleArr = [];
+      this.isAll = false;
+      this.resetEvent()
+    },
+    toDistribution () {//去分配
+
+    },
     shieldingUserCancel (type) {
       if (type == 'update') {
         this.init(1)
@@ -327,6 +343,27 @@ export default {
           }
           this.total = res.rst.pageInfo.total;
           this.pages = res.rst.pageInfo.pages;
+
+
+          // 回显选择
+          let page_multiple_data = [];
+          if (this.isAll && (!this.multipleSelection[this.page])) {
+            page_multiple_data = this.tableData
+          } else {
+            let multiple_id = this.multipleSelection[this.page] ? this.multipleSelection[this.page].map((v) => {
+              return v.user_id + '-' + v.customer_id
+            }) : []
+            this.tableData.forEach((item) => {
+              if (multiple_id.indexOf((item.user_id + '-' + item.customer_id)) != -1) {
+                page_multiple_data.push(item)
+              }
+            })
+          }
+          this.$nextTick(() => {
+            page_multiple_data.forEach((row) => {
+              this.$refs.multipleTable.toggleRowSelection(row, true);
+            })
+          })
         } else if (res.errno != 4002) {
           this.$message({
             message: res.err,
@@ -340,8 +377,54 @@ export default {
     handleCurrentChange (val) {
       this.init(val)
     },
-    handleSelectionChange () {
-
+    handleSelectionChange (row) {
+      this.multipleSelection[this.page] = row && row.length != 0 ? row : null;
+      if (this.isAll) {//全选状态下被排除的用户
+        let page_multiple_data = [];
+        let multiple_id = this.multipleSelection[this.page] ? this.multipleSelection[this.page].map((v) => {
+          return v.user_id + '-' + v.customer_id
+        }) : []
+        this.tableData.forEach((item) => {
+          if (multiple_id.indexOf((item.user_id + '-' + item.customer_id)) != -1) {
+            page_multiple_data.push(item)
+          }
+        })
+        this.exclude_multiple_selection[this.page] = page_multiple_data
+      }
+      this.userChange()
+    },
+    pageOptionSelect (val) {//选择
+      if (val && val != '') {
+        this.old_pageOptionValue = val;
+      }
+      this.exclude_multiple_selection = {}
+      if (this.pageOptionValue == 1) {
+        this.isAll = true
+      } else {//选择当前页面
+        this.isAll = false
+        let current_page_data = this.multipleSelection[this.page];
+        this.multipleSelection = {};
+        this.multipleSelection[this.page] = current_page_data ? current_page_data : null;
+      }
+      this.tableData.forEach((row) => {
+        this.$refs.multipleTable.toggleRowSelection(row, true);
+      });
+      this.userChange()
+    },
+    handleSelectAll (row) {//点击了全选
+      if (this.isAll && row.length == 0) {
+        this.multipleSelection = {}
+        this.exclude_multiple_selection = {}
+        this.isAll = false
+        this.userChange()
+      }
+    },
+    userChange () {
+      let multipleArr = []
+      for (var i in this.multipleSelection) {
+        multipleArr = multipleArr.concat(this.multipleSelection[1] ? this.multipleSelection[1] : [])
+      }
+      this.multipleArr = multipleArr;
     },
   }
 }

project/src/components/customManage/manage.vue

@@ -34,12 +34,12 @@
           <!-- <div class="smalLine"></div> -->
           <!-- <el-button type="primary" plain size="mini"><i class="el-icon-refresh-right"></i> 更新数据</el-button> -->
         </div>
-        <div class="selectCustom">已择0个客户</div>
+        <div class="selectCustom">已择{{multipleArr.length}}个客户</div>
       </div>
       <div class="flex">
         <el-button type="primary" plain size="mini" @click="setCustomerTag(1)">批量打标签</el-button>
         <el-button type="primary" plain size="mini" @click="setCustomerTag(2)">批量移除标签</el-button>
-        <el-button type="primary" plain size="mini">导出Excel</el-button>
+        <el-button type="primary" plain size="mini" @click="init(1,'export')">导出Excel</el-button>
       </div>
     </div>
     <!-- table -->
@@ -135,7 +135,7 @@
     </el-drawer>
     <!-- 批量打标签 -->
     <el-dialog :title="tagType==1?'批量打标签':'批量移除标签'" :visible.sync="tagVisible" width="600px" center top="15vh">
-      <tag-dialog @closeTagDialog="closeTagDialog" :tagType='tagType'></tag-dialog>
+      <tag-dialog @closeTagDialog="closeTagDialog" :tagType='tagType' :userLength='multipleArr.length'></tag-dialog>
     </el-dialog>
   </div>
 </template>
@@ -163,7 +163,7 @@ export default {
       page: 1,
       pages: 0,
       total: 0,
-      page_size: 2,
+      page_size: 20,
       shieldingFlag: false,
       pageOptions: [
         { name: '全部', id: 1 },
@@ -188,8 +188,9 @@ export default {
       shieldingData: {},//拉黑的数据
       multipleSelection: {},
       exclude_multiple_selection: {},
+      multipleArr: [],
       isAll: false,//是否选择全部
-      tagVisible: true,
+      tagVisible: false,
       tagType: 1
     }
   },
@@ -215,56 +216,37 @@ export default {
     },
     closeTagDialog (val) {
       if (val && val.length != 0) {
-        this.page = page ? page : this.page;
-        this.loading = true
-        this.$axios.get(this.URL.BASEURL + this.URL.customer_setCustomerTag, {
-          params: {
-            user_id_list: this.user_id_list,
-            customer_name: this.input_keyword,
-            add_date_start: this.add_date_start,
-            add_date_end: this.add_date_end,
-            add_way: this.add_way,
-            pay_status: this.pay_status,
-            pay_num_min: this.pay_num_min,
-            pay_num_max: this.pay_num_max,
-            tag_type: this.tag_type,
-            tag_id_list: this.tag_id_list,
-            loss_status: this.loss_status,
-            page: this.page,
-            page_size: this.page_size
-          }
+        let customer_list = [];
+        customer_list = this.multipleArr.map((v) => {
+          return { customer_id: v.customer_id, user_id: v.user_id }
+        })
+        this.$loading(this.$loadingConfig);
+        this.$axios.post(this.URL.BASEURL + this.URL.customer_setCustomerTag, {
+          // user_id_list: this.user_id_list,
+          // customer_name: this.input_keyword,
+          // add_date_start: this.add_date_start,
+          // add_date_end: this.add_date_end,
+          // add_way: this.add_way,
+          // pay_status: this.pay_status,
+          // pay_num_min: this.pay_num_min,
+          // pay_num_max: this.pay_num_max,
+          // tag_type: this.tag_type,
+          // tag_id_list: this.tag_id_list,
+          // loss_status: this.loss_status,
+
+          type: this.tagType,
+          tag_list: val,
+          customer_list: customer_list
         }).then((res) => {
           var res = res.data
-          this.loading = false
+          this.$loading(this.$loadingConfig).close();
           if (res && res.errno == 0) {
-            this.tableData = res.rst.data.list;
-            this.otherData = {
-              count: res.rst.data.count,
-              exclude_count: res.rst.data.exclude_count
-            }
-            this.total = res.rst.pageInfo.total;
-            this.pages = res.rst.pageInfo.pages;
-
-            // 回显选择
-            let page_multiple_data = [];
-            if (this.isAll && (!this.multipleSelection[this.page])) {
-              page_multiple_data = this.tableData
-            } else {
-              let multiple_id = this.multipleSelection[this.page] ? this.multipleSelection[this.page].map((v) => {
-                return v.user_id + '-' + v.customer_id
-              }) : []
-              this.tableData.forEach((item) => {
-                if (multiple_id.indexOf((item.user_id + '-' + item.customer_id)) != -1) {
-                  page_multiple_data.push(item)
-                }
-              })
-            }
-            this.$nextTick(() => {
-              page_multiple_data.forEach((row) => {
-                this.$refs.multipleTable.toggleRowSelection(row, true);
-              })
-            })
-
+            this.$notify.info({
+              title: '提示',
+              message: `批量${this.tagType == 1 ? '打' : '移除'}标签进行中，请耐心等待！`,
+              duration: 0
+            });
+            this.customer_batchMarkTagResult(res.rst.id)
           } else if (res.errno != 4002) {
             this.$message({
               message: res.err,
@@ -272,11 +254,64 @@ export default {
             })
           }
         }).catch((err) => {
-          this.loading = false
+          this.$loading(this.$loadingConfig).close();
         });
       }
       this.tagVisible = false
     },
+    customer_batchMarkTagResult (id) {//批量编辑标签结果
+      this.$axios.get(this.URL.BASEURL + this.URL.customer_batchMarkTagResult, {
+        params: {
+          id: id
+        }
+      }).then((res) => {
+        var res = res.data
+        if (res && res.errno == 0) {
+          if (res.rst.status == 3) {
+            this.$notify.closeAll()
+            this.$notify({
+              title: '成功',
+              message: '标签编辑成功！',
+              type: 'success',
+              duration: 0
+            });
+            this.multipleSelection = {};
+            this.exclude_multiple_selection = {};
+            this.multipleArr = [];
+            this.isAll = false;
+            this.init(this.page)
+          } else if (res.rst.status == 3) {
+            this.$notify.closeAll()
+            this.$notify.error({
+              title: '错误',
+              message: '标签编辑失败!',
+              type: 'success',
+              duration: 0
+            });
+          } else {
+            setTimeout(() => {
+              this.customer_batchMarkTagResult(id)
+            }, 2000)
+          }
+        } else if (res.errno != 4002) {
+          this.$notify.closeAll()
+          this.$notify.error({
+            title: '错误',
+            message: res.err,
+            type: 'success',
+            duration: 0
+          });
+        }
+      }).catch((err) => {
+        this.$notify.closeAll()
+        this.$notify.error({
+          title: '错误',
+          message: '标签编辑失败，服务器错误！',
+          type: 'success',
+          duration: 0
+        });
+      });
+    },
     resetEvent () {//重置
       this.resetFlag = !this.resetFlag
       this.input_keyword = '';
@@ -344,8 +379,18 @@ export default {
       }
       this.init(1)
     },
-    init (page) {
-      this.page = page ? page : this.page;
+    init (page, type) {
+      if (type != 'export') {
+        this.page = page ? page : this.page;
+      } else {
+        if (this.total == 0) {
+          this.$message({
+            message: '暂无数据可导出',
+            type: "warning"
+          })
+          return
+        }
+      }
       this.loading = true
       this.$axios.get(this.URL.BASEURL + this.URL.customerList, {
         params: {
@@ -360,41 +405,44 @@ export default {
           tag_type: this.tag_type,
           tag_id_list: this.tag_id_list,
           loss_status: this.loss_status,
-          page: this.page,
-          page_size: this.page_size
+          page: type == 'export' ? 1 : this.page,
+          page_size: type == 'export' ? this.$store.state.exportNumber : this.page_size
         }
       }).then((res) => {
         var res = res.data
         this.loading = false
         if (res && res.errno == 0) {
-          this.tableData = res.rst.data.list;
-          this.otherData = {
-            count: res.rst.data.count,
-            exclude_count: res.rst.data.exclude_count
-          }
-          this.total = res.rst.pageInfo.total;
-          this.pages = res.rst.pageInfo.pages;
-
-          // 回显选择
-          let page_multiple_data = [];
-          if (this.isAll && (!this.multipleSelection[this.page])) {
-            page_multiple_data = this.tableData
+          if (type == 'export') {
+            this.exportEvent(res.rst.data.list)
           } else {
-            let multiple_id = this.multipleSelection[this.page] ? this.multipleSelection[this.page].map((v) => {
-              return v.user_id + '-' + v.customer_id
-            }) : []
-            this.tableData.forEach((item) => {
-              if (multiple_id.indexOf((item.user_id + '-' + item.customer_id)) != -1) {
-                page_multiple_data.push(item)
-              }
+            this.tableData = res.rst.data.list;
+            this.otherData = {
+              count: res.rst.data.count,
+              exclude_count: res.rst.data.exclude_count
+            }
+            this.total = res.rst.pageInfo.total;
+            this.pages = res.rst.pageInfo.pages;
+
+            // 回显选择
+            let page_multiple_data = [];
+            if (this.isAll && (!this.multipleSelection[this.page])) {
+              page_multiple_data = this.tableData
+            } else {
+              let multiple_id = this.multipleSelection[this.page] ? this.multipleSelection[this.page].map((v) => {
+                return v.user_id + '-' + v.customer_id
+              }) : []
+              this.tableData.forEach((item) => {
+                if (multiple_id.indexOf((item.user_id + '-' + item.customer_id)) != -1) {
+                  page_multiple_data.push(item)
+                }
+              })
+            }
+            this.$nextTick(() => {
+              page_multiple_data.forEach((row) => {
+                this.$refs.multipleTable.toggleRowSelection(row, true);
+              })
             })
           }
-          this.$nextTick(() => {
-            page_multiple_data.forEach((row) => {
-              this.$refs.multipleTable.toggleRowSelection(row, true);
-            })
-          })
-
         } else if (res.errno != 4002) {
           this.$message({
             message: res.err,
@@ -405,13 +453,17 @@ export default {
         this.loading = false
       });
     },
-    setCustomerTag (type) {//批量打标签、移除标签
-      //type 操作类型 1添加标签 2移除标签
+    userChange () {
       let multipleArr = []
       for (var i in this.multipleSelection) {
         multipleArr = multipleArr.concat(this.multipleSelection[1] ? this.multipleSelection[1] : [])
       }
-      if (multipleArr.length == 0) {
+      this.multipleArr = multipleArr;
+    },
+    setCustomerTag (type) {//批量打标签、移除标签
+      //type 操作类型 1添加标签 2移除标签
+      this.userChange()
+      if (this.multipleArr.length == 0) {
         this.$message({
           message: '请选择客户！',
           type: "warning"
@@ -429,6 +481,7 @@ export default {
         this.multipleSelection = {}
         this.exclude_multiple_selection = {}
         this.isAll = false
+        this.userChange()
       }
     },
     handleSelectionChange (row) {//点击选择变化
@@ -445,6 +498,7 @@ export default {
         })
         this.exclude_multiple_selection[this.page] = page_multiple_data
       }
+      this.userChange()
     },
     pageOptionSelect (val) {//选择
       if (val && val != '') {
@@ -462,7 +516,29 @@ export default {
       this.tableData.forEach((row) => {
         this.$refs.multipleTable.toggleRowSelection(row, true);
       });
+      this.userChange()
     },
+    exportEvent (data) {
+      let list = data;
+      let tHeader = ['客户id', '客户名称', '客户备注', '客户头像', '外部联系人的类型', '客户状态', '所属客服', '客服ID', '所属部门', '标签', '性别', '添加时间', '添加渠道', '付费情况']
+      let filterVal = ['customer_id', 'name', 'remark', 'avatar', 'self_type', 'self_customer_enable', 'self_user_name', 'user_id', 'department_list', 'tag_list', 'self_gender', 'createtime', 'add_way', 'self_pay_num']
+      list.forEach((item) => {
+        item.self_pay_num = item.pay_num > 0 ? ('已付费(' + item.pay_num + '次)') : '未付费';
+        item.self_gender = item.gender == 1 ? '男' : item.gender == 2 ? '女' : '';
+        item.self_user_name = item.user_list.name;
+        item.self_type = item.type == 1 ? '微信用户' : item.type == 2 ? '' : '企业微信';
+        item.self_customer_enable = item.customer_enable == 0 ? '禁用' : item.customer_enable == 1 ? '可用' : item.customer_enable == 3 ? '已流失' : ''
+      })
+      let excelDatas = [
+        {
+          tHeader: tHeader, // sheet表一头部
+          filterVal: filterVal, // 表一的数据字段
+          tableDatas: list, // 表一的整体json数据
+          sheetName: ''// 表一的sheet名字
+        }
+      ]
+      this.$exportOrder({ excelDatas, name: `客户管理（导出时间：${this.$getDay(0)}）` })
+    }
   }
 }
 </script>

project/src/components/detials/customerProfile.vue

@@ -187,9 +187,7 @@ export default {
       }
     }
   },
-  created() {
-    this.init()
-  },
+
   methods:{
     init(){
       this.loading = true