From 090b6b2c3444fac879ebf028d11e5b7419f033ee Mon Sep 17 00:00:00 2001 From: SelfRidicule Date: Tue, 20 Aug 2024 09:21:52 +0800 Subject: [PATCH] 1 --- miniprogram/api/repair/repair.js | 108 ++++++++++++------ miniprogram/app.js | 12 +- .../pages/reportRepair/query/record/record.js | 36 +++++- .../reportRepair/query/record/record.wxml | 25 ++++ 4 files changed, 140 insertions(+), 41 deletions(-) diff --git a/miniprogram/api/repair/repair.js b/miniprogram/api/repair/repair.js index 68b209e..dd4e393 100644 --- a/miniprogram/api/repair/repair.js +++ b/miniprogram/api/repair/repair.js @@ -46,13 +46,19 @@ export function repairSaveRq(data) { }); } -// * 工单列表 -// * menu:1.保修查询，3派单入口，5维修入口, 7 管理员 - -// * 报修查询：全部、处理中、待评价、已评价 type对应值：all、process、evaling、evaled -// * 派单入口：重新派单、待派单、已派单、已关闭 type对应值：anew、wait、already、close -// * 维修入口：待完成、进行中、已完成 type对应值：wait、working、close -// * 管理员：重派单，全部 type对应值：anew、all 【小程序暂时用不到】 +/** + * 工单列表 + * menu:1.报修查询，3派单入口，5维修入口, 7 管理员,9 楼层管理员 + *

+ * 报修查询：全部、处理中、待评价、已评价、无效申请 type对应值：all、process、evaling、evaled、invalid + * 派单入口：重新派单、待派单、已派单、已关闭（无效申请） type对应值：anew、wait、already、close + * 维修入口：待完成、进行中、已完成 type对应值：wait、working、close + * 管理员：重派单，全部，无效申请 type对应值：anew、all、invalid 【小程序暂时用不到】 + * 楼层管理员：全部、无效申请 type对应值：all、invalid + * + * name : 工单名称搜索关键字 + *

+ */ export function repairListRq(data) { return request({ url: `/app/repair/list?pageNum=${data.pageNum}&pageSize=${data.pageSize}`, @@ -133,34 +139,70 @@ export function repairRemindReadRq(data) { } // 返回订单状态 -// 状态:1 待派单,3 重新派单,5 已派单,7 处理中, 9已完成 待评价, 11 已关闭 13 已评价 -let statusList = [{ - status: 1, - statusName: '待派单', -}, { - status: 3, - statusName: '重新派单', -}, { - status: 5, - statusName: '已派单', -}, { - status: 7, - statusName: '处理中', -}, { - status: 9, - statusName: '已完成', -}, { - status: 11, - statusName: '已关闭', -}, { - status: 13, - statusName: '已评价', -},] export function getStatusName(status) { - let obj = statusList.find(item=> item.status == status ) - if(obj){ + // 状态:1 待派单,3 重新派单,5 已派单,7 处理中, 9已完成 待评价, 11 已关闭 13 已评价 + let statusList = [{ + status: 1, + statusName: '待派单', + }, { + status: 3, + statusName: '重新派单', + }, { + status: 5, + statusName: '已派单', + }, { + status: 7, + statusName: '处理中', + }, { + status: 9, + statusName: '已完成', + }, { + status: 11, + statusName: '已关闭', + }, { + status: 13, + statusName: '已评价', + }, ] + // + let obj = statusList.find(item => item.status == status) + if (obj) { return obj.statusName - }else{ + } else { + return '状态不存在!' + } +} + + +// 返回查询订单状态 +export function getQueryStatusName(status) { + // 状态:1 处理中,3 重新派单,5 已派单,7 处理中, 9待评价, 11 无效单 13 已评价 + let statusList = [{ + status: 1, + statusName: '处理中', + }, { + status: 3, + statusName: '重新派单', + }, { + status: 5, + statusName: '已派单', + }, { + status: 7, + statusName: '处理中', + }, { + status: 9, + statusName: '待评价', + }, { + status: 11, + statusName: '无效单', + }, { + status: 13, + statusName: '已评价', + }, ] + // + let obj = statusList.find(item => item.status == status) + if (obj) { + return obj.statusName + } else { return '状态不存在!' } } \ No newline at end of file diff --git a/miniprogram/app.js b/miniprogram/app.js index 34c1389..17a48b5 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -6,13 +6,13 @@ App({ // parkId : '26', // 园区id // parkName : '长阳智会云控', // 园区名称 // 本地测试 - // DOMAIN_NAME_PREFIX: 'http://192.168.0.30:9227', - // DOMAIN_NAME: 'http://192.168.0.30:9227', //接口域名 - // IMG_NAME: 'http://192.168.0.30:9227', + DOMAIN_NAME_PREFIX: 'http://192.168.0.30:9227', + DOMAIN_NAME: 'http://192.168.0.30:9227', //接口域名 + IMG_NAME: 'http://192.168.0.30:9227', // 生产 - DOMAIN_NAME_PREFIX: 'https://company.haxy.com.cn:4443/shoot-hand', - DOMAIN_NAME: 'https://company.haxy.com.cn:4443/shoot-hand', //接口域名 - IMG_NAME: 'https://company.haxy.com.cn:4443/shoot-hand', + // DOMAIN_NAME_PREFIX: 'https://company.haxy.com.cn:4443/shoot-hand', + // DOMAIN_NAME: 'https://company.haxy.com.cn:4443/shoot-hand', //接口域名 + // IMG_NAME: 'https://company.haxy.com.cn:4443/shoot-hand', globals: { refreshMyPages: false, homedata: {}, diff --git a/miniprogram/pages/reportRepair/query/record/record.js b/miniprogram/pages/reportRepair/query/record/record.js index 28ddb1c..73bd22e 100644 --- a/miniprogram/pages/reportRepair/query/record/record.js +++ b/miniprogram/pages/reportRepair/query/record/record.js @@ -4,7 +4,7 @@ import Notify from '@vant/weapp/notify/notify'; import { repairListRq, - getStatusName + getQueryStatusName } from "../../../../api/repair/repair.js" @@ -78,6 +78,14 @@ Page({ dataList: [], isDataAll: false, }, + //无效申请 + invalidOrder: { + pageNum: 1, + pageSize: 10, + type: 'invalid', + dataList: [], + isDataAll: false, + }, }, /** @@ -135,6 +143,7 @@ Page({ let processOrder = _this.data.processOrder let evalingOrder = _this.data.evalingOrder let evaledOrder = _this.data.evaledOrder + let invalidOrder = _this.data.invalidOrder if (tabTitle == '全部') { pageNum = allOrder.pageNum @@ -160,6 +169,12 @@ Page({ type = evaledOrder.type isDataAll = evaledOrder.isDataAll + } else if (tabTitle == '无效单') { + pageNum = invalidOrder.pageNum + pageSize = invalidOrder.pageSize + type = invalidOrder.type + isDataAll = invalidOrder.isDataAll + } else { wx.showToast({ title: `tab 切换错误(${tabTitle})`, @@ -220,6 +235,14 @@ Page({ evaledOrder }) + } else if (tabTitle == '无效单') { + invalidOrder.dataList = invalidOrder.dataList.concat(_this.formartData(dataList)) + invalidOrder.pageNum = invalidOrder.pageNum + 1 + invalidOrder.isDataAll = isDataAll + _this.setData({ + invalidOrder + }) + } }) @@ -235,7 +258,7 @@ Page({ } else { item.visibleImg = '/profile/static/repair/index/noneImg.png' } - item.statusName = getStatusName(item.status) + item.statusName = getQueryStatusName(item.status) return item; }) }, @@ -293,12 +316,21 @@ Page({ dataList: [], isDataAll: false, }, + //无效申请 + invalidOrder: { + pageNum: 1, + pageSize: 10, + type: 'invalid', + dataList: [], + isDataAll: false, + }, }) // _this.getDataList('全部') _this.getDataList('处理中') _this.getDataList('待评价') _this.getDataList('已评价') + _this.getDataList('无效单') }, /** diff --git a/miniprogram/pages/reportRepair/query/record/record.wxml b/miniprogram/pages/reportRepair/query/record/record.wxml index 652aa60..fcfc4d9 100644 --- a/miniprogram/pages/reportRepair/query/record/record.wxml +++ b/miniprogram/pages/reportRepair/query/record/record.wxml @@ -102,6 +102,31 @@ 数据已全部加载 + + + {{item.repairName}} + + + + 类型: {{item.typeName + '/' + item.deviceName}} + 地点: {{item.address + '/' + item.floor}} + 门牌号: {{item.room ? item.room : ''}} + + + + + {{item.statusName}} + + 分享 + + + + + + + 数据已全部加载 + +