diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue index b3e4354..62d9a8c 100644 --- a/src/views/base/project/index.vue +++ b/src/views/base/project/index.vue @@ -480,6 +480,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const projectId = row.projectId || this.ids; + const projectDepartName = row.projectDepartName; if(row.pronum>0){ this.$alert('该项目部存在工程,无法删除', '提示', { type: 'warning', @@ -487,14 +488,14 @@ export default { }); return; } - if(row.appnum>0){ - this.$alert('该项目部存在APP轮播图,无法删除', '提示', { - type: 'warning', - confirmButtonText: '确定', - }); - return; - } - this.$modal.confirm('是否确认删除项目部名称为"' + projectId + '"的数据项?').then(function() { + // if(row.appnum>0){ + // this.$alert('该项目部存在APP轮播图,无法删除', '提示', { + // type: 'warning', + // confirmButtonText: '确定', + // }); + // return; + // } + this.$modal.confirm('是否确认删除项目部名称为"' + projectDepartName + '"的数据项?').then(function() { return delProject(projectId); }).then(() => { this.getList(); diff --git a/src/views/base/staff/index.vue b/src/views/base/staff/index.vue index 30feb06..7a9607e 100644 --- a/src/views/base/staff/index.vue +++ b/src/views/base/staff/index.vue @@ -630,6 +630,12 @@ const fileListTemp = fileList.filter(item => { return item.uid != file.uid }); + if(!(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf' || file.name.split('.')[1] === 'png' || file.name.split('.')[1] === 'jpg' || file.name.split('.')[1] === 'jpeg')){ + this.$message.warning('文件格式不正确') + fileList = fileList.filter(item => { + return item.uid != file.uid + }) + } if(file.size > 1024 * 1024 * 10){ this.$message.warning('文件大小不能超过10Mb') fileList = fileList.filter(item => { @@ -660,6 +666,12 @@ const fileListTemp = fileList.filter(item => { return item.uid != file.uid }); + if(!(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf' || file.name.split('.')[1] === 'png' || file.name.split('.')[1] === 'jpg' || file.name.split('.')[1] === 'jpeg')){ + this.$message.warning('文件格式不正确') + fileList = fileList.filter(item => { + return item.uid != file.uid + }) + } if(file.size > 1024 * 1024 * 10){ this.$message.warning('文件大小不能超过10Mb') fileList = fileList.filter(item => { @@ -690,6 +702,12 @@ const fileListTemp = fileList.filter(item => { return item.uid != file.uid }); + if(!(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf' || file.name.split('.')[1] === 'png' || file.name.split('.')[1] === 'jpg' || file.name.split('.')[1] === 'jpeg')){ + this.$message.warning('文件格式不正确') + fileList = fileList.filter(item => { + return item.uid != file.uid + }) + } if(file.size > 1024 * 1024 * 10){ this.$message.warning('文件大小不能超过10Mb') fileList = fileList.filter(item => { @@ -949,6 +967,7 @@ }, //打开证书上传 openCertificate(row){ + this.title = "证书上传"; this.memberId = row.id; this.highImgList = []; this.electricianImgList = [];