新增追加团款

src/components/FinancialModule/addFinancialDocuments.vue

@@ -914,6 +914,9 @@ export default {
               })
             }
           }
+          if (this.orderObj && this.orderObj.TravelReplenish){
+            this.msg.TravelReplenish = this.orderObj.TravelReplenish
+          }
           this.loading = true;
           this.msg.Description=this.Description;
             this.apipost('Financial_post_Set',this.msg,res=>{
@@ -1047,12 +1050,12 @@ export default {
                     if (t>=0) {
                         this.msg.detailList[t].CostTypeName = x.Name;
                         if (x.ID === 56) {
-                            this.msg.detailList[t].Remark = `地接费领取自动生成：${this.orderObj.TCNUMS}`;
+                            this.msg.detailList[t].Remark = this.orderObj.TCNUMS ? `地接费领取自动生成：${this.orderObj.TCNUMS}` : '';
                         }
                     }else{
                         this.detailList.CostTypeName = x.Name;
                         if (x.ID === 56) {
-                            this.detailList.Remark = `地接费领取自动生成：${this.orderObj.TCNUMS}`;
+                            this.detailList.Remark = this.orderObj.TCNUMS ? `地接费领取自动生成：${this.orderObj.TCNUMS}` : '';
                         }
                     }
                 }

src/components/LeaderManagement/leaderPayHotelDetail.vue

@@ -55,6 +55,7 @@
         <!-- </template> -->
       </template>
     </table>
+    
   </div>
 </template>
 <script>
@@ -64,6 +65,7 @@ export default {
       loading: true, 
       dataList: [], 
       currencyList: [],
+      
     };
   },created(){
     this.apipost("financeinfo_post_GetList", {Name: ""}, res=>{

src/components/LeaderManagement/leaderReimbursement.vue

@@ -546,6 +546,89 @@
         </td>
       </tr>
     </table>
+    <table border="0" cellspacing="1" class="leaderReimbursementTable">
+        <tr>
+          <th :colspan="7">
+            <span >追加团款</span> 
+          </th>
+          <th :colspan="1"><input
+              type="button"
+              value="制单"
+              class="leader2Btn"
+              @click="ZhuiJiaTuanKuan()"></th>
+        </tr>
+        <tr>
+          <th>单号</th>
+          <th>所属公司</th>
+          <th>单据类型</th>
+          <th>费用类型</th> 
+          <th>交易方式</th>
+          <th>金额</th>
+          <th>付款对象</th>
+          <th>制单人员</th>
+        </tr>
+        <tr class="_item_list" v-for="(item,index) in zhuijiaList"> 
+          <td>{{item.BranchName}}</td>
+            <td class="Bill_par">
+                <el-popover
+                    popper-class="detailsIT_Journal"
+                    placement="bottom-start"
+                    trigger="click">
+                        <template v-if="item.Type!=1&&item.Type!=7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
+                            <my-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-Bill>
+                        </template>
+                        <template v-else-if="item.Type==1&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
+                            <my-RVB-Bill :ID="item.FrID" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
+                        </template>
+                        <template v-else-if="item.Type==7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
+                            <my-GZ-Bill :ID="item.FrID" :width="'1000px'"  :color="colorSon"></my-GZ-Bill>
+                        </template>
+                        <template v-else-if="item.Is_Merge===1&&item.modelShow">
+                          <my-HB-Bill :ID="item.FrID" :width="widthSon"  :color="colorSon"></my-HB-Bill>
+                        </template>
+                    <span slot="reference" @click="item.modelShow = true" class="text_d PingFangSC" >{{item.FrID}}</span>
+                </el-popover>
+            </td>
+            <td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span></td> 
+            <td>
+                <template v-for="(s,si) in item.CostTypeList">
+                    <span  class="_tag_span">{{s}}</span><br/>
+                </template>                                  
+            </td>
+            <td class="_number">
+                <template v-if="item.TradeWayList&&item.TradeWayList.length>0">
+                    <div class="_TradeWayList"   v-for="(tw,twIn) in item.TradeWayList">
+                        <p class="_fex_cen clearfix"><span class="_bold">{{tw.Alias}}</span><span class="_bank_name">{{item.TradeWayList[0].TypeName}}</span><span class="_bank_type" :class="tw.AccountType=='私'?'':'_bank_type2'">{{tw.AccountType==""?$t('fnc.no'):tw.AccountType}}</span> </p>
+                        <p>{{tw.BankNo}}</p>
+                    </div>
+                </template>
+                <template v-else>
+                    <div class="_pad5">
+                        {{$t('fnc.no')}}
+                    </div>
+                </template>
+            </td>
+            <td>
+                <p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span class="">{{moneyFormat(item.Money)}}</span></p>
+                <p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p>
+            </td>
+            <td>
+                <template v-if='item.Type===1'>
+                <span class="_color_gar">{{$t('fnc.huikuanren')}}：</span><span>{{item.RemitterName}}</span>
+                </template>
+                <template v-if='item.Type===2'>
+                <span class="_color_gar">{{$t('fnc.fkduixiang')}}：</span><span>{{item.RemitterName}}</span> 
+                </template>
+                <template v-if='item.Type===4'>
+                <span class="_color_gar">{{$t('fnc.no')}}</span> 
+                </template>
+            </td>
+            <td valign="middle">
+                <img class="_head_img" :src="item.EmPhoto" alt="">
+                <span>{{item.EmName}}</span>
+            </td> 
+        </tr>
+      </table>
     <div v-if='picIsShow' class="viewBigPicLayer">
       <i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false,picObj=[]"></i>
       <el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
@@ -574,6 +657,7 @@
           TCIDs: '',
           NewCombinationNum: ''
         },
+        zhuijiaList:[],
         list: [],
         nav: [],
         TravelDayNum: 0,
@@ -601,6 +685,40 @@
       commonHotelInfo
     },
     methods: {
+      ZhuiJiaTuanKuan(){
+        let TCIDARR = [this.$route.query.id]
+        let orderObj = {
+          OrderID: 0,
+          OrderSource: 8,
+          Obj: {},
+          SourceID: 0,
+          TCIDList: TCIDARR,
+          TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route.query.id
+        } 
+        this.$router.push({
+          name: 'ChoiceAddFinancialDocuments',
+          query: {
+            "Type": 2,
+            "companyID": '',
+            "path": "",
+            'blank': 'y',
+            'orderObj': JSON.stringify(orderObj),
+          }
+        });
+      },
+      getzhuijiaList(){
+        this.apipost(
+          'Financial_post_GetTravelFinanceReplenishList', {
+            TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route.query.id
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              this.zhuijiaList = res.data.data.list
+            }
+          },
+          err => {}
+        )
+      },
       getHangingAccountByTCIDList: function () {
         this.apipost(
           'Financial_post_GetHangingAccountByTCIDList', {
@@ -913,6 +1031,7 @@
       this.getList();
       this.getTotalNav();
       this.getHangingAccountByTCIDList()
+      this.getzhuijiaList()
     }
   }
 
@@ -974,5 +1093,52 @@
     background: #fff;
     text-align: center;
   }
-
+ .leader2Btn {
+  color: #fff;
+  padding: 0 15px;
+  height: 30px;
+  background: #e95252;
+  border: 1px solid #e95252;
+  cursor: pointer;
+  border-radius: 15px;
+}
+.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._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} 
 </style>