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

src/components/SalesModule/groupTourOrder.vue

@@ -1787,7 +1787,7 @@
                         @click='getHouse(item)'>修改房型
                       </div>
                        <div v-if="item.isOrder=='1'&&item.orderState!='4' && TransferMission ==true" @click="transfer(item)">订单转团</div>
-                      <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')"
+                      <div v-if="item.orderState=='1'||item.orderState=='2'"
                         @click='setChargeLoss(item)'>
                         <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
                         <span v-else>设为收损单</span>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2083,7 +2083,7 @@
                         <div
                           v-if='item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0)'
                           @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>申请发票</div>
-                        <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')"
+                        <div v-if="item.orderState=='1'||item.orderState=='2'"
                           @click='setChargeLoss(item)'>
                           <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
                           <span v-else>设为收损单</span>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1755,7 +1755,7 @@
                       <div v-if="OrderDataList.IsUpdateOrderCommission"
                         @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
                         设置额外金额</div>
-                      <div @click="SetShouSunClick(item.OrderId, item.GuestNum)">设置收损金额</div>
+                      <div @click="SetShouSunClick(item.OrderId,item.GuestNum)">设置收损金额</div>
                       <div @click="ZhuiJiaTuanKuan(item.OrderId)">追加团款</div>
                       <div @click='deleteItem(item)'>删除</div>
                     </div>
@@ -2044,7 +2044,7 @@
                         <div v-if="OrderDataList.IsUpdateOrderCommission"
                           @click='EwMsg.OrderId = childItem.OrderId, EwMsg.ExtraRewardMoney = childItem.ExtraRewardMoney,EwMsg.ExtraDeductMoney=childItem.ExtraDeductMoney, OrderMoneyDialog = true'>
                           设置额外金额</div>
-                        <div @click="SetShouSunClick(childItem.OrderId, item.GuestNum)">设置收损金额</div>
+                        <div @click="SetShouSunClick(childItem.OrderId, childItem.GuestNum)">设置收损金额</div>
                         <div @click="lianyunFY(childItem)">联运返佣</div>
                         <div @click="ZhuiJiaTuanKuan(childItem.OrderId)">追加团款</div>
                         <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"