fix : 修复项目归档五个附件上传功能、提示框、文件多选上传、详情驳回/同意路由跳转问题

src/components/AttachmentUpload.vue

@@ -10,7 +10,7 @@
             <el-button type="danger" link @click="deleteOtherFile(singleFile,1)">删除</el-button>
           </template>
           <template v-else-if="!preview||JSON.stringify(singleFile) === '{}'||singleFile==null">
-            <file-upload @getFile="getAttachment" :showFileList="showFileList" :maxSize="0" @delete="deleteAttachment"/>
+            <file-upload @getFile="getAttachment" :showFileList="showFileList" :multiple="false" :maxSize="1" :disabled="isSingleFile" @delete="deleteAttachment"/>
           </template>
         </el-form-item>
       </el-col>
@@ -63,20 +63,21 @@ const tableConfig = reactive({
       align: 'center',
       currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
     },
-    // {
-    //   prop: 'oper',
-    //   label: '操作',
-    //   align: 'center',
-    //   showOverflowTooltip: false,
-    //   currentRender: ({row, index}) => {
-    //     return (
-    //         <div>
-    //           <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-    //           <el-button type="primary" size="large" link onClick={() => deleteOtherFile(row)}>删除</el-button>
-    //         </div>
-    //     )
-    //   }
-    // }
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+            </div>
+        )
+      }
+    }
+
+    // <el-button type="primary" size="large" link onClick={() => deleteOtherFile(row)}>删除</el-button>
   ]
 })
 const rules = reactive({
@@ -84,6 +85,7 @@ const rules = reactive({
 })
 const applyForm = ref()
 const singleFile = ref()
+const isSingleFile = ref(false)
 const allFileList = ref([])
 const props = defineProps({
   showFileList: {
@@ -110,12 +112,17 @@ watch(() => props.showTable, (newVal) => {
   props.showTable = newVal
 }, {deep: true})
 watch(() => props.otherFileList, (newVal) => {
-  console.log('new',newVal)
-  // newVal?.forEach(item => {
+  console.log('newotherFileList',newVal)
+  if (props.preview) {
+    newVal?.forEach(item => {
+      allFileList.value.push(item)
+    })
+  }else {
     allFileList.value=newVal
-  // })
+  }
 }, {deep: true})
 watch(() => props.formData.fileList, (newVal) => {
+  console.log('newVal-fileList',newVal)
   if (props.preview) {
     newVal?.forEach(item => {
       allFileList.value.push(item)
@@ -127,6 +134,7 @@ watch(() => props.formData.singleFile, (newVal) => {
   singleFile.value = newVal
 }, {deep: true})
 const getAttachment = (val) => {
+  isSingleFile.value=true
   emit('getAttachment', val)
 }
 const getOtherFile = (val) => {
@@ -135,7 +143,12 @@ const getOtherFile = (val) => {
 const deleteAttachment = (val) => {
   deleteFile(val).then(res => {
     if (res.code === 1000) {
-      ElMessage.success("删除成功");
+      ElNotification({
+        title: '提示',
+        message:"删除成功",
+        type:'success'
+      })
+      isSingleFile.value=false
     }
   });
 }

src/components/DetailComponent/Opinion.vue

@@ -37,8 +37,7 @@ const schema = computed(() => {
       props: {
         placeholder: '请输入审核意见',
         type: 'textarea',
-        // maxlength: 140,
-        rows:3
+        rows: 3
       }
     }
   ]
@@ -52,7 +51,13 @@ const back = () => {
       router.push({name: 'Filing'})
       break;
     case 'Implementation/detail':
-      router.push({name: 'Implementation'})
+      if (route.query.step === '20') {
+        router.push({name: 'Initiation'})
+      } else if (route.query.step === '40') {
+        router.push({name: 'Implementation'})
+      } else if (route.query.step === '50') {
+        router.push({name: 'Filing'})
+      }
       break;
     case 'Summary/detail':
       router.push({name: 'Summary'})

src/components/FileUpload.vue

@@ -4,7 +4,7 @@
              :headers="headers"
              :limit="maxSize"
              with-credentials
-             :multiple="maxSize > 0"
+             :multiple="multiple"
              :data="uploadParams"
              :show-file-list="showFileList"
              :auto-upload="true"
@@ -19,8 +19,9 @@
 </template>
 
 <script setup>
-import {ElMessage,ElMessageBox} from "element-plus";
+import { ElMessageBox, ElNotification} from "element-plus";
 import {getToken} from '@/utils/auth'
+
 const baseURL = import.meta.env.VITE_BASE_URL
 const uploadFileUrl = ref(baseURL + "/workflow/process/file/upload")
 const headers = reactive({
@@ -43,13 +44,16 @@ const props = defineProps({
   showFileList: {
     type: Boolean,
     default: false
-  },disabled: {
+  }, disabled: {
     type: Boolean,
     default: false
+  }, multiple: {
+    type: Boolean,
+    default: true
   }
 })
 
-const emit = defineEmits(["input", "getFile","delete"])
+const emit = defineEmits(["input", "getFile", "delete"])
 const fileList = ref([])
 const _value = computed({
   get() {
@@ -59,7 +63,7 @@ const _value = computed({
     emit("input", val);
   }
 })
-const beforeRemove = (file, fileList) => {
+const beforeRemove = (file) => {
   return ElMessageBox.confirm(`确认删除名称为${file.name}的文件吗?`, '系统提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -67,38 +71,32 @@ const beforeRemove = (file, fileList) => {
   }).then(() => true)
 }
 
-const handleRemove = (file, fileList) => {
-  emit("delete",file.response.data.id)
+const handleRemove = (file) => {
+  emit("delete", file.response.data.id)
 }
-const beforeUpload = (file) => {
-  // const FileExt = file.name.replace(/.+\./, "");
-  // if (['zip', 'rar', 'pdf', 'doc', 'docx', 'xlsx'].indexOf(FileExt.toLowerCase()) === -1) {
-  //   ElMessage.warning('请上传后缀名为pdf、doc、docx、xlsx、zip或rar的文件！');
-  //   return false;
-  // } else
-  // if (props.maxSize > 0 && file.size / 1024 / 1024 > props.maxSize) {
-  //   ElMessage.warning(`每个文件最大不超过 ${props.maxSize}MB`)
-  // } else {
+const beforeUpload = () => {
   loading.value = true
   return true
-  // }
 }
-const handleUploadSuccess = (res, file) => {
-  if (res.code !== 1000) {
-    loading.value = false
-    ElMessage.error("上传失败")
-  } else {
-    loading.value = false
-    ElMessage.success("上传成功")
-  }
+const handleUploadSuccess = (res) => {
+  ElNotification({
+    title: '提示',
+    message: res.code === 1000 ? '上传成功' : '上传失败',
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  loading.value = false
   showTable.value = true
   let data = res.data
   fileList.value.push(data)
   emit("getFile", res.data)
 }
-const uploadError=(err)=>{
+const uploadError = () => {
   loading.value = false
-  ElMessage.error("上传失败，请稍后再试！")
+  ElNotification({
+    title: '提示',
+    message: "上传失败，请稍后再试！",
+    type: 'error'
+  })
 }
 
 </script>
@@ -108,6 +106,7 @@ a {
   font-size: 14px;
   color: #2a99ff;
 }
+
 :deep(.el-upload-list) {
   width: 400px;
 }