diff --git a/src/apis/workOrder/workOrder.ts b/src/apis/workOrder/workOrder.ts index 2064539..d2c6d1b 100644 --- a/src/apis/workOrder/workOrder.ts +++ b/src/apis/workOrder/workOrder.ts @@ -8,7 +8,6 @@ export interface WorkOrderResp { orderNo: string materialName: string encoding: string - encodingPrint: string unitWeight: string materialSpec: string photoUrl: string @@ -43,7 +42,6 @@ export interface WorkOrderQuery { materialName: string | undefined batch: string | undefined encoding: string | undefined - encodingPrint: string | undefined userName: string | undefined carNo: string | undefined startDate: string | undefined diff --git a/src/views/barcodePrint/index.vue b/src/views/barcodePrint/index.vue index 1376cb1..524d023 100644 --- a/src/views/barcodePrint/index.vue +++ b/src/views/barcodePrint/index.vue @@ -12,9 +12,14 @@ +
+ + + +
- +
@@ -298,7 +303,7 @@ const generateDetailLabel = async () => { for (const workOrderInfo of formData.workOrderInfos) { // 计算二维码数据 const orderNo = formData.orderNo + workOrderInfo.id; - const qrCodeData = `10#${formData.encodingPrint}$11#9DP$12#${formData.batch}$17#${workOrderInfo.quantity}$20#${formattedDate2}$31#${orderNo}$DY` + const qrCodeData = `10#${formData.encodingPrint || formData.encoding}$11#9DP$12#${formData.batch}$17#${workOrderInfo.quantity}$20#${formattedDate2}$31#${orderNo}$DY`; // 生成二维码图片 const qrCodeImage = await generateQRCode(qrCodeData) @@ -306,7 +311,7 @@ const generateDetailLabel = async () => { // 添加标签数据 labelDataList.push({ partName: formData.materialName || '', - partNumber: formData.encodingPrint || '', + partNumber: formData.encodingPrint || formData.encoding || '', totalCalculatedWeight: workOrderInfo.calculatedWeight || '', totalWeight: workOrderInfo.weight || '', productionDate: formattedDate, @@ -354,7 +359,7 @@ const generateOverallLabel = async () => { String(now.getDate()).padStart(2, '0') // 计算二维码数据 - const qrCodeData = `10#${formData.encodingPrint}$11#9DP$12#${formData.batch}$17#${formData.totalCount}$20#${formattedDate2}$31#${formData.orderNo}$DY` + const qrCodeData = `10#${formData.encodingPrint || formData.encoding}$11#9DP$12#${formData.batch}$17#${formData.totalCount}$20#${formattedDate2}$31#${formData.orderNo}$DY` // 生成二维码图片 const qrCodeImage = await generateQRCode(qrCodeData) @@ -362,7 +367,7 @@ const generateOverallLabel = async () => { // 直接从 formData 中获取数据 Object.assign(labelData, { partName: formData.materialName || '', - partNumber: formData.encodingPrint || '', + partNumber: formData.encodingPrint || formData.encoding || '', totalCalculatedWeight: formData.totalCalculatedWeight || '', totalWeight: formData.totalWeight || '', productionDate: formattedDate, @@ -391,7 +396,6 @@ onMounted(() => { getWorkOrder(workerOrderId).then(res => { if (res.code == '0') { formData.encoding = res.data.encoding - formData.encodingPrint = res.data.encodingPrint formData.materialName = res.data.materialName formData.orderNo = res.data.orderNo formData.batch = res.data.batch diff --git a/src/views/fullClaim/index.vue b/src/views/fullClaim/index.vue index bedfa52..23eff85 100644 --- a/src/views/fullClaim/index.vue +++ b/src/views/fullClaim/index.vue @@ -1,22 +1,22 @@