diff --git a/src/views/base/canteenStall/stall/index.vue b/src/views/base/canteenStall/stall/index.vue
index 37ac2dee..eae9df46 100644
--- a/src/views/base/canteenStall/stall/index.vue
+++ b/src/views/base/canteenStall/stall/index.vue
@@ -207,6 +207,88 @@
             </el-row>  
           </el-form>
         </el-tab-pane> 
+        <!-- 预订/点餐/报餐设置 -->
+        <el-tab-pane label="餐次设置" name="orderSetting" style="height: 600px;overflow-y: auto;">  
+          <el-table :data="mealtimeList" height="400" >
+            <el-table-column label="餐次类型" align="center" prop="mealtimeName"/> 
+            <el-table-column label="餐次时段" align="center" >
+              <template slot-scope="scope">
+                <el-time-picker
+                  is-range
+                  v-model="scope.row.orderTimeList" style="width: 200px;"
+                  range-separator="至" format="HH:mm:ss" value-format="HH:mm:ss" 
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  placeholder="选择时间范围" @change="changeOrderTimeList(scope.row)">
+                </el-time-picker>
+                <!-- <span>{{scope.row.startTime}}</span>-<span>{{scope.row.endTime}}</span> -->
+              </template> 
+            </el-table-column>
+            <!-- <el-table-column label="预定餐" align="center"> 
+                <el-table-column label="预定时段" align="center" width="220">
+                    <template slot-scope="scope">
+                      <el-time-picker
+                        is-range :clearable="true"
+                        v-model="scope.row.reserveTimeList"  style="width: 190px;"
+                        range-separator="至" format="HH:mm:ss" value-format="HH:mm:ss" 
+                        start-placeholder="开始时间"
+                        end-placeholder="结束时间"
+                        placeholder="选择时间范围" @change="changeReserveTimeList(scope.row)">
+                      </el-time-picker>
+                    </template>
+                </el-table-column>
+                <el-table-column label="退单截止时间" align="center" width="150">
+                    <template slot-scope="scope">
+                      <el-time-picker
+                        v-model="scope.row.reserveRefundDeadline" style="width: 120px;"
+                        placeholder="选择时间">
+                      </el-time-picker>
+                    </template>
+                </el-table-column>
+                <el-table-column label="自动打印时间" align="center" width="150">
+                    <template slot-scope="scope">
+                      <el-time-picker
+                        v-model="scope.row.reservePrintTime" style="width: 120px;"
+                        placeholder="选择时间">
+                      </el-time-picker>
+                    </template>
+                </el-table-column>
+            </el-table-column>
+            <el-table-column label="当餐点餐" align="center"> 
+                <el-table-column label="点餐时段" align="center" width="220">
+                    <template slot-scope="scope">
+                      <el-time-picker
+                        is-range :clearable="true"
+                        v-model="scope.row.currTimeList" style="width: 190px;"
+                        range-separator="至" format="HH:mm:ss" value-format="HH:mm:ss" 
+                        start-placeholder="开始时间"
+                        end-placeholder="结束时间"
+                        placeholder="选择时间范围" @change="changeCurrTimeList(scope.row)">
+                      </el-time-picker>
+                    </template>
+                </el-table-column>
+                <el-table-column label="退单截止时间" align="center" width="150">
+                    <template slot-scope="scope">
+                      <el-time-picker
+                        v-model="scope.row.currRefundDeadline" style="width: 120px;" 
+                        placeholder="选择时间">
+                      </el-time-picker>
+                    </template>
+                </el-table-column>
+            </el-table-column>  
+            <el-table-column label="状态" align="center" prop="ifUse" width="150">
+                <template slot-scope="scope">
+                  <el-switch
+                    v-model="scope.row.ifUse"
+                    active-text="开启"
+                    inactive-text="关闭"
+                    :active-value="1"
+                    :inactive-value="2">
+                  </el-switch>
+                </template>
+            </el-table-column> -->
+          </el-table> 
+        </el-tab-pane>
       </el-tabs> 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -308,6 +390,43 @@ export default {
             }
         ] 
       },
+      mealtimeList:[
+        {
+          "mealtimeType": "1",
+          "mealtimeName": "早餐",
+          "orderTimeList":["05:00:00","10:00:00"],
+          "startTime": "05:00:00",
+          "endTime": "10:00:00"
+        },
+        {
+          "mealtimeType": "2",
+          "mealtimeName": "午餐",
+          "orderTimeList":["10:00:01","14:00:00"],
+          "startTime": "10:00:01",
+          "endTime": "14:00:00"
+        },
+        {
+          "mealtimeType": "3",
+          "mealtimeName": "下午茶",
+          "orderTimeList":["14:00:01","18:00:00"],
+          "startTime": "14:00:01",
+          "endTime": "18:00:00"
+        },
+        {
+          "mealtimeType": "4",
+          "mealtimeName": "晚餐",
+          "orderTimeList":["18:00:01","21:00:00"],
+          "startTime": "18:00:01",
+          "endTime": "21:00:00"
+        },
+        {
+          "mealtimeType": "5",
+          "mealtimeName": "夜宵",
+          "orderTimeList":["21:00:01","23:59:59"],
+          "startTime": "21:00:01",
+          "endTime": "23:59:59"
+        } 
+      ],//餐次列表
       fileList: [],//档口图片
       checkUrlList: [],//档口图片
       checkUrlNameList: [],//档口图片
@@ -427,6 +546,13 @@ export default {
                 }); 
               },200)
               this.rangeTime=[response.data.startBusinessTime, response.data.endBusinessTime]
+              if(response.data.allocStallMealtimeList&&response.data.allocStallMealtimeList.length>0){
+                this.mealtimeList = response.data.allocStallMealtimeList
+                this.mealtimeList.forEach(item=>{
+                  this.$set(item,"orderTimeList",[item.startTime,item.endTime]) 
+                })
+              }
+              
               this.open = true;
               this.title = "修改";
           });
@@ -449,6 +575,7 @@ export default {
             this.baseForm.startBusinessTime=this.rangeTime[0]
             this.baseForm.endBusinessTime=this.rangeTime[1]
             this.baseForm.imgUrl = this.checkUrlList[0] 
+            this.baseForm.allocStallMealtimeList = this.mealtimeList
             let param = this.baseForm
             if (this.stallId != "") {
               param.stallId = this.stallId
@@ -467,7 +594,11 @@ export default {
           }
           });
       },
-      
+      changeOrderTimeList(row){
+          console.log(row)
+          row.startTime = row.orderTimeList[0]
+          row.endTime = row.orderTimeList[1]
+      },
       //基础设置-选择区域
       handleTreeChange2(val){  
           if(val){