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

src/components/commonPage/commonDinnerInfo.vue

@@ -44,17 +44,11 @@
           <th width="120">{{$t('pub.date')}}</th>
           <th width="150">餐厅名称</th>
           <th width="150">更换餐厅</th>
-          <th width="120">餐厅状态</th>
-          <th width="120">{{$t('salesModule.DJstatus')}}</th>
-          <th width="150" v-if="showHotelObj.showPrice">
-            {{$t('restaurant.res_Number')}}<br />{{$t('Operation.Op_price')}}</th>
-          <th width="150" v-if="showHotelObj.showPrice">
-            <el-tooltip class="item" effect="dark" content="（用餐人数-免人数）× 价格" placement="top">
-              <span>总价</span>
-            </el-tooltip>
-          </th>
+          <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">
@@ -73,12 +67,22 @@
             <td style="text-align:left;padding-left:3px;color:red">
               {{hotelSubItem.DinnerName!=hotelSubItem.NewDinnerName?""+hotelSubItem.NewDinnerName:""}}
             </td>
-            <td>
-              <span>
-                <template v-if="hotelSubItem.DiningChangeState==1">
-                  <a style="color:green">待审核</a>
+           
+           
+            <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>
+              </template>
+            </td>
+            <td>
+              {{hotelSubItem.DiningTypeName}} <br /> {{hotelSubItem.BookTime}}
+            </td>
+            <td>
+              {{hotelSubItem.CreateByName}}
             </td>
             <td>
               <span>
@@ -93,35 +97,6 @@
                 </template>
               </span>
             </td>
-            <td v-if="showHotelObj.showPrice&&hotelSubItem.PriceList&&hotelSubItem.PriceList.length>0">
-              <div v-for="(priceSubItem,priceSubIndex) in hotelSubItem.PriceList" :key="`din`+priceSubIndex"
-                style="text-align:left;padding-left:2px;">
-                <template v-if="priceSubItem.DiningNum>0&&priceSubItem.UnitPrice>0">
-                  {{priceSubItem.GuestType==1?"大人：":(priceSubItem.GuestType==2?"中人：":(priceSubItem.GuestType==3?"小人：":""))}}
-                  <template v-if="priceSubItem.DiningDiscount>0">
-                    ({{priceSubItem.DiningNum}}-{{priceSubItem.DiningDiscount}})
-                    ×{{priceSubItem.UnitPrice>0?(priceSubItem.UnitPrice):""}}
-                  </template>
-                  <template v-else>
-                    {{priceSubItem.DiningNum}} ×{{priceSubItem.UnitPrice>0?(priceSubItem.UnitPrice):""}}
-                  </template>
-                </template>
-                <template
-                  v-if="priceSubItem.DiningNum>0&&priceSubItem.UnitPrice>0&&priceSubIndex!=hotelSubItem.PriceList.length-1">
-                  <br />
-                </template>
-              </div>
-            </td>
-            <td>
-              <template v-if="hotelSubItem.TotalMoney>0">{{ hotelSubItem.TotalMoney }}
-                （{{hotelSubItem.CurrencyName}}）</template>
-            </td>
-            <td>
-              {{hotelSubItem.DiningTypeName}} <br /> {{hotelSubItem.BookTime}}
-            </td>
-            <td>
-              {{hotelSubItem.CreateByName}}
-            </td>
             <td>
               {{hotelSubItem.SureTime}}
             </td>