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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1619,7 +1619,7 @@ export default {
         },
         {
           field: "CompensationMoney",
-          title: "赔偿",
+          title: "赔偿(不进利润)",
           formatter: this.moneyFormat,
           width: 100,
           titleAlign: "left",

src/components/LeaderManagement/leaderReimbursement.vue

@@ -804,7 +804,6 @@
       </span>
     </p>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
-
       <tr>
         <th width="10%">单号</th>
         <th width="10%">费用说明</th>
@@ -923,9 +922,10 @@
                 </span>
               </p>
               <el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
-                v-model="leadr.LeaderGetPriceT"></el-input>
+                v-model="leadr.LeaderGetPriceT" @input="changePrice"></el-input>
             </template>
           </div>
+          <span style="color:red;font-weight:bold;">合团的请分别领款!</span>
         </td>
         <td>
           <p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"
@@ -1055,7 +1055,6 @@
     </div>
   </div>
 </template>
-
 <script>
   import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
   import {
@@ -1131,6 +1130,9 @@
       commonHotelInfo
     },
     methods: {
+      changePrice() {
+        this.$forceUpdate();
+      },
       getTips(x) {
         let title = `付款账号：${x.AccountNumber},原币：${String(x.WBMoney)}`
         let text = []
@@ -1219,7 +1221,6 @@
         let TCIDARR = []
         let id = [];
         if (this.msgList && this.msgList.length > 0 && this.msgList[0].LineId == this.myLineId) {
-
           if (_orderSource === 1 && _type === 2) {
             id = [94]
           } else if (_orderSource === 2 && _type === 2) {
@@ -1232,7 +1233,6 @@
             id = [97]
           }
         } else {
-
           // _orderSource 1 酒店   2餐厅   5 车资
           if (_orderSource === 1 && _type === 2) {
             id = [51, 52, 245, 246, 255]
@@ -1474,7 +1474,7 @@
         if (obj.LineId == this.LineId) {
           id = [98, 99];
         } else {
-          id = [43, 48,56, 53, 245, 246];
+          id = [43, 48, 56, 53, 245, 246];
           // if (obj.OutBranchId === 0) {
           //   id = [43, 48, 245, 246];
           // } else {
@@ -2128,7 +2128,6 @@
         }
         return this.moneyFormat(money)
       },
-
     },
     mounted() {
       this.isUpdate = this.$route.query.isUpdate;
@@ -2346,7 +2345,6 @@
     padding: 10px;
   }
 
-  /* tr._t_head th{border-top: 1px solid #e5e5e5;} */
   tr._item_list td:first-child {
     border-left: 1px solid #e5e5e5;
   }