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

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -933,9 +933,9 @@
 
   .GO_Contract {
     color: blue;
-    display: block;
+    display: inline-block;
     cursor: pointer;
-    max-width: 200px;
+    margin-right:20px;
   }
   .RegistrationList .leftSetInfo,.RegistrationList .GO_TPright{
     float:left;
@@ -1880,6 +1880,7 @@
                         @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="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0">追加团款</div>
                       <div @click='deleteItem(item)'>删除</div>
                     </div>
@@ -1911,8 +1912,16 @@
               <!--                <span>暂无名单</span>-->
               <!--              </p>-->
               <span>房间信息：{{item.OrderGuestHouseStr}}</span>
-              <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)">领取合同</span>
-              <span v-else class="GO_Contract" @click="goContract(item)">{{item.ContractNum}}</span>
+              <div v-if="item.ContractNum.length==0">
+                <span class="GO_Contract" @click="goContract(item,{})">领取合同</span>
+              </div>
+              <div v-else>
+                <span v-for="sItem in item.ContractNum" class="GO_Contract" @click="goContract(item,sItem)">
+                    {{sItem.Client_Name+''+sItem.ContractNum}}
+                </span>
+              </div>
+              <!-- <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)">领取合同</span>
+              <span v-else class="GO_Contract" @click="goContract(item)">{{item.ContractNum}}</span> -->
             </td>
           </tr>
           <tr>
@@ -2182,6 +2191,7 @@
                           @click='EwMsg.OrderId = childItem.OrderId, EwMsg.ExtraRewardMoney = childItem.ExtraRewardMoney,EwMsg.ExtraDeductMoney=childItem.ExtraDeductMoney, OrderMoneyDialog = true'>
                           设置额外金额</div>
                         <div @click="SetShouSunClick(childItem.OrderId, childItem.GuestNum)">设置收损金额</div>
+                        <div v-if="childItem.IsChargeLossOrders==1" @click="setChargeLoss(childItem)">恢复收损单</div>
                         <div @click="lianyunFY(childItem)">联运返佣</div>
                         <div @click="ZhuiJiaTuanKuan(childItem.OrderId)" v-if="RBBranchId == 0">追加团款</div>
                         <div @click="importNameOrder(childItem.OrderId)" v-if="OrderDataList.OtherOrderList.length == 1 && subItem.List.length == 1">导入旅客名单</div>
@@ -2246,8 +2256,14 @@
                       style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId"
                       :key="i">{{id}}</span>
                   </span>
-                  <span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)">领取合同</span>
-                  <span v-else class="GO_Contract" @click="goContract(childItem)">{{childItem.ContractNum}}</span>
+                  <div v-if="childItem.ContractNum.length==0">
+                    <span class="GO_Contract" @click="goContract(childItem,{})">领取合同</span>
+                  </div>
+                  <div v-else>
+                    <span v-for="sItem in childItem.ContractNum" class="GO_Contract" @click="goContract(childItem,sItem)">
+                        {{sItem.Client_Name+''+sItem.ContractNum}}
+                    </span>
+                  </div>
                 </div>
               </td>
             </tr>
@@ -2554,6 +2570,8 @@
                         @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="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0">追加团款</div>
                       <div @click="importNameOrder(item.OrderId)">导入旅客名单</div>
                       <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
@@ -3426,6 +3444,33 @@
       commonShouSun: commonShouSun
     },
     methods: {
+      setChargeLoss(obj){
+        console.log("obj",obj)
+        this.$confirm("确定恢复收损单", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            this.apipost(
+              "sellorder_post_RemoveChargeLossOrders", {
+                OrderId: obj.OrderId
+              },
+              res => {
+                if (res.data.resultCode == 1) {
+                  this.$message.success("操作成功！");
+                  this.getList();
+                } else {
+                  this.$message.error(res.data.message);
+                }
+              },
+              err => {}
+            );
+          })
+          .catch(() => {
+            this.$message.info("取消！");
+          });
+      },
       //上传
       handleAvatarSuccess(res, file) {
         if (res.resultCode == 1) {
@@ -5305,28 +5350,29 @@
 
       },
       //跳转至领取合同
-      goContract(item) {
-        if (item.ContractNum) {
-          let routeData = this.$router.resolve({
-            name: 'TravelContractDetail',
-            query: {
-              TCID: item.TCID,
-              orderID: item.OrderId,
-              blank: 'y'
-            }
-          })
-          window.open(routeData.href, '_blank')
-        } else {
+      goContract(item,sItem) {
+        // if (item.ContractNum) {
+        //   let routeData = this.$router.resolve({
+        //     name: 'TravelContractDetail',
+        //     query: {
+        //       TCID: item.TCID,
+        //       orderID: item.OrderId,
+        //       blank: 'y'
+        //     }
+        //   })
+        //   window.open(routeData.href, '_blank')
+        // } else {
           let routeData = this.$router.resolve({
             name: 'TravelContractNew',
             query: {
               TCID: item.TCID,
+              guestId:sItem.GuestId,
               orderID: item.OrderId,
               blank: 'y'
             }
           })
           window.open(routeData.href, '_blank')
-        }
+        // }
       },
       Discount(TCID) {
         this.SpecialOffer = true