From 42d2aa6117884b07d62f45d4255fcfb92614a374 Mon Sep 17 00:00:00 2001 From: yangkang <yangkang@xalxzn.com> Date: 星期三, 13 九月 2023 15:42:50 +0800 Subject: [PATCH] 预测方案修改 --- src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue | 60 ++++++++++++++++-------------------------------------------- 1 files changed, 16 insertions(+), 44 deletions(-) diff --git a/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue b/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue index 5fcc5e4..8d605b5 100644 --- a/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue +++ b/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue @@ -181,39 +181,32 @@ @sendEquipmentRecord='sendEquipmentRecord' ></equipment-list> - <!-- <j-select-maintenance-standard-modal ref="maintenanceStandardModalForm"></j-select-maintenance-standard-modal>--> </a-modal> </template> <script> - import { getAction, postAction, requestPut, deleteAction } from '@/api/manage' + import { postAction, requestPut } from '@/api/manage' import pick from 'lodash.pick' import JMultiSelectTag from '@/components/dict/JMultiSelectTag' - import { duplicateCheck } from '@/api/api' import Tooltip from 'ant-design-vue/es/tooltip' - // import JSelectMaintenanceStandardModal from './JSelectMaintenanceStandardModal' import { preview } from 'vue-photo-preview' - import { ACCESS_TOKEN } from '@/store/mutation-types' - import Vue from 'vue' import PdfView from '@views/common/PdfView' - import { getFileAccessHttpUrl } from '@/api/manage' - import EquipmentList from '.././dailyInspectionStandard/EquipmentList' + import EquipmentList from '@/views/eam/common/EquipmentList' export default { name: 'MaintenanceStandardModal', components: { JMultiSelectTag, Tooltip, - // JSelectMaintenanceStandardModal, - // UploadModel, PdfView, preview, EquipmentList }, data() { - return {title: '鎿嶄綔', + return { + title: '鎿嶄綔', visible: false, visible4Confirm: false, disableSubmit: false, @@ -270,13 +263,10 @@ } }, url: { - list: '/eam/maintenanceStandardDetail/getMaintenanceStandardDetailListByIds', add: '/eam/predictiveworkplan/add', edit: '/eam/predictiveworkplan/edit', - addDetail: '/eam/maintenanceStandardDetail/add', - revise: '/eam/maintenanceStandard/revise', - getReviseVersion: '/eam/maintenanceStandard/getReviseVersion', - loadOptions: '/sys/sysDepart/loadDepartTreeOptions' + revise: '/eam/predictiveworkplan/revise', + getReviseVersion: '/eam/predictiveworkplan/getReviseVersion' }, dataSource: [], @@ -294,31 +284,23 @@ methods: { add() { - this.edit({ maintenanceStandardDetaillist: [] }) + this.edit() }, edit(record) { let that = this - this.initOptions() this.dataSource = [] this.form.resetFields() this.model = Object.assign({}, record) this.visible = true - if (record.maintenanceStandardDetaillist != undefined) { - const temp = [...record.maintenanceStandardDetaillist] - // for (let i = 0; i < temp.length; i++) { - // let r = temp[i].upload; - // r.src = this.getSrc(temp[i].upload); - // } - that.dataSource = temp - } that.$nextTick(() => { - that.model.equipmentId = record.id + that.model.equipmentId = record.equipmentId that.model.teamId = record.teamId - if (!record.status) { - that.model.status = 1 - } - that.form.setFieldsValue(pick(that.model, 'num', 'equipmentName', 'useDepartName', 'teamName', 'assignMode', 'planVersion', 'remark')) + that.form.setFieldsValue(pick(that.model, 'num', 'name', 'monitorType', 'maintenanceMethod', 'assignMode', 'teamName', 'planVersion')) + that.form.setFieldsValue({ + equipmentName: record.deviceNum + '/' + record.deviceName + '/' + record.deviceModel, + historyVersion: record.planVersion + }) }) if (record.id) { this.codeDisable = true @@ -326,7 +308,7 @@ if (that.isRevise) { requestPut(that.url.getReviseVersion, record).then((res) => { if (res.success) { - that.form.setFieldsValue({ planVersion: res.result, historyVersion: record.version }) + that.form.setFieldsValue({ planVersion: res.result }) } }) } @@ -337,16 +319,6 @@ that.form.setFieldsValue({ 'planVersion': '1.0' }) }) } - }, - - initOptions() { - getAction(this.url.loadOptions).then(res => { - if (res.success) { - this.treeData = res.result - } else { - this.$message.warning(res.message) - } - }) }, onEquipmentList() { @@ -381,11 +353,11 @@ let formData = Object.assign(this.model, values) let obj if (!this.model.id) { - formData.planVersion = '1' + formData.status = '1' obj = postAction(this.url.add, formData) } else { if (this.isRevise) { - formData.planVersion = '1' + formData.status = '1' obj = postAction(this.url.revise, formData) } else { obj = requestPut(this.url.edit, formData, { id: this.model.id }) -- Gitblit v1.9.3