页面修改

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

@@ -2440,7 +2440,7 @@ export const sm={
   dingdancaozuo:"訂單操作",
   closenotcaozuo:"關閉後,業務人員將不能操作訂單",
   tonghangzaixianyd:"同行線上預訂",
-  cpjhtuiB2bzzd:'產品將會直接推送到B2B網站',
+  cpjhtuiB2bzzd:'產品將會直接推送到B2B、小程序網站',
   bmhb:'報名候補',
   closenotcsrenshu:'關閉後不可超收人數',
   zhikezxyd:'直客線上預訂',

src/assets/common/lang/zh.js

@@ -2452,7 +2452,7 @@ export const sm={
   dingdancaozuo:"订单操作",
   closenotcaozuo:"关闭后，业务人员将不能操作订单",
   tonghangzaixianyd:"同行在线预订",
-  cpjhtuiB2bzzd:'产品将会直接推送到B2B站点',
+  cpjhtuiB2bzzd:'产品将会直接推送到B2B、小程序站点',
   bmhb:'报名候补',
   closenotcsrenshu:'关闭后不可超收人数',
   zhikezxyd:'直客在线预订',

src/components/Restaurant/RestaurantSalesBoard.vue

@@ -204,25 +204,26 @@
         <li>
           <span>
             <em>{{$t('commonPickUp.Pick_resName')}}</em>
-            <el-select v-model="msg.DiningIDList" :placeholder="$t('pub.pleaseSel')"
-            multiple collapse-tags filterable @change="getMultipleChoice" style="width: 300px;">
+            <el-select v-model="msg.DiningIDList" :placeholder="$t('pub.pleaseSel')" multiple collapse-tags filterable
+              @change="getMultipleChoice" style="width: 300px;">
               <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
               <el-option v-for="item in DinnerList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </span>
         </li>
-        <li >
+        <li>
           <span>
             <em>{{$t('advmanager.v_type')}}</em>
             <el-select v-model="msg.QStatus" :placeholder="$t('pub.pleaseSel')" filterable>
-              <el-option  :key="0" :label="$t('ground.dijiectdd')" :value="0"></el-option>
-              <el-option  :key="1" :label="$t('ground.xingchct')" :value="1"></el-option>
+              <el-option :key="0" :label="$t('ground.dijiectdd')" :value="0"></el-option>
+              <el-option :key="1" :label="$t('ground.xingchct')" :value="1"></el-option>
             </el-select>
           </span>
         </li>
         <li style="margin-right:50px;">
           <button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
-          <button class="normalBtn" type="button" @click="DownLoadDinnerSalesBoard()">{{$t('adm.adm_download')}}</button>
+          <button class="normalBtn" type="button"
+            @click="DownLoadDinnerSalesBoard()">{{$t('adm.adm_download')}}</button>
         </li>
       </ul>
     </div>
@@ -257,12 +258,16 @@
       <li>{{$t('hotel.hotel_Sunday')}}</li>
     </ul>
     <ul class="days clearfix" v-loading="msg.loading">
-      <li v-for="(dayItem,index) in days" :key="dayItem.index">
+      <li v-for="(dayItem,index) in days" :key="`day_`+dayItem.index+index">
         <p class="ckStyle" :class="{ckStyleOther:dayItem.day.getMonth()+1 != currentMonth}">{{dayItem.day.getDate()}}
         </p>
         <div>
-          <p v-for="item in dayItem.dayValue">
-            <span class="text_underLine">{{item.DinnerName}}（{{item.DiningNum}}）</span>
+          <p v-for="(item,subIndex) in dayItem.dayValue" :key="`details_`+index+subIndex">
+            <span class="text_underLine">{{item.DinnerName}}
+              <el-tooltip class="item" effect="dark" :content="`预定人数`+item.DiningNum+`人`" placement="top-start"
+                popper-class="max-w250">
+                <font>({{item.DiningNum}})</font>
+              </el-tooltip></span>
           </p>
         </div>
       </li>
@@ -277,11 +282,11 @@
           Year: 0,
           Month: 0,
           DiningID: 0,
-          DiningIDList:[],
+          DiningIDList: [],
           DiningIDs: '',
-          QStatus:0,
+          QStatus: 0,
           loading: false,
-          uid:0,
+          uid: 0,
         },
         //餐厅列表
         DinnerList: [],
@@ -301,21 +306,21 @@
     },
     methods: {
       // 多选
-      getMultipleChoice(){
-        if(this.msg.DiningIDList.length>1){
-            if(this.msg.DiningIDList.at(-1)==0){
-              this.msg.DiningIDList = [0]
-            }else if(this.msg.DiningIDList.at(-1)!=0){
-              this.msg.DiningIDList.forEach((x,index)=>{
-                if(x==0){
-                  this.msg.DiningIDList.splice(index,1)
-                }
-              })
-            }
-            this.msg.DiningID = 0
-            this.msg.DiningIDs = this.msg.DiningIDList.join(',')
+      getMultipleChoice() {
+        if (this.msg.DiningIDList.length > 1) {
+          if (this.msg.DiningIDList.at(-1) == 0) {
+            this.msg.DiningIDList = [0]
+          } else if (this.msg.DiningIDList.at(-1) != 0) {
+            this.msg.DiningIDList.forEach((x, index) => {
+              if (x == 0) {
+                this.msg.DiningIDList.splice(index, 1)
+              }
+            })
+          }
+          this.msg.DiningID = 0
+          this.msg.DiningIDs = this.msg.DiningIDList.join(',')
         }
-        if(this.msg.DiningIDList.length==1){
+        if (this.msg.DiningIDList.length == 1) {
           this.msg.DiningID = this.msg.DiningIDList[0]
           this.msg.DiningIDs = ''
         }
@@ -428,17 +433,17 @@
       },
       //下载餐厅统计
       DownLoadDinnerSalesBoard() {
-        if (this.msg.DiningID<=0&&!this.msg.DiningIDs) {
+        if (this.msg.DiningID <= 0 && !this.msg.DiningIDs) {
           this.Info(this.$t('sm.qxzcanting'));
           return;
         }
         let url
-        if(this.msg.DiningID>0){
+        if (this.msg.DiningID > 0) {
           url = 'dinner_get_downloadDinnerSalesBoard'
-        }else{
-          url ='dinner_get_downloadDinnerSalesBoardNew'
+        } else {
+          url = 'dinner_get_downloadDinnerSalesBoardNew'
         }
-        this.msg.uid=this.getLocalStorage().EmployeeId;
+        this.msg.uid = this.getLocalStorage().EmployeeId;
         this.msg.loading = true;
         let fileName = this.$t('ground.cantxiazai') + this.$commonUtils.getCurrentDate() + ".xls";
 

src/components/Restaurant/restaurantInfoManage.vue

@@ -838,13 +838,13 @@
             <div class="toolOne">
               <span class="toolSpan">{{$t('scen.sc_fdTag')}}</span>
               <div class="footabs">
-                <el-tag :key="tag" v-for="tag in tipsList" closable :disable-transitions="false"
-                  @close="handleClose(tag)">{{tag}}
+                <el-tag :key="tag" v-for="tag in foodTagList" closable :disable-transitions="false"
+                  @close="handleCloseFoodTag(tag)">{{tag}}
                 </el-tag>
                 <el-input class="input-new-tag" v-if="inputVisible" v-model="inputValue" ref="saveTagInput" size="small"
-                  @keyup.enter.native="handleInputConfirm" @blur="handleInputConfirm">
+                  @keyup.enter.native="handleFoodTagInputConfirm" @blur="handleFoodTagInputConfirm">
                 </el-input>
-                <el-button v-else class="button-new-tag" size="small" @click="showInput">+ {{$t('pub.addBtn')}}
+                <el-button v-else class="button-new-tag" size="small" @click="showFoodTag">+ {{$t('pub.addBtn')}}
                 </el-button>
               </div>
             </div>
@@ -963,7 +963,7 @@
         totalimg: "",
         selecnum: 0,
         ID: "",
-        tipsList: [],
+        foodTagList: [],//实物标签
         tipsItem: "",
         Geographic: [],
         GeoItem: "",
@@ -1158,7 +1158,7 @@
           picPathArr.push(x.Path);
         });
         this.addMsg.PicPath = picPathArr.join(",");
-        this.addMsg.FoodTag = this.tipsList.join(",");
+        this.addMsg.FoodTag = this.foodTagList.join(",");
         this.addMsg.GeographicTag = this.Geographic.join(",");
         this.addMsg.DiningImageList = this.DiningImageArray;
         this.addMsg.DeleteImageList = this.DeleteImageArray;
@@ -1244,7 +1244,7 @@
                 }
               }
               if (res.data.data.FoodTag != "") {
-                this.tipsList = res.data.data.FoodTag.split(",");
+                this.foodTagList = res.data.data.FoodTag.split(",");
               }
               if (res.data.data.GeographicTag != "") {
                 this.Geographic = res.data.data.GeographicTag.split(",");
@@ -1321,28 +1321,30 @@
       },
       getItemList(type) {
         if (type == 1) {
-          this.tipsList.push(this.tipsItem);
+          this.foodTagList.push(this.tipsItem);
           this.tipsItem = "";
         } else {
           this.Geographic.push(this.GeoItem);
           this.GeoItem = "";
         }
       },
-      handleClose(tag) {
-        this.tipsList.splice(this.tipsList.indexOf(tag), 1);
+      handleCloseFoodTag(tag) {
+        this.foodTagList.splice(this.foodTagList.indexOf(tag), 1);
       },
-
-      showInput() {
+      showFoodTag() {
         this.inputVisible = true;
+        if(this.foodTagList&&this.foodTagList.length==0)
+        {
+          this.foodTagList.push("徐總推薦")
+        }
         this.$nextTick(_ => {
           this.$refs.saveTagInput.$refs.input.focus();
         });
       },
-
-      handleInputConfirm() {
+      handleFoodTagInputConfirm() {
         let inputValue = this.inputValue;
         if (inputValue) {
-          this.tipsList.push(inputValue);
+          this.foodTagList.push(inputValue);
         }
         this.inputVisible = false;
         this.inputValue = "";
@@ -1350,14 +1352,12 @@
       handleClose2(tag) {
         this.Geographic.splice(this.Geographic.indexOf(tag), 1);
       },
-
       showInput2() {
         this.inputVisible2 = true;
         this.$nextTick(_ => {
           this.$refs.saveTagInput.$refs.input.focus();
         });
       },
-
       handleInputConfirm2() {
         let inputValue = this.inputValue2;
         if (inputValue) {

src/components/Restaurant/restaurantList.vue

@@ -322,7 +322,7 @@
           <button class="hollowFixedBtn" type="button"
             @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
           <!--v-if="IsEditDmcSource==1"-->
-          <button class="normalBtn" type="button" 
+          <button class="normalBtn" type="button"
             @click="$router.push('restaurantInfoManage')">{{$t('pub.addBtn')}}</button>
         </li>
       </ul>
@@ -333,32 +333,33 @@
           <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}"
-              :key="index">{{items.Name}}</span>
+            <span class="foodList" v-for="(items,index) in item.FoodTagArr" :key="`ft_`+index">{{items}}</span>
           </div>
           <div class="delScien" @click="isdelete(item.ID)">
             <i class="iconfont icon-xingzhuang"></i>
           </div>
           <div class="starSu">
             <div class="star">
-              <span class="foodList">{{item.DiningTypeName}}</span>
-              <!-- <span class="foodList" v-for="(items,index) in item.FoodTagArr" :key="index">{{items}}</span> -->
+              <span class="foodList" v-if="item.DiningTypeName&&item.DiningTypeName!=''">{{item.DiningTypeName}}</span>
             </div>
-            <span v-if="item.Star==8" class="sushe">{{$t('restaurant.res_homeFacility')}}</span>
-            <span v-if="item.Star==9" class="sushe">{{$t('restaurant.res_SpringHotel')}}</span>
           </div>
         </div>
         <el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250">
-          <div class="hotelTitle fz12">{{item.Name}}</div>
+          <div class="hotelTitle">{{item.Name}}</div>
         </el-tooltip>
         <el-tooltip class="item" effect="dark" :content="item.RealName" placement="top-start" popper-class="max-w250">
-          <div class="hotelTitle fz12">{{$t('ground.zhenshimingcheng')}}:<font class="F1">{{item.RealName}}</font>
+          <div class="hotelTitle">{{$t('ground.zhenshimingcheng')}}:<font class="F1">{{item.RealName}}</font>
           </div>
         </el-tooltip>
+        <template v-if="item.OpenPlatformList&&item.OpenPlatformList.length>0">
+          <div class="hotelTitle fz12">上架平台:<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="`pl_`+index" style="padding-left:1px;">{{items.Name}}</span>
+          </div>
+        </template>
         <el-tooltip class="item" effect="dark" :content="item.UseTypeListStr" placement="top-start"
           popper-class="max-w250">
-          <div class="hotelTitle">适用类型:<font class="F2" v-for="(subItem,subIndex) in item.UseTypeList"
+          <div class="hotelTitle fz12">适用类型:<font class="F2" v-for="(subItem,subIndex) in item.UseTypeList"
               :key="`ut_`+index+subIndex">
               {{subItem}}
             </font>
@@ -366,18 +367,6 @@
         </el-tooltip>
         <div class="hotelTitle fz12">最低餐标: <font class="F3">{{item.MinDinnerPrice>0?item.MinDinnerPrice:"/"}}</font>
         </div>
-        <!-- <div class="brandList clearfix">
-          <div class="brand">
-            <span class="SupportCount">{{item.UseTypeList}}</span>
-            <div></div>
-          </div>
-          <div class="line"></div>
-          <div class="dayNum">
-            <span class="dayNumber">{{item.MinDinnerPrice>0?item.MinDinnerPrice:"/"}}</span>
-            {{$t('hotel.hotel_people')}}
-            <div>最低餐标</div>
-          </div>
-        </div> -->
         <div style="padding:0 0 15px 15px;margin-top: 5px;">
           <i class="iconfont icon-renyuanguanli"></i>
           <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
@@ -385,7 +374,7 @@
         </div>
         <div class="btnList">
           <!--v-if="IsEditDmcSource==1"-->
-          <button  @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
+          <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>
         </div>

src/components/commonPage/commonDinnerInfo.vue

@@ -47,38 +47,42 @@
           <th width="150" v-if="showHotelObj.showPrice"> 餐标</th>
           <th width="100" v-if="showHotelObj.showZhan">预约时间</th>
           <th width="100" v-if="showHotelObj.showZhan">操作人</th>
-          
+
           <th width="120">{{$t('salesModule.DJstatus')}}</th>
           <th width="100" v-if="showHotelObj.showZhan">确认时间</th>
         </tr>
         <template v-if=" DiningObj&& DiningObj.length>0">
-          <tr v-for="(hotelSubItem,hotelSubIndex) in DiningObj">
+          <tr v-for="(hotelSubItem,hotelSubIndex) in DiningObj" :key="`p_d_`+hotelSubIndex">
             <td>
               {{hotelSubItem.UseTime}}（{{getDayByDate(hotelSubItem.UseTime)}}）
             </td>
             <td style="text-align:left;padding-left:3px;">
 
-              <el-link  type="info" style="font-size:12px;"  @click="goDinnerDetails('restaurantInfoManage',  hotelSubItem.OldDiningID ) "><template v-if="hotelSubItem.DinnerRealName!=hotelSubItem.NewDinnerRealName && hotelSubItem.NewDinnerRealName!=''">
-                <span style="text-decoration:line-through;color:#606266;"> {{hotelSubItem.DinnerRealName}}</span>
+              <template
+                v-if="hotelSubItem.DinnerRealName!=hotelSubItem.NewDinnerRealName && hotelSubItem.NewDinnerRealName!=''">
+                <span style="text-decoration:underline;color:#606266;cursor:pointer;"
+                  @click="goDinnerDetails('restaurantInfoManage',  hotelSubItem.OldDiningID ) ">
+                  {{hotelSubItem.DinnerRealName}}</span>
               </template>
               <template v-else>
-                <span style="color:#606266;"> {{hotelSubItem.DinnerRealName}}</span>   
-              </template></el-link>
-            
+                <span style="color:#606266;text-decoration:underline;cursor:pointer;"
+                  @click="goDinnerDetails('restaurantInfoManage',  hotelSubItem.OldDiningID ) ">
+                  {{hotelSubItem.DinnerRealName}}</span>
+              </template>
             </td>
             <td style="text-align:left;padding-left:3px;color:red">
-              <el-link type="info" style="font-size:12px;"  @click="goDinnerDetails('restaurantInfoManage',  hotelSubItem.NewDiningID ) ">  
-                <span style="color:#606266;">   {{hotelSubItem.DinnerRealName!=hotelSubItem.NewDinnerRealName?""+hotelSubItem.NewDinnerRealName:""}}
-                </span>   
-                </el-link>
+              <span style="color:#606266;text-decoration:underline;cursor:pointer;"
+                @click="goDinnerDetails('restaurantInfoManage',  hotelSubItem.NewDiningID ) ">
+                {{hotelSubItem.DinnerRealName!=hotelSubItem.NewDinnerRealName?""+hotelSubItem.NewDinnerRealName:""}}
+              </span>
             </td>
-            <td >
+            <td>
               <template v-if="showHotelObj.showPrice&&hotelSubItem.PriceList&&hotelSubItem.PriceList.length>0">
-                <span v-for="(priceSubItem,priceSubIndex) in hotelSubItem.PriceList" :key="`din`+priceSubIndex"   >
-                <template v-if="priceSubItem.GuestType==1">
-                {{priceSubItem.UnitPrice}}
-                </template>
-              </span>
+                <span v-for="(priceSubItem,priceSubIndex) in hotelSubItem.PriceList" :key="`din`+priceSubIndex">
+                  <template v-if="priceSubItem.GuestType==1">
+                    {{priceSubItem.UnitPrice}}
+                  </template>
+                </span>
               </template>
             </td>
             <td>
@@ -145,14 +149,14 @@
         }
       },
 
-       // 跳转餐厅详情页  restaurantInfoManage  ///#/restaurantInfoManage?id=4688&blank=y&cache=true 
-       goDinnerDetails: function (path, id) {
+      // 跳转餐厅详情页  restaurantInfoManage  ///#/restaurantInfoManage?id=4688&blank=y&cache=true 
+      goDinnerDetails: function (path, id) {
         this.$router.push({
           name: path,
           query: {
             id: id,
             blank: "y",
-            cache:true,
+            cache: true,
           },
         });
       },

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -944,7 +944,7 @@
                         <span class="TCswitch">
                           <el-switch v-model="priceData.IsB2B" :active-value="inActive" :inactive-value="notInActive">
                           </el-switch>
-                          <div class="TC-config">{{$t('sm.cpjhtuiB2bzzd')}}</div>
+                          <div class="TC-config">{{$t('sm.cpjhtuiB2bzzd')}}<br/><font style="color:red;">切位团请关闭此项;</font></div>
                         </span>
                       </div>
                     </el-form-item>

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -937,7 +937,7 @@
                         <span class="TCswitch">
                           <el-switch v-model="priceData.IsB2B" :active-value="inActive" :inactive-value="notInActive">
                           </el-switch>
-                          <div class="TC-config">{{$t('sm.cpjhtuiB2bzzd')}}</div>
+                          <div class="TC-config">{{$t('sm.cpjhtuiB2bzzd')}}<br/><font style="color:red;">切位团请关闭此项;</font></div>
                         </span>
                       </div>
                     </el-form-item>