1

src/components/FinancialModule/domesticCommission.vue

@@ -24,13 +24,13 @@
     <div class="flexOne domesticCommission">
         <div>
             <ul class="opUl">
-                <li>
+                <!-- <li>
                     <em>期数</em>
                     <el-select v-model="msg.Periods" size="mini" @change="handleCurrentChange(1)">
                         <el-option label="不限" :value="0"></el-option>
                         <el-option v-for="(item,index) in PeriodsList" :key="item.index" :label="item.Name" :value="item.Id"></el-option>
                     </el-select>
-                </li>
+                </li> -->
                 <li>
                     <em>选择月份</em>
                     <el-date-picker
@@ -119,7 +119,9 @@
             if (ActionMenuCode.indexOf('F_DCommissionSend') != -1) {
                 this.btnShow = true;
             }
-            this.getqishilist()
+            // this.getqishilist()
+            this.getList();
+
         },
         methods: {
 
@@ -133,12 +135,10 @@
                             // if(this.PeriodsList && this.PeriodsList.length>0){
                             //     this.msg.Periods = Number(this.PeriodsList[0].Id) 
                             // }
-                            this.getList();
 
                             
                         } else {
                             this.Error(res.data.message);
-                            this.getList();
 
                         }
                     },

src/components/FinancialModule/domesticCommissionUser.vue

@@ -9,7 +9,9 @@
         display: inline-block;
         margin: 10px 15px 10px 0;
     }
-
+    .domesticCommissionUser .opUl li input{
+        height: 34px !important;
+    }
     .domesticCommissionUser .singeRowTable tr td {
         padding: 8px 5px;
     }
@@ -27,7 +29,7 @@
                 
                 <li>
                     <em>人员</em>
-                    <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable>
+                    <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
                         <el-option label="不限" :value="-1"></el-option>
                         <el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name"
                             :value="item.empId"></el-option>
@@ -35,7 +37,7 @@
                 </li>
                 <li>
                     <em>公司</em>
-                    <el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)">
+                    <el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
                         <el-option label="不限" :value="-1"></el-option>
                         <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
                             :value="item.Id"></el-option>
@@ -43,7 +45,7 @@
                 </li>
                 <li>
                     <em>部门</em>
-                    <el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)">
+                    <el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
                         <el-option label="不限" :value="-1"></el-option>
                         <el-option v-for="(item,index) in departMentList" :key="item.index" :label="item.DepartmentName"
                             :value="item.DepartmentID"></el-option>
@@ -120,7 +122,7 @@
                 //数据源
                 dataList: [],
                 total: 0,
-                btnShow: false,
+                disabled: true,
                 PeriodsList: [],
                 BranchList: [],
                 searchList: [],
@@ -130,8 +132,11 @@
         mounted() {
             let userInfo = this.getLocalStorage();
             let ActionMenuCode = userInfo.ActionMenuCode;
-            if (ActionMenuCode.indexOf('P_OPCommissionSend') != -1) {
-                this.btnShow = true;
+            if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限
+                this.disabled = false;
+            }else{
+                this.disabled = true;
+                this.msg.UserId = Number(userInfo.EmployeeId)
             }
             if (this.$route.query && this.$route.query.PeriodId) {
                 this.msg.PeriodId = this.$route.query.PeriodId

src/components/FinancialModule/domesticCommissiondetails.vue

@@ -9,6 +9,9 @@
         display: inline-block;
         margin: 10px 15px 10px 0;
     }
+    .domesticCommissiondetails .opUl li input{
+        height: 34px !important;
+    }
 
     .domesticCommissiondetails .singeRowTable tr td {
         padding: 8px 5px;
@@ -23,8 +26,38 @@
 <template>
     <div class="flexOne domesticCommissiondetails">
         <div style="min-height: 70px;">
-            <ul class="query-box" style="padding: 0;">
-                
+            <ul class="opUl" >
+                <li>
+                    <em>期数</em>
+                    <el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)">
+                        <el-option label="不限" :value="0"></el-option>
+                        <el-option v-for="(item,index) in PeriodsList" :key="item.index" :label="item.Name" :value="item.Id"></el-option>
+                    </el-select>
+                </li>
+                <li>
+                    <em>人员</em>
+                    <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
+                        <el-option label="不限" :value="-1"></el-option>
+                        <el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name"
+                            :value="item.empId"></el-option>
+                    </el-select>
+                </li>
+                <li>
+                    <em>公司</em>
+                    <el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
+                        <el-option label="不限" :value="-1"></el-option>
+                        <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
+                            :value="item.Id"></el-option>
+                    </el-select>
+                </li>
+                <li>
+                    <em>部门</em>
+                    <el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
+                        <el-option label="不限" :value="-1"></el-option>
+                        <el-option v-for="(item,index) in departMentList" :key="item.index" :label="item.DepartmentName"
+                            :value="item.DepartmentID"></el-option>
+                    </el-select>
+                </li>
                 <li>
                     <em>订单号</em>
                     <el-input maxlength="50" v-model="msg.OrderId" class="permiss-input w200"
@@ -35,47 +68,54 @@
                     <el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200"
                     @keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
                 </li>
-                <li>
-                    <input type="button" class="normalBtn" value="导出" @click="exportExcel">
-                </li>
+               
 
                 
             </ul>
         </div>
-        <div style="display: flex;align-items: center;height: 50px;">
-            <span>总金额：{{TotalMoney}}元</span>
-            <span style="margin-left: 15px;">总人数：{{TotalNum}}人</span>
+        <!-- <li>
+            <input type="button" class="normalBtn" value="导出" @click="exportExcel">
+        </li> -->
+        <div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
+            <div style="display: flex;align-items: center;">
+                <span>总金额：{{TotalMoney}}元</span>
+                <span style="margin-left: 15px;">总人数：{{TotalNum}}人</span>
+            </div>
+            <input type="button" class="normalBtn" value="导出" @click="exportExcel">
+            
         </div>
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" style="margin-top: 10px;">
             <tr>
-                <th>团信息</th>
-                <th>订单号</th>
+               
                 <th>公司</th>
                 <th>部门</th>
                 <th>销售</th>
+                <th>团信息</th>
+                <th>订单号</th>
                 <th>人数</th>
-
-               
                 <th>提成</th>
                 <th>额外奖励</th>
                 <th>额外扣除</th>
-                <th>最终提成</th>
+                <th>最终发放</th>
                 <th>期数</th>
+                <th>备注</th>
 
                 <!-- <th>操作</th> -->
             </tr>
             <tr v-for="item in dataList">
-                <td style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">{{item.TCNUM}}({{item.TCID}})</td>
-                <td>{{item.OrderId}}</td>
+               
                 <td>{{item.BranchName}}</td>
                 <td>{{item.DeptName}}</td>
                 <td>{{item.UserName}}</td>
+                <td style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">{{item.TCNUM}}({{item.TCID}})</td>
+                <td>{{item.OrderId}}</td>
                 <td>{{item.PeopleCount}}</td>
                 <td>{{item.CommissionMoney}}</td>
                 <td>{{item.OtherMoney}}</td>
                 <td>{{item.BackMoney}}</td>
-                <td>{{item.YFMoney}}</td>
+                <td>{{item.RealityCommissionMoney}}</td>
                 <td>{{item.Periods}}</td>
+                <td>{{item.Description}}</td>
 
              
                 <!-- <td>
@@ -89,7 +129,7 @@
                 </td> -->
             </tr>
             <tr v-if="dataList.length==0">
-                <td style="text-align:center" colspan="11">暂无数据</td>
+                <td style="text-align:center" colspan="12">暂无数据</td>
             </tr>
         </table>
         <!-- 分页 -->
@@ -127,34 +167,39 @@
                 departMentList:[],
                 TotalMoney:0,
                 TotalNum:0,
+                disabled:true
 
             }
         },
         mounted() {
             let userInfo = this.getLocalStorage();
             let ActionMenuCode = userInfo.ActionMenuCode;
-            if (ActionMenuCode.indexOf('P_OPCommissionSend') != -1) {
-                this.btnShow = true;
-            }
-            if (this.$route.query ) {
-                if(this.$route.query.PeriodId){
-                    this.msg.PeriodId = this.$route.query.PeriodId
+            console.log(this.$route.query,'this.$route.query')
+            if (this.$route.query ) {//不大于0的话用默认值
+                if(this.$route.query.PeriodId && this.$route.query.PeriodId>0){
+                    this.msg.PeriodId = Number(this.$route.query.PeriodId)
                 }
-                if(this.$route.query.UserId){
-                    this.msg.UserId = this.$route.query.UserId
+                if(this.$route.query.UserId && this.$route.query.UserId>0){
+                    this.msg.UserId =Number(this.$route.query.UserId) 
                 }
-                if(this.$route.query.RB_Branch_Id){
-                    this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id
+                if(this.$route.query.RB_Branch_Id&& this.$route.query.RB_Branch_Id>0){
+                    this.msg.RB_Branch_Id = Number(this.$route.query.RB_Branch_Id)
                 }
-                if(this.$route.query.RB_Department_Id){
-                    this.msg.RB_Department_Id = this.$route.query.RB_Department_Id
+                if(this.$route.query.RB_Department_Id && this.$route.query.RB_Department_Id>0){
+                    this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id)
                 }
             }
+            if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限
+                this.disabled = false;
+            }else{
+                this.disabled = true;
+                this.msg.UserId = Number(userInfo.EmployeeId)
+            }
             this.getList();
-            // this.getqishilist()
-            // this.getCompanyList()//获取公司
-            // this.getEmployee()//人员
-            // this.getDerpartMent()//部门
+            this.getqishilist()
+            this.getCompanyList()//获取公司
+            this.getEmployee()//人员
+            this.getDerpartMent()//部门
         },
         methods: {
             getDerpartMent() {