工单详情增加部分字段,装表新增采集器，修改工单列表查询的问题

components/searchSelect/index.js

@@ -1,5 +1,5 @@
 import { getLoginParkList, getParkBuildingList } from "../../service/park"
-import { getParkSimpleMeterList, getParkBoxList, getCardList, getCollectionList, getInventoryMeter } from "../../service/meter"
+import { getParkSimpleMeterList, getParkBoxList, getCardList, getCollectionList, getInventoryMeter, getCollectorList } from "../../service/meter"
 import { alertInfo } from "../../utils/index";
 import request from "../../utils/request"
 import { payWays, feeType, meterType, noticeFlowType, noticeFlowStatus,
@@ -176,8 +176,23 @@ Component({
         case "collection":
           this.onSearchCollection();
           return;
+        case "collector":
+          this.onSearchCollector();
+          break;
       }
     },
+    async onSearchCollector() {
+      const { searchText = "", } = this.data;
+      const { code, message, data = [] } = await getCollectorList(searchText);
+      if (code !== OK) {
+        alertInfo(message)
+        return
+      }
+      this.setData({
+        columns: data?.map(item => `${item.collectorAddress}-${item.manufacturer}`),
+        list: data,
+      })
+    },
     async onSearchPark() {
       const { searchText = "" } = this.data;
       const { code, message, data: parks = [] } = await getLoginParkList({keyword: searchText});

pages/workBenchNew/components/installMeter/index.js

@@ -146,6 +146,27 @@ Page({
       collection: "C"
     })
   },
+  onBindCollector() {
+    const { park } = this.data;
+    if (!park) {
+      alertInfo("请先选择园区")
+      return;
+    }
+    this.setData({
+      show: true,
+      title: "采集器",
+      type: 'collector',
+    })
+  },
+  clearCollector() {
+    this.setData({
+      show: false,
+      title: "",
+      type: 'collector',
+      collector: null,
+      collectorName: null,
+    })
+  },
   uploadImage() {
     const that = this;
     wx.chooseMedia({
@@ -204,6 +225,8 @@ Page({
       flat: null,
       valley: null,
       area: null,
+      collector: null,
+      collectorName: null,
       collections: [],
     })
   },
@@ -258,6 +281,12 @@ Page({
           meterTypeName: data,
         });
         break;
+        case "collector":
+          this.setData({
+            collector: data?.id,
+            collectorName: `${data.collectorAddress}-${data.manufacturer}`,
+          });
+          break;
       case "meter":
         this.setData({
           meter: data.id,
@@ -403,7 +432,7 @@ Page({
       park, meter, address, building, meterBox, meterType,  
       ratio, area, card, collectionA, collectionB, collectionC,
       tenement, sharp, peak, flat, valley, overall, url, sn, 
-      collectionARatio, collectionBRatio, collectionCRatio
+      collectionARatio, collectionBRatio, collectionCRatio, collector,
     } = this.data;
     if (!park || !(meter || sn) || !address || meterType == null || !building || !meterBox || ratio == null) {
       alertInfo("请填写必填项后保存")
@@ -434,7 +463,7 @@ Page({
       flat: flat === "" ? null : flat, 
       valley: valley === "" ? null : valley, 
       overall: overall === "" ? null : overall, 
-      url, sn
+      url, sn, collector
     })
     if (code !== OK) {
       alertInfo(message)

pages/workBenchNew/components/installMeter/index.wxml

@@ -90,6 +90,14 @@
     allowClear="{{true}}"
     bind:clear="clearCard"
 />
+<searchSelectWrapper 
+    label="采集器" 
+    placeholder="请选择采集器绑定"
+    text="{{collectorName}}"
+    bind:search="onBindCollector"
+    allowClear="{{true}}"
+    bind:clear="clearCollector"
+/>
 <searchSelectWrapper 
     label="互感器A" 
     placeholder="请选择互感器绑定"

pages/workBenchTodoList/index.js

@@ -2,7 +2,7 @@
 import request from "../../utils/request"
 import { getWorkOrderList, doNoticeFlow } from "../../service/workBench"
 import { alertInfo, alertSuccess, loadingFunc } from "../../utils/index";
-import { noticeFlowType } from "../../utils/data"
+import { noticeFlowType as noticeFlowTypeList } from "../../utils/data"
 const { OK } = request
 Page({
 
@@ -12,7 +12,7 @@ Page({
   data: {
     page: 1,
     size: 20,
-    noticeFlowType,
+    noticeFlowTypeList,
     actionItems: [{
       name: '详情',
       value: 'detail'

pages/workBenchTodoList/index.wxml

@@ -53,7 +53,7 @@
                                     {{ item.time }}
                                 </view>
                                 <view class="th" style="flex: 0 0 150rpx;">
-                                    {{ noticeFlowType[item.types - 1] }}
+                                    {{ noticeFlowTypeList[item.types - 1] }}
                                 </view>
                           
                                 <view class="th" style="flex: 0 0 150rpx;">

pages/workOrderDetail/index.js

@@ -11,7 +11,12 @@ Page({
    * 页面的初始数据
    */
   data: {
-    detail: {}
+    detail: {},
+    header: [
+      // { key: 'address', title: '电表地址', renderBody: (item) => item.meter?.address },
+      { title: '操作人',renderBody: (item) => { return item.user_name } },
+      { title: '状态',renderBody: (item) => { return item.status === 0 ? "未确认" : "已确认" } },
+    ],
   },
 
   /**

pages/workOrderDetail/index.json

@@ -3,7 +3,8 @@
     "navigator": "/components/navigator/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-field": "@vant/weapp/field/index",
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "custom-table": "/components/table/table"
   },
   "navigationStyle": "custom"
 }

pages/workOrderDetail/index.wxml

@@ -36,6 +36,39 @@
             <view wx:else> - </view>
         </view>
     </van-field>
+    <van-field
+        value="{{ detail.created_at || '-'  }}"
+        label="发起时间"
+        readonly
+        title-width="132rpx"
+    />
+    <van-field
+        value="{{ detail.created_name || '-'  }}"
+        label="发起人"
+        readonly
+        title-width="132rpx"
+    />
+    <van-field
+        value="{{ detail.target.meter_data.meter_sn || '-'  }}"
+        label="电表编号"
+        readonly
+        title-width="132rpx"
+    />
+    <van-field
+        value="{{ detail.reason || '-'  }}"
+        label="批注"
+        readonly
+        title-width="132rpx"
+    />
+    <van-field
+        value="{{ detail.current_user_audit_status === 0 ? '未确认' : '已确认'  }}"
+        label="工单状态"
+        readonly
+        title-width="132rpx"
+    />
+    <view style="margin: 20rpx;">
+        <custom-table header="{{header}}" list="{{detail.notifier}}" />
+    </view>
     <view class="wrapper">
         <view class="operate">
         <view class="submit" wx:if="{{detail.current_user_audit_status === 0}}"> <van-button type="info" block bind:click="onSubmit"> 确认 </van-button> </view>

service/meter.js

@@ -79,3 +79,8 @@ export const installMeter = async function(data) {
 export const uninstallMeter = async function(data) {
   return await POST(`/flow/doMeterRemoveApproval`, data);
 }
+
+// 获取商户下的电表，后台
+export const getCollectorList = async function(keyword) {
+  return await GET(`/collector/list?collectorAddress=${replaceSpecialIcon(keyword)}`);
+}