From 08494834c2d4277570ecc357829626a16059451a Mon Sep 17 00:00:00 2001
From: piexlMax <qimiaojiangjizhao@gmail.com>
Date: Wed, 13 Sep 2023 21:33:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=A2=9E=E5=8A=A0=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E5=80=BC=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E7=94=9F=E6=88=90=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=BB=98=E8=AE=A4=E8=AF=AD=E5=8F=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/model/system/sys_dictionary_detail.go           |  1 +
 server/resource/autocode_template/web/table.vue.tpl    |  4 ++--
 .../view/superAdmin/dictionary/sysDictionaryDetail.vue | 10 ++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/server/model/system/sys_dictionary_detail.go b/server/model/system/sys_dictionary_detail.go
index 5e4f62b7e..443f10718 100644
--- a/server/model/system/sys_dictionary_detail.go
+++ b/server/model/system/sys_dictionary_detail.go
@@ -10,6 +10,7 @@ type SysDictionaryDetail struct {
 	global.GVA_MODEL
 	Label           string `json:"label" form:"label" gorm:"column:label;comment:展示值"`                                  // 展示值
 	Value           int    `json:"value" form:"value" gorm:"column:value;comment:字典值"`                                  // 字典值
+	Extend          string `json:"extend" form:"extend" gorm:"column:extend;comment:扩展值"`                               // 扩展值
 	Status          *bool  `json:"status" form:"status" gorm:"column:status;comment:启用状态"`                              // 启用状态
 	Sort            int    `json:"sort" form:"sort" gorm:"column:sort;comment:排序标记"`                                    // 排序标记
 	SysDictionaryID int    `json:"sysDictionaryID" form:"sysDictionaryID" gorm:"column:sys_dictionary_id;comment:关联标记"` // 关联标记
diff --git a/server/resource/autocode_template/web/table.vue.tpl b/server/resource/autocode_template/web/table.vue.tpl
index 26d8ff597..4934d3f69 100644
--- a/server/resource/autocode_template/web/table.vue.tpl
+++ b/server/resource/autocode_template/web/table.vue.tpl
@@ -42,9 +42,9 @@
 
         {{- if eq .FieldType "float64" "int"}}
             {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
-            <el-input v-model.number="searchInfo.start{{.FieldName}}" placeholder="搜索条件（起）" />
+            <el-input v-model.number="searchInfo.start{{.FieldName}}" placeholder="最小值" />
             —
-            <el-input v-model.number="searchInfo.end{{.FieldName}}" placeholder="搜索条件（止）" />
+            <el-input v-model.number="searchInfo.end{{.FieldName}}" placeholder="最大值" />
            {{- else}}
              {{- if .DictType}}
               <el-select v-model="searchInfo.{{.FieldJson}}" placeholder="请选择" style="width:100%" :clearable="true" >
diff --git a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
index 10538d6fa..7ee6845ee 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
@@ -40,6 +40,8 @@
 
         <el-table-column align="left" label="字典值" prop="value" width="120" />
 
+        <el-table-column align="left" label="扩展值" prop="extend" width="120" />
+
         <el-table-column align="left" label="启用状态" prop="status" width="120">
           <template #default="scope">{{ formatBoolean(scope.row.status) }}</template>
         </el-table-column>
@@ -98,6 +100,14 @@
             max="2147483647"
           />
         </el-form-item>
+        <el-form-item label="扩展值" prop="extend">
+          <el-input
+              v-model="formData.extend"
+              placeholder="请输入扩展值"
+              clearable
+              :style="{width: '100%'}"
+          />
+        </el-form-item>
         <el-form-item label="启用状态" prop="status" required>
           <el-switch v-model="formData.status" active-text="开启" inactive-text="停用" />
         </el-form-item>