Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Hotel/roomReservationsDetails.vue

@@ -218,7 +218,12 @@ export default {
     					ID:item.NewHotelId
     				})
 					item.PayStyle=item.PayStyle.toString()
-					item.OrderDetailsList.forEach(x=>{
+					item.OrderDetailsList.forEach((x,index1)=>{
+						 if(x.HouseTypeCount<=0){
+                             x.HouseTypeCount = item.HouseStatistics.HouseTypeList[index1].HouseTypeCount.toString();
+                          }else{
+                             x.HouseTypeCount =x.HouseTypeCount.toString();
+                          }
 						x.HouseTypeCount = x.HouseTypeCount.toString();
 						x.UnitPrice = x.UnitPrice.toString();
 						x.HotelDiscount = x.HotelDiscount.toString();

src/components/administrative/CommissionDetail.vue

@@ -55,6 +55,7 @@ export default {
       multipleSort: false,
       loading: true,
       CompanyList:[],
+      dataListTwo: [],
       stringPerons:''
     };
   },
@@ -96,10 +97,23 @@ export default {
       }
     },
     filterMethod(filters){
-      if(filters.bName=='')
-        this.msg.BName=-1
-      else
-        this.msg.BName=filters.bName
+      console.log("filter", filters);
+      let data = JSON.parse(JSON.stringify(this.dataListTwo))
+      let dataListTwo = JSON.parse(JSON.stringify(this.dataListTwo))
+      if (filters.bName!='' && filters.bName!='__all__'){
+        data = data.filter(item => item.bName.indexOf(filters.bName)!=-1);
+      }
+      if (filters.departmentName!=''){
+        data = data.filter(item => item.departmentName.indexOf(filters.departmentName)!=-1);
+      }
+      if (filters.createByStr!=''){
+        data = data.filter(item => item.createByStr.indexOf(filters.createByStr)!=-1);
+      }
+      if ((filters.bName === '' || filters.bName==='__all__') && filters.departmentName === '' && filters.createByStr === ''){
+        data = dataListTwo
+      }
+      this.dataList = data
+      console.log(data)
     },
     customCompFunc(params) {
       if (params.type === "see") {
@@ -132,9 +146,10 @@ export default {
       this.CompanyList.forEach(x => {
         let item = {};
         item.label = x.BName;
-        item.value = x.Id;
+        item.value = x.BName;
         companyList.push(item);
       });
+      console.log(companyList)
       let company = {
         field: "bName",
         title: "公司",
@@ -142,11 +157,15 @@ export default {
         titleAlign: "left",
         columnAlign: "left",
         isResize: true,
+        result: "",
+        filterMultiple: false,
+        filters: companyList,
+        type: "select"
         // filterMultiple: false,
         // filters: companyList,
         // result: "",
         // type: "select",
-        orderBy: "asc"
+        // orderBy: "asc"
         // isFrozen:true
       };
       let department = {
@@ -155,7 +174,11 @@ export default {
         width: 80,
         titleAlign: "left",
         columnAlign: "left",
-        isResize: true
+        isResize: true,
+        result: "",
+        filterMultiple: false,
+        filters: companyList,
+        type: "text"
       };
       let userName = {
         field: "createByStr",
@@ -163,7 +186,11 @@ export default {
         titleAlign: "left",
         columnAlign: "left",
         isResize: true,
-        width: 80
+        width: 80,
+        result: "",
+        filterMultiple: false,
+        filters: [{}],
+        type: "text"
       };
       let commissionMoney = {
         field: "commissionMoney",
@@ -329,6 +356,7 @@ export default {
             this.dataList.forEach(x=>{
               x.sumMoney=x.commissionMoney+x.otherMoney-x.backMoney
             })
+            this.dataListTwo = JSON.parse(JSON.stringify(this.dataList))
           } else {
             this.Error(res.data.message);
           }