no message

src/App.vue

@@ -22,14 +22,13 @@ export default {
       this.$router.push({
         path: "/login",
       });
-    } else if (getData && getData.path) {
+    } else if (getData && getData.path && this.getLocalStorage()) {
       // erp自动登陆传过来的参数
-      let parameter = getData;
-      this.$router.push({
-        path: `/automaticLogin?toke=${data.token}&data=${JSON.stringify(
-          parameter
-        )}`,
-      });
+      // let parameter = getData;
+      // let erpuserInfo =  JSON.parse(localStorage.erpuserInfo)
+      // this.$router.push({
+      //   path: `/automaticLogin?toke=${erpuserInfo.token}&data=${JSON.stringify(parameter)}`,
+      // });
     } else {
       this.$router.push({
         name: "Home",

src/components/clueManagement/clueComponent.vue

@@ -86,7 +86,7 @@
                 </el-col>
                 <el-col :span="4">
                     <el-button icon="iconfont iconshaixuan" class="crm-btn query-btn crm-btn-mini margin-right0"
-                        @click="MsgBus.$emit('sceneBoxShow', 4)">高级筛选</el-button>
+                        @click="MsgBus.$emit('sceneBoxShow', 4,'','',erpOrderObj)">高级筛选</el-button>
                 </el-col>
             </el-row>
             <div v-else class="flex-center">
@@ -464,9 +464,14 @@ export default {
       isShowImport: false, //是否显示导入弹窗
       importType: 1, //导入文件类型(1-客户导入,2-直客导入)
       IsSelectAdminList: [], //是否是线索管理员
+      erpOrderObj:{}
     };
   },
   mounted() {
+    if(this.$route.query&&this.$route.query.erpOrderObj){
+      this.erpOrderObj = JSON.parse(this.$route.query.erpOrderObj)
+    }
+
     this.userInfo = this.getLocalStorage();
     let $this = this;
     this.MsgBus.$on("closeCustomerDialogBox", function() {

src/components/dev/payroll.vue

@@ -149,8 +149,7 @@
                               commissionratioList.AvgLureNum>item.StartValue&&
                                 commissionratioList.AvfOrderNum>item.EndValue?colorlists[Math.floor(Math.random()*10)]:colors[Math.floor(Math.random()*10)]">
                               </el-progress>
-                              <div class="rate-box" v-if="commissionratioList.AvgLureNum>item.StartValue&&
-                                commissionratioList.AvfOrderNum>item.EndValue">
+                              <div class="rate-box">
                                 <div class="sanjiao" :style="{'border-bottom-color':commissionratioList.AvgLureNum>item.StartValue&&
                                 commissionratioList.AvfOrderNum>item.EndValue?'#FF7262':'#CACACA'}"></div>
                                 <div class="rate full-width" :class="{'active-rate':commissionratioList.AvgLureNum>item.StartValue&&
@@ -176,8 +175,7 @@
                               commissionratioList.AvgLureNum>item.StartValue&&
                                 commissionratioList.AvfOrderNum>item.EndValue?colorlists[Math.floor(Math.random()*10)]:colors[Math.floor(Math.random()*10)]">
                               </el-progress>
-                              <div class="rate-box" v-if="commissionratioList.AvgLureNum>item.StartValue&&
-                                commissionratioList.AvfOrderNum>item.EndValue">
+                              <div class="rate-box">
                                 <div class="sanjiao" :style="{'border-bottom-color':commissionratioList.AvgLureNum>item.StartValue&&
                                 commissionratioList.AvfOrderNum>item.EndValue?'#FF7262':'#CACACA'}"></div>
                                 <div class="rate full-width" :class="{'active-rate':commissionratioList.AvgLureNum>item.StartValue&&

src/components/dialogModel/sceneBox.vue

@@ -56,7 +56,6 @@
                         <el-col :span="8">
                             <el-input v-if="!item.Setting.length && item.nameStr !== '负责人' && item.nameStr !== '创建人'"
                                 v-model="item.SceneName" placeholder="请输入筛选条件"></el-input>
-
                             <el-select v-else-if="item.nameStr === '负责人' || item.nameStr === '创建人'" v-model="item.id"
                                 filterable @change="changeFC(index)" placeholder="请选择" style="width: 100%;">
                                 <el-option filterable v-for="item in EmployeeList" :label='item.EmName'
@@ -306,14 +305,26 @@
             }
         },
         mounted() {
-            if(this.erpOrderObj){
-                this.dataList.forEach(item=>{
-                    return item.SceneIndex = 5
-                })
-            }
             this.userInfo = this.getLocalStorage();
             this.GetSceneList()
             this.Employee()
+            if(this.erpOrderObj){
+                this.dataList.forEach((item,index)=>{
+                    item.SceneIndex = 5
+                    item.regionS = [
+                        {
+                            c: "等于",
+                            n: 'is',
+                            t: "t",
+                        },
+                        {
+                            c: "不等于",
+                            n: 'isnot',
+                            t: "t",
+                        },
+                    ]
+                })
+            }
         },
         methods: {
             // 修改组装数据

src/views/index.vue

@@ -175,7 +175,7 @@
         <p><span></span>新建场景</p>
         <span icon="el-icon-close"></span>
       </div>
-      <sceneBox :LableType="LableType" :sceneType="sceneType" :sceneDataList="sceneDataList" />
+      <sceneBox :LableType="LableType" :sceneType="sceneType" :sceneDataList="sceneDataList" :erpOrderObj="erpOrderObj"/>
     </el-dialog>
     <!-- 高级筛选修改 -->
     <el-dialog :visible.sync="sceneEditBoxShow" :close-on-click-modal="false" width="800px"
@@ -276,7 +276,8 @@
         SceneID: 0,
         TicketOrderID: 0,
         GuestId: 0,
-        obj: {}
+        obj: {},
+        erpOrderObj: {},
       };
     },
     watch: {
@@ -432,11 +433,13 @@
         $this.BusinessId = ID;
         $this.CustomerType = CustomerType;
       });
-      this.MsgBus.$on("sceneBoxShow", function (type, sceneType, sceneDataList) {
+      this.MsgBus.$on("sceneBoxShow", function (type, sceneType, sceneDataList, erpOrderObj) {
         $this.LableType = type;
         $this.sceneType = sceneType;
         $this.sceneDataList = sceneDataList;
+        $this.erpOrderObj = erpOrderObj;
         $this.sceneShow = true;
+        
       });
       this.MsgBus.$on("sceneBoxClose", function () {
         $this.sceneShow = false;