From e24b3269311aa3febbf8fd08aaf1c62781782daa Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 29 Mar 2023 13:58:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE=20?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=9D=E9=A1=B5=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inventory/InspectionPlan.js | 8 +- src/api/inventory/deviceInspectOrder.js | 55 +++++ src/api/inventory/deviceRepairOrder.js | 57 +++++ .../inventory/DeviceInspectOrderAudit.vue | 209 +++++++++--------- .../inventory/DeviceInspectOrderCompleted.vue | 209 +++++++++--------- src/views/inventory/DeviceInspectOrderNew.vue | 183 +++++++++------ .../inventory/DeviceRepairOrderAudit.vue | 178 ++++++--------- .../inventory/DeviceRepairOrderCompleted.vue | 176 ++++++--------- src/views/inventory/DeviceRepairOrderNew.vue | 92 ++++---- 9 files changed, 641 insertions(+), 526 deletions(-) create mode 100644 src/api/inventory/deviceInspectOrder.js create mode 100644 src/api/inventory/deviceRepairOrder.js diff --git a/src/api/inventory/InspectionPlan.js b/src/api/inventory/InspectionPlan.js index e5441603..08b70fd6 100644 --- a/src/api/inventory/InspectionPlan.js +++ b/src/api/inventory/InspectionPlan.js @@ -8,13 +8,7 @@ export function filterList(params) { }); } -export function getRepairList(params) { - return axios({ - url: "/udiwms/inv/device/repair/order/filter", - method: "get", - params: params - }); -} + export function getMaintenanceList(params) { return axios({ diff --git a/src/api/inventory/deviceInspectOrder.js b/src/api/inventory/deviceInspectOrder.js new file mode 100644 index 00000000..e344353d --- /dev/null +++ b/src/api/inventory/deviceInspectOrder.js @@ -0,0 +1,55 @@ +import axios from "../../utils/request"; + + +export function getMaintenanceList(params) { + return axios({ + url: "/udiwms/inv/device/inspect/order/filter", + method: "get", + params: params + }); +} + +export function addDeviceInspectOrder(params) { + return axios({ + url: "/udiwms/inv/device/inspect/order/add", + method: "get", + data: params + }); +} + +export function updateDeviceInspectOrder(params) { + return axios({ + url: "/udiwms/inv/device/inspect/order/update", + method: "get", + data: params + }); +} + +export function submitAudit(params) { + return axios({ + url: "/udiwms/inv/device/inspect/order/submitAudit", + method: "get", + data: params + }); +} + + +export function updateStatus(params) { + return axios({ + url: "/udiwms/inv/device/inspect/order/updateStatus", + method: "get", + data: params + }); +} + + +export function deleteDeviceInspectOrder(params) { + return axios({ + url: "/udiwms/inv/device/inspect/order/delete", + method: "get", + data: params + }); +} + + + diff --git a/src/api/inventory/deviceRepairOrder.js b/src/api/inventory/deviceRepairOrder.js new file mode 100644 index 00000000..6c9271be --- /dev/null +++ b/src/api/inventory/deviceRepairOrder.js @@ -0,0 +1,57 @@ +import axios from "../../utils/request"; + + +export function getRepairList(params) { + return axios({ + url: "/udiwms/inv/device/repair/order/filter", + method: "get", + params: params + }); +} + +export function addDeviceRepairOrder(params) { + return axios({ + url: "/udiwms/inv/device/repair/order/addDeviceRepairOrder", + method: "post", + data: params + }); +} + + +export function updateDeviceRepairOrder(params) { + return axios({ + url: "/udiwms/inv/device/repair/order/updateDeviceRepairOrder", + method: "post", + data: params + }); +} + +export function submitAudit(params) { + return axios({ + url: "/udiwms/inv/device/repair/order/submitAudit", + method: "post", + data: params + }); +} + + +export function updateStatus(params) { + return axios({ + url: "/udiwms/inv/device/repair/order/updateStatus", + method: "post", + data: params + }); +} + + + +export function deleteRepairOrder(params) { + return axios({ + url: "/udiwms/inv/device/repair/order/deleteRepairOrder", + method: "post", + data: params + }); +} + + + diff --git a/src/views/inventory/DeviceInspectOrderAudit.vue b/src/views/inventory/DeviceInspectOrderAudit.vue index ddad0a27..d82fc470 100644 --- a/src/views/inventory/DeviceInspectOrderAudit.vue +++ b/src/views/inventory/DeviceInspectOrderAudit.vue @@ -1,68 +1,117 @@ @@ -133,7 +157,7 @@ import { deleteDeviceReceiveOrder, getDeviceReceiveOrderList } from "@/api/inventory/deviceReceiveOrder"; -import {getMaintenanceList} from "@/api/inventory/InspectionPlan"; +import {getMaintenanceList,submitAudit,deleteDeviceInspectOrder} from "@/api/inventory/deviceInspectOrder"; export default { name: "DeviceReceiveOrderAudit", @@ -290,25 +314,6 @@ export default { } }); }, - handleChange(row) { - this.detailQuery.orderIdFk = row.orderId; - this.detailQuery.page = 1; - this.getDetailList(); - }, - getDetailList() { - getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => { - if (res.code === 20000) { - this.detailList = res.data.list || []; - this.detailTotal = res.data.total || 0; - } else { - this.detailList = []; - this.detailTotal = 0; - } - }).catch(() => { - this.detailList = []; - this.detailTotal = 0; - }); - }, deleteDialog(rowId) { this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', { confirmButtonText: '确定', diff --git a/src/views/inventory/DeviceInspectOrderCompleted.vue b/src/views/inventory/DeviceInspectOrderCompleted.vue index b642336f..e6f05ab7 100644 --- a/src/views/inventory/DeviceInspectOrderCompleted.vue +++ b/src/views/inventory/DeviceInspectOrderCompleted.vue @@ -1,68 +1,117 @@ @@ -113,7 +137,7 @@ import { getDeviceReceiveOrderDetailList, getDeviceReceiveOrderList } from "@/api/inventory/deviceReceiveOrder"; -import {getMaintenanceList} from "@/api/inventory/InspectionPlan"; +import {getMaintenanceList,submitAudit,deleteDeviceInspectOrder} from "@/api/inventory/deviceInspectOrder"; export default { name: "DeviceReceiveOrderCompleted", @@ -231,25 +255,6 @@ export default { this.getList(); }) }, - handleChange(row) { - this.detailQuery.orderIdFk = row.orderId; - this.detailQuery.page = 1; - this.getDetailList(); - }, - getDetailList() { - getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => { - if (res.code === 20000) { - this.detailList = res.data.list || []; - this.detailTotal = res.data.total || 0; - } else { - this.detailList = []; - this.detailTotal = 0; - } - }).catch(() => { - this.detailList = []; - this.detailTotal = 0; - }); - }, closeDialog() { this.formVisible = false; this.getList(); diff --git a/src/views/inventory/DeviceInspectOrderNew.vue b/src/views/inventory/DeviceInspectOrderNew.vue index 87ef712a..be9329a5 100644 --- a/src/views/inventory/DeviceInspectOrderNew.vue +++ b/src/views/inventory/DeviceInspectOrderNew.vue @@ -1,68 +1,118 @@