From e6a86770788ee116c7d196b63b05ec4e1c993595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 9 Jan 2026 19:00:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(house):=20=E6=B7=BB=E5=8A=A0=E6=88=BF?=
 =?UTF-8?q?=E5=B1=8B=E4=BF=A1=E6=81=AF=E8=A1=A8=E5=8D=95=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在房屋信息模型中添加了租金单位、月租金单位和面积单位字段
- 修改表单界面为面积、单价和总价字段添加单位输入框
- 更新字典选择器的代码配置从 premium 到 premium2
- 设置默认单位值为泰铢和泰铢/菜
- 修复表单提交时使用正确的租金字段映射
---
 src/components/DictSelect/index.vue           | 84 +++++++++++++++++--
 src/views/house/info/components/info-edit.vue |  1 +
 .../house/maimai/components/info-edit.vue     | 12 +--
 3 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/src/components/DictSelect/index.vue b/src/components/DictSelect/index.vue
index bdcc5c8..4547a26 100644
--- a/src/components/DictSelect/index.vue
+++ b/src/components/DictSelect/index.vue
@@ -5,7 +5,7 @@
     :show-search="true"
     optionFilterProp="label"
     :options="data"
-    :value="value"
+    :value="innerValue"
     :placeholder="placeholder"
     @update:value="updateValue"
     :style="`width: ${width}px`"
@@ -15,13 +15,14 @@
 </template>
 
 <script lang="ts" setup>
-  import {ref} from 'vue';
+  import { ref, watch } from 'vue';
   import {listDictData} from "@/api/system/dict-data";
 
   const data = ref<any[]>([]);
+  const innerValue = ref<string | number | undefined>(undefined);
 
   const emit = defineEmits<{
-    (e: 'update:value', value: string): void;
+    (e: 'update:value', value: string | number | undefined): void;
     (e: 'index', index: number): void;
     (e: 'blur'): void;
     (e: 'done', item: any): void;
@@ -29,39 +30,106 @@
 
   const props = withDefaults(
     defineProps<{
-      value?: string;
+      value?: string | number;
       placeholder?: string;
       dictCode?: string;
       showSearch?: string;
       allowClear?: boolean;
       width?: number;
       index?: number;
+      valueType?: 'id' | 'code' | 'name';
     }>(),
     {
-      placeholder: '请选择服务器厂商'
+      placeholder: '请选择服务器厂商',
+      valueType: 'id'
     }
   );
 
+  innerValue.value = props.value as any;
+
+  const normalizeInnerValue = () => {
+    const raw = props.value;
+    if (raw === undefined || raw === null || raw === '') {
+      innerValue.value = raw as any;
+      return;
+    }
+    const rawStr = String(raw);
+    const matchById = data.value.find((d) => String(d.dictDataId) === rawStr);
+    const matchByCode = data.value.find((d) => String(d.dictDataCode) === rawStr);
+    const matchByName = data.value.find((d) => String(d.dictDataName) === rawStr);
+
+    const setInnerValue = (next: string | number) => {
+      innerValue.value = next;
+    };
+    const emitIfChanged = (next: string | number) => {
+      if (String(raw) !== String(next)) {
+        emit('update:value', next);
+        emit('done', data.value.find((d) => String(d.value) === String(next)));
+      }
+    };
+
+    if (props.valueType === 'name') {
+      const next = matchByName?.dictDataName ?? matchById?.dictDataName ?? matchByCode?.dictDataName;
+      if (next !== undefined) {
+        setInnerValue(next);
+        emitIfChanged(next);
+        return;
+      }
+    } else if (props.valueType === 'code') {
+      const next = matchByCode?.dictDataCode ?? matchById?.dictDataCode ?? matchByName?.dictDataCode;
+      if (next !== undefined) {
+        setInnerValue(next);
+        emitIfChanged(next);
+        return;
+      }
+    } else if (props.valueType === 'id') {
+      const next =
+        matchById?.dictDataId ??
+        matchByCode?.dictDataId ??
+        matchByName?.dictDataId ??
+        raw;
+      setInnerValue(next);
+      return;
+    }
+
+    innerValue.value = raw as any;
+  };
+
   // 字典数据
   listDictData({dictCode: props.dictCode}).then(res => {
     data.value = res.map(d => {
+      const optionValue =
+        props.valueType === 'name'
+          ? d.dictDataName
+          : props.valueType === 'code'
+            ? d.dictDataCode
+            : d.dictDataId;
       return {
         dictDataId: d.dictDataId,
         dictDataCode: d.dictDataCode,
         dictDataName: d.dictDataName,
         key: d.dictDataCode,
-        value: d.dictDataId,
+        value: optionValue,
         label: d.dictDataName,
         comments: d.comments
       };
     });
+    normalizeInnerValue();
   });
 
+  watch(
+    () => props.value,
+    () => {
+      normalizeInnerValue();
+    }
+  );
+
   /* 更新选中数据 */
-  const updateValue = (value: string) => {
+  const updateValue = (value: string | number) => {
+    innerValue.value = value;
     emit('update:value', value);
     emit('index', Number(props.index));
-    emit('done', data.value.find(d => d.value === value))
+    emit('done', data.value.find(d => String(d.value) === String(value)))
   };
 
   /* 失去焦点 */
diff --git a/src/views/house/info/components/info-edit.vue b/src/views/house/info/components/info-edit.vue
index 97e7f50..e6c8cae 100644
--- a/src/views/house/info/components/info-edit.vue
+++ b/src/views/house/info/components/info-edit.vue
@@ -150,6 +150,7 @@
                 <DictSelect
                   v-if="editStatus"
                   dict-code="premium"
+                  value-type="name"
                   v-model:value="form.premium"
                   placeholder="是否可溢价"
                 />
diff --git a/src/views/house/maimai/components/info-edit.vue b/src/views/house/maimai/components/info-edit.vue
index 5ea2cc3..bdd0794 100644
--- a/src/views/house/maimai/components/info-edit.vue
+++ b/src/views/house/maimai/components/info-edit.vue
@@ -62,7 +62,7 @@
                     v-model:value="form.extentUnit"
                   />
                 </a-space>
-                <span v-else>{{ form.extent }}</span>
+                <span v-else>{{ form.extent }}{{ form.extentUnit }}</span>
               </a-form-item>
               <a-form-item label="单价(莱)" name="rent">
                 <a-space v-if="editStatus">
@@ -76,7 +76,7 @@
                     v-model:value="form.rentUnit"
                   />
                 </a-space>
-                <span v-else>{{ form.rent }}</span>
+                <span v-else>{{ form.rent }}{{ form.rentUnit }}</span>
               </a-form-item>
               <a-form-item label="总价" name="monthlyRent">
                 <a-space v-if="editStatus">
@@ -88,10 +88,10 @@
                   />
                   <a-input
                     placeholder="单位"
-                    v-model:value="form.rentUnit"
+                    v-model:value="form.monthlyRentUnit"
                   />
                 </a-space>
-                <span v-else>{{ form.monthlyRent }}</span>
+                <span v-else>{{ form.monthlyRent }}{{form.monthlyRentUnit}}</span>
               </a-form-item>
 <!--              <a-form-item label="房号" name="roomNumber">-->
 <!--                <a-input-->
@@ -137,7 +137,7 @@
               <a-form-item label="是否可溢价" name="premium">
                 <DictSelect
                   v-if="editStatus"
-                  dict-code="premium2"
+                  dict-code="premium"
                   v-model:value="form.premium"
                   placeholder="是否可溢价"
                 />
@@ -415,7 +415,7 @@ import {ref, reactive, watch, computed} from 'vue';
     rent: undefined,
     rentUnit: '泰铢',
     monthlyRent: undefined,
-    monthlyRentUnit: undefined,
+    monthlyRentUnit: '泰铢',
     extent: undefined,
     extentUnit: '泰铢/菜',
     floor: undefined,