工作台代码提交

app.json

@@ -39,6 +39,7 @@
     "pages/billMeterDetail/index",
     "pages/meterBalanceRecord/index",
     "pages/workBenchNew/components/workBenchMeter/index",
+    "pages/workBenchNew/components/workBenchMeterControl/index",
     "pages/workBenchNew/components/workBenchTenement/index",
     "pages/workBenchNew/components/workBenchApprove/index",
     "pages/workBenchNew/components/workBenchWxUser/index",
@@ -47,7 +48,8 @@
     "pages/workBenchNew/components/installMeter/index",
     "pages/workBenchNew/components/uninstallMeter/index",
     "pages/workBenchTodoList/index",
-    "pages/workBenchNew/components/kaihu/index"
+    "pages/workBenchNew/components/kaihu/index",
+    "pages/workOrderDetail/index"
   ],
   "subPackages": [
     {

components/searchSelect/index.js

@@ -2,7 +2,9 @@ import { getLoginParkList, getParkBuildingList } from "../../service/park"
 import { getParkSimpleMeterList, getParkBoxList, getCardList, getCollectionList, getInventoryMeter } from "../../service/meter"
 import { alertInfo } from "../../utils/index";
 import request from "../../utils/request"
-import { payWays, feeType, meterType } from "../../utils/data";
+import { payWays, feeType, meterType, noticeFlowType, noticeFlowStatus,
+  meterMode
+} from "../../utils/data";
 import { getTenementList, getWxTenementList } from "../../service/tenement";
 const { OK } = request;
 
@@ -23,6 +25,7 @@ Component({
   observers: {
     "show,type,filterBind": function(newShow, newType) {
       if (newShow && newType) { 
+        console.log("newShow",  newShow,"newType", newType)
         this.onSearch()
       }
     }
@@ -35,7 +38,10 @@ Component({
     searchText: "",
     payWays,
     feeType,
-    meterType
+    meterType,
+    noticeFlowType,
+    noticeFlowStatus,
+    meterMode,
   },
   lifetimes: {
     attached() {
@@ -76,6 +82,17 @@ Component({
       })
       this.triggerEvent("confirm", { data: item, type, index } );
     },
+    onMeterModeConfirm(event) {
+      const { index } = event.detail;
+      const { meterMode = [], type } = this.data;
+      const item = meterMode[index];
+      this.setData({
+        columns: [],
+        list: [],
+        searchText: ""
+      })
+      this.triggerEvent("confirm", { data: item, way: index, type } );
+    },
     onPayConfirm(event) {
       const { index } = event.detail;
       const { payWays = [], type } = this.data;
@@ -87,6 +104,29 @@ Component({
       })
       this.triggerEvent("confirm", { data: item, way: index, type } );
     },
+    onNoticeFlowTypeConfirm(event) {
+      const { index } = event.detail;
+      const { noticeFlowType = [], type } = this.data;
+      const item = noticeFlowType[index];
+      this.setData({
+        columns: [],
+        list: [],
+        searchText: ""
+      })
+      this.triggerEvent("confirm", { data: item, way: index + 1, type } );
+    },
+    onNoticeFlowStatusConfirm(event) {
+      const { index } = event.detail;
+      const { noticeFlowStatus = [], type } = this.data;
+      const item = noticeFlowStatus[index];
+      this.setData({
+        columns: [],
+        list: [],
+        searchText: ""
+      })
+      console.log("{ data: item, way: index + 1, type }", { data: item, way: index + 1, type })
+      this.triggerEvent("confirm", { data: item, way: index + 1, type } );
+    },
     onFeeTypeConfirm(event) {
       const { index } = event.detail;
       const { feeType = [], type } = this.data;

components/searchSelect/index.wxml

@@ -36,6 +36,36 @@
             bind:confirm="onMeterTypeConfirm"
         /> 
     </view>
+    <view wx:elif="{{type === 'noticeFlowType'}}">
+        <van-picker 
+            custom-style="width: 100%;" 
+            columns="{{ noticeFlowType }}" 
+            title="{{title}}"
+            show-toolbar="{{true}}"
+            bind:cancel="onCancel"
+            bind:confirm="onNoticeFlowTypeConfirm"
+        /> 
+    </view>
+    <view wx:elif="{{type === 'meterMode'}}">
+        <van-picker 
+            custom-style="width: 100%;" 
+            columns="{{ meterMode }}" 
+            title="{{title}}"
+            show-toolbar="{{true}}"
+            bind:cancel="onCancel"
+            bind:confirm="onMeterModeConfirm"
+        /> 
+    </view>
+    <view wx:elif="{{type === 'noticeFlowStatus'}}">
+        <van-picker 
+            custom-style="width: 100%;" 
+            columns="{{ noticeFlowStatus }}" 
+            title="{{title}}"
+            show-toolbar="{{true}}"
+            bind:cancel="onCancel"
+            bind:confirm="onNoticeFlowStatusConfirm"
+        /> 
+    </view>
     <view wx:elif="{{type !== 'pay'}}">
         <van-search
             value="{{ value }}"

components/searchSelectWrapper/index.wxml

@@ -4,6 +4,7 @@
     <view class="content" bind:tap="clickTime" bind:tap="onSearch">
         <view class="text" wx:if="{{!text}}" style="color: #ccc;"> {{placeholder}} </view>
         <view class="text" wx:else> {{text}} </view>
+        <!-- <van-icon name="close" custom-style="margin-right: 16rpx" /> -->
         <van-icon name="arrow-down" />
     </view>
 </view>

components/searchSelectWrapper/index.wxss

@@ -15,6 +15,7 @@
     border-radius: 12rpx;
     border: 1rpx solid #ccc;
     background-color: #fff;
+    position: relative;
 }
 
 .inputContent {
@@ -26,6 +27,7 @@
     border-radius: 12rpx;
     border: 1rpx solid #ccc;
     background-color: #fff;
+    position: relative;
 }
   
 .text {
@@ -39,4 +41,5 @@
 .required {
     color: rgb(209, 83, 25);
     font-size: 30rpx;
-}
+}
+

pages/workBenchNew/components/kaihu/index.js

@@ -1,4 +1,9 @@
 // pages/workBenchNew/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;
 Page({
 
   /**
@@ -7,7 +12,85 @@ Page({
   data: {
 
   },
-
+  onParkFocus(e) {
+    this.setData({
+      show: true,
+      title: "园区",
+      type: 'park'
+    })
+  },
+  onBuildingFocus() {
+    const { park } = this.data;
+    if (!park) {
+      alertInfo("请先选择园区")
+      return;
+    }
+    this.setData({
+      show: true,
+      title: "建筑",
+      type: 'building'
+    })
+  },
+  onChange(e) {
+    const { name } = e.currentTarget.dataset;
+    this.setData({
+      [name]: e.detail
+    })
+  },
+  onFeeTypeFocus() {
+    this.setData({
+      show: true,
+      title: "收费类型",
+      type: 'feeType'
+    })
+  },
+  onCancel() {
+    this.setData({ show: false })
+  },
+  async onSubmit() {
+    const { name, shortName, address, contact, 
+      phone, building, feeType, park, editType, id, parkName,
+      
+    } = this.data;
+    const { code, message } = await createBackTenement(park, { name, shortName, address, contact, phone, building, feeType })
+    if (code !== OK) {
+      alertInfo(message)
+      return
+    }
+    alertSuccess("开户成功")
+    // wx.navigateBack()
+    wx.redirectTo({
+      url: `/pages/workBenchNew/components/workBenchTenement/index?park=${park}&parkName=${parkName}&name=${name}`,
+    })
+  },
+  handleBack() {
+    wx.navigateBack()
+  },
+  onConfirm(e) {
+    const { type, data, way } = e.detail;
+    switch(type) {
+      case "park":
+        this.setData({
+          park: data.id,
+          parkName: data.name,
+          show: false,
+        })
+        return;
+      case "building":
+        this.setData({
+          building: data.id,
+          buildingName: data.name,
+          show: false,
+        })
+        return;
+      case "feeType":
+        this.setData({
+          feeTypeName: data,
+          feeType: way,
+          show: false,
+        })
+    }
+  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/workBenchNew/components/kaihu/index.wxml

@@ -1,6 +1,19 @@
 <!--pages/workBenchNew/components/kaihu/index.wxml-->
 <navigator canBack="{{true}}" title="开户" />
 <view class="modalContentWrapper">
+    <van-field
+        value="{{ parkName }}"
+        placeholder="请选择园区"
+        label="园区"
+        use-button-slot
+        readonly
+        title-width="120rpx"
+        required
+    >
+        <van-button slot="button" size="small" type="info" bind:click="onParkFocus">
+            选择
+        </van-button>
+    </van-field>
         <van-field
             value="{{name}}"
             data-name="name"
@@ -80,4 +93,19 @@
                 选择
             </van-button>
         </van-field>
-    </view>
+    </view>
+    <view class="operate">
+        <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="onSubmit" data-status="0"> 保存 </van-button>
+            <van-button size="small" bind:click="handleBack" data-status="1"> 返回 </van-button>
+        </view>
+    </view>
+
+    <search-select 
+        show="{{show}}" 
+        title="{{title}}" 
+        type="{{type}}" 
+        park="{{park}}"
+        bindconfirm="onConfirm"
+        bindcancel="onCancel"
+    />

pages/workBenchNew/components/uninstallMeter/index.js

@@ -1,6 +1,11 @@
 // pages/workBenchNew/components/uninstallMeter/index.js
+import { uninstallMeter } from "../../../../service/meter";
 import dayjs from "../../../../utils/dayjs"
-import { alertInfo, } from "../../../../utils/index"
+import request from "../../../../utils/request"
+import { alertInfo, alertSuccess, } from "../../../../utils/index"
+
+const { OK } = request;
+
 Page({
 
   /**
@@ -66,6 +71,7 @@ Page({
         this.setData({
           meter: data.id,
           meterName: data.address,
+          meterInfo: data,
         });
         break;
       case "card":
@@ -106,6 +112,59 @@ Page({
       type: "",
     })
   },
+  async onSubmit() {
+    const { meter, } = this.data;
+    if (!meter) {
+      alertInfo("请选择表号")
+      return;
+    }
+    const { code, message } = await uninstallMeter(meter)
+    if (code !== OK) {
+      alertInfo(message)
+      return
+    }
+    alertSuccess("拆除成功")
+    setTimeout(() => {
+      wx.navigateTo({
+        url: '/pages/workBenchTodoList/index',
+      })
+    }, 300)
+  },
+  uploadImage() {
+    const that = this;
+    wx.chooseMedia({
+      count: 1,
+      mediaType: ['image'],
+      sourceType: ['album', 'camera'],
+      success: async function(res) {
+        console.log("res", res)
+        const path = res.tempFiles?.[0]?.tempFilePath.toLowerCase()
+        if (!/(\.jpg|\.png|\.jpeg)$/.test(path)) {
+          wx.showToast({
+            title: '请上传jpg、png或jpeg格式的图片',
+            icon: 'none',
+          });
+          return;
+        }
+        var tempFilePaths = path;
+        loadingFunc(async () => {
+          const { code, message, url } = await uploadInstallMeter(tempFilePaths)
+          if (code !== OK) {
+            alertError(message)
+            return
+          }
+          that.setData({
+            url: url
+          })
+        }) 
+      }
+    })
+  },
+  clearImage() {
+    this.setData({
+      url: ""
+    })
+  },
   goback() {
     wx.navigateBack()
   },

pages/workBenchNew/components/uninstallMeter/index.wxml

@@ -39,11 +39,19 @@
     type=""
     hideBorder="{{true}}"
 >
-    <van-button wx:if="{{!image}}" type="info" size="small"> 上传 </van-button>
+    <view style="display: flex; align-items: center;">
+        <view>
+            <van-button type="info" size="small" bind:click="uploadImage" custom-style="margin-right: 20rpx;"> 上传 </van-button>
+            <view style="margin-top: 20rpx" wx:if="{{!!url}}">
+                <van-button type="danger" size="small" bind:click="clearImage" custom-style="margin-right: 20rpx;"> 清除 </van-button>
+            </view>
+        </view>
+        <van-image wx:if="{{!!url}}" width="100" height="100" src="{{url}}" custom-style="margin-left: 20rpx;" />
+    </view>
 
 </searchSelectWrapper>
 <view class="operate">
-    <view class="submit"> <van-button type="info" block> 提交 </van-button> </view>
+    <view class="submit"> <van-button type="info" block bind:click="onSubmit"> 提交 </van-button> </view>
     <view class="cancel"> <van-button block bind:tap="goback"> 返回 </van-button> </view>
 </view>
 </view>

pages/workBenchNew/components/workBenchMeterControl/index.js

@@ -0,0 +1,276 @@
+// 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'
+    })
+  },
+  onModeFocus(e) {
+    this.setData({
+      show: true,
+      title: "强控类型",
+      type: 'meterMode'
+    })
+  },
+  onMeterFocus(e) {
+    const { park } = this.data;
+    if (!park) {
+      alertInfo("请先选择园区")
+      return;
+    }
+    this.setData({
+      show: true,
+      title: "电表",
+      type: 'meter'
+    })
+  },
+  onConfirm(e) {
+    const { data, type, way } = e.detail;
+    const that = this;
+    switch(type) {
+      case "park":
+        this.setData({
+          parkName: data.name,
+          park: data.id,
+        })
+        break;
+      case "meterMode":
+        this.setData({
+          modeName: data,
+          mode: way,
+        })
+        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 })
+  },
+  changeDays(e) {
+    this.setData({
+      days: e.detail,
+    })
+  },
+  uploadImage() {
+    const that = this;
+    wx.chooseMedia({
+      count: 1,
+      mediaType: ['image'],
+      sourceType: ['album', 'camera'],
+      success: async function(res) {
+        console.log("res", res)
+        const path = res.tempFiles?.[0]?.tempFilePath.toLowerCase()
+        if (!/(\.jpg|\.png|\.jpeg)$/.test(path)) {
+          wx.showToast({
+            title: '请上传jpg、png或jpeg格式的图片',
+            icon: 'none',
+          });
+          return;
+        }
+        var tempFilePaths = path;
+        loadingFunc(async () => {
+          const { code, message, url } = await uploadInstallMeter(tempFilePaths)
+          if (code !== OK) {
+            alertError(message)
+            return
+          }
+          that.setData({
+            url: url
+          })
+        }) 
+      }
+    })
+  },
+  clearImage() {
+    this.setData({
+      url: ""
+    })
+  },
+  changeReason(e) {
+    this.setData({
+      reason: 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/workBenchMeterControl/index.json

@@ -0,0 +1,20 @@
+{
+  "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",
+    "van-popup": "@vant/weapp/popup/index"
+  },
+  "navigationStyle": "custom"
+}

pages/workBenchNew/components/workBenchMeterControl/index.wxml

@@ -0,0 +1,163 @@
+<!--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="display: flex;align-items: center;">
+                                        <view style="text-align: center; margin-right: 24rpx;">在线</view> 
+                                        <view wx:if="{{item.mode === 0}}"> 预付费 </view>
+                                        <view wx:if="{{item.mode === 1}}"> 强控 </view>
+                                        <view wx:if="{{item.mode === 2}}"> 临时强控 </view>
+                                    </view>
+                                </van-col>
+                                <van-col span="8" wx:else>
+                                    <view style="display: flex;align-items: center; margin-right: 24rpx;">
+                                        <view style="text-align: center;">失联</view> 
+                                        <view wx:if="{{item.mode === 0}}"> 预付费 </view>
+                                        <view wx:if="{{item.mode === 1}}"> 强控 </view>
+                                        <view wx:if="{{item.mode === 2}}"> 临时强控 </view>
+                                    </view>
+                                
+                                </van-col>
+                            </van-row>
+                        </view>
+                    </van-col>
+                </van-row>
+            </view>
+        </view>
+        <view class="wrapper">
+            <searchSelectWrapper 
+                label="强控类型" 
+                placeholder="请选择强控类型"
+                text="{{modeName}}"
+                bind:search="onModeFocus"
+                required="{{true}}"
+            />
+            <searchSelectWrapper 
+                wx:if="{{mode === 2}}"
+                label="天数" 
+                placeholder="请输入天数"
+                text="{{days}}"
+                type="input"
+                bind:changeText="changeDays"
+            />
+            <searchSelectWrapper 
+                label="原因" 
+                placeholder="请输入原因"
+                text="{{reason}}"
+                type="input"
+                bind:changeText="changeReason"
+            />
+            <searchSelectWrapper 
+                label="图片" 
+                useSlot="{{true}}"
+                type=""
+                hideBorder="{{true}}"
+            >
+                <view style="display: flex; align-items: center;">
+                    <view>
+                        <van-button type="info" size="small" bind:click="uploadImage" custom-style="margin-right: 20rpx;"> 上传 </van-button>
+                        <view style="margin-top: 20rpx" wx:if="{{!!url}}">
+                            <van-button type="danger" size="small" bind:click="clearImage" custom-style="margin-right: 20rpx;"> 清除 </van-button>
+                        </view>
+                    </view>
+                    <van-image wx:if="{{!!url}}" width="100" height="100" src="{{url}}" custom-style="margin-left: 20rpx;" />
+                </view>
+
+            </searchSelectWrapper>
+            <view class="operate">
+                <view class="submit"> <van-button type="info" block bind:click="handleSubmit"> 提交 </van-button> </view>
+                <view class="cancel"> <van-button block bind:tap="goback"> 返回 </van-button> </view>
+            </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/workBenchMeterControl/index.wxss

@@ -0,0 +1,78 @@
+/* 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;
+  }
+
+
+  .operate {
+    display: flex;
+    padding-top: 24rpx;
+    padding-bottom: 36rpx;
+}
+
+.submit, .cancel {
+    flex: 1;
+}
+
+.submit {
+    margin-right: 30rpx;
+}

pages/workBenchNew/components/workBenchTenement/index.js

@@ -20,7 +20,17 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    console.log("options", options)
+    const { park, parkName, name, id } = options
+    this.setData({
+      park,
+      parkName,
+      tenementName: name,
+      tenement: id
+    })
+    if (id) {
+      this.getTenementInfo();
+    }
   },
   onParkFocus(e) {
     this.setData({

pages/workBenchNew/index.js

@@ -78,7 +78,17 @@ Page({
   },
   jumpToKaihu() {
     wx.navigateTo({
-      url: 'pages/workBenchNew/components/kaihu/index',
+      url: '/pages/workBenchNew/components/kaihu/index',
+    })
+  },
+  jumpToMeterControl() {
+    wx.navigateTo({
+      url: '/pages/workBenchNew/components/workBenchMeterControl/index',
+    })
+  },
+  workOrder() {
+    wx.navigateTo({
+      url: '/pages/workBenchTodoList/index',
     })
   },
   /**

pages/workBenchNew/index.wxml

@@ -114,10 +114,13 @@
                     <operate-button text="开户" bind:click="jumpToKaihu" />
                 </van-col>
                 <van-col span="8">
-                    <operate-button text="销户" />
+                    <operate-button text="销户" bind:click="jumpToTenement" />
                 </van-col>
                 <van-col span="8">
-                    <operate-button text="强控" />
+                    <operate-button text="强控" bind:click="jumpToMeterControl" />
+                </van-col>
+                <van-col span="8">
+                    <operate-button text="工单" bind:click="workOrder" />
                 </van-col>
             </van-row>
      

pages/workBenchTodoList/index.js

@@ -1,18 +1,178 @@
 // pages/workBenchTodoList/index.js
+import request from "../../utils/request"
+import { getWorkOrderList } from "../../service/workBench"
+import { alertInfo, loadingFunc } from "../../utils/index";
+import { noticeFlowType } from "../../utils/data"
+const { OK } = request
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    page: 1,
+    size: 20,
+    noticeFlowType,
+    actionItems: [{
+      name: '确认',
+      value: 'status'
+  }],
   },
+  showActionMenu(e) {
+    console.log("e", 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(id);
+  }
+},
+  jumpToDetail(id) {
+    
+    // wx.navigateTo({
+    //     url: '/pages/workOrderDetail/index?id=' + id,
+    // })
+  },
+  onConfirm(e) {
+    const { type, data = {}, way } = e.detail;
+    const that = this;
+    switch(type) {
+      case "park":
+        this.setData({
+          park: data.id,
+          parkName: data.name,
+        })
+        break;
+      case "tenement":
+        this.setData({
+          tenement: data.id,
+          tenementName: data.name,
+        })
+        break;
+      
+      case "noticeFlowType":
+        this.setData({
+          noticeFlowType: data,
+          noticeFlowTypeName: data,
+          page: 1,
+        }, () => {
+          loadingFunc(async () => {
+            await that.init()
+          })
+        });
+        break;
+      case "noticeFlowStatus":
+        this.setData({
+          noticeFlowStatus: data,
+          noticeFlowStatusName: data,
+          page: 1,
+        }, () => {
+          loadingFunc(async () => {
+            await that.init()
+          })
+        });
+        break;
+      case "meter":
+        this.setData({
+          meter: data.id,
+          meterName: data.address,
+          meterInfo: data,
+          page: 1,
+        }, () => {
+          loadingFunc(async () => {
+            await that.init()
+          })
+        });
+        break;
+    }
+    this.onCancel();
+  },
+  onCancel() {
+    this.setData({
+      show: false,
+      title: "",
+      type: "",
+    })
+  },
+  onParkFocus(e) {
+    this.setData({
+      show: true,
+      title: "园区",
+      type: 'park'
+    })
+  },
+  onNoticeFlowFocus() {
+    this.setData({
+      show: true,
+      title: "类型",
+      type: 'noticeFlowType'
+    })
+  },
+  onNoticeFlowStatusFocus() {
+    this.setData({
+      show: true,
+      title: "确认状态",
+      type: 'noticeFlowStatus'
+    })
+  },
+  onMeterFocus(e) {
+    const { park } = this.data;
+    if (!park) {
+      alertInfo("请先选择园区")
+      return;
+    }
+    this.setData({
+      show: true,
+      title: "电表",
+      type: 'meter'
+    })
+  },
+  onChangePage(e) {
+    const that = this;
+    this.setData({
+      page: e.detail.currentIndex,
+    }, () => {
+      loadingFunc(async () => {
+        await that.init()
+      })
+    })
+    console.log("e", e)
+  },
+  async init() {
+    const { page, size, park, tenement, meter, type, time, status } = this.data;
+    const { code, message, data, total } = await getWorkOrderList({ page, size, park, tenement, meter, type, time, status })
+    if (code !== OK) {
+      alertInfo(message)
+      return;
+    }
+    this.setData({
+      list: data?.map(item => {
+        item.time = item?.created_at?.slice(0, 10)
+        item.address = item?.target?.meter_data?.address;
+        return item;
+      }),
+      totalPage: Math.ceil(total / size),
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    loadingFunc(async () => {
+      await this.init()
+    })
   },
 
   /**

pages/workBenchTodoList/index.json

@@ -7,7 +7,17 @@
     "search-select": "/components/searchSelect/index",
     "van-field": "@vant/weapp/field/index",
     "van-button": "@vant/weapp/button/index",
-    "searchSelectWrapper": "/components/searchSelectWrapper/index"
+    "searchSelectWrapper": "/components/searchSelectWrapper/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-icon": "@vant/weapp/icon/index",
+    "van-action-sheet": "@vant/weapp/action-sheet/index"  
+  
   },
   "navigationStyle": "custom"
 }

pages/workBenchTodoList/index.wxml

@@ -1,12 +1,99 @@
 <!--pages/workBenchTodoList/index.wxml-->
 <navigator canBack="{{true}}" title="工单列表" />
 <view class="wrapper">
-    <van-row gutter="20">
+    <searchSelectWrapper 
-        <van-col span="12">
+        label="选择园区" 
-            1
+        placeholder="请选择园区"
-        </van-col>
+        text="{{parkName}}"
-        <van-col span="12">
+        bind:search="onParkFocus"
-        2
+    />
-    </van-col>
+
-    </van-row>
+    <searchSelectWrapper 
-</view>
+        label="选择电表" 
+        placeholder="请选择电表"
+        text="{{meterName}}"
+        bind:search="onMeterFocus"
+    />
+    <searchSelectWrapper 
+        label="流程类型" 
+        placeholder="请选择流程类型"
+        text="{{noticeFlowTypeName}}"
+        bind:search="onNoticeFlowFocus"
+    />
+    <searchSelectWrapper 
+        label="确认状态" 
+        placeholder="请选择确认状态"
+        text="{{noticeFlowStatusName}}"
+        bind:search="onNoticeFlowStatusFocus"
+    />
+    <view>
+    <view wx:if="{{list.length}}">
+        <view class="tableWrapper">
+            <view class="table">
+                <view class="thead">
+                    <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;">电表地址</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 130rpx;">
+                                    {{ item.time }}
+                                </view>
+                                <view class="th" style="flex: 0 0 150rpx;">
+                                    {{ noticeFlowType[item.types - 1] }}
+                                </view>
+                          
+                                <view class="th" style="flex: 0 0 150rpx;">
+                                    {{ item.address }}
+                                </view>
+                                <view class="th" style="flex: 0 0 150rpx;">
+                                    {{ item.flow_status === 1 ? "处理中" : "已确认" }}
+                                </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-data="{{index}}" 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 
+                                        class="primaryTextBtn" 
+                                        wx:if="{{item.flow_status === 1}}"
+                                        data-id="{{item.id}}"    
+                                    > 确认 </view>
+                                </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"
+    wx:if="{{show}}"
+/>
+</view>

pages/workBenchTodoList/index.wxss

@@ -1 +1,71 @@
-/* pages/workBenchTodoList/index.wxss */
+/* pages/workBenchTodoList/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/workOrderDetail/index.js

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

pages/workOrderDetail/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/workOrderDetail/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/workOrderDetail/index.wxml-->
+<text>pages/workOrderDetail/index.wxml</text>

pages/workOrderDetail/index.wxss

@@ -0,0 +1 @@
+/* pages/workOrderDetail/index.wxss */

service/meter.js

@@ -67,4 +67,9 @@ export const getInventoryMeter = async function({park = "", keyword = "", page =
 // 新装电表
 export const installMeter = async function(data) {
   return await POST(`/wx/workBench/installMeter`, data);
+}
+
+// 拆表
+export const uninstallMeter = async function(sn) {
+  return await DELETE(`/flow/doMeterRemoveApproval?sn=${sn}`);
 }

service/workBench.js

@@ -49,4 +49,11 @@ export const checkReadingFinish = async function(id) {
 // 获取工作台首页
 export const getWorkBenchHome = async function() {
   return await GET(`/workHome/mainPage`,);
+}
+
+// 获取工单列表
+export const getWorkOrderList = async function({
+  page, size, park = "", meter = "", tenement = "", status = "", type = "", time = ""
+}) {
+  return await GET(`/noticeFlow/getDisposeList?page=${page}&size=${size}&park=${park}&meter=${meter}&tenement=${tenement}&status=${status}&type=${type}&time=${time}`,);
 }

utils/data.js

@@ -11,4 +11,9 @@ export const getRechargeOperateWay = (num) => {
 
 export const feeType = ['华昌宝能收费', "物业代收1", "物业代收2", "物业代收线损"]
 
-export const meterType = ['商户电表', '园区电表', '公摊电表']
+export const meterType = ['商户电表', '园区电表', '公摊电表']
+
+export const noticeFlowType = ['拆表', '装表', '开户', "解绑", "绑定"]
+export const noticeFlowStatus = ["已确认", "待确认"]
+
+export const meterMode = ["预付费", "强控", "临时强控"]