diff --git a/src/views/modules/eam/eamMaintenanceItem.vue b/src/views/modules/eam/eamMaintenanceItem.vue index 66b85d3..47f2a87 100644 --- a/src/views/modules/eam/eamMaintenanceItem.vue +++ b/src/views/modules/eam/eamMaintenanceItem.vue @@ -93,17 +93,6 @@ - - - - - - - - - - - @@ -115,6 +104,20 @@ + + + + + + + + + + + + + + 保存 关闭 @@ -265,6 +268,7 @@ itemRemark:'', itemType:'B', updateBy: this.$store.state.user.name, + imageFlag: '' }, departmentList:[], // 展示列集 @@ -405,6 +409,23 @@ status: true, fixed: '', }, + { + userId: this.$store.state.user.name, + functionId: 101011, + serialNumber: '101011TableValueChooseFlag', + tableId: "101011Table", + tableName: "common", + columnProp: 'imageFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否图片必填', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, { userId: this.$store.state.user.name, functionId: 101011, @@ -581,6 +602,7 @@ itemRemark:'', itemType:'B', updateBy: this.$store.state.user.name, + imageFlag: '' }; this.modalDisableFlag=false; this.modalFlag=true; @@ -607,6 +629,7 @@ itemRemark:row.itemRemark, itemType:'B', updateBy: this.$store.state.user.name, + imageFlag: row.imageFlag }; this.modalDisableFlag=true; this.modalFlag=true; @@ -639,20 +662,28 @@ }) }, saveData(){ - if (this.modalData.itemNo == '' || this.modalData.itemNo == null) { + if (this.modalData.itemNo === '' || this.modalData.itemNo == null) { this.$alert('请输入维保项目编码！', '错误', { confirmButtonText: '确定' }) return false } - if (this.modalData.itemDesc == '' || this.modalData.itemDesc == null) { + if (this.modalData.itemDesc === '' || this.modalData.itemDesc == null) { this.$alert('请输入维保项目名称！', '错误', { confirmButtonText: '确定' }) return false } - - if(this.modalData.flag=='1'){ + let obj = document.getElementsByName('addWorkOrderRule'); + let s = ''; + for (let i = 0; i < obj.length; i++) { + if (obj[i].checked) { + s += obj[i].value + ','; + } + } + s = s.substring(0,s.length-1) + this.modalData.imageFlag = s + if(this.modalData.flag === '1'){ eamPropertiesItemSave(this.modalData).then(({data}) => { if (data && data.code === '0') { this.getDataList() @@ -691,7 +722,7 @@ } }, addChooseModal(){ - this.itemFlag= this.chooseModalData.valueTypeDb=='T'?'text':'number'; + this.itemFlag= this.chooseModalData.valueTypeDb === 'T'?'text':'number'; this.itemData={ itemNo:this.chooseModalData.itemNo, valueNo:0, @@ -702,7 +733,7 @@ this.itemModalFlag=true; }, updateChooseModal(row){ - this.itemFlag= this.chooseModalData.valueTypeDb=='T'?'text':'number'; + this.itemFlag= this.chooseModalData.valueTypeDb === 'T'?'text':'number'; this.itemData={ itemNo:this.chooseModalData.itemNo, valueNo:row.valueNo, @@ -713,7 +744,7 @@ this.itemModalFlag=true; }, saveItemAvailable(){ - if(this.itemData.availableValue==''||this.itemData.availableValue==null){ + if(this.itemData.availableValue === ''||this.itemData.availableValue == null){ this.$alert("请输入可选值！",'错误', { confirmButtonText: '确定' }) diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue index a76187b..af4ae08 100644 --- a/src/views/modules/eam/eamWorkOrderForCheck.vue +++ b/src/views/modules/eam/eamWorkOrderForCheck.vue @@ -208,10 +208,8 @@ min-width="80" label="实测值"> { if (data && data.code === 0) { this.getDataList(); - this.detailModelFlag = false; + this.saveData.status = '待审核' this.$message({ message: '操作成功', type: 'success', @@ -904,7 +900,7 @@ checkWorkOrder(this.submitData).then(({data}) => { if (data && data.code === 0) { this.getDataList(); - this.detailModelFlag = false; + this.saveData.status = '已完工' this.$message({ message: '操作成功', type: 'success', @@ -949,7 +945,6 @@ } }) }, - // 详情 reportModal(row){ let indata = { @@ -1024,7 +1019,7 @@ this.changeModelFlag = true; }, changeOrderOperator(){ - let inList=JSON.parse(JSON.stringify(this.dataListSelections)); + let inList = JSON.parse(JSON.stringify(this.dataListSelections)); for (let i = 0; i @@ -351,9 +363,11 @@ } from "@/api/eam/eam.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' + import comEamItemImageUploadFile from './com_eam_itemImage_upload_file.vue' export default { components: { - Chooselist + Chooselist, + comEamItemImageUploadFile }, watch: { saveData: { @@ -793,6 +807,24 @@ fixed: '', columnWidth: 70, }, + { + userId: this.$store.state.user.name, + functionId: 101020, + serialNumber: '101020Table2MinValue', + tableId: "101020Table2", + tableName: "维保项目表", + columnProp: 'imageFlag', + headerAlign: "center", + align: "center", + columnLabel: '图片必填', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 70, + }, ], activeTable: 'inspection_form', HistoryRecordList: [], @@ -1116,7 +1148,6 @@ } }) }, - // 点击行选中复选框 operatorClickRow(row){ this.$refs.operatorTable.toggleRowSelection(row); @@ -1228,17 +1259,10 @@ functionId: this.$route.meta.menuId, } if (this.favorite) { - // 取消收藏 - // this.$confirm(`确定取消收藏`, '提示', { - // confirmButtonText: '确定', - // cancelButtonText: '取消', - // type: 'warning' - // }).then(() => { - removeUserFavorite(userFavorite).then(({data}) => { - this.$message.success(data.msg) - this.favorite = false - }) - // }) + removeUserFavorite(userFavorite).then(({data}) => { + this.$message.success(data.msg) + this.favorite = false + }) } else { // 收藏 saveUserFavorite(userFavorite).then(({data}) => { @@ -1293,7 +1317,7 @@ return this.exportList; }, startDownload() { - // this.exportData = this.dataList + }, finishDownload() { @@ -1455,8 +1479,24 @@ }) } }) - } - + }, + /** + * 上传图片 + */ + addUploadFileModal(row){ + let currentData = { + site: this.$store.state.user.site, + createBy: this.$store.state.user.name, + orderNo: this.saveData.orderNo, + functionType: 'B', + itemNo: row.itemNo, + folder: 'WBItemImageFile' + }; + //打开组件 去做新增业务 + this.$nextTick(() => { + this.$refs.comEamItemImageUploadFile.init(currentData); + }) + }, } }