diff --git a/src/views/modules/production/searchDailyPlan.vue b/src/views/modules/production/searchDailyPlan.vue index fd0cdfc..b422d68 100644 --- a/src/views/modules/production/searchDailyPlan.vue +++ b/src/views/modules/production/searchDailyPlan.vue @@ -120,6 +120,20 @@ min-width="60" label="计划数量"> + + + + diff --git a/src/views/modules/schedule/closeSchedule.vue b/src/views/modules/schedule/closeSchedule.vue index a65b3e5..7b0fef4 100644 --- a/src/views/modules/schedule/closeSchedule.vue +++ b/src/views/modules/schedule/closeSchedule.vue @@ -9,7 +9,7 @@ 加工中心编码 - + 物料编码 diff --git a/src/views/modules/schedule/generateReport.vue b/src/views/modules/schedule/generateReport.vue index a62f708..0bbf321 100644 --- a/src/views/modules/schedule/generateReport.vue +++ b/src/views/modules/schedule/generateReport.vue @@ -8,7 +8,7 @@ - + 加工中心编码 @@ -199,6 +199,14 @@ min-width="120" label="结束时间"> + + --> - + @@ -743,7 +751,7 @@ this.saveHeaderData.operatorName=currentData.operatorName; this.saveHeaderData.qtyRequire=currentData.qtyRequired; this.saveHeaderData.userId=this.$store.state.user.name; - this.saveHeaderData.manufacturingTime=1; + this.saveHeaderData.manufacturingTime=''; this.qty1=''; this.qty2 =''; this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00') @@ -753,6 +761,7 @@ if(data.code===0) { this.qty1 = data.row.qtyReported; this.qty2 = data.row.lastApproveQty; + this.saveHeaderData.manufacturingTime = data.row.timeReported; }else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -792,6 +801,7 @@ startSeqNo(inData).then(({data}) => { if (data && data.code === 0) { this.scanSeqNo=''; + this.previousSeqNo=''; this.startModalFlag=false; this.$message({ message: '操作成功', @@ -802,6 +812,7 @@ }) } else { this.scanSeqNo=''; + this.previousSeqNo=''; this.$alert(data.msg, '错误', { confirmButtonText: '确定' }) diff --git a/src/views/modules/schedule/soscheduleRouting.vue b/src/views/modules/schedule/soscheduleRouting.vue index cbff886..ff855dd 100644 --- a/src/views/modules/schedule/soscheduleRouting.vue +++ b/src/views/modules/schedule/soscheduleRouting.vue @@ -9,7 +9,7 @@ 加工中心编码 - + 物料编码 @@ -200,6 +200,14 @@ min-width="120" label="结束时间"> + +