diff --git a/src/api/yieldReport/abnormalRoll.js b/src/api/yieldReport/abnormalRoll.js new file mode 100644 index 0000000..c6e2861 --- /dev/null +++ b/src/api/yieldReport/abnormalRoll.js @@ -0,0 +1,11 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 查询卷号列表(去重) +export const getAbnormalRollNoList = data => createAPI('schedule/abnormalRoll/getRollNoList', 'POST', data); + +// 根据卷号组合查询详细数据 +export const getAbnormalRollByRollNos = data => createAPI('schedule/abnormalRoll/getByRollNos', 'POST', data); + +// 异常续卷(更新数据) +export const abnormalContinueRoll = data => createAPI('schedule/abnormalRoll/continueRoll', 'POST', data); + diff --git a/src/views/modules/yieldReport/com_abnormal_continue_roll.vue b/src/views/modules/yieldReport/com_abnormal_continue_roll.vue new file mode 100644 index 0000000..de6a003 --- /dev/null +++ b/src/views/modules/yieldReport/com_abnormal_continue_roll.vue @@ -0,0 +1,438 @@ + + + + + + + diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 9f9999f..38de077 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -145,16 +145,19 @@ 切换卷 - + 创建分卷 + + 异常续卷 + 结束卷 - + 合并卷 - + 结单 @@ -620,6 +623,12 @@ + + + + + @@ -900,6 +909,7 @@ import notOverFinishRoll from "./not_over_finish_roll";/*生产过程的停机 import ComMalformedMaterial from "./com_malformed_material";/*生产过程的停机组件*/ import ComProcessInspection from "./com_process_inspection";/*过程检验组件*/ import ComMrbRegister from "./com_mrb_register";/*MRB异常单登记组件*/ +import comAbnormalContinueRoll from "./com_abnormal_continue_roll";/*异常续卷组件*/ var functionId = 'C10000002'; export default { mixins: [labelPrintTemplates], // 添加标签打印模板 mixin @@ -914,6 +924,7 @@ export default { showProcessInspectionFlag: false,// 过程检验弹窗显示状态 processInspectionButtonStyle: '', // 过程检验按钮样式 showMrbRegisterFlag: false,// MRB异常单登记弹窗显示状态 + showAbnormalContinueRollFlag: false,// 异常续卷弹窗显示状态 showDefault: false, popoverFlag: false, showNotOverFlag: false, @@ -3818,6 +3829,7 @@ export default { ComMalformedMaterial, // 材料一场,扫描 ComProcessInspection,/*过程检验组件*/ ComMrbRegister,/*MRB异常单登记组件*/ + comAbnormalContinueRoll,/*异常续卷组件*/ }, methods: { // 删除不良 @@ -4456,6 +4468,14 @@ export default { }); }, + /*异常续卷的modal调用*/ + abnormalContinueRollModal() { + this.$nextTick(() => { + this.showAbnormalContinueRollFlag = true; + this.$refs.comAbnormalContinueRoll.init(this.scheduleData, this.operatorData) + }); + }, + /*结束卷操作*/ finishRollModal() { //1.首先调用菜单判断方式 看看是否可以结束卷 @@ -5353,17 +5373,22 @@ export default { .current-roll-display { display: flex; align-items: center; - gap: 8px; - min-width: 150px; + gap: 6px; + min-width: 120px; + max-width: 180px; } .current-roll-display label { - font-size: 13px; + font-size: 12px; font-weight: 600; color: #303133; white-space: nowrap; } +.current-roll-display .roll-no-input { + width: 100px; +} + .roll-no-input { flex: 1; }