酒店查询，餐厅查询新增操作人条件

src/components/Hotel/HotelManagement.vue

@@ -267,6 +267,7 @@
             </el-select>
           </span>
         </li>
+       
         <li>
           <span>
             <em>{{$t('Operation.Op_price')}}</em>
@@ -276,6 +277,15 @@
               </el-option>
             </el-select>
           </span>
+        </li>
+         <li>
+          <span><em>{{$t('visa.v_czuser')}}</em></span>
+          <el-select class="w150" v-model="msg.UpdateBy" filterable :placeholder="$t('pub.pleaseSel')">
+            <el-option :label="$t('pub.unlimitedSel')" :value="0">
+            </el-option>
+            <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
+              :key="item.EmployeeId"></el-option>
+          </el-select>
         </li>
         <li>
           <button class="hollowFixedBtn" type="button"
@@ -359,6 +369,7 @@
         cityList: "",
         district: "",
         tableData: [],
+        EmployeeList: [], //员工列表
         //酒店类型
         HotelTypeList: [],
         //酒店价格
@@ -387,7 +398,8 @@
           QDistrict: "",
           total: 0,
           currentPage: 1,
-          ID: 0
+          ID: 0,
+          UpdateBy: 0, //操作人
         }
       };
     },
@@ -561,9 +573,30 @@
           },
           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.EmployeeList = res.data.data;
             }
           },
+          err => {}
+        );
+      },
+    },
     mounted() {
+      this.getEmployeeList();
       this.GetHotelPirceStockAuth();
       this.getCountryList();
       this.GetHotelTypeList();

src/components/Restaurant/restaurantList.vue

@@ -4,15 +4,15 @@
     display: block;
     height: 0;
     clear: both;
-}
+  }
 
-.restaurantList .hotelResource {
+  .restaurantList .hotelResource {
     width: 100%;
     min-height: 500px;
     margin-top: 20px;
-}
+  }
 
-.restaurantList .resourceList {
+  .restaurantList .resourceList {
     width: 215px;
     height: 330px;
     background-color: #fff;
@@ -22,119 +22,121 @@
     font-size: 12px;
     color: #333333;
     float: left;
-}
+  }
 
-.restaurantList .resourceList:hover {
+  .restaurantList .resourceList:hover {
     box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
     transition: all linear 0.5s;
-}
+  }
 
-.restaurantList .reTopInfo {
+  .restaurantList .reTopInfo {
     width: 100%;
     height: 123px;
     position: relative;
-}
+  }
 
-.restaurantList .reTopInfo img {
+  .restaurantList .reTopInfo img {
     position: absolute;
     width: 100%;
     height: 100%;
     top: 0;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
-}
+  }
 
-.restaurantList .resTypeList {
+  .restaurantList .resTypeList {
     position: absolute;
     top: 10px;
     left: 10px;
-}
+  }
 
-.restaurantList .resTypeList span {
+  .restaurantList .resTypeList span {
     display: inline-block;
     padding: 1px 5px;
     border-radius: 10px;
     color: #fff;
     margin-right: 10px;
-}
+  }
 
-.restaurantList .L1 {
+  .restaurantList .L1 {
     background-color: #e95252;
-}
+  }
 
-.restaurantList .L2 {
+  .restaurantList .L2 {
     background-color: #47bf8c;
-}
+  }
 
-.restaurantList .L3 {
+  .restaurantList .L3 {
     background-color: #2aaef2;
-}
-.restaurantList .L4 {
+  }
+
+  .restaurantList .L4 {
     background-color: #9cf;
-}
-.restaurantList .L5 {
+  }
+
+  .restaurantList .L5 {
     background-color: #00c6ff;
-  margin-top:5px;
-}
+    margin-top: 5px;
+  }
 
-.restaurantList .starSu {
+  .restaurantList .starSu {
     position: absolute;
     bottom: 8px;
     right: 10px;
-}
+  }
 
-.restaurantList .sushe {
+  .restaurantList .sushe {
     background-color: #ffc800;
     display: inline-block;
     padding: 1px 5px;
     border-radius: 10px;
     color: #fff;
-}
+  }
 
-.restaurantList .hotelTitle {
+  .restaurantList .hotelTitle {
     margin: 10px 16px 0 16px;
     font-size: 14px;
     color: #333333;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-}
+  }
 
-.restaurantList .brandList {
+  .restaurantList .brandList {
     margin: 16px 0;
-}
+  }
 
-.restaurantList .brandList i {
+  .restaurantList .brandList i {
     position: relative;
     top: 2px;
-}
+  }
 
-.restaurantList .brand {
+  .restaurantList .brand {
     float: left;
     width: 49%;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     text-align: center;
-}
+  }
 
-.restaurantList .dayNum {
+  .restaurantList .dayNum {
     float: right;
     text-align: center;
     width: 50%;
-}
+  }
 
-.restaurantList .iconfont {
+  .restaurantList .iconfont {
     margin-right: 5px;
-}
+  }
 
-.restaurantList .dieline {
+  .restaurantList .dieline {
     color: #2aaef2;
     font-size: 14px;
     top: 1px !important;
-}
+  }
 
-.restaurantList .AddressInner {
+  .restaurantList .AddressInner {
     float: right;
     width: 160px;
     height: 18px;
@@ -143,87 +145,88 @@
     display: -webkit-box;
     -webkit-line-clamp: 1;
     -webkit-box-orient: vertical;
-}
+  }
 
-.restaurantList .btnList {
+  .restaurantList .btnList {
     text-align: center;
-}
+  }
 
-.restaurantList .hotelBtn {
+  .restaurantList .hotelBtn {
     width: 80px;
     height: 28px;
     background: #f76f6f;
     border-radius: 14px;
     color: #fff;
     cursor: pointer;
-}
+  }
 
-.restaurantList .hotelBtn:first-child {
+  .restaurantList .hotelBtn:first-child {
     margin-right: 19px;
-}
+  }
 
-.restaurantList .w150 .el-input {
+  .restaurantList .w150 .el-input {
     width: 150px !important;
-}
+  }
 
-.restaurantList .SupportCount {
+  .restaurantList .SupportCount {
     color: #4bca81;
     font-size: 18px;
     font-weight: bold;
     margin: 0 5px 5px 0;
     display: inline-block;
-}
+  }
 
-.restaurantList .dayNumber {
+  .restaurantList .dayNumber {
     color: #2aaef2;
     font-size: 18px;
     font-weight: bold;
     margin: 0 5px 5px 5px;
     display: inline-block;
-}
+  }
 
-.restaurantList .line {
+  .restaurantList .line {
     float: left;
     width: 1px;
     height: 35px;
     background-color: #ededed;
     margin-top: 6px;
-}
+  }
 
-.restaurantList .foodList {
+  .restaurantList .foodList {
     display: inline-block;
     padding: 1px 5px;
     background-color: #ff9c00;
     color: #fff;
     margin-right: 6px;
     border-radius: 2px;
-}
+  }
 
-.restaurantList .foodList:last-child {
+  .restaurantList .foodList:last-child {
     margin-right: 0;
-}
+  }
 
-.restaurantList .delScien {
+  .restaurantList .delScien {
     position: absolute;
     right: 10px;
     top: 10px;
     display: none;
-}
+  }
 
-.restaurantList .delScien:hover {
+  .restaurantList .delScien:hover {
     color: #f76f6f;
     cursor: pointer;
-}
+  }
 
-.restaurantList .resourceList:hover .delScien {
+  .restaurantList .resourceList:hover .delScien {
     display: block;
-}
+  }
 
-.restaurantList .comCursorUrl {
+  .restaurantList .comCursorUrl {
     cursor: pointer;
-}
+  }
+
+  /* 餐厅列表 */
 
-/* 餐厅列表 */
 </style>
 <template>
   <div class="flexOne restaurantList">
@@ -232,21 +235,23 @@
         <li>
           <span class="hotel_name">
             <em>{{$t('restaurant.res_resName')}}</em>
-            <el-input maxlength="50" @keyup.native.enter="resetPageIndex(),selectResource()" v-model="msg.Name"></el-input>
+            <el-input maxlength="50" @keyup.native.enter="resetPageIndex(),selectResource()" v-model="msg.Name">
+            </el-input>
           </span>
         </li>
         <li>
           <span>
             <em>{{$t('system.quety_area')}}</em>
-            <el-select v-model="msg.QCountry" clearable class="w150" filterable @change="getProvinceList(msg.QCountry,1)"
-              :placeholder="$t('hotel.hotel_country')">
+            <el-select v-model="msg.QCountry" clearable class="w150" filterable
+              @change="getProvinceList(msg.QCountry,1)" :placeholder="$t('hotel.hotel_country')">
               <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
             <el-select v-model="msg.QProvince" class="w150" filterable @change="getProvinceList(msg.QProvince,2)"
               :placeholder="$t('hotel.hotel_province')">
               <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
-            <el-select v-model="msg.QCity" class="w150" filterable @change="getProvinceList(msg.QCity,3)" :placeholder="$t('hotel.hotel_city')">
+            <el-select v-model="msg.QCity" class="w150" filterable @change="getProvinceList(msg.QCity,3)"
+              :placeholder="$t('hotel.hotel_city')">
               <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
             <el-select v-model="msg.QDistrict" class="w150" filterable :placeholder="$t('hotel.hotel_area')">
@@ -277,7 +282,8 @@
             <em>{{$t('Operation.Op_price')}}</em>
             <el-select v-model="msg.DiningPriceType" class="w210" :placeholder="$t('pub.unlimitedSel')">
               <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
-              <el-option v-for="item in DiningPriceTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+              <el-option v-for="item in DiningPriceTypeList" :key="item.ID" :label="item.Name" :value="item.ID">
+              </el-option>
             </el-select>
           </span>
         </li>
@@ -286,13 +292,25 @@
             <em>{{$t('ground.hezuofangshi')}}</em>
             <el-select v-model="msg.CooperationType" class="w210" :placeholder="$t('pub.unlimitedSel')">
               <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
-              <el-option v-for="item in CooperationTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+              <el-option v-for="item in CooperationTypeList" :key="item.ID" :label="item.Name" :value="item.ID">
+              </el-option>
             </el-select>
           </span>
         </li>
         <li>
-          <button class="hollowFixedBtn" type="button" @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
-          <button class="normalBtn" type="button" @click="$router.push('restaurantInfoManage')">{{$t('pub.addBtn')}}</button>
+          <span><em>{{$t('visa.v_czuser')}}</em></span>
+          <el-select class="w150" v-model="msg.UpdateBy" filterable :placeholder="$t('pub.pleaseSel')">
+            <el-option :label="$t('pub.unlimitedSel')" :value="0">
+            </el-option>
+            <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
+              :key="item.EmployeeId"></el-option>
+          </el-select>
+        </li>
+        <li>
+          <button class="hollowFixedBtn" type="button"
+            @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
+          <button class="normalBtn" type="button"
+            @click="$router.push('restaurantInfoManage')">{{$t('pub.addBtn')}}</button>
         </li>
       </ul>
     </div>
@@ -302,7 +320,8 @@
           <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
           <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
           <div class="resTypeList">
-            <span v-for="(items,index) in item.OpenPlatformList" :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}"
+            <span v-for="(items,index) in item.OpenPlatformList"
+              :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}"
               :key="index">{{items.Name}}</span>
           </div>
           <div class="delScien" @click="isdelete(item.ID)">
@@ -343,12 +362,13 @@
         </div>
         <div class="btnList">
           <button @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
-          <button v-if="IsHotelPriceStock==1" @click="goUrl('RestaurantPackage',item.ID)" class="hotelBtn">{{$t('restaurant.res_package')}}</button>
+          <button v-if="IsHotelPriceStock==1" @click="goUrl('RestaurantPackage',item.ID)"
+            class="hotelBtn">{{$t('restaurant.res_package')}}</button>
         </div>
       </div>
     </div>
-    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" :page-size="msg.pageSize"
-      layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
+      :page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
   </div>
 </template>
 
@@ -356,7 +376,7 @@
   export default {
     data() {
       return {
-        IsHotelPriceStock:0,//1-有获取餐厅与报价添加修改权限
+        IsHotelPriceStock: 0, //1-有获取餐厅与报价添加修改权限
         total: 0,
         currentPage: 1,
         countryList: "",
@@ -366,9 +386,10 @@
         Ids: [],
         tableData: "",
         deleteID: "",
-        DiningTypeList:[],
-        DiningPriceTypeList:[],
-        CooperationTypeList:[],
+        EmployeeList: [], //员工列表
+        DiningTypeList: [],
+        DiningPriceTypeList: [],
+        CooperationTypeList: [],
         status: [{
             value: "0",
             label: this.$t('pub.normalSel')
@@ -385,9 +406,9 @@
           pageIndex: 1,
           pageSize: 14,
           Name: "",
-          DiningType:"-1",
-          DiningPriceType:"-1",
-          CooperationType:"-1",
+          DiningType: "-1",
+          DiningPriceType: "-1",
+          CooperationType: "-1",
           QCountry: "",
           QProvince: "",
           QCity: "",
@@ -396,6 +417,7 @@
           total: 0,
           currentPage: 1,
           ID: 0,
+          UpdateBy: 0, //操作人
         }
       };
     },
@@ -495,8 +517,8 @@
           path: path,
           query: {
             id: id,
-            blank:'y',
-            tab:'套餐查询'
+            blank: 'y',
+            tab: '套餐查询'
           }
         });
       },
@@ -506,7 +528,7 @@
           path: path,
           query: {
             id: id,
-            blank:'y',
+            blank: 'y',
             cache: true
           }
         });
@@ -514,8 +536,7 @@
       //获取餐厅列表
       GetDiningTypeList() {
         this.apipost(
-        "dining_get_GetDiningType",
-        {},
+          "dining_get_GetDiningType", {},
           res => {
             if (res.data.resultCode == 1) {
               this.DiningTypeList = res.data.data;
@@ -527,8 +548,7 @@
       //获取餐厅价格列表
       GetDiningPriceTypeList() {
         this.apipost(
-        "dining_get_GetDiningPriceType",
-        {},
+          "dining_get_GetDiningPriceType", {},
           res => {
             if (res.data.resultCode == 1) {
               this.DiningPriceTypeList = res.data.data;
@@ -540,8 +560,7 @@
       //获取合作方式列表
       GetCooperationTypeList() {
         this.apipost(
-        "dining_get_GetCooperationType",
-        {},
+          "dining_get_GetCooperationType", {},
           res => {
             if (res.data.resultCode == 1) {
               this.CooperationTypeList = res.data.data;
@@ -561,8 +580,28 @@
           },
           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.EmployeeList = res.data.data;
             }
           },
+          err => {}
+        );
+      },
+    },
     created() {
       if (this.$route.query.hasOwnProperty("cache")) {
         if (this.$store.state.pageCondition != null) {
@@ -575,6 +614,7 @@
       }
     },
     mounted() {
+      this.getEmployeeList();
       this.GetHotelPirceStockAuth();
       this.getCountryList();
       this.selectResource();
@@ -583,4 +623,5 @@
       this.GetCooperationTypeList();
     }
   };
+
 </script>