From 511f901b1bff19d0e09a74051ff7c0c2c5f6b128 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Fri, 19 Apr 2024 07:50:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A1=E6=A3=80=E7=82=B9=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/spotCheckOrder.js | 10 + src/pages.json | 17 + src/pages/index.vue | 7 +- src/pages/repairOrder/myOrder.vue | 10 + src/pages/spotCheckOrder/addForm.vue | 26 +- src/pages/spotCheckOrder/detail.vue | 559 +++++++++++++++++++++++++++ src/pages/spotCheckOrder/index.vue | 240 ++++++++++++ src/pages/spotCheckOrder/myOrder.vue | 8 + src/pages/upkeepOrder/myOrder.vue | 6 + 9 files changed, 875 insertions(+), 8 deletions(-) create mode 100644 src/pages/spotCheckOrder/detail.vue create mode 100644 src/pages/spotCheckOrder/index.vue diff --git a/src/api/spotCheckOrder.js b/src/api/spotCheckOrder.js index 11f44eb..fb65753 100644 --- a/src/api/spotCheckOrder.js +++ b/src/api/spotCheckOrder.js @@ -17,3 +17,13 @@ export function spotCheckOrderPage(params) { export function orderClick(params) { return http.get('/eam/device-spot-inspection-record-main/onClick',{params}) } + +// 操作工单 +export function selectListByNumber(params) { + return http.get('/eam/device-spot-inspection-record-detail/getList',{params}) +} + +// 工程师审批 +export function orderClickApprove(params) { + return http.get('/eam/device-spot-inspection-record-main/orderClickApprove',{params}) +} diff --git a/src/pages.json b/src/pages.json index ed4f0cc..6e04648 100644 --- a/src/pages.json +++ b/src/pages.json @@ -133,6 +133,23 @@ "navigationBarTextStyle": "white" } },{ + "path": "pages/spotCheckOrder/index", + "style": { + "navigationBarTitleText": "点检工单", + "navigationBarBackgroundColor": "#409eff", + "navigationBarTextStyle": "white", + "navigationStyle": "custom" + } + } + ,{ + "path": "pages/spotCheckOrder/detail", + "style": { + "navigationBarTitleText": "点检工单详情", + "navigationBarBackgroundColor": "#409eff", + "navigationBarTextStyle": "white" + } + } + ,{ "path": "pages/spotCheckOrder/addForm", "style": { "navigationBarTitleText": "添加点检工单", diff --git a/src/pages/index.vue b/src/pages/index.vue index 26b7629..c455f42 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -66,7 +66,7 @@ 检修工单 - 点检工单 @@ -114,6 +114,11 @@ 检修工单 + + + 点检工单 + diff --git a/src/pages/repairOrder/myOrder.vue b/src/pages/repairOrder/myOrder.vue index 9349950..6873fe3 100644 --- a/src/pages/repairOrder/myOrder.vue +++ b/src/pages/repairOrder/myOrder.vue @@ -17,6 +17,7 @@ + 报修单号:{{item.number}} @@ -39,6 +40,15 @@ 完成时间:{{$time.formatDate(item.completionTime)}} + + 报修人:{{item.applyName}} + + + 审核人:{{item.verifyName}} + + + 审核时间:{{`${$time.formatDate(item.verifyTime)}`}} + diff --git a/src/pages/spotCheckOrder/addForm.vue b/src/pages/spotCheckOrder/addForm.vue index 60abee8..3a4dc66 100644 --- a/src/pages/spotCheckOrder/addForm.vue +++ b/src/pages/spotCheckOrder/addForm.vue @@ -98,6 +98,7 @@ } from 'vue' import * as deviceApi from "@/api/device.js" + import * as moldApi from "@/api/mold.js" import * as spotCheckOrderApi from "@/api/spotCheckOrder.js" import * as dictApi from "@/api/dict.js" import { useCountStore } from '@/store' @@ -156,13 +157,24 @@ number:form.value.deviceNumber, flag:2 } - deviceApi.getDeviceDetailsByNumber(data).then((res) => { - if (res.data) { - form.value.deviceName = res.data.name - } else { - proxy.$modal.showToast(`找不到该${type.value=='DEVICE'?'设备' : '模具'}`) - } - }).catch(()=>{}) + if(type.value=='MOLD'){ + moldApi.getMoldDetailsByNumber(data).then((res) => { + if (res.data) { + form.value.deviceName = res.data.name + } else { + proxy.$modal.showToast(`找不到该${type.value=='DEVICE'?'设备' : '模具'}`) + } + }).catch(()=>{}) + }else{ + deviceApi.getDeviceDetailsByNumber(data).then((res) => { + if (res.data) { + form.value.deviceName = res.data.name + } else { + proxy.$modal.showToast(`找不到该${type.value=='DEVICE'?'设备' : '模具'}`) + } + }).catch(()=>{}) + } + } // 根据设备获取二级列表 function getSubList() { diff --git a/src/pages/spotCheckOrder/detail.vue b/src/pages/spotCheckOrder/detail.vue new file mode 100644 index 0000000..86a780c --- /dev/null +++ b/src/pages/spotCheckOrder/detail.vue @@ -0,0 +1,559 @@ + + + + + \ No newline at end of file diff --git a/src/pages/spotCheckOrder/index.vue b/src/pages/spotCheckOrder/index.vue new file mode 100644 index 0000000..9579f83 --- /dev/null +++ b/src/pages/spotCheckOrder/index.vue @@ -0,0 +1,240 @@ + + + + + \ No newline at end of file diff --git a/src/pages/spotCheckOrder/myOrder.vue b/src/pages/spotCheckOrder/myOrder.vue index 991070f..eb620cd 100644 --- a/src/pages/spotCheckOrder/myOrder.vue +++ b/src/pages/spotCheckOrder/myOrder.vue @@ -17,6 +17,8 @@ + + 点检单号:{{item.number}} @@ -30,6 +32,12 @@ 班次:{{item.classesName}} + + 审核人:{{item.verifyName}} + + + 审核时间:{{`${$time.formatDate(item.verifyTime)}`}} + diff --git a/src/pages/upkeepOrder/myOrder.vue b/src/pages/upkeepOrder/myOrder.vue index 4dfa7cc..6292289 100644 --- a/src/pages/upkeepOrder/myOrder.vue +++ b/src/pages/upkeepOrder/myOrder.vue @@ -45,6 +45,12 @@ 完成时间:{{$time.formatDate(item.completionTime)}} + + 审核人:{{item.verifyName}} + + + 审核时间:{{`${$time.formatDate(item.verifyTime)}`}} +