feat(标签打印): 统一标签字体样式并增强镀锌分步加工功能

- 为所有标签组件添加统一的粗体黑体字体样式
- 修改getGalvanize1TypingPrefill方法参数以支持分页查询
- 在分步加工面板中增加镀锌二级数据展示功能
- 优化分步加工逻辑,支持根据actionType动态加载数据
This commit is contained in:
砂糖
2026-03-21 10:10:21 +08:00
parent 4478921d9b
commit 0c86b80fb2
11 changed files with 105 additions and 21 deletions

View File

@@ -454,7 +454,7 @@
<el-dialog title="分步加工" :visible.sync="stepSpilt.visible" width="1400px" append-to-body>
<step-split @print="handlePrintLabel" @complete="handleComposeSplit" :actionId="stepSpilt.actionId"
:coilId="stepSpilt.coilId" :actionStatus="stepSpilt.actionStatus" />
:coilId="stepSpilt.coilId" :actionStatus="stepSpilt.actionStatus" :actionType="stepSpilt.actionType" />
</el-dialog>
<label-render ref="labelRender" v-show="false" :content="labelRender.data" :labelType="labelRender.type" />
@@ -577,7 +577,8 @@ export default {
visible: false,
coilId: null,
actionId: null,
actionStatus: null
actionStatus: null,
actionType: null,
}
}
},
@@ -642,6 +643,10 @@ export default {
// 如果待操作列表为空,则加载数据
if (this.pendingActionList.length === 0) {
this.getPendingAction()
console.log(this.useSpecialSplit)
if (this.useSpecialSplit) {
this.getStepSplitList()
}
}
}
},
@@ -673,15 +678,16 @@ export default {
// 立即加载物料列表(不依赖字典)
// this.getMaterialCoil()
// 尝试加载待操作列表(如果字典已加载)
this.$nextTick(() => {
if (this.acidRollingActionType) {
this.actionQueryParams.actionType = this.acidRollingActionType
this.getPendingAction()
if (this.useSpecialSplit) {
this.getStepSplitList()
}
}
})
// this.$nextTick(() => {
// if (this.acidRollingActionType) {
// this.actionQueryParams.actionType = this.acidRollingActionType
// this.getPendingAction()
// console.log(this.useSpecialSplit)
// if (this.useSpecialSplit) {
// this.getStepSplitList()
// }
// }
// })
},
mounted() {
// 确保在mounted时也尝试加载字典数据可能此时才加载完成
@@ -689,6 +695,10 @@ export default {
if (this.acidRollingActionType && !this.actionQueryParams.actionType) {
this.actionQueryParams.actionType = this.acidRollingActionType
this.getPendingAction()
console.log(this.useSpecialSplit)
if (this.useSpecialSplit) {
this.getStepSplitList()
}
}
})
},
@@ -1008,6 +1018,7 @@ export default {
this.stepSpilt.coilId = row.coilId
this.stepSpilt.actionId = row.actionId
this.stepSpilt.actionStatus = row.actionStatus
this.stepSpilt.actionType = row.actionType
this.stepSpilt.visible = true
// this.buttonLoading = true
// this.getPendingAction()