diff --git a/src/api/eam/inspection.js b/src/api/eam/inspection.js
new file mode 100644
index 0000000..f6dc1c0
--- /dev/null
+++ b/src/api/eam/inspection.js
@@ -0,0 +1,52 @@
+import http from '../http'
+// 获取巡检工单
+export function inspectionOrderPage(params) {
+ return http.get('/eam/equipment-inspection-main/page',{params})
+}
+
+// 获取巡检工单
+export function inspectionOrder(number) {
+ return http.get('/eam/equipment-inspection-main/get?id=' + number)
+}
+
+//接单
+export function inspectionUpdateOrder(params) {
+ return http.post('/eam/equipment-inspection-main/updateOrder',params)
+}
+
+//完成
+export function inspectionExecuteOrder(params) {
+ return http.post('/eam/equipment-inspection-main/execute',params)
+}
+
+
+// 获取巡检工单
+export function inspectionOrderDetail(params) {
+ return http.get('/eam/equipment-inspection-detail/getList',{params})
+}
+
+//更新巡检项
+export function inspectionOrderItemUpdate(params) {
+ return http.put('/eam/equipment-inspection-detail/update',params)
+}
+
+//新增非必选巡检项
+export function inspectionOrderItemCreate(params) {
+ return http.post('/eam/equipment-inspection-detail/create',params)
+}
+
+//获取非必选的巡检项
+export function inspectionPlanItemList(params) {
+ return http.post('/eam/relation-inspection-plan-item/getList',params)
+}
+
+//验证驳回
+export function inspectionOrderRejected(params) {
+ return http.post('/eam/equipment-inspection-main/fallback',params)
+}
+
+//验证通过
+export function inspectionOrderPassed(params) {
+ return http.put('/eam/equipment-inspection-main/update',params)
+}
+
diff --git a/src/pages.json b/src/pages.json
index f467016..a02ba65 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -2121,6 +2121,33 @@
"navigationBarTitleText": "详情",
"enablePullDownRefresh": true
}
+ },
+ {
+ "path": "pages/eam/inspectionOrder/inspectionRequest",
+ "style": {
+ "navigationBarTitleText": "巡检",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/eam/inspectionOrder/index",
+ "style": {
+ "navigationBarTitleText": "巡检工单",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/eam/inspectionOrder/detail",
+ "style": {
+ "navigationBarTitleText": "巡检工单详情",
+ "enablePullDownRefresh": true
+ }
+ },{
+ "path": "pages/eam/inspectionOrder/item",
+ "style": {
+ "navigationBarTitleText": "巡检项",
+ "enablePullDownRefresh": true
+ }
}
diff --git a/src/pages/eam/inspectionOrder/detail.vue b/src/pages/eam/inspectionOrder/detail.vue
new file mode 100644
index 0000000..c58e294
--- /dev/null
+++ b/src/pages/eam/inspectionOrder/detail.vue
@@ -0,0 +1,741 @@
+
+
+
+
+
+
+ 巡检工单
+
+
+
+ 工单单号：
+ {{data.number}}
+
+
+ 工单状态：
+
+
+
+
+
+
+
+
+
+
+
+ 巡检描述：
+ {{data.describes}}
+
+
+ 班组：
+ {{data.classType}}
+
+
+ 巡检人：
+ {{data.maintenancer}}
+
+
+ 巡检人电话：
+ {{data.maintenancePhone}}
+
+
+ 巡检开始时间：
+ {{data.endTime == null ? '':$time.formatDate(data.startTime)}}
+
+
+ 巡检结束时间：
+ {{data.endTime == null ? '':$time.formatDate(data.endTime)}}
+
+
+ 完成时间：
+ {{data.completionTime == null ? '':$time.formatDate(data.completionTime)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编号：
+ {{data.equipmentCode}}
+
+
+ 所属车间：
+ {{data.workshopCode}}
+
+
+ 类型：
+ {{data.type == 'DEVICE'?'设备':data.type == 'EQUIPMENT'?'工装':''}}
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+ 巡检内容: {{item.content}}
+
+
+
+
+ 结果: {{item.result == '0'?'完成':item.result == '1'?'未完成':''}}
+
+
+
+
+ 未完成原因: {{item.uncompletedCause==null?'':item.uncompletedCause}}
+
+
+
+
+ 完成时间: {{item.completionTime == null ? '':$time.formatDate(item.completionTime)}}
+
+
+
+
+
+
+
+ 巡检
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{formatStartDate}}
+
+
+ {{`请选择开始时间`}}
+
+
+
+
+
+
+
+ {{formatEndDate}}
+
+
+ {{`请选择完成时间`}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/eam/inspectionOrder/index.vue b/src/pages/eam/inspectionOrder/index.vue
new file mode 100644
index 0000000..2fc3359
--- /dev/null
+++ b/src/pages/eam/inspectionOrder/index.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.number}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 工单单号:{{item.number}}
+
+
+ 类型:{{item.type=='DEVICE'?'设备':item.type=='EQUIPMENT'?'工装':''}}
+
+
+ {{`${params.type=='DEVICE'?'设备' : '工装'}`}}编号:{{item.equipmentCode}}
+
+
+ 所属车间:{{item.workshopCode}}
+
+
+ 班组:{{item.classType}}
+
+
+ 巡检人:{{item.maintenancer}}
+
+
+ 完成时间:{{`${$time.formatDate(item.completionTime)}`}}
+
+
+
+
+ 创建时间：{{`${$time.formatDate(item.createTime)}`}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/eam/inspectionOrder/inspectionRequest.vue b/src/pages/eam/inspectionOrder/inspectionRequest.vue
new file mode 100644
index 0000000..26af6ba
--- /dev/null
+++ b/src/pages/eam/inspectionOrder/inspectionRequest.vue
@@ -0,0 +1,93 @@
+
+
+
+
+ *巡检类型选择
+
+
+ 设备巡检
+
+
+ 工装巡检
+
+
+
+
+
+
+
+
diff --git a/src/pages/eam/inspectionOrder/item.vue b/src/pages/eam/inspectionOrder/item.vue
new file mode 100644
index 0000000..e0482eb
--- /dev/null
+++ b/src/pages/eam/inspectionOrder/item.vue
@@ -0,0 +1,517 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/eam/repairOrder/myRepairRequest.vue b/src/pages/eam/repairOrder/myRepairRequest.vue
index e8351b6..9971684 100644
--- a/src/pages/eam/repairOrder/myRepairRequest.vue
+++ b/src/pages/eam/repairOrder/myRepairRequest.vue
@@ -2,15 +2,15 @@
- *我的报修
+ *巡检类型选择
设备报修
+ size="36">设备巡检
工装报修
+ size="36">工装巡检
@@ -23,10 +23,11 @@
} from 'vue'
const { proxy } = getCurrentInstance()
function openDevice() {
- proxy.$tab.navigateTo(`/pages/eam/repairOrder/index?type=DEVICE&flag=2`)
+ console.log("777777")
+ proxy.$tab.navigateTo(`/pages/eam/inspectionOrder/index?type=DEVICE&flag=2`)
}
function openTool() {
- proxy.$tab.navigateTo(`/pages/eam/repairOrder/index?type=EQUIPMENT&flag=2`)
+ proxy.$tab.navigateTo(`/pages/eam/inspectionOrder/index?type=EQUIPMENT&flag=2`)
}
diff --git a/src/pages/eam/spotcheckOrder/index.vue b/src/pages/eam/spotcheckOrder/index.vue
new file mode 100644
index 0000000..60027fe
--- /dev/null
+++ b/src/pages/eam/spotcheckOrder/index.vue
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.number}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 工单单号:{{item.number}}
+
+
+ 类型:{{item.type=='DEVICE'?'设备':item.type=='EQUIPMENT'?'工装':''}}
+
+
+ {{`${params.type=='DEVICE'?'设备' : '工装'}`}}编号:{{item.equipmentCode}}
+
+
+ 所属车间:{{item.workshopCode}}
+
+
+ 班组:{{item.classType}}
+
+
+ 巡检人:{{item.maintenancer}}
+
+
+ 完成时间:{{`${$time.formatDate(item.completionTime)}`}}
+
+
+
+
+ 创建时间：{{`${$time.formatDate(item.createTime)}`}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/eam/spotcheckOrder/spotcheckRequest.vue b/src/pages/eam/spotcheckOrder/spotcheckRequest.vue
new file mode 100644
index 0000000..5fa22c6
--- /dev/null
+++ b/src/pages/eam/spotcheckOrder/spotcheckRequest.vue
@@ -0,0 +1,93 @@
+
+
+
+
+ *点检类型选择
+
+
+ 设备点检
+
+
+ 工装点检
+
+
+
+
+
+
+
+