From 5b3d0a6c38604f71add35ce8d74b001b8ce4b52d Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Thu, 18 Sep 2025 12:56:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8F=B7=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/zplGenerator.js                     |  5 ++
 .../modules/labelSetting/LabelDesigner.vue    | 15 +++-
 .../components/DataSourceDialog.vue           | 87 +++++++++++++++++--
 .../labelSetting/components/DesignElement.vue | 17 +++-
 .../labelSetting/components/PropertyForm.vue  | 11 ++-
 5 files changed, 124 insertions(+), 11 deletions(-)

diff --git a/src/utils/zplGenerator.js b/src/utils/zplGenerator.js
index fcfce90..96f45f6 100644
--- a/src/utils/zplGenerator.js
+++ b/src/utils/zplGenerator.js
@@ -510,6 +510,11 @@ export class ZPLGenerator {
    * 生成流水号ZPL代码
    */
   generateSerialNumberZPL(element, x, y) {
+    // 检查是否显示流水号（默认显示）
+    if (element.showSerialNumber === false) {
+      return '' // 不显示时返回空字符串
+    }
+
     const zpl = []
 
     // 生成字体命令
diff --git a/src/views/modules/labelSetting/LabelDesigner.vue b/src/views/modules/labelSetting/LabelDesigner.vue
index 1c8b2a7..f70f73d 100644
--- a/src/views/modules/labelSetting/LabelDesigner.vue
+++ b/src/views/modules/labelSetting/LabelDesigner.vue
@@ -462,7 +462,7 @@ export default {
           // 修复：对每个元素补全属性，保证响应式
           const defaultElement = {reportId: '',
             type: '', x: 0, y: 0, data: '', fontSize: 30, bold: false, newline: false, lineRows: 2,
-            lineWidth: 200, digits: 6, step: 1, width: 100, height: 30, previewUrl: '', barcodeType: '', showContent: true, showElement: true,
+            lineWidth: 200, digits: 6, step: 1, width: 100, height: 30, previewUrl: '', barcodeType: '', showContent: true, showElement: true, showSerialNumber: true,
             showMainSeq: false,parentSerialLabelNo:'', seqName: '', isChecked: false, decimalPlaces: '', showDecimalPlaces: false, thousandsSeparator: false,
             // 字体相关属性
             fontFamily: 'default', textAlign: 'left', letterSpacing: 0, fontItalic: false, fontUnderline: false
@@ -474,6 +474,16 @@ export default {
               if (!element.barcodeType) element.barcodeType = 'CODE128';
               if (element.showContent === undefined) element.showContent = true;
             }
+            // 为流水号元素确保显示属性默认为true
+            if (element.type === 'serialNumber') {
+              if (element.showSerialNumber === undefined || element.showSerialNumber === null || element.showSerialNumber === '') {
+                element.showSerialNumber = true;
+              }
+              // 如果是字符串类型，转换为布尔值
+              if (typeof element.showSerialNumber === 'string') {
+                element.showSerialNumber = element.showSerialNumber === 'true';
+              }
+            }
             return element;
           });
         }
@@ -569,7 +579,8 @@ export default {
           fontSize: 30,
           showMainSeq: false,
           parentSerialLabelNo:'',
-          reportId: this.labelNo
+          reportId: this.labelNo,
+          showSerialNumber: true // 默认显示流水号
         }
       }
 
diff --git a/src/views/modules/labelSetting/components/DataSourceDialog.vue b/src/views/modules/labelSetting/components/DataSourceDialog.vue
index ec401d0..9865716 100644
--- a/src/views/modules/labelSetting/components/DataSourceDialog.vue
+++ b/src/views/modules/labelSetting/components/DataSourceDialog.vue
@@ -14,6 +14,22 @@
       <el-form label-position="top" class="data-source-form">
         <!-- 可选：分组显示 -->
         <template v-if="hasViewGroups">
+          <!-- 系统变量组 -->
+          <div class="view-group">
+            <div class="view-title">系统变量</div>
+            <div class="checkbox-grid">
+              <label
+                v-for="sysVar in systemVariables"
+                :key="sysVar.fieldName"
+                class="checkbox-item system-var">
+                <el-checkbox :label="sysVar.fieldName" v-model="selectedKeys">
+                  <span class="label-inner">
+                    <span class="field-name" :title="sysVar.description">{{ sysVar.displayName }}</span>
+                  </span>
+                </el-checkbox>
+              </label>
+            </div>
+          </div>
           <div
             v-for="group in viewGroups"
             :key="group.viewSource"
@@ -38,6 +54,7 @@
         </template>
 
         <template v-else>
+          <!-- 数据字段组 -->
           <div class="view-group">
             <div class="view-title">可用数据字段</div>
             <div class="checkbox-grid">
@@ -86,7 +103,14 @@ export default {
   emits: ['update:visible', 'confirm'],
   data() {
     return {
-      selectedKeys: []
+      selectedKeys: [],
+      systemVariables: [
+        {
+          fieldName: 'CURRENT_DATE_YYYYMMDD',
+          displayName: '日期(YYYYMMDD)',
+          description: '日期，格式：YYYYMMDD，如：20241218'
+        }
+      ]
     }
   },
   computed: {
@@ -119,15 +143,26 @@ export default {
       return name + (key.fieldDescription ? `(${key.fieldDescription})` : '')
     },
     initializeSelection() {
-      if (!this.currentText || !this.dataKeys || !this.dataKeys.length) {
+      if (!this.currentText) {
         this.selectedKeys = []
         return
       }
       const found = []
-      this.dataKeys.forEach(k => {
-        const pat = new RegExp(`#\\{${k.fieldName}\\}`, 'g')
-        if (pat.test(this.currentText)) found.push(k.fieldName)
+
+      // 检查系统变量
+      this.systemVariables.forEach(sysVar => {
+        const pat = new RegExp(`#\\{${sysVar.fieldName}\\}`, 'g')
+        if (pat.test(this.currentText)) found.push(sysVar.fieldName)
       })
+
+      // 检查数据字段
+      if (this.dataKeys && this.dataKeys.length) {
+        this.dataKeys.forEach(k => {
+          const pat = new RegExp(`#\\{${k.fieldName}\\}`, 'g')
+          if (pat.test(this.currentText)) found.push(k.fieldName)
+        })
+      }
+
       this.selectedKeys = found
     },
     handleClose() {
@@ -135,6 +170,13 @@ export default {
     },
     handleConfirm() {
       const processed = this.selectedKeys.map(s => {
+        // 首先检查是否是系统变量
+        const sysVar = this.systemVariables.find(sv => sv.fieldName === s)
+        if (sysVar) {
+          return s // 系统变量直接返回字段名
+        }
+
+        // 然后检查数据字段
         const f = this.dataKeys.find(k => k.fieldName === s)
         return f && f.originalFieldName ? f.originalFieldName : s
       })
@@ -289,4 +331,39 @@ export default {
   color: #fff;
   border: none;
 }
+
+/* 系统变量特殊样式 */
+.checkbox-item.system-var {
+  background: linear-gradient(135deg, #fff7e6, #fff2d9);
+  border-color: #ffd591;
+}
+
+.checkbox-item.system-var:hover {
+  background: linear-gradient(135deg, #fff4e6, #ffefcc);
+  border-color: #ffcc7a;
+}
+
+.checkbox-item.system-var .field-name {
+  color: #d46b08;
+  font-weight: 800;
+}
+
+/* 使用提示样式 */
+.usage-tip {
+  background: #fff7e6;
+  border: 1px solid #ffd591;
+  border-radius: 4px;
+  padding: 8px 12px;
+  margin-bottom: 12px;
+  font-size: 13px;
+  color: #d46b08;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.usage-tip i {
+  font-size: 14px;
+  color: #faad14;
+}
 </style>
diff --git a/src/views/modules/labelSetting/components/DesignElement.vue b/src/views/modules/labelSetting/components/DesignElement.vue
index 6a08e2b..1f1c73c 100644
--- a/src/views/modules/labelSetting/components/DesignElement.vue
+++ b/src/views/modules/labelSetting/components/DesignElement.vue
@@ -71,9 +71,8 @@
     </div>
 
     <!-- 流水号元素 -->
-    <div v-else-if="element.type === 'serialNumber'" class="serial-number-element">
-
-      <div class="element-label">流水号</div>
+    <div v-else-if="element.type === 'serialNumber'" class="serial-number-element" :class="{ 'hidden-element': element.showSerialNumber === false }">
+      <div class="element-label">{{ element.showSerialNumber === false ? '流水号(已隐藏)' : '流水号' }}</div>
     </div>
   </div>
 </template>
@@ -399,4 +398,16 @@ export default {
     font-size: 9px;
   }
 }
+
+/* 隐藏元素样式 */
+.hidden-element {
+  opacity: 0.5;
+  background: linear-gradient(135deg, #f5f5f5, #e0e0e0) !important;
+  border: 1px dashed #bbb !important;
+}
+
+.hidden-element .element-label {
+  color: #999 !important;
+  font-style: italic;
+}
 </style>
diff --git a/src/views/modules/labelSetting/components/PropertyForm.vue b/src/views/modules/labelSetting/components/PropertyForm.vue
index fa9316f..5346040 100644
--- a/src/views/modules/labelSetting/components/PropertyForm.vue
+++ b/src/views/modules/labelSetting/components/PropertyForm.vue
@@ -532,13 +532,22 @@
         </div>
         <div class="form-row"  v-if="!element.parentSerialLabelNo">
           <el-form-item label="流水号规则" class="form-item-half">
-            <el-input v-model="element.data" placeholder="请输入流水号规则" @focus="$emit('data-source', element)"/>
+            <el-input v-model="element.data" placeholder="请输入流水号规则" />
+            <el-button type="primary" size="mini" @click="$emit('data-source', element)">
+              数据源
+            </el-button>
           </el-form-item>
+
+        </div>
+        <div class="form-row">
           <el-form-item label="流水号信息" class="form-item-half">
             <el-button type="primary" size="mini" @click="serialInfoModal(element)">
               查看
             </el-button>
           </el-form-item>
+          <el-form-item label="是否显示" class="form-item-half">
+            <el-checkbox v-model="element.showSerialNumber" size="middle">显示流水号</el-checkbox>
+          </el-form-item>
         </div>
 
       </el-form>