Browse Source

bug修复

master
xuhuajiao 23 hours ago
parent
commit
81849187a8
  1. 3
      src/views/components/category/PreviewForm.vue
  2. 0
      src/views/components/category/preUpload-20260126.vue
  3. 30
      src/views/components/category/preUpload.vue

3
src/views/components/category/PreviewForm.vue

@ -745,7 +745,6 @@ export default {
this.formPreviewData.map(item => {
if (item.isAutomatic) {
this.$set(this.addOrUpdateForm, item.fieldName, string)
// archive_year
if (item.fieldName === 'archive_no') {
const rule = {}
@ -1281,6 +1280,7 @@ export default {
if (this.archivesType === 'add') {
this.addOrUpdateForm.fonds_affiliation = this.selectedCategory.fondsId
}
const originalArchiveNo = this.addOrUpdateForm.archive_no
console.log('this.addOrUpdateForm', this.addOrUpdateForm)
this.$nextTick(() => {
@ -1288,6 +1288,7 @@ export default {
this.$refs[formName].validate((valid, fields) => {
if (valid) {
this.addOrUpdateForm.archive_no = originalArchiveNo
delete this.addOrUpdateForm.id
this.$emit('formLoadingShow', true)
//

0
src/views/components/category/preUpload2.vue → src/views/components/category/preUpload-20260126.vue

30
src/views/components/category/preUpload.vue

@ -1,6 +1,5 @@
<template>
<div class="upload-minio">
<!-- 文件选择按钮与隐藏的input -->
<el-button
v-if="isPreFile !== 'true'"
type="primary"
@ -10,15 +9,6 @@
>
选择文件
</el-button>
<!--<input
type="file"
multiple
:disabled="!isCaValid || isCheckingCa"
:accept="fileAcceptType"
class="file-input"
@change="handleFileSelect"
> -->
<el-dialog
title="文件列表"
class="minio-file"
@ -47,14 +37,6 @@
</div>
</div>
</div>
<!-- <el-button
type="success"
style="margin-bottom: 20px"
:disabled="fileList.some(item => item.uploading || item.merging) || fileList.length === 0"
@click="handleUploadConfirm"
>
开始上传
</el-button> -->
<div v-if="fileList.length !== 0" style="max-height: 400px; overflow: hidden; overflow-y: scroll;">
<div
v-for="(fileItem, index) in fileList"
@ -664,18 +646,6 @@ export default {
throw new Error(response.data.msg || '合并失败')
}
}
// URL
// const mergeApiUrl = this.isBatchMount === 'true'
// ? `${this.baseApi}/api/collect/merge`
// : `${this.baseApi}/api/minioUpload/merge`
// //
// const response = await axios.post(mergeApiUrl, jsonArray, {
// headers: {
// 'Authorization': getToken(),
// 'Content-Type': 'application/json'
// }
// })
} catch (err) {
this.btnLoading = false
this.totalMergeEndTime = new Date().getTime()

Loading…
Cancel
Save