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

src/components/Hotel/roomQuery.vue

@@ -3,38 +3,85 @@
     <div class="query-box" style="border-bottom: none;">
       <ul>
         <li>
-          <span><em>出团公司</em>
-            <el-select filterable v-model='msg.OutBranchId' :placeholder="$t('pub.unlimitedSel')">
-              <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
-              <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
-              </el-option>
+          <span>
+            <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
+            <el-select v-model="msg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
+              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+              <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
+                :key="item.LtID"></el-option>
             </el-select>
           </span>
         </li>
-        <li><span><em>系列</em>
+        <li>
+          <span>
+            <em>系列</em>
             <el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
-              <el-option label="不限" value='-1'></el-option>
-              <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
+              <el-option label="不限" :value='0'></el-option>
+              <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID'
+                :key='item.LtID'>
               </el-option>
             </el-select>
           </span>
         </li>
         <li>
           <span>
-            <em>订团号</em>
-            <el-input v-model='msg.CombinationNum' class='w135'></el-input>
+            <em>团号</em>
+            <el-input v-model='msg.TCNUM'></el-input>
+          </span>
+        </li>
+        <li><span><em>日期</em>
+            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
+              :picker-options="pickerBeginDateBefore"></el-date-picker>
+            -
+            <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
+              :picker-options="pickerBeginDateAfter"></el-date-picker>
+          </span>
+        </li>
+        <li><span>
+            <em>状态</em>
+            <el-select v-model='msg.PriceStatus'>
+              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+              <el-option v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Name" :key="team.Id"
+                :value="team.Id" v-if="team.Id==1 || team.Id==3"></el-option>
+            </el-select>
           </span>
         </li>
         <li>
           <span>
-            <em>团号</em>
-            <el-input v-model='msg.TCNUM' class='w135'></el-input>
+            <em>航空公司</em>
+            <el-select v-model="msg.AirLineId" filterable :placeholder="$t('system.ph_buxian')">
+              <el-option :label="$t('system.ph_buxian')" :value="0">
+              </el-option>
+              <el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName"
+                :value="item.AirLineId"></el-option>
+            </el-select>
           </span>
         </li>
-        <li><span><em>出发日期</em>
-            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-            -
-            <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+        <li>
+          <span>
+            <em>OP</em>
+            <el-select v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
+              <el-option :label="$t('pub.unlimitedSel')" :value="0">
+              </el-option>
+              <el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName" :value="item.EmployeeId"
+                :key="item.EmployeeId"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>地接团号</em>
+            <el-input v-model='msg.CombinationNum'></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>出团公司</em>
+            <el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input"
+              :placeholder="$t('pub.pleaseSel')">
+              <el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'>
+              </el-option>
+            </el-select>
           </span>
         </li>
         <li>
@@ -47,7 +94,6 @@
           </span>
         </li>
         <li>
-
           <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
           <input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
         </li>
@@ -60,6 +106,7 @@
           <th width="w100">序号</th>
           <th width="120">出发地</th>
           <th width="80">公司团号</th>
+          <th width="100">系列</th>
           <th width="120">机位总数<br />(Y/E/F)</th>
           <th>使用时间&酒店情况</th>
         </tr>
@@ -83,6 +130,11 @@
                   <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}</p>
                 </div>
               </td>
+              <td>
+                <div class="w120 link">
+                  {{item.LineteamIdNames}}
+                </div>
+              </td>
               <td>
                 <div class="w120 link">
                   <p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
@@ -123,17 +175,25 @@
           pageIndex: 1,
           pageSize: 5,
           SelectType: 1,
-          LineId: 14,
-          LineteamId: "-1",
           StartDate: '',
           EndDate: '',
           //酒店编号
           HotelId: 0,
           //日期
           DateStr: "",
-          OutBranchId: -1,
-          //订团号
-          CombinationNum: ""
+
+          //出团公司
+          OutBranchIds: [],
+          LineId: 14,
+          PlaceID: 0,
+          LineteamId: 0,
+          //航空公司
+          AirLineId: 0,
+          CreateBy: 0,
+          TCNUM: '',
+          PriceStatus: 0,
+          CombinationNum: ''
+
         },
         //分公司类表
         companyList: [],
@@ -143,6 +203,32 @@
         LineTeamList: [],
         thLengthTitle: [],
         dataList: [],
+        queryCommonData: {
+          //公司数据
+          BranchList: [],
+          //国家
+          PlaceList: [],
+          LineList: [],
+          LineTeamList: [],
+          AirlineList: [],
+          EmployeeList: [],
+        },
+        pickerBeginDateBefore: {
+          disabledDate: time => {
+            if (this.msg.EndDate == null) {
+              return false;
+            } else {
+              let endTime = new Date(this.msg.EndDate)
+              return endTime.getTime() < time.getTime()
+            }
+          }
+        },
+        pickerBeginDateAfter: {
+          disabledDate: time => {
+            let startTime = new Date(this.msg.StartDate)
+            return startTime.getTime() >= time.getTime()
+          }
+        }
       }
     },
     methods: {
@@ -256,16 +342,6 @@
           err => {}
         );
       },
-      getBranchList() {
-        this.apipost('admin_get_BranchGetList', {
-          RB_Group_Id: '2',
-          Status: 0,
-        }, res => {
-          if (res.data.resultCode == 1) {
-            this.companyList = res.data.data;
-          }
-        }, err => {})
-      },
       //下载Excel
       DownLoadHotel() {
         this.loading = true;
@@ -275,10 +351,90 @@
         };
         let fileName = "订房查询" + this.$commonUtils.getCurrentDate() + ".xls";
         this.GetLocalFile("hotel_get_downloadHotel", qMsg, fileName,
-         res => {
-          this.loading = false;
-        });
-      }
+          res => {
+            this.loading = false;
+          });
+      },
+      //获取目的地列表
+      getLinePlaceList() {
+        this.msg.PlaceID = 0;
+        this.msg.LineteamId = 0;
+        let msg = {
+          lineID: this.msg.LineId,
+        }
+        this.apipost('team_post_GetLinePlace', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.queryCommonData.PlaceList = res.data.data
+            this.queryCommonData.LineTeamList = []
+          }
+        })
+      },
+      //获取系列列表
+      getLineTeamList() {
+        this.msg.LineteamId = 0
+        let msg = {
+          lineID: this.msg.LineId,
+          placeID: this.msg.PlaceID,
+          isTOOP: 1
+        }
+        this.apipost('team_post_GetList', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.queryCommonData.LineTeamList = res.data.data
+          }
+        })
+      },
+      //获取航空公司
+      getAirlineList() {
+        this.apipost(
+          'airline_post_GetList', {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.queryCommonData.AirlineList = res.data.data
+            }
+          },
+          err => {}
+        )
+      },
+      //根据当前员工所在部门获取该部门及子部门员工信息
+      getEmployeeList() {
+        let userInfo = this.getLocalStorage()
+        let msg = {
+          GroupId: userInfo.RB_Group_id,
+          BranchId: '-1',
+          DepartmentId: '-1',
+          PostId: '-1',
+          IsLeave: '0'
+        }
+        this.apipost(
+          'admin_get_EmployeeGetList', {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.queryCommonData.EmployeeList = res.data.data
+            }
+          },
+          err => {}
+        )
+      },
+      //初始化公司
+      getCompanyList() {
+        let userInfo = this.getLocalStorage()
+        var RB_Group_id = userInfo.RB_Group_id
+        let msg = {
+          Status: 0,
+          is_show: 0,
+          RB_Group_Id: RB_Group_id
+        }
+        this.apipost(
+          'admin_get_BranchGetList',
+          msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.queryCommonData.BranchList = res.data.data;
+            }
+          },
+          err => {}
+        )
+      },
     },
     mounted() {
       let myDate = new Date();
@@ -299,10 +455,12 @@
       } else {
         this.msg.StartDate = nowDate;
       }
-      this.getBranchList();
+      this.getLinePlaceList();
+      this.getAirlineList();
+      this.getEmployeeList();
+      this.getCompanyList();
       this.GetHotelList();
       this.getList();
-      this.getLineTeamList();
     },
   }
 

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -256,12 +256,6 @@
           this.list.forEach(item => {
             item.DiningSummaryList.forEach(insideItem => {
               insideItem.OrderState = 0;
-              if (!insideItem.Discount) {
-                insideItem.Discount = 0;
-              }
-              if (!insideItem.DiscountPrice) {
-                insideItem.DiscountPrice = 0;
-              }
             })
           })
         }
@@ -269,15 +263,23 @@
           this.list.forEach(item => {
             item.DiningSummaryList.forEach(insideItem => {
               insideItem.OrderState = 1;
-              if (!insideItem.Discount) {
-                insideItem.Discount = 0;
-              }
-              if (!insideItem.DiscountPrice) {
-                insideItem.DiscountPrice = 0;
-              }
             })
           })
         }
+        this.list.forEach(item => {
+          item.DiningSummaryList.forEach(insideItem => {
+            if (insideItem.DiningPriceList) {
+              insideItem.DiningPriceList.forEach(subItem => {
+                if (!subItem.Discount) {
+                  subItem.Discount = 0;
+                }
+                if (!subItem.DiscountPrice) {
+                  subItem.DiscountPrice = 0;
+                }
+              });
+            }
+          })
+        })
         this.apipost('dmcstatistics_get_SetDiningOrder', this.list, res => {
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message);