增加额外金额

src/components/SalesModule/enrollTotal.vue

@@ -209,8 +209,16 @@
           <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
           <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
           <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
-          <div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
-          <div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额：<span style="color:#e95252">{{item.extraDeductMoney}}</span></div>
+          <div>
+                  <div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
+                    <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
+                    <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
+                </div>
+                <div style="color:red" v-else>
+                    <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
+                  <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
+                </div>
+            </div>
         </td>
         <td>
           <p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>

src/components/SalesModule/groupTourOrder.vue

@@ -1532,6 +1532,16 @@
               <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
               <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
               <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
+              <div>
+                    <div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
+                      <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
+                      <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
+                  </div>
+                  <div style="color:red" v-else>
+                      <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
+                    <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
+                  </div>
+              </div>
             </td>
             <td>
               <p class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1671,6 +1671,16 @@
                   <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
                   <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
                 </template>
+                <div>
+                  <div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
+                    <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
+                    <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
+                </div>
+                <div style="color:red" v-else>
+                    <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
+                  <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
+                </div>
+            </div>
               </td>
               <td>
                 <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder'

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1805,6 +1805,17 @@
                 <p v-if='childItem.CommissionMoney' style="color:red">提成：{{childItem.CommissionMoney}}</p>
                 <p v-else-if="childItem.LatestCommissionMoney" style="color:red">提成：{{childItem.LatestCommissionMoney}}
                 </p>
+                <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>
+                  </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>
+                
               </td>
               <td>
                 <p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;"
@@ -3248,7 +3259,6 @@
       },
       // 点击弹出下拉框
       getDetail(obj) {
-        console.log(obj)
         this.Ysze = false;
         this.starTime = obj.StartDate;
         this.endTime = obj.BackDate;
@@ -3846,7 +3856,6 @@
         }
       },
       getTotalPrice(t) {
-        console.log(t)
         if (t === 3) {
           if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
             this.$message.error('请输入正确的价格！')
@@ -4504,7 +4513,6 @@
           "sellorder_get_GetOrderListByTCID",
           msg,
           res => {
-            console.log("111",res);
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.OrderDataList = res.data.data;

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -222,6 +222,19 @@
             <p class="fz12 over_ellipsis">下单时间：{{item.createDate}}</p>
             <p class="fz12 over_ellipsis" style="width: 100%;">
               {{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
+              <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+              <p v-else-if="item.commissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}
+                </p>
+            <div>
+                  <div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
+                    <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
+                    <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
+                </div>
+                <div style="color:red" v-else>
+                    <p v-if="item.extraRewardMoney>0">额外奖励金额：{{item.extraRewardMoney}}</p>
+                  <p v-if="item.extraDeductMoney>0">额外扣除金额：{{item.extraDeductMoney}}</p>
+                </div>
+            </div>
           </td>
           <td>
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>