绑定电表和解绑电表的时候初始传尖峰平谷和保存的时候传平

app.json

@@ -23,6 +23,7 @@
     "pages/encyclopedia/index",
     "pages/encyclopediaDetail/index",
     "pages/workBench/index",
+    "pages/workBenchNew/index",
     "pages/webPage/index",
     "pages/aid/finance/index",
     "pages/aid/law/index",
@@ -36,7 +37,12 @@
     "pages/meterList/index",
     "pages/workBench/components/tenement/components/createTenement/index",
     "pages/billMeterDetail/index",
-    "pages/meterBalanceRecord/index"
+    "pages/meterBalanceRecord/index",
+    "pages/workBenchNew/components/workBenchMeter/index",
+    "pages/workBenchNew/components/workBenchTenement/index",
+    "pages/workBenchNew/components/workBenchApprove/index",
+    "pages/workBenchNew/components/workBenchWxUser/index",
+    "pages/workBenchNew/components/workBenchReading/index"
   ],
   "subPackages": [
     {

components/DateTimePicker/index.js

@@ -8,8 +8,18 @@ Component({
    */
   properties: {
     show: Boolean,
+    // time: String,
   },
-
+  // observers: {
+  //   time: function(newValue) {
+  //     if (!newValue) {
+  //       return;
+  //     }
+  //     this.setData({
+  //       currentDate: new Date(newValue).getTime(),
+  //     })
+  //   }
+  // },
   /**
    * 组件的初始数据
    */
@@ -20,7 +30,10 @@ Component({
   },
   lifetimes: {
     attached() {
- 
+      this.setData({
+        maxDate: new Date().getTime(),
+        currentDate: new Date().getTime(),
+      })
     }
   },
   /**

pages/invoiceDetail/index.js

@@ -87,7 +87,6 @@ Page({
                   },
                   fail: function (e) {
                     // alertError("打开失败")
-                    // console.log('打开失败错误为', e)
                     wx.showModal({
                       title: '提示',
                       content: '打开失败，请复制链接后通过浏览器打开',

pages/login/index.js

@@ -58,6 +58,13 @@ Page({
       const { token, ...user } = data
       wx.setStorageSync('user', user)
       wx.setStorageSync('token', data?.token)
+      console.log("user.workStatus", user.workStatus)
+      if (user.workStatus) {
+        wx.redirectTo({
+          url: '/pages/workBenchNew/index',
+        })
+        return
+      }
       wx.switchTab({
         url: '/pages/home/index',
       })

pages/my/index.js

@@ -97,7 +97,7 @@ Page({
   },
   jumpToWorkBench() {
     wx.navigateTo({
-      url: '/pages/workBench/index',
+      url: '/pages/workBenchNew/index',
     })
   },
   jumpToIntegral() {

pages/readingHistory/components/editModal/index.js

@@ -1,8 +1,8 @@
 // pages/workBench/components/tenement/components/bindMeter/index.js
 // 0015980101
-import { bindMeter, } from "../../../../service/tenement"
+import { createReading, updateReading } from "../../../../service/workBench"
 import { getWorkMeterDetail } from "../../../../service/meter"
-import { alertInfo, alertSuccess } from "../../../../utils/index";
+import { alertInfo, alertSuccess, alertError } from "../../../../utils/index";
 import request from "../../../../utils/request"
 import dayjs from "../../../../utils/dayjs"
 const { OK } = request
@@ -16,12 +16,16 @@ Component({
     title: String,
     timeProps: String,
     numberProps: String,
-    id: String
+    idProps: String,
+    meter: String,
+    park: String,
+    routeId: String,
   },
   observers: {
     "timeProps": function(newValue) {
       this.setData({
-        time: newValue
+        time: newValue,
+        // startTime: newValue
       })
     },
     "numberProps": function(newValue) {
@@ -63,12 +67,40 @@ Component({
       })
     },
     async onSubmit() {
-      const { time, number } = this.data;
+      const { time, number, idProps, park, meter, timeProps, routeId } = this.data;
       if (time == null || number == null) {
         alertInfo("请正确填写后保存")
         return;
       }
-      this.triggerEvent("ok")
+      if (!idProps) {
+        const { code, message } = await createReading(park, meter, routeId, {
+          overall: `${number}`,
+          flat: `${number}`,
+          readAt: time,
+          source: 1,       
+        })
+        if (code !== OK) {
+          alertError(message)
+          return
+        }
+        alertSuccess("录入成功")
+        this.setData({ number: null, time: null, startTime: null })
+      } else {
+        const { code, message } = await updateReading(park, meter, new Date(timeProps).getTime() * 1000, {
+          overall: `${number}`,
+          flat: `${number}`,
+        })
+        if (code !== OK) {
+          alertError(message)
+          return
+        }
+        alertSuccess("录入成功")
+        this.setData({ number: null, time: null, startTime: null })
+      }
+      const that = this;
+      setTimeout(() => {
+        that.triggerEvent("ok")
+      }, 300)
     },
 
     dateTimeConfirm(e) {

pages/readingHistory/components/editModal/index.wxml

@@ -17,14 +17,16 @@
         use-button-slot
         title-width="100rpx"
     >
-        <van-button slot="button" size="small" type="info" bind:click="onTimeFocus">
+        <!-- <van-button slot="button" size="small" type="info" bind:click="onTimeFocus" wx:if="{{!idProps}}">
         选择
-        </van-button>
+        </van-button> -->
     </van-field>
     <van-field
         value="{{ number }}"
         placeholder="请输入读数"
         label="读数"
+        bind:change="onChange"
+        data-name="number"
         type="digit"
         border="{{ false }}"
         title-width="100rpx"
@@ -44,7 +46,9 @@
 />
 
 <date-time-picker 
+    wx:if="{{dateTimeShow}}"
     show="{{dateTimeShow}}"
+    time="{{startTime}}"
     bind:confirm="dateTimeConfirm"
     bind:cancel="dateTimeCancal"
 />

pages/readingHistory/components/meterInfo/index.wxss

@@ -20,3 +20,7 @@
     font-size: 30rpx;
     margin-bottom: 20rpx;
 }
+
+.status {
+    font-size: 30rpx;
+}

pages/readingHistory/index.js

@@ -1,28 +1,54 @@
 // pages/readingHistory/index.js
-import { getMeterReadingRouteMeterDetail } from "../../service/workBench"
+import { getMeterReadingRouteMeterDetail, getReadingList, deleteReading } from "../../service/workBench"
 import request from "../../utils/request"
-import { alertInfo, alertSuccess, alertError } from "../../utils/index"
+import { alertInfo, alertSuccess, alertError, loadingFunc } from "../../utils/index"
 const { OK } = request;
+import dayjs from "../../utils/dayjs"
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    list: [{time: "2025-05-05 14:10:09", number: 90803.87}]
+    list: [],
+    page: 1,
+    size: 20,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    const { meter, park } = options;
+    const { meter, park, routeId, disabled } = options;
+    const that = this;
     this.setData({
       meter,
-      park
+      park,
+      routeId,
+      disabled
+    }, () => {
+      that.refresh();
     })
     this.getMeterInfo(meter);
   },
+  refresh() {
+    const that = this;
+    loadingFunc(async () => {
+      await that.getList();
+    })
+  },
+  onEditFinish() {
+    this.setData({
+      title: null,
+      visible: null,
+      time: null,
+      number: null,
+      id: null,
+      readAtTimestamp: null,
+      type: null,
+    })
+    this.refresh()
+  },
   async getMeterInfo(id) {
     const { code, message, data } = await getMeterReadingRouteMeterDetail(id)
     if (code !== OK) {
@@ -31,6 +57,27 @@ Page({
     }
     this.setData({ meterInfo: data })
   },
+  async getList() {
+    const { meter, park, page, size } = this.data;
+    const { code, message, records: data } = await getReadingList(park, meter, page)
+    if (code !== OK) {
+      alertError(message)
+      return;
+    }
+    this.setData({
+      list: data,
+      totalPage: Math.ceil(data?.length / size)
+    })
+  },
+  async onChangePage(e) {
+    const newPage = e.detail.currentIndex;
+    const that = this;
+    this.setData({
+      page: newPage
+    }, () => {
+      that.getList();
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -40,30 +87,44 @@ Page({
   handleCreate() {
     this.setData({
       title: "新增记录",
-      visible: true
+      visible: true,
+      type: "create",
+      time: dayjs().format("YYYY-MM-DD HH:mm:ss")
     })
   },
-  handleUpdate() {
+  handleUpdate(e) {
+    const { data } = e.currentTarget.dataset;
     this.setData({
       title: "编辑记录",
       visible: true,
-      time: "2025-09-11",
-      number: 100,
-      id: ""
+      time: data.readAt,
+      number: data.overall,
+      id: data.id,
+      readAtTimestamp: data.readAtTimestamp,
+      type: "edit",
     })
   },
   handleDelete(e) {
-    const { id } = e.currentTarget.dataset;
+    const { data } = e.currentTarget.dataset;
+    const that = this;
     wx.showModal({
       title: '删除确认',
       content: '确认要删除这一项记录吗？',
-      complete: (res) => {
+      complete: async (res) => {
         if (res.cancel) {
           
         }
     
         if (res.confirm) {
-          
+          const { code, message } = await deleteReading(data?.id, data?.overall)
+          if (code !== OK) {
+            alertError(message)
+            return
+          }
+          alertSuccess("删除成功")
+          setTimeout(() => {
+            that.refresh()
+          }, 300)
         }
       }
     })

pages/readingHistory/index.json

@@ -4,7 +4,9 @@
     "meterInfo": "./components/meterInfo/index",
     "van-button": "@vant/weapp/button/index",
     "van-icon": "@vant/weapp/icon/index",
-    "editModal": "./components/editModal/index"
+    "editModal": "./components/editModal/index",
+    "pagination": "/components/pagination/index",
+    "empty": "/components/empty/index"
   },
   "navigationStyle": "custom"
 }

pages/readingHistory/index.wxml

@@ -1,13 +1,12 @@
 <!--pages/readingHistory/index.wxml-->
 <navigator title="历史抄表记录" canBack="{{true}}" />
-
 <view class="wrapper">
     <meterInfo meterInfo="{{meterInfo}}" />
     <view class="historyTitle">
         <view class="text">
             抄表记录历史
         </view>
-        <van-button type="info" size="small" icon="plus" bind:tap="handleCreate"> 新增记录 </van-button>
+        <van-button disabled="{{disabled === 'true'}}" type="info" size="small" icon="plus" bind:tap="handleCreate"> 新增记录 </van-button>
     </view>
     <view>
         <view wx:if="{{list.length}}">
@@ -22,15 +21,15 @@
                         <view wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
                             <view class="tr" style="display: flex; align-items: center; ">
                                 <view class="th" style="width: 40%; text-align: center; font-size: 30rpx;">
-                                    {{ item.time }}
+                                    {{ item.readAt }}
                                 </view>
                                 <view class="th" style="width: 35%; text-align: center; font-size: 30rpx;">
-                                    {{ item.number }}
+                                    {{ item.overall }}
                                 </view>
     
                                 <view class="th" style="width: 25%; text-align: center; justify-content: center; display: flex; align-items: center;">
-                                    <van-icon name="edit" size="40rpx" bind:tap="handleUpdate"  data-data="{{item}}" color="#15755e" />
-                                    <van-icon name="delete" size="40rpx" bind:tap="handleDelete" data-id="{{item.id}}" color="#15755e" custom-style="margin-left: 20rpx" />
+                                    <van-icon wx:if="{{item.isDelete && disabled !== 'true'}}" name="edit" size="40rpx" bind:tap="handleUpdate"  data-data="{{item}}" color="#15755e" />
+                                    <van-icon wx:if="{{item.isDelete && disabled !== 'true'}}" name="delete" size="40rpx" bind:tap="handleDelete" data-data="{{item}}" color="#15755e" custom-style="margin-left: 20rpx" />
                                 </view>
                             </view>
                         </view>
@@ -41,9 +40,22 @@
             <pagination currentIndex="{{page}}" totalPage="{{totalPage}}" bind:pagingChange="onChangePage" />
 
         </view>
-        <empty bind:refresh="init" wx:else />
+        <empty bind:refresh="refresh" wx:else />
 
     </view>
 </view>
 
-<editModal title="{{title}}" visible="{{visible}}" timeProps="{{time}}" numberProps="{{number}}" id="{{id}}" />
+<editModal 
+    wx:if="{{visible}}"
+    title="{{title}}" 
+    visible="{{visible}}" 
+    timeProps="{{time}}" 
+    timeStamp="{{readAtTimestamp}}"
+    numberProps="{{number}}" 
+    idProps="{{id}}" 
+    park="{{park}}"
+    meter="{{meter}}" 
+    bind:ok="onEditFinish"   
+    startTime="{{startTime}}"
+    routeId="{{routeId}}"
+/>

pages/readingHistory/index.wxss

@@ -11,6 +11,11 @@ page {
 .historyTitle {
     display: flex;
     justify-content: space-between;
+    align-items: center;
+}
+
+.historyTitle .text {
+    font-size: 32rpx;
 }
 
 .table {

pages/workBench/components/reading/index.js

@@ -20,7 +20,13 @@ Component({
     park: "",
     parkName: ""
   },
-
+  lifetimes: {
+    attached() {
+      if (this.data.parkName) {
+        this.init();
+      }
+    }
+  },
   /**
    * 组件的方法列表
    */
@@ -80,7 +86,7 @@ Component({
       alertSuccess("操作成功")
       this.init()
       setTimeout(() => {
-        that.jumpToReading()
+        that.jumpToReading({ currentTarget: { dataset: { id } } })
       }, 500)
     },
     async changeEndStatus(e) {

pages/workBench/components/reading/index.wxml

@@ -25,6 +25,7 @@
 <van-empty description="请先选择园区" wx:if="{{!park}}" />
 
 <view wx:else>
+    <view wx:if="{{list.length}}">
         <van-cell 
             wx:for="{{list}}"
             wx:key="id"
@@ -58,4 +59,6 @@
                 > 结束抄表 </van-button>
             </view>
         </van-cell>
+    </view>
+    <empty wx:else bind:refresh="init" />
 </view>

pages/workBench/index.js

@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    active: 4
+    active: 0
   },
 
   /**

pages/workBenchNew/components/workBenchApprove/components/approve/index.js

@@ -0,0 +1,279 @@
+// pages/workBench/components/recharge/components/waitApprove/index.js
+import {
+    alertInfo,
+    alertSuccess,
+    loadingFunc
+} from "../../../../../../utils/index";
+import {
+    getRechargeApproveList,
+    rechargeApprove
+} from "../../../../../../service/recharge"
+import request from "../../../../../../utils/request"
+import dayjs from "../../../../../../utils/dayjs"
+const {
+    OK
+} = request
+
+// pages/workBench/components/record/index.js
+Component({
+
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        status: Number
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        keyword: "",
+        keywordTemp: "",
+        page: 1,
+        currentActionSheet: null,
+        actionItems: [{
+            name: '查看详细',
+            value: 'detail'
+        }],
+    },
+
+    lifetimes: {
+        attached() {
+            loadingFunc(async () => {
+                await this.init();
+            })
+        }
+    },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        onParkFocus(e) {
+            this.setData({
+                show: true,
+                title: "园区",
+                type: 'park'
+            })
+        },
+        onConfirm(e) {
+            const {
+                data
+            } = e.detail;
+            const that = this;
+            this.setData({
+                parkName: data.name,
+                park: data.id,
+            }, () => {
+                loadingFunc(async () => {
+                    await that.init();
+                })
+            })
+            this.onCancel();
+        },
+        onSearchKeyword(e) {
+            const that = this;
+            that.setData({
+                keyword: e.detail
+            }, () => {
+                loadingFunc(async () => {
+                    await that.init();
+                })
+            })
+        },
+        onChangeKeyword(e) {
+            this.setData({
+                keywordTemp: e.detail
+            })
+        },
+        onSearch() {
+            const that = this;
+            that.setData({
+                keyword: that.data.keywordTemp
+            }, () => {
+                loadingFunc(async () => {
+                    await that.init();
+                })
+            })
+        },
+        async init() {
+            const {
+                page,
+                keyword,
+                park,
+                status
+            } = this.data;
+            const {
+                code,
+                message,
+                data,
+                total
+            } = await getRechargeApproveList({
+                park,
+                page,
+                keyword,
+                status
+            })
+            if (code !== OK) {
+                alertInfo(message);
+                return;
+            }
+            this.setData({
+                list: data.map(item => {
+                    item.topTime = dayjs(item.topTime).format("MM-DD")
+                    return item
+                }),
+                total: total,
+                totalPage: Math.ceil(total / 20)
+            })
+        },
+        onChangeReason(e) {
+            this.setData({
+                reason: e.detail,
+            })
+        },
+        onApproveClose() {
+            this.setData({
+                reason: "",
+                approveShow: false,
+            })
+        },
+        onApproveConfirm() {
+            const {
+                reason,
+                record
+            } = this.data;
+            const that = this;
+            if (!reason) {
+                alertInfo("请输入拒绝理由")
+                return;
+            }
+            loadingFunc(async () => {
+                const {
+                    code,
+                    message
+                } = await rechargeApprove({
+                    id: record,
+                    status: 1,
+                    reason
+                })
+                if (code !== OK) {
+                    alertInfo(message)
+                    return;
+                }
+                alertSuccess("已拒绝")
+                that.init();
+                that.setData({
+                    reason: "",
+                    approveShow: false,
+                    record: "",
+                })
+            })
+
+        },
+        handleApprove(e) {
+            const status = e.currentTarget.dataset.status;
+            const that = this;
+            if (status === '1') {
+                this.setData({
+                    approveShow: true
+                })
+                return;
+            }
+            const {
+                record,
+                list
+            } = this.data;
+            const item = list.find(ele => ele.id === record)
+
+            wx.showModal({
+                title: '提示',
+                content: `您确认要同意${item?.tenement?.shortName || 当前记录}吗？`,
+                complete: async (res) => {
+                    if (res.cancel) {
+
+                    }
+                    if (res.confirm) {
+                        loadingFunc(async () => {
+                            const {
+                                code,
+                                message
+                            } = await rechargeApprove({
+                                id: record,
+                                status: 0,
+                            })
+                            if (code !== OK) {
+                                alertInfo(message)
+                                return;
+                            }
+                            alertSuccess("已同意")
+                            that.init();
+                        })
+
+                    }
+                }
+            })
+        },
+
+        showActionMenu(e) {
+            this.setData({
+                currentActionSheet: e.currentTarget.dataset.id
+            });
+        },
+
+        hideActionMenu() {
+            this.setData({
+                currentActionSheet: null
+            });
+        },
+
+        onMenuSelect(e) {
+            const {
+                value
+            } = e.detail;
+            const id = e.currentTarget.dataset.id;
+
+            if (value === 'detail') {
+                this.jumpToDetail({
+                    currentTarget: {
+                        dataset: {
+                            id
+                        }
+                    }
+                });
+            }
+        },
+
+        jumpToDetail(e) {
+            const {
+                id
+            } = e.currentTarget.dataset;
+            wx.navigateTo({
+                url: '/pages/rechargeDetail/index?id=' + id,
+            })
+        },
+        async onChangePage(e) {
+            const page = e.detail.currentIndex;
+            const that = this;
+            this.setData({
+                page
+            }, () => {
+                loadingFunc(async () => {
+                    await that.init();
+                })
+            })
+        },
+        onCancel() {
+            this.setData({
+                show: false,
+                title: "",
+                type: "",
+            })
+        },
+        onChangeSelectRecharge(e) {
+            this.setData({
+                record: e.detail
+            })
+        }
+    }
+})

pages/workBenchNew/components/workBenchApprove/components/approve/index.json

@@ -0,0 +1,18 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index",
+    "search-select": "/components/searchSelect/index",
+    "van-empty": "@vant/weapp/empty/index",
+    "table": "/components/table/table",
+    "pagination": "/components/pagination/index",
+    "empty": "/components/empty/index",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index",
+    "van-dialog": "@vant/weapp/dialog/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-action-sheet": "@vant/weapp/action-sheet/index"    
+  }
+}

pages/workBenchNew/components/workBenchApprove/components/approve/index.wxml

@@ -0,0 +1,66 @@
+<!--pages/workBench/components/recharge/components/waitApprove/index.wxml-->
+<searchSelectWrapper label="园区" placeholder="请选择园区" text="{{parkName}}" bind:search="onParkFocus" />
+
+<searchSelectWrapper label="关键字" placeholder="请输入关键字" text="{{meterName}}" bind:searchKeyword="onSearchKeyword" type="inputSearch" />
+<view>
+    <view wx:if="{{list.length}}">
+        <view class="operate" wx:if="{{status === 2}}">
+            <view style="margin-top: 60rpx; margin-bottom: 60rpx;display: flex; justify-content: center; align-items: center;">
+                <van-button type="info" size="small" style="margin-right: 30rpx;" bind:click="handleApprove" data-status="0" disabled="{{!record}}"> 同意 </van-button>
+                <van-button size="small" bind:click="handleClear" disabled="{{!record}}" bind:click="handleApprove" data-status="1"> 拒绝 </van-button>
+            </view>
+        </view>
+        <view class="tableWrapper">
+            <view class="table">
+                <view class="thead">
+                    <view class="th" style="flex: 0 0 80rpx; display: {{status === 2 ? 'block' : 'none'}};"> </view>
+                    <!-- <view class="th" style="flex: 0 0 0rpx; display: {{status === 1 ? 'block' : 'none'}};"> </view> -->
+                    <view class="th" style="flex: 0 0 130rpx;"> 商户名字</view>
+                    <view class="th" style="flex: 0 0 150rpx;"> 充值金额 </view>
+                    <view class="th" style="flex: 0 0 150rpx; display: {{status === 1 ? 'block' : 'none'}};">状态</view>
+                    <view class="th"  style="flex: 0 0 150rpx;">提交时间</view>
+                    <view class="th"style="flex: 0 0 120rpx; justify-content: flex-end; display: flex; align-items: center;"> 操作 </view>
+                </view>
+                <view class="tbody">
+                    <van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
+                        <block wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
+                            <view class="tr" style="display: flex; align-items: center; ">
+                                <view class="th" style="flex: 0 0 80rpx; ; display: {{status === 2 ? 'block' : 'none'}};">
+                                    <van-radio wx:if="{{status === 2}}" name="{{item.id}}"></van-radio>
+                                </view>
+                                <view class="th" style="flex: 0 0 130rpx;">
+                                    {{ item.tenement.shortName }}
+                                </view>
+                                <view class="th" style="flex: 0 0 150rpx;">
+                                    {{ item.money }}
+                                </view>
+                                <view class="th" style="flex: 0 0 150rpx; display: {{status === 1 ? 'block' : 'none'}};">
+                                    <view class="tag">{{item.orderStatus}}</view>
+                                </view>
+                                <view class="th" style="flex: 0 0 150rpx; font-size: 30rpx;">
+                                    {{item.topTime}}
+                                </view>
+                                <view class="th" style="flex: 0 0 120rpx; justify-content: flex-end; display: flex; align-items: center;">
+                                    <van-icon name="ellipsis" size="24px" bind:tap="showActionMenu" data-id="{{item.id}}" class="more-icon" />
+                                    <van-action-sheet show="{{ currentActionSheet === item.id }}" actions="{{ actionItems }}" bind:close="hideActionMenu" bind:select="onMenuSelect" data-id="{{item.id}}" close-on-click-action />
+                                </view>
+                            </view>
+
+                        </block>
+                    </van-radio-group>
+                </view>
+            </view>
+        </view>
+
+        <pagination currentIndex="{{page}}" totalPage="{{totalPage}}" bind:pagingChange="onChangePage" />
+
+    </view>
+    <empty bind:refresh="init" wx:else />
+
+</view>
+
+<search-select show="{{show}}" title="{{title}}" type="{{type}}" park="{{park}}" bindconfirm="onConfirm" bindcancel="onCancel" />
+
+<van-dialog use-slot title="审核" show="{{ approveShow }}" show-cancel-button bind:close="onApproveClose" bind:confirm="onApproveConfirm">
+    <van-field label="拒绝理由" value="{{ reason }}" placeholder="请输入拒绝理由" bind:change="onChangeReason" />
+</van-dialog>

pages/workBenchNew/components/workBenchApprove/components/approve/index.wxss

@@ -0,0 +1,70 @@
+/* pages/workBench/components/recharge/components/waitApprove/index.wxss */
+.table {
+    width: 500rpx;
+
+}
+
+.tableWrapper {
+    width: 100vw;
+    overflow-x: auto;
+}
+
+.thead {
+    
+    display: flex;
+    flex-wrap: nowrap;
+ 
+}
+
+.thead  .th {
+    padding: 10rpx;
+    white-space: nowrap;
+    text-align: center;
+    box-sizing: border-box;
+}
+
+.primaryTextBtn {
+    color: #1989fa;
+  }
+
+.tbody {
+    width: 500rpx;
+}
+
+.tbody .tr {
+    padding: 10rpx;
+    border-bottom: 1rpx solid #EEEEEE;
+    display: flex;
+    align-items: center;
+    flex-wrap: nowrap;
+}
+
+.tbody .tr {
+    word-break: break-all;
+    text-align: center;
+}
+
+.more-icon {
+    padding: 20rpx;
+    color: #1989fa;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  
+/* 基础标签样式 */
+.tag {
+    display: inline-block;
+    padding: 4px 5px;
+    margin-right: 0px;
+    border-radius: 16px;
+    background: #07c160;
+    color: white;
+    font-size: 25rpx;
+  }
+  
+  /* 激活状态样式 */
+  .tag.active {
+    background: #07c160;
+    color: white;
+  }

pages/workBenchNew/components/workBenchApprove/components/reharge/index.js

@@ -0,0 +1,152 @@
+// pages/workBench/components/recharge/components/reharge/index.js
+
+import { handleRecharge } from "../../../../../../service/recharge";
+import { alertInfo, alertSuccess, loadingFunc } from "../../../../../../utils/index";
+import request from '../../../../../../utils/request'
+const { OK } = request;
+
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onParkFocus() {
+      this.setData({
+        show: true,
+        title: "园区",
+        type: 'park'
+      })
+    },
+    onMeterFocus() {
+      const { park } = this.data;
+      if (!park) {
+        alertInfo("请先选择园区")
+        return;
+      }
+      this.setData({
+        show: true,
+        title: "电表",
+        type: 'meter'
+      })
+    },
+    onConfirm(e) {
+      const { data, type, way } = e.detail;
+      switch(type) {
+        case "park":
+          this.setData({
+            parkName: data.name,
+            park: data.id,
+          })
+          break;
+        case "meter":
+          this.setData({
+            meterName: `${data.meterNo}-${data.address}${data.tenement?.name ? '-' + data.tenement?.name : ''}`,
+            meter: data.id,
+          })
+          break;
+        case "pay":
+          this.setData({
+            payName: data,
+            way: way,
+          });
+          break;
+      }
+      this.onCancel();
+    },
+    onCancel() {
+      this.setData({
+        show: false,
+        title: "",
+        type: "",
+      })
+    },
+    onPayFocus() {
+      this.setData({
+        show: true,
+        title: "付款方式",
+        type: 'pay'
+      })
+    },
+    onChangeMoney(e) {
+      this.setData({ money: e.detail })
+    },
+    onChangeVoucherNo(e) {
+      this.setData({ voucherNo: e.detail })
+    },
+    handleClear() {
+      this.setData({
+        park: "",
+        parkName: "",
+        meter: "",
+        meterName: "",
+        way: "",
+        payName: "",
+        show: false,
+        title: "",
+        type: "",
+        money: null,
+        voucherNo: null
+      })
+    },
+    async handleSubmit() {
+      const that = this;
+      const { park, meter, money, way, voucherNo } = this.data;
+      if (!park) {
+        alertInfo("请选择园区");
+        return;
+      }
+      if (!meter) {
+        alertInfo("请选择电表")
+        return;
+      }
+      if (!money) {
+        alertInfo("请输入金额")
+        return
+      }
+      if (!way && way !== 0) {
+        alertInfo("请选择付款方式")
+        return
+      }
+      if (!voucherNo) {
+        alertInfo("请输入凭证号")
+        return
+      }
+      loadingFunc(async () => {
+        const { code, message } = await handleRecharge(park, { 
+          amount: `${money || ''}`, 
+          meter, 
+          paymentType: way, 
+          voucherNo, 
+          type: 0 
+        })
+        if (code !== OK) {
+          alertInfo(message)
+          return
+        }
+        alertSuccess("充值成功")
+        setTimeout(() => {
+          that.handleClear()
+          that.setData({
+            
+          })
+        }, 500)
+      })
+      
+    }
+  }
+})

pages/workBenchNew/components/workBenchApprove/components/reharge/index.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index",
+    "search-select": "/components/searchSelect/index",
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index"
+  }
+}

pages/workBenchNew/components/workBenchApprove/components/reharge/index.wxml

@@ -0,0 +1,50 @@
+<!--pages/workBench/components/recharge/components/reharge/index.wxml-->
+<van-cell-group>
+  <searchSelectWrapper 
+    label="园区" 
+    placeholder="请选择园区"
+    text="{{parkName}}"
+    bind:search="onParkFocus"
+  />
+
+  <searchSelectWrapper 
+    label="电表" 
+    placeholder="请选择电表"
+    text="{{meterName}}"
+    bind:search="onMeterFocus"
+  />
+  <searchSelectWrapper 
+    label="金额" 
+    placeholder="请输入金额"
+    text="{{meterName}}"
+    fieldType="number"
+    type="input"
+    bind:changeText="onChangeMoney"
+  />
+  <searchSelectWrapper 
+    label="付款方式" 
+    placeholder="请选择付款方式"
+    text="{{payName}}"
+    bind:search="onPayFocus"
+  />
+  <searchSelectWrapper 
+    label="凭证" 
+    placeholder="请输入凭证"
+    type="input"
+    bind:changeText="onChangeVoucherNo"
+  />
+</van-cell-group>
+
+<view style="margin-top: 60rpx;display: flex; justify-content: center; align-items: center;">
+  <van-button type="info" size="small" style="margin-right: 30rpx;" bind:click="handleSubmit"> 确认 </van-button>
+  <van-button size="small" bind:click="handleClear"> 清空 </van-button>
+</view>
+<search-select 
+  show="{{show}}" 
+  title="{{title}}" 
+  type="{{type}}" 
+  park="{{park}}"
+  bindconfirm="onConfirm"
+  bindcancel="onCancel"
+  wx:if="{{show}}"
+/>

pages/workBenchNew/components/workBenchApprove/components/reharge/index.wxss

@@ -0,0 +1 @@
+/* pages/workBench/components/recharge/components/reharge/index.wxss */

pages/workBenchNew/components/workBenchApprove/index.js

@@ -0,0 +1,72 @@
+// pages/workBenchNew/components/workBenchApprove/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    active: 0,
+    segmentedList: ['待审核', '已审核', '充值'],
+  },
+  changeQueryType(e) {
+    const { type } = e.currentTarget.dataset;
+    this.setData({
+      active: type
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/workBenchNew/components/workBenchApprove/index.json

@@ -0,0 +1,12 @@
+{
+  "usingComponents": {
+    "van-button": "@vant/weapp/button/index",
+    "segmented": "/components/Segmented/index",
+    "recharge": "./components/reharge/index",
+    "approve": "./components/approve/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "navigator": "/components/navigator/index"
+  },
+  "navigationStyle": "custom"
+}

pages/workBenchNew/components/workBenchApprove/index.wxml

@@ -0,0 +1,21 @@
+<!--pages/workBench/components/recharge/index.wxml-->
+<navigator title="充值审核" canBack="{{true}}" />
+<view style="">
+  <view class="typeQuery">
+      <van-row>
+        <van-col span="8">
+          <view class="typeQueryText" style="color: {{active === 0 ? '#0958d9' : '#000'}}" bind:tap="changeQueryType" data-type="{{0}}"> 待审核 </view>
+        </van-col>
+        <van-col span="8">
+          <view class="typeQueryText" style="color: {{active === 1 ? '#0958d9' : '#000'}}" bind:tap="changeQueryType" data-type="{{1}}"> 已审核 </view>
+        </van-col>
+        <van-col span="8">
+          <view class="typeQueryText" style="color: {{active === 2 ? '#0958d9' : '#000'}}" bind:tap="changeQueryType" data-type="{{2}}"> 充值 </view>
+        </van-col>
+      </van-row>
+    </view>
+</view>
+
+<approve status="{{2}}" wx:if="{{active === 0}}" />
+<approve status="{{1}}" wx:if="{{active === 1}}" />
+<recharge wx:if="{{active === 2}}" />

pages/workBenchNew/components/workBenchApprove/index.wxss

@@ -0,0 +1,27 @@
+/* pages/workBench/components/recharge/index.wxss */
+page {
+    background-color: rgb(228,240,236);
+    font-size: 32rpx;
+  }
+
+
+  .query {
+    margin: 20rpx 0rpx;
+  }
+  
+  .typeQueryText {
+    text-align: center;
+    padding: 20rpx;
+    background-color: var(--light-green);
+    font-size: 32rpx;
+  }
+  
+  .select {
+    border: 1rpx solid #ccc;
+    padding: 12rpx;
+    border-radius: 12rpx;
+    flex: 1;
+    display: flex;
+    justify-content: space-between;
+    font-size: 30rpx;
+  }

pages/workBenchNew/components/workBenchMeter/index.js

@@ -0,0 +1,218 @@
+// pages/workBenchNew/components/workBenchMeter/index.js
+
+import { alertInfo, alertSuccess, loadingFunc } from "../../../../utils/index";
+import { getParkMeterList, handleOperateMeterSwitch } from "../../../../service/meter"
+import request from "../../../../utils/request"
+const { OK } = request
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    keyword: "",
+    keywordTemp: "",
+    page: 1,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+  onParkFocus(e) {
+    this.setData({
+      show: true,
+      title: "园区",
+      type: 'park'
+    })
+  },
+  onMeterFocus(e) {
+    const { park } = this.data;
+    if (!park) {
+      alertInfo("请先选择园区")
+      return;
+    }
+    this.setData({
+      show: true,
+      title: "电表",
+      type: 'meter'
+    })
+  },
+  onConfirm(e) {
+    const { data, type } = e.detail;
+    const that = this;
+    switch(type) {
+      case "park":
+        this.setData({
+          parkName: data.name,
+          park: data.id,
+        })
+        break;
+      case "meter":
+        this.setData({
+          meterName: data.address,
+          meter: data.id,
+        }, () => {
+          loadingFunc(async () => {
+            await that.init();
+          })
+        })
+        break;
+    }
+    
+    this.onCancel();
+  },
+  onChangeKeyword(e) {
+    this.setData({ keywordTemp: e.detail })
+  },
+  onSearch() {
+    const that = this;
+    that.setData({
+      keyword: that.data.keywordTemp
+    }, () => {
+      loadingFunc(async () => {
+        await that.init();
+      })
+    })
+  },
+  async init() {
+    const { page, park, meter } = this.data;
+    if (!park) {
+      return;
+    }
+    const { code, message, data, total } = await getParkMeterList({ park, keyword: meter, page })
+    if (code !== OK) {
+      alertInfo(message);
+      return;
+    }
+    this.setData({
+      list: data,
+      total: total,
+      totalPage: Math.ceil(total / 20)
+    })
+  },
+  async onChangePage(e) {
+    const page = e.detail.currentIndex;
+    const that = this;
+    this.setData({
+      page
+    }, () => {
+      loadingFunc(async () => {
+        await that.init();
+      })
+    })
+  },
+  onCancel() {
+    this.setData({
+      show: false,
+      title: "",
+      type: "",
+    })
+  },
+  onChangeSelectMeter(e) {
+    this.setData({
+      meter: e.detail
+    })
+  },
+  async handleMeterSwitchOn() {
+    const that = this;
+    const { meter, meterName } = this.data;
+    wx.showModal({
+      title: '提示',
+      content: `您确认要对${meterName || 当前电表}进行合闸吗？`,
+      complete: async (res) => {
+        if (res.cancel) {
+          
+        }
+    
+        if (res.confirm) {
+          loadingFunc(async () => {
+            const { code, message } = await handleOperateMeterSwitch({ ids: [meter], status: 0 })
+            if (code !== OK) {
+              alertInfo(message)
+              return;
+            }
+            alertSuccess("合闸成功")
+            that.init();
+          })
+          
+        }
+      }
+    })
+  },
+  async handleMeterSwitchOff() {
+    const that = this;
+    const { meter, meterName } = this.data;
+    wx.showModal({
+      title: '提示',
+      content: `您确认要对${meterName || 当前电表}进行拉闸吗？`,
+      complete: async (res) => {
+        if (res.cancel) {
+          return;
+        }
+        if (res.confirm) {
+          loadingFunc(async () => {
+            const { code, message } = await handleOperateMeterSwitch({ ids: [meter], status: 1 })
+            if (code !== OK) {
+              alertInfo(message)
+              return;
+            }
+            alertSuccess("拉闸成功")
+            that.init();
+          })
+        }
+      }
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/workBenchNew/components/workBenchMeter/index.json

@@ -0,0 +1,19 @@
+{
+  "usingComponents": {
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index",
+    "search-select": "/components/searchSelect/index",
+    "van-empty": "@vant/weapp/empty/index",
+    "table": "/components/table/table",
+    "pagination": "/components/pagination/index",
+    "empty": "/components/empty/index",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index",
+    "van-tag": "@vant/weapp/tag/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "navigator": "/components/navigator/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index"
+  },
+  "navigationStyle": "custom"
+}

pages/workBenchNew/components/workBenchMeter/index.wxml

@@ -0,0 +1,102 @@
+<!--pages/workBench/components/record/index.wxml-->
+<navigator title="电表信息" canBack="{{true}}" />
+<searchSelectWrapper 
+    label="园区" 
+    placeholder="请选择园区"
+    text="{{parkName}}"
+    bind:search="onParkFocus"
+/>
+
+<searchSelectWrapper 
+    label="电表" 
+    placeholder="请选择电表"
+    text="{{meterName}}"
+    bind:search="onMeterFocus"
+/>
+<van-empty wx:if="{{!meter}}" description="选择电表后查看" />
+<view wx:else>
+    <view wx:if="{{list.length}}">
+        <view class="operate">
+            <view style="margin-top: 24rpx; margin-bottom: 24rpx;display: flex; justify-content: center; align-items: center;">
+                <van-button 
+                    type="info" 
+                    size="small" 
+                    style="margin-right: 30rpx;" 
+                    bind:click="handleMeterSwitchOn"
+                    disabled="{{!meter}}"
+                > 合闸 </van-button>
+                <van-button size="small" bind:click="handleClear"  disabled="{{!meter}}" bind:click="handleMeterSwitchOff"> 拉闸 </van-button>
+            </view>
+        </view> 
+        <view class="customTable" wx:for="{{list}}" wx:key="id">
+            <view class="customTableTile">
+                <van-row>
+                    <van-col span="8">
+                        <view style="text-align: center;"> {{item.tenement.shortName}} </view>
+                    </van-col>
+                    <van-col span="16"><view style="margin-left: 16rpx;">{{item.tenement.name}}</view> </van-col>
+                </van-row>
+            </view>
+            <view class="customTableContent">
+                <van-row >
+                    <van-col span="24">
+                        <view class="tableRow">
+                            <van-row gutter="5">
+                                <van-col span="8" wx:if="{{item.type === 0}}">
+                                    <view style="text-align: center;border-right: 1rpx solid #ccc;"> 商户电表 </view></van-col>
+                                <van-col span="8" wx:elif="{{item.type === 2}}">
+                                    <view style="text-align: center;border-right: 1rpx solid #ccc;"> 公摊电表 </view></van-col>
+                                <van-col span="8" wx:else>
+                                    <view style="text-align: center;border-right: 1rpx solid #ccc;"> 园区电表 </view></van-col>
+                                <van-col span="16">表号：{{item.meterNo}}</van-col>
+                            </van-row>
+                        </view>
+                    </van-col>
+                    <van-col span="24">
+                        <view class="tableRow">
+                            <van-row gutter="5">
+                                <van-col span="8">
+                                    <view style="text-align: center;border-right: 1rpx solid #ccc;"> {{item.address}} </view>
+                                </van-col>
+                                <van-col span="16">SN：{{item.meterSn}}</van-col>
+                            </van-row>
+                        </view>
+                    </van-col>
+                    <van-col span="24">
+                        <view class="tableRow">
+                            <van-row gutter="5">
+                                <van-col span="8">
+                                    <view style="text-align: center;border-right: 1rpx solid #ccc;"> 表字：{{item.amount}} </view>
+                                </van-col>
+                                <van-col span="16">余额：{{item.money}}</van-col>
+                            </van-row>
+                        </view>
+                    </van-col>
+                    <van-col span="24">
+                        <view class="tableRow">
+                            <van-row gutter="5">
+                                <van-col span="8" wx:if="{{item.onPosition === 0}}">
+                                    <view style="text-align: center;border-right: 1rpx solid #ccc;">合闸</view> </van-col>
+                                <van-col span="8" wx:else><view style="text-align: center;border-right: 1rpx solid #ccc;">拉闸</view> </van-col>
+                                <van-col span="8" wx:if="{{item.canConnect}}"><view style="text-align: center;">在线</view> </van-col>
+                                <van-col span="8" wx:else><view style="text-align: center;">失联</view> </van-col>
+                            </van-row>
+                        </view>
+                    </van-col>
+                </van-row>
+            </view>
+        </view>
+    </view>
+    <empty bind:refresh="init" wx:else />
+    
+</view>
+
+<search-select 
+    show="{{show}}" 
+    title="{{title}}" 
+    type="{{type}}" 
+    park="{{park}}"
+    bindconfirm="onConfirm"
+    bindcancel="onCancel"
+    wx:if="{{show}}"
+/>

pages/workBenchNew/components/workBenchMeter/index.wxss

@@ -0,0 +1,63 @@
+/* pages/workBench/components/record/index.wxss */
+.table {
+    width: 890rpx;
+    
+}
+
+.classWrapper {
+    width: 100vw;
+    overflow-x: auto;
+}
+
+.thead {
+    display: flex;
+    flex-wrap: nowrap;
+    border-bottom: 1rpx solid #EEEEEE;
+}
+
+.thead  .th {
+    padding: 20rpx;
+    white-space: nowrap;
+    text-align: center;
+    box-sizing: border-box;
+
+}
+
+.tbody {
+    width: 890rpx;
+}
+
+.tbody .tr {
+    padding: 20rpx;
+    border-bottom: 1rpx solid #EEEEEE;
+    display: flex;
+    align-items: center;
+    flex-wrap: nowrap;
+}
+
+.tbody .th {
+    word-break: break-all;
+    text-align: center;
+}
+
+.customTable {
+    margin: 20rpx;
+}
+
+.customTableTile {
+    background-color: var(--light-green);
+    padding: 16rpx;
+    box-sizing: border-box;
+    font-weight: 700;
+}
+
+.tableRow {
+    padding: 16rpx;
+    border: 1rpx solid #ccc;
+    border-top: 0rpx;
+}
+
+page {
+    background-color: rgb(228,240,236);
+    font-size: 32rpx;
+  }

pages/workBenchNew/components/workBenchReading/index.js

@@ -0,0 +1,158 @@
+// pages/workBenchNew/components/workBenchReading/index.js
+import { getMeterReadingRouteList, changeMeterRouteStatus } from "../../../../service/workBench"
+import { alertError, alertSuccess, loadingFunc } from "../../../../utils/index"
+import request from "../../../../utils/request"
+const { OK } = request
+
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    park: "",
+    parkName: "",
+  },
+  onParkFocus(e) {
+    this.setData({
+      show: true,
+      title: "园区",
+      type: 'park'
+    })
+  },
+  async init() {
+    const { parkName, park } = this.data;
+    const { code, message, data } = await getMeterReadingRouteList(parkName)
+    if (code !== OK) {
+      alertError(message)
+      return
+    }
+    this.setData({
+      list: data
+    })
+  },
+  onConfirm(e) {
+    const { data } = e.detail;
+    const that = this;
+    this.setData({
+      parkName: data.name,
+      park: data.id,
+    }, () => {
+      loadingFunc(async () => {
+        await that.init();
+      })
+    })
+    this.onConcal();
+  },
+  onConcal() {
+    this.setData({
+      show: false,
+      title: "",
+      type: "",
+    })
+  },
+  jumpToReading(e) {
+    const { id, type } = e.currentTarget.dataset;
+    wx.navigateTo({
+      url: `/pages/writeReading/index?id=${id}&type=${type}`,
+    })
+  },
+  async changeStartStatus(e) {
+    const that = this;
+    const { id, routeid: routeId } = e.currentTarget.dataset;
+    const { code, message } = await changeMeterRouteStatus({ id, status: 1, routeId })
+    if (code !== OK) {
+      alertError(message)
+      return
+    }
+    alertSuccess("操作成功")
+    this.init()
+    setTimeout(() => {
+      that.jumpToReading({ currentTarget: { dataset: { id } } })
+    }, 500)
+  },
+  async changeEndStatus(e) {
+    const that = this;
+    wx.showModal({
+      title: '提示',
+      content: '确认要结束吗？',
+      complete: async (res) => {
+        if (res.cancel) {
+          
+        }
+    
+        if (res.confirm) {
+          const { id, routeid: routeId } = e.currentTarget.dataset;
+          const { code, message } = await changeMeterRouteStatus({ id, status: 0, routeId })
+          if (code !== OK) {
+            alertError(message)
+            return
+          }
+          alertSuccess("操作成功")
+          that.init()
+        }
+      }
+    })
+
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    const { parkName } = this.data;
+    if (!parkName) {
+      return
+    }
+    this.init()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/workBenchNew/components/workBenchReading/index.json

@@ -0,0 +1,17 @@
+{
+  "usingComponents": {
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index",
+    "search-select": "/components/searchSelect/index",
+    "van-empty": "@vant/weapp/empty/index",
+    "table": "/components/table/table",
+    "pagination": "/components/pagination/index",
+    "empty": "/components/empty/index",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index",
+    "van-dialog": "@vant/weapp/dialog/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "navigator": "/components/navigator/index"
+  },
+  "navigationStyle": "custom"
+}

pages/workBenchNew/components/workBenchReading/index.wxml

@@ -0,0 +1,72 @@
+<!--pages/workBench/components/reading/index.wxml-->
+<navigator title="抄表记录录入" canBack="{{true}}" />
+<van-field
+    value="{{ parkName }}"
+    placeholder="请选择园区"
+    label="园区"
+    readonly
+    border="{{ false }}"
+    use-button-slot
+    title-width="100rpx"
+>
+    <van-button slot="button" size="small" type="primary" bind:click="onParkFocus">
+      选择
+    </van-button>
+</van-field>
+
+<search-select 
+    show="{{show}}" 
+    title="{{title}}" 
+    type="{{type}}" 
+    park="{{park}}"
+    bindconfirm="onConfirm"
+    bindcancel="onConcal"
+/>
+
+<van-empty description="请先选择园区" wx:if="{{!park}}" />
+
+<view wx:else>
+    <view wx:if="{{list.length}}">
+        <van-cell 
+            wx:for="{{list}}"
+            wx:key="id"
+            title="{{item.readingRouteName}}" 
+            label="包含{{item.meterRoute}}个抄表点" 
+            data-id="{{item.id}}"
+            data-type="look"   
+            catch:click="jumpToReading"
+        >
+            <view slot="right-icon">
+                <van-button 
+                    type="primary" 
+                    size="small" 
+                    type="primary" 
+                    catch:tap="changeStartStatus"
+                    data-routeId="{{item.readingRouteId}}"
+                    custom-style="margin-right: 20rpx;" 
+                    data-id="{{item.id}}"
+                   
+                    wx:if="{{item.status === 0}}"
+                > 开始抄表 </van-button>
+                <van-button 
+                    type="primary" 
+                    size="small" 
+                    catch:tap="jumpToReading"
+                    data-id="{{item.id}}"
+                    data-type="edit"
+                    custom-style="margin-right: 20rpx;"
+                    wx:if="{{item.status === 1}}"
+                > 去抄表 </van-button>
+                <van-button 
+                    size="small" 
+                    type="danger" 
+                    catch:tap="changeEndStatus"
+                    data-id="{{item.id}}"
+                    wx:if="{{item.status === 1}}"
+                    data-routeId="{{item.readingRouteId}}"
+                > 结束抄表 </van-button>
+            </view>
+        </van-cell>
+    </view>
+    <empty wx:else bind:refresh="init" />
+</view>

pages/workBenchNew/components/workBenchReading/index.wxss

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

pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.js

@@ -0,0 +1,128 @@
+// pages/workBench/components/tenement/components/bindMeter/index.js
+// 0015980101
+import { bindMeter, } from "../../../../../../service/tenement"
+import { getWorkMeterDetail } from "../../../../../../service/meter"
+import { alertInfo, alertSuccess } from "../../../../../../utils/index";
+import request from "../../../../../../utils/request"
+import dayjs from "../../../../../../utils/dayjs"
+const { OK } = request
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    tenement: String,
+    tenementName: String,
+    park: String,
+    visible: Boolean,
+    meterId: String,
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    dateTimeShow: false,
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onMeterFocus(e) {
+      const { park } = this.data;
+      if (!park) {
+        alertInfo("请先选择园区")
+        return;
+      }
+      this.setData({
+        show: true,
+        title: "电表",
+        type: 'meter'
+      })
+    },
+    onCancel() {
+      this.setData({
+        show: false,
+        title: "",
+        type: "",
+      })
+      // this.triggerEvent("close")
+    },
+    onClose() {
+      this.setData({
+        show: false,
+        title: "",
+        type: "",
+      })
+    },
+    onChange(e) {
+      const { name } = e.currentTarget.dataset;
+      this.setData({
+        [name]: e.detail
+      })
+    },
+    async onSubmit() {
+      const { overall, critical, peak, valley, park, tenement, meter, readAt, flat } = this.data;
+      const { code, message } = await bindMeter(
+        park, 
+        tenement, 
+        { 
+          code: meter,  
+          overall:overall? Number(overall) : overall, 
+          critical : critical ? Number(critical) : critical, 
+          peak: peak ? Number(peak) : peak, 
+          flat: flat ? Number(flat) : flat, 
+          valley : valley ? Number(valley) : valley, 
+          readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
+        }
+        )
+      if (code !== OK) {
+        alertInfo(message)
+        return;
+      }
+      alertSuccess("绑定成功")
+      this.triggerEvent("ok")
+    },
+    onConfirm(e) {
+      const { type, data } = e.detail;
+      const that = this;
+      switch(type) {
+        case "meter":
+          this.setData({
+            meter: data.id,
+            meterName: data.address,
+            show: false,
+          })
+          this.getMeterDetail(data.id);
+          break;
+      }
+    },
+    async getMeterDetail(id) {
+      const { code, message, data } = await getWorkMeterDetail(id)
+      if (code !== OK) {
+        alertInfo(message)
+        return;
+      }
+      this.setData({
+        overall: Number(data?.overall || 0),
+        critical: Number(data?.sharp || 0),
+        peak: Number(data?.peak || 0),
+        flat: Number(data?.flat || 0),
+        valley: Number(data?.valley || 0),
+        meter04kvType: data?.meter04kvType,
+        status: data?.breakType ? '合闸' : "分闸",
+      })
+    },
+    dateTimeConfirm(e) {
+      this.setData({ readAt: e.detail.time, dateTimeShow: false })
+    },
+    dateTimeCancal(e) {
+      this.setData({ dateTimeShow: false })
+    },
+    onTimeFocus() {
+      this.setData({ dateTimeShow: true })
+    }
+  }
+})

pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-dialog": "@vant/weapp/dialog/index",
+    "search-select": "/components/searchSelect/index",
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index",
+    "date-time-picker": "/components/DateTimePicker/index"
+  }
+}

pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.wxml

@@ -0,0 +1,121 @@
+<!--pages/workBench/components/tenement/components/bindMeter/index.wxml-->
+<van-dialog
+  use-slot
+  title="绑定表计"
+  show="{{ visible }}"
+  show-cancel-button
+  bind:confirm="onSubmit"
+  bind:close="onClose"
+>
+  <view class="modalContentWrapper">
+    <van-field
+        value="{{tenementName}}"
+        label="商户名称"
+        readonly
+        type="textarea"
+        autosize="{{true}}"
+        title-width="132rpx"
+        border="{{false}}"
+    />
+    <van-field
+        value="{{ meterName }}"
+        placeholder="请选择电表"
+        label="电表"
+        readonly
+        border="{{ false }}"
+        use-button-slot
+        title-width="100rpx"
+    >
+        <van-button slot="button" size="small" type="info" bind:click="onMeterFocus">
+        选择
+        </van-button>
+    </van-field>
+    <van-field
+        value="{{ status }}"
+        label="状态"
+        title-width="132rpx"
+        border="{{false}}"
+        readonly
+        type="digit"
+    />
+    <van-field
+        value="{{ readAt }}"
+        placeholder="请选择绑定时间"
+        label="时间"
+        readonly
+        border="{{ false }}"
+        use-button-slot
+        title-width="100rpx"
+    >
+        <van-button slot="button" size="small" type="info" bind:click="onTimeFocus">
+        选择
+        </van-button>
+    </van-field>
+    <van-field
+        value="{{ overall }}"
+        label="表字"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="overall"
+        placeholder="请输入表字"
+        type="digit"
+    />
+    <van-field
+        value="{{ critical }}"
+        label="尖"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="critical"
+        placeholder="请输入有功（尖）"
+        type="digit"
+    />
+    <van-field
+        value="{{ peak }}"
+        label="峰"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="peak"
+        placeholder="请输入有功（峰）"
+        type="digit"
+    />
+    <van-field
+        value="{{ flat }}"
+        label="平"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="flat"
+        placeholder="请输入有功（平）"
+        type="digit"
+    />
+    <van-field
+        value="{{ valley }}"
+        label="谷"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="valley"
+        type="digit"
+        placeholder="请输入有功（谷）"
+    />
+</view>
+ 
+</van-dialog>
+
+<search-select 
+    show="{{show}}" 
+    title="{{title}}" 
+    type="{{type}}" 
+    park="{{park}}"
+    bindconfirm="onConfirm"
+    bindcancel="onCancel"
+/>
+
+<date-time-picker 
+    show="{{dateTimeShow}}"
+    bind:confirm="dateTimeConfirm"
+    bind:cancel="dateTimeCancal"
+/>

pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.wxss

@@ -0,0 +1 @@
+/* pages/workBench/components/tenement/components/bindMeter/index.wxss */

pages/workBenchNew/components/workBenchTenement/components/createTenement/index.js

@@ -0,0 +1,103 @@
+// pages/workBench/components/tenement/components/createTenement/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.setData(options)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+  onBuildingFocus() {
+    const { park } = this.data;
+    if (!park) {
+      alertInfo("请先选择园区")
+      return;
+    }
+    this.setData({
+      show: true,
+      title: "建筑",
+      type: 'building'
+    })
+  },
+  onFeeTypeFocus() {
+    const { park } = this.data;
+    if (!park) {
+      alertInfo("请先选择园区")
+      return;
+    }
+    this.setData({
+      show: true,
+      title: "建筑",
+      type: 'building'
+    })
+  },
+  beforeBack() {
+    let pages = getCurrentPages(); // 获取当前页面栈
+    let prevPage = pages[pages.length - 2]; // 获取上一页
+    const { tenement = '', tenementName = '', park = '', parkName = '' } = this.data;
+    // 修改上一页的数据
+    prevPage.setData({
+      needBackShow: true,
+      tenement,
+      tenementName,
+      park,
+      parkName
+    });
+  
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/workBenchNew/components/workBenchTenement/components/createTenement/index.json

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

pages/workBenchNew/components/workBenchTenement/components/createTenement/index.wxml

@@ -0,0 +1,74 @@
+<!--pages/workBench/components/tenement/components/createTenement/index.wxml-->
+<navigator title="开户" canBack="{{true}}" beforeBack="beforeBack" />
+<view class="modalContentWrapper">
+    <van-field
+        value=""
+        label="商户全称"
+        type="textarea"
+        autosize="{{true}}"
+        title-width="132rpx"
+        required
+    />
+    <van-field
+        value=""
+        label="商户简称"
+        type="textarea"
+        autosize="{{true}}"
+        title-width="132rpx"
+    />
+    <van-field
+        value=""
+        label="联系地址"
+        type="textarea"
+        autosize="{{true}}"
+        title-width="132rpx"
+        required
+    />
+    <van-field
+        value=""
+        label="联系人"
+        type="textarea"
+        autosize="{{true}}"
+        title-width="132rpx"
+        required
+    />
+    <van-field
+        value=""
+        label="联系电话"
+        type="textarea"
+        autosize="{{true}}"
+        title-width="132rpx"
+        required
+    />
+    <van-field
+        value="{{ meterName }}"
+        placeholder="请选择建筑"
+        label="建筑"
+        use-button-slot
+        title-width="120rpx"
+    >
+        <van-button slot="button" size="small" type="info" bind:click="onBuildingFocus">
+            选择
+        </van-button>
+    </van-field>
+    <van-field
+        value="{{ meterName }}"
+        placeholder="请选择收费类型"
+        label="收费类型"
+        use-button-slot
+        title-width="120rpx"
+    >
+        <van-button slot="button" size="small" type="info" bind:click="onFeeTypeFocus">
+            选择
+        </van-button>
+    </van-field>
+</view>
+
+<search-select 
+    show="{{show}}" 
+    title="{{title}}" 
+    type="{{type}}" 
+    park="{{park}}"
+    bindconfirm="onConfirm"
+    bindcancel="onCancel"
+/>

pages/workBenchNew/components/workBenchTenement/components/createTenement/index.wxss

@@ -0,0 +1 @@
+/* pages/workBench/components/tenement/components/createTenement/index.wxss */

pages/workBenchNew/components/workBenchTenement/components/kaihu/index.js

@@ -0,0 +1,124 @@
+// pages/workBench/components/tenement/components/kaihu/index.js
+import { alertInfo, alertSuccess } from "../../../../../../utils/index"
+import { createBackTenement, updateTenementBackInfo } from "../../../../../../service/tenement"
+import request from "../../../../../../utils/request"
+import { payWays, feeType as feeTypeList } from "../../../../../../utils/data";
+const { OK } = request;
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    park: String,
+    visible: Boolean,
+    defaultValue: Object,
+    editType: String,
+    title: String,
+  },
+  observers: {
+    'defaultValue': function(defaultValue) {
+      const { fullName, shortName, phone, id, feeType, address, building, buildingName, contact,} = defaultValue;
+      this.setData({
+        name: fullName,
+        shortName,
+        phone, id, feeType, address, building, buildingName, contact,
+        feeTypeName: feeTypeList[feeType]
+      })
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onBuildingFocus() {
+      const { park } = this.data;
+      if (!park) {
+        alertInfo("请先选择园区")
+        return;
+      }
+      this.setData({
+        show: true,
+        title: "建筑",
+        type: 'building'
+      })
+    },
+    onFeeTypeFocus() {
+      const { park } = this.data;
+      if (!park) {
+        alertInfo("请先选择园区")
+        return;
+      }
+      this.setData({
+        show: true,
+        title: "收费类型",
+        type: 'feeType'
+      })
+    },
+    onConfirm(e) {
+      const { type, data, way } = e.detail;
+      switch(type) {
+        case "building":
+          this.setData({
+            building: data.id,
+            buildingName: data.name,
+            show: false,
+          })
+          return;
+        case "feeType":
+          this.setData({
+            feeTypeName: data,
+            feeType: way,
+            show: false,
+          })
+      }
+    },
+
+    onCancel() {
+      this.setData({ show: false })
+    },
+    onClose() {
+      this.triggerEvent("close")
+    },
+    onChange(e) {
+      const { name } = e.currentTarget.dataset;
+      this.setData({
+        [name]: e.detail
+      })
+    },
+    clear() {
+      this.setData({
+        name: "", shortName: "", address: "", contact: "", phone: "", 
+        building: "", feeType: "", buildingName: "", feeTypeName: "", id,
+      })
+    },
+    async onSubmit() {
+      const { name, shortName, address, contact, phone, building, feeType, park, editType, id } = this.data;
+      if (editType === "add") {
+        const { code, message } = await createBackTenement(park, { name, shortName, address, contact, phone, building, feeType })
+        if (code !== OK) {
+          alertInfo(message)
+          return
+        }
+        alertSuccess("开户成功")
+        this.triggerEvent("ok")
+        return;
+      }
+      const { code, message } = await updateTenementBackInfo(park, id,  { name, shortName, address, contact, phone, building, feeType })
+      if (code !== OK) {
+        alertInfo(message)
+        return;
+      }
+      alertSuccess("编辑成功")
+      this.triggerEvent("ok")
+    }
+  },
+  
+})

pages/workBenchNew/components/workBenchTenement/components/kaihu/index.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "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"
+  }
+}

pages/workBenchNew/components/workBenchTenement/components/kaihu/index.wxml

@@ -0,0 +1,100 @@
+<!--pages/workBench/components/tenement/components/kaihu/index.wxml-->
+<van-dialog
+  use-slot
+  title="{{title}}"
+  show="{{ visible }}"
+  show-cancel-button
+  bind:close="onClose"
+  bind:confirm="onSubmit"
+>
+    <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>
+</van-dialog>
+
+<search-select 
+    show="{{show}}" 
+    title="{{title}}" 
+    type="{{type}}" 
+    park="{{park}}"
+    bindconfirm="onConfirm"
+    bindcancel="onCancel"
+/>

pages/workBenchNew/components/workBenchTenement/components/kaihu/index.wxss

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

pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.js

@@ -0,0 +1,107 @@
+// pages/workBench/components/tenement/components/bindMeter/index.js
+
+import { unbindMeter, } from "../../../../../../service/tenement"
+import request from "../../../../../../utils/request"
+import { alertInfo, alertSuccess } from "../../../../../../utils/index";
+const { OK } = request
+import { getWorkMeterDetail } from "../../../../../../service/meter"
+import dayjs from "../../../../../../utils/dayjs"
+
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    tenement: String,
+    park: String,
+    tenementName: String,
+    meterId: String,
+    meterAddress: String,
+    visible:Boolean,
+  },
+  observers: {
+    "meterId": function(newValue) {
+      this.getMeterDetail(newValue)
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    dateTimeShow: false
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onMeterFocus(e) {
+      const { park } = this.data;
+      if (!park) {
+        alertInfo("请先选择园区")
+        return;
+      }
+      this.setData({
+        show: true,
+        title: "电表",
+        type: 'meter'
+      })
+    },
+    async getMeterDetail(id) {
+      const { code, message, data } = await getWorkMeterDetail(id)
+      if (code !== OK) {
+        alertInfo(message)
+        return;
+      }
+      this.setData({
+        overall: Number(data?.overall || 0),
+        critical: Number(data?.sharp || 0),
+        peak: Number(data?.peak || 0),
+        flat: Number(data?.flat || 0),
+        valley: Number(data?.valley || 0),
+        meter04kvType: data?.meter04kvType,
+        status: data?.breakType ? '合闸' : "分闸"
+      })
+    },
+    onClose() {
+      this.triggerEvent("close")
+    },
+    onChange(e) {
+      const { name } = e.currentTarget.dataset;
+      this.setData({
+        [name]: e.detail
+      })
+    },
+    async onSubmit() {
+      const { overall, critical, peak, valley, park, tenement, meterId,readAt, flat } = this.data;
+      const { code, message, } = await unbindMeter(
+        park, 
+        tenement, 
+        meterId, 
+        { 
+          overall:overall? Number(overall) : overall, 
+          critical : critical ? Number(critical) : critical, 
+          peak: peak ? Number(peak) : peak, 
+          flat: flat ? Number(flat) : flat,
+          valley : valley ? Number(valley) : valley, 
+          readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
+        });
+      if (code !== OK) {
+        alertInfo(message)
+        return
+      }
+      alertSuccess("解绑成功")
+      this.triggerEvent("ok")
+    },
+    dateTimeConfirm(e) {
+      this.setData({ readAt: e.detail.time, dateTimeShow: false })
+    },
+    dateTimeCancal(e) {
+      this.setData({ dateTimeShow: false })
+    },
+    onTimeFocus() {
+      this.setData({ dateTimeShow: true })
+    }
+  }
+})

pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-dialog": "@vant/weapp/dialog/index",
+    "search-select": "/components/searchSelect/index",
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index",
+    "date-time-picker": "/components/DateTimePicker/index"
+  }
+}

pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.wxml

@@ -0,0 +1,100 @@
+<!--pages/workBench/components/tenement/components/bindMeter/index.wxml-->
+<van-dialog
+  use-slot
+  title="解绑电表"
+  show="{{ visible }}"
+  show-cancel-button
+  bind:confirm="onSubmit"
+  bind:close="onClose"
+>
+  <view class="modalContentWrapper">
+    <van-field
+        value="{{tenementName}}"
+        label="商户名称"
+        readonly
+        type="textarea"
+        autosize="{{true}}"
+        title-width="132rpx"
+        border="{{false}}"
+    />
+    <van-field
+        value="{{meterAddress}}"
+        label="电表地址"
+        readonly
+        type="textarea"
+        autosize="{{true}}"
+        title-width="132rpx"
+        border="{{false}}"
+    />
+    <van-field
+        value="{{ readAt }}"
+        placeholder="请选择解绑时间"
+        label="时间"
+        readonly
+        border="{{ false }}"
+        use-button-slot
+        title-width="100rpx"
+    >
+        <van-button slot="button" size="small" type="info" bind:click="onTimeFocus">
+        选择
+        </van-button>
+    </van-field>
+    <van-field
+        value="{{ overall }}"
+        label="表字"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="overall"
+        placeholder="请输入表字"
+        type="number"
+    />
+    <van-field
+        value="{{ critical }}"
+        label="尖"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="critical"
+        placeholder="请输入有功（尖）"
+        type="number"
+    />
+    <van-field
+        value="{{ peak }}"
+        label="峰"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="peak"
+        placeholder="请输入有功（峰）"
+        type="number"
+    />
+    <van-field
+        value="{{ flat }}"
+        label="平"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="flat"
+        type="number"
+        placeholder="请输入有功（平）"
+    />
+    <van-field
+        value="{{ valley }}"
+        label="谷"
+        type="number"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="valley"
+        placeholder="请输入有功（谷）"
+    />
+</view>
+ 
+</van-dialog>
+
+<date-time-picker 
+    show="{{dateTimeShow}}"
+    bind:confirm="dateTimeConfirm"
+    bind:cancel="dateTimeCancal"
+/>

pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.wxss

@@ -0,0 +1 @@
+/* pages/workBench/components/tenement/components/bindMeter/index.wxss */

pages/workBenchNew/components/workBenchTenement/index.js

@@ -0,0 +1,233 @@
+// pages/workBenchNew/components/workBenchTenement/index.js
+import { alertInfo, alertSuccess } from "../../../../utils/index";
+import { getTenementBackInfo, unbindMeter, } from "../../../../service/tenement"
+import { getBackTenementMeters, } from "../../../../service/meter"
+import request from "../../../../utils/request"
+const { OK } = request
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    defaultValue: {},
+    editType: "",
+    meterList: [],
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+  onParkFocus(e) {
+    this.setData({
+      show: true,
+      title: "园区",
+      type: 'park'
+    })
+  },
+  onTenementFocus(e) {
+    const { park } = this.data;
+    const that = this;
+    if (!park) {
+      alertInfo("请先选择园区")
+      return;
+    }
+    this.setData({
+      show: true,
+      title: "商户",
+      type: 'tenement'
+    })
+  },
+  async init() {
+
+  },
+  async getTenementInfo() {
+    const { tenement, park } = this.data;
+    if (!tenement || !park) {
+      return;
+    }
+    const { code, message, tenement: data } = await getTenementBackInfo(park, tenement)
+    if (code !== OK) {
+      alertInfo(message)
+      return;
+    }
+    this.setData({
+      tenementInfo: data,
+    })
+  },
+  onConfirm(e) {
+    const { type, data } = e.detail;
+    const that = this;
+    switch(type) {
+      case "park":
+        this.setData({
+          park: data.id,
+          parkName: data.name,
+          show: false,
+        })
+        break;
+      case "tenement":
+        this.setData({
+          tenement: data.id,
+          tenementName: data.name,
+          show: false,
+        } , () => {
+          that.getTenementInfo();
+          that.getTenementMeters();
+        })
+        break;
+    }
+  },
+  onCancel() {
+    this.setData({
+      show: false,
+    })
+  },
+  startKh() {
+    this.setData({
+      kaihuVisible: true,
+      editType: "add",
+      title: "开户",
+      defaultValue: { feeType: 0, feeTypeName: "华昌宝能收费" }
+    })
+  },
+  startUpdateInfo() {
+    const { tenementInfo } = this.data;
+    this.setData({
+      kaihuVisible: true,
+      defaultValue: tenementInfo,
+      editType: "update",
+      title: "开户"
+    })
+  },
+  async getTenementMeters() {
+    const { park, tenement } = this.data;
+    const { code, message, data } = await getBackTenementMeters(park, tenement)
+    if (code !== OK) {
+      alertInfo(message)
+      return
+    }
+    this.setData({ meterList: data });
+  },
+  onKaihuClose() {
+    this.setData({
+      kaihuVisible: false,
+      defaultValue: {},
+      title: "编辑",
+      editType: "",
+    })
+  },
+  onBindClose() {
+    this.setData({
+      bindVisible: false,
+    })
+  },
+  async onKaihuConfirm() {
+    this.getTenementInfo();
+    this.onKaihuClose();
+  },
+  unbind(e) {
+    const that = this;
+    const { park, tenement } = this.data;
+    const { address, id } = e.currentTarget.dataset;
+    this.setData({
+      unbindVisible: true,
+      meterId: id,
+      meterAddress: address
+    })
+    // wx.showModal({
+    //   title: '提示',
+    //   content: `确认要解绑${address}吗？`,
+    //   complete: async (res) => {
+    //     if (res.cancel) {
+          
+    //     }
+    
+    //     if (res.confirm) {
+    //       const { code, message, } = await unbindMeter(park, tenement, id);
+    //       if (code !== OK) {
+    //         alertInfo(message)
+    //         return
+    //       }
+    //       alertSuccess("解绑成功")
+    //       that.getTenementMeters();
+    //       return
+    //     }
+    //   }
+    // })
+  },
+  onUnbindOk() {
+    this.setData({
+      unbindVisible: false,
+      meterId: "",
+      meterAddress: "",
+    })
+    this.getTenementMeters();
+  },
+  startBind() {
+    this.setData({
+      bindVisible: true
+    })
+  },
+  onBindOk() {
+    this.setData({
+      bindVisible: false,
+    })
+    this.getTenementMeters();
+  },
+  onTimeConfirm(e) {
+
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/workBenchNew/components/workBenchTenement/index.json

@@ -0,0 +1,16 @@
+{
+  "usingComponents": {
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index",
+    "search-select": "/components/searchSelect/index",
+    "van-empty": "@vant/weapp/empty/index",
+    "kaihu": "./components/kaihu/index",
+    "bindMeter": "./components/bindMeter/index",
+    "unBindMeter": "./components/unBindMeter/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "navigator": "/components/navigator/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index"
+  },
+  "navigationStyle": "custom"
+}

pages/workBenchNew/components/workBenchTenement/index.wxml

@@ -0,0 +1,138 @@
+<!--pages/workBench/components/tenement/index.wxml-->
+<navigator title="商户信息" canBack="{{true}}" />
+<view>
+    <searchSelectWrapper 
+        label="园区"
+        placeholder="请选择园区"
+        text="{{ parkName }}"
+        bind:search="onParkFocus"
+    />
+    <searchSelectWrapper 
+        label="商户"
+        placeholder="请选择商户"
+        text="{{ tenementName }}"
+        bind:search="onTenementFocus"
+    />
+</view>
+<view style="display: flex; align-items: center;margin: 20rpx">
+    <view wx:if="{{tenement}}">
+        <van-button 
+            style="margin-right: 20rpx;"  
+            type="info" 
+            size="small" 
+            bind:click="startBind"
+        > 绑定电表 </van-button>
+        <van-button 
+            style="margin-right: 20rpx;" 
+            type="info" 
+            size="small" 
+            bind:tap="startUpdateInfo"
+        > 修改信息 </van-button>
+    </view>
+    <van-button type="info" size="small" bind:click="startKh" wx:if="{{!!park}}"> 开户 </van-button>
+</view>
+<van-empty wx:if="{{!tenement}}" description="选择园区和商户后查看" />
+<view wx:else>
+    <view class="customTable">
+        <view class="customTableTile">
+            <van-row>
+                <van-col span="24">
+                    <view class="tableTitleRow">
+                        <view class="tbody">
+                            <view class="tr">
+                                <view style="width: 250rpx;text-align: center;"> {{tenementInfo.shortName}} </view>
+                                <view> {{tenementInfo.fullName}} </view>
+                            </view>
+                            <view class="tr">
+                                <view wx:if="{{tenementInfo.feeType === 0}}" class="th" style="width: 250rpx;text-align: center;"> 华昌宝能收费 </view>
+                                <view wx:if="{{tenementInfo.feeType === 1}}" class="th" style="width: 250rpx;text-align: center;"> 物业代收1 </view>
+                                <view wx:if="{{tenementInfo.feeType === 2}}" class="th" style="width: 250rpx;text-align: center;"> 物业代收2 </view>
+                                <view wx:if="{{tenementInfo.feeType === 3}}" class="th" style="width: 250rpx;text-align: center;"> 物业代收线损 </view>
+                                <view> {{tenementInfo.contact}} {{tenementInfo.phone}} </view>
+                            </view>
+                        </view>
+                    </view>
+                </van-col>
+               
+
+                        <!-- <van-row gutter="5">
+                            <van-col span="8"> 
+                                <view style="text-align: center;"> 华昌宝能收费 </view> </van-col>
+                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 1}}"> 
+                                <view style="text-align: center;"> 物业代收1 </view> </van-col>
+                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 2}}"> 
+                                <view style="text-align: center;"> 物业代收2 </view>  </van-col>
+                            <van-col span="8" wx:else> <view style="text-align: center;"> 物业代收线损 </view> </van-col>
+                            <van-col span="16">{{tenementInfo.contact}} {{tenementInfo.phone}} </van-col>
+                        </van-row> -->
+            
+     
+            </van-row>
+        </view>
+        <view class="customTableContent">
+       
+            <van-row>
+                <van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
+                    <block wx:for="{{meterList}}" wx:for-index="itemIndex" wx:key="item">
+                        <view class="tbody">
+                            <view class="tr tableRow">
+                                <view class="th" style="width: 250rpx;padding-right: 16rpx;box-sizing: border-box;border-right: 1rpx solid #ccc;"> {{ item.address }} </view>
+                                <view class="th" style="width: 250rpx;padding-right: 16rpx;box-sizing: border-box;border-right: 1rpx solid #ccc;"> {{ item.meterSn }} </view>
+                                <view class="th" style="width: 200rpx">
+                                    <view 
+                                        class="primaryTextBtn" 
+                                        bind:tap="unbind" 
+                                        data-id="{{item.meterId}}" 
+                                        data-address="{{item.address}}"
+                                    >
+                                        解绑
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </block>
+                </van-radio-group>
+            </van-row>
+        </view>
+    </view>
+</view>
+<search-select 
+    show="{{show}}" 
+    title="{{title}}" 
+    type="{{type}}" 
+    park="{{park}}"
+    isBack="{{true}}"
+    bindconfirm="onConfirm"
+    bindcancel="onCancel"
+/>
+<kaihu 
+    wx:if="{{kaihuVisible}}"
+    park="{{park}}" 
+    visible="{{kaihuVisible}}" 
+    defaultValue="{{defaultValue}}" 
+    bind:close="onKaihuClose"
+    bind:ok="onKaihuConfirm"
+    editType="{{editType}}"
+    title="{{title}}"
+/>
+
+<bindMeter 
+    visible="{{bindVisible}}" 
+    wx:if="{{bindVisible}}" 
+    park="{{park}}" 
+    tenement="{{tenement}}"
+    tenementName="{{tenementName}}"
+    bind:ok="onBindOk"    
+    bind:close="onBindClose"
+/>
+
+<unBindMeter 
+    wx:if="{{unbindVisible}}"
+    visible="{{unbindVisible}}"
+    park="{{park}}" 
+    tenement="{{tenement}}" 
+    tenementName="{{tenementName}}"    
+    meterId="{{meterId}}"
+    meterAddress="{{meterAddress}}"
+    bind:ok="onUnbindOk"
+/>

pages/workBenchNew/components/workBenchTenement/index.wxss

@@ -0,0 +1,70 @@
+/* pages/workBench/components/tenement/index.wxss */
+
+.table {
+    width: 890rpx;
+}
+
+.classWrapper {
+    width: 100vw;
+    overflow-x: auto;
+}
+
+.thead {
+    display: flex;
+    flex-wrap: nowrap;
+    border-bottom: 1rpx solid #EEEEEE;
+}
+
+.thead  .th {
+    padding: 20rpx;
+    white-space: nowrap;
+    text-align: center;
+    box-sizing: border-box;
+
+}
+
+.tbody .tr {
+    padding: 20rpx;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    flex-wrap: nowrap;
+}
+
+.tbody .th {
+    word-break: break-all;
+    text-align: center;
+}
+
+.primaryTextBtn {
+    color: #1989fa;
+}
+
+
+.customTable {
+    margin: 20rpx;
+    font-size: 32rpx;
+}
+
+.customTableTile {
+    background-color: var(--light-green);
+    box-sizing: border-box;
+    font-weight: 700;
+}
+
+.tableTitleRow {
+    padding: 16rpx;
+}
+
+.tableRow {
+
+    padding: 16rpx;
+    border: 1rpx solid #ccc;
+    border-top: 0rpx;
+    font-size: 32rpx;
+}
+
+page {
+    background-color: rgb(228,240,236);
+    font-size: 32rpx;
+  }

pages/workBenchNew/components/workBenchWxUser/components/editModal/index.js

@@ -0,0 +1,74 @@
+import { alertInfo, alertSuccess } from "../../../../../../utils/index";
+import { createTenementWxUser } from "../../../../../../service/tenement";
+import request from "../../../../../../utils/request"
+const { OK } = request
+// pages/workBench/components/account/components/editModal/index.js
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    type: String,
+    title: String,
+    visible: Boolean,
+    onCancel: Function,
+    park: String,
+    tenement: String,
+    parentPhone:String, 
+    parentName:String, 
+    parentId:String, 
+  },
+  observers: {
+    "parentName,parentId,parentPhone": function(newName, newId, newPhone) {
+      this.setData({ data: { name: newName, id: newId, phone: newPhone } })
+    },
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    data: { name: "", phone: "", id: "" }
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    async onSubmit() {
+      const { data = {}, tenement, park, type } = this.data;
+      if (!data.phone) {
+        alertInfo("请输入手机号")
+        return
+      }
+      if (!data.name) {
+        alertInfo("请输入昵称")
+        return
+      }
+      const { code, message } = await createTenementWxUser({ ...data, tenement, park })
+      if (code !== OK) {
+        alertInfo(message)
+        this.triggerEvent("cancel")
+        return;
+      }
+      alertSuccess("操作成功")
+      this.triggerEvent("ok")
+      this.setData({ data: {} })
+      return;
+      
+      
+    },
+    onChange(e) {
+      const { name } = e.currentTarget.dataset;
+      const newData = this.data.data;
+      newData[name] = e.detail;
+      this.setData({
+        data: newData,
+      })
+    },
+    onCancel() {
+      this.setData({ data: {} })
+      this.triggerEvent("cancel")
+    }
+  }
+})

pages/workBenchNew/components/workBenchWxUser/components/editModal/index.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-dialog": "@vant/weapp/dialog/index",
+    "search-select": "/components/searchSelect/index",
+    "van-field": "@vant/weapp/field/index"
+  }
+}

pages/workBenchNew/components/workBenchWxUser/components/editModal/index.wxml

@@ -0,0 +1,34 @@
+<!--pages/workBench/components/account/components/editModal/index.wxml-->
+<van-dialog
+  use-slot
+  title="{{title}}"
+  show="{{ visible }}"
+  show-cancel-button
+  bind:confirm="onSubmit"
+  bind:cancel="onCancel"
+>
+  <view class="modalContentWrapper">
+    <van-field
+        value="{{data.name}}"
+        label="昵称"
+        placeholder="请输入昵称"
+        type="textarea"
+        autosize="{{true}}"
+        title-width="120rpx"
+        border="{{false}}"
+        data-name="name"
+        bind:change="onChange"
+    />
+    <van-field
+        value="{{ data.phone }}"
+        placeholder="请输入手机号"
+        label="手机号"
+        border="{{ false }}"
+        title-width="120rpx"
+        data-name="phone"
+        bind:change="onChange"
+    >
+    </van-field>
+</view>
+ 
+</van-dialog>

pages/workBenchNew/components/workBenchWxUser/components/editModal/index.wxss

@@ -0,0 +1 @@
+/* pages/workBench/components/account/components/editModal/index.wxss */

pages/workBenchNew/components/workBenchWxUser/components/updatePhoneModal/index.js

@@ -0,0 +1,68 @@
+// pages/workBench/components/account/components/updatePhoneModa/index.js
+import { alertInfo, alertSuccess } from "../../../../../../utils/index";
+import { updateAdminPhone } from "../../../../../../service/tenement";
+import request from "../../../../../../utils/request"
+const { OK } = request
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    type: String,
+    title: String,
+    visible: Boolean,
+    onCancel: Function,
+    park: String,
+    tenement: String,
+    parentPhone:String, 
+    parentName:String, 
+    parentId:String, 
+  },
+  observers: {
+    "parentPhone": function (newPhone) {
+      this.setData({ phone: newPhone })
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    phone: "",
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    async onSubmit() {
+      const { phone, tenement, park, type } = this.data;
+      if (!phone) {
+        alertInfo("请输入手机号")
+        return
+      }
+      const { code, message } = await updateAdminPhone({tenement, phone: phone })
+      if (code !== OK) {
+        alertInfo(message)
+        this.triggerEvent("cancel")
+        return;
+      }
+      alertSuccess("操作成功")
+      this.triggerEvent("ok")
+      this.setData({ phone: "" })
+      return;
+      
+      
+    },
+    onChange(e) {
+
+      this.setData({
+        phone: e.detail,
+      })
+    },
+    onCancel() {
+      this.setData({ phone: "" })
+      this.triggerEvent("cancel")
+    }
+  }
+})

pages/workBenchNew/components/workBenchWxUser/components/updatePhoneModal/index.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-dialog": "@vant/weapp/dialog/index",
+    "search-select": "/components/searchSelect/index",
+    "van-field": "@vant/weapp/field/index"
+  }
+}

pages/workBenchNew/components/workBenchWxUser/components/updatePhoneModal/index.wxml

@@ -0,0 +1,23 @@
+<!--pages/workBench/components/account/components/updatePhoneModa/index.wxml-->
+<van-dialog
+  use-slot
+  title="编辑管理员手机号"
+  show="{{ visible }}"
+  show-cancel-button
+  bind:confirm="onSubmit"
+  bind:cancel="onCancel"
+>
+  <view class="modalContentWrapper">
+    <van-field
+        value="{{ phone }}"
+        placeholder="请输入新管理员手机号"
+        label="手机号"
+        border="{{ false }}"
+        title-width="120rpx"
+        data-name="phone"
+        bind:change="onChange"
+    >
+    </van-field>
+</view>
+ 
+</van-dialog>

pages/workBenchNew/components/workBenchWxUser/components/updatePhoneModal/index.wxss

@@ -0,0 +1 @@
+/* pages/workBench/components/account/components/updatePhoneModa/index.wxss */

pages/workBenchNew/components/workBenchWxUser/index.js

@@ -0,0 +1,224 @@
+// pages/workBenchNew/components/workBenchWxUser/index.js
+import request from "../../../../utils/request"
+import { getTenementBackInfo, updateUserApp} from "../../../../service/tenement"
+import { getBackApproveList, removeUser } from "../../../../service/user"
+import { alertInfo, alertSuccess, wxModal } from "../../../../utils/index"
+const { OK } = request
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    list: [],
+    tenementInfo: {},
+  },
+  onParkFocus(e) {
+    this.setData({
+      show: true,
+      title: "园区",
+      type: 'park'
+    })
+  },
+  onTenementFocus(e) {
+    const { park } = this.data;
+    if (!park) {
+      alertInfo("请先选择园区")
+      return;
+    }
+    this.setData({
+      show: true,
+      title: "商户",
+      type: 'tenement'
+    })
+  },
+  onConfirm(e) {
+    const that = this;
+    const { type, data } = e.detail;
+    switch(type) {
+      case "park":
+        this.setData({
+          park: data.id,
+          parkName: data.name,
+          show: false,
+        })
+        break;
+      case "tenement":
+        this.setData({
+          tenement: data.id,
+          tenementName: data.name,
+          show: false,
+        }, () => {
+          that.initUserList();
+          that.getTenementInfo();
+        })
+        break;
+    }
+  },
+  async setAdmin(e) {
+    const { id, name } = e.currentTarget.dataset;
+    const { tenement } = this.data;
+    await wxModal({ content: `确认要将${name}设置为管理吗？` })
+    const { code, message } = await updateUserApp({ userId: id, type: 2, tenement: tenement })
+    if (code !== OK) {
+      alertInfo(message)
+      return;
+    }
+    alertSuccess("转交成功")
+    this.initUserList();
+    this.getTenementInfo();
+  },
+  onCancel() {
+    this.setData({
+      show: false,
+    })
+  },
+  handleDelete(e) {
+    const { id, name } = e.currentTarget.dataset;
+    const { tenement } = this.data;
+    const that = this;
+    wx.showModal({
+      title: '提示',
+      content: `确认要移除${name}吗？`,
+      complete: async (res) => {
+        if (res.cancel) {
+          
+        }
+    
+        if (res.confirm) {
+          const { code, message } = await removeUser(id, tenement)
+          if (code !== OK) {
+            alertInfo(message)
+            return;
+          }
+          alertSuccess("删除成功")
+          that.initUserList();
+        }
+      }
+    })
+  },
+  onEditConfirm() {
+    this.initUserList()
+    this.handleCancel();
+  },
+  onUpdatePhoneConfirm() {
+    this.setData({ parentPhone: "", phone: "", type: "", title: "" })
+    this.getTenementInfo();
+    this.initUserList()
+  },
+  async getTenementInfo() {
+    const { tenement, park } = this.data;
+    const { code, message, tenement: data } = await getTenementBackInfo(park, tenement)
+    if (code !== OK) {
+      alertInfo(message)
+      return;
+    }
+    this.setData({
+      tenementInfo: data,
+    })
+  },
+  async initUserList() {
+    const { tenement } = this.data;
+    const { code, message, data } = await getBackApproveList(tenement, 1);
+    if (code !== OK) {
+      alertInfo(message)
+      return;
+    }
+    this.setData({
+      list: data,
+    })
+  },
+  handleAddSon() {
+    this.setData({
+      visible: true,
+      type: "add",
+      title: "新建子账号"
+    })
+  },
+  handleChangeMain() {
+    const { tenementInfo = {} } = this.data;
+    this.setData({
+      updatePhoneVisible: true,
+      type: "update",
+      title: "编辑管理员",
+      parentPhone: tenementInfo.phone,
+      // name: main.WechatUserName,
+      // id: main.WechatUserID,
+    })
+  },
+  handleUpdatePhoneCancel() {
+    this.setData({
+      updatePhoneVisible: false,
+      type: "",
+      phone: "",
+      parentPhone: "",
+      name: "",
+      id: "",
+    })
+  },
+  handleCancel() {
+    this.setData({
+      visible: false,
+      type: "",
+      phone: "",
+      name: "",
+      id: "",
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/workBenchNew/components/workBenchWxUser/index.json

@@ -0,0 +1,22 @@
+{
+  "usingComponents": {
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index",
+    "search-select": "/components/searchSelect/index",
+    "van-empty": "@vant/weapp/empty/index",
+    "table": "/components/table/table",
+    "pagination": "/components/pagination/index",
+    "empty": "/components/empty/index",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index",
+    "van-tag": "@vant/weapp/tag/index",
+    "edit-modal": "./components/editModal/index",
+    "updatePhoneModal": "./components/updatePhoneModal/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index",
+    "van-image": "@vant/weapp/image/index",
+    "navigator": "/components/navigator/index"
+  },
+  "navigationStyle": "custom"
+}

pages/workBenchNew/components/workBenchWxUser/index.wxml

@@ -0,0 +1,143 @@
+<!--pages/workBench/components/account/index.wxml-->
+<navigator title="C端账号" canBack="{{true}}" />
+<view>
+    <searchSelectWrapper 
+        label="园区"
+        placeholder="请选择园区"
+        text="{{ parkName }}"
+        bind:search="onParkFocus"
+    />
+    <searchSelectWrapper 
+        label="商户"
+        placeholder="请选择商户"
+        text="{{ tenementName }}"
+        bind:search="onTenementFocus"
+    />
+</view>
+<van-empty wx:if="{{!tenement}}" description="选择园区和商户后查看" />
+<view wx:else>
+    <view class="operateBox">
+        <van-button type="info" size="small" style="margin-right: 20rpx;" bind:click="handleAddSon"> 添加子账号 </van-button>
+        <van-button type="info" size="small" style="margin-right: 20rpx;" bind:click="handleChangeMain"> 修改主账号 </van-button>
+    </view>
+    <view class="customTable">
+        <view class="customTableTile">
+            <van-row>
+                <van-col span="24">
+                    <view class="tableTitleRow">
+                        <view class="tableTitleRow">
+                            <view class="tbody">
+                                <view class="tr">
+                                    <view class="th" style="width: 200rpx;text-align: center;"> {{tenementInfo.shortName}} </view>
+                                    <view> {{tenementInfo.fullName}} </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </van-col>
+                <van-col span="24">
+                    <view class="tableTitleRow">
+                        <view class="tbody">
+                            <view class="tr">
+                                <view 
+                                    class="th" 
+                                    style="width: 200rpx;text-align: center;"
+                                    wx:if="{{tenementInfo.feeType === 0}}"
+                                > 华昌宝能收费 </view>
+                                <view 
+                                    class="th" 
+                                    style="width: 200rpx;text-align: center;"
+                                    wx:if="{{tenementInfo.feeType === 1}}"
+                                > 物业代收1 </view>
+                                <view 
+                                    class="th" 
+                                    style="width: 200rpx;text-align: center;"
+                                    wx:if="{{tenementInfo.feeType === 2}}"
+                                > 物业代收2 </view>
+                                <view 
+                                    class="th" 
+                                    style="width: 200rpx;text-align: center;"
+                                    wx:if="{{tenementInfo.feeType === 3}}"
+                                > 物业代收线损 </view>
+                                <view style="margin-left: 26rpx;"> {{tenementInfo.contact}} {{tenementInfo.phone}} </view>
+                            </view>
+                        </view>
+                        
+                    </view>
+                </van-col>
+     
+            </van-row>
+        </view>
+        <view class="customTableContent">
+            <van-row wx:if="{{list.length}}">
+                <van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
+                    <block wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
+                        <view class="tbody">
+                            <view class="tr tableRow">
+                                <view class="th" style="width: 200rpx;border-right: 1rpx solid #ccc;"> {{ item.WechatUserName }} </view>
+                                <view class="th" style="width: 250rpx;border-right: 1rpx solid #ccc;"> {{ item.WechatPhone }} </view>
+                                <view class="th" style="display: flex;">
+                                    <view style="margin-left: 16rpx;">
+                                        <view wx:if="{{!item.Permissions}}" style="display: inline-block;">
+                                            <view 
+                                                class="primaryTextBtn" 
+                                                bind:tap="handleDelete" 
+                                                data-id="{{item.WechatUserID}}" 
+                                                data-name="{{item.WechatUserName}}" 
+                                            >
+                                            <van-image width="40rpx" height="40rpx" src="/assets/images/stop.png" />
+                                            </view>
+                                            <view 
+                                                class="primaryTextBtn" 
+                                                bind:tap="setAdmin" 
+                                                data-id="{{item.WechatUserID}}" 
+                                                data-name="{{item.WechatUserName}}" 
+                                                style="margin-left: 16rpx;"
+                                            >
+                                            <van-image width="40rpx" height="40rpx" src="/assets/images/tihuan.png" />
+                                            </view>
+                                        </view>
+                   
+                                        <van-tag type="primary" wx:else>管理员</van-tag>
+                                    </view>
+                                   
+                                </view>
+                            </view>
+                        </view>
+                        
+                    </block>
+                </van-radio-group>
+            </van-row>
+            <empty wx:else bind:refresh="initUserList" />
+        </view>
+    </view>
+</view>
+<search-select 
+    show="{{show}}" 
+    title="{{title}}" 
+    type="{{type}}" 
+    park="{{park}}"
+    isBack="{{true}}"
+    bindconfirm="onConfirm"
+    bindcancel="onCancel"
+/>
+<edit-modal 
+    visible="{{visible}}" 
+    type="{{type}}" 
+    title="{{title}}"  
+    tenement="{{tenement}}"
+    park="{{park}}"  
+    parentPhone="{{phone}}"
+    parentName="{{name}}"
+    parentId="{{id}}"
+    bind:ok="onEditConfirm"
+    bind:cancel="handleCancel"
+/>
+<updatePhoneModal
+    visible="{{updatePhoneVisible}}"  
+    tenement="{{tenement}}"
+    park="{{park}}"  
+    parentPhone="{{parentPhone}}"
+    bind:ok="onUpdatePhoneConfirm"
+    bind:cancel="handleUpdatePhoneCancel"
+/>

pages/workBenchNew/components/workBenchWxUser/index.wxss

@@ -0,0 +1,71 @@
+/* pages/workBench/components/account/index.wxss */
+
+.operateBox {
+    margin: 20rpx;
+}
+
+.table {
+    width: 890rpx;
+    
+}
+
+.classWrapper {
+    width: 100vw;
+    overflow-x: auto;
+}
+
+.thead {
+    display: flex;
+    flex-wrap: nowrap;
+    border-bottom: 1rpx solid #EEEEEE;
+}
+
+.thead  .th {
+    padding: 20rpx;
+    white-space: nowrap;
+    text-align: center;
+    box-sizing: border-box;
+
+}
+
+
+.tr {
+    display: flex;
+    align-items: center;
+    flex-wrap: nowrap;
+}
+
+.tbody .th {
+    word-break: break-all;
+    text-align: center;
+}
+.primaryTextBtn {
+    color: #1989fa;
+    display: inline-block;
+}
+
+.customTable {
+    margin: 20rpx;
+    font-size: 32rpx;
+}
+
+.customTableTile {
+    background-color: var(--light-green);
+    box-sizing: border-box;
+}
+
+.tableTitleRow {
+    padding: 16rpx;
+    font-weight: 700;
+}
+
+.tableRow {
+    padding: 16rpx;
+    border: 1rpx solid #ccc;
+    border-top: 0rpx;
+}
+
+page {
+    background-color: rgb(228,240,236);
+    font-size: 32rpx;
+  }

pages/workBenchNew/index.js

@@ -0,0 +1,112 @@
+// pages/workBench/index.js
+import { getWorkBenchHome } from "../../service/workBench"
+import { alertError, alertSuccess, loadingFunc } from "../../utils/index"
+import request from "../../utils/request"
+const { OK } = request
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.init()
+    const user = wx.getStorageSync('user')
+    this.setData({
+      workStatus: !!user.workStatus
+    })
+  },
+  async init() {
+    const { code, message, data } = await getWorkBenchHome()
+    if (code !== OK) {
+      alertError(message)
+      return
+    }
+    this.setData({ data })
+  },
+  jumpToMeter() {
+    wx.navigateTo({
+      url: '/pages/workBenchNew/components/workBenchMeter/index',
+    })
+  },
+  jumpToTenement() {
+    wx.navigateTo({
+      url: '/pages/workBenchNew/components/workBenchTenement/index',
+    })
+  },
+  jumpToPay() {
+    wx.navigateTo({
+      url: '/pages/workBenchNew/components/workBenchApprove/index',
+    })
+  },
+  jumpToWxUser() {
+    wx.navigateTo({
+      url: '/pages/workBenchNew/components/workBenchWxUser/index',
+    })
+  },
+  jumpToRoute() {
+    wx.navigateTo({
+      url: '/pages/workBenchNew/components/workBenchReading/index',
+    })
+  },
+  jumpToHome() {
+    wx.switchTab({
+      url: '/pages/home/index',
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/workBenchNew/index.json

@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "navigator": "/components/navigator/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "van-button": "@vant/weapp/button/index"
+  },
+  "navigationStyle": "custom"
+}

pages/workBenchNew/index.wxml

@@ -0,0 +1,80 @@
+<!--pages/workBench/index.wxml-->
+<navigator title="工作台" canBack="{{false}}" />
+
+<view class="wrapper">
+    <van-row gutter="10">
+        <van-col span="12">
+            <view class="contentWrapper" bind:tap="jumpToMeter">
+                <view class="image">
+                    <view class="imageContent">
+                    </view>
+                </view>
+                <view class="title">
+                    电表信息
+                </view>
+                <view class="number">
+                    {{data.meter}}
+                </view>
+            </view>
+        </van-col>
+        <van-col span="12">
+            <view class="contentWrapper" bind:tap="jumpToTenement">
+                <view class="image">
+                    <view class="imageContent">
+                    </view>
+                </view>
+                <view class="title">
+                    商户信息
+                </view>
+                <view class="number">
+                    {{data.tenement}}
+                </view>
+            </view>
+        </van-col>
+        <van-col span="12">
+            <view class="contentWrapper" bind:tap="jumpToPay">
+                <view class="image">
+                    <view class="imageContent">
+                    </view>
+                </view>
+                <view class="title">
+                    充值审核
+                </view>
+                <view class="number">
+                    {{data.pay}}
+                </view>
+            </view>
+        </van-col>
+        <van-col span="12">
+            <view class="contentWrapper" bind:tap="jumpToWxUser">
+                <view class="image">
+                    <view class="imageContent">
+                    </view>
+                </view>
+                <view class="title">
+                    C端账号
+                </view>
+                <view class="number">
+                    {{data.wxUser}}
+                </view>
+            </view>
+        </van-col>
+        <van-col span="12">
+            <view class="contentWrapper" bind:tap="jumpToRoute">
+                <view class="image">
+                    <view class="imageContent">
+                    </view>
+                </view>
+                <view class="title">
+                    抄表记录录入
+                </view>
+                <view class="number">
+                    {{data.route}}
+                </view>
+            </view>
+        </van-col>
+    </van-row>
+    <view class="operate">
+        <van-button type="info" block bind:click="jumpToHome"> 回到首页 </van-button>
+    </view>
+</view>

pages/workBenchNew/index.wxss

@@ -0,0 +1,48 @@
+/* pages/workBench/index.wxss */
+
+.wrapper {
+    margin: 20rpx 0rpx;
+}
+
+.contentWrapper {
+    background-color: white;
+    width: 100%;
+    margin-bottom: 24rpx;
+}
+
+.image {
+    padding: 50rpx 0;
+    display: flex;
+    justify-content: center;
+}
+
+.title {
+    font-size: 32rpx;
+    font-weight: 600;
+    /* margin-top: 30rpx; */
+    margin-bottom: 20rpx;
+    text-align: center;
+}
+
+.number {
+    font-size: 40rpx;
+    font-weight: 700;
+    color: var(--deep-green);
+    text-align: center;
+    padding-bottom: 30rpx;
+}
+
+.imageContent {
+    width: 100rpx;
+    height: 100rpx;
+    border-radius: 12rpx;
+    background-color: var(--light-green);
+}
+
+page {
+    background-color: rgb(242,243,245);
+}
+
+.operate {
+    padding-bottom: 24rpx;
+}

pages/writeReading/components/meterInfo/index.js

@@ -6,6 +6,8 @@ Component({
    */
   properties: {
     meterInfo: Object,
+    routeId: String,
+    disabled: Boolean,
   },
 
   /**
@@ -19,6 +21,11 @@ Component({
    * 组件的方法列表
    */
   methods: {
-
+    jumpToHistory() {
+      const { meterInfo, routeId, disabled } = this.data;
+      wx.navigateTo({
+        url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.parkId}&routeId=${routeId}&disabled=${disabled}`,
+      })
+    },
   }
 })

pages/writeReading/components/meterInfo/index.json

@@ -3,6 +3,7 @@
   "usingComponents": {
     "van-tag": "@vant/weapp/tag/index",
     "van-row": "@vant/weapp/row/index",
-    "van-col": "@vant/weapp/col/index"
+    "van-col": "@vant/weapp/col/index",
+    "van-button": "@vant/weapp/button/index"
   }
 }

pages/writeReading/components/meterInfo/index.wxml

@@ -1,15 +1,24 @@
 <!--pages/writeReading/components/meterInfo/index.wxml-->
 <view class="wrapper">
-    <view class="title">
-        <text> 电表列表 </text>
+    <view class="title" style="display: flex; justify-content: space-between; align-items: center;">
+        <text> 电表详情 </text>
+        <view class="time">
+            <!-- 2025年9月5日 -->
+            <van-button size="small" type="info" bind:click="jumpToHistory">
+                历史记录
+            </van-button>
+        </view>
     </view>
     <view class="info">
         <view class="title">
             <view class="address">
-                标1东-307
+                {{ meterInfo.address }}
             </view>
             <view class="meterType">
-                <van-tag type="primary">华昌宝能收费</van-tag> 
+                <van-tag type="primary" custom-style="width: 100%;" wx:if="{{meterInfo.feeType === 1}}">物业代收1</van-tag> 
+                <van-tag type="primary" custom-style="width: 100%;" wx:elif="{{meterInfo.feeType === 2}}">物业代收2</van-tag> 
+                <van-tag type="primary" custom-style="width: 100%;" wx:elif="{{meterInfo.feeType === 3}}">物业代收线损</van-tag> 
+                <van-tag type="primary" custom-style="width: 100%;" wx:else>华昌宝能收费</van-tag> 
             </view>
             
         </view>
@@ -17,7 +26,7 @@
             <van-row gutter="20">
                 <van-col span="12">
                     <view class="text">
-                        <view>
+                        <view class="titleText">
                             编号
                         </view>
                         <view>
@@ -27,7 +36,7 @@
                 </van-col>
                 <van-col span="12">
                     <view class="text">
-                        <view>
+                        <view class="titleText">
                             类型
                         </view>
                         <view wx:if="{{meterInfo.meterBelongType === 0}}">
@@ -43,24 +52,26 @@
                 </van-col>
                 <van-col span="12">
                     <view class="text">
-                        <view>
-                            状态
+                        <view class="titleText">
+                            建筑
                         </view>
-                        <view wx:if="{{meterInfo.enabled}}">
+                        <!-- <view wx:if="{{meterInfo.enabled}}">
                             正常
                         </view>
                         <view wx:else>
                             停用
-                        </view>
+                        </view> -->
+                        <view> {{ meterInfo.buildingName || "-" }} </view>
                     </view>
                 </van-col>
                 <van-col span="12">
                     <view class="text">
-                        <view>
-                            读数
+                        <view class="titleText">
+                            楼层
                         </view>
                         <view>
-                            {{meterInfo.overall}}
+                            {{ meterInfo.floor || "-" }}
+                            <!-- {{meterInfo.overall}} -->
                         </view>
                     </view>
                 </van-col>

pages/writeReading/components/meterInfo/index.wxss

@@ -20,6 +20,15 @@
 .info .title .address {
     font-size: 36rpx;
     font-weight: 800;
+    flex: 1;
+    margin-right: 24rpx;
+    word-break: break-all;
+}
+
+.info .title .meterType {
+    display: flex;
+    justify-content: end;
+    width: 180rpx;
 }
 
 .info .detail  {
@@ -31,3 +40,11 @@
     justify-content: space-between;
     font-size: 30rpx;
 }
+
+.wrapper > .title {
+    font-size: 32rpx;
+}
+
+.titleText {
+    color: rgb(150, 137, 137);
+}

pages/writeReading/components/meterList/components/meterItem/index.js

@@ -6,7 +6,8 @@ Component({
    */
   properties: {
     active: Boolean,
-    meter: Object
+    meter: Object,
+    status: Number,
   },
   observers: {
     "active": function (newValue) {

pages/writeReading/components/meterList/components/meterItem/index.wxml

@@ -1,4 +1,4 @@
 <!--pages/writeReading/components/meterList/components/meterItem/index.wxml-->
-<view class="wrapper {{isDeep ? 'deepBg' : ''}}" bind:tap="onClick">
+<view class="wrapper {{isDeep ? 'deepBg' : ''}} {{status == 1 ? 'done' : ''}}" bind:tap="onClick">
     {{meter.meterAddress}}
 </view>

pages/writeReading/components/meterList/components/meterItem/index.wxss

@@ -19,6 +19,10 @@
 }
 
 .deepBg {
-    background-color: var(--deep-green);
+    background-color: var(--deep-green) !important;
     color: white;
 }
+
+.done {
+    background-color: #ccc;
+}

pages/writeReading/components/meterList/index.js

@@ -12,7 +12,8 @@ Component({
   properties: {
     list: Array,
     active: Number,
-    meterInfo: Object
+    meterInfo: Object,
+    finishNumber: Number,
   },
   observers: {
     "active,list": function(newActive, newList) {
@@ -22,7 +23,7 @@ Component({
       if (newActive === 0) {
         this.setData({ scrollLeft: 0 })
       } else if (newActive > 0) {
-        this.setData({ scrollLeft: 220 * newList.length - 20 })
+        this.setData({ scrollLeft: (220 * (newActive) - 20) + "rpx" })
       }
       const { scrollWidth } = this.data;
       if (scrollWidth) {
@@ -30,7 +31,7 @@ Component({
           maxScrollLeft: newList?.length ? 220 * newList.length - (scrollWidth || 0) - 20 : 0,
         })
       }
-    }
+    },
   },
   /**
    * 组件的初始数据
@@ -54,8 +55,6 @@ Component({
           scrollWidth: res?.[0]?.width || 0
         })
       }) 
- 
-      
     }
   },
   /**
@@ -109,13 +108,12 @@ Component({
     },
     // onScroll(e) {
     //   // 实时更新当前滚动位置，可用于更复杂的边界判断
-    //   console.log("e", e)
     //   this.setData({
     //     scrollLeft: e.detail.scrollLeft
     //   });
     // },
   
-    scrollLeft() {
+    handleScrollLeft() {
       // 向左滚动：减少 scrollLeft，但不能小于0
       const newScrollLeft = Math.max(0, this.data.scrollLeft - 200);
       this.setData({
@@ -123,7 +121,7 @@ Component({
       });
     },
   
-    scrollRight() {
+    handleScrollRight() {
       // 向右滚动：增加 scrollLeft，但不能超过 maxScrollLeft
       const newScrollLeft = Math.min(this.data.maxScrollLeft, this.data.scrollLeft + 200);
       this.setData({

pages/writeReading/components/meterList/index.wxml

@@ -2,16 +2,16 @@
 
 <view class="wrapper">
     <view class="title">
-        <text> 电表列表 </text>
+        <text> 电表列表 (总计{{list.length}}块，已抄{{list.length - finishNumber}}块) </text>
     </view>
     <view style="display: flex; align-items: center;margin-top: 20rpx;">
-        <van-icon name="arrow-left" size="50rpx" bind:tap="scrollLeft" />
+        <!-- <van-icon name="arrow-left" size="50rpx" bind:tap="handleScrollLeft" /> -->
         <scroll-view
             scroll-x="{{true}}"
             class="meterListScrollView"
             scroll-left="{{scrollLeft}}" 
-            bindscroll="onScroll" 
-            scroll-with-animation="true"
+            scroll-with-animation="{{true}}"
+            scroll-anchoring="{{true}}"
         >
             <view style="display: flex;" class="scroll-content">
                 <meter-item 
@@ -19,13 +19,13 @@
                     wx:for="{{list}}" 
                     wx:key="id" 
                     meter="{{item}}" 
-                    bind:click="handleSelect"
+                    catch:click="handleSelect"
                     data-index="{{index}}"
                     data-id="{{item.meterId}}" 
+                    status="{{item.status}}"
                 />
             </view>
         </scroll-view>
-        <van-icon name="arrow" size="50rpx" bind:tap="scrollRight" />
+        <!-- <van-icon name="arrow" size="50rpx" bind:tap="handleScrollRight" /> -->
     </view>
-    
 </view>

pages/writeReading/components/meterList/index.wxss

@@ -6,6 +6,7 @@
 
 .title {
     margin-top: 20rpx;
+    font-size: 32rpx;
 }
 
 .meterListScrollView {

pages/writeReading/components/photo/index.js

@@ -1,4 +1,8 @@
 // pages/writeReading/components/photo/index.js
+import { uploadOcrFile } from "../../../../service/public"
+import request from "../../../../utils/request"
+import { alertError, alertInfo, alertSuccess, loadingFunc } from "../../../../utils/index"
+const { OK } = request;
 Component({
 
   /**
@@ -19,6 +23,53 @@ Component({
    * 组件的方法列表
    */
   methods: {
+    chooseImage() {
+      const that = this;
+      wx.chooseMedia({
+        count: 1,
+        mediaType: ['image'],
+        sourceType: ['album', 'camera'],
+        success: async function(res) {
+          wx.cropImage({
+            src: res.tempFiles[0].tempFilePath, // 图片路径
+            cropScale: '16:9', // 裁剪比例
+            success: function (res) {
+              if (!/(\.jpg|\.png|\.jpeg)$/.test(res.tempFilePath.toLowerCase())) {
+                wx.showToast({
+                  title: '请上传jpg、png或jpeg格式的图片',
+                  icon: 'none',
+                });
+                return;
+              }
+              var tempFilePaths = res.tempFilePath;
+              loadingFunc(async () => {
+                const { code, message, data } = await uploadOcrFile(tempFilePaths)
+                if (code !== OK) {
+                  alertError(message)
+                  return
+                }
+                setTimeout(() => {
+                  that.triggerEvent("finish", { number: data?.integer + "." + data?.decimal || 0, success: data?.integer != null && data?.integer !== "" })
+                }, 100)
+              })
    
             }
+    
+          })
+  
+          // loadingFunc(async () => {
+          //   const { code, message, data } = await uploadOcrFile(res.tempFiles[0].tempFilePath)
+          //   if (code !== OK) {
+          //     alertError(message)
+          //     return
+          //   }
+          //   setTimeout(() => {
+          //     that.triggerEvent("finish", { number: data?.integer, success: data?.integer != null && data?.integer !== "" })
+          //   }, 100)
+          // })
+          
+        }
+      })
+    }
+  }
 })

pages/writeReading/components/photo/index.json

@@ -1,4 +1,6 @@
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "van-button": "@vant/weapp/button/index"
+  }
 }

pages/writeReading/components/photo/index.wxml

@@ -1,4 +1,8 @@
 <!--pages/writeReading/components/photo/index.wxml-->
 <view class="wrapper">
-    拍照
+    <van-button 
+        type="info" 
+        size="small" 
+        bind:tap="chooseImage"
+    > 拍照 </van-button>
 </view> 

pages/writeReading/components/readingInfo/index.js

@@ -1,8 +1,9 @@
 // pages/writeReading/components/readingInfo/index.js
 
-import { createReading } from "../../../../service/workBench"
-import { alertError, alertInfo, alertSuccess } from "../../../../utils/index"
+import { createReading, checkReadingFinish, changeMeterRouteStatus } from "../../../../service/workBench"
+import { alertError, alertInfo, alertSuccess, wxModal } from "../../../../utils/index"
 import request from "../../../../utils/request"
+import dayjs from "../../../../utils/dayjs"
 const { OK } = request
 
 Component({
@@ -14,25 +15,34 @@ Component({
     meterInfo: Object,
     showLeft: Boolean,
     showRight: Boolean,
+    routeId: String, 
+    disabled: Boolean,
+  },
+  observers: {
+    "routeId": function(newValue) {
+      if (!newValue) {
+        return;
+      }
+      this.checkFinish(newValue)
+    },
   },
-
   /**
    * 组件的初始数据
    */
   data: {
-    currentNumber: null
+    currentNumber: null,
+    diff: "-"
   },
+  lifetimes: {
+    attached() {
       
+    }
+  },
   /**
    * 组件的方法列表
    */
   methods: {
-    jumpToHistory() {
-      const { meterInfo } = this.data;
-      wx.navigateTo({
-        url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.park}`,
-      })
-    },
+
     handlePrev() {
       this.triggerEvent("prev")
     },
@@ -41,7 +51,9 @@ Component({
     },
     onChange(e) {
       this.setData({
-        currentNumber: e.detail ? Number(e.detail) : 0
+        currentNumber: e.detail,
+        calcNumber: isNaN(Number(e.detail)) ? 0 : Number(e.detail),
+        diff: isNaN(Number(e.detail)) ? "-" : (Number(e.detail) - this.data.meterInfo?.overall).toFixed(2)
       })
     },
     handleClear() {
@@ -49,20 +61,89 @@ Component({
         currentNumber: null,
       })
     },
+    async changeEndStatus() {
+      const { routeId: id } = this.data;
+      const { code, message } = await changeMeterRouteStatus({ id, status: 0 })
+      if (code !== OK) {
+        alertError(message)
+        return
+      }
+      alertSuccess("操作成功")
+      wx.navigateBack()
+    },
+    onPhotoFinish(e) {
+      const { number, success } = e.detail;
+      const { meterInfo } = this.data;
+      if (success) {
+        this.setData({ 
+          currentNumber: `${Number(number)}`,  
+          calcNumber: isNaN(Number(number)) ? 0 : Number(number),
+          diff: isNaN(Number(number)) ? "-" : (Number(number || 0) - Number(meterInfo.overall)).toFixed(2)
+        })
+        alertSuccess("获取成功")
+      } else {
+        alertInfo("未能识别数字")
+      }
+    },
     async onSubmit() {
-      const { meterInfo, currentNumber } = this.data;
+      const { meterInfo, currentNumber, routeId } = this.data;
       const { parkId, id } = meterInfo;
-      const { code, message } = await createReading(parkId, id, {
+      const { code, message } = await createReading(parkId, id, routeId, {
         overall: `${currentNumber}`,
-        flat: `${currentNumber}`
+        flat: `${currentNumber}`,
+        readAt: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+        source: 1,
       })
       if (code !== OK) {
         alertError(message)
         return
       }
+      this.setData({
+        currentNumber: null,
+        calcNumber: null,
+        diff: "-"
+      })
       alertSuccess("录入成功")
-      this.handleNext()
-      this.handleClear()
+      const that = this;
+      that.triggerEvent("onSubmit")
+      setTimeout(async () => {
+        const isFinished = await that.checkFinish()
+        if (isFinished) {
+          
+          wx.showModal({
+            title: '提示',
+            content: '所有电表都已抄完，是否返回？',
+            complete: async (res) => {
+              if (res.cancel) {
+                
+              }
+          
+              if (res.confirm) {
+                // await that.changeEndStatus()
+                wx.navigateBack()
+                // const pages = getCurrentPages();
+                // const prevPage = pages[pages.length - 2];
+                // if (prevPage.init){
+                //   prevPage.init()
+                // }
+              }
+            }
+          })
+        } else {
+          that.handleNext()
+          that.handleClear()
+        }
+      }, 300)
+
+    },
+    async checkFinish(id) {
+      const { code, message, data, num } = await checkReadingFinish(id || this.data.routeId);
+      if (code !== OK) {
+        alertError(message)
+        return;
+      }
+      this.triggerEvent("finishNumber", num)
+      return data;
     },
     handleCreateReading() {
       const { meterInfo, currentNumber } = this.data;
@@ -80,7 +161,7 @@ Component({
           }
       
           if (res.confirm) {
-            if (meterInfo.consumption < currentNumber) {
+            if (meterInfo.consumption < currentNumber - meterInfo.overall) {
               wx.showModal({
                 title: '提示',
                 content: '本次用电量已抄过历史平均水平的100%，是否确认录入？',

pages/writeReading/components/readingInfo/index.wxml

@@ -1,24 +1,21 @@
 <!--pages/writeReading/components/readingInfo/index.wxml-->
 
 <view class="wrapper">
-    <view class="bodyTitle">
+    <!-- <view class="bodyTitle">
         <view class="text">
-            <!-- 电表数据记录器 -->
-        </view>
-        <view class="time" bind:tap="jumpToHistory">
-            <!-- 2025年9月5日 -->
-            历史记录
-        </view>
         </view>
+ 
+    </view> -->
     <view class="contentWrapper">
-        <view class="currentMeter">
+        <!-- <view class="currentMeter">
             <view class="text">
                 当前电表
             </view>
             <view class="address">
                 {{meterInfo.address}}
             </view>
-        </view>
+        </view> -->
+        <view style="height: 10rpx;"></view>
         <view class="change">
             <van-button wx:if="{{showLeft}}" type="info" size="small" bind:click="handlePrev"> 
                 <van-icon name="arrow-left" /> 
@@ -31,7 +28,7 @@
             </van-button>
             <view wx:else></view>
         </view>
-        <van-divider />
+        <van-divider custom-style="margin: 20rpx 0;" />
         <view class="readingNumber">
             <view class="lastNumber">
                 <view class="title">
@@ -52,36 +49,41 @@
                 </view>
           
                 <view class="number">
+                    <view style="flex: 1;">
                         <van-field
                             value="{{currentNumber}}"
-                        placeholder="请输入本次读数"
+                            placeholder="{{ disabled ? '已抄表' : '请输入本次读数'}}"
                             bind:change="onChange"
                             border="{{false}}"
-                        custom-style="border: 1rpx solid #ccc; padding: 2px 14rpx; font-size: 32rpx; border-radius: 10rpx;"
+                            custom-style="border: 1rpx solid #ccc; padding: 2px 14rpx; font-size: 32rpx; border-radius: 10rpx;flex: 1;"
+                            disabled="{{disabled}}"
                         />
                     </view>
+        
+                    <photo bind:finish="onPhotoFinish" wx:if="{{!disabled}}" />
                 </view>
-            <view class="photo">
-                <photo />
             </view>
+            <!-- <view class="photo">
+            
+            </view> -->
         </view>
         <view class="calc">
             <view class="title">
                 表字差
             </view>
-            <view class="rightNumber" wx:if="{{currentNumber - meterInfo.overall >= 0}}">
-                {{(currentNumber || 0) - meterInfo.overall}}
+            <view class="rightNumber" wx:if="{{diff >= 0}}">
+                {{diff}}
             </view>
             <view class="wrongNumber" wx:else>
-                {{(currentNumber || 0) - meterInfo.overall}}
+                {{diff}}
             </view>
         </view>
         <view class="operate">
             <view style="flex: 1;">
-                <van-button size="small"  type="info" block bind:click="handleCreateReading"> 确定录入 </van-button>
+                <van-button disabled="{{disabled}}" type="info" block bind:click="handleCreateReading"> 确定录入 </van-button>
             </view>
             <view style="flex: 1; margin-left: 20rpx;">
-                <van-button size="small" block bind:click="handleClear"> 清除记录 </van-button>
+                <van-button disabled="{{disabled}}" block bind:click="handleClear"> 清除记录 </van-button>
             </view>     
         </view>
     </view>

pages/writeReading/components/readingInfo/index.wxss

@@ -46,8 +46,8 @@
 }
 
 .change {
-   margin-top: 20rpx;
-   margin-bottom: 20rpx;
+   margin-top: 10rpx;
+   /* margin-bottom: 10rpx; */
    display: flex;
    justify-content: space-between; 
 }
@@ -65,6 +65,7 @@
     font-size: 42rpx;
     font-weight: 800;
     margin-top: 12rpx;
+    margin-bottom: 12rpx;
 }
 .readingNumber .lastTime {
     font-size: 32rpx;
@@ -72,7 +73,7 @@
 
 .nextReadingNumber {
     display: flex;
-    align-items: bottom;
+
 }
 
 .nextReadingNumber .title {
@@ -81,12 +82,19 @@
 
 .nextReadingNumber .number {
     margin-top: 12rpx;
+    display: flex;
+    align-items: center;
+    flex: 1;
 }
 
 .currentNumber {
     flex: 1;
 }
 
+.currentNumber .title {
+    margin-bottom: 24rpx;
+}
+
 .calc {
     margin-top: 24rpx;
 }

pages/writeReading/index.js

@@ -18,7 +18,8 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    const { id } = options;
+    const { id, type } = options;
+    this.setData({ id, type })
     this.getMeterList(id)
   },
   async getMeterList(id) {
@@ -29,7 +30,8 @@ Page({
     }
     this.setData({
       meterList: data?.meterRouteDetail || [],
-      meterInfo: data?.meterRouteDetail?.[0] || {}
+      meterInfo: data?.meterRouteDetail?.[0] || {},
+      routeId: id
     })
   },
   changeMeter(e) {
@@ -43,14 +45,17 @@ Page({
       active: e.detail.index,
     })
   },
+  onSubmit() {
+    this.getMeterList(this.data.routeId)
+  },
   handleNext() {
     const { active = 0, meterList } = this.data;
     let newIndex = active + 1
-    if (active > meterList?.length - 1) {
+    if (newIndex > meterList?.length - 1) {
       newIndex = meterList?.length - 1
     }
     this.setData({
-      active: newIndex
+      active: newIndex,
     })
   },
   handlePrev() {
@@ -58,6 +63,11 @@ Page({
       active: this.data.active === 0 ? 0 : this.data.active - 1
     })
   },
+  onSetFinishNumber(e) {
+    this.setData({
+      finishNumber: e.detail,
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/writeReading/index.wxml

@@ -6,12 +6,22 @@
     bind:changeMeterAndIndex="changeMeterAndIndex" 
     active="{{active}}" 
     meterInfo="{{meterInfo}}"
+    finishNumber="{{finishNumber}}"
 />
-<meter-info meterInfo="{{meterInfo}}" />
+<meter-info 
+    meterInfo="{{meterInfo}}" 
+    routeId="{{routeId}}"     
+    disabled="{{meterList[active].status === 1}}" 
+/>
+
 <reading-info 
     meterInfo="{{meterInfo}}" 
     showLeft="{{active !== 0}}"  
     showRight="{{active < meterList.length - 1}}"    
     bind:prev="handlePrev"
     bind:next="handleNext"
+    routeId="{{routeId}}"
+    bind:finishNumber="onSetFinishNumber"
+    bind:onSubmit="onSubmit"
+    disabled="{{meterList[active].status === 1}}"
 />

project.private.config.json

@@ -23,10 +23,24 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/workBenchNew/components/workBenchReading/index",
+          "pathName": "pages/workBenchNew/components/workBenchReading/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/workBenchNew/index",
+          "pathName": "pages/workBenchNew/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/writeReading/index",
           "pathName": "pages/writeReading/index",
-          "query": "id=PR00117566262804481",
+          "query": "id=PR00118027286020097",
           "launchMode": "default",
           "scene": null
         },

service/public.js

@@ -22,6 +22,27 @@ export const uploadFile = (filePath) => {
     })
 }
 
+export const uploadOcrFile = (filePath) => {
+    const { api } = getConfigByEnv();
+    return new Promise((resolve, reject) => {
+        wx.uploadFile({
+            
+            filePath: filePath,
+            name: 'data',
+            url: `${api}/image/to/meter/reading`,
+            header: {
+                authorization: 'Bearer ' + wx.getStorageSync("token")
+            },
+            success: (res) => {
+                resolve(res?.data ? JSON.parse(res?.data) : res?.data);
+            },
+            fail: (err) => {
+                reject(err);
+            }
+        })
+    })
+}
+
 export const uploadPublicFile = (filePath) => {
     const { api } = getConfigByEnv();
     return new Promise((resolve, reject) => {

service/workBench.js

@@ -22,6 +22,31 @@ export const getMeterReadingRouteMeterDetail = async function(id) {
 }
 
 // 新建一条抄表记录
-export const createReading = async function(park, code, data) {
-  return await POST(`/reading/${park}/${code}`, data);
+export const createReading = async function(park, code, routeId, data) {
+  return await POST(`/reading/hand/${park}/${code}?parkRouteId=${routeId}`, data);
+}
+
+
+// 查询符合指定条件的抄表记录
+export const getReadingList = async function(park, keyword, page) {
+  return await GET(`/reading/${park}?keyword=${keyword}&page=${page}`,);
+}
+
+// 删除抄表记录
+export const deleteReading = async function(id, overall) {
+  return await DELETE(`/meter/delete/records/${id}`, { overall });
+}
+
+// 修改抄表记录
+export const updateReading = async function(park, code, read_at, data) {
+  return await PUT(`/reading/${park}/${code}/${read_at}`, data);
+}
+// 检查是否抄表完全
+export const checkReadingFinish = async function(id) {
+  return await GET(`/park/meter/${id}/route/status`,);
+}
+
+// 获取工作台首页
+export const getWorkBenchHome = async function() {
+  return await GET(`/workHome/mainPage`,);
 }

utils/request.js

@@ -44,7 +44,6 @@ const request = async function (options, config = {}) {
     const setCookie = response.header['set-cookie'] || response.header['Set-Cookie'];
     if (setCookie) {
       const cookieMap = {};
-  
       if (localCookieString) {
         const localCookies = localCookieString.split('; ');
         for (const localCookie of localCookies) {
@@ -93,7 +92,6 @@ const parseResponse = function (response, url) {
     alertError("服务错误")
     return
   }
-  console.log('url', url,'statusCode', statusCode,  'response.data', response?.data)
   if (code === 401) {
     const currentUrl = getPageUrl()
     
@@ -146,7 +144,6 @@ const CUD = async function (method, uri, data = null) {
     options.data = data;
   }
   const response = await request(options);
-  console.log("response---------",response)
   return parseResponse(response);
 };