no message

src/App.vue

@@ -13,15 +13,13 @@ export default {
       this.$router.push({
         path: "/login",
       });
-    } else if(this.$route.query.token) { // erp自动登陆传过来的参数
+    } else if(this.$route.query) { // erp自动登陆传过来的参数
       let data = this.$route.query
       let parameter = data.data[0]
+      console.log(data, 'apppppppppppppppp')
+      return
       this.$router.push({
-          path: `/automaticLogin`,
-          query:{
-            token: data.token,
-            erpOrderObj: JSON.stringify(parameter),
-          }
+          path: `/automaticLogin?toke=${data.token}&data=${JSON.stringify(parameter)}`,
       })
     } else {
       this.$router.push({

src/components/guestManagement/guestManagement.vue

@@ -519,9 +519,9 @@
                     pageIndex: 1,
                     pageSize: 30,
                     ContactNumber: "",
-                    WhereType: -1,
+                    WhereType: 1,
                     OrderBy: "",
-                    ID: 36,
+                    ID: 37,
                     Q_TOrderState:"0"
                 },
                 total: 0,
@@ -549,7 +549,7 @@
                 }, ],
                 sceneList: [],
                 SceneEmployeeList: [],
-                sceneID: 36,
+                sceneID: 37,
                 visible: false,
             };
         },

src/components/guestManagement/ticketOrder.vue

@@ -293,8 +293,21 @@
                 <el-row v-if="name=='订单转交'">
                      <el-col>
                         <div class="MyEditForm-item">
-                            <el-form-item label="转交id" prop="EnterId">
-                                <el-input placeholder="请输入转交人id" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" v-model="form.EnterId"></el-input>
+                            <el-form-item label="转交业务员" prop="EnterId">
+                              <el-select 
+                                size="mini"
+                                filterable
+                                v-model="form.EnterId" 
+                                clearable
+                                placeholder="请选择业务员">
+                                    <el-option 
+                                        v-for="item in EmployeeList"
+                                        :label='item.EmName'
+                                        :value='item.EmployeeId'
+                                        :key='item.EmployeeId'>
+                                    </el-option>
+                                </el-select>
+                                <!-- <el-input placeholder="请输入转交人id" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" v-model="form.EnterId"></el-input> -->
                             </el-form-item>
                         </div>
                     </el-col>
@@ -364,6 +377,7 @@ export default {
   },
   data() {
     return {
+      EmployeeList:[],
       width:"",
       logData:[],
       total:0,
@@ -468,6 +482,7 @@ export default {
     }
     if(this.name=='订单转交'){
       this.width="400px"
+      this.Employee()
     }
     if(this.name=='编辑订单金额'){
       this.width="600px"
@@ -478,6 +493,28 @@ export default {
     }, 50);
   },
   methods: {
+    // 获取业务员
+    Employee() {
+        let userInfo = this.getLocalStorage();
+        let msg = {
+            RB_Group_id: userInfo.RB_Group_id,
+            BranchId: -1,
+            DepartmentId: 0,
+            PostId: 0,
+            IsLeave: 0,
+        };
+        this.apipost2(
+            "admin_get_EmployeeGetList",
+            msg,
+            (res) => {
+            if (res.data.resultCode == 1) {
+                this.EmployeeList = res.data.data;
+            } else {
+            }
+            },
+            (err) => {}
+        );
+    },
     closedDialog() {
       this.MsgBus.$emit("closeTicketOrderDialogBox");
     },

src/plugins/index.js

@@ -215,7 +215,7 @@ export default {
                 var timestamp = (new Date()).valueOf();
                 var token = "";
                 var key = "";
-                var data = localStorage.erpuserInfo
+                var data = JSON.parse(localStorage.erpuserInfo)
                 if (localStorage.erpuserInfo != null) {
                     token = data.token;
                 }
@@ -238,9 +238,9 @@ export default {
                 })
                     .then(res => {
                         if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
-                            // this.$router.push({
-                            //     path: `/automaticLogin?token=${data.token}&data=${JSON.stringify(data.data)}`
-                            // })
+                            this.$router.push({
+                                path: `/automaticLogin?token=${data.token}&data=${JSON.stringify(data.parameter)}`
+                            })
                         } else if (res.data.resultCode == 10005) {
                             this.$router.go(-1)
                         } else {
@@ -317,7 +317,6 @@ export default {
                 var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
                 var postData = {
                     "msg": msg,
-                    // "cmd": cmd,
                     "timestamp": timestamp,
                     "token": token,
                     "sign": md5Str
@@ -325,8 +324,9 @@ export default {
                 this.$http.post(apiurl, postData, {
                     headers: {
                         'Content-Type': 'application/json',
-                        'Referer-Viitto': this.$route.path
-                    }
+                        'Referer-Viitto': this.$route.path,  
+                    },
+                    responseType: 'blob'
                 }).then((res) => {
                     let blob = new Blob([res.data], {
                         type: "application/vnd.ms-excel"
@@ -337,7 +337,12 @@ export default {
                     link.setAttribute("download", fileName);
                     document.body.appendChild(link);
                     link.click();
-                    successCall(res);
+                    if (callBack) {
+                        var result = {
+                            Code: 1
+                        };
+                        callBack(result);
+                    }
                 }).catch(function (res) { });
             }
     }

src/router.js

@@ -44,11 +44,11 @@ export default new Router({
             }
         },
         {
-            path: "/",
+            path: "/automaticLogin",
             name: "automaticLogin",
             component: automaticLogin,
             meta: {
-                title: "欢迎使用CRM系统-请登录使用",
+                title: "欢迎使用CRM系统-自动登录",
                 "http-equiv": "X-UA-Compatible",
                 content: "IE=Edge,chrome=1"
             }

src/views/automaticLogin.vue

 <style>
-  @import "../assets/css/login2019.css";
+  /* @import "../assets/css/login2019.css"; */
   .Autologin{
     position: fixed;
     left: 0;
@@ -14,6 +14,7 @@
 <template>
   <div>
     <div class="Autologin">
+      
       <div class="gifContent">
        
       </div>
@@ -39,10 +40,8 @@
       
     },
     mounted() {
-      console.log('--------', '')
     },
     created() {
-        console.log('=========', '')
       if(this.$route.query){
         let param = JSON.parse(this.$route.query.data) ;
         this.obj.token=this.$route.query.token;
@@ -68,13 +67,11 @@
         this.apipostLogin("/api/AutoLogin/CRMAutoLogin", this.msg, (res) => {
           var jsonData = res.data;
           if (jsonData.resultCode == 1) {
-            localStorage.autoLogin = JSON.stringify(autoLogin);
             var userData = jsonData.data;
             var userJson = JSON.stringify(userData);
             localStorage.userInfo = userJson;
             this.loginState = 0;
             var data = JSON.parse(localStorage.erpuserInfo)
-            console.log('-----------', '')
             this.$router.push({
               path: data.parameter.path,
               query:{