初步进行新装调试

app.json

@@ -46,7 +46,8 @@
     "pages/workBenchNew/components/recharge/index",
     "pages/workBenchNew/components/installMeter/index",
     "pages/workBenchNew/components/uninstallMeter/index",
-    "pages/workBenchTodoList/index"
+    "pages/workBenchTodoList/index",
+    "pages/workBenchNew/components/kaihu/index"
   ],
   "subPackages": [
     {

components/searchSelect/index.js

@@ -152,7 +152,7 @@ Component({
     },
     async onSearchCollection() {
       const { searchText = "" } = this.data;
-      const { code, message, data: parks = [] } = await getCollectionList({keyword: searchText, page: 1});
+      const { code, message, data: parks = [] } = await getCollectionList({keyword: searchText, page: 1, status: 1});
       if (code !== OK) {
         alertInfo(message)
         return

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" 
+    label="互感器A" 
-    placeholder="请选择采集器绑定（选填）"
+    placeholder="请选择互感器绑定"
     text="{{collectionAName}}"
     bind:search="onBindCollectionA"
 />
 <searchSelectWrapper 
-    label="采集器B" 
+    label="互感器B" 
-    placeholder="请选择采集器绑定（选填）"
+    placeholder="请选择互感器绑定"
     text="{{collectionBName}}"
     bind:search="onBindCollectionB"
 />
 <searchSelectWrapper 
-    label="采集器C" 
+    label="互感器C" 
-    placeholder="请选择采集器绑定（选填）"
+    placeholder="请选择互感器绑定"
     text="{{collectionCName}}"
     bind:search="onBindCollectionC"
 />

pages/workBenchNew/components/kaihu/index.js

@@ -0,0 +1,66 @@
+// pages/workBenchNew/components/kaihu/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/workBenchNew/components/kaihu/index.json

@@ -0,0 +1,10 @@
+{
+  "usingComponents": {
+    "search-select": "/components/searchSelect/index",
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index",
+    "navigator": "/components/navigator/index",
+    "van-dialog": "@vant/weapp/dialog/index"
+  },
+  "navigationStyle": "custom"
+}

pages/workBenchNew/components/kaihu/index.wxml

@@ -0,0 +1,83 @@
+<!--pages/workBenchNew/components/kaihu/index.wxml-->
+<navigator canBack="{{true}}" title="开户" />
+<view class="modalContentWrapper">
+        <van-field
+            value="{{name}}"
+            data-name="name"
+            bind:change="onChange"
+            label="商户全称"
+            type="textarea"
+            placeholder="请输入商户全称"
+            autosize="{{true}}"
+            title-width="132rpx"
+            required
+        />
+        <van-field
+            value="{{shortName}}"
+            data-name="shortName"
+            bind:change="onChange"
+            label="商户简称"
+            placeholder="请输入商户简称"
+            type="textarea"
+            autosize="{{true}}"
+            title-width="132rpx"
+        />
+        <van-field
+            value="{{address}}"
+            data-name="address"
+            bind:change="onChange"
+            label="联系地址"
+            placeholder="请输入联系地址"
+            type="textarea"
+            autosize="{{true}}"
+            title-width="132rpx"
+            required
+        />
+        <van-field
+            value="{{contact}}"
+            data-name="contact"
+            bind:change="onChange"
+            label="联系人"
+            placeholder="请输入联系人"
+            type="textarea"
+            autosize="{{true}}"
+            title-width="132rpx"
+            required
+        />
+        <van-field
+            value="{{phone}}"
+            data-name="phone"
+            bind:change="onChange"
+            label="联系电话"
+            placeholder="请输入联系电话"
+            type="textarea"
+            autosize="{{true}}"
+            title-width="132rpx"
+            required
+        />
+        <van-field
+            value="{{ buildingName }}"
+            placeholder="请选择建筑"
+            label="建筑"
+            use-button-slot
+            readonly
+            title-width="120rpx"
+            required
+        >
+            <van-button slot="button" size="small" type="info" bind:click="onBuildingFocus">
+                选择
+            </van-button>
+        </van-field>
+        <van-field
+            value="{{ feeTypeName }}"
+            placeholder="请选择收费类型"
+            label="收费类型"
+            readonly
+            use-button-slot
+            title-width="120rpx"
+        >
+            <van-button slot="button" size="small" type="info" bind:click="onFeeTypeFocus">
+                选择
+            </van-button>
+        </van-field>
+    </view>

pages/workBenchNew/components/kaihu/index.wxss

@@ -0,0 +1 @@
+/* pages/workBenchNew/components/kaihu/index.wxss */

pages/workBenchNew/index.js

@@ -76,6 +76,11 @@ Page({
       url: '/pages/workBenchNew/components/uninstallMeter/index',
     })
   },
+  jumpToKaihu() {
+    wx.navigateTo({
+      url: 'pages/workBenchNew/components/kaihu/index',
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/workBenchNew/index.wxml

@@ -111,7 +111,7 @@
                     <operate-button text="新装" bind:click="jumpToInstallMeter" />
                 </van-col>
                 <van-col span="8">
-                    <operate-button text="开户" />
+                    <operate-button text="开户" bind:click="jumpToKaihu" />
                 </van-col>
                 <van-col span="8">
                     <operate-button text="销户" />