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

src/components/FinancialModule/FinancialSubmodule/czBillModule.vue

@@ -180,6 +180,37 @@
                     </tr>
                 </table>
             </div>
+        </div>
+         <div v-if="details.SpecialType && details.SpecialType==15">
+            <div class="_tit">
+                <span class="_text">系统使用费关联单</span>
+                <div>
+                    <span class="_btn" v-if="tableShow" @click="tableShow=false">{{$t('fnc.shouqi')}} <i class="iconfont icon-gengduo _rotate"></i> </span>
+                    <span class="_btn" v-else @click="tableShow=true">{{$t('fnc.zhankai')}} <i class="iconfont icon-gengduo"></i> </span>
+                </div>
+            </div>
+            <div v-show="tableShow" class="sanjiao-box _padding_20_15">
+                <table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
+                    <tr>
+                        <th>{{$t('sm.company')}}</th>
+                        <th>{{$t('advmanager.v_type')}}</th>
+                        <th>{{$t('fnc.danhao')}}</th>
+                        <th>{{$t('fnc.feiyongleixing')}}</th>
+                        <th>{{$t('fnc.yuanbi')}}</th>
+                        <th>{{$t('fnc.bweibi')}}</th>
+                        <th>{{$t('hotel.hotel_status')}}</th>
+                    </tr>
+                    <tr class="_color_b" v-for="(item,index) in opFinanceFeeList" :key="index">
+                        <td>{{item.BranchName}}</td>
+                        <th>{{item.TypeName}}</th>
+                        <td class="hover_text" @click="goDetail(item.FrID)" ><span>{{item.FrID}}</span></td>
+                        <th>{{item.CostTypeIdStr}}</th>
+                        <td>{{item.WBMoney}}/{{item.CurrencyName}}</td>
+                        <td>{{item.Money}}</td>
+                        <td>{{item.Status}}</td>
+                    </tr>
+                </table>
+            </div>
         </div>
         <div v-if="IsAdvanceFinance==1" style="border-top: 1px solid #DDDDDD;">
             <div class="_tit">
@@ -498,7 +529,9 @@ export default {
             }else if(this.details.SpecialType && this.details.SpecialType==13){
                 this.getKimonoList();
             }else if(this.details.SpecialType && this.details.SpecialType==14){
-                this.getOPFinanceFeeList();
+                this.getOPFinanceFeeList(18);
+            }else if(this.details.SpecialType && this.details.SpecialType==15){
+                this.getOPFinanceFeeList(14);
             }
       },
       goTravelControlList(id){
@@ -593,16 +626,20 @@ export default {
             }
         }, err => {})
       },
-      getOPFinanceFeeList(){
+      getOPFinanceFeeList(type){
+        console.log("我进来了。。。");
+        
         this.loading = true
         let msg={
-          FrId:this.FrID
+          FrId:this.FrID,
+          Type:type
         };
         this.apipost('Financial_post_GetOPAndFinanceFeeReList', msg, res => {
             this.loading = false
             if (res.data.resultCode == 1) {
                 let data=res.data.data;
                 this.opFinanceFeeList=data;
+                 console.log("我进来了1",data);
             }
             else{
                 this.Error(res.data.message)