diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index cd68809b..c5e002b7 100644 --- a/src/components/UploadFile/src/UploadFile.vue +++ b/src/components/UploadFile/src/UploadFile.vue @@ -9,6 +9,7 @@ :disabled="disabled" :drag="drag" :http-request="httpRequest" + :accept="acceptTypes" :limit="props.limit" :multiple="props.limit > 1" :on-error="excelUploadError" @@ -102,6 +103,18 @@ const nameMap = ref>({}) const { uploadUrl, httpRequest } = useUpload() +const acceptTypes = computed(() => + props.fileType + .map((type: string) => { + const normalizedType = String(type).trim() + if (!normalizedType) return '' + if (normalizedType.startsWith('.') || normalizedType.includes('/')) return normalizedType + return `.${normalizedType}` + }) + .filter(Boolean) + .join(',') +) + const emitUploadingChange = () => { emit('uploading-change', uploadPendingCount.value > 0) } diff --git a/src/views/mes/deviceledger/detail/editIndex.vue b/src/views/mes/deviceledger/detail/editIndex.vue index 0adf9f09..02459aac 100644 --- a/src/views/mes/deviceledger/detail/editIndex.vue +++ b/src/views/mes/deviceledger/detail/editIndex.vue @@ -176,6 +176,8 @@ @@ -426,8 +428,6 @@ const parseIdsValue = (value: any): number[] => { const selectedRows = ref([]) // 存储所有选中的行 const bjSelectedRows = ref([]) // 存储所有选中的行 const queryParams = reactive({ - pageNo: 1, - pageSize: 10, code: undefined as string | undefined, name: undefined as string | undefined, description: undefined as string | undefined, @@ -734,6 +734,25 @@ const formLoading = ref(false) const fileUploading = ref(false) const formType = ref('update') const formRef = ref() +const materialFileTypes = [ + 'png', + 'jpg', + 'jpeg', + 'webp', + 'doc', + 'docx', + 'xls', + 'xlsx', + 'ppt', + 'pptx', + 'pdf', + 'zip', + 'rar', + '7z', + 'dwg', + 'dxf', + 'mp4' +] const formData = ref({ ...initFormData() }) @@ -1442,5 +1461,3 @@ onBeforeUnmount(() => { - -