From 632323a5df8a7d593a09796528449b5b074bfd6d Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 15 Dec 2023 17:59:08 +0800 Subject: [PATCH] =?UTF-8?q?2023-12-15=20=E5=A2=9E=E5=8A=A0=E2=80=9C?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E2=80=9D=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=EF=BC=8C=E5=88=A4=E6=96=AD=E8=AE=A1=E5=88=92=E5=88=B0=E8=BE=BE?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F=E8=87=AA=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/eam/eamWorkPlanForCheck.vue | 84 +++++++++++++------ .../modules/eam/eamWorkPlanForMaintenance.vue | 43 ++++++++-- 2 files changed, 95 insertions(+), 32 deletions(-) diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue index c2d9d67..968a834 100644 --- a/src/views/modules/eam/eamWorkPlanForCheck.vue +++ b/src/views/modules/eam/eamWorkPlanForCheck.vue @@ -139,7 +139,7 @@ - 点检模板 + 点检模板 @@ -184,10 +184,10 @@ - + - + @@ -197,6 +197,9 @@ + + + @@ -277,26 +280,28 @@ - + - + - + + + 点检模板 - + - + + + - - - - - - + - + @@ -341,15 +343,23 @@ + + + - 计划执行人员 - + 计划执行人员 + - 选择审核人员 - + 选择审核人员 + + + + + +
@@ -845,7 +855,8 @@ remark:'', workOrderRule:'', planCycle: '', - taskStartDate: '' + taskStartDate: '', + autoRenewal: '' }, objectData:{ site: this.$store.state.user.site, @@ -2011,7 +2022,8 @@ remark: '', workOrderRule: '', planCycle: '天', - taskStartDate: '' + taskStartDate: '', + autoRenewal: '' } this.modalDisableFlag = false this.objectList = [] @@ -2044,7 +2056,8 @@ remark: row.remark, workOrderRule: row.workOrderRule, planCycle: row.planCycle, - taskStartDate: row.taskStartDate + taskStartDate: row.taskStartDate, + autoRenewal: row.autoRenewal } this.updateObjectList = [] this.updateDetailData = {} @@ -2144,6 +2157,7 @@ } this.saveLoading = true this.modalData.objectList = this.dataListSelections + // 周日 let obj = document.getElementsByName('addWorkOrderRule') let s = '' for (let i = 0; i < obj.length; i++) { @@ -2153,6 +2167,16 @@ } s = s.substring(0, s.length - 1) this.modalData.workOrderRule = s + // 自动生成 + let obj2 = document.getElementsByName('autoRenewalRule') + let s2 = '' + for (let i = 0; i < obj2.length; i++) { + if (obj2[i].checked) { + s2 += obj2[i].value + ',' + } + } + s2 = s2.substring(0, s2.length - 1) + this.modalData.autoRenewal = s2 eamWorkPlanSave(this.modalData).then(({data}) => { if (data && data.code === 0) { this.getDataList() @@ -2183,6 +2207,16 @@ } s = s.substring(0,s.length-1) this.modalData.workOrderRule = s + // 自动生成 + let obj2 = document.getElementsByName('autoRenewalRule') + let s2 = '' + for (let i = 0; i < obj2.length; i++) { + if (obj2[i].checked) { + s2 += obj2[i].value + ',' + } + } + s2 = s2.substring(0, s2.length - 1) + this.modalData.autoRenewal = s2 eamWorkPlanEdit(this.modalData).then(({data}) => { if (data && data.code === 0) { this.getDataList() diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue index e14c3f1..86a5c9a 100644 --- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue +++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue @@ -170,10 +170,10 @@ - + - + @@ -183,6 +183,9 @@ + + + @@ -300,10 +303,10 @@ - + - + @@ -313,6 +316,9 @@ + + + @@ -834,7 +840,8 @@ remark:'', workOrderRule: '', planCycle: '', - planHaltDate: '' + planHaltDate: '', + autoRenewal: '' }, objectData:{ site: this.$store.state.user.site, @@ -1976,7 +1983,8 @@ remark: '', workOrderRule: '', planCycle: '天', - planHaltDate: '' + planHaltDate: '', + autoRenewal: '' } this.modalDisableFlag = false this.objectList = [] @@ -2008,7 +2016,8 @@ remark: row.remark, workOrderRule: row.workOrderRule, planCycle: row.planCycle, - planHaltDate: row.planHaltDate + planHaltDate: row.planHaltDate, + autoRenewal: row.autoRenewal } this.updateObjectList = [] this.updateDetailData = {} @@ -2115,6 +2124,16 @@ } s = s.substring(0,s.length-1) this.modalData.workOrderRule = s + // 自动生成 + let obj2 = document.getElementsByName('autoRenewalRule') + let s2 = '' + for (let i = 0; i < obj2.length; i++) { + if (obj2[i].checked) { + s2 += obj2[i].value + ',' + } + } + s2 = s2.substring(0, s2.length - 1) + this.modalData.autoRenewal = s2 eamWorkPlanSave(this.modalData).then(({data}) => { if (data && data.code === 0) { this.getDataList() @@ -2145,6 +2164,16 @@ } s = s.substring(0,s.length-1) this.modalData.workOrderRule = s + // 自动生成 + let obj2 = document.getElementsByName('autoRenewalRule') + let s2 = '' + for (let i = 0; i < obj2.length; i++) { + if (obj2[i].checked) { + s2 += obj2[i].value + ',' + } + } + s2 = s2.substring(0, s2.length - 1) + this.modalData.autoRenewal = s2 eamWorkPlanEdit(this.modalData).then(({data}) => { if (data && data.code === 0) { this.getDataList()