From 305b61fd1265fc76de537a7ca752b6d959a93101 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 10 九月 2025 17:53:41 +0800
Subject: [PATCH] 热处理报工适配
---
src/views/mes/modules/MesProductionWorkOrderReportModal.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/views/mes/modules/MesProductionWorkOrderReportModal.vue b/src/views/mes/modules/MesProductionWorkOrderReportModal.vue
index 2aa862a..6e98f2c 100644
--- a/src/views/mes/modules/MesProductionWorkOrderReportModal.vue
+++ b/src/views/mes/modules/MesProductionWorkOrderReportModal.vue
@@ -13,7 +13,7 @@
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="12" v-if="!heatTreatmentFlag">
<a-form-model-item label="鎶ュ伐璁㈠崟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
<a-select
v-model="model.orderId"
@@ -143,7 +143,8 @@
selectReportWorkOrderList: '/mes/productionOrder/selectReportWorkOrderList'
},
workOrderOptions: [],
- finishedProductLabel: {}
+ finishedProductLabel: {},
+ heatTreatmentFlag: false
}
},
computed: {
@@ -171,8 +172,8 @@
});
},
// 鎵撳嵃鏍囩
- printLabel() {
- this.generateQRCode('鎴愬搧鎵樻爣绛�'); // 鍏堢敓鎴愪簩缁寸爜
+ printLabel(palletNumber) {
+ this.generateQRCode(palletNumber); // 鍏堢敓鎴愪簩缁寸爜
setTimeout(() => {
printJS({
printable: 'printLabel',
@@ -241,11 +242,15 @@
this.$refs.form && this.$refs.form.resetFields()
// 璁剧疆鍒濆鍊�
this.model = Object.assign({}, record);
- getAction(this.url.selectReportWorkOrderList, {materialNumber: record.materialNumber}).then(res => {
- if (res.success) {
- this.workOrderOptions = res.result
- }
- })
+ if (record.productionType === 'HEATTREATMENT') {
+ this.heatTreatmentFlag = true
+ } else {
+ getAction(this.url.selectReportWorkOrderList, {materialNumber: record.materialNumber}).then(res => {
+ if (res.success) {
+ this.workOrderOptions = res.result
+ }
+ })
+ }
this.visible = true
},
close () {
@@ -279,7 +284,7 @@
}
//鎴愬搧鎵樻爣绛炬墦鍗�
this.$nextTick(() => {
- this.printLabel()
+ this.printLabel(data.palletNumber)
})
}
this.submitCallback()
--
Gitblit v1.9.3