初步进行新装调试

pages/workBenchNew/components/installMeter/index.js

@@ -113,7 +113,7 @@ Page({
     }
     this.setData({
       show: true,
-      title: "采集器A",
+      title: "互感器A",
       type: 'collection',
       collection: "A"
     })
@@ -126,7 +126,7 @@ Page({
     }
     this.setData({
       show: true,
-      title: "采集器B",
+      title: "互感器B",
       type: 'collection',
       collection: "B"
     })
@@ -139,7 +139,7 @@ Page({
     }
     this.setData({
       show: true,
-      title: "采集器C",
+      title: "互感器C",
       type: 'collection',
       collection: "C"
     })
@@ -360,7 +360,7 @@ Page({
       tenement, sharp, peak, flat, valley, overall, url, sn, 
       collectionARatio, collectionBRatio, collectionCRatio
     } = this.data;
-    if (!park || !(meter || sn) || !address || meterType == null) {
+    if (!park || !(meter || sn) || !address || meterType == null || !building || !meterBox) {
       alertInfo("请填写必填项后保存")
       return;
     }
@@ -369,7 +369,7 @@ Page({
       (collectionA == collectionC&& collectionA != null && collectionC != null) || 
       (collectionC == collectionB && collectionB != null && collectionC != null)
     ) {
-      alertInfo("采集器不能重复选择")
+      alertInfo("互感器不能重复选择")
       return;
     }
     if (
@@ -377,7 +377,7 @@ Page({
       (collectionARatio != collectionCRatio&& collectionARatio != null && collectionCRatio != null) || 
       (collectionCRatio != collectionBRatio && collectionBRatio != null && collectionCRatio != null)
     ) {
-      alertInfo("采集器倍率不一致")
+      alertInfo("互感器倍率不一致")
       return;
     }
     const { code, data, message } = await installMeter({

pages/workBenchNew/components/installMeter/index.wxml

@@ -41,6 +41,7 @@
     placeholder="请选择建筑"
     text="{{buildingName}}"
     bind:search="onBuildingFocus"
+    required="{{true}}"
 
 />
 <searchSelectWrapper 
@@ -48,6 +49,7 @@
     placeholder="请选择电表箱"
     text="{{meterBoxName}}"
     bind:search="onMeterBoxFocus"
+    required="{{true}}"
 />
 <searchSelectWrapper 
     label="电表类型" 
@@ -85,20 +87,20 @@
     bind:search="onBindCard"
 />
 <searchSelectWrapper 
-    label="采集器A" 
-    placeholder="请选择采集器绑定（选填）"
+    label="互感器A" 
+    placeholder="请选择互感器绑定"
     text="{{collectionAName}}"
     bind:search="onBindCollectionA"
 />
 <searchSelectWrapper 
-    label="采集器B" 
-    placeholder="请选择采集器绑定（选填）"
+    label="互感器B" 
+    placeholder="请选择互感器绑定"
     text="{{collectionBName}}"
     bind:search="onBindCollectionB"
 />
 <searchSelectWrapper 
-    label="采集器C" 
-    placeholder="请选择采集器绑定（选填）"
+    label="互感器C" 
+    placeholder="请选择互感器绑定"
     text="{{collectionCName}}"
     bind:search="onBindCollectionC"
 />