diff --git a/src/views/barcodePrint/index.vue b/src/views/barcodePrint/index.vue
index 524d023..6676a31 100644
--- a/src/views/barcodePrint/index.vue
+++ b/src/views/barcodePrint/index.vue
@@ -17,11 +17,6 @@
-
+
+
+
@@ -197,6 +203,7 @@ import { Message } from '@arco-design/web-vue'
import { useRoute } from 'vue-router'
import {getWorkOrder, type WorkOrderInfoResp} from "@/apis/workOrder/workOrder"
import QRCode from 'qrcode';
+import {getMaterialDetail} from "@/apis/weightManage/weightManage";
const route = useRoute()
@@ -205,6 +212,7 @@ const formData = reactive({
workerOrderId: '',
encoding: '',
encodingPrint: '',
+ materialNamePrint: '',
materialName: '',
orderNo: '',
totalCalculatedWeight: '',
@@ -249,6 +257,21 @@ const labelData = reactive({
// 标签容器引用
const labelContainer = ref(null)
+const getMaterialName = async (value: string) => {
+ try {
+ const res = await getMaterialDetail(value)
+ if (res.code == '0') {
+ formData.materialNamePrint = res.data.materialName || ''
+ } else {
+ formData.materialNamePrint = '';
+ Message.error('获取物料信息失败')
+ }
+ } catch (error) {
+ formData.materialNamePrint = '';
+ }
+};
+
+
// 生成二维码
const generateQRCode = async (data: string) => {
try {
@@ -274,7 +297,6 @@ const generateDetailLabel = async () => {
}
if (!formData.batch) {
- console.log("11111", formData.batch);
Message.error('未获取到批次信息')
return
}
@@ -310,7 +332,7 @@ const generateDetailLabel = async () => {
// 添加标签数据
labelDataList.push({
- partName: formData.materialName || '',
+ partName: formData.materialNamePrint || formData.materialName || '',
partNumber: formData.encodingPrint || formData.encoding || '',
totalCalculatedWeight: workOrderInfo.calculatedWeight || '',
totalWeight: workOrderInfo.weight || '',
@@ -366,7 +388,7 @@ const generateOverallLabel = async () => {
// 直接从 formData 中获取数据
Object.assign(labelData, {
- partName: formData.materialName || '',
+ partName: formData.materialNamePrint || formData.materialName || '',
partNumber: formData.encodingPrint || formData.encoding || '',
totalCalculatedWeight: formData.totalCalculatedWeight || '',
totalWeight: formData.totalWeight || '',