确认清位

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1400,14 +1400,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="是否清位">
-              <el-select v-model='addMsg.IsCanClear' :placeholder="$t('pub.pleaseSel')">
-                <el-option label='可清位' :value='0' :key='0'></el-option>
-                <el-option label='不可清位' :value='1' :key='1'></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="4">
@@ -2007,9 +1999,17 @@
                 </div>
               </td>
               <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
-                <div class="clearfix RL-MARK">
+                <div class="clearfix RL-MARK" style="width:75%;float:left;">
                   <span class="RL-opremarkTitle">OP备注:</span>
-                  <span class="RL-redType RL-remarkCon">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
+                  <span class="RL-redType RL-remarkCon" style="width:80%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
+                </div>
+                <div style="float:right;" v-if="childItem.IsCanClear==0">
+                    <input type="button" value="确认订单" class="normalBtn" @click="clearSeat(childItem,1)" style="display:block;"/>
+                    <div style="width:85px;color:red;">该订单未确认会被系统自动清位</div>
+                </div>
+                <div style="float:right;" v-else>
+                    <input type="button" value="取消订单" class="normalBtn" @click="clearSeat(childItem,2)" style="display:block;"/>
+                    <div style="width:85px;color:red;text-align:left;">该订单已确认不会被系统清位</div>
                 </div>
               </td>
               <td colspan="5" style="height: 40px;cursor: pointer;"
@@ -2776,7 +2776,6 @@
           //订单归属【HK新加，报名清单页面修改使用】
           CreateBy: 0,
           RefuseVisaNum:0,//拒签人数
-          IsCanClear:0  //是否可清位
         },
         //行程下载使用
         travelControlTripLayerShow: false,
@@ -3118,7 +3117,6 @@
               this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
               this.addMsg.BabyNum = x.BabyNum.toString();
               this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
-              this.addMsg.IsCanClear=x.IsCanClear;
 
               this.IsChildrenTour = x.IsChildrenTour;
               this.IsBirdDiscount = x.IsBirdDiscount;
@@ -4307,6 +4305,7 @@
             if (res.data.resultCode == 1) {
               this.OrderDataList = res.data.data;
               this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
+              console.log(this.OrderDataList,'orderdatalist');
             }
           },
           err => {}
@@ -4726,6 +4725,40 @@
       closeSalseDiv() {
         this.showChangeSales = false;
       },
+      //清位
+      clearSeat(item,type){
+        if(type==1){
+          let msg = {
+            IsCanClear:1,
+            OrderId:item.OrderId
+          }
+          this.apipost('sellorder_post_SetOrderIsCanClear',msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message)
+              this.getList();
+            } else {
+              this.Error(res.data.message)
+            }
+          },
+          err => {})
+        }else{
+          let msg = {
+            IsCanClear:0,
+            OrderId:item.OrderId
+          }
+          this.apipost('sellorder_post_SetOrderIsCanClear',msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message)
+              this.getList();
+            } else {
+              this.Error(res.data.message)
+            }
+          },
+          err => {})
+        }
+      }
     },
     mounted() {
       let userInfo = this.getLocalStorage();