diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue index 58c50ff..9b9a42c 100644 --- a/src/views/modules/production/dailyPlan.vue +++ b/src/views/modules/production/dailyPlan.vue @@ -217,9 +217,12 @@ + + + - 批量新增 - 新增 + 批量新增 + 新增 @@ -367,6 +370,7 @@ schedulingModalFlag: false, scheduleTableData: [], scheduledModelData: { + status:'', weightFactor:'', orderNo: '', planStartDate: '', @@ -375,6 +379,7 @@ unSchedulingSize: '', site:'', }, + closeFlag:false, dataListSelections: [], scheduledingData: { weight:'', @@ -516,17 +521,23 @@ }, // 排产信息界面 openScheduleModel (row) { + // if (row.status == '已计划' || row.status == '已关闭') { + // this.$alert('该订单状态为' + row.status + '无法排产', '错误', { + // confirmButtonText: '确定' + // }) + // return false + // } if (row.status == '已计划' || row.status == '已关闭') { - this.$alert('该订单状态为' + row.status + '无法排产', '错误', { - confirmButtonText: '确定' - }) - return false + this.closeFlag=true; + }else { + this.closeFlag=false; } let list = {site:row.site,orderNo: row.orderNo} getSchedulingSize(list).then(({data}) => { this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1) this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize) }) + this.scheduledModelData.status = row.status this.scheduledingData.lotSize = row.lotSize this.scheduledingData.site = row.site this.scheduledingData.partNo = row.partNo