From c1f8c16e4407cdb2ba3d13df4c8466b83e515008 Mon Sep 17 00:00:00 2001
From: Zy <1448159279@qq.com>
Date: Thu, 25 Jun 2026 08:04:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=8D=A2=E6=96=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=B0=8F=E5=8C=BAid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wuye-manager-uniapp/api/instrument.js         |  4 +--
 .../pageSubPack/instrument/addreplacement.vue |  6 ++++-
 .../instrument/replacement_record.vue         | 26 ++++++++++++-------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/wuye-manager-uniapp/api/instrument.js b/wuye-manager-uniapp/api/instrument.js
index e143d3b..634d28f 100644
--- a/wuye-manager-uniapp/api/instrument.js
+++ b/wuye-manager-uniapp/api/instrument.js
@@ -3,7 +3,7 @@
  * @Author: Zy
  * @Date: 2026-05-16 15:53:23
  * @LastEditor: Zy
- * @LastEditTime: 2026-05-16 16:38:54
+ * @LastEditTime: 2026-06-23 10:02:36
  */
 import request, {
   filterParams,
@@ -43,7 +43,7 @@ export const getReplaceMainList = (data) => {
 
 /**
  * @description: 添加仪表API
- * @param {{ deviceType:DeviceType, deviceCode:string,houseId:string }} data
+ * @param {{ deviceType:DeviceType, deviceCode:string,houseId:string,villageId:string }} data
  */
 export const AddReplaceMainList = (data) => {
   return put('/manage/replace/sdb/replace/device', filterParams(data))
diff --git a/wuye-manager-uniapp/pageSubPack/instrument/addreplacement.vue b/wuye-manager-uniapp/pageSubPack/instrument/addreplacement.vue
index d66980e..7790816 100644
--- a/wuye-manager-uniapp/pageSubPack/instrument/addreplacement.vue
+++ b/wuye-manager-uniapp/pageSubPack/instrument/addreplacement.vue
@@ -113,7 +113,11 @@ function handleSubmit() {
       title: '选择房屋'
     })
   }
-  AddReplaceMainList(formData.value)
+  const { villageId } = JSON.parse(uni.getStorageSync('currentVillage'))
+  AddReplaceMainList({
+    villageId,
+    ...formData.value
+  })
     .then(() => {
       uni.showToast({
         icon: 'success',
diff --git a/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue b/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue
index 1043377..e9a2d2b 100644
--- a/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue
+++ b/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue
@@ -17,15 +17,18 @@
             v-for="(item, index) in infolist"
             :key="index"
           >
-            <view class="flex items-center">
-              <image lazy-load src="/static/imgs/home.png" class="icon" mode=""></image>
-              <view class="instrument_info">
-                <view class="instrument_title">
-                  <text>{{ item.addressCn }}</text>
-                </view>
-                <view class="instrument_time">
-                  <text>换新时间时间：{{ item.createTime }}</text>
-                </view>
+            <image lazy-load src="/static/imgs/home.png" class="icon" mode=""></image>
+            <view class="flex-1 instrument_info">
+              <view class="instrument_title">
+                <text>{{ item.addressCn }}</text>
+                <text v-if="item.addressHyphen">({{ item.addressHyphen }})</text>
+              </view>
+              <view class="instrument_time">
+                <text>换新时间时间：{{ item.createTime }}</text>
+              </view>
+              <view class="instrument_time">
+                <text>更换设备为：</text>
+                <text>{{ item.deviceCode }}</text>
               </view>
             </view>
             <view class="instrument_type">
@@ -192,9 +195,12 @@ function handleClick() {
       .icon {
         width: 40rpx;
         height: 32rpx;
+        min-width: 40rpx;
       }
       .instrument_info {
+        flex: 1;
         margin-left: 22rpx;
+        overflow: hidden;
         .instrument_title {
           font-weight: 550;
           font-size: 32rpx;
@@ -206,10 +212,12 @@ function handleClick() {
           font-weight: 400;
           font-size: 24rpx;
           color: #666666;
+          text-wrap: wrap;
           line-height: 30rpx;
         }
       }
       .instrument_type {
+        min-width: 50rpx;
         font-weight: 400;
         font-size: 24rpx;
         color: #4d5dfa;