From 529596b9238d7e79bc817f38fe523a82ad4e5e14 Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 27 Feb 2024 17:08:15 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=9D=E5=85=BB=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../check/Content-add_detail.vue | 2 +- src/views/specialEquipment/check/Content.vue | 2 +- .../specialEquipment/maintain/WaitingList.vue | 93 ++-- .../maintain/WaitingListPlanned--edit.vue | 53 +- .../WaitingListUnplanned--add_detail.vue | 516 ++++++++++++++++++ .../maintain/WaitingListUnplanned--edit.vue | 6 +- 6 files changed, 629 insertions(+), 43 deletions(-) create mode 100644 src/views/specialEquipment/maintain/WaitingListUnplanned--add_detail.vue diff --git a/src/views/specialEquipment/check/Content-add_detail.vue b/src/views/specialEquipment/check/Content-add_detail.vue index b9acd19d..cfd9796d 100644 --- a/src/views/specialEquipment/check/Content-add_detail.vue +++ b/src/views/specialEquipment/check/Content-add_detail.vue @@ -269,7 +269,7 @@ export default { }, getConfirmed() { - return this.$confirm('是否直接确认保养记录', '提示', { + return this.$confirm('是否直接确认巡检记录', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue index ddd1d638..df82ec23 100644 --- a/src/views/specialEquipment/check/Content.vue +++ b/src/views/specialEquipment/check/Content.vue @@ -281,7 +281,7 @@ export default { /** 新增按钮操作 */ handleAdd() { this.open = true; - this.title = '新建巡检单'; + this.title = '新增巡检单'; this.$nextTick(() => { this.$refs.add.init(); }); diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue index 9c72bf40..486d3c5c 100644 --- a/src/views/specialEquipment/maintain/WaitingList.vue +++ b/src/views/specialEquipment/maintain/WaitingList.vue @@ -76,6 +76,7 @@ v-if="openUnplannedDrawer" @refreshDataList="getList" @destroy="openUnplannedDrawer = false" /> + + + @@ -95,8 +102,8 @@ 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 UnplannedAddDet from './WaitingListUnplanned--add_detail.vue'; import { - deleteEqMaintainLog, exportMaintainLogExcel, } from '@/api/equipment/base/maintain/record'; import WaitingListTable from './WaitingListTable.vue'; @@ -134,7 +141,8 @@ export default { WaitingListTable, RecordDetail, UnplannedEditDrawer, - PlannedEditDrawer + UnplannedAddDet, + PlannedEditDrawer, }, mixins: [basicPageMixin], data() { @@ -461,7 +469,7 @@ export default { allSpecialEquipments: [], openPlannedDrawer: false, openUnplannedDrawer: false, - openPlannedDrawer: false, + openUnplannedDetDrawer: false, }; }, watch: { @@ -681,7 +689,6 @@ export default { if (!valid) { return; } - // 修改的提交 if (this.form.id != null) { this.put({ ...this.form, @@ -694,36 +701,51 @@ export default { this.getList(); }); return; + } else { + this.post({ + ...this.form, + maintainWorker: this.form.maintainWorker.join(','), + special: true, + relatePlan: 2, + confirmed: false, + }).then((response) => { + this.$modal.msgSuccess('新增成功'); + this.open = false; + this.getList(); + setTimeout(() => { + this.handleAddDet(response.data); + }, 450); + }); } // 添加的提交 - this.getConfirmed() - .then((confirmed) => { - this.post({ - ...this.form, - maintainWorker: this.form.maintainWorker.join(','), - special: true, - relatePlan: 2, - confirmed: true, - }).then((response) => { - this.$modal.msgSuccess('新增成功'); - this.open = false; - this.getList(); - }); - }) - .catch((err) => { - this.post({ - ...this.form, - maintainWorker: this.form.maintainWorker.join(','), - special: true, - relatePlan: 2, - confirmed: false, - }).then((response) => { - this.$modal.msgSuccess('新增成功'); - this.open = false; - this.getList(); - }); - }); + // this.getConfirmed() + // .then((confirmed) => { + // this.post({ + // ...this.form, + // maintainWorker: this.form.maintainWorker.join(','), + // special: true, + // relatePlan: 2, + // confirmed: true, + // }).then((response) => { + // this.$modal.msgSuccess('新增成功'); + // this.open = false; + // this.getList(); + // }); + // }) + // .catch((err) => { + // this.post({ + // ...this.form, + // maintainWorker: this.form.maintainWorker.join(','), + // special: true, + // relatePlan: 2, + // confirmed: false, + // }).then((response) => { + // this.$modal.msgSuccess('新增成功'); + // this.open = false; + // this.getList(); + // }); + // }); }); }, /** 确认 */ @@ -757,6 +779,15 @@ export default { }); } }, + + /** 新增后添加内容 */ + handleAddDet(id) { + this.openUnplannedDetDrawer = true; + this.$nextTick(() => { + this.$refs['unplanned-det'].init({ id }); + }); + }, + /** 删除按钮操作 */ handleDelete(row) { this.$modal diff --git a/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue b/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue index a5a202fc..730717f4 100644 --- a/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue +++ b/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue @@ -209,12 +209,12 @@
-
+ - + @clickBtn="handleTableBtnClick" /> --> @@ -324,6 +324,45 @@ export default { { prop: 'maintenanceDes', label: '保养描述', + subcomponent: { + name: 'TableCellInput', + props: ['injectData'], + data() { + return { + inputvalue: null, + }; + }, + mounted() { + this.inputvalue = this.injectData.maintenanceDes; + }, + methods: { + async handleValueChange(maintenanceDes) { + document.body.style.cursor = 'wait'; + await this.$axios({ + url: '/base/equipment-maintain-log-det/update', + method: 'put', + data: { + logId: this.injectData.logId, + remark: this.injectData.remark, + program: this.injectData.program, + id: this.injectData.id, + maintenanceDes: maintenanceDes, + }, + }); + document.body.style.cursor = 'default'; + }, + }, + render: function (h) { + return ( + + ); + }, + }, }, ], attrList: [], @@ -584,7 +623,7 @@ export default { handleAddAttr() { if (!this.row.id) return this.$message.error('请先选中保养记录'); this.resetAttrform(); - this.attrTitle = '添加设备属性'; + this.attrTitle = '添加保养项目'; this.attrFormVisible = true; }, @@ -597,14 +636,14 @@ export default { }); if (res.code == 0) { this.attrForm = res.data; - this.attrTitle = '编辑设备属性'; + this.attrTitle = '编辑保养项目'; this.attrFormVisible = true; } }, // 删除属性 handleDeleteAttr(attrId) { - this.$confirm('确定删除该保养内容?', '提示', { + this.$confirm('确定删除该保养项目?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', diff --git a/src/views/specialEquipment/maintain/WaitingListUnplanned--add_detail.vue b/src/views/specialEquipment/maintain/WaitingListUnplanned--add_detail.vue new file mode 100644 index 00000000..65ac8674 --- /dev/null +++ b/src/views/specialEquipment/maintain/WaitingListUnplanned--add_detail.vue @@ -0,0 +1,516 @@ + + + + + + + diff --git a/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue b/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue index 926de9fa..25e19b2c 100644 --- a/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue +++ b/src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue @@ -559,7 +559,7 @@ export default { handleAddAttr() { if (!this.row.id) return this.$message.error('请先选中保养记录'); this.resetAttrform(); - this.attrTitle = '添加设备属性'; + this.attrTitle = '添加保养项目'; this.attrFormVisible = true; }, @@ -572,14 +572,14 @@ export default { }); if (res.code == 0) { this.attrForm = res.data; - this.attrTitle = '编辑设备属性'; + this.attrTitle = '编辑保养项目'; this.attrFormVisible = true; } }, // 删除属性 handleDeleteAttr(attrId) { - this.$confirm('确定删除该属性?', '提示', { + this.$confirm('确定删除该保养项目?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning',