From 17ff00d840f0ba7c6d06b0be702d6caca7b395d8 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 8 Apr 2026 15:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=98=AF=E5=90=A6=E5=9B=9B?=
 =?UTF-8?q?=E8=88=8D=E4=BA=94=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/labelSetting/LabelDesigner.vue           | 2 +-
 src/views/modules/labelSetting/components/PropertyForm.vue | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/labelSetting/LabelDesigner.vue b/src/views/modules/labelSetting/LabelDesigner.vue
index 4a05c34..58aac97 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, dateOffsetDays: 0,
+            showMainSeq: false,parentSerialLabelNo:'', seqName: '', isChecked: false, decimalPlaces: '', showDecimalPlaces: false, thousandsSeparator: false, roundHalfUp: true, 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 c31ed2f..c44a2f6 100644
--- a/src/views/modules/labelSetting/components/PropertyForm.vue
+++ b/src/views/modules/labelSetting/components/PropertyForm.vue
@@ -144,8 +144,9 @@
           <el-form-item label="小数位数" >
             <div class="font-size-row">
               <el-input v-model="element.decimalPlaces" controls-position="right" size="mini"/>
-              <el-checkbox v-model="element.showDecimalPlaces" size="small" class="inline-checkbox">整数显示小数位数</el-checkbox>
+              <el-checkbox v-model="element.showDecimalPlaces" size="small" class="inline-checkbox">整数显示小数位</el-checkbox>
               <el-checkbox v-model="element.thousandsSeparator" size="small" class="inline-checkbox">千位分隔符</el-checkbox>
+              <el-checkbox v-model="element.roundHalfUp" size="small" class="inline-checkbox">四舍五入</el-checkbox>
             </div>
           </el-form-item>
         </template>
@@ -707,6 +708,8 @@ export default {
         this.setElementDefault('firstWeekDate', '')
         this.setElementDefault('firstDayOfWeek', '1')
         this.setElementDefault('dateOffsetDays', 0)
+      } else if (this.element.dataType === 'number') {
+        this.setElementDefault('roundHalfUp', true)
       } else if (this.element.dataType === 'string') {
         this.setElementDefault('stringProcessType', 'none')
         this.setElementDefault('substringStartLength', '')
@@ -756,6 +759,8 @@ export default {
         this.$set(this.element, 'firstWeekDate', '')
         this.$set(this.element, 'firstDayOfWeek', '1')
         this.$set(this.element, 'dateOffsetDays', 0)
+      } else if (newType === 'number') {
+        this.$set(this.element, 'roundHalfUp', true)
       } else if (newType === 'string') {
         this.$set(this.element, 'stringProcessType', 'none')
         this.$set(this.element, 'substringStartLength', '')