From 3b394c3f10250710257d4c7222d8d55d98f90710 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 18 Aug 2025 14:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E6=B5=81=E6=B0=B4=E5=8F=B7?=
 =?UTF-8?q?=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/labelSetting/LabelDesigner.vue      |  2 +-
 .../labelSetting/components/PropertyForm.vue    | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/labelSetting/LabelDesigner.vue b/src/views/modules/labelSetting/LabelDesigner.vue
index eff8151..e2a1f57 100644
--- a/src/views/modules/labelSetting/LabelDesigner.vue
+++ b/src/views/modules/labelSetting/LabelDesigner.vue
@@ -433,7 +433,7 @@ export default {
           // 修复：对每个元素补全属性，保证响应式
           const defaultElement = {
             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,showPic:true,
+            lineWidth: 200, digits: 6, step: 1, width: 100, height: 30, previewUrl: '', barcodeType: '', showContent: true,showElement:true,
             showMainSeq:false,seqName:'',isChecked:false,decimalPlaces:'',showDecimalPlaces:false,thousandsSeparator:false
           };
           this.elements = (data.data || []).map(item => {
diff --git a/src/views/modules/labelSetting/components/PropertyForm.vue b/src/views/modules/labelSetting/components/PropertyForm.vue
index d48ebb0..2cb3ae5 100644
--- a/src/views/modules/labelSetting/components/PropertyForm.vue
+++ b/src/views/modules/labelSetting/components/PropertyForm.vue
@@ -19,6 +19,9 @@
             </el-button>
           </div>
         </el-form-item>
+        <el-form-item label="不显示规则(如:XXX=N)" class="form-item-half">
+          <el-input v-model="element.showElement" controls-position="right" size="mini"/>
+        </el-form-item>
         <el-form-item label="" class="form-item-half">
           <el-checkbox v-model="element.isChecked" size="small" class="inline-checkbox">打勾</el-checkbox>
         </el-form-item>
@@ -238,7 +241,9 @@
             </el-button>
           </div>
         </el-form-item>
-
+        <el-form-item label="不显示规则(如:XXX=N)" class="form-item-half">
+          <el-input v-model="element.showElement" controls-position="right" size="mini"/>
+        </el-form-item>
         <div class="form-row">
           <el-form-item label="条码类型" class="form-item-half">
             <el-select v-model="element.barcodeType" size="mini" style="width: 100%;">
@@ -252,7 +257,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="显示内容" class="form-item-half">
+          <el-form-item label="明文显示" class="form-item-half">
             <el-radio-group v-model="element.showContent" size="mini">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
@@ -298,7 +303,9 @@
             </el-button>
           </div>
         </el-form-item>
-
+        <el-form-item label="不显示规则(如:XXX=N)" class="form-item-half">
+          <el-input v-model="element.showElement" controls-position="right" size="mini"/>
+        </el-form-item>
         <el-form-item label="尺寸(mm)">
           <el-input
             v-model="element.height"
@@ -348,8 +355,8 @@
         <div v-if="element.previewUrl" class="image-preview">
           <img :src="element.previewUrl" alt="预览" />
         </div>
-        <el-form-item label="图片不显示规则(如:XXX=N)" class="form-item-half">
-          <el-input v-model="element.showPic" controls-position="right" size="mini"/>
+        <el-form-item label="不显示规则(如:XXX=N)" class="form-item-half">
+          <el-input v-model="element.showElement" controls-position="right" size="mini"/>
         </el-form-item>
       </el-form>
     </div>