From 750f2d8d39360476170f057bfdf70d4d2c98191d Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Tue, 4 Nov 2025 15:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A3=85=E8=A1=A8=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=9A=84=E6=97=B6=E5=80=99=E6=8F=90=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=92=8C=E4=BA=92=E6=84=9F=E5=99=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/searchSelect/index.js                    | 3 ++-
 components/searchSelectWrapper/index.wxml           | 6 +++---
 pages/workBenchNew/components/installMeter/index.js | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js
index 65f64df..c30dd46 100644
--- a/components/searchSelect/index.js
+++ b/components/searchSelect/index.js
@@ -156,8 +156,9 @@ Component({
         alertInfo(message)
         return
       }
+      console.log("parks", parks)
       this.setData({
-        columns: parks?.map(item => item?.name),
+        columns: parks?.map(item => `${item.transformerId}-倍率:${item.ratio}-${item.manufacturer}`),
         list: parks,
       })
     },
diff --git a/components/searchSelectWrapper/index.wxml b/components/searchSelectWrapper/index.wxml
index 94888c1..cfcece7 100644
--- a/components/searchSelectWrapper/index.wxml
+++ b/components/searchSelectWrapper/index.wxml
@@ -8,7 +8,7 @@
     </view>
 </view>
 <view class="wrapper" wx:if="{{type === 'inputSearch'}}">
-    <view class="label"> {{ label }} </view>
+    <view class="label"><text class="required" wx:if="{{required}}">*</text>{{ label }}</view>
     <view class="inputContent" bind:tap="clickTime">
         <van-field
             value="{{ value }}"
@@ -21,7 +21,7 @@
     <van-button type="info" size="small" bind:click="onSearchKeyword"> 搜索 </van-button>
 </view>
 <view class="wrapper" wx:if="{{type === 'input'}}">
-    <view class="label"> {{ label }} </view>
+    <view class="label"><text class="required" wx:if="{{required}}">*</text>{{ label }}</view>
     <view class="inputContent" bind:tap="clickTime">
         <van-field
             value="{{ value }}"
@@ -35,7 +35,7 @@
 </view>
 
 <view class="wrapper" wx:if="{{useSlot}}">
-    <view class="label"> {{ label }} </view>
+    <view class="label"><text class="required" wx:if="{{required}}">*</text>{{ label }}</view>
     <view class="inputContent" bind:tap="clickTime" style="{{hideBorder ? 'border: none;' : ''}}">
         <slot></slot>
     </view>
diff --git a/pages/workBenchNew/components/installMeter/index.js b/pages/workBenchNew/components/installMeter/index.js
index 48fc9e5..8118ae9 100644
--- a/pages/workBenchNew/components/installMeter/index.js
+++ b/pages/workBenchNew/components/installMeter/index.js
@@ -237,19 +237,19 @@ Page({
         if (collection === "A") {
           newData = {
             collectionA: data.id,
-            collectionAName: data.name,
+            collectionAName: `${item.transformerId}-倍率:${item.ratio}-${item.manufacturer}`,
           }
         }
         if (collection === "B") {
           newData = {
             collectionB: data.id,
-            collectionBName: data.name,
+            collectionBName: `${item.transformerId}-倍率:${item.ratio}-${item.manufacturer}`,
           }
         }
         if (collection === "C") {
           newData = {
             collectionC: data.id,
-            collectionCName: data.name,
+            collectionCName: `${item.transformerId}-倍率:${item.ratio}-${item.manufacturer}`,
           }
         }
         this.setData(newData);
@@ -323,7 +323,7 @@ Page({
       ratio, area, card, collectionA, collectionB, collectionC,
       tenement, sharp, peak, flat, valley, overall, url
     } = this.data;
-    if (!park || !meter || !address) {
+    if (!park || !meter || !address || !meterType) {
       alertInfo("请填写必填项后保存")
       return;
     }