From 1a6071194aa701775e92bddd1fbb5f88e93999ee Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Wed, 12 Nov 2025 18:14:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/workBenchTodoList/index.js | 14 ++++++-- pages/workBenchTodoList/index.json | 2 +- pages/workOrderDetail/index.js | 52 +++++++++++++++++++++++++-- pages/workOrderDetail/index.json | 7 +++- pages/workOrderDetail/index.wxml | 58 +++++++++++++++++++++++++++++- pages/workOrderDetail/index.wxss | 17 ++++++++- project.private.config.json | 7 ++++ service/workBench.js | 12 ++++++- 8 files changed, 159 insertions(+), 10 deletions(-) diff --git a/pages/workBenchTodoList/index.js b/pages/workBenchTodoList/index.js index a09da8c..b951c31 100644 --- a/pages/workBenchTodoList/index.js +++ b/pages/workBenchTodoList/index.js @@ -1,7 +1,7 @@ // pages/workBenchTodoList/index.js import request from "../../utils/request" -import { getWorkOrderList } from "../../service/workBench" -import { alertInfo, loadingFunc } from "../../utils/index"; +import { getWorkOrderList, doNoticeFlow } from "../../service/workBench" +import { alertInfo, alertSuccess, loadingFunc } from "../../utils/index"; import { noticeFlowType } from "../../utils/data" const { OK } = request Page({ @@ -40,9 +40,19 @@ onMenuSelect(e) { this.jumpToDetail(id); break; case "ok": + this.handleDoNotice(id); break; } }, + async handleDoNotice(id) { + const { code, message } = await doNoticeFlow(id) + if (code !== OK) { + alertInfo(message) + return + } + alertSuccess("确认成功") + this.init(); + }, jumpToDetail(id) { // wx.navigateTo({ diff --git a/pages/workBenchTodoList/index.json b/pages/workBenchTodoList/index.json index ede92dd..8705131 100644 --- a/pages/workBenchTodoList/index.json +++ b/pages/workBenchTodoList/index.json @@ -1,11 +1,11 @@ { "usingComponents": { "navigator": "/components/navigator/index", + "van-field": "@vant/weapp/field/index", "van-popup": "@vant/weapp/popup/index", "van-row": "@vant/weapp/row/index", "van-col": "@vant/weapp/col/index", "search-select": "/components/searchSelect/index", - "van-field": "@vant/weapp/field/index", "van-button": "@vant/weapp/button/index", "searchSelectWrapper": "/components/searchSelectWrapper/index", "van-empty": "@vant/weapp/empty/index", diff --git a/pages/workOrderDetail/index.js b/pages/workOrderDetail/index.js index 9b339ba..646709d 100644 --- a/pages/workOrderDetail/index.js +++ b/pages/workOrderDetail/index.js @@ -1,3 +1,9 @@ +import { loadingFunc, alertSuccess, alertInfo } from "../../utils/index"; +import request from "../../utils/request" +import { getNoticeFlowDetail, doNoticeFlow } from "../../service/workBench" + +const { OK } = request; + // pages/workOrderDetail/index.js Page({ @@ -5,16 +11,56 @@ Page({ * 页面的初始数据 */ data: { - + detail: {} }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - + const { id } = options; + const that = this; + loadingFunc(async () => { + that.getDetail(id) + }) + }, + showImage() { + this.setData({ + imageShow: true + }) + }, + onClose() { + this.setData({ + imageShow: false + }) + }, + goback() { + wx.navigateBack(); + }, + async onSubmit() { + const {detail} = this.data; + const {id} = detail; + const { code, message } = await doNoticeFlow(id) + if (code !== OK) { + alertInfo(message) + return + } + alertSuccess("确认成功") + const that = this; + loadingFunc(async () => { + that.getDetail(id) + }) + }, + async getDetail(id) { + const { code, data ,message } = await getNoticeFlowDetail(id) + if (code !== OK) { + alertInfo(message) + return; + } + this.setData({ + detail: data + }) }, - /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/workOrderDetail/index.json b/pages/workOrderDetail/index.json index 8835af0..357ff18 100644 --- a/pages/workOrderDetail/index.json +++ b/pages/workOrderDetail/index.json @@ -1,3 +1,8 @@ { - "usingComponents": {} + "usingComponents": { + "navigator": "/components/navigator/index", + "van-popup": "@vant/weapp/popup/index", + "van-field": "@vant/weapp/field/index" + }, + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/workOrderDetail/index.wxml b/pages/workOrderDetail/index.wxml index 15d3210..26e571b 100644 --- a/pages/workOrderDetail/index.wxml +++ b/pages/workOrderDetail/index.wxml @@ -1,2 +1,58 @@ -pages/workOrderDetail/index.wxml \ No newline at end of file + + + + + + + + + + + + - + + + + 提交 + 返回 + + + + + + + \ No newline at end of file diff --git a/pages/workOrderDetail/index.wxss b/pages/workOrderDetail/index.wxss index d1b82a2..112aa5a 100644 --- a/pages/workOrderDetail/index.wxss +++ b/pages/workOrderDetail/index.wxss @@ -1 +1,16 @@ -/* pages/workOrderDetail/index.wxss */ \ No newline at end of file +/* pages/workOrderDetail/index.wxss */ + + +.operate { + display: flex; + padding-top: 24rpx; + padding-bottom: 36rpx; +} + +.submit, .cancel { + flex: 1; +} + +.submit { + margin-right: 30rpx; +} \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index 422eecd..1069557 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -23,6 +23,13 @@ "condition": { "miniprogram": { "list": [ + { + "name": "pages/workOrderDetail/index", + "pathName": "pages/workOrderDetail/index", + "query": "id=NM00123091982548993", + "launchMode": "default", + "scene": null + }, { "name": "pages/workBenchTodoList/index", "pathName": "pages/workBenchTodoList/index", diff --git a/service/workBench.js b/service/workBench.js index 61f0169..a616200 100644 --- a/service/workBench.js +++ b/service/workBench.js @@ -56,4 +56,14 @@ 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}`,); -} \ No newline at end of file +} + +// 确认当前流程 +export const doNoticeFlow = async function(id) { + return await PUT(`/noticeFlow/${id}/meter/dispose`,); +} + +// 确认当前流程 +export const getNoticeFlowDetail = async function(id) { + return await GET(`/noticeFlow/${id}/detail`,); +}