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

src/components/SalesModule/groupTourOrder.vue

@@ -3779,7 +3779,6 @@
           this.ScenicRefundMoney = 0;
           this.addMsg.ScenicRefundArr.forEach((x) => {
            var index=this.ScenicRefundList.findIndex(item=>item.Id===x.Id);
-             console.log(index,"x",x);
            if(index!=-1){
             var nowModel=this.ScenicRefundList[index];
             nowModel.Number=x.Number;

src/components/SalesModule/passengerSaleList.vue

 <template>
+<!-- border-top: 1px solid #cccccc;margin-top: 5px -->
   <div class="passengerSaleList">
-    <div class="passengerSaleList_topBtn">
+    
+     <div v-if="OrderBackScenicList!=null&&OrderBackScenicList.length>0 " style="width: 70%;font-size:14px;float:left;margin-bottom: 10px;">
+          
+               <el-collapse accordion v-model="activeName">   
+                <el-collapse-item  name="1">
+                 <template slot="title" > &nbsp;&nbsp;{{$t('ground.tuiJingdian')}}<i class="header-icon el-icon-info"></i> </template>
+                    <div style="margin:0px 10px;">
+                                <span v-for="(childItem,subIndex) in OrderBackScenicList" >
+                                  <font style="color:green;">{{subIndex+1}}、{{ childItem.CouponsName }}</font>退票<font style="color:red;">{{childItem.Number}}</font>人：<font style="color: blue">{{childItem.GuestBackScenicName}}</font>
+                                &nbsp;&nbsp; &nbsp;&nbsp;
+                                </span></div>
+                  </el-collapse-item>
+             </el-collapse >
+     </div>
+    <div class="passengerSaleList_topBtn" style="width: 30%;float:right;margin-bottom: 10px;">
       <template v-if="isOrder==0">
         <span style="color:red;">{{$t('objFill.opygbddcz')}}</span>
       </template>
@@ -13,6 +28,7 @@
       <div v-if="isOrder==1 && isOneDay !== 1 && !isDis" @click="goUrlP()">{{$t('op.Fenfang')}}</div>
     </div>
     <div class="passengerSaleList_tableBox">
+      
       <table class="passengerSaleList_table" border="0" cellspacing="0" cellpadding="0" :loading="loading">
         <thead>
           <tr>
@@ -75,6 +91,12 @@
                     <el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3'
                       icon="iconfont icon-img_download" @click="goUrlB(item.Id)"></el-button>
                   </el-tooltip>
+                  <el-tooltip v-if="OrderBackScenicList!=null&&OrderBackScenicList.length>0 " class="item" effect="dark" :content="$t('ground.tuiJingdian')"
+                    placement="top-start">
+                     <el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3'
+                      icon="iconfont el-icon-notebook-2" @click="updateGuestBackScenic(item)"></el-button>
+                  </el-tooltip>
+                  </el-tooltip>
                 </el-button-group>
               </td>
             </tr>
@@ -157,6 +179,28 @@
 
       </div>
     </div>
+    <el-dialog custom-class="w450" :title="$t('sm.exitsure')" :visible.sync="isShowOpSure" center style="padding:25px 25px 55px;">
+      <el-form label-width="110px">
+        <el-form-item :label="$t('ground.tuiJingdian')">
+         <el-select v-model="UpdateGuestBackScenic.CouponsIds" multiple collapse-tags placeholder="请选择">
+          <el-option
+            v-for="item in OrderBackScenicList"
+            :key="item.CouponsId"
+            :label="item.CouponsName"
+            :value="item.CouponsId">
+          </el-option>
+        </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <button class="normalBtn" type="primary" @click="opSureAudit" :loading="isSubmit">
+          {{ $t("pub.saveBtn") }}
+        </button>
+        <button class="hollowFixedBtn" @click="GBGuestBackScenic()">
+          {{ $t("pub.cancelBtn") }}
+        </button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -165,6 +209,9 @@
     data() {
       return {
         loading: false,
+        isShowOpSure:false,
+        activeName:"1",
+        UpdateGuestBackScenic:{Id:0,CouponsIds:[]},
         msg: {
           id: '0',
           tcid: '0',
@@ -178,6 +225,7 @@
         guestNum: 0,
         isOrder: 0,
         tableList: [],
+        OrderBackScenicList:[],
         isOneDay: 0,
         LineId: 0,
         EndDateStr: "",
@@ -219,6 +267,35 @@
       };
     },
     methods: {
+      opSureAudit(){
+         this.isSubmit = false;
+          this.apipost(
+            "sellorder_post_UpdateGuestBackScenic",
+            this.UpdateGuestBackScenic,
+            (res) => {
+              this.isSubmit = true;
+              if (res.data.resultCode == 1) {
+                this.Success(res.data.message);
+                this.GBGuestBackScenic();
+                this.getData();
+              } else {
+                this.Error(res.data.message);
+              }
+               this.isSubmit = false;
+            },
+            (err) => {}
+          );
+      },
+      updateGuestBackScenic(item){
+        this.UpdateGuestBackScenic.CouponsIds=item.CouponsIds;
+        this.UpdateGuestBackScenic.Id=item.Id;
+        this.isShowOpSure=true;
+      },
+      GBGuestBackScenic(){
+        this.isShowOpSure = false;
+        this.UpdateGuestBackScenic.Id=0;
+        this.UpdateGuestBackScenic.CouponsIds=[];
+      },
       //确定设置领队
       setTheLeader() {
         if (this.isSubmit) {
@@ -308,6 +385,7 @@
           if (res.data.resultCode == 1) {
             this.guestNum = res.data.data.GuestNum;
             this.tableList = res.data.data.list;
+            this.OrderBackScenicList=res.data.data.OrderBackScenicList;
             this.isOneDay = res.data.data.IsOneDay;
             this.LineId = res.data.data.LineId;
             this.EndDateStr = res.data.data.EndDateStr;