diff --git a/klp-ui/src/views/wms/coil/panels/L2MatchPanel.vue b/klp-ui/src/views/wms/coil/panels/L2MatchPanel.vue index c331a6bb3..f63d45df5 100644 --- a/klp-ui/src/views/wms/coil/panels/L2MatchPanel.vue +++ b/klp-ui/src/views/wms/coil/panels/L2MatchPanel.vue @@ -88,7 +88,8 @@ const PLAN_FIELDS = [ export default { name: 'L2MatchPanel', props: { - hotCoilId: { type: String, default: '' } + hotCoilId: { type: String, default: '' }, + autoFill: { type: Boolean, default: false } }, data() { return { @@ -103,6 +104,11 @@ export default { hotCoilId(val) { if (val) this.loadBestMatch(val) else this.bestMatch = null + }, + bestMatch(val) { + if (val && this.autoFill) { + this.$emit('fill', val) + } } }, created() { diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue index 22148fb04..c321ae1bb 100644 --- a/klp-ui/src/views/wms/coil/typing.vue +++ b/klp-ui/src/views/wms/coil/typing.vue @@ -25,7 +25,7 @@
- +
@@ -573,6 +573,10 @@ export default { isDrAction() { return this.actionType === 504 || this.actionType === 524 }, + /** 酸轧产线 */ + isAcidRolling() { + return [11, 120, 200, 201, 520].includes(Number(this.actionType)) + }, /** 镀锌/酸轧产线免验净重和厚度范围 */ isExemptFromValidation() { return [11, 120, 200, 201, 520, 202, 501, 521].includes(Number(this.actionType)) @@ -694,6 +698,11 @@ export default { if (data.end_date) { this.$set(this.updateForm, 'productionEndTime', this.formatDateTime(data.end_date)) } + + if (data.encoilid) { + this.$set(this.updateForm, 'chromePlateCoilNo', data.encoilid) + } + if (data.start_date || data.end_date) this.calculateProductionDuration() const query = {