From 0f13f4b33c26cac85837282ebfd7656a0e16dd0b Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 11 May 2026 14:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E2=80=9C=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=A2=84=E8=A7=88=E2=80=9D=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=8B=A5=E5=BD=93=E5=89=8D=E6=A0=87=E7=AD=BE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=98=AF=E5=A4=96=E7=AE=B1=E6=A0=87=E7=AD=BE=E6=88=96=E5=86=85?=
 =?UTF-8?q?=E7=AE=B1=E6=A0=87=E7=AD=BE=EF=BC=8C=E5=85=88=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E8=AE=A9=E7=94=A8=E6=88=B7=E8=BE=93=E5=85=A5=E8=BF=99=205=20?=
 =?UTF-8?q?=E4=B8=AA=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../labelSetting/components/ZPLPreview.vue    | 138 +++++++++++++++++-
 1 file changed, 137 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/labelSetting/components/ZPLPreview.vue b/src/views/modules/labelSetting/components/ZPLPreview.vue
index ea86ec3..ded7518 100644
--- a/src/views/modules/labelSetting/components/ZPLPreview.vue
+++ b/src/views/modules/labelSetting/components/ZPLPreview.vue
@@ -80,6 +80,63 @@
       </div>
     </div>
 
+    <el-dialog
+      title="真实数据预览参数"
+      :visible.sync="realDataPreviewDialogVisible"
+      width="460px"
+      :close-on-click-modal="false"
+    >
+      <div class="real-preview-hint">外箱/内箱标签预览请先输入IFS查询参数</div>
+      <el-form label-width="110px" size="mini">
+        <el-form-item label="consignmentId">
+          <el-input
+            v-model.trim="realDataPreviewParams.consignmentId"
+            placeholder="请输入 consignmentId"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="jobNo">
+          <el-input
+            v-model.trim="realDataPreviewParams.jobNo"
+            placeholder="请输入 jobNo"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="lineNo">
+          <el-input
+            v-model.trim="realDataPreviewParams.lineNo"
+            placeholder="请输入 lineNo"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="relNo">
+          <el-input
+            v-model.trim="realDataPreviewParams.relNo"
+            placeholder="请输入 relNo"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="lineItemNo">
+          <el-input
+            v-model.trim="realDataPreviewParams.lineItemNo"
+            placeholder="请输入 lineItemNo"
+            clearable
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="realDataPreviewDialogVisible = false">取消</el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          :loading="realDataPreviewLoading"
+          @click="handleRealDataPreviewConfirm"
+        >
+          确认预览
+        </el-button>
+      </div>
+    </el-dialog>
+
     <!-- 预览图片 -->
     <div v-if="previewImage" class="preview-image">
       <img
@@ -149,6 +206,14 @@ export default {
       realDataPreviewLoading: false,
       pdfExportLoading: false,
       autoPreview: true, // 默认开启实时预览
+      realDataPreviewDialogVisible: false,
+      realDataPreviewParams: {
+        consignmentId: '',
+        jobNo: '',
+        lineNo: '',
+        relNo: '',
+        lineItemNo: ''
+      }
     }
   },
   computed: {
@@ -335,6 +400,60 @@ export default {
       console.log('预览已清除')
     },
 
+    getCurrentLabelType() {
+      const labelSetting = this.$route.params.labelSetting || {}
+      return (labelSetting.labelType || '').trim()
+    },
+
+    isBoxLabelType(labelType) {
+      return ['外箱标签', '内箱标签'].includes(labelType)
+    },
+
+    buildRealDataPreviewQueryParams() {
+      const consignmentId = (this.realDataPreviewParams.consignmentId || '').trim()
+      const jobNo = (this.realDataPreviewParams.jobNo || '').trim()
+      const lineNo = (this.realDataPreviewParams.lineNo || '').trim()
+      const relNo = (this.realDataPreviewParams.relNo || '').trim()
+      const lineItemNo = (this.realDataPreviewParams.lineItemNo || '').toString().trim()
+
+      if (!consignmentId || !jobNo || !lineNo || !relNo || lineItemNo === '') {
+        this.$message.warning('请完整填写真实数据预览参数')
+        return null
+      }
+      if (!/^\d+$/.test(consignmentId)) {
+        this.$message.warning('发货单ID必须为整数')
+        return null
+      }
+      if (!/^-?\d+$/.test(lineItemNo)) {
+        this.$message.warning('行项目号必须为整数')
+        return null
+      }
+
+      return {
+        consignmentId: Number(consignmentId),
+        jobNo: jobNo,
+        lineNo: lineNo,
+        relNo: relNo,
+        lineItemNo: Number(lineItemNo)
+      }
+    },
+
+    async handleRealDataPreviewConfirm() {
+      const reportId = this.$route.params.labelSetting && this.$route.params.labelSetting.labelNo
+      if (!reportId) {
+        this.$message.warning('请先设置标签编号')
+        return
+      }
+
+      const queryParams = this.buildRealDataPreviewQueryParams()
+      if (!queryParams) {
+        return
+      }
+
+      this.realDataPreviewDialogVisible = false
+      await this.executeRealDataPreview(reportId, queryParams)
+    },
+
     async generateRealDataPreview() {
       const reportId = this.$route.params.labelSetting && this.$route.params.labelSetting.labelNo
       if (!reportId) {
@@ -348,6 +467,16 @@ export default {
         return
       }
 
+      const labelType = this.getCurrentLabelType()
+      if (this.isBoxLabelType(labelType)) {
+        this.realDataPreviewDialogVisible = true
+        return
+      }
+
+      await this.executeRealDataPreview(reportId)
+    },
+
+    async executeRealDataPreview(reportId, queryParams = {}) {
       this.realDataPreviewLoading = true
 
       try {
@@ -360,7 +489,8 @@ export default {
 
         // 3. 调用真实数据预览API
         const response = await previewLabelWithRealData({
-          reportId: reportId
+          reportId: reportId,
+          ...queryParams
         })
 
         if (response && response.data && response.data.code === 200) {
@@ -598,6 +728,12 @@ export default {
   font-weight: 600;
 }
 
+.real-preview-hint {
+  margin-bottom: 10px;
+  color: #606266;
+  font-size: 12px;
+}
+
 .preview-image {
   margin-bottom: 16px;
   text-align: center;