1

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -227,6 +227,31 @@
                       </el-select>
                     </td>
                   </tr>
+
+                <template v-if="subItem.OrderState==1">
+                  <tr>
+                    <td width="60" style="text-align:right;">
+                      确认时间：
+                    </td>
+                    <td style="text-align:left;">
+                      <el-date-picker class='w135'
+                        v-model="subItem.SureTime"
+                        type="datetime"
+                        placeholder="选择确认时间">
+                       </el-date-picker>
+                    </td>
+                  </tr>
+
+                  <tr>
+                    <td width="60" style="text-align:right;">
+                      预约时间：
+                    </td>
+                    <td style="text-align:left;">
+                      <el-input class='w135' v-model='subItem.BookTime' type="text"></el-input>
+                    </td>
+                  </tr>
+                </template>
+                  
                   <tr v-show="subItem.PayStyle==6">
                     <td width="60" style="text-align:right;">
                       {{$t('ground.fukuanth')}}:
@@ -385,9 +410,19 @@
                     RealName: str,
                     ID: x.NewDiningID
                   })
+                  
                   if (x.ReserveNo == '' || x.ReserveNo == null) {
                     x.ReserveNo = this.$route.query.NewCombinationNum;;
                   }
+                  if(x.SureTime)
+                  {
+                    if(x.SureTime=='0001-01-01T00:00:00'){
+                      x.SureTime=''
+                    }else{
+                      x.SureTime=x.SureTime.replace("T", " ");
+                    }
+                  }
+
                 })
               });
               this.list = resultArray;
@@ -461,11 +496,16 @@
         // }
         this.list.forEach(item => {
           item.DiningSummaryList.forEach(insideItem => {
+            // if(insideItem.SureTime=''||insideItem.SureTime.length==0)
+            //       {
+            //         insideItem.SureTime='0001-01-01T00:00:00'
+            //       }
             if (insideItem.DiningPriceList) {
               insideItem.DiningPriceList.forEach(subItem => {
                 if (!subItem.Discount) {
                   subItem.Discount = 0;
                 }
+                
                 if (!subItem.DiscountPrice) {
                   subItem.DiscountPrice = 0;
                 }

src/components/dmc/manager/dmcTotalTable.vue

@@ -371,8 +371,10 @@
                   <span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
                 </div>
-                <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单"
+                <a style="text-decoration:underline;cursor:pointer;" title="点击下载餐配信息"
                   @click="DownLoadDinner(item)">{{$t('ground.peicanxiazai')}}</a>
+                  <a style="text-decoration:underline;cursor:pointer;" title="点击下载新餐配信息"
+                  @click="DownLoadNewDinner(item)">{{$t('ground.peicanxiazai')}}</a>
               </td>
 
               <td>
@@ -1408,6 +1410,24 @@
             this.loading = false;
           });
       },
+       DownLoadNewDinner(item) {
+        this.loading = true;
+        //导出报表
+        let msg = {
+          TCID: item.TCID,
+          StartDate: item.StartDateStr,
+          DayNum: item.DayNum
+        };
+        var fileName = "餐配下载.xls";
+        if (item.TCNUMS != null) {
+          fileName =
+            "【" + item.TCNUMS + "】餐配下载.xls";
+        }
+        this.GetLocalFile("travel_get_GetNewTravelDinnerDownLoad", msg, fileName,
+          res => {
+            this.loading = false;
+          });
+      },
 
       goRoomTip() {
         this.Error("请联系组团OP提供分房表文件!");