From 755fd6c712140579f7973a3465afdfdbfe6c6176 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 8 Apr 2026 15:24:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=94=AF=E6=8C=81=E5=8A=A0?=
 =?UTF-8?q?=E5=87=8F=E5=A4=A9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/labelSetting/LabelDesigner.vue    |  2 +-
 .../labelSetting/components/PropertyForm.vue  | 71 +++++++++++++++----
 2 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/labelSetting/LabelDesigner.vue b/src/views/modules/labelSetting/LabelDesigner.vue
index eb1b313..4a05c34 100644
--- a/src/views/modules/labelSetting/LabelDesigner.vue
+++ b/src/views/modules/labelSetting/LabelDesigner.vue
@@ -463,7 +463,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, showSerialNumber: true,
-            showMainSeq: false,parentSerialLabelNo:'', seqName: '', isChecked: false, decimalPlaces: '', showDecimalPlaces: false, thousandsSeparator: false,
+            showMainSeq: false,parentSerialLabelNo:'', seqName: '', isChecked: false, decimalPlaces: '', showDecimalPlaces: false, thousandsSeparator: false, dateOffsetDays: 0,
             // 字体相关属性
             fontFamily: 'default', textAlign: 'left', letterSpacing: 0, fontItalic: false, fontUnderline: false
           };
diff --git a/src/views/modules/labelSetting/components/PropertyForm.vue b/src/views/modules/labelSetting/components/PropertyForm.vue
index 7e5c2cf..c31ed2f 100644
--- a/src/views/modules/labelSetting/components/PropertyForm.vue
+++ b/src/views/modules/labelSetting/components/PropertyForm.vue
@@ -151,16 +151,25 @@
         </template>
         <!-- 日期类型设置 -->
         <template v-if="element.dataType === 'date'">
-          <el-form-item label="日期提取类型">
-            <el-select v-model="element.dateExtractType" size="mini" style="width: 100%;">
-              <el-option label="完整日期" value="full" />
-              <el-option label="提取年" value="year" />
-              <el-option label="提取月" value="month" />
-              <el-option label="提取日" value="day" />
-              <el-option label="提取周别" value="week" />
-              <el-option label="提取周几" value="weekday" />
-            </el-select>
-          </el-form-item>
+          <div class="form-row">
+            <el-form-item label="日期提取类型" class="form-item-half">
+              <el-select v-model="element.dateExtractType" size="mini" style="width: 100%;">
+                <el-option label="完整日期" value="full" />
+                <el-option label="提取年" value="year" />
+                <el-option label="提取月" value="month" />
+                <el-option label="提取日" value="day" />
+                <el-option label="提取周别" value="week" />
+                <el-option label="提取周几" value="weekday" />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="加减天数" class="form-item-half">
+              <el-input
+                v-model="element.dateOffsetDays"
+                controls-position="right" size="mini"
+                style="width: 100%;"/>
+            </el-form-item>
+          </div>
 
           <template v-if="element.dateExtractType === 'week'">
             <el-form-item label="第一周日期">
@@ -645,10 +654,8 @@ export default {
     comShowLabelSerialInfo,/*标签内容流水号信息的組件*/
   },
   mounted() {
-    // 初始化数据类型
-    if (this.element.type === 'text' && !this.element.dataType) {
-      this.$set(this.element, 'dataType', 'text')
-    }
+    // 初始化数据类型及相关设置
+    this.initializeTypeSettings()
 
     // 初始化字体设置
     this.initializeFontSettings()
@@ -669,6 +676,7 @@ export default {
     'element'() {
       // 当切换到不同元素时，获取父流水号
       this.$nextTick(() => {
+        this.initializeTypeSettings()
         if (this.element.type === 'serialNumber') {
           this.getParentLabelInfo()
         }
@@ -676,6 +684,40 @@ export default {
     }
   },
   methods: {
+    setElementDefault(key, defaultValue) {
+      const value = this.element[key]
+      if (value === undefined || value === null || value === '') {
+        this.$set(this.element, key, defaultValue)
+      }
+    },
+
+    initializeTypeSettings() {
+      if (this.element.type !== 'text') {
+        return
+      }
+
+      this.setElementDefault('dataType', 'text')
+
+      if (this.element.dataType === 'date') {
+        this.setElementDefault('dateExtractType', 'full')
+        this.setElementDefault('dateFormat', 'ymd')
+        this.setElementDefault('dateSeparator', '-')
+        this.setElementDefault('yearDigits', '4')
+        this.setElementDefault('monthDayDigits', '2')
+        this.setElementDefault('firstWeekDate', '')
+        this.setElementDefault('firstDayOfWeek', '1')
+        this.setElementDefault('dateOffsetDays', 0)
+      } else if (this.element.dataType === 'string') {
+        this.setElementDefault('stringProcessType', 'none')
+        this.setElementDefault('substringStartLength', '')
+        this.setElementDefault('substringEndLength', '')
+        this.setElementDefault('splitCharacter', '')
+        this.setElementDefault('splitIndex', '0')
+        this.setElementDefault('replaceFrom', '')
+        this.setElementDefault('replaceTo', '')
+      }
+    },
+
     // 获取父标签信息
     async getParentLabelInfo() {
       if (!this.element.reportId) return null
@@ -713,6 +755,7 @@ export default {
         this.$set(this.element, 'monthDayDigits', '2')
         this.$set(this.element, 'firstWeekDate', '')
         this.$set(this.element, 'firstDayOfWeek', '1')
+        this.$set(this.element, 'dateOffsetDays', 0)
       } else if (newType === 'string') {
         this.$set(this.element, 'stringProcessType', 'none')
         this.$set(this.element, 'substringStartLength', '')