页面修改

src/assets/common/lang/jp.js

@@ -335,7 +335,8 @@ export const admin={  //行政
     table_operater:'操作人',　　
     table_operattime:'オペレーテイングタイム',　　
     table_operat:'オペレーション',　　　　
-    product_name:'商品名',　　　
+    product_name:'商品名',　　
+    product_type_name:'部屋タイプ',  　
     table_hotelname:'ホテル名',　　
     table_Address:'ホテル住所',　　　　
     table_areaDetail:'詳しい住所を記入してください',　　　
@@ -466,7 +467,8 @@ export const admin={  //行政
     res_homeFacility:'民宿',　　　　　　　　　　　　　　　　
     res_SpringHotel:'温泉ホテル',　　　　　　　　　　　　　　
     res_package:'コース',　　　　　　　　　　　　　　　　　　　　
-    res_packageName:'セットメニュー名',　　　　　　　　　　　　　 
+    res_packageName:'セットメニュー名',　　
+    res_package_type_Name:'定食タイプ',  　　　　　　　　　　　 
     res_suplierName:'サプライヤー名',　　　　　　　　　　　　　
     res_belongArea:'所在地域',　　　　　　　　　　　　　　　
     res_Number:'数',　　　　　　　　　　　　　　　　　　　　
@@ -510,6 +512,7 @@ export const admin={  //行政
    sc_tel:'連絡先',
    sc_mpzy:'入場券ソース',
    sc_name:'入場券名称',
+   sc_type_name:'入場券タイプ',
    sc_bjts:'見積個数',
    sc_dj:'最低価格',
    sc_gj:'最高価格',

src/assets/common/lang/zh-tw.js

@@ -346,6 +346,7 @@ export const admin={  //行政
   table_operattime:'操作時間',  
   table_operat:'操作',  
   product_name:'產品名稱',  
+  product_type_name:'房間類型',  
   table_hotelname:'酒店名稱',  
   table_Address:'飯店地址',  
   table_areaDetail:'請輸入詳細地址',  
@@ -478,6 +479,7 @@ export const admin={  //行政
   res_SpringHotel:'溫泉飯店',  
   res_package:'套餐',  
   res_packageName:'套餐名稱',  
+  res_package_type_Name:'套餐類型',  
   res_suplierName:'供應商名稱',  
   res_belongArea:'所在區域', 
   res_Number:'數量',  
@@ -521,6 +523,7 @@ export const admin={  //行政
   sc_tel:'聯繫電話',  
   sc_mpzy:'門票資源',  
   sc_name:'門票名稱',  
+  sc_type_name:'門票類型',
   sc_bjts:'報價條數',  
   sc_dj:'最低價格',  
   sc_gj:'最高價格',

src/assets/common/lang/zh.js

@@ -346,6 +346,7 @@ export const admin={  //行政
    table_operattime:'操作时间',
    table_operat:'操作',
    product_name:'产品名称',
+   product_type_name:'房间类型',  
    table_hotelname:'酒店名称',
    table_Address:'酒店地址',
    table_areaDetail:'请输入详细地址',
@@ -478,6 +479,7 @@ export const admin={  //行政
    res_SpringHotel:'温泉酒店',
    res_package:'套餐',
    res_packageName:'套餐名称',
+   res_package_type_Name:'套餐类型',  
    res_suplierName:'供应商名称',
    res_belongArea:'所在区域',
    res_Number:'数量',
@@ -521,6 +523,7 @@ export const admin={  //行政
    sc_tel:'联系电话',
    sc_mpzy:'门票资源',
    sc_name:'门票名称',
+   sc_type_name:'门票类型',
    sc_bjts:'报价条数',
    sc_dj:'最低价格',
    sc_gj:'最高价格',

src/components/Hotel/HotelManagement.vue

@@ -267,7 +267,6 @@
             </el-select>
           </span>
         </li> 
-       
         <li>
           <span>
             <em>{{$t('Operation.Op_price')}}</em>
@@ -299,7 +298,6 @@
         <div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
           <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="RemainingInventory">{{item.RemainingInventory}}</div> -->
           <div class="resTypeList">
             <span v-for="(items,index) in item.OpenPlatformList" :key="index"
               :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}">{{items.Name}}</span>
@@ -322,7 +320,7 @@
           popper-class="max-w250">
           <div class="hotelTitle fz12">{{$t('ground.zhenshimingcheng')}}: {{item.HotelRealName}}</div>
         </el-tooltip>
-        <div class="brandList clearfix">
+        <div class="brandList clearfix" style="display:none;">
           <div class="brand">
             <i class="iconfont honor icon-img_biaozhi"></i>
             {{item.ChainBrand}}
@@ -349,8 +347,10 @@
         </el-tooltip>
         <div class="btnList">
           <button @click="goSubInfo('HotelInfo',item.ID)" class="hotelBtnMan">{{$t('pub.updateMsg')}}</button>
-          <button @click="CopyHotel(item.ID)" class="hotelBtnMan">复制</button>
-          <button v-if="IsHotelPriceStock==1" style="width:80px;" @click="goUrl('HotelProductManage2',item)"
+          <button @click="CopyHotel(item.ID)" class="hotelBtnMan" v-if="userInfo.RB_Group_id==QjGroupId()">复制</button>
+          <button @click="goproduct('HotelProductManage',item)" class="hotelBtnMan">房型</button>
+          <br/>
+          <button v-if="IsHotelPriceStock==1" style="width:80px;margin-top:10px;" @click="goUrl('HotelProductManage2',item)"
             class="hotelBtnMan">{{$t('ground.baojiayukucun')}}</button>
         </div>
       </div>
@@ -363,6 +363,7 @@
   export default {
     data() {
       return {
+        userInfo:{},//登录用户信息
         IsHotelPriceStock: 0, //1-有获取酒店库存与报价添加修改权限
         countryList: "",
         provinceList: "",
@@ -529,6 +530,19 @@
           }
         });
       },
+      //调整到房型列表
+      goproduct(path, item) {
+        this.$router.push({
+          path: path,
+          query: {
+            id: item.ID,
+            Country:item.Country,
+            IsSelfBook:item.IsSelfBook,
+            blank: 'y',
+            tab: '房型列表'
+          }
+        });
+      },
       goSubInfo(path, id) {
         this.$store.commit("pageConditionUpdate", this.msg);
         this.$router.push({
@@ -576,9 +590,8 @@
       },
       //根据当前员工所在部门获取该部门及子部门员工信息
       getEmployeeList() {
-        let userInfo = this.getLocalStorage();
         let msg = {
-          GroupId: userInfo.RB_Group_id,
+          GroupId: this.userInfo.RB_Group_id,
           BranchId: "-1",
           DepartmentId: "-1",
           PostId: "-1",
@@ -596,6 +609,7 @@
       },
     },
     mounted() {
+      this.userInfo=this.getLocalStorage();
       this.getEmployeeList();
       this.GetHotelPirceStockAuth();
       this.getCountryList();

src/components/Hotel/HotelProductManage.vue

@@ -171,8 +171,11 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('hotel.product_name')" prop="HotelProductType">
-          <el-select filterable v-model='addMsg.HotelProductType' :placeholder="$t('pub.pleaseSel')">
+        <el-form-item :label="$t('hotel.product_name')">
+          <el-input class="w300" type="text" v-model="addMsg.Name" maxlength="20"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('hotel.product_type_name')" prop="HotelProductType" >
+          <el-select filterable v-model='addMsg.HotelProductType' :placeholder="$t('pub.pleaseSel')" class="w300">
             <el-option v-for='item in HotelProductTypeList' :label='item.Name' :value='item.Id' :key='item.Id'>
             </el-option>
           </el-select>
@@ -231,7 +234,8 @@
         </td>
         <td>
           <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
-            <el-button type="primary" @click="outerVisible = true,dialogTitle=$t('ground.xiugaijiudcp'),updateProduct(index,item.ID)"
+            <el-button type="primary"
+              @click="outerVisible = true,dialogTitle=$t('ground.xiugaijiudcp'),updateProduct(index,item.ID)"
               icon="el-icon-edit" circle></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="$t('restaurant.res_bidManage')" placement="top-start">

src/components/Restaurant/RestaurantPackage.vue

@@ -73,9 +73,7 @@
     overflow: hidden;
     text-overflow: ellipsis;
     display: -webkit-box;
-    /*! autoprefixer: off */
     -webkit-box-orient: vertical;
-    /* autoprefixer: on */
     -webkit-line-clamp: 2;
   }
 
@@ -105,8 +103,8 @@
         <li>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
             @click="getList(),resetPageIndex()" />
-          <input type="button" class="normalBtn" @click="resetId(),outerVisible = true,dialogTitle=$t('ground.tianjiataocan')"
-            :value="$t('pub.addBtn')" />
+          <input type="button" class="normalBtn"
+            @click="resetId(),outerVisible = true,dialogTitle=$t('ground.tianjiataocan')" :value="$t('pub.addBtn')" />
         </li>
       </ul>
     </div>
@@ -179,15 +177,16 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('restaurant.res_packageName')" prop="DiningMealType">
-          <el-select filterable v-model='addMsg.DiningMealType' :placeholder="$t('pub.pleaseSel')">
+        <el-form-item :label="$t('restaurant.res_packageName')" prop="MealName">
+          <el-input class="w300" type="text" v-model="addMsg.MealName" maxlength="20"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('restaurant.res_package_type_Name')" prop="DiningMealType">
+          <el-select filterable v-model='addMsg.DiningMealType' :placeholder="$t('pub.pleaseSel')" class="w300">
             <el-option v-for='item in DiningMealTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
             </el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item :label="$t('restaurant.res_packageName')" prop="MealName">
-                    <el-input class="w300" type="text" v-model="addMsg.MealName" maxlength="20"></el-input>
-                </el-form-item> -->
+      
         <el-form-item :label="$t('hotel.hotel_produceDes')" prop="MealDesc">
           <el-input class="w300" type="textarea" v-model="addMsg.MealDesc" maxlength="200"></el-input>
         </el-form-item>
@@ -278,7 +277,8 @@
       saveResource() {
         this.DiningMealTypeList.forEach(item => {
           if (this.addMsg.DiningMealType == item.ID) {
-            this.addMsg.MealName = item.Name
+            // HK 2020-05-06注释
+            //this.addMsg.MealName = item.Name
           }
         })
         this.apipost(

src/components/scenicSpot/ticketManagement.vue

 <style>
-.ticketManagement .singeRowTable tr:nth-child(n + 2):hover {
+  .ticketManagement .singeRowTable tr:nth-child(n + 2):hover {
     background-color: white;
     box-shadow: 0px 0px 14px 0px #adadad;
     z-index: 10;
     position: relative;
-}
-.ticketManagement .DaysInfo span {
+  }
+
+  .ticketManagement .DaysInfo span {
     display: inline-block;
     background-color: #2aaef2;
     color: white;
@@ -13,49 +14,58 @@
     padding: 0 10px;
     height: 30px;
     line-height: 30px;
-}
-.ticketManagement .DaysInfo span i {
+  }
+
+  .ticketManagement .DaysInfo span i {
     margin-right: 10px;
-}
-.ticketManagement .singeRowTable tr:nth-child(n + 2) {
+  }
+
+  .ticketManagement .singeRowTable tr:nth-child(n + 2) {
     height: 80px;
     text-align: center;
-}
-.ticketManagement .detailsIT .singeRowTable tr:nth-child(n + 2):hover {
+  }
+
+  .ticketManagement .detailsIT .singeRowTable tr:nth-child(n + 2):hover {
     background-color: white;
     box-shadow: 0px 0px 14px 0px #adadad;
     z-index: 10;
     position: relative;
-}
-.ticketManagement .Ldata {
+  }
+
+  .ticketManagement .Ldata {
     color: #333333;
     margin-top: 5px;
-}
-.ticketManagement .LP {
+  }
+
+  .ticketManagement .LP {
     color: #e95252;
-}
-.ticketManagement .HP {
+  }
+
+  .ticketManagement .HP {
     color: #2aaef2;
     text-align: left;
     font-size: 14px;
     font-weight: bold;
     padding-left: 5px;
     display: inline-block;
-}
-.ticketManagement .T1 {
+  }
+
+  .ticketManagement .T1 {
     text-align: right;
     color: #666666;
     display: inline-block;
-}
-.ticketManagement .T2 {
+  }
+
+  .ticketManagement .T2 {
     text-align: left;
     color: #e95252;
     font-size: 14px;
     font-weight: bold;
     padding-left: 5px;
     display: inline-block;
-}
-.ticketManagement .descripTion {
+  }
+
+  .ticketManagement .descripTion {
     border-radius: 4px;
     width: 266px;
     text-align: left;
@@ -67,11 +77,13 @@
     -webkit-box-orient: vertical;
     /* autoprefixer: on */
     -webkit-line-clamp: 2;
-}
-.ticketManagement .singeRowTable tr:nth-child(n + 2):hover .descripTion {
+  }
+
+  .ticketManagement .singeRowTable tr:nth-child(n + 2):hover .descripTion {
     background-color: #ededed;
-}
-.ticketManagement .roomName {
+  }
+
+  .ticketManagement .roomName {
     display: inline-block;
     width: 200px;
     overflow: hidden;
@@ -79,13 +91,16 @@
     white-space: nowrap;
     text-align: left;
     padding-left: 20px;
-}
-.ticketManagement .w300 .el-textarea__inner {
+  }
+
+  .ticketManagement .w300 .el-textarea__inner {
     height: 140px;
-}
-.ticketManagement .el-dialog--center .el-dialog__body {
+  }
+
+  .ticketManagement .el-dialog--center .el-dialog__body {
     padding: 25px 25px 0;
-}
+  }
+
 </style>
 <template>
   <div class='flexOne ticketManagement'>
@@ -96,12 +111,15 @@
           <el-input v-model="msg.TicketName" maxlength="30" @keyup.native.enter="getList"></el-input>
         </li>
         <li>
-          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList(),resetPageIndex()" />
-          <input type="button" class="normalBtn" @click="outerVisible = true,dialogTitle='添加门票'" :value="$t('pub.addBtn')" />
+          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
+            @click="getList(),resetPageIndex()" />
+          <input type="button" class="normalBtn" @click="outerVisible = true,dialogTitle='添加门票'"
+            :value="$t('pub.addBtn')" />
         </li>
       </ul>
     </div>
-    <table class="singeRowTable centerTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading" style="border-collapse:separate;border-spacing:0px 10px;table-layout:fixed;">
+    <table class="singeRowTable centerTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"
+      style="border-collapse:separate;border-spacing:0px 10px;table-layout:fixed;">
       <tr>
         <th width="200">{{$t('scen.sc_name')}}</th>
         <th width="200">{{$t('scen.sc_bjts')}}</th>
@@ -112,7 +130,8 @@
       </tr>
       <tr v-for="item in DataList" :key="item.subCode">
         <td>
-          <el-tooltip class="item" effect="dark" :content="item.TicketName" placement="top-start" popper-class="max-w250">
+          <el-tooltip class="item" effect="dark" :content="item.TicketName" placement="top-start"
+            popper-class="max-w250">
             <span class="roomName">{{item.TicketName}}</span>
           </el-tooltip>
         </td>
@@ -121,13 +140,15 @@
         </td>
         <td>
           <p class="clearfix">
-            <span class="tit_name T1">{{getCurrencyCode(item.CurrencyId)}}</span><span class='tit_name T2'>{{item.LPrice}}</span>
+            <span class="tit_name T1">{{getCurrencyCode(item.CurrencyId)}}</span><span
+              class='tit_name T2'>{{item.LPrice}}</span>
           </p>
           <p class="Ldata">{{item.LDate}}</p>
         </td>
         <td>
           <p class="clearfix">
-            <span class="tit_name T1">{{getCurrencyCode(item.CurrencyId)}}</span><span class='tit_name HP'>{{item.HPrice}}</span>
+            <span class="tit_name T1">{{getCurrencyCode(item.CurrencyId)}}</span><span
+              class='tit_name HP'>{{item.HPrice}}</span>
           </p>
           <p class="Ldata">{{item.HDate}}</p>
         </td>
@@ -140,10 +161,12 @@
         <td>
           <el-button-group>
             <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
-              <el-button type="primary" icon="iconfont icon-Edit" @click="outerVisible = true,dialogTitle='修改门票',updateResturant(item.Id)"></el-button>
+              <el-button type="primary" icon="iconfont icon-Edit"
+                @click="outerVisible = true,dialogTitle='修改门票',updateResturant(item.Id)"></el-button>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="报价管理" placement="top-start">
-              <el-button type="primary" icon="iconfont icon-ico_shezhi" @click="goUrl('scenicSpotPackagePrice',item.Id)"></el-button>
+              <el-button type="primary" icon="iconfont icon-ico_shezhi"
+                @click="goUrl('scenicSpotPackagePrice',item.Id)"></el-button>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
               <el-button type="danger" icon="el-icon-delete" @click="isDelete(item.Id)"></el-button>
@@ -152,7 +175,8 @@
         </td>
       </tr>
     </table>
-    <el-dialog custom-class='w500' :visible.sync="outerVisible" :title="dialogTitle" center :before-close="closeChangeMachie">
+    <el-dialog custom-class='w500' :visible.sync="outerVisible" :title="dialogTitle" center
+      :before-close="closeChangeMachie">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="110px">
         <el-form-item :label="$t('scen.sc_mpzy')" prop="CouponsId">
           <el-select :placeholder="$t('pub.pleaseSel')" class="w300" disabled v-model="addMsg.CouponsId">
@@ -160,15 +184,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item :label="$t('scen.sc_name')" prop="TicketName">
+        <el-form-item :label="$t('scen.sc_name')" prop="TicketName">
           <el-input class="w300" type="text" v-model="addMsg.TicketName" maxlength="20"></el-input>
-        </el-form-item> -->
-          <el-form-item :label="$t('scen.sc_name')" prop="TicketCouponsType">
-            <el-select filterable  v-model='addMsg.TicketCouponsType' :placeholder="$t('pub.pleaseSel')">
-              <el-option v-for='item in TickettTypeList' 
-              :label='item.Name'
-              :value='item.ID'
-              :key='item.ID'>
+        </el-form-item>
+        <el-form-item :label="$t('scen.sc_type_name')" prop="TicketCouponsType">
+          <el-select filterable v-model='addMsg.TicketCouponsType' :placeholder="$t('pub.pleaseSel')" class="w300">
+            <el-option v-for='item in TickettTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
             </el-option>
           </el-select>
         </el-form-item>
@@ -177,7 +198,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <button class="hollowFixedBtn" @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button>
+        <button class="hollowFixedBtn"
+          @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button>
         &nbsp;
         <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
       </div>
@@ -185,13 +207,13 @@
     <div class="noData" v-show="noData">
       {{$t('system.content_noData')}}
     </div>
-    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
-      :page-size='msg.pageSize' :total='msg.total'>
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+      layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='msg.total'>
     </el-pagination>
   </div>
 </template>
 <script>
-export default {
+  export default {
     data() {
       return {
         msg: {
@@ -206,10 +228,10 @@ export default {
           CouponsId: "",
           TicketName: "",
           TicketDesc: "",
-        TicketCouponsType:"",
+          TicketCouponsType: "",
         },
         TicketID: "",
-      TickettTypeList:[],
+        TickettTypeList: [],
         loading: true,
         total: 0,
         currentPage: 1,
@@ -220,18 +242,14 @@ export default {
         TicketCouponsList: "",
         rules: {
           //表单必填验证
-        CouponsId: [
-          {
+          CouponsId: [{
             required: true,
             message: "请选择门票资源"
-          }
-        ],
-        TicketCouponsType: [
-          {
+          }],
+          TicketCouponsType: [{
             required: true,
             message: "请选择门票类型"
-          }
-        ]
+          }]
         },
         allCurrencyList: []
       };
@@ -247,6 +265,7 @@ export default {
             if (res.data.resultCode == 1) {
               this.total = res.data.data.count;
               this.DataList = res.data.data.pageData;
+              console.log("this.datalist",this.DataList);
               this.noData = !this.total > 0;
             }
           },
@@ -303,10 +322,8 @@ export default {
           }, res => {
             if (res.data.resultCode == 1) {
               this.getList()
-            } else {
-            }
-          }, err => {
-          })
+            } else {}
+          }, err => {})
         }).catch(() => {
           this.$message({
             type: 'info',
@@ -320,17 +337,17 @@ export default {
           query: {
             TicketID: id,
             CouponsId: this.TicketID,
-          blank:'y',
-          tab:'报价管理'
+            blank: 'y',
+            tab: '报价管理'
           }
         });
       },
-    GetTicketType(){
-    		this.apipost('ticketcouponsprice_post_GetTicketType',{},res=>{
-				if(res.data.resultCode==1){
-          this.TickettTypeList=res.data.data
+      GetTicketType() {
+        this.apipost('ticketcouponsprice_post_GetTicketType', {}, res => {
+          if (res.data.resultCode == 1) {
+            this.TickettTypeList = res.data.data
           }
-			},err=>{}) 
+        }, err => {})
       },
       //翻页功能按钮
       handleCurrentChange(val) {
@@ -358,10 +375,10 @@ export default {
       },
       submitForm(addMsg) {
         //提交创建、修改表单
-       this.TickettTypeList.forEach(item=>{
-					if(this.addMsg.TicketCouponsType==item.ID)
-					{
-						 this.addMsg.TicketName =item.Name
+        this.TickettTypeList.forEach(item => {
+          if (this.addMsg.TicketCouponsType == item.ID) {
+            // HK 2020-05-06注释
+            //this.addMsg.TicketName = item.Name
           }
         })
         let that = this;
@@ -379,7 +396,7 @@ export default {
           CouponsId: "",
           TicketName: "",
           TicketDesc: "",
-        TicketCouponsType:''
+          TicketCouponsType: ''
         };
         this.addMsg = newMsg;
       },
@@ -396,8 +413,7 @@ export default {
       //获取所有币种
       getAllCurrency() {
         this.apipost(
-        "financeinfo_post_GetList",
-        {},
+          "financeinfo_post_GetList", {},
           res => {
             if (res.data.resultCode == 1) {
               this.allCurrencyList = res.data.data;
@@ -426,5 +442,5 @@ export default {
       this.getList();
       this.GetTicketType();
     }
-};
+  };
 </script>
\ No newline at end of file