diff --git a/api/api.js b/api/api.js index 1803efc..fb6761b 100644 --- a/api/api.js +++ b/api/api.js @@ -220,13 +220,17 @@ const install = (Vue, vm) => { authorizations: true, isparams: false }) - - // 获取巡检任务列表 lab-ops/maintenance/task-page + // 巡检计划 详情 + let getPlanDetail = (params) => http.get('/lab-ops/maintenance/plan-detail', params, { + authorizations: true, + isparams: false + }) + // 获取巡检任务列表 let getTaskPage = (params) => http.get('/lab-ops/maintenance/task-page', params, { authorizations: true, isparams: false }) - // 获取巡检任务详情 lab-ops/maintenance/task-page + // 获取巡检任务详情 let getTaskDetail = (params) => http.get('/lab-ops/maintenance/task-detail', params, { authorizations: true, isparams: false @@ -236,14 +240,19 @@ const install = (Vue, vm) => { authorizations: true, isparams: false }) - //维修人员确认接收 lab-ops/maintenance/task-serviceman-receive + //维修人员确认接收 let taskServicemanreceive = (params) => http.post('/lab-ops/maintenance/task-serviceman-receive', params, { authorizations: true, isparams: false }) + //维修人员更新上门时间 + let taskServicemanUpdateTime = (params) => http.post('/lab-ops/maintenance/task-serviceman-update-time', params, { + authorizations: true, + isparams: false + }) // 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下 - vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail,taskSupervisorconfirm,taskServicemanreceive,updateCoordinate }; + vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail,taskSupervisorconfirm,taskServicemanreceive,updateCoordinate ,taskServicemanUpdateTime,getPlanDetail}; } export default { diff --git a/pages.json b/pages.json index e69b8ba..5e3bd1d 100644 --- a/pages.json +++ b/pages.json @@ -196,6 +196,18 @@ "titleNView": {} } } + }, + { + "path": "pages/inspection/planDetails", + "style": { + "navigationBarTitleText": "巡检计划详情", + "enablePullDownRefresh": false, + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#F8F8F8", + "app-plus": { + "titleNView": {} + } + } } ], "globalStyle": { diff --git a/pages/inspection/components/plan-list.vue b/pages/inspection/components/plan-list.vue index d46db9c..7a8c1c3 100644 --- a/pages/inspection/components/plan-list.vue +++ b/pages/inspection/components/plan-list.vue @@ -3,8 +3,8 @@ - + @@ -26,6 +26,8 @@ 创建时间:{{ item.createTime }} + 查看 指派 @@ -35,6 +37,7 @@ + .page-css { - padding: 0; + padding: 0 !important; .page-search-top { - height: 210rpx; + max-height: 210rpx; background-color: rgba(248, 248, 248, 1); padding: 0 40rpx 0; } @@ -231,7 +242,7 @@ export default { margin-top: 20rpx; .order-item { - min-height: 414rpx; + min-height: 214rpx; margin: 0 24rpx 20rpx; border-radius: 20rpx; background: #fff; @@ -336,7 +347,7 @@ export default { .con-btn { margin-top: 56rpx; - margin-bottom: 32rpx; + // margin-bottom: 32rpx; display: inline-block; text-align: right; } diff --git a/pages/inspection/plan.vue b/pages/inspection/plan.vue index 09e9331..6a373bb 100644 --- a/pages/inspection/plan.vue +++ b/pages/inspection/plan.vue @@ -1,5 +1,5 @@