Merge branch 'zcwy-0306' into dev0223

This commit is contained in:
zhangsir
2024-04-11 19:28:36 +08:00

View File

@@ -703,7 +703,7 @@ import {timeoutUpload} from "@/api/configPublic";
const userInfo = computed(() => store.state.userInfo); const userInfo = computed(() => store.state.userInfo);
const router = useRouter(); const router = useRouter();
const state = reactive({ const state = reactive({
fileLists: [], uploadTypes: true,
saveNotUpload: true, saveNotUpload: true,
stateUpload: true, stateUpload: true,
uploadParameters: {}, uploadParameters: {},
@@ -1250,7 +1250,7 @@ import {timeoutUpload} from "@/api/configPublic";
return false; return false;
}; };
const beforeUpload3 = async (file) => { const beforeUpload3 = async (file) => {
console.log('bbbbb') state.uploadTypes = true
if(file.type === "application/pdf"){ if(file.type === "application/pdf"){
const pattern = /^([0-9\u4e00-\u9fa5\a-z\A-Z]+-){2}[0-9\u4e00-\u9fa5\a-z\A-Z]+\.\w*$/; const pattern = /^([0-9\u4e00-\u9fa5\a-z\A-Z]+-){2}[0-9\u4e00-\u9fa5\a-z\A-Z]+\.\w*$/;
if (!pattern.test(file.name)) { if (!pattern.test(file.name)) {
@@ -1317,7 +1317,9 @@ import {timeoutUpload} from "@/api/configPublic";
// } // }
} }
const handleChange = ({file, fileList,event}) => { const handleChange = ({file, fileList,event}) => {
state.fileLists = fileList if(!state.uploadTypes){
return
}
if(file.response && file.response.code === 200){ if(file.response && file.response.code === 200){
state.totalNumber = file.response.data state.totalNumber = file.response.data
state.sussessIds = file.response.data?.successId state.sussessIds = file.response.data?.successId
@@ -1332,6 +1334,7 @@ import {timeoutUpload} from "@/api/configPublic";
}; };
const uploadRef = ref() const uploadRef = ref()
const delUploadList = (i) => { const delUploadList = (i) => {
state.uploadTypes = false
state.uploadDownLoad = false state.uploadDownLoad = false
state.sussessIds = null state.sussessIds = null
state.failedId = '' state.failedId = ''