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

src/components/SalesModule/groupTourOrder.vue

@@ -1355,8 +1355,8 @@
                     <div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" @click='getHouse(item)'>修改房型</div>
                     <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</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>
+                      <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
+                      <span v-else>设为收损单</span>
                     </div>
 										<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
                     

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1570,9 +1570,11 @@
                       <div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" @click='getHouse(item)'>修改房型</div>
                       <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  @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate, 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>
+                        <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
+                        <span v-else>设为收损单</span>
                       </div>
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
                     </div>
@@ -1945,6 +1947,20 @@
           <button class="normalBtn" type="primary" @click="TransferDocuments">{{$t('pub.saveBtn')}}</button>
           <button class="hollowFixedBtn" @click="initOPRemarkMsg">{{$t('pub.cancelBtn')}}</button>
         </div>
+      </el-dialog>
+      <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-input placeholder="请输入" v-model="TCMsg.CommissionMinusRate" @keyup.native="maxCommissionMinusRate">
+              <template slot="append">%</template>
+            </el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <button class="normalBtn" type="primary" @click="submitTCMsg">{{$t('pub.saveBtn')}}</button>
+          <button class="hollowFixedBtn" @click="initTCMsg">{{$t('pub.cancelBtn')}}</button>
+        </div>
       </el-dialog>
 	</div>	
 </template>
@@ -1962,6 +1978,11 @@ export default {
         OP_Remarks: '',
       },
       zhuanLoading: false,
+      TiChengLoading: false,
+      TCMsg: {
+        OrderId: 0,
+        CommissionMinusRate: 0,
+      },
     	checkedObj:{},
     	positionId:0,
       pickerOptions0: {
@@ -2235,7 +2256,7 @@ export default {
       subInfo:{
         CreateBy:'',
         OrderId:0
-      }
+      },
     };
   },
   components: {
@@ -2259,6 +2280,32 @@ export default {
     }
   },
   methods: {
+    maxCommissionMinusRate: function () {
+      this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
+      this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
+      if (this.TCMsg.CommissionMinusRate > 100) {
+        this.TCMsg.CommissionMinusRate = 100
+      }
+    },
+    submitTCMsg: function () {
+      this.apipost('sellorder_post_SetOrderCommission', this.TCMsg, res=>{
+        if (res.data.resultCode == 1) {
+          this.$message.success(res.data.message)
+          this.getList()
+          this.initTCMsg()
+          this.TiChengLoading = false
+        } else {
+          this.$message.error(res.data.message);
+        }
+      }, null)
+    },
+    initTCMsg: function () {
+      this.TiChengLoading = false
+      this.TCMsg = {
+        OrderId: 0,
+        CommissionMinusRate: 0,
+      }
+    },
     TransferDocuments: function () {
       this.apipost('sellorder_get_SetOrderOPRemarks', this.OPRemarkMsg, res=>{
         if (res.data.resultCode == 1) {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1476,6 +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  @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, 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;'
@@ -1658,6 +1659,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  @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
                         <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
                           @click='deleteItem(childItem)'>
                           删除
@@ -1876,6 +1878,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  @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, 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;'
@@ -2082,6 +2085,20 @@
     <el-dialog custom-class='w450' title="行程下载" :visible.sync="travelControlTripLayerShow" center>
       <tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj"   @headCallBack="hideTripDown" :downType="2"></tripDownLoadCommon>
     </el-dialog>
+    <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-input placeholder="请输入" v-model="TCMsg.CommissionMinusRate" @keyup.native="maxCommissionMinusRate">
+              <template slot="append">%</template>
+            </el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <button class="normalBtn" type="primary" @click="submitTCMsg">{{$t('pub.saveBtn')}}</button>
+          <button class="hollowFixedBtn" @click="initTCMsg">{{$t('pub.cancelBtn')}}</button>
+        </div>
+      </el-dialog>
   </div>
 </template>
 
@@ -2107,6 +2124,11 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
         OrderId: '',
         OP_Remarks: '',
       },
+      TiChengLoading: false,
+      TCMsg: {
+        OrderId: 0,
+        CommissionMinusRate: 0,
+      },
       zhuanLoading: false,
         notUpdate: true,
         //是否显示操作按钮
@@ -2439,6 +2461,33 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
       updateSalesMan:updateSalesMan
   },
     methods: {
+      maxCommissionMinusRate: function () {
+        this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
+        this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
+        if (this.TCMsg.CommissionMinusRate > 100) {
+          this.TCMsg.CommissionMinusRate = 100
+        }
+        this.$forceUpdate()
+      },
+      submitTCMsg: function () {
+        this.apipost('sellorder_post_SetOrderCommission', this.TCMsg, res=>{
+          if (res.data.resultCode == 1) {
+            this.$message.success(res.data.message)
+            this.getList()
+            this.initTCMsg()
+            this.TiChengLoading = false
+          } else {
+            this.$message.error(res.data.message);
+          }
+        }, null)
+      },
+      initTCMsg: function () {
+        this.TiChengLoading = false
+        this.TCMsg = {
+          OrderId: 0,
+          CommissionMinusRate: 0,
+        }
+      },
       goUrlSFD: function (path, name, item) {
         let obj = JSON.parse(JSON.stringify(item))
         obj.oP_Remarks = ''