haozq
/
lj-zhgd-htweb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
jjLv 2024-08-29 17:43:40 +08:00
parent affe602366
commit afd77cea06
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/base/project/index.vue
View File

@ -480,6 +480,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const projectId = row.projectId || this.ids; const projectId = row.projectId || this.ids;
const projectDepartName = row.projectDepartName;
if(row.pronum>0){ if(row.pronum>0){
this.$alert('该项目部存在工程，无法删除', '提示', { this.$alert('该项目部存在工程，无法删除', '提示', {
type: 'warning', type: 'warning',
@ -487,14 +488,14 @@ export default {
}); });
return; return;
} }
if(row.appnum>0){ // if(row.appnum>0){
this.$alert('该项目部存在APP轮播图，无法删除', '提示', { // this.$alert('该项目部存在APP轮播图，无法删除', '提示', {
type: 'warning', // type: 'warning',
confirmButtonText: '确定', // confirmButtonText: '确定',
}); // });
return; // return;
} // }
this.$modal.confirm('是否确认删除项目部名称为"' + projectId + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除项目部名称为"' + projectDepartName + '"的数据项？').then(function() {
return delProject(projectId); return delProject(projectId);
}).then(() => { }).then(() => {
this.getList(); this.getList();

19
src/views/base/staff/index.vue
View File

@ -630,6 +630,12 @@
const fileListTemp = fileList.filter(item => { const fileListTemp = fileList.filter(item => {
return item.uid != file.uid 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){ if(file.size > 1024 * 1024 * 10){
this.$message.warning('文件大小不能超过10Mb') this.$message.warning('文件大小不能超过10Mb')
fileList = fileList.filter(item => { fileList = fileList.filter(item => {
@ -660,6 +666,12 @@
const fileListTemp = fileList.filter(item => { const fileListTemp = fileList.filter(item => {
return item.uid != file.uid 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){ if(file.size > 1024 * 1024 * 10){
this.$message.warning('文件大小不能超过10Mb') this.$message.warning('文件大小不能超过10Mb')
fileList = fileList.filter(item => { fileList = fileList.filter(item => {
@ -690,6 +702,12 @@
const fileListTemp = fileList.filter(item => { const fileListTemp = fileList.filter(item => {
return item.uid != file.uid 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){ if(file.size > 1024 * 1024 * 10){
this.$message.warning('文件大小不能超过10Mb') this.$message.warning('文件大小不能超过10Mb')
fileList = fileList.filter(item => { fileList = fileList.filter(item => {
@ -949,6 +967,7 @@
}, },
//打开证书上传 //打开证书上传
openCertificate(row){ openCertificate(row){
this.title = "证书上传";
this.memberId = row.id; this.memberId = row.id;
this.highImgList = []; this.highImgList = [];
this.electricianImgList = []; this.electricianImgList = [];