diff --git a/src/api/eam/spotcheck.js b/src/api/eam/spotcheck.js
new file mode 100644
index 0000000..6c280cc
--- /dev/null
+++ b/src/api/eam/spotcheck.js
@@ -0,0 +1,52 @@
+import http from '../http'
+// 获取点检工单
+export function spotcheckOrderPage(params) {
+ return http.get('/eam/equipment-spot-check-main/page',{params})
+}
+
+// 获取点检工单
+export function spotcheckOrder(number) {
+ return http.get('/eam/equipment-spot-check-main/get?id=' + number)
+}
+
+//接单
+export function spotcheckUpdateOrder(params) {
+ return http.post('/eam/equipment-spot-check-main/updateOrder',params)
+}
+
+//完成
+export function spotcheckExecuteOrder(params) {
+ return http.post('/eam/equipment-spot-check-main/execute',params)
+}
+
+
+// 获取点检工单
+export function spotcheckOrderDetail(params) {
+ return http.get('/eam/equipment-spot-check-detail/getList',{params})
+}
+
+//更新点检项
+export function spotcheckOrderItemUpdate(params) {
+ return http.put('/eam/equipment-spot-check-detail/update',params)
+}
+
+//新增非必选点检项
+export function spotcheckOrderItemCreate(params) {
+ return http.post('/eam/equipment-spot-check-detail/create',params)
+}
+
+//获取非必选的点检项
+export function spotcheckPlanItemList(params) {
+ return http.post('/eam/relation-spot-check-plan-item/getList',params)
+}
+
+//验证驳回
+export function spotcheckOrderRejected(params) {
+ return http.post('/eam/equipment-spot-check-main/fallback',params)
+}
+
+//验证通过
+export function spotcheckOrderPassed(params) {
+ return http.put('/eam/equipment-spot-check-main/update',params)
+}
+
diff --git a/src/pages.json b/src/pages.json
index a02ba65..f3085c5 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -2142,12 +2142,41 @@
"navigationBarTitleText": "巡检工单详情",
"enablePullDownRefresh": true
}
- },{
+ },
+ {
"path": "pages/eam/inspectionOrder/item",
"style": {
"navigationBarTitleText": "巡检项",
"enablePullDownRefresh": true
}
+ },
+ {
+ "path": "pages/eam/spotcheckOrder/spotcheckRequest",
+ "style": {
+ "navigationBarTitleText": "点检",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/eam/spotcheckOrder/index",
+ "style": {
+ "navigationBarTitleText": "点检工单",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/eam/spotcheckOrder/detail",
+ "style": {
+ "navigationBarTitleText": "点检工单详情",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/eam/spotcheckOrder/item",
+ "style": {
+ "navigationBarTitleText": "点检项",
+ "enablePullDownRefresh": true
+ }
}
diff --git a/src/pages/eam/inspectionOrder/index.vue b/src/pages/eam/inspectionOrder/index.vue
index 2fc3359..7fb0613 100644
--- a/src/pages/eam/inspectionOrder/index.vue
+++ b/src/pages/eam/inspectionOrder/index.vue
@@ -88,9 +88,6 @@
function itemClick(item, index) {
proxy.$tab.navigateTo(`/pages/eam/inspectionOrder/detail?type=${params.value.type}&id=${encodeURIComponent(JSON.stringify(item.id))}`)
}
- // function addForm(item) {
- // proxy.$tab.navigateTo(`/pages/spotCheckOrder/addForm?type=${params.value.type}&data=${encodeURIComponent(JSON.stringify(item))}`)
- // }
async function getList() {
if (status.value == 'nomore') return;
diff --git a/src/pages/eam/spotcheckOrder/detail.vue b/src/pages/eam/spotcheckOrder/detail.vue
new file mode 100644
index 0000000..3daa650
--- /dev/null
+++ b/src/pages/eam/spotcheckOrder/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/spotcheckOrder/index.vue b/src/pages/eam/spotcheckOrder/index.vue
index 60027fe..c1521c4 100644
--- a/src/pages/eam/spotcheckOrder/index.vue
+++ b/src/pages/eam/spotcheckOrder/index.vue
@@ -1,8 +1,8 @@
-
+
+ title="点检工单">
@@ -14,10 +14,10 @@
{{item.number}}
-
-
-
-
+
+
+
+
@@ -40,7 +40,7 @@
班组:{{item.classType}}
- 巡检人:{{item.maintenancer}}
+ 点检人:{{item.maintenancer}}
完成时间:{{`${$time.formatDate(item.completionTime)}`}}
@@ -73,7 +73,7 @@
nextTick
} from 'vue'
- import * as inspectionOrderApi from "@/api/eam/inspection"
+ import * as inspectionOrderApi from "@/api/eam/spotcheck"
const { proxy } = getCurrentInstance()
const params = ref({
@@ -83,18 +83,17 @@
})
const status = ref('loadmore') //是否显示没有更多了
const list = ref([])
- // function itemClick(item, index) {
- // proxy.$tab.navigateTo(`/pages/spotCheckOrder/detail?type=${params.value.type}&number=${item.number}&data=${encodeURIComponent(JSON.stringify(item))}`)
- // }
- // function addForm(item) {
- // proxy.$tab.navigateTo(`/pages/spotCheckOrder/addForm?type=${params.value.type}&data=${encodeURIComponent(JSON.stringify(item))}`)
- // }
+
+ //点击详情
+ function itemClick(item, index) {
+ proxy.$tab.navigateTo(`/pages/eam/spotcheckOrder/detail?type=${params.value.type}&id=${encodeURIComponent(JSON.stringify(item.id))}`)
+ }
async function getList() {
if (status.value == 'nomore') return;
status.value = 'loading';
proxy.$modal.loading('加载中')
- await inspectionOrderApi.inspectionOrderPage(params.value).then((res) => {
+ await inspectionOrderApi.spotcheckOrderPage(params.value).then((res) => {
proxy.$modal.closeLoading()
if (res.data.list.length > 0) {
list.value = list.value.concat(res.data.list);
@@ -106,7 +105,6 @@
}).catch(() => {
proxy.$modal.closeLoading()
})
- console.log(list.value)
}
onLoad((option) => {
if (option.type) params.value.type = option.type;
diff --git a/src/pages/eam/spotcheckOrder/item.vue b/src/pages/eam/spotcheckOrder/item.vue
new file mode 100644
index 0000000..c713124
--- /dev/null
+++ b/src/pages/eam/spotcheckOrder/item.vue
@@ -0,0 +1,517 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file