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

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -207,6 +207,16 @@
                     <td height="26px"></td>
                     <td height="26px"></td>
                 </tr>
+                <tr>
+                   <td height="26px"></td>
+                    <td height="26px"></td>
+                    <td height="26px"></td>
+                    <td height="26px"></td>
+                    <td height="26px">{{currentMoney}}</td>
+                    <td height="26px"></td>
+                    <td height="26px">{{benMoney}}</td>
+                    <td height="26px"></td>
+                </tr>
                 <tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&GetDetail.Type!=1">
                   <td height="34px" class="">交易方式</td>
                   <td height="34px" colspan="7" class="_color_b">
@@ -300,6 +310,8 @@ export default {
             EndDate:'',
             StartDate:'',
             printTime:'',
+            currentMoney:0,
+            benMoney:0,
         }
     },created(){
       let date = new Date(),
@@ -347,8 +359,12 @@ export default {
                     data.DetailList.forEach(x=>{
                         x.UnitPrice = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2))
                         x.Money = x.Money.toFixed(2)
-                        x.OriginalMoney = x.OriginalMoney.toFixed(2)
+                        x.OriginalMoney = x.OriginalMoney.toFixed(2);
+                        this.currentMoney += parseFloat(x.OriginalMoney);
+                        this.benMoney += parseFloat(x.Money);
                     })
+                    this.currentMoney = this.currentMoney.toFixed(2);
+                    this.benMoney = this.benMoney.toFixed(2);
                     data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
                     data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney)
                     data.PayMoney = this.$commonUtils.addCommas(data.PayMoney.toFixed(2))

src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue

@@ -182,6 +182,16 @@
                     <td height="26px"></td>
                     <td height="26px"></td>
                 </tr>
+                <tr>
+                    <td height="26px"></td>
+                    <td height="26px"></td>
+                    <td height="26px"></td>
+                    <td height="26px"></td>
+                    <td height="26px">{{currentMoney}}</td>
+                    <td height="26px"></td>
+                    <td height="26px">{{benMoney}}</td>
+                    <td height="26px"></td>
+                </tr>
                 <tr>
                     <td colspan="1">手续费<br/><span class="_font_size12">（原币）</span></td>
                     <td colspan="3" class="_font_size12" >{{GetDetail.OriginalFee}}</td>
@@ -278,7 +288,9 @@ export default {
             EmployeeId:'',
             EndDate:'',
             StartDate:'',
-          printTime:''
+            printTime:'',
+            currentMoney:0,
+            benMoney:0,
         }
     },created(){
   let date = new Date(),
@@ -334,7 +346,11 @@ export default {
                         x.UnitPrice = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2));
                         x.Money = x.Money.toFixed(2);
                         x.OriginalMoney = x.OriginalMoney.toFixed(2);
+                        this.currentMoney += parseFloat(x.OriginalMoney);
+                        this.benMoney += parseFloat(x.Money);
                     })
+                    this.currentMoney = this.currentMoney.toFixed(2);
+                    this.benMoney = this.benMoney.toFixed(2);
                     // let m = data.PayMoney?data.PayMoney:data.Money;                    
                     data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money);
                     data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney)

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);
           }