diff --git a/klp-ui/src/api/pocket/acidTyping.js b/klp-ui/src/api/pocket/acidTyping.js
index 51963846..63d567fb 100644
--- a/klp-ui/src/api/pocket/acidTyping.js
+++ b/klp-ui/src/api/pocket/acidTyping.js
@@ -8,10 +8,10 @@ export function getAcidTypingPrefill(currentCoilNo) {
})
}
-export function getGalvanize1TypingPrefill(currentCoilNo) {
+export function getGalvanize1TypingPrefill(params) {
return request({
url: '/pocket/galvanize1/crmPdoExcoil/list',
method: 'get',
- params: { currentCoilNo }
+ params
})
}
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
index 13f433ee..d23c006e 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
@@ -434,10 +434,14 @@ export default {
.nob {
width: 100%;
height: 100%;
+ font-weight: bold;
+ color: #000;
+ font-family: '黑体', serif;
border: none;
outline: none;
background: transparent;
text-align: center;
+ font-size: 1.2em;
}
/* 打印样式 - 强制单页,适配180mm x 100mm纸张,保持原有样式不变 */
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
index 62fc0eda..70abbf28 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
@@ -102,7 +102,7 @@
生产日期
-
{{ parseTime(content.updateTime, '{y}-{m}-{d}') }}
+
{{ parseTime(content.updateTime, '{y}-{m}-{d}') }}
@@ -437,8 +437,12 @@ export default {
height: 100%;
border: none;
outline: none;
+ font-weight: bold;
+ color: #000;
+ font-family: '黑体', serif;
background: transparent;
text-align: center;
+ font-size: 1.2em;
}
/* 打印样式 - 强制单页,适配180mm x 100mm纸张,保持原有样式不变 */
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
index 02dc8909..9925fd1b 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
@@ -333,6 +333,9 @@ export default {
.nob {
width: 100%;
height: 100%;
+ font-weight: bold;
+ color: #000;
+ font-family: '黑体', serif;
border: none;
outline: none;
background: transparent;
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
index cf4f8b31..203f2bf9 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
@@ -392,7 +392,7 @@ export default {
.info-grid-item {
border: 1px solid #000;
padding: 0.1em;
- font-size: 1.05em;
+ font-size: 1.2em;
height: 2em;
text-align: center;
vertical-align: middle;
@@ -443,8 +443,12 @@ export default {
height: 100%;
border: none;
outline: none;
+ font-weight: bold;
+ color: #000;
+ font-family: '黑体', serif;
background: transparent;
text-align: center;
+ font-size: 1.2em;
}
/* 打印样式 - 强制单页,适配180mm x 100mm纸张,保持原有样式不变 */
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
index 80515cd3..b2bf89fe 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
@@ -253,6 +253,10 @@ export default {
display: flex;
align-items: center;
justify-content: center;
+ font-weight: bold;
+ color: #000;
+ font-family: '黑体', serif;
+ font-size: 1.2em;
}
/* 打印样式 */
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
index 0242ba6a..d36450b8 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
@@ -246,6 +246,10 @@ export default {
word-break: break-all;
overflow-wrap: break-word;
white-space: normal;
+ font-weight: bold;
+ color: #000;
+ font-family: '黑体', serif;
+ font-size: 1.2em;
}
/* 打印样式 - 强制单页,适配100mm x 80mm纸张,保持原有样式不变 */
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
index f61439ad..eee80e5c 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
@@ -244,6 +244,7 @@ export default {
.nob {
width: 100%;
height: 100%;
+ font-size: 1.2em;
border: none;
outline: none;
background: transparent;
@@ -253,6 +254,10 @@ export default {
display: flex;
align-items: center;
justify-content: center;
+ font-weight: bold;
+ color: #000;
+ font-family: '黑体', serif;
+ font-size: 1.2em;
}
/* 打印样式 */
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 9b9b0968..2fd3834a 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -454,7 +454,7 @@
+ :coilId="stepSpilt.coilId" :actionStatus="stepSpilt.actionStatus" :actionType="stepSpilt.actionType" />
@@ -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()
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index b02b8b27..da1ae858 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -67,8 +67,13 @@
-
+
+
+
+
+
+
+
@@ -268,6 +273,7 @@