Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm into master

src/components/guestManagement/guestManagement.vue

@@ -104,18 +104,15 @@
                 <el-table-column prop="MobilePhone" label="手机号码" width="120" v-if="queryType[1].show"
                     show-overflow-tooltip>
                 </el-table-column>
-                
+
                 <el-table-column prop="CustomerSourceTypeStr" label="客户来源" v-if="queryType[3].show"
                     show-overflow-tooltip>
                 </el-table-column>
-                <el-table-column prop="SourceAccountName" label="来源细分" v-if="queryType[31].show"
-                    show-overflow-tooltip>
+                <el-table-column prop="SourceAccountName" label="来源细分" v-if="queryType[31].show" show-overflow-tooltip>
                 </el-table-column>
-                <el-table-column prop="ClueDemand" label="需求" v-if="queryType[32].show"
-                    show-overflow-tooltip>
+                <el-table-column prop="ClueDemand" label="需求" v-if="queryType[32].show" show-overflow-tooltip>
                 </el-table-column>
-                <el-table-column prop="WeChatNo" label="微信号" v-if="queryType[33].show"
-                    show-overflow-tooltip>
+                <el-table-column prop="WeChatNo" label="微信号" v-if="queryType[33].show" show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column prop="TraveNum" label="参团数" sortable v-if="queryType[4].show" show-overflow-tooltip>
                 </el-table-column>
@@ -271,7 +268,7 @@
         },
         data() {
             return {
-                ruleList:[],
+                ruleList: [],
                 queryType2: [{
                     label: "客户名称",
                     show: true,
@@ -468,7 +465,7 @@
                 }, {
                     label: "微信号",
                     show: true,
-                },],
+                }, ],
                 CustomerId: 0,
                 CustomerIdStr: "",
                 transferVisible: false,
@@ -613,7 +610,7 @@
             },
             //删除
             delete() {
-          
+
             },
             // 关注
             CareforCustomer(scope) {
@@ -635,9 +632,9 @@
                     if (type === 3) {
                         this.multipleSelection.push(this.CustomerId);
                     }
-                    if(this.ruleList.length==0){
+                    if (this.ruleList.length == 0) {
                         this.transferVisible = true
-                    }else{
+                    } else {
                         let tips = '系统已开启自动分配，无法指定推送，是否继续推送?'
                         this.$confirm(tips, '提示', {
                             confirmButtonText: '确定',
@@ -645,14 +642,14 @@
                             type: 'warning'
                         }).then(() => {
                             let ids
-                            if(this.CustomerId){
+                            if (this.CustomerId) {
                                 ids = this.CustomerId
-                            }else{
+                            } else {
                                 ids = this.multipleSelection.join(',')
                             }
                             this.apipost('/api/Customer/AutoTransferCustomer', {
                                 IDs: ids
-                            }, res=>{
+                            }, res => {
                                 if (res.data.resultCode == 1) {
                                     this.$message.success(res.data.message);
                                     this.getList()
@@ -662,7 +659,7 @@
                             this.$message({
                                 type: 'info',
                                 message: '已取消'
-                            });          
+                            });
                         });
                     }
                 } else {
@@ -707,19 +704,17 @@
                 this.dialogTableVisible = true;
             },
             openDetails(scope) {
-                console.log("scope",scope)
                 this.drawer = true;
                 this.CustomerId = scope.row.ID;
                 this.CustomerName = scope.row.GusetName;
             },
             // 获取是否开启规则
-            GetCustomerAllotRule(){
-                this.apipost('/api/Customer/GetCustomerAllotRule', {}, res=>{
+            GetCustomerAllotRule() {
+                this.apipost('/api/Customer/GetCustomerAllotRule', {}, res => {
                     if (res.data.resultCode == 1) {
                         this.ruleList = res.data.data.EmpList
                     }
                 })
-                
             },
             handleSizeChange(val) {
                 this.msg.pageSize = val;