1

src/components/Restaurant/restaurantInfoDetail.vue

@@ -708,7 +708,7 @@ margin-right:5px;
             <span>  {{addMsg.UnitPrice}}/人</span>
           </el-form-item>
           <el-form-item label="适用类型">
-            <el-tag  v-for="childItem in DiningUseTypeList" :key="childItem.ID"  type="info">{{childItem.Name}}</el-tag>
+            <el-tag  v-for="childItem in DiningUseTypeNowList" :key="childItem.ID"  type="info">{{childItem.Name}}</el-tag>
           </el-form-item>
           <el-form-item :label="$t('hotel.hotel_website')">
             <div>
@@ -792,7 +792,7 @@ margin-right:5px;
            </template>
           </el-form-item>
           <el-form-item :label="$t('ground.cantingleixing')">
-            <template v-if="DiningTypeList&&DiningTypeList.length>0">
+            <template v-if="DiningTypeList&&DiningTypeList.length>0&&addMsg.DiningType>0">
         <span v-for="childItem in DiningTypeList" :key="childItem.ID" v-if="childItem.ID==addMsg.DiningType">{{childItem.Name}}</span>
       </template>
       <template v-else>
@@ -801,7 +801,6 @@ margin-right:5px;
           </el-form-item>
           <el-form-item :label="$t('Operation.Op_price')">
             <template v-if="DiningPriceTypeList&&DiningPriceTypeList.length>0&&addMsg.DiningPriceType>0">
-             
              <span v-for="childItem in DiningPriceTypeList" :key="childItem.ID" v-if="childItem.ID==addMsg.DiningPriceType">{{childItem.Name}}</span>
            </template>
            <template v-else>
@@ -1003,7 +1002,9 @@ margin-right:5px;
           UseTypeList: [], //适用类型
         },
         DiningUseTypeList: [],
+        DiningUseTypeNowList:[],
         openplatList:[],
+        
         rules: {
           //表单必填验证
           Name: [{
@@ -1214,6 +1215,17 @@ margin-right:5px;
                 });
                 });
               }
+              if( this.addMsg.UseTypeList&& this.addMsg.UseTypeList.length>0&&this.DiningUseTypeList&&this.DiningUseTypeList.length>0){
+                this.DiningUseTypeNowList=[]; 
+                this.DiningUseTypeList.forEach((item,index) => {
+                  this.addMsg.UseTypeList.forEach((item1,index1) => {
+                  if(item1==item.ID){
+                    this.DiningUseTypeNowList.push(item);
+                  }
+                });
+                });
+              }
+              
               if (res.data.data.FoodTag != "") {
                 this.tipsList = res.data.data.FoodTag.split(",");
               }

src/components/commonPage/commonDinnerInfo.vue

@@ -58,7 +58,7 @@
             </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!=''">
+              <el-link  type="info" style="font-size:12px;"  @click="goDinnerDetails('restaurantInfoDetail',  hotelSubItem.OldDiningID ) "><template v-if="hotelSubItem.DinnerRealName!=hotelSubItem.NewDinnerRealName && hotelSubItem.NewDinnerRealName!=''">
                 <span style="text-decoration:line-through;color:#606266;"> {{hotelSubItem.DinnerRealName}}</span>
               </template>
               <template v-else>
@@ -67,7 +67,7 @@
             
             </td>
             <td style="text-align:left;padding-left:3px;color:red">
-              <el-link type="info" style="font-size:12px;"  @click="goDinnerDetails('restaurantInfoManage',  hotelSubItem.NewDiningID ) ">  
+              <el-link type="info" style="font-size:12px;"  @click="goDinnerDetails('restaurantInfoDetail',  hotelSubItem.NewDiningID ) ">  
                 <span style="color:#606266;">   {{hotelSubItem.DinnerRealName!=hotelSubItem.NewDinnerRealName?""+hotelSubItem.NewDinnerRealName:""}}
                 </span>   
                 </el-link>