强控和装表字段调整

components/searchSelect/index.js

@@ -124,7 +124,6 @@ Component({
         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) {
@@ -216,7 +215,7 @@ Component({
     },
     async onSearchInventoryMeter() {
       const { searchText = "", park, filterBind } = this.data;
-      const { code, message, data: parks = [] } = await getInventoryMeter({keyword: searchText, park, isNeedBind: !filterBind});
+      const { code, message, data: parks = [] } = await getInventoryMeter({keyword: searchText, park, isNeedBind: !filterBind, a : 1});
       if (code !== OK) {
         alertInfo(message)
         return

pages/workBenchNew/components/workBenchMeterControl/index.js

@@ -147,6 +147,9 @@ Page({
       }
     })
   },
+  goback() {
+    wx.navigateBack();
+  },
   clearImage() {
     this.setData({
       url: ""

pages/workBenchTodoList/index.js

@@ -64,7 +64,7 @@ onMenuSelect(e) {
       
       case "noticeFlowType":
         this.setData({
-          noticeFlowType: data,
+          noticeFlowType: way,
           noticeFlowTypeName: data,
           page: 1,
         }, () => {
@@ -75,7 +75,7 @@ onMenuSelect(e) {
         break;
       case "noticeFlowStatus":
         this.setData({
-          noticeFlowStatus: data,
+          noticeFlowStatus: way,
           noticeFlowStatusName: data,
           page: 1,
         }, () => {

service/meter.js

@@ -66,8 +66,8 @@ export const getCollectionList = async function({park = "", keyword = "", page =
 
 
 // 获取库存电表列表
-export const getInventoryMeter = async function({park = "", keyword = "", page = 1}) {
-  return await GET(`/electricity/list?page=${page}&park=${park}&keyword=${replaceSpecialIcon(keyword)}`);
+export const getInventoryMeter = async function({park = "", keyword = "", page = 1, status = 1}) {
+  return await GET(`/electricity/list?page=${page}&park=${park}&keyword=${replaceSpecialIcon(keyword)}&status=${status}`);
 }
 
 // 新装电表