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

src/components/Hotel/DiDa/HotelList.vue

@@ -171,7 +171,7 @@
             <el-select v-model="msg.Country" filterable @change="getCityList(msg.Country,'Destination')"
               :placeholder="$t('hotel.hotel_province')" clearable @clear="msg.Province='',msg.City=''">
               <el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
-              <el-option v-for="item in provinceList" :key="item.ISOCountryCode" :label="item.CountryName_CN"
+              <el-option v-for="item in countryList" :key="item.ISOCountryCode" :label="item.CountryName_CN"
                 :value="item.ISOCountryCode"></el-option>
             </el-select>
           </span>
@@ -315,8 +315,8 @@
         isShow: false,
         currentPage: 0,
         total: 0,
-        //国家 省市 区
-        provinceList: [],
+        //国家
+        countryList: [],
         cityList: [],
         district: [],
         beforeCheck: {
@@ -389,13 +389,13 @@
           },
         );
       },
-      getProvinceList() {
-        //根据省份获取城市
-        this.provinceList = [];
+      //获取国家
+      getCountryList() {
+        this.countryList = [];
         this.apipost(
           "dmc_post_GetDiDaCountryList", {},
           res => {
-            this.provinceList = res.data.data;
+            this.countryList = res.data.data;
           },
         );
       },
@@ -452,7 +452,7 @@
       this.msg.EndDate = eyear + "-" +
         (emonth < 10 ? "0" : "") + emonth + "-" +
         (eday < 10 ? "0" : "") + eday;
-      this.getProvinceList();
+      this.getCountryList();
       this.getPageList();
     }
   };

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -367,8 +367,6 @@
           <td>{{item.PlatformTax}}</td>
           <td>{{item.DiscountMoney}}</td>
           <td>{{item.DueinMoney}}</td>
-          <!-- <td>{{item.UpdateJapanese}}/{{item.totalChargeableRateInfoTaxOut}}</td>
-          <td>{{item.UpdateJapanese-(item.totalChargeableRateInfoTaxOut*0.04)}}</td> -->
           <td>
             <span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span>
           </td>
@@ -433,13 +431,13 @@
               <div>
                 <span v-for="(subItem,subIndex) in item.FinanceList" :key="`d_`+index+`s_`+subIndex">
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue">{{subItem.FrID}}</span>
+                    v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue" style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green" style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red" style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black" style="margin-right:8px;">{{subItem.FrID}}</span>
                 </span>
                 <span v-if="item.FinanceList==0">{{$t('system.content_noData')}}</span>
               </div>
@@ -449,13 +447,13 @@
               <div>
                 <span v-for="(subItem,subIndex) in item.RefundFinanceList" :key="`d1_`+index+`s1_`+subIndex">
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue">{{subItem.FrID}}</span>
+                    v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue" style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green" style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red" style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black" style="margin-right:8px;">{{subItem.FrID}}</span>
                 </span>
                 <span v-if="item.RefundFinanceList==0">{{$t('system.content_noData')}}</span>
               </div>

src/components/TravelManager/TravelList/OpHotelOrderDetail.vue

@@ -468,9 +468,9 @@
               <template
                 v-if="details.parmResultRoomInfo&&details.parmResultRoomInfo.GuestList&&details.parmResultRoomInfo.GuestList.length>0">
                 <template v-for="(item,index) in details.parmResultRoomInfo.GuestList">
-                  <el-row :key="`dp_`+index"  >
-                    <el-col  >
-                      房间 {{item.RoomNum}}:  <template v-for="(subItem,subIndex) in item.GuestInfo">
+                  <el-row :key="`dp_`+index">
+                    <el-col>
+                      房间 {{item.RoomNum}}: <template v-for="(subItem,subIndex) in item.GuestInfo">
                         {{subItem.LastName}} {{subItem.FirstName}}
                         <template v-if="subItem.Age&&subItem.Age!=''">
                           年龄：{{subItem.Age}}
@@ -539,7 +539,10 @@
         <div class="HS_HtName">{{details.model.HotelName}}</div>
         <div class="HS_HAddress">
           <img src="../../../assets/img/hotel/redAddress.png" alt="" />
-          <template v-if="details.parmResult">
+          <template v-if="details.Address&&details.Address!=''">
+            {{details.Address}}
+          </template>
+          <template v-else-if="details.parmResult&&details.parmResult.address!=''">
             {{details.parmResult.address}}
           </template>
         </div>

src/components/dmc/manager/dmcTotalTable.vue

@@ -41,8 +41,6 @@
           </span>
         </li>
         <li><span><em>{{$t('sm.Date')}}</em>
-            <!-- <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
-              :picker-options="pickerBeginDateBefore"></el-date-picker> -->
             <DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate"
               @change="(date)=> msg.StartDate = date"></DateLimit>
             -
@@ -140,6 +138,17 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span><em>团队类型</em></span>
+          <el-select class="w150" v-model="msg.QTeamType" filterable :placeholder="$t('pub.pleaseSel')">
+            <el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
+            <el-option label="常规团" :value="0" :key="0"></el-option>
+            <el-option label="小包团" :value="1" :key="1"></el-option>
+            <el-option label="当地游" :value="2" :key="2"></el-option>
+            <el-option label="切位团" :value="5" :key="5"></el-option>
+          </el-select>
+        </li>
+        <li>
         <li>
           <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
           <input type="button" class="normalBtn" :value="$t('adm.adm_download')" @click="DownLoad.ShowDownLoad=true" />
@@ -282,7 +291,10 @@
               </td>
               <td>
                 <div class="link">
-                  <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}<br />({{item.TCID}})</p>
+                  <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}<br />({{item.TCID}} )
+                    <br />
+                    <font style="color:red;">{{item.TeamTypeName}}</font>
+                  </p>
                   <div v-if="item.IsSetOut&&item.IsSetOut==1" style="color:red;font-weight:bold;">
                     ({{$t('objFill.quxiaofatuan')}})
                   </div>