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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -23,7 +23,7 @@
         <td>{{NewCombinationNum}}</td>
         <td>{{item.FlightDate}}</td>
         <td>{{item.DayNum}}天</td>
-        <td>{{item.GuestNum}}人</td>
+        <td>{{item.GuestNum}}+{{item.LeaderOrderNum}}人</td>
         <td>{{item.LeaderName}}</td>
         <td>{{item.GuideName}}</td>
         <td>

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -65,6 +65,17 @@
     text-align: center;
     margin: 10px;
   }
+ .PassengerList .disClick {
+    background-color: #d1d1d1;
+    color: #fff;
+    border: 1px solid #d1d1d1;
+  }
+ .PassengerList .disClick:hover {
+    background-color: #d1d1d1 !important;
+    cursor: default !important;
+    box-shadow: none !important;
+  }
+
 
 </style>
 
@@ -136,11 +147,17 @@
             </el-select>
           </td>
           <td>
-            <el-select v-model="subItem.HouseType" placeholder="请选择" @change="changeRmType(subItem, subIndex)" v-if="subItem.IsLeaderOrder==1">
+            <!-- <el-select v-model="subItem.HouseType" placeholder="请选择" @change="changeRmType(subItem, subIndex)" v-if="subItem.IsLeaderOrder==1">
               <el-option :disabled="(subItem.HouseType == 1 && IsLeaderGuide == 1) || allDIs"
                 v-for="(hs, hsIndex) in HouseTypeList" :key="hsIndex" :label="hs.HouseName" :value="hs.HouseType">
               </el-option>
+            </el-select> -->
+            <el-select v-model="subItem.HouseType" placeholder="请选择" @change="changeRmType1(subItem, subIndex,subItem.HouseType)" v-if="subItem.IsLeaderOrder==1">
+              <el-option :disabled="(hs.disabled && IsLeaderGuide == 1) || allDIs"
+                v-for="(hs, hsIndex) in HouseTypeList" :key="hsIndex" :label="hs.HouseName" :value="hs.HouseType">
+              </el-option>
             </el-select>
+
             <el-select v-model="subItem.HouseType" placeholder="请选择" @change="changeRmType(subItem, subIndex)" v-else>
               <el-option :disabled="(subItem.HouseType == 1 && IsLeaderGuide == 1) || allDIs"
                 v-for="(hs, hsIndex) in LeaderHouseList" :key="hsIndex" :label="hs.HouseName" :value="hs.HouseType">
@@ -170,8 +187,9 @@
           <td>{{subItem.VisaTypeStr}} {{subItem.VisaTypeStr==1?'拒签':"正常"}}</td>
         </tr>
         <tr v-if="!allDIs" style="height:50px; line-height:50px;">
-          <td style="text-align:right" colspan="23"><input type="button" value="保存" class="leader2Btn"
-              @click="saveOPSetGuestHouse"></td>
+          <td style="text-align:right" colspan="23">
+            <input type="button" value="保存" :class="{'disClick':!isSubmit}" class="leader2Btn" @click="saveOPSetGuestHouse">
+          </td>
         </tr>
       </tbody>
       <!--单机票和自由行-->
@@ -245,7 +263,11 @@
         numberList: [],
         dataList: [],
         otherList: [], //单机票和自由行列表
+        //只有两个项、
+        twoList:[],
         allDIs: false,
+        //验证重复提交
+        isSubmit: true,
       };
     },
     methods: {
@@ -266,6 +288,26 @@
           err => {}
         );
       },
+      // 修改类型1
+      changeRmType1: function (obj, index,type) {
+        if(type==1||type==6){
+          this.HouseTypeList.forEach((x,index)=>{
+            if(index!=0&&index!=5){
+              x.disabled=true
+            }
+          })
+        }
+        let list = this.dataList;
+        for (let i = 0; i < list.length; i++) {
+          if (obj.HouseNo === list[i].HouseNo) {
+            list[i].HouseType = obj.HouseType
+            list[i].SingleRoomType = obj.HouseType
+          }
+        }
+        list = list.sort(this.compare)
+        this.dataList = list;
+      },
+
       // 修改类型
       changeRmType: function (obj, index) {
         let list = this.dataList;
@@ -304,19 +346,23 @@
       },
       //保存分房
       saveOPSetGuestHouse: function () {
+        if (this.isSubmit) {
+          this.isSubmit = false;
           this.apipost(
             "travel_get_OPSetGuestHouse",
             this.dataList,
             res => {
+              this.isSubmit = true;
               if (res.data.resultCode == 1) {
-              this.$message.success('操作成功')
+                this.Success('操作成功')
                 this.getList()
               } else {
-              this.$message.error('操作失败')
+                this.Error('操作失败')
               }
             },
             err => {}
           );
+        }
       },
       goUrlTravelControl(name, path, id, tcmun) {
         this.$router.push({
@@ -367,12 +413,16 @@
             this.QueryMsg.loading = false;
             if (res.data.resultCode == 1) {
               this.HouseTypeList = res.data.data;
-              console.log(this.HouseTypeList,'houseType');
               this.LeaderHouseList=[];
+              this.twoList=[];
               this.HouseTypeList.forEach(x=>{
+                x.disabled=false;
                 if(x.HouseType!=6){
                   this.LeaderHouseList.push(x)
                 }
+                if(x.HouseType==1||x.HouseType==6){
+                  this.twoList.push(x);
+                }
               })
             }
           },
@@ -434,7 +484,6 @@
               }
               this.dataList = list
               this.numberList = numberList
-              console.log(this.dataList,'datalist');
             }
           },
           err => {}