From b93a646520a50457af3644a37cc09cf32bff0341 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 8 Aug 2023 11:18:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inventory/deviceInspectTake.js | 61 ++---- .../inventory/DeviceInspectPlanAudit.vue | 39 +++- .../inventory/DeviceInspectPlanCompleted.vue | 37 +++- src/views/inventory/DeviceInspectPlanNew.vue | 14 +- .../inventory/DeviceInspectProjectSelect.vue | 180 ++---------------- src/views/inventory/DeviceInspectTake.vue | 38 +++- .../inventory/DeviceInspectTakeDetail.vue | 80 ++++++++ .../inventory/DeviceInspectTakeSelect.vue | 38 +++- 8 files changed, 275 insertions(+), 212 deletions(-) create mode 100644 src/views/inventory/DeviceInspectTakeDetail.vue diff --git a/src/api/inventory/deviceInspectTake.js b/src/api/inventory/deviceInspectTake.js index eb494577..22cc89bb 100644 --- a/src/api/inventory/deviceInspectTake.js +++ b/src/api/inventory/deviceInspectTake.js @@ -9,56 +9,35 @@ export function getDeviceInspectTakeList(params) { } export function uploadDeviceInspecTake(params) { - return axios({ - url: "/udiwms/inv/device/inspect/take/uploadDeviceInspecTake", - method: "post", - data: params - }); + return axios({ + url: "/udiwms/inv/device/inspect/take/uploadDeviceInspecTake", + method: "post", + data: params + }); } - - - - - - - - - - - - - - - - - - - - - export function selectDeviceInspecTakeDetail(params) { - return axios({ - url: "/udiwms/inv/device/inspect/take/detail/selectDeviceInspecTakeDetail", - method: "get", - params: params - }); + return axios({ + url: "/udiwms/inv/device/inspect/take/detail/selectDeviceInspecTakeDetail", + method: "get", + params: params + }); } export function uploadDeviceInspecTakeDetail(params) { - return axios({ - url: "/udiwms/inv/device/inspect/take/detail/uploadDeviceInspecTakeDetail", - method: "post", - data: params - }); + return axios({ + url: "/udiwms/inv/device/inspect/take/detail/uploadDeviceInspecTakeDetail", + method: "post", + data: params + }); } export function addDeviceInspecTakeDetail(params) { - return axios({ - url: "/udiwms/inv/device/inspect/take/detail/addDeviceInspecTakeDetail", - method: "post", - data: params - }); + return axios({ + url: "/udiwms/inv/device/inspect/take/detail/addDeviceInspecTakeDetail", + method: "post", + data: params + }); } diff --git a/src/views/inventory/DeviceInspectPlanAudit.vue b/src/views/inventory/DeviceInspectPlanAudit.vue index 978fef71..382ebb38 100644 --- a/src/views/inventory/DeviceInspectPlanAudit.vue +++ b/src/views/inventory/DeviceInspectPlanAudit.vue @@ -188,8 +188,36 @@ + + + + + + + + + + @@ -199,6 +227,8 @@ import {findInvByUser} from "@/api/system/invSubWarehouse"; import {getDeviceInspectPlanList, deleteInspectPlan, updateStatus} from "@/api/inventory/deviceInspectPlan"; import deviceInspectPlanAuditModify from "@/views/inventory/DeviceInspectPlanAuditModify" import {selectDeviceInspectPlanDelect} from "@/api/inventory/deviceInspectPlanDelect"; +import DeviceInspectPlanProjectSet from "@/views/inventory/DeviceInspectProjectSelect"; + export default { @@ -261,6 +291,8 @@ export default { startTime: '', expectedTime:null }, + deviceProjectSelectVisible: false, + detailQuery: null, showSearch: true, actDateRange: [], endDateRange: [], @@ -425,6 +457,11 @@ export default { }); }, + datailSelect(row){ + this.detailQuery = row + this.deviceProjectSelectVisible = true + }, + auditOrder(row) { this.formVisible = true; this.deviceInspectPlan = row; @@ -473,7 +510,7 @@ export default { this.getList(); }, }, - components: {deviceInspectPlanAuditModify}, + components: {deviceInspectPlanAuditModify,DeviceInspectPlanProjectSet}, mounted() { document.body.ondrop = function (event) { event.preventDefault(); diff --git a/src/views/inventory/DeviceInspectPlanCompleted.vue b/src/views/inventory/DeviceInspectPlanCompleted.vue index d8f15d79..ac83944c 100644 --- a/src/views/inventory/DeviceInspectPlanCompleted.vue +++ b/src/views/inventory/DeviceInspectPlanCompleted.vue @@ -178,9 +178,35 @@ + + + + + + + + @@ -189,6 +215,8 @@ import {getDeptListByUser} from "@/api/auth/authDept"; import {findInvByUser} from "@/api/system/invSubWarehouse"; import {getDeviceInspectPlanList, deleteInspectPlan, updateStatus} from "@/api/inventory/deviceInspectPlan"; import {selectDeviceInspectPlanDelect} from "@/api/inventory/deviceInspectPlanDelect"; +import DeviceInspectPlanProjectSet from "@/views/inventory/DeviceInspectProjectSelect"; + export default { @@ -247,6 +275,8 @@ export default { invCode: null, deviceName: null }, + deviceProjectSelectVisible: false, + detailQuery: null, showSearch: true, actDateRange: [], auditDateRange: [], @@ -461,8 +491,13 @@ export default { this.formVisible = false; this.getList(); }, + datailSelect(row){ + this.detailQuery = row + this.deviceProjectSelectVisible = true + }, + }, - components: {}, + components: {DeviceInspectPlanProjectSet}, mounted() { document.body.ondrop = function (event) { event.preventDefault(); diff --git a/src/views/inventory/DeviceInspectPlanNew.vue b/src/views/inventory/DeviceInspectPlanNew.vue index d7e11601..cfef6bab 100644 --- a/src/views/inventory/DeviceInspectPlanNew.vue +++ b/src/views/inventory/DeviceInspectPlanNew.vue @@ -224,14 +224,14 @@ :visible.sync="deviceProjectSelectVisible" :close-on-click-modal="false" :close-on-press-escape="false" - width="65%" + width="40%" v-if="deviceProjectSelectVisible" > - - + @@ -243,7 +243,7 @@ import {findInvByUser} from "@/api/system/invSubWarehouse"; import deviceInspectPlanModify from "@/views/inventory/DeviceInspectPlanModify.vue"; import {getDeviceInspectPlanList, submitAudit, deleteInspectPlan} from "@/api/inventory/deviceInspectPlan"; import {selectDeviceInspectPlanDelect} from "@/api/inventory/deviceInspectPlanDelect"; -import deviceInspectProjectSelect from "@/views/inventory/DeviceInspectProjectSelect"; +import DeviceInspectPlanProjectSet from "@/views/inventory/DeviceInspectProjectSelect"; export default { @@ -310,6 +310,7 @@ export default { showSearch: true, deviceProjectSelectVisible: false, detailQuery: null, + orderIds:null, pickerOptions: { shortcuts: [ { @@ -519,7 +520,7 @@ export default { closeDialog() { this.formVisible = false; this.deviceProjectSelectVisible = false - this.getList(); + this.selectDeviceInspectPlanDelect({orderIdFk:this.orderIds}) }, addInspectPlan() { this.formVisible = true; @@ -536,6 +537,7 @@ export default { }; }, handleDetail(row){ + this.orderIds = row.orderId; this.selectDeviceInspectPlanDelect({orderIdFk:row.orderId}) }, selectDeviceInspectPlanDelect(obj) { @@ -555,7 +557,7 @@ export default { }, }, components: { - deviceInspectPlanModify,deviceInspectProjectSelect + deviceInspectPlanModify,DeviceInspectPlanProjectSet }, mounted() { document.body.ondrop = function (event) { diff --git a/src/views/inventory/DeviceInspectProjectSelect.vue b/src/views/inventory/DeviceInspectProjectSelect.vue index db958b86..ba36d7fd 100644 --- a/src/views/inventory/DeviceInspectProjectSelect.vue +++ b/src/views/inventory/DeviceInspectProjectSelect.vue @@ -1,74 +1,36 @@ + + + + + + + + + + + @@ -208,6 +237,7 @@ import deviceInspectTakeAuditModify from "@/views/inventory/DeviceInspectTakeAud import {getDeviceInspectTakeList,selectDeviceInspecTakeDetail} from "@/api/inventory/deviceInspectTake"; import {previewImage, previewFile} from "@/api/purchase/supCompany"; import ElImageViewer from "element-ui/packages/image/src/image-viewer"; +import DeviceInspectTakeDetail from "@/views/inventory/DeviceInspectTakeDetail" export default { name: "deviceInspectTake", @@ -259,6 +289,8 @@ export default { endTime: '', startTime: '', }, + deviceProjectSelectVisible: false, + detailQuery: null, showSearch: true, actDateRange: [], endDateRange: [], @@ -502,6 +534,10 @@ export default { this.formVisible = false; this.getList(); }, + datailSelect(row){ + this.detailQuery = row + this.deviceProjectSelectVisible = true + }, showImgViewer(row) { if (row.inspectImage.substr(-1) == ',') { @@ -533,7 +569,7 @@ export default { }, }, - components: {deviceInspectTakeAuditModify,ElImageViewer}, + components: {deviceInspectTakeAuditModify,ElImageViewer,DeviceInspectTakeDetail}, mounted() { document.body.ondrop = function (event) { event.preventDefault(); diff --git a/src/views/inventory/DeviceInspectTakeDetail.vue b/src/views/inventory/DeviceInspectTakeDetail.vue new file mode 100644 index 00000000..6c8447d3 --- /dev/null +++ b/src/views/inventory/DeviceInspectTakeDetail.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/src/views/inventory/DeviceInspectTakeSelect.vue b/src/views/inventory/DeviceInspectTakeSelect.vue index 7c0ad8cb..4f93b0ed 100644 --- a/src/views/inventory/DeviceInspectTakeSelect.vue +++ b/src/views/inventory/DeviceInspectTakeSelect.vue @@ -195,9 +195,37 @@
{{ scope.row.inspectImage }}
+ + + + + + + + + + @@ -209,6 +237,8 @@ import deviceInspectTakeAuditModify from "@/views/inventory/DeviceInspectTakeAud import {getDeviceInspectTakeList,selectDeviceInspecTakeDetail} from "@/api/inventory/deviceInspectTake"; import {previewImage, previewFile} from "@/api/purchase/supCompany"; import ElImageViewer from "element-ui/packages/image/src/image-viewer"; +import DeviceInspectTakeDetail from "@/views/inventory/DeviceInspectTakeDetail" + export default { name: "deviceInspectTake", @@ -260,6 +290,8 @@ export default { endTime: '', startTime: '', }, + deviceProjectSelectVisible: false, + detailQuery: null, showSearch: true, actDateRange: [], endDateRange: [], @@ -490,6 +522,10 @@ export default { this.formVisible = false; this.getList(); }, + datailSelect(row){ + this.detailQuery = row + this.deviceProjectSelectVisible = true + }, showImgViewer(row) { if (row.inspectImage.substr(-1) == ',') { @@ -521,7 +557,7 @@ export default { }, }, - components: {deviceInspectTakeAuditModify,ElImageViewer}, + components: {deviceInspectTakeAuditModify,ElImageViewer,DeviceInspectTakeDetail}, mounted() { document.body.ondrop = function (event) { event.preventDefault();