From 09ff6bf4d83143e0db6067fd70e84bd5c925e67c Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 18 Dec 2023 14:16:49 +0800 Subject: [PATCH] =?UTF-8?q?2023-12-18=20=E4=BC=98=E5=8C=96=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 | 40 ++++++---- .../modules/eam/eamWorkPlanForMaintenance.vue | 65 +++++++++------- src/views/modules/qc/sub_detail_upload.vue | 21 +++-- .../com_eam_itemImage_upload_file.vue | 65 ++++++++-------- .../reportWorkOrder/report_image_upload.vue | 78 ++++++++++--------- 5 files changed, 148 insertions(+), 121 deletions(-) diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue index 968a834..0062330 100644 --- a/src/views/modules/eam/eamWorkPlanForCheck.vue +++ b/src/views/modules/eam/eamWorkPlanForCheck.vue @@ -154,7 +154,7 @@ type="date" value-format="yyyy-MM-dd" format='yyyy-MM-dd' - placeholder="必选" + placeholder="请选择" :editable=false :picker-options="pickerOptions2"> @@ -166,9 +166,9 @@ type="date" value-format="yyyy-MM-dd" format='yyyy-MM-dd' - placeholder="必选" + placeholder="请选择" :editable=false - :picker-options="pickerOptions3"> + :picker-options="pickerOptions2"> @@ -179,7 +179,7 @@ arrow-control style="width: 260px" v-model="modalData.taskStartDate" - placeholder="必选" + placeholder="请选择" value-format="HH:mm"> @@ -198,7 +198,7 @@ - + @@ -305,7 +305,9 @@ v-model="modalData.planStartDate" type="date" value-format="yyyy-MM-dd" - placeholder="必选"> + placeholder="请选择" + :editable=false + :picker-options="pickerOptions2"> @@ -314,7 +316,9 @@ v-model="modalData.planEndDate" type="date" value-format="yyyy-MM-dd" - placeholder="必选"> + placeholder="请选择" + :editable=false + :picker-options="pickerOptions2"> @@ -325,7 +329,7 @@ arrow-control style="width: 260px" v-model="modalData.taskStartDate" - placeholder="必选" + placeholder="请选择" value-format="HH:mm"> @@ -344,7 +348,7 @@ - + @@ -1628,7 +1632,7 @@ id:'A' }, // pointerEvents: '', - pickerOptions2: { + pickerOptions: { disabledDate (time) { let curDate = new Date().getTime() let curD = new Date() @@ -1645,7 +1649,7 @@ return time.getTime() > Date.now() || time.getTime() < threeMonths }, }, - pickerOptions3: { + pickerOptions2: { disabledDate (time) { return time.getTime() < Date.now() - 8.64e7 }, @@ -2065,6 +2069,13 @@ this.updateDetailData.planID = row.planID if (this.modalData.workOrderRule != null && this.modalData.workOrderRule.split(",").includes('A')) { this.modalData.workOrderRule = 'A' + } else { + this.modalData.workOrderRule = '' + } + if (this.modalData.autoRenewal != null && this.modalData.autoRenewal.split(",").includes('Y')) { + this.modalData.autoRenewal = 'Y' + } else { + this.modalData.autoRenewal = '' } getPlanDetailList(this.updateDetailData).then(({data}) => { if (data && data.code === 0) { @@ -2168,7 +2179,7 @@ s = s.substring(0, s.length - 1) this.modalData.workOrderRule = s // 自动生成 - let obj2 = document.getElementsByName('autoRenewalRule') + let obj2 = document.getElementsByName('addAutoRenewalRule') let s2 = '' for (let i = 0; i < obj2.length; i++) { if (obj2[i].checked) { @@ -2185,8 +2196,7 @@ message: '操作成功', type: 'success', duration: 1500, - onClose: () => { - } + onClose: () => {} }) } else { this.$alert(data.msg, '错误', { @@ -2208,7 +2218,7 @@ s = s.substring(0,s.length-1) this.modalData.workOrderRule = s // 自动生成 - let obj2 = document.getElementsByName('autoRenewalRule') + let obj2 = document.getElementsByName('updateAutoRenewalRule') let s2 = '' for (let i = 0; i < obj2.length; i++) { if (obj2[i].checked) { diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue index 86a5c9a..bc94637 100644 --- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue +++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue @@ -141,7 +141,7 @@ v-model="modalData.planStartDate" type="date" value-format="yyyy-MM-dd" - placeholder="必选" + placeholder="请选择" :editable=false :picker-options="pickerOptions2"> @@ -152,9 +152,9 @@ v-model="modalData.planEndDate" type="date" value-format="yyyy-MM-dd" - placeholder="必选" + placeholder="请选择" :editable=false - :picker-options="pickerOptions3"> + :picker-options="pickerOptions2"> @@ -184,7 +184,7 @@ - + @@ -278,7 +278,9 @@ v-model="modalData.planStartDate" type="date" value-format="yyyy-MM-dd" - placeholder="必选"> + placeholder="请选择" + :editable=false + :picker-options="pickerOptions2"> @@ -287,7 +289,9 @@ v-model="modalData.planEndDate" type="date" value-format="yyyy-MM-dd" - placeholder="必选"> + placeholder="请选择" + :editable=false + :picker-options="pickerOptions2"> @@ -317,7 +321,7 @@ - + @@ -1652,7 +1656,7 @@ columnWidth: '100' } ], - pickerOptions2: { + pickerOptions: { disabledDate (time) { let curDate = new Date().getTime() let curD = new Date() @@ -1669,7 +1673,7 @@ return time.getTime() > Date.now() || time.getTime() < threeMonths }, }, - pickerOptions3: { + pickerOptions2: { disabledDate (time) { return time.getTime() < Date.now() - 8.64e7 }, @@ -1991,6 +1995,7 @@ this.modalFlag = true }, updateModal (row) { + console.log(row) this.modalData = { flag: '2', objectList: [], @@ -2023,8 +2028,15 @@ this.updateDetailData = {} this.updateDetailData.site = row.site this.updateDetailData.planID = row.planID - if (this.modalData.workOrderRule.split(",").includes('A')) { + if (this.modalData.workOrderRule != null && this.modalData.workOrderRule.split(",").includes('A')) { this.modalData.workOrderRule = 'A' + } else { + this.modalData.workOrderRule = '' + } + if (this.modalData.autoRenewal != null && this.modalData.autoRenewal.split(",").includes('Y')) { + this.modalData.autoRenewal = 'Y' + } else { + this.modalData.autoRenewal = '' } getPlanDetailList(this.updateDetailData).then(({data}) => { if (data && data.code === 0) { @@ -2092,10 +2104,10 @@ this.$message.warning('请选择开始日期！') return } - if (this.modalData.planStartDate < this.dayjs().format("YYYY-MM-DD")) { - this.$message.warning('计划开始日期不能小于今天！') - return - } + // if (this.modalData.planStartDate < this.dayjs().format("YYYY-MM-DD")) { + // this.$message.warning('计划开始日期不能小于今天！') + // return + // } if (this.modalData.planEndDate === '' || this.modalData.planEndDate == null) { this.$message.warning('请选择结束日期！') return @@ -2115,17 +2127,17 @@ } this.saveLoading = true this.modalData.objectList = this.dataListSelections - let obj = document.getElementsByName('addWorkOrderRule'); - let s = ''; + let obj = document.getElementsByName('addWorkOrderRule') + let s = '' for (let i = 0; i < obj.length; i++) { if (obj[i].checked) { - s += obj[i].value + ','; + s += obj[i].value + ',' } } s = s.substring(0,s.length-1) this.modalData.workOrderRule = s // 自动生成 - let obj2 = document.getElementsByName('autoRenewalRule') + let obj2 = document.getElementsByName('addAutoRenewalRule') let s2 = '' for (let i = 0; i < obj2.length; i++) { if (obj2[i].checked) { @@ -2142,8 +2154,7 @@ message: '操作成功', type: 'success', duration: 1500, - onClose: () => { - } + onClose: () => {} }) } else { this.$alert(data.msg, '错误', { @@ -2165,7 +2176,7 @@ s = s.substring(0,s.length-1) this.modalData.workOrderRule = s // 自动生成 - let obj2 = document.getElementsByName('autoRenewalRule') + let obj2 = document.getElementsByName('updateAutoRenewalRule') let s2 = '' for (let i = 0; i < obj2.length; i++) { if (obj2[i].checked) { @@ -2182,8 +2193,7 @@ message: '操作成功', type: 'success', duration: 1500, - onClose: () => { - } + onClose: () => {} }) } else { this.$alert(data.msg, '错误', { @@ -2394,7 +2404,7 @@ }) }, // 下达 - createOrder(row){ + createOrder (row) { let tempData = { site: row.site, planID: row.planID, @@ -2411,7 +2421,7 @@ }) } }) - if(row.planStartDate < this.dayjs().format("YYYY-MM-DD")){ + if (row.planStartDate < this.dayjs().format("YYYY-MM-DD")) { this.$alert('计划开始日期小于今天！请修改开始日期', '错误', { confirmButtonText: '确定' }) @@ -2425,14 +2435,13 @@ }).then(() => { this.dataListLoading = true createEamWorkOrder(tempData).then(({data}) => { - if (data && data.code == 0) { + if (data && data.code === 0) { this.getDataList() this.$message({ message: '操作成功', type: 'success', duration: 1500, - onClose: () => { - } + onClose: () => {} }) } else { this.$alert(data.msg, '错误', { diff --git a/src/views/modules/qc/sub_detail_upload.vue b/src/views/modules/qc/sub_detail_upload.vue index c0e6262..2642d29 100644 --- a/src/views/modules/qc/sub_detail_upload.vue +++ b/src/views/modules/qc/sub_detail_upload.vue @@ -44,14 +44,14 @@ export default { }, methods: { //初始化组件的参数 - init(currentRow) { + init (currentRow) { // 获得类别 this.pageData = JSON.parse(JSON.stringify(currentRow)) //打开页面 this.visible = true }, // 上传之前 - beforeUploadHandle(file) { + beforeUploadHandle (file) { let extName = file[0].name.substring(file[0].name.lastIndexOf('.')).toLowerCase() if (!(extName === '.xlsx' || extName === '.xls')) { this.$message.error('数据导入失败，请选择正确的xlsx模板文件') @@ -59,14 +59,14 @@ export default { } }, /*选择上传文件时*/ - onChange(file){ + onChange (file) { this.fileList.push(file) }, /*关闭modal*/ - closeDialog(){ + closeDialog () { this.fileList = [] // 刷新报工的页面 - this.$emit('refreshPageTables') + //this.$emit('refreshPageTables') // 关闭当前的页面 this.visible = false }, @@ -98,12 +98,12 @@ export default { confirmButtonText: '确定', dangerouslyUseHTMLString: true }) - this.fileList = [] } + this.fileList = [] }) }, // 下载 - async downloadFile() { + async downloadFile () { let file = { id: 0, fileName: '' @@ -143,6 +143,13 @@ export default { }) }, + /** + * 点击 X 关闭对话框的回调 + **/ + handleDialogClose () { + this.fileList = [] + } + } } diff --git a/src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue b/src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue index 4f5d5ef..3f72ccf 100644 --- a/src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue +++ b/src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue @@ -78,15 +78,15 @@ export default { }, methods: { //初始化组件的参数 - init(currentRow) { + init (currentRow) { //初始化参数 - this.pageData = JSON.parse(JSON.stringify(currentRow)); + this.pageData = JSON.parse(JSON.stringify(currentRow)) //打开页面 - this.visible = true; + this.visible = true //重置人员信息 - // this.pageData.username = this.userId; - this.descImgs = []; - this.searchItemFileUrl(); + // this.pageData.username = this.userId + this.descImgs = [] + this.searchItemFileUrl() }, // 查询图片列表 searchItemFileUrl () { @@ -103,7 +103,7 @@ export default { }, // 上传之前 - beforeUploadHandle(file) { + beforeUploadHandle (file) { if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') { this.$message.error('只支持图片！') return false @@ -111,32 +111,32 @@ export default { this.num++ }, /*选择上传文件时*/ - onChange(file){ + onChange (file) { this.fileList.push(file); }, /*关闭modal*/ - closeDialog(){ - this.fileList = []; + closeDialog () { + this.fileList = [] // 刷新报工的页面 - this.$emit('refreshPageTables'); + // this.$emit('refreshPageTables') // 关闭当前的页面 - this.visible = false; + this.visible = false }, /*保修当前的数据*/ - saveUploadFile(){ + saveUploadFile () { /*判断文件是否上传*/ if(null == this.fileList || 0 === this.fileList.length){ - this.$message.error("请先上传图片!"); - return false; + this.$message.error("请先上传图片!") + return false } - const formData = new FormData(); + const formData = new FormData() //片接文件 - formData.append("file", this.fileList[0].raw); - formData.append("site", this.pageData.site); - formData.append("folder", this.pageData.folder); - formData.append("objectID", this.pageData.orderNo); - formData.append("orderRef1", this.pageData.itemNo); + formData.append("file", this.fileList[0].raw) + formData.append("site", this.pageData.site) + formData.append("folder", this.pageData.folder) + formData.append("objectID", this.pageData.orderNo) + formData.append("orderRef1", this.pageData.itemNo) uploadEamObjectFile(formData).then(({data}) => { if (data.code === 0) { this.$message.success(data.msg) @@ -145,15 +145,15 @@ export default { this.searchItemFileUrl() this.fileList = [] }else { - this.$message.warning(data.msg); + this.$message.warning(data.msg) } }) }, // 删除图片 - deleteImage(index, id) { + deleteImage (index, id) { let param = { id: id - }; + } this.$confirm(`是否删除该图片?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -161,10 +161,10 @@ export default { }).then(() => { imageDelete(param).then(({data}) => { if (data.code === 0) { - this.searchItemFileUrl(); - this.$message.success(data.msg); + this.searchItemFileUrl() + this.$message.success(data.msg) }else { - this.$message.warning(data.msg); + this.$message.warning(data.msg) } }) }).catch(() => { @@ -174,15 +174,12 @@ export default { /** * 点击 X 关闭对话框的回调 **/ - handleDialogClose() { - this.fileList = []; + handleDialogClose () { + this.fileList = [] // 刷新报工的页面 - this.$emit('refreshPageTables'); + // this.$emit('refreshPageTables') } - }, - created() { - - }, + } }