提成

src/components/SalesModule/enrollTotal.vue

@@ -180,6 +180,7 @@
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
             <p>发团：{{item.startDate}}</p>
             <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+            <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
           </td>
           <td>
             <p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>

src/components/SalesModule/groupTourOrder.vue

@@ -1223,6 +1223,7 @@
             <p style="min-width: 180px;">发团：{{item.startDate}}</p>
             <p>下单时间：{{item.createDate}}</p>
             <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+            <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
           </td>
           <td>
 						<p class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1415,6 +1415,7 @@
               <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
               <p>下单时间：{{item.createDate}}</p>
               <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+              <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
             </td>
             <td>
               <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder' class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
@@ -1572,7 +1573,7 @@
                       <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
                       <div v-if="isUpdateOrder" @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注</div>
                       <!-- v-if="item.isUpdateOrderCommission" -->
-                      <div v-if="isUpdateOrderCommission" @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="isUpdateOrderCommission" @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate,TCMsg.LatestCommissionMoney=item.latestCommissionMoney, TiChengLoading = true'>修改提成</div>
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')" @click='setChargeLoss(item)'>
                         <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
                         <span v-else>设为收损单</span>
@@ -1953,10 +1954,14 @@
       <el-dialog custom-class='w350' title="修改提成" :visible.sync="TiChengLoading" center :before-close="initTCMsg">
         <!--zhaunMsg.TCNUM-->
         <el-form label-width="110px">
-          <el-form-item label="扣除提成比例：" class="w280">
+          <!-- <el-form-item label="扣除提成比例：" class="w280">
             <el-input placeholder="请输入" v-model="TCMsg.CommissionMinusRate" @keyup.native="maxCommissionMinusRate">
               <template slot="append">%</template>
             </el-input>
+          </el-form-item> -->
+          <el-form-item label="提成金额：" class="w280">
+            <el-input placeholder="请输入" type="number" v-model="TCMsg.LatestCommissionMoney" >
+            </el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -1984,6 +1989,7 @@ export default {
       TCMsg: {
         OrderId: 0,
         CommissionMinusRate: 0,
+        LatestCommissionMoney: '',
       },
     	checkedObj:{},
     	positionId:0,
@@ -2307,6 +2313,7 @@ export default {
       this.TCMsg = {
         OrderId: 0,
         CommissionMinusRate: 0,
+        LatestCommissionMoney:''
       }
     },
     TransferDocuments: function () {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1476,7 +1476,7 @@
                       <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
-                      <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate,TCMsg.LatestCommissionMoney=item.LatestCommissionMoney, TiChengLoading = true'>修改提成</div>
                       <div @click='deleteItem(item)'>删除</div>
                     </div>
                     <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
@@ -1545,6 +1545,7 @@
                 <!-- <p>发团：{{childItem.startDate}}</p> -->
                 <p>下单时间：{{childItem.CreateDate}}</p>
                 <p v-if='childItem.CommissionMoney' style="color:red">提成：{{childItem.CommissionMoney}}</p>
+                <p v-else-if="childItem.LatestCommissionMoney" style="color:red">提成：{{childItem.LatestCommissionMoney}}</p>
               </td>
               <td>
                 <p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;" :title="childItem.ContactName">
@@ -1661,7 +1662,7 @@
                         <div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div>
                         <div @click="transfer(childItem)">订单转团</div>
                         <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId'>OP备注</div>
-                        <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                        <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate,TCMsg.LatestCommissionMoney=childItem.LatestCommissionMoney, TiChengLoading = true'>修改提成</div>
                         <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
                           @click='deleteItem(childItem)'>
                           删除
@@ -1881,7 +1882,7 @@
                       <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
-                      <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate,TCMsg.LatestCommissionMoney=item.LatestCommissionMoney, TiChengLoading = true'>修改提成</div>
                       <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
                     </div>
                     <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
@@ -2092,10 +2093,14 @@
     <el-dialog custom-class='w350' title="修改提成" :visible.sync="TiChengLoading" center :before-close="initTCMsg">
         <!--zhaunMsg.TCNUM-->
         <el-form label-width="110px">
-          <el-form-item label="扣除提成比例：" class="w280">
+          <!-- <el-form-item label="扣除提成比例：" class="w280">
             <el-input placeholder="请输入" v-model="TCMsg.CommissionMinusRate" @keyup.native="maxCommissionMinusRate">
               <template slot="append">%</template>
             </el-input>
+          </el-form-item> -->
+          <el-form-item label="提成金额：" class="w280">
+            <el-input placeholder="请输入" type="number" v-model="TCMsg.LatestCommissionMoney">
+            </el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -2132,6 +2137,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
       TCMsg: {
         OrderId: 0,
         CommissionMinusRate: 0,
+        LatestCommissionMoney:''
       },
       zhuanLoading: false,
         notUpdate: true,
@@ -2490,6 +2496,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
         this.TCMsg = {
           OrderId: 0,
           CommissionMinusRate: 0,
+          LatestCommissionMoney:''
         }
       },
       goUrlSFD: function (path, name, item) {