样式的修改和旅客名单的房间信息增加

src/assets/css/DMC.css

@@ -16,6 +16,7 @@
     margin-top: 30px;
     font-size: 12px;
     min-width: 1200px;
+    overflow-y: auto;
   }
   .changInfo .resource-baseinfo {
     float: left;

src/components/SalesModule/addPassenger.vue

@@ -154,8 +154,8 @@
           </li>
           <li>
             <el-form-item label="性别" prop="Sex">
-              <el-checkbox v-model="addMsg.Sex" true-label='1' false-label='2'>男</el-checkbox>
-              <el-checkbox v-model="addMsg.Sex" true-label='2' false-label='1'>女</el-checkbox>
+              <el-checkbox v-model="addMsg.Sex" true-label='1' false-label='2' @change="Roominformation()">男</el-checkbox>
+              <el-checkbox v-model="addMsg.Sex" true-label='2' false-label='1' @change="Roominformation()">女</el-checkbox>
             </el-form-item>
           </li>
           <li>
@@ -291,8 +291,17 @@
           </li>
           <li>
             <el-form-item label="是否占床">
-              <el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='1' :false-label='0'>是</el-checkbox>
-              <el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='0' :false-label='1'>否</el-checkbox>
+              <el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='1' :false-label='0' @change="Roominformation()">是</el-checkbox>
+              <el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='0' :false-label='1' @change="Roominformation()">否</el-checkbox>
+            </el-form-item>
+          </li>
+          <li>
+            <el-form-item label="房间信息" prop="HouseId">
+              <el-select v-model="addMsg.HouseId" filterable size=mini class="w230">
+                <el-option v-for="item in roomlist" :key="item.ID" :label="item.HouseInfo" :value="item.ID">
+                </el-option>
+              </el-select>
+              <input type="button" value="新增" class="normalBtn" @click="addhouse()" />
             </el-form-item>
           </li>
           <li>
@@ -647,6 +656,7 @@
           VisaReplaceId: "0",
           SafeReplaceId: "0",
           VisaState: 0, //签证状态
+          HouseId:'',//房间信息
         },
         EconomicCapabilityS: [],
         rules: {
@@ -756,7 +766,8 @@
         VisaStartStatus: 2,
         AirStartStatus: 2,
         SafeStartStatus: 2,
-        btnState: true
+        btnState: true,
+        roomlist:[],
       };
     },
     methods: {
@@ -1513,7 +1524,7 @@
           this.addMsg.Marriage = "0";
         }
         this.apipost(
-          "sellorder_post_SetTravelGuestInfo",
+          "sellorder_post_SetTravelGuestInfo_V2",
           this.addMsg,
           res => {
             if (res.data.resultCode == 1) {
@@ -1735,8 +1746,9 @@
               this.AirStartStatus = this.addMsg.IsNeedAirticket;
               this.SafeStartStatus = this.addMsg.IsNeedSafe;
               this.$forceUpdate();
+              this.getHouselist(obj.Sex.toString(),obj.TCID,obj.OrderId,obj.IsBed)
             } else {
-              this.$message.error(res.data.message);
+              this.$message.error();
             }
           },
           err => {}
@@ -1841,8 +1853,59 @@
           this.addMsg.PassportAddress = "湖南";
         }
         this.addMsg.IssuingAuthority = "公安部出入境管理局";
+      },
+      Roominformation(){
+        let TCIDs = this.addMsg.TCID;
+        let OrderId = this.addMsg.OrderId;
+        let IsBed = this.addMsg.IsBed;
+        let Sex = this.addMsg.Sex;
+        this.apipost(
+          "sellorder_post_GetHouseDetailsByOrderID",
+          {TCIDs:TCIDs,OrderId:OrderId,Sex:Sex,IsBed:IsBed},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.roomlist = res.data.data;
+            } else {
+              this.$message.error(res.data.message);
+            }
+          },
+          err => {}
+        );
+      },
+      getHouselist(Sex,TCID,OrderId,IsBed){
+          if(Sex ==1 || Sex == 2){
+            this.apipost(
+              "sellorder_post_GetHouseDetailsByOrderID",
+              {TCIDs:TCID,OrderId:OrderId,Sex:Sex,IsBed:IsBed},
+              res => {
+                if (res.data.resultCode == 1) {
+                  this.roomlist = res.data.data;
+                } else {
+                  this.$message.error(res.data.message);
+                }
+              },
+              err => {}
+            );
           }
       },
+      addhouse(){
+        let orderId = this.addMsg.OrderId;
+        let sex = this.addMsg.Sex;
+        this.apipost(
+          "sellorder_get_BatchSetOrderHouse_V2",
+          {orderId:orderId,sex:sex,},
+          res => {
+            if (res.data.resultCode == 1) {
+                this.Roominformation()
+            } else {
+              this.$message.error(res.data.message);
+            }
+          },
+          err => {}
+        );
+      },
+
+    },
     mounted() {
       this.getCountry();
       this.getMarriageType();

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2012,14 +2012,14 @@
                 <div>
                   <span>发票单据：</span>
                   <span v-for="(item2,index2) in childItem.InvoiceApplyList" :key="index2">
-                    <span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue"
-                      @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                    <span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3"
-                      class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                    <span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 "
-                      class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                    <span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
-                      @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                    <span v-if="item2.InvoiceApplyState === 6" class="groupTourOrder_tickets_blue"
+                      @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
+                    <span v-else-if="item2.InvoiceApplyState === 1 || item2.InvoiceApplyState === 3"
+                      class="groupTourOrder_tickets_green" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
+                    <span v-else-if="item2.InvoiceApplyState === 5 || item2.InvoiceApplyState === 4 "
+                      class="groupTourOrder_tickets_red" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
+                    <span v-else-if="item2.InvoiceApplyState === 2" class="groupTourOrder_tickets_black"
+                      @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
                   </span>
                   <span v-if="childItem.InvoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
                 </div>

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -212,7 +212,10 @@
           <td rowspan="2">
             <p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
             <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;text-decoration:underline;" :title="item.orderId"
-              @click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" title="点击跳转到报名清单">{{item.orderId}}</p>
+              @click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" title="点击跳转到报名清单">{{item.orderId}}
+              <el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;text-decoration: none;display: inline-block;"></i></el-tooltip>
+            </p>
+
             <p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" title="点击跳转到团控列表" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p>
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''"
                 style="color:red">({{item.leaveStr}})</span></p>