From 9f8d60445643ff3ce75c47fdb854169f13e080e5 Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 20 Feb 2024 15:53:31 +0800 Subject: [PATCH] =?UTF-8?q?done=20=E4=BF=9D=E5=85=BB=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../specialEquipment/maintain/WaitingList.vue | 47 +- .../maintain/WaitingListPlanned--edit.vue | 758 ++++++++++++++++++ .../maintain/WaitingListTable.vue | 2 +- 3 files changed, 791 insertions(+), 16 deletions(-) create mode 100644 src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue index d23031f5..e710cace 100644 --- a/src/views/specialEquipment/maintain/WaitingList.vue +++ b/src/views/specialEquipment/maintain/WaitingList.vue @@ -74,12 +74,18 @@ + - + @closed="recordDetailVisible = false" /> @@ -90,11 +96,13 @@ import moment from 'moment'; import basicPageMixin from '@/mixins/lb/basicPageMixin'; import DialogFormUnplanned from './WaitingList--add--unplanned.vue'; import UnplannedEditDrawer from './WaitingListUnplanned--edit.vue'; +import PlannedEditDrawer from './WaitingListPlanned--edit.vue'; import { deleteEqMaintainLog, exportMaintainLogExcel, } from '@/api/equipment/base/maintain/record'; import WaitingListTable from './WaitingListTable.vue'; +import RecordDetail from './Record--detail.vue'; const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); @@ -123,7 +131,13 @@ const btn = { export default { name: 'SpecialEquipmentMaintainRecord', - components: { DialogFormUnplanned, WaitingListTable, UnplannedEditDrawer }, + components: { + DialogFormUnplanned, + WaitingListTable, + RecordDetail, + UnplannedEditDrawer, + PlannedEditDrawer + }, mixins: [basicPageMixin], data() { return { @@ -449,6 +463,7 @@ export default { allSpecialEquipments: [], openPlannedDrawer: false, openUnplannedDrawer: false, + openPlannedDrawer: false, }; }, watch: { @@ -604,7 +619,7 @@ export default { this.recv({ ...this.queryParams, special: true, - relatePlan: 2, + // relatePlan: 2, confirmed: false, }).then((response) => { this.list = response.data.list; @@ -730,10 +745,13 @@ export default { this.reset(); if (row.relatePlan == 1) { // 计划型 - const res = await this.info({ id: row.id }); - this.form = res.data; - this.form.maintainWorker = res.data.maintainWorker.split(','); + // const res = await this.info({ id: row.id }); + // this.form = res.data; + // this.form.maintainWorker = res.data.maintainWorker.split(','); this.openPlannedDrawer = true; + this.$nextTick(() => { + this.$refs.planned.init(row); + }); } else { this.openUnplannedDrawer = true; this.$nextTick(() => { @@ -760,14 +778,13 @@ export default { .catch(console.error); }, handleDetail(row) { - console.log('detail', row); - return; - this.reset(); - this.mode = 'detail'; - this.info({ id }).then((response) => { - this.form = response.data; - // this.open = true; - // this.title = '查看保养记录详情'; + this.recordDetailVisible = true; + this.$nextTick(() => { + this.$refs.recordDetailDrawer.show({ + id: row.id, + planMaintainWorker: row.planMaintainWorker, + maintainWorker: row.maintainWorker, + }); }); }, /** 导出按钮操作 */ diff --git a/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue b/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue new file mode 100644 index 00000000..a5a202fc --- /dev/null +++ b/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue @@ -0,0 +1,758 @@ + + + + + + + diff --git a/src/views/specialEquipment/maintain/WaitingListTable.vue b/src/views/specialEquipment/maintain/WaitingListTable.vue index edad3470..697fbd8e 100644 --- a/src/views/specialEquipment/maintain/WaitingListTable.vue +++ b/src/views/specialEquipment/maintain/WaitingListTable.vue @@ -39,7 +39,7 @@ width="128" label="设备保养单号" prop="maintainOrderNumber"> - +