Merge remote-tracking branch 'origin/master'

src/views/modules/schedule/order_schedule.vue

@@ -1963,8 +1963,8 @@ export default {
           //重置按钮
           this.primaryMenuButton.workCalendarOutFlag = true;
           //返回错误
-          this.$message.error('请选择工单!');
-          return false;
+          //this.$message.error('请选择工单!');
+          //return false;
         }
         let tempData = {'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
           'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate};
@@ -1980,8 +1980,8 @@ export default {
           //重置按钮
           this.primaryMenuButton.workCalendarOutFlag = true;
           //返回错误
-          this.$message.error('请选择工单!');
-          return false;
+          //this.$message.error('请选择工单!');
+          //return false;
         }
         let tempData = {'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
           'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate};
@@ -2006,8 +2006,8 @@ export default {
           //重置按钮
           this.primaryMenuButton.workCalendarOutFlag = true;
           //返回错误
-          this.$message.error('请选择工单!');
-          return false;
+          //this.$message.error('请选择工单!');
+          //return false;
         }
         //调用提示的方法
        this.warnReScheduleConfirm();
@@ -2460,10 +2460,10 @@ export default {
       //没有选择行 所有的按钮都是灰色
       if(this.currentRoutingRow == null || this.currentRoutingRow == {}){
         this.primaryMenuButton.shopOrderFlag = true;
-        this.primaryMenuButton.workCalendarOutFlag = true;
-        this.primaryMenuButton.batchWorkCalendarFlag = true;
+        this.primaryMenuButton.workCalendarOutFlag = false;
+        this.primaryMenuButton.batchWorkCalendarFlag = false;
         this.primaryMenuButton.splitScheduleFlag = true;
-        this.primaryMenuButton.reScheduleOrderFlag = true;
+        this.primaryMenuButton.reScheduleOrderFlag = false;
         this.primaryMenuButton.partStockFlag = true;
         this.primaryMenuButton.updateProductRouting=true;
       }else{