1

src/components/FinancialModule/domesticCommission.vue

@@ -117,9 +117,9 @@
                     res => {
                         if (res.data.resultCode == 1) {
                             this.PeriodsList = res.data.data;
-                            if(this.PeriodsList && this.PeriodsList.length>0){
-                                this.msg.Periods = Number(this.PeriodsList[0].Id) 
-                            }
+                            // if(this.PeriodsList && this.PeriodsList.length>0){
+                            //     this.msg.Periods = Number(this.PeriodsList[0].Id) 
+                            // }
                             this.getList();
 
                             

src/components/FinancialModule/domesticCommissionUser.vue

@@ -134,7 +134,7 @@
                 this.msg.PeriodId = this.$route.query.PeriodId
             }
             this.getList();
-            this.getqishilist()
+            // this.getqishilist()
             this.getCompanyList()//获取公司
             this.getEmployee()//人员
             this.getDerpartMent()//部门

src/components/FinancialModule/domesticCommissiondetails.vue

@@ -42,6 +42,10 @@
                 
             </ul>
         </div>
+        <div style="display: flex;align-items: center;height: 50px;">
+            <span>总金额：{{TotalMoney}}元</span>
+            <span style="margin-left: 15px;">总人数：{{TotalNum}}人</span>
+        </div>
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" style="margin-top: 10px;">
             <tr>
                 <th>期数</th>
@@ -117,6 +121,9 @@
                 BranchList: [],
                 searchList: [],
                 departMentList:[],
+                TotalMoney:0,
+                TotalNum:0,
+
             }
         },
         mounted() {
@@ -126,7 +133,6 @@
                 this.btnShow = true;
             }
             if (this.$route.query ) {
-                console.log(this.$route.query)
                 if(this.$route.query.PeriodId){
                     this.msg.PeriodId = this.$route.query.PeriodId
                 }
@@ -141,10 +147,10 @@
                 }
             }
             this.getList();
-            this.getqishilist()
-            this.getCompanyList()//获取公司
-            this.getEmployee()//人员
-            this.getDerpartMent()//部门
+            // this.getqishilist()
+            // this.getCompanyList()//获取公司
+            // this.getEmployee()//人员
+            // this.getDerpartMent()//部门
         },
         methods: {
             getDerpartMent() {
@@ -235,15 +241,21 @@
             },
             //获取数据
             getList() {
+                let msg = JSON.parse(JSON.stringify(this.msg))
+                if(msg.OrderId==''){
+                    msg.OrderId = 0
+                }
                 this.loading = true;
                 this.apipost(
                     "sellcommission_GetGNCommissionSingleDetailsList",
-                    this.msg,
+                    msg,
                     res => {
                         this.loading = false;
                         if (res.data.resultCode == 1) {
-                            this.dataList = res.data.data.pageData;
-                            this.total = res.data.data.count;
+                            this.TotalMoney = res.data.data.TotalMoney?res.data.data.TotalMoney:0
+                            this.TotalNum = res.data.data.TotalNum?res.data.data.TotalNum:0
+                            this.dataList = res.data.data.pmodel.pageData;
+                            this.total = res.data.data.pmodel.count;
                         } else {
                             this.Error(res.data.message);
                         }
@@ -252,7 +264,10 @@
                 );
             },
             exportExcel(){//导出
-                let msg=this.msg;
+                let msg = JSON.parse(JSON.stringify(this.msg))
+                if(msg.OrderId==''){
+                    msg.OrderId = 0
+                }
                 var fileName = "国内提成明细.xls";
                 this.GetLocalFile("sellcommission_post_GetGNCommissionSingleDetailsListToExcel", msg, fileName);
             },