1

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -1117,6 +1117,15 @@ export default {
           columnAlign: "left",
           isResize: true
         },
+        {
+          field: "UnionExtraMoney",
+          formatter: this.moneyFormat,
+          title: "额外返佣",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true
+        },
         {
           field: "UnionTiCheng",
           formatter: this.moneyFormat,
@@ -1547,6 +1556,9 @@ export default {
       if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
       if (field === "TransportCost")
         return this.priceFormat(rowData.TransportCost);
+      if(field === "UnionExtraMoney"){
+        return this.priceFormat(rowData.UnionExtraMoney);
+      }
       if (field === "UnionTiCheng")
         return this.priceFormat(rowData.UnionTiCheng);
       if (field === "YingYeE") return this.priceFormat(rowData.YingYeE);

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1457,6 +1457,15 @@ export default {
           columnAlign: "right",
           isResize: true
         },
+        {
+          field: "UnionExtraMoney",
+          formatter: this.moneyFormat,
+          title: "额外返佣",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        },
         {
           field: "UnionTiCheng",
           formatter: this.moneyFormat,
@@ -1999,6 +2008,8 @@ export default {
       if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
       if (field === "TransportCost")
         return this.priceFormat(rowData.TransportCost);
+      if(field === "UnionExtraMoney")
+      return this.priceFormat(rowData.UnionExtraMoney);
         if (field === "UnionTiCheng")
         return this.priceFormat(rowData.UnionTiCheng);
       if (field === "YingYeE") return this.priceFormat(rowData.YingYeE);
@@ -2158,6 +2169,9 @@ export default {
       }
        if(rowData.TransportCost < 0 && columnName=="TransportCost"){
         return "column-cell-class-name-test-red"
+      }
+      if(rowData.UnionExtraMoney<0 && columnName=="UnionExtraMoney"){
+        return "column-cell-class-name-test-red"
       }
        if(rowData.UnionTiCheng < 0 && columnName=="UnionTiCheng"){
         return "column-cell-class-name-test-red"

src/components/SalesModule/enrollTotal.vue

@@ -168,7 +168,7 @@
     <div style="clear: both; width: 100%;height: 20px;"></div>
     <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
       <tr>
-        <th width="130">单号&团号</th>
+        <th width="160">单号&团号</th>
         <th width="60">客户信息</th>
         <th width="70">类型</th>
         <th width="180">系列&线路</th>
@@ -218,6 +218,9 @@
                     <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
                   <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
                 </div>
+                <div style="color:red">
+                  <p v-if="item.unionExtraMoney!=0">联运额外返佣：{{item.unionExtraMoney}}</p>
+                </div>
             </div>
         </td>
         <td>

src/components/SalesModule/groupTourOrder.vue

@@ -1541,6 +1541,9 @@
                       <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
                     <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
                   </div>
+                  <div style="color:red">
+                    <p v-if="item.unionExtraMoney!=0">联运额外返佣：{{item.unionExtraMoney}}</p>
+                  </div>
               </div>
             </td>
             <td>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1680,6 +1680,9 @@
                     <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
                   <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
                 </div>
+                <div style="color:red">
+                  <p v-if="item.unionExtraMoney!=0">联运额外返佣：{{item.unionExtraMoney}}</p>
+                </div>
             </div>
               </td>
               <td>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1808,12 +1808,15 @@
                 <div>
                     <div style="color:green" v-if="childItem.CommissionMoney==''||childItem.CommissionMoney=='-1'">
                       <p v-if="childItem.ExtraRewardMoney>0">额外奖励金额：{{childItem.ExtraRewardMoney}}</p>
-                      <p v-if="childItem.ExtraDeductMoney>0">额外扣除金额：{{childItem.ExtraDeductMoney}}</p>
+                      <p v-if="childItem.ExtraDeductMoney>0">额外扣除金额：{{childItem.ExtraDeductMoney}}</p>                      
                   </div>
                   <div style="color:red" v-else>
                      <p v-if="childItem.ExtraRewardMoney>0">额外奖励金额：{{childItem.ExtraRewardMoney}}</p>
                     <p v-if="childItem.ExtraDeductMoney>0">额外扣除金额：{{childItem.ExtraDeductMoney}}</p>
                   </div>
+                  <div style="color:red">
+                    <p v-if="childItem.UnionExtraMoney!=0">联运额外返佣：{{childItem.UnionExtraMoney}}</p>
+                  </div>
                 </div>
                 
               </td>
@@ -2562,6 +2565,9 @@
         <el-form-item label="是否返佣：" class="w280">
           <el-switch v-model="IsBackStatus" :active-value="0" :inactive-value="1"></el-switch>
         </el-form-item>
+        <el-form-item label="额外返佣金额：" class="w280">
+          <el-input :rows="2" v-model="UnionExtraMoney"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary" @click="FyongLossOk">{{$t('pub.saveBtn')}}</button>
@@ -3147,6 +3153,7 @@
         },
         SuperiorPeople: [],
         IsBackStatus: 1,
+        UnionExtraMoney:0,
         Unit_Price: 0
       };
     },
@@ -3197,7 +3204,8 @@
       FyongLossOk: function () {
         let msg = {
           OrderId: this.lianyunFYId,
-          IsBackStatus: this.IsBackStatus
+          IsBackStatus: this.IsBackStatus,
+          UnionExtraMoney: this.UnionExtraMoney
         }
         this.apipost('sellorder_post_SetOrderUnionBackMoney', msg, res => {
           if (res.data.resultCode === 1) {
@@ -3212,6 +3220,7 @@
       lianyunFY: function (item) {
         this.FyongLoading = true
         this.IsBackStatus = item.IsBackUnionMoney
+        this.UnionExtraMoney = item.UnionExtraMoney
         this.lianyunFYId = item.OrderId
       },
       goIisDetail: function (id) { // 跳转发票详情页面

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -251,6 +251,7 @@
                     </div>
                   </div>
                   <div>联运成本：<span>￥{{DataList.LYCB}}</span></div>
+                  <div>额外返佣：<span>￥{{DataList.EWFY}}</span></div>
               </div>
             </el-col>
             <el-col :span="4">

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -234,6 +234,9 @@
                     <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
                   <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
                 </div>
+                <div style="color:red">
+                  <p v-if="item.unionExtraMoney!=0">联运额外返佣：{{item.unionExtraMoney}}</p>
+                </div>
             </div>
           </td>
           <td>