页面修改

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -26,21 +26,21 @@
           </th>
         </tr>
         <tr>
-          <th width="150">用餐时间</th>
+          <th width="100">用餐时间</th>
           <th width="250">餐厅名称</th>
           <th width="160">修改餐厅</th>
           <th width="80">类别</th>
           <th width="200" style="display:none;">餐饮类型</th>
-          <th width="80">总人数</th>
+          <th width="70">总人数</th>
           <th width="70">用餐人<br />类型</th>
           <th width="70">用餐<br />人数</th>
-          <th width="100">价格</th>
-          <th width="100">免人数</th>
+          <th width="90">价格</th>
+          <th width="90">免人数</th>
           <th width="80">金额小计</th>
-          <th width="100">返佣</th>
-          <th width="120">总金额</th>
+          <th width="90">返佣</th>
+          <th width="100">总金额</th>
           <th width="210">付款方式/订餐方式/订团号</th>
-          <th width="80">备注</th>
+          <th width="140">备注</th>
         </tr>
         <template v-for="(item,index) in list">
           <template v-for="(subItem,subIndex) in item.DiningSummaryList">
@@ -81,7 +81,6 @@
                   <el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID'
                     :key='itemHotel.ID'></el-option>
                 </el-select>
-
               </td>
               <td v-if="childIndex==0" :rowspan="3">
                 {{subItem.UseDinnerTypeStr}}
@@ -102,8 +101,8 @@
                 <span class="spanlink" v-if='childItem.PeoplePrice==0'
                   @click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span>
                 <template v-else>
-                   <el-input class='w50 tcenter' @input='calculationPrice(subItem)'  
-                  v-model='childItem.PeoplePrice' @keyup.native="checkInteger(childItem,'PeoplePrice')"></el-input>
+                  <el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.PeoplePrice'
+                    @keyup.native="checkInteger(childItem,'PeoplePrice')"></el-input>
                 </template>
               </td>
               <td>
@@ -185,7 +184,22 @@
                 </table>
               </td>
               <td v-if="childIndex==0" :rowspan="3">
-                <el-input type='textarea' rows="4" class='w120' v-model='subItem.Remarks'></el-input>
+                <table class="dinnerTable">
+                  <tr>
+                    <td width="80" style="text-align:right;">备注：</td>
+                    <td>
+                      <el-input type='textarea' rows="2" class='w120' v-model='subItem.Remarks'></el-input>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td width="80" style="text-align:right;">
+                      餐配备注：
+                    </td>
+                    <td style="text-align:left;">
+                      <el-input type='textarea' rows="2" class='w120' v-model='subItem.DinnerRemark'></el-input>
+                    </td>
+                  </tr>
+                </table>
               </td>
             </tr>
           </template>
@@ -194,7 +208,6 @@
     </div>
   </div>
 </template>
-
 <script>
   export default {
     data() {
@@ -300,7 +313,7 @@
             return item.ID === obj.CurrencyId; //筛选出匹配数据
           });
         }
-        
+
         //日元
         let jpaObj = this.allCurrencyList.find(item => {
           return item.ID === 3; //筛选出匹配数据
@@ -308,7 +321,8 @@
         obj.DiningPriceList.forEach((item, index) => {
           var tempPrice = 0;
           var coefficient = 1;
-          totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (coefficient - item.DiscountPrice / 100);
+          totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (coefficient - item.DiscountPrice /
+            100);
           totalPrice += tempPrice;
         })
         obj.TotalPrice = totalPrice.toFixed(2);
@@ -321,24 +335,18 @@
           else if (currentObj.ID == 3) {
             obj.NewTotalPrice = "";
           } else {
-            if(currentObj.CurrentRate>1)
-            {
-              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)/currentObj.CurrentRate).toFixed(2);
-            }
-            else
-            {
-              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)*currentObj.CurrentRate).toFixed(2);
+            if (currentObj.CurrentRate > 1) {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) / currentObj.CurrentRate)
+                .toFixed(2);
+            } else {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) * currentObj.CurrentRate)
+                .toFixed(2);
             }
           }
         } else {
           obj.NewTotalPrice = "";
         }
         this.$forceUpdate();
-        // let totalPrice = 0;
-        // obj.DiningPriceList.forEach(item => {
-        //   totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
-        // })
-        // obj.TotalPrice = totalPrice.toFixed(2);
       },
       saveList(type) {
         this.IsDisabled = true;