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 @@
-
+
@@ -44,132 +44,5 @@ export default {
\ No newline at end of file
diff --git a/pages/inspection/planDetails.vue b/pages/inspection/planDetails.vue
new file mode 100644
index 0000000..278e3e0
--- /dev/null
+++ b/pages/inspection/planDetails.vue
@@ -0,0 +1,271 @@
+
+
+
+ 基本信息
+
+ 单位名称:
+ {{ detailForm.deptName }}
+
+
+ 项目标题:
+ {{ detailForm.planContent }}
+
+
+
+
+ 巡检任务
+
+
+
+
+ 实验室楼层:{{ item.floorName }}
+
+
+ 房间名称:{{ v.deptName }}
+
+ 专业分类:{{ s.checkContent }}
+
+
+
+ 各排/出水口通水顺畅
+ 工艺内容工艺内容工艺内容工艺内容工艺内容工艺内容工艺内容
+
+ 状态:
+
+
+ 正常
+ 异常
+
+
+
+
+
+ 现场照片:
+
+ 上传照片
+
+
+
+ 使用人签字:
+
+
+ 签字
+
+
+
+
+ 备注:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/inspection/quest.vue b/pages/inspection/quest.vue
index 9e28b3f..d6a27fd 100644
--- a/pages/inspection/quest.vue
+++ b/pages/inspection/quest.vue
@@ -1,6 +1,7 @@
+
@@ -33,7 +34,8 @@
查看
- 接收
+ 接收
@@ -41,7 +43,7 @@
-
+
@@ -60,7 +62,7 @@ export default {
type: '',//状态
reportUnit: '',//提报单位
},
- rowInfo:{},//选中行数据
+ rowInfo: {},//选中行数据
tagColor: {
维修中: "#3A62D7",
待确认: "#81B337",
@@ -109,7 +111,16 @@ export default {
currentPage: 1,
pageSize: 10,
},
-
+ subsectionList: [
+ {
+ name: '巡检任务'
+ },
+ {
+ name: '巡检维修'
+ },
+
+ ],
+ subsectionCurrent:1,//
};
},
@@ -226,7 +237,7 @@ export default {
});
},
//跳转工单
- openWorkOrder(item){
+ openWorkOrder(item) {
let param = {
id: item.id,
type: 'view'
@@ -250,6 +261,9 @@ export default {
background-color: rgba(248, 248, 248, 1);
padding: 0 40rpx 0;
}
+ .protocol-content{
+ padding: 30rpx;
+ }
.order-box {
margin-top: 20rpx;
diff --git a/pages/inspection/questDetails.vue b/pages/inspection/questDetails.vue
index 3b02718..47f5fa2 100644
--- a/pages/inspection/questDetails.vue
+++ b/pages/inspection/questDetails.vue
@@ -55,15 +55,20 @@ export default {
return {
detailForm: {},
optionsType: '',//可操作类型
+ planOrderId:'',//
}
},
onLoad(options) {
this.optionsType = options.type
+ this.planOrderId = options.id
this.getDetails()
},
methods: {
getDetails() {
- this.$u.api.getTaskDetail().then(res => {
+ let query_={
+ id:this.planOrderId
+ }
+ this.$u.api.getTaskDetail(query_).then(res => {
if (res.code == 200) {
this.detailForm = res.data
}
diff --git a/pages/inspection/questOrder.vue b/pages/inspection/questOrder.vue
index 0a8a580..ffe8dd8 100644
--- a/pages/inspection/questOrder.vue
+++ b/pages/inspection/questOrder.vue
@@ -31,11 +31,10 @@
-->
-
+
-
-
+
+
{
if (res.code == 200) {
- // setTimeout(() => {
- // uni.navigateBack({
- // delta: 1 // 默认值是1,表示回退一个页面
- // })
- // },500)
+ let query_ = {
+ id: this.detailForm.id,
+ reservationTime: this.reservationTime
+ }
+ this.$u.api.taskServicemanUpdateTime(query_).then(res => {
+ uni.showToast({ title: "接收成功", icon: "none" });
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1 // 默认值是1,表示回退一个页面
+ })
+ }, 500)
+ })
+
}
})
},
diff --git a/pages/inspection/records.vue b/pages/inspection/records.vue
index f8fe67e..67b3918 100644
--- a/pages/inspection/records.vue
+++ b/pages/inspection/records.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/utils/tabbar.js b/utils/tabbar.js
index c9d1604..5ae6507 100644
--- a/utils/tabbar.js
+++ b/utils/tabbar.js
@@ -4,7 +4,12 @@ const ordinary = [{
selectedIconPath: "photo-fill",
text: "接单记录",
pagePath: "/pages/order/tasking",
-}, {
+}, {
+ iconPath: "setting",
+ selectedIconPath: "setting-fill",
+ text: "巡检任务",
+ pagePath: "/pages/inspection/quest",
+},{
iconPath: "account",
selectedIconPath: "account-fill",
text: "我的",
@@ -38,8 +43,8 @@ const manage = [{
}, {
iconPath: "setting",
selectedIconPath: "setting-fill",
- text: "巡检计划",
- pagePath: "/pages/inspection/plan",
+ text: "巡检任务",
+ pagePath: "/pages/inspection/quest",
}, {
iconPath: "account",
selectedIconPath: "account-fill",
@@ -63,6 +68,7 @@ const repair = [{
text: "我的",
pagePath: "/pages/my/my",
}]
+// 未审核的账号看到的菜单
const oathTab = [{
iconPath: "photo",
selectedIconPath: "photo-fill",