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

src/components/DomesticModule/SettlementOrder.vue

@@ -37,7 +37,17 @@
                             value-format="yyyy-MM-dd">
                         </el-date-picker>
                     </span>
-                </li>                 
+                </li>       
+                <li>
+                    <span>
+                        <em>机票类别</em>
+                        <el-select  filterable  v-model='msg.IsInter' >
+                            <el-option label='全部' value='-1'></el-option>
+                            <el-option label='国内机票' value='0'></el-option>
+                            <el-option label='国际机票' value='1'></el-option>
+                        </el-select>
+                    </span>
+                </li>          
                  <li>
                     <span>
                         <em>状态</em>
@@ -156,7 +166,8 @@ export default {
                 PageIndex:1,
                 pageSize:15,
                 sDate:'',
-                eDate:''
+                eDate:'',
+                IsInter:'-1'
             },
             dataList:[],
             noData:false,
@@ -275,7 +286,7 @@ export default {
             },null)
         },
       method5: function() {
-        this.GetLocalFile("DomesticTicket_post_DownBill", {'Term':this.msg.Term,'Status':this.msg.Status,'sDate':this.msg.sDate,'eDate':this.msg.eDate},"历史账单.xls");
+        this.GetLocalFile("DomesticTicket_post_DownBill", {'Term':this.msg.Term,'Status':this.msg.Status,'sDate':this.msg.sDate,'eDate':this.msg.eDate,'emID':this.emID,'IsInter':this.msg.IsInter},"历史账单.xls");
       }  ,      
         resetPageIndex() {//查询初始化页码
             this.msg.pageIndex = 1;

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/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/SalesModule/productQuery.vue

@@ -1832,7 +1832,7 @@
           }
         }, err => {})
       },
-      getScenicRefundgetScenicRefund(TCID) {
+      getScenicRefund(TCID) {
         this.apipost('sellorder_get_GetScenicRefundList', {
           TCID
         }, res => {

src/components/activity/CouponList.vue

@@ -82,10 +82,12 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <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>
@@ -97,6 +99,8 @@
       <tr v-for="(item,index) in DataList" v-loading="loading">
         <td>{{item.couponsName}}</td>
         <td>{{item.couponCount}}</td>
+        <td>{{item.couponReceiveCount}}</td>
+        <td>{{(item.couponCount - item.couponReceiveCount) > 0 ? (item.couponCount - item.couponReceiveCount) : 0 }}</td>
         <td>{{item.lineName}}</td>
         <td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
         <td>{{item.useCondition}}</td>

src/components/activity/LuckyDraw.vue

@@ -62,6 +62,9 @@
     .LuckyDraw .ql-container{
       min-height: 100px;
     }
+    .LuckyDraw .avatar-uploader-icon{
+      height: auto
+    }
   </style>
 <template>
   <div class="flexOne LuckyDraw">

src/components/activity/awardList.vue

@@ -129,7 +129,7 @@ export default {
           rank:'',  
       },
      rules:{ 
-        awardName: [{ required: true, message: "请输入公司", trigger: "blur" }],
+        awardName: [{ required: true, message: "请输入奖项名称", trigger: "blur" }],
         awardType: [{ required: true, message: "请选择奖项类型", trigger: "change" }],
         awardRelationId: [{required: true, message: "请选择奖项关联", trigger: "change"}],
         awardCount: [{ required: true, message: "请输入奖项数量", trigger: "blur" }],

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