页面优化

src/components/Hotel/HotelProductManage2.vue

@@ -187,7 +187,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="单间成本价" prop="SingleroomPrice">
+            <el-form-item label="自然单间成本价" prop="SingleroomPrice">
               <el-input-number v-model="msg2.SingleroomPrice" :precision="2" :min="0"></el-input-number>
             </el-form-item>
           </el-col>
@@ -424,7 +424,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="单间成本价" prop="SingleroomPrice">
+            <el-form-item label="自然单间成本价" prop="SingleroomPrice">
               <el-input-number v-model="msg.SingleroomPrice" :precision="2" :min="0"></el-input-number>
             </el-form-item>
           </el-col>

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -88,7 +88,16 @@
         <tr v-for="(subItem,subIndex) in item" :class="{'redTr':subItem.VisaState==1}">
           <td v-if="subIndex==0" :rowspan="subItem.RowsCount">{{index+1}}</td>
           <td v-if="subIndex==0" :rowspan="subItem.RowsCount"></td>
-          <td>{{getHouseTypeStr(subItem)}}</td>        
+          <td>
+            <!--自然单间   指定单间（单房差）-->
+            <template v-if="subItem.SingleRoomType==subItem.HouseType">
+               {{getHouseTypeStr(subItem.HouseType)}} 
+            </template>
+            <template v-else>
+              {{getHouseTypeStr(subItem.SingleRoomType)}} <br/><span style="color:red;">(指定)</span>
+            </template>
+            <template v-if="subItem.IsBed==0"><br/><span style="color:red;">(不占床)</span></template>
+          </td>        
           <td>{{subItem.GuestName}}</td>
           <td>{{subItem.ESurName}}</td>
           <td>{{subItem.EName}}</td>
@@ -126,6 +135,8 @@ export default {
         OrderId: 0,
         currentPage: 1
       },
+      IsHaveLeader:1,//1-有领队,0-无领队
+      IsLeaderGuide:0,//1-领兼导,0-领队
       TCID: 0,
       QueryMsg: {
         loading: true,
@@ -162,19 +173,19 @@ export default {
       return str;
     },
     //获取房间类型
-    getHouseTypeStr(item) {
+    getHouseTypeStr(HouseType) {
       var str = "";
-      if (item.HouseType == 1) {
-        str = "单间";
-      } else if (item.HouseType == 2) {
+      if (HouseType == 1) {
+        str = "自然单间";
+      } else if (HouseType == 2) {
         str = "标准双人间";
-      } else if (item.HouseType == 3) {
+      } else if (HouseType == 3) {
         str = "大床房";
       } 
-      else if (item.HouseType == 4) {
+      else if (HouseType == 4) {
         str = "三人间";
       } 
-      else if (item.HouseType== 5) {
+      else if (HouseType== 5) {
         str = "拼凑双人间";
       } 
       else {
@@ -190,8 +201,11 @@ export default {
         this.msg,
         res => {
           this.QueryMsg.loading = false;
+          console.log(res.data.data);
           if (res.data.resultCode == 1) {
-            this.QueryMsg.dataList = res.data.data.pageData;
+            this.QueryMsg.dataList = res.data.data.pageData.result;
+            this.IsHaveLeader=res.data.data.pageData.IsHaveLeader;
+            this.IsLeaderGuide=res.data.data.pageData.IsLeaderGuide;
           }
         },
         err => {}