no message

src/components/FinancialModule/OpCommission/OPCommissionDetail.vue

@@ -58,7 +58,7 @@
       flex: 1;
       display: flex;
       flex-direction: row;
-      
+
   }
   .relative-position{
       flex: 1;
@@ -89,7 +89,7 @@
       display: flex;
       flex-wrap: wrap;
       justify-content: center;
-      
+
   }
 .sanjiao {
     width: 0;
@@ -128,13 +128,13 @@
           <ul class="opUl">
               <li>
                   <em>出团公司</em>
-                  <el-select filterable  size="mini" v-model='msg.OutBranchId' 
+                  <el-select filterable  size="mini" v-model='msg.OutBranchId'
                   @change='handleCurrentChange(1)' :disabled="disabled">
                   <el-option label="不限" :value="-1" :key="-1"></el-option>
                   <el-option
                   v-for="item in companyList"
-                  :label='item.BName' 
-                  :value='item.Id' 
+                  :label='item.BName'
+                  :value='item.Id'
                   :key='item.Id'
                   ></el-option>
                   </el-select>
@@ -149,24 +149,24 @@
               </li>
               <li>
                   <em>所属公司</em>
-                  <el-select filterable size="mini" v-model='msg.RB_Branch_Id' 
+                  <el-select filterable size="mini" v-model='msg.RB_Branch_Id'
                   @change='getDepartment();handleCurrentChange(1)' :disabled="disabled">
                   <el-option label="不限" :value="-1" :key="-1"></el-option>
                   <el-option
                   v-for="item in companyList"
-                  :label='item.BName' 
-                  :value='item.Id' 
+                  :label='item.BName'
+                  :value='item.Id'
                   :key='item.Id'
                   ></el-option>
                   </el-select>
               </li>
-              
+
               <li>
                   <em>部门</em>
-                  <el-select filterable size="mini" v-model='msg.RB_Department_Id' 
+                  <el-select filterable size="mini" v-model='msg.RB_Department_Id'
                   @change='getEmployee();handleCurrentChange(1)'>
                   <el-option label="不限" :value="-1"></el-option>
-                  <el-option v-for='item in departmentList' 
+                  <el-option v-for='item in departmentList'
                       :label='item.DepartmentName'
                       :value='item.DepartmentID'
                       :key='item.DepartmentID'>
@@ -175,7 +175,7 @@
               </li>
               <li>
                   <em>人员</em>
-                  <el-select v-model="msg.EmployeeId" size="mini" 
+                  <el-select v-model="msg.EmployeeId" size="mini"
                   @change="handleCurrentChange(1)" :disabled="disabled" filterable>
                       <el-option label="不限" :value="-1"></el-option>
                       <el-option label="微途" :value="-2"></el-option>
@@ -183,12 +183,12 @@
                           :value="item.empId"></el-option>
                   </el-select>
               </li>
-              
-              
+
+
               <li style="position: fixed;right: 0;top: 51px;">
                   <input type="button" class="normalBtn" value="导出" @click="exportExcel">
               </li>
-              
+
           </ul>
       </div>
       <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
@@ -238,7 +238,7 @@
   import moment from "moment"
   export default {
       components:{
-          
+
       },
       data() {
           return {
@@ -254,7 +254,7 @@
                   RB_Branch_Id: -1,//公司ID
                   OutBranchId: -1,//出团公司ID
               },
-              
+
               loading: false,
               //数据源
               dataList: [],
@@ -289,18 +289,15 @@
           this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id;    //集团ID
           this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
           this.departmentMsg.RB_Branch_Id = userInfo.RB_Branch_Id;
-          this.GetCommissionPeroidsList()//期数
-          this.getEmployee()//人员
-          this.getDepartment()
-          this.getCompany()
+
       },
       mounted() {
           let userInfo = this.getLocalStorage();
           let ActionMenuCode = userInfo.ActionMenuCode;
-          
+
           this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
           this.msg.OutBranchId = this.$route.query.RB_Branch_Id>-1?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
-          this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId) 
+          this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
           if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
           ||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
           ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
@@ -308,12 +305,16 @@
               this.msg.OutBranchId = -1
               this.msg.RB_Branch_Id = -1
               // this.msg.RB_Department_Id = -1
-              this.msg.EmployeeId = -1
+              this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
           }else{
               this.disabled = true;
+              this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
           }
-          
-          
+          this.GetCommissionPeroidsList()//期数
+          this.getEmployee()//人员
+          this.getDepartment()
+          this.getCompany()
+
       },
       methods: {
           getDepartment() {
@@ -323,7 +324,7 @@
           this.departmentList = res.data.data;
         }
       }, err => {})
-              
+
     },
           getCompany(){
               this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
@@ -338,7 +339,7 @@
                   if (res.data.resultCode == 1) {
                       this.PeroidsList = res.data.data;
                       if(!this.$route.query.PeriodId){
-                          this.msg.PeriodsId = this.PeroidsList[0].Id
+                          this.msg.PeriodsId = this.PeroidsList[0].ID
                       }
                       this.getList()
                   } else {
@@ -376,7 +377,7 @@
                   query: {
                       PeriodId: this.$route.query.PeriodId,
                     //   OutBranchId: item.RB_Branch_Id,
-                      UserId: item.EmployeeId,  
+                      UserId: item.EmployeeId,
                       blank: 'y',
                       tab: '同业提现详情'
                   }
@@ -410,4 +411,4 @@
 
       }
   }
-</script>
+</script>
\ No newline at end of file

src/components/FinancialModule/ServiceCommission/ServiceCommissionUser.vue

@@ -157,13 +157,9 @@
                 this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
             }else{
                 this.disabled = true;
-                // this.msg.UserId = Number(userInfo.EmployeeId)
-                if(!this.$route.query.UserId){
-                  this.msg.UserId = Number(userInfo.EmployeeId)
-                }else{
-                  this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
-                }
+                this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
             }
+            this.msg.Type = this.$route.query.Type?this.$route.query.Type:''
             this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             this.getqishilist()
             this.getCompanyList()//获取公司

src/components/FinancialModule/domestic/OPsalesCommissionUser.vue

@@ -136,9 +136,10 @@
             let ActionMenuCode = userInfo.ActionMenuCode;
             if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限
                 this.disabled = false;
+                this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
             }else{
                 this.disabled = true;
-                this.msg.UserId = Number(userInfo.EmployeeId)
+                this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
             }
             this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             this.getList();

src/components/temp/operation.vue

@@ -602,18 +602,14 @@
         }else if(type==3){//历史单项
           name = 'ServiceCommissionUser'
         }
-        if(type!=5&&name){
-          this.$router.push({
+        this.$router.push({
             name: name,
             query: {
               UserId: Number(userInfo.EmployeeId),
               Type: 2,
-              isSale: 1,
               blank: 'y'
             }
           });
-        }
-
       },
 
       goMore(){