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

src/components/FinancialModule/FinancialSubmodule/czBillModule.vue

@@ -37,6 +37,7 @@
                     <tr>
                         <th>{{$t('fnc.danhao')}}</th>
                         <th>{{$t('sm.company')}}</th>
+                        <th style="width:180px">{{$t('objFill.fukuanzhanghao')}}</th>
                         <th>{{$t('fnc.feiyongleixing')}}</th>
                         <th>{{$t('hotel.hotel_Currency')}}</th>
                         <th>{{$t('hotel.hotel_CurrentRate')}}</th>
@@ -46,6 +47,11 @@
                     <tr class="_color_b" v-for="(item,index) in czList" :key="index">
                         <td class="hover_text" @click="goDetail(item.FrID)" ><span>{{item.FrID}}</span></td>
                         <td>{{item.BranchName}}</td>
+                        <td style="max-width: 100px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap; ">
+                            <el-tooltip class="item" effect="dark" :content="item.RemitterName+'/'+item.AccountNumber" placement="top-start">
+                                <div>{{item.RemitterName}}/{{item.AccountNumber}}</div>
+                            </el-tooltip>
+                        </td>
                         <td>{{item.CostTypeName}}</td>
                         <td>{{item.CurrencyName}}</td>
                         <td>{{item.Rate}}</td>

src/components/FinancialModule/ReportForm/MemberSettlement.vue

+<style scoped>
+    .page_fnDm{background-color: white}
+    .query-box{overflow: inherit}
+    ._nav{margin: 20px 0 0 0 ;background-color: #f5f5f5;}
+    ._nav li{float: left;font-size: 14px;color: #666666;padding: 15px 20px;cursor: pointer;position: relative;background-color: #f1f1f1;margin-right: 5px}
+    ._nav li._active{background-color:#FFFFFF;color: #333333 }
+    ._nav li._active::after{content: "";width: 20px;height: 3px;background-color: #E95252;display: inline-block;position: absolute;bottom: 0;left: 38%;}
+    .el-range-editor.el-input__inner{border-radius: 0}
+    .query-box{border: none}
+    .hight_query{position: relative;}
+    .hight_query span{height: 34px;line-height: 34px;color: #E95252}
+    .hight_query span .icon-gengduo{font-size: 12px}
+    .hight_query span em{text-decoration: underline;cursor: pointer;}
+    .hight_query_box{position: absolute;background-color: white;z-index: 2000;right: 200px;width: 800px;}
+    ._hqb_shadow{box-shadow:3px 2px 10px rgb(204, 203, 203);border: 1px solid #ececec;}
+    .query-box ul {overflow: initial;}
+    .hqb_t{padding: 10px 20px;font-size: 16px;background-color: #E95252;border: 1px solid #E95252;color: #fff;text-align: center;margin-bottom: 15px}
+    .query-box li:last-child{float: left}
+    .query-box>ul>li:last-child{float: right;}
+    .query-box .hight_query ul .el-input{width: inherit  }
+    .hight_query_box ul li{margin-top: 0;float: left;margin-right: 15px}
+    .hight_query_box ul li label{font-size: 14px}
+    .hight_query_box .el-form{padding: 0 20px}
+    .hight_query_box ul li._hqb_btn{float: right;margin-right: 25px;padding-top: 5px;position: inherit}
+    .Receipt_box{padding: 15px;color: #c94052;width: 614px;background-color: rgba(242, 242, 242, 1);border: 1px solid rgba(228, 228, 228, 1)}
+    .Receipt_box.color_blur{color: #106BAF;}
+    .Receipt_box.color_blur .rb_stit span{display: inline-block;border-bottom: 2px solid #106BAF;padding: 0 20px}
+    .rb_tit{font-size: 18px;text-align: center}
+    .rb_stit{font-size: 14px;text-align: center}
+    .rb_stit span{display: inline-block;border-bottom: 2px solid #C94052;padding: 0 20px}
+    .rb_top_row{display: flex;justify-content: space-between;font-size: 12px;}
+    .rb_top_row span._r_name{color: #333333}
+    .rb_top_row span._r_bold{font-weight: bold}
+    .rb_top_row ._r_time span{color: #333333}
+    ._r_mb5{margin-bottom: 5px;}
+    .Receipt_table{width: 100%;font-size: 14px;text-align: center}
+    .Receipt_table .th{font-weight: 200 !important}
+    ._r_mt10{margin-top: 10px;}
+    ._bg__{display: inline-block;padding: 2px 8px;color: white;border-radius: 4px}
+    ._bg_red{background-color: #E95252;}
+    ._bg_green{background-color: #2BB87C}
+    .text_d{text-decoration: underline;cursor: pointer;}
+    .PingFangSC{font-weight: bold}
+    .Bill_par{position: relative;}
+    tr th,tr td{text-align: left;padding-left: 20px;}
+    tr._item_list{border-bottom: 1px solid #E5E5E5;height: 78px;}
+    tr._item_list td{border-bottom: 1px solid #e5e5e5;    padding: 10px;}
+    /* tr._t_head th{border-top: 1px solid #e5e5e5;} */
+    tr._item_list td:first-child{border-left: 1px solid #e5e5e5;}
+    tr._item_list td:last-child{border-right: 1px solid #e5e5e5;}
+    ._head_img{width: 28px;height: 28px;border-radius: 50%;vertical-align:middle;}
+    ._btn_group{font-size: 14px;}
+    .icon-daiqueren{color: #4BCA81}
+    .icon-yiqueren{color: #4BCA81}
+    .icon-yiquxiao{color: #959595}
+    .icon-shenhebohui{color: #E95252}
+    .icon-icon-zancun{color: #FF9C01}
+    .singeRowTable tr:hover{background-color: white}
+    ._TradeWayList{padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width: 230px}
+    ._bold{font-weight: bold}
+    ._bank_name,._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;}
+    ._bank_name{margin-left: 10px;}
+    ._bank_type{background-color: #2AAEF2}
+    ._bank_type2{background-color: #FF9C01}
+    ._font_init{color: #333333;font-size: 12px;vertical-align:top;}
+    .InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
+    .changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
+    .changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
+    ._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
+    .changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
+    ._icon_btn i{width: 30px;height: 30px;display: inline-block;color: white !important;border-radius: 50%;text-align: center;line-height: 30px;margin-right: 10px;cursor: pointer;outline: none;}
+    ._icon_btn i.edit{background-color: #00C6FF;font-size: 16px;}
+    ._icon_btn i.edit:hover{background-color: #59daff}
+    ._icon_btn i.edit:active{background-color: #00b8ec}
+    ._icon_btn i.icon-sousuo{background-color: #47BF8C;}
+    ._icon_btn i.icon-sousuo:hover{background-color: #66bb97}
+    ._icon_btn i.icon-sousuo:active{background-color: #35ab79}
+    ._icon_btn i.icon-ico_commodity_defaul{background-color: #F16C3C;}
+    ._icon_btn i.icon-ico_commodity_defaul:hover{background-color: #e87c54}
+    ._icon_btn i.icon-ico_commodity_defaul:active{background-color: #f76630}
+    ._icon_btn i.icon-quxiao1{background-color: #E95252;}
+    ._icon_btn i.icon-quxiao1:hover{background-color: #ea6d6d}
+    ._icon_btn i.icon-quxiao1:active{background-color:#e42d2d}
+    ._icon_btn i.icon-zhuanjiao1{background-color: #E6A014;font-size: 16px;}
+    ._icon_btn i.icon-zhuanjiao1:hover{background-color: rgb(235, 184, 84)}
+    ._icon_btn i.icon-zhuanjiao1:active{background-color: rgb(223, 150, 6)}
+    ._tag_span{background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #409eff;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;}
+    ._tag_span._tag_warr{background-color: rgba(103,194,58,.1);border-color: rgba(103,194,58,.2);color: #67c23a;}
+    ._fex_cen{display: flex;align-items: center}
+    ._pad5{padding: 5px 10px;}
+    ._color_gar{color: gray}
+    ._TCIDAndTCNUMList{
+        display: flex;
+    }
+    .JumpDivTitleOne{
+        margin-left:20px;
+        font-size:14px;
+    }
+    .JumpDivTitleTwo{
+        margin:10px 0 0 20px;
+        font-size:14px;
+    }
+    .JumpSpan{
+        margin:0 20px;
+    }
+    /deep/._fnDm_contenteltable .el-table tr th{
+        background-color: #e6e6e6
+    }
+</style>
+
+<template >
+    <div class="page_fnDm page_RecPayQuery"  @keyup.enter="resetPageIndex(),getPageList(), getIntegralPageList()">
+        <div class="query-box">
+            <el-form class="_info_box clearfix"  label-width="110px">
+                <el-row style="padding:15px 20px 0 0;">
+                    <el-col :span="4">
+                        <el-form-item :label="$t('fnc.ssuogongsi')">
+                            <el-select  filterable  v-model='RB_Branch_Id'  class="">
+                                <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+                                <el-option v-for='item in CompanyList'
+                                    :label='item.BName'
+                                    :value='item.Id'
+                                    :key='item.Id'>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                      <el-col :span="6">
+                        <el-form-item :label="$t('fnc.jiaoyiriqi')">
+                          <el-date-picker class="h34"
+                                          v-model="transactionDate"
+                                          type="daterange"
+                                          value-format="yyyy-MM-dd">
+                          </el-date-picker>
+                        </el-form-item>
+                      </el-col>
+                </el-row>
+            </el-form>
+            <ul class="clearfix">
+                <li class="hight_query">
+                    <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList(),getIntegralPageList()">{{$t('pub.searchBtn')}}</button>
+                    <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
+                </li>
+            </ul>
+            <div style="width:100%;display:flex;">
+            <div style="width:25%;display:inline-block;border-right:1px solid #E5e5e5;border-bottom:1px dashed #E5e5e5;padding:5px 0px;">
+                <div  class="JumpDivTitleOne" style="margin-bottom:15px; font-size: 17px">常规单据</div>
+                <div class="JumpDivTitleOne">{{$t('fnc.ysjine')}}：{{SumYingShou}} <span class="JumpSpan">{{$t('objFill.shishoujine')}}：{{SumShiShou}}</span> {{$t('Operation.Op_daishou')}}：{{SumDaiShou}}</div>
+                <div class="JumpDivTitleTwo">{{$t('objFill.yingfujine')}}：{{SumYingFu}} <span class="JumpSpan">{{$t('fnc.sfjine')}}：{{SumShiFu}}</span> {{$t('objFill.v101.FinancialModule.daifuje')}}：{{SumDaiFu}}</div>
+            </div>
+           <div style="border-right:1px solid #E5e5e5; border-bottom:1px dashed #E5e5e5; width:15%;padding:5px 0px;">
+            <div  class="JumpDivTitleOne" style="margin-bottom:15px;font-size: 17px">{{$t('fnc.tanxiaoinfo')}}</div>
+            <div class="JumpDivTitleOne">{{$t('fnc.tanxiaomoney')}}：{{TotalAmortization}}  </div>
+           </div>
+           <div style="border-bottom:1px dashed #E5e5e5; width:15%;padding:5px 0px;">
+            <div  class="JumpDivTitleOne" style="margin-bottom:15px;font-size: 17px">{{$t('fnc.a_heji')}}</div>
+            <div class="JumpDivTitleOne">{{$t('fnc.jine')}}：{{(SumYingFu-SumYingShou+TotalAmortization).toFixed(2)}}  </div>
+           </div>
+
+           
+        </div>
+        </div>
+        <div class="_fnDm_content" v-loading='CZloading' >
+            <p style="margin-bottom:5px;">幸福存折结算</p>
+            <el-table ref="multipleTable" :data="CZDataList" tooltip-effect="dark" style="width: 100%"  row-key="Id">
+              <el-table-column prop="OrderId" label="订单号">
+              </el-table-column>
+              <el-table-column prop="Type" label="类型">
+                <template slot-scope="scope">
+                  <span>{{(scope.row.Type==1?'收入':'成本')}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="TCNUM" label="团号">
+              </el-table-column>
+              <el-table-column prop="BName" label="公司别">
+              </el-table-column>
+              <el-table-column prop="CustomerName" label="客户">
+              </el-table-column>
+              <el-table-column prop="Money" label="金额">
+              </el-table-column>
+              <el-table-column prop="UpdateTime" label="时间">
+              </el-table-column>
+              <el-table-column prop="UseOrderId" label="使用单号">
+              </el-table-column>
+              <el-table-column prop="UseTCNUM" label="使用团号">
+              </el-table-column>
+              <el-table-column prop="UseBName" label="使用公司">
+              </el-table-column>
+            </el-table>
+        </div>
+
+  <div class="_fnDm_content _fnDm_contenteltable" v-loading='JFloading' style="margin-top:10px;">
+    <p style="margin-bottom:5px;">积分结算</p>
+      <el-table ref="multipleTable" :data="JFDataList" tooltip-effect="dark" style="width: 100%"  row-key="Id">
+        <el-table-column prop="OrderId" :label="$t('fnc.danhao')" width="90">
+          <template slot-scope="scope">
+            <span 
+                style="text-decoration: underline;cursor: pointer;font-weight: bold"  @click="goUrlDetail('FinancialDocumentsDetail',scope.row)">{{scope.row.OrderId}}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+  </div>
+    </div>
+</template>
+<script>
+
+export default {
+    data(){
+        return{
+            userId:0,
+            msgCZ:{
+                pageIndex:1,
+                pageSize:5,
+                StartTime:'',
+                EndTime:'',
+                RB_Branch_Id: -1
+            },
+            msgJF:{
+                pageIndex:1,
+                pageSize:5,
+                QStartDate:'',
+                QEndDate:'',
+                RB_Branch_Id: -1
+            },
+            getCompanyMsg:{  // 公司
+                RB_Group_Id:'0',
+                Status:'0',
+            },
+            CompanyList:[],
+            transactionDate:[],
+            RB_Branch_Id:-1,
+            currentCZPage: 1,
+            currentJFPage: 1,
+            CZloading: false,
+            JFloading: false,
+            BalanceIncome: 0,
+            BalanceCost: 0,
+            IntegralIncome: 0,
+            IntegralCost: 0,
+            TotalMoney:0,
+            CZDataList:[],
+            JFDataList:[],
+            CZtotal:0,
+            JFtotal:0
+        }
+    },
+    created(){
+        if(this.$route.query.year && this.$route.query.month)
+            {
+            let sTradeDate=this.$route.query.year+"-"+this.$route.query.month+"-01";
+            var d1=new Date(sTradeDate);
+            var d2=new Date(d1);
+            d2.setMonth(d2.getMonth()+1);
+            d2.setDate(d2.getDate()-1);
+            var month = d2.getMonth()+1;
+            var day = d2.getDate();
+            let eTradeDate= d2.getFullYear()+'-'+month+'-'+day;
+            this.transactionDate[0]= sTradeDate;
+            this.transactionDate[1]= eTradeDate;
+        }
+        if(this.$route.query.BranchId){
+            this.RB_Branch_Id=parseInt(this.$route.query.BranchId);
+        }
+    },
+    mounted(){
+        this.getCompanyList();
+        // this.getPageList();
+        // this.getIntegralPageList();
+    },methods:{
+        handleCurrentChanges(val){
+            this.pageIndex = this.msg.pageIndex = val;
+            this.getPageList();
+        },
+        getPageList(){  // 获取列表数据
+            this.CZloading= true;
+            this.msgCZ.StartTime = this.transactionDate[0];
+            this.msgCZ.EndTime = this.transactionDate[1];
+            this.msgCZ.RB_Branch_Id = this.RB_Branch_Id;
+            this.apipost('financestatistics_post_GetBalanceUseDetailPageList',this.msgCZ,res=>{
+                if(res.data.resultCode == 1) {
+                    let data = res.data.data.pageData.List;
+                    this.CZtotal = res.data.data.count;
+                    this.BalanceIncome=res.data.data.pageData.IncomeMoney;
+                    this.BalanceCost=res.data.data.pageData.CostMoney;
+                    if(this.CZtotal==0){
+                        this.CZDataList=[];
+                    }else{
+                        this.CZDataList = data;
+                    }
+                    this.CZloading= false;
+                }else{
+                    this.CZloading= false;
+                    this.$message.error(res.data.message);
+                }                            
+            },err=>{})
+        },
+        getIntegralPageList(){  // 获取列表数据
+            this.JFloading= true;
+            this.msgJF.QStartDate = this.transactionDate[0];
+            this.msgJF.QEndDate = this.transactionDate[1];
+            this.msgJF.RB_Branch_Id = this.RB_Branch_Id;
+            this.apipost('financestatistics_post_GetIntegralUseDetailPageList',this.msgJF,res=>{
+                if(res.data.resultCode == 1) {
+                    let data = res.data.data.pageData.List;
+                    this.JFtotal = res.data.data.count;
+                    this.IntegralIncome=res.data.data.pageData.IncomeMoney;
+                    this.IntegralCost=res.data.data.pageData.CostMoney;
+                    if(this.JFtotal==0){
+                        this.JFDataList=[];
+                    }else{
+                        this.JFDataList = data;
+                    }
+                    this.JFloading=false;
+                }else{
+                    this.JFloading= false;
+                    this.$message.error(res.data.message);
+                }
+            },err=>{})
+        },
+        method5: function() {
+          this.GetLocalFile("Financial_post_DownInOrOut", this.msg,this.$t('objFill.shouzhikuan')+".xls");
+        } ,
+        getCompanyList(){ //获取公司列表
+            this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
+                if(res.data.resultCode==1){
+                        this.CompanyList=res.data.data;
+                }else{}
+            },err=>{})
+        },
+        handleCurrentChange(val) { //翻页
+            this.msg.pageIndex = val;
+            this.getPageList();
+        },
+        resetPageIndex(){  // 重置页码
+            this.msgCZ.pageIndex=1;
+            this.currentCZPage = 1;
+            this.msgJF.pageIndex=1;
+            this.currentJFPage = 1;
+        }
+    }
+}
+</script>

src/router/config.js

@@ -4929,6 +4929,14 @@ export default {
                 title: '赞羊返佣明细'
               },
             },
+            {
+              path: '/MemberSettlement',
+              name: 'MemberSettlement',
+              component: resolve => require(['@/components/FinancialModule/ReportForm/MemberSettlement'], resolve),
+              meta: {
+                title: '会员返利结算'
+              },
+            },
             {
               path: '/JumpReport',
               name: 'JumpReport',