报价单，车配调整

src/components/Ticketing/PassengerList.vue

@@ -129,13 +129,13 @@
         <li>
           <table class="PT_teamTable">
             <tr>
-              <th width="140">{{$t('visa.v_tuanhao')}}</th>
+              <th width="160">{{$t('visa.v_tuanhao')}}</th>
               <th>{{$t('Operation.Op_TeamName')}}</th>
               <th width="50">{{$t('admin.admin_personNumber')}}</th>
               <th width="120">{{$t('hotel.hotel_StarDate')}}</th>
             </tr>
             <tr v-for="(item,index) in QueryMsg.TeamInfoData" :key="index">
-              <td>{{item.TCNUM}}</td>
+              <td>{{item.TCNUM}}({{item.TCID}})</td>
               <td>{{item.Title}}</td>
               <td>{{item.OfferNumber}}{{$t('hotel.hotel_people')}}</td>
               <td>{{item.StartDate}} {{item.WeekStr}}</td>
@@ -143,41 +143,54 @@
           </table>
         </li>
         <li>
-          <el-select v-if="!isShowAirticketOut" size="small" v-model="msg.checkOutState" @change="msg.pageIndex=1,getList()" :placeholder="$t('objFill.v101.qingxzchuplx')">
+          <el-select v-model="msg.TCID" @change="msg.pageIndex=1,getList()"
+            :placeholder="$t('objFill.v101.qingxzchuplx')">
+            <el-option v-for="(item,index) in QueryMsg.TeamInfoData" :key="index" :label="item.TCNUM+`(`+item.TCID+`)`"
+              :value="item.TCID"></el-option>
+          </el-select>
+          <el-select v-if="!isShowAirticketOut" size="small" v-model="msg.checkOutState"
+            @change="msg.pageIndex=1,getList()" :placeholder="$t('objFill.v101.qingxzchuplx')">
             <el-option :label="$t('advmanager.v_all')" :value="0"></el-option>
             <el-option :label="$t('objFill.v101.yichupiao')" :value="1"></el-option>
             <el-option :label="$t('objFill.v101.weichupiao')" :value="2"></el-option>
           </el-select>
-          <input v-if="!isShowAirticketOut" type="button" class="normalBtn" :value="$t('objFill.v101.kaipiao')" @click="openAirticket" />
-          <el-select v-if="isShowAirticketOut" size="small" v-model="checkOutMsg.TicketOutType" :placeholder="$t('objFill.v101.qingxzkpleix')">
+          <input v-if="!isShowAirticketOut" type="button" class="normalBtn" :value="$t('objFill.v101.kaipiao')"
+            @click="openAirticket" />
+          <el-select v-if="isShowAirticketOut" size="small" v-model="checkOutMsg.TicketOutType"
+            :placeholder="$t('objFill.v101.qingxzkpleix')">
             <el-option :label="$t('objFill.v101.tuanduip')" :value="1"></el-option>
             <el-option :label="$t('objFill.v101.shankep')" :value="2"></el-option>
           </el-select>
-          <input v-if="isShowAirticketOut" type="button" class="normalBtn" :value="$t('objFill.v101.baocunkaipxxi')" @click="setAirticketGuest" />
-          <input type="button" class="normalBtn" :value="$t('objFill.v101.administrative.daochubaob')" @click="getFlightInfo(0),getCombinTeam()" />
+          <input v-if="isShowAirticketOut" type="button" class="normalBtn" :value="$t('objFill.v101.baocunkaipxxi')"
+            @click="setAirticketGuest" />
+          <input type="button" class="normalBtn" :value="$t('objFill.v101.administrative.daochubaob')"
+            @click="getFlightInfo(0),getCombinTeam()" />
           <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.baohanjipxxi')" placement="bottom">
-            <input type="button" class="normalBtn" :value="$t('objFill.v101.daoclkhanb')" @click="getFlightInfo(1),getCombinTeam()" />
+            <input type="button" class="normalBtn" :value="$t('objFill.v101.daoclkhanb')"
+              @click="getFlightInfo(1),getCombinTeam()" />
           </el-tooltip>
-          <input type="button" class="normalBtn" v-if="isShowGuoji" :value="$t('objFill.v101.zhizuocwdju')" @click="makeFinacelDoc()" />
-          <input type="button" class="normalBtn" :value="$t('objFill.v101.administrative.daochubaob')" @click="exportExcel()" style="display:none;" />
+          <input type="button" class="normalBtn" v-if="isShowGuoji" :value="$t('objFill.v101.zhizuocwdju')"
+            @click="makeFinacelDoc()" />
+          <input type="button" class="normalBtn" :value="$t('objFill.v101.administrative.daochubaob')"
+            @click="exportExcel()" style="display:none;" />
         </li>
       </ul>
     </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
-        <th v-if="isShowGuoji">{{$t('objFill.guojijp')}} <input type="checkbox" @change="checkAllbox(checkdGuoji,'guoji')"
-            v-model="checkdGuoji" /></th>
-        <th v-if="isShowGuoji">{{$t('objFill.v101.DomesticModule.guoneijp')}} <input type="checkbox" @change="checkAllbox(checkedGuonei,'guonei')"
-            v-model="checkedGuonei" /></th>
-        <th v-if="isShowGuoji">{{$t('objFill.v101.guojizhongduan')}} <input type="checkbox" @change="checkAllbox(checkedGJzd,'gjzd')"
-            v-model="checkedGJzd" /></th>
-        <th v-if="isShowGuoji">{{$t('objFill.shuijin')}} <input type="checkbox" @change="checkAllbox(checkedshuijin,'shuijin')"
-            v-model="checkedshuijin" /></th>
-        <th v-if="isShowGuoji">{{$t('objFill.v101.shenchan')}} <input type="checkbox" @change="checkAllbox(checkedsc,'shengcang')"
-            v-model="checkedsc" /></th>
+        <th v-if="isShowGuoji">{{$t('objFill.guojijp')}} <input type="checkbox"
+            @change="checkAllbox(checkdGuoji,'guoji')" v-model="checkdGuoji" /></th>
+        <th v-if="isShowGuoji">{{$t('objFill.v101.DomesticModule.guoneijp')}} <input type="checkbox"
+            @change="checkAllbox(checkedGuonei,'guonei')" v-model="checkedGuonei" /></th>
+        <th v-if="isShowGuoji">{{$t('objFill.v101.guojizhongduan')}} <input type="checkbox"
+            @change="checkAllbox(checkedGJzd,'gjzd')" v-model="checkedGJzd" /></th>
+        <th v-if="isShowGuoji">{{$t('objFill.shuijin')}} <input type="checkbox"
+            @change="checkAllbox(checkedshuijin,'shuijin')" v-model="checkedshuijin" /></th>
+        <th v-if="isShowGuoji">{{$t('objFill.v101.shenchan')}} <input type="checkbox"
+            @change="checkAllbox(checkedsc,'shengcang')" v-model="checkedsc" /></th>
         <th v-if="isShowAirticketOut">
-          {{$t('objFill.v101.chupiao')}} <input type="checkbox" @change="checkAllbox(checkAirticketOut,'checkAirticketOut')"
-            v-model="checkAirticketOut" />
+          {{$t('objFill.v101.chupiao')}} <input type="checkbox"
+            @change="checkAllbox(checkAirticketOut,'checkAirticketOut')" v-model="checkAirticketOut" />
         </th>
         <th>{{$t('objFill.lvkexm')}}</th>
         <th>{{$t('objFill.shengfenzheng')}}</th>
@@ -336,7 +349,8 @@
             <el-option :label="$t('objFill.v101.nanhgjitd')" :value="1"></el-option>
           </el-select>
         </span>
-        <button class="normalBtn" type="primary" @click="getIsSure()">{{$t('objFill.v101.querenhbxxin')}}</button> &nbsp;
+        <button class="normalBtn" type="primary" @click="getIsSure()">{{$t('objFill.v101.querenhbxxin')}}</button>
+        &nbsp;
         <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
       </div>
     </el-dialog>
@@ -353,7 +367,8 @@
           AirTicketId: 0,
           total: 0,
           currentPage: 1,
-          checkOutState:0,//出票状态(1-已出票，2-未出票)
+          checkOutState: 0, //出票状态(1-已出票，2-未出票)
+          TCID: 0,
         },
         QueryMsg: {
           loading: true,
@@ -425,6 +440,7 @@
       },
       //获取数据
       getList() {
+        var that = this;
         this.QueryMsg.loading = true;
         this.apipost(
           "travel_get_GetAirTicketGuestPageList",
@@ -435,7 +451,7 @@
               this.msg.total = res.data.data.count;
               this.QueryMsg.dataList = res.data.data.pageData;
               this.QueryMsg.noData = !this.msg.total > 0;
-              let arrText = [this.$t('pub.man'),this.$t('pub.woman')]
+              let arrText = [that.$t('pub.man'), that.$t('pub.woman')]
               this.QueryMsg.dataList.forEach(item => {
                 if (item.Sex == 1) {
                   item.Sex = arrText[0];
@@ -540,15 +556,14 @@
           AirTicketId: this.msg.AirTicketId,
           Type: this.checkModule,
           TemplateType: this.TemplateType,
-          checkOutState:this.msg.checkOutState,//出票状态(1-已出票，2-未出票)
+          checkOutState: this.msg.checkOutState, //出票状态(1-已出票，2-未出票)
+          TCID: this.msg.TCID
         };
         var fileName = this.$route.query.flightdate;
         var TempfileName = ""
         this.QueryMsg.TeamInfoData.forEach(item => {
-          if (TempfileName.length > 0) {
+          if (item.TCID == msg.TCID) {
             TempfileName += "/" + item.TCNUM
-          } else {
-            TempfileName += item.TCNUM
           }
         })
         fileName = fileName + TempfileName
@@ -580,7 +595,11 @@
           res => {
             if (res.data.resultCode == 1) {
               this.QueryMsg.TeamInfoData = res.data.data.resultData;
+              if (this.QueryMsg.TeamInfoData && this.QueryMsg.TeamInfoData.length > 0) {
+                this.msg.TCID = this.QueryMsg.TeamInfoData[0].TCID;
+              }
               this.QueryMsg.TempCode = res.data.data.TempCode;
+              this.getList();
             }
           },
           err => {}
@@ -672,7 +691,7 @@
       if (this.isShowGuoji) {
         this.msg.PageSize = 200;
       }
-      this.getList();
+
     }
   };
 

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -1078,7 +1078,7 @@
         <div class="Cost_Line"></div>
       </el-form>
     </div>
-    <el-dialog custom-class='w750' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center modal>
+    <el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center modal>
       <changeOffer v-if="changMsg.isShowChangeOffer" :qMsg="changMsg" @success="refreshPage" @closeDialog="closeDialog">
       </changeOffer>
     </el-dialog>

src/components/busManagement/busHandBook.vue

@@ -173,7 +173,7 @@
             <template v-if="BusObj.BusId > 0">
               <template v-if="BusObj.OrderState == 0">
                 <span style="color:red;">{{$t('objFill.v101.busManagement.weiqrsp')}}</span>
-                <input type="button" class="normalBtn" @click="SureBus(1)" :value="$t('objFill.v101.busManagement.querenspf')" />
+                <input type="button" class="normalBtn" @click="SureBus(1)" :value="$t('objFill.querenspf')" />
               </template>
               <template v-if="BusObj.OrderState == 1">
                 <span style="color:green;">{{$t('objFill.yiquerenspf')}}</span>

src/components/commonPage/changeOffer.vue

@@ -37,6 +37,12 @@
     padding-left: 5px !important;
   }
 
+  .changeOfferTable .el-input-group__append,
+  .el-input-group__prepend {
+    background: #fff;
+    border-bottom: 1px solid #606266;
+  }
+
 </style>
 
 <template>
@@ -44,13 +50,13 @@
     <div>
       <table class="changeOfferTable">
         <tr>
-          <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">类别</td>
+          <td style="width:105px;" class="CP_ComTitle2 CostcomCenter">类别</td>
           <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">变更类型</td>
           <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">天数</td>
           <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">原金额</td>
           <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">地接金额</td>
           <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">变更值</td>
-          <td style="width:300px;" class="CP_ComTitle2 CostcomCenter">变更备注</td>
+          <td style="width:500px;" class="CP_ComTitle2 CostcomCenter">变更备注</td>
           <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">
             <a style="color:blue;cursor:pointer;" @click="AddOfferObj()">添加</a>
           </td>
@@ -84,13 +90,16 @@
             <td>
               <el-input v-model="item.ChangeValue" style="width:100px;" max="6"></el-input>
             </td>
-            <td>
-              <el-select v-model="item.ChangeRemarks" :placeholder="$t('objFill.qingxuanzhe')">
+            <td style="padding:5px;text-align:left;">
+              <el-input placeholder="请输入内容" v-model="item.ChangeRemarks" class="input-with-select">
+                <el-select v-model="sChangeRemark" :placeholder="$t('objFill.qingxuanzhe')" @change="selectChange(item)"
+                  slot="prepend">
                   <el-option v-for="(cItem,cIndex) in changeRemarkList" :key="cIndex" :label="cItem.Name"
                     :value="cItem.Name"></el-option>
                 </el-select>
+              </el-input>
               <template v-if="item.ChangeType==1">
-                <br/>
+                <br />
                 <el-select filterable remote :remote-method="(query) => remoteSearchAdGroup(query, item)"
                   v-model='item.ChangeContent' :placeholder="$t('objFill.qingshurujdmc')" :loading="loading">
                   <el-option v-for="(x) in item.HotelList" :key="x.ID" :label="x.Name" :value='x.Name'>
@@ -119,12 +128,15 @@
         loading: false,
         dataList: [],
         changeTypeList: [], //变更类型
-        changeRemarkList: [
-
-        ]
+        changeRemarkList: [],
+        sChangeRemark: ""
       };
     },
     methods: {
+      selectChange(item) {
+        console.log("this.sChangeRemark", this.sChangeRemark);
+        item.ChangeRemarks = this.sChangeRemark;
+      },
       getHotel(subItem, HotelId) {
         subItem.HotelList.forEach(x => {
           if (x.Name == HotelId) {
@@ -310,7 +322,8 @@
         this.apipost("travel_post_GetChangeOfferList", searchParmeters, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
-            this.dataList = res.data.data;
+            var tempArray = res.data.data;
+            this.dataList = tempArray;
           }
         });
       },