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

src/components/FinancialModule/ReportForm/LineReceiver.vue

@@ -20,13 +20,15 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item>
-                    <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
+                    <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
+                    <input type="button" class="hollowFixedBtn" value="导出" @click="Export"/>
+                    
                </el-form-item>
                 
           </el-form>
       </div>
-      <div>
-          <el-table :data="List" stripe border>
+      <div v-loading="loading">
+          <el-table :data="List" border>
 			<el-table-column fixed prop="BranchName" label="公司名称" min-width="100">
 			</el-table-column>
 			<el-table-column min-width="130" @sort-by="SortBy" sortable v-for='(item,index) in newArr' :prop='item.Rank' :label="item.title" :key='index'>
@@ -53,6 +55,8 @@
                 ColList:[],
                 List:[],
                 newArr:[],
+                loading:false,
+                userId:0,
             }
         },
         created(){
@@ -61,11 +65,22 @@
             this.productionDate=[mon2,mon1];
             this.msg.StartTime=this.productionDate[0];
             this.msg.EndTime=this.productionDate[1]; 
+            let userInfo = this.getLocalStorage();
+            this.userId = userInfo.EmployeeId;
         },
 		mounted(){
 			this.getList();
 		},
 		methods:{
+            Export(){
+                this.msg.EmployeeId = this.userId;
+                let msg = JSON.parse(JSON.stringify(this.msg));
+                this.GetLocalFile(
+                    "financestatistics_post_OutToExcelGetCompanyLineGuestList",
+                    msg,
+                    "线路收客统计.xls"
+                );
+            },
             SortBy(){
                 
             },
@@ -79,21 +94,20 @@
                 }
             },
             getList(){
+                this.loading=true;
                 this.apipost('financestatistics_post_GetCompanyLineGuestList',this.msg, res => {
+                    this.loading=false;
                     
                     if(res.data.resultCode == 1) {
                         this.ColList=res.data.data.ColList;
                         this.List=res.data.data.List;
-                        console.log("this.ColList",this.ColList);
-                        console.log("this.List",this.List);
                         for(let i = 1; i < this.ColList.length; i++) {
 							this.newArr.push({
                                 "Rank":this.ColList[i].Sort,
 								'value': this.ColList[i].Col,
 								"title": this.ColList[i].Name,
 							})
-                        }
-                        console.log("this.newArr",this.newArr);                        
+                        }                   
                         
                     }else{
                         this.Error(res.data.message);

src/components/Hotel/roomQuery.vue

@@ -92,6 +92,22 @@
               <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </span>
+        </li>
+            <li style="display:none;">
+          <span>
+            <em>酒店状态</em>
+            <el-select v-model="msg.HotelStatus" :placeholder="$t('pub.pleaseSel')" filterable>
+              <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
+              <el-option label="全部OK" :value='100'></el-option>
+              <el-option label="暂定一晚" :value='1'></el-option>
+              <el-option label="暂定二晚" :value='2'></el-option>
+              <el-option label="暂定三晚" :value='3'></el-option>
+              <el-option label="暂定四晚" :value='4'></el-option>
+              <el-option label="暂定五晚" :value='5'></el-option>
+              <el-option label="暂定六晚" :value='6'></el-option>
+              <el-option label="暂定七晚以上" :value='7'></el-option>
+            </el-select>
+          </span>
         </li>
         <li>
           <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
@@ -149,8 +165,12 @@
                     <p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
                     <p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
                       class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
-                      {{childItem.NewHotelName}}<span
-                        class="colorE95252">（{{childItem.HotelOrderState==1?"OK":"暂定"}}）</span>
+                      {{childItem.NewHotelName}}
+                      <span  class="colorE95252">
+                         <template v-if="childItem.OPState==1">[OP选房-OK]</template>
+                         <template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
+                         </template>
+                      </span>
                     </p>
                   </div>
                 </div>
@@ -191,7 +211,8 @@
           CreateBy: 0,
           TCNUM: '',
           PriceStatus: 0,
-          CombinationNum: ''
+          CombinationNum: '',
+          HotelStatus:-1,
         },
         //分公司类表
         companyList: [],