Merge remote-tracking branch 'origin/master'

src/views/modules/schedule/order_schedule.vue

@@ -96,7 +96,8 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="''" style="margin-top: -10px; margin-left: -5px;">
-          <el-checkbox style="margin-top: 28px;" :label=labels.onlyViewPreItemScheduled name="type"></el-checkbox>
+          <el-checkbox style="margin-top: 28px;" v-model="pageData.preScheduledFlag" true-label="Y" false-label="N"
+                       :label=labels.onlyViewPreItemScheduled name="type"></el-checkbox>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;">
@@ -477,6 +478,7 @@ export default {
         planStartTime: '',
         calendarId: '',
         calendarDesc: '',
+        preScheduledFlag: 'N',
         status: 1,
         sortField: 'needDate',
       },