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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -1474,11 +1474,12 @@
         if (obj.LineId == this.LineId) {
           id = [98, 99];
         } else {
-          if (obj.OutBranchId === 0) {
-            id = [43, 48, 245, 246];
-          } else {
-            id = [56, 53, 245, 246];
-          }
+          id = [43, 48,56, 53, 245, 246];
+          // if (obj.OutBranchId === 0) {
+          //   id = [43, 48, 245, 246];
+          // } else {
+          //   id = [56, 53, 245, 246];
+          // }
         }
         this.$router.push({
           name: "ChoiceAddFinancialDocuments",

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -238,8 +238,10 @@
                 </div>
                 <div class="Team_Incontent">
                   <div>应收：<span>￥{{DataList.TeamBalance.ShouldReceive}}</span></div>
-                  <div>实收：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualReceive}}</span></div>
-                  <div>待收：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitRecive}}</span></div>
+                  <div>实收：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualReceive}}</span>    &nbsp;&nbsp;   待收：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitRecive}}</span></div>
+
+                  <div>应退：<span>￥{{DataList.TeamBalance.YRefundMoney}}</span></div>
+                  <div>实退：<span class="Team_Coins">￥{{DataList.TeamBalance.SRefundMoney}}</span></div>
                   <div>
                     注：应收=订单应收总额，实收=订单实收总额
                   </div>
@@ -571,6 +573,56 @@
             </tr>
           </template>
         </table>
+        <div class="clearfix TB_PrintDiv">
+          <div class="TB_comtitle TB-Title">团费退款：
+            <span v-if="moneyAll.RefundAll>0 || moneyAll.PayRefundAll>0">
+              <span class="span_all">应退：¥{{moneyFormat(moneyAll.RefundAll)}}</span>
+              <span class="span_all">实退：¥{{moneyFormat(moneyAll.PayRefundAll)}}</span>
+            </span>
+          </div>
+        </div>
+        <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+          <tr>
+            <th width="180">单号</th>
+            <th width="200">费用类型</th>
+            <th width="500">交易明细</th>
+            <th width="300">金额</th>
+            <th width="200">交易日期</th>
+            <th width="250">制单人员</th>
+            <th width='180'>审核状态</th>
+            <th width="200">当前审核人</th>
+          </tr>
+          <template v-for="item in DataList.FiniceRefundList">
+            <tr>
+              <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
+              </td>
+              <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
+              <td>
+                <div v-for="childItem in item.TradeWayList">
+                  支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
+                  <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
+                  <span class="TB_Rate">汇率：{{childItem.Rate}}</span>
+                </div>
+              </td>
+              <td style="font-size:14px;">
+                应付：{{item.Money}}<br />
+                实付：{{item.PayMoney}}
+              </td>
+              <td>{{item.TradeDate}}</td>
+              <td>
+                <div>{{item.EmName}}</div>
+                <div class="Team_btmDiv">{{item.CreateDate}}</div>
+              </td>
+              <td>{{item.StatusStr}}</td>
+              <td>
+                <div v-for="AuditItem in item.AuditList">
+                  {{AuditItem.EmName}}
+                  <span class="TB_Rate">{{AuditItem.AuditDate}}</span>
+                </div>
+              </td>
+            </tr>
+          </template>
+        </table>
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">地接款收入：
             <span v-if="moneyAll.dijieys>0 || moneyAll.dijiess>0">
@@ -1973,6 +2025,9 @@
         moneyAll: {
           Moneyall: 0,
           PayMoneyall: 0,
+          //团费退款
+          RefundAll:0,
+          PayRefundAll:0,
           // 收入  地接款
           dijieys: 0,
           dijiess: 0,
@@ -2426,6 +2481,8 @@
         let that = this;
         this.moneyAll.Moneyall = 0;
         this.moneyAll.PayMoneyall = 0;
+        this.moneyAll.RefundAll = 0;
+        this.moneyAll.PayRefundAll = 0;
         this.moneyAll.dijieys = 0;
         this.moneyAll.dijiess = 0;
         this.moneyAll.zifeiys = 0;
@@ -2678,6 +2735,10 @@
               }
 
             })
+            this.DataList.FiniceRefundList.forEach(item => {
+                this.moneyAll.RefundAll += item.Money;
+                this.moneyAll.PayRefundAll += item.PayMoney;
+            })
           }
         });