diff --git a/pages/workBenchTodoList/index.js b/pages/workBenchTodoList/index.js index ecd4a4c..801652b 100644 --- a/pages/workBenchTodoList/index.js +++ b/pages/workBenchTodoList/index.js @@ -36,7 +36,7 @@ Page({ }, onClearPark() { const that = this; - this.setData({ park: null, parkName: null, meter: null, meterName: null }, () => { + this.setData({ park: "", parkName: "", meter: "", meterName: "" }, () => { loadingFunc(async () => { await that.init() }) @@ -44,7 +44,7 @@ onClearPark() { }, onClearMeter() { const that = this; - this.setData({ meter: null, meterName: null }, () => { + this.setData({ meter: "", meterName: "" }, () => { loadingFunc(async () => { await that.init() }) @@ -52,7 +52,7 @@ onClearMeter() { }, onClearType() { const that = this; - this.setData({ noticeFlowType: null, noticeFlowTypeName: null }, () => { + this.setData({ noticeFlowType: "", noticeFlowTypeName: "" }, () => { loadingFunc(async () => { await that.init() }) @@ -60,7 +60,7 @@ onClearType() { }, onClearStatus() { const that = this; - this.setData({ noticeFlowStatus: null, noticeFlowStatusName: null }, () => { + this.setData({ noticeFlowStatus: "", noticeFlowStatusName: "" }, () => { loadingFunc(async () => { await that.init() }) @@ -68,7 +68,7 @@ onClearStatus() { }, hideActionMenu() { this.setData({ - currentActionSheet: null + currentActionSheet: "" }); }, onMenuSelect(e) { @@ -114,8 +114,8 @@ handleDoNoticeBtn(e) { switch(type) { case "park": this.setData({ - park: data.id, - parkName: data.name, + park: data?.id, + parkName: data?.name, }) break; case "tenement": @@ -149,8 +149,8 @@ handleDoNoticeBtn(e) { break; case "workOrderMeter": this.setData({ - meter: data.meter_id, - meterName: data.address, + meter: data?.meter_id, + meterName: data?.address, meterInfo: data, page: 1, }, () => { @@ -213,7 +213,8 @@ handleDoNoticeBtn(e) { }) }, async init() { - const { page, size, park, tenement, meter, noticeFlowType, noticeFlowStatus, time } = this.data; + const { page, size, park, tenement = "", meter = "", noticeFlowType, noticeFlowStatus, time } = this.data; + const { code, message, data, total } = await getWorkOrderList({ page, size, park, tenement, meter, type: noticeFlowType, time, status: noticeFlowStatus }) if (code !== OK) { alertInfo(message)