From 050c5cf57ad6c7a61e66ade385a0e35f0fe56c6c Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 23:01:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E5=88=97=E8=A1=A8=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           | 50 +++++++++----------
 src/views/project-management/filing/index.vue |  8 +--
 .../implementation/index.vue                  | 12 ++---
 .../project-management/initiation/index.vue   |  6 +--
 4 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 4a36418..0dc29f1 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -5,7 +5,7 @@
         <el-form-item :label="label" prop="attachment">
           <template v-if="preview&&JSON.stringify(singleFile) !== '{}'&&JSON.stringify(singleFile)!=='null'">
             <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 16px">
-              {{ singleFile?.originalFileName }}
+              {{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName }}
             </el-button>
             <el-button type="danger" link @click="deleteSingleFile(singleFile,1)">删除</el-button>
           </template>
@@ -35,7 +35,7 @@
 <script setup lang="jsx">
 import FileUpload from '@/components/FileUpload.vue'
 import {deleteFile, downloadFile} from "@/api/project-demand";
-import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
+import {ElMessageBox, ElNotification} from "element-plus";
 
 const props = defineProps({
   showFileList: {
@@ -59,12 +59,11 @@ const props = defineProps({
     default: []
   },
   formData: {
-    type: Array,
-    default: []
+    type: Object,
+    default: {}
   }
 })
 const emit = defineEmits(["getAttachment", "getOtherFile"])
-const formData = ref({})
 const tableConfig = reactive({
   columns: [
     {
@@ -115,11 +114,12 @@ const tableConfig = reactive({
                 ))
               }
               {
-              row.newFile||props.preview||!props.preview ? <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
-                                            perm={['mosr:requirement:del']}
-                                            onDelete={() => handleDelete(row)}/>
-                  : ''
-            }
+                row.newFile || props.preview || !props.preview ?
+                    <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
+                                    perm={['mosr:requirement:del']}
+                                    onDelete={() => handleDelete(row)}/>
+                    : ''
+              }
             </div>
         )
       }
@@ -136,10 +136,18 @@ const allFileList = ref([])
 watch(() => props.showTable, (newVal) => {
   props.showTable = newVal
 }, {deep: true})
-watch(() => props.otherFileList, (newVal) => {
-  console.log('newotherFileList', newVal)
+watch(() => props.formData.fileList, (newVal) => {
+  console.log('newVal-fileList', newVal)
   if (props.preview) {
-    if (props.formData.fileList===null||props.formData.fileList.length===0) {
+    newVal?.forEach(item => {
+      allFileList.value.push(item)
+    })
+  }
+}, {deep: true})
+watch(() => props.otherFileList, (newVal) => {
+  console.log('newotherFileList', newVal,props.formData)
+  if (props.preview) {
+    if (props.formData.fileList === null || props.formData.fileList.length === 0) {
       allFileList.value = newVal
     } else {
       newVal?.forEach(item => {
@@ -150,14 +158,6 @@ watch(() => props.otherFileList, (newVal) => {
     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)
-    })
-  }
-}, {deep: true})
 watch(() => props.formData.singleFile, (newVal) => {
   console.log('singleFile', newVal)
   singleFile.value = newVal
@@ -193,7 +193,7 @@ const deleteAttachment = (val) => {
         type: 'success'
       })
       isSingleFile.value = false
-      singleFile.value=null
+      singleFile.value = null
     }
   });
 }
@@ -210,7 +210,7 @@ const deleteSingleFile = (row, type) => {
         type: res.code === 1000 ? 'success' : 'error'
       })
       if (res.code === 1000) {
-        isSingleFile.value=false
+        isSingleFile.value = false
         if (type === 1) {
           singleFile.value = null
         } else {
@@ -249,7 +249,7 @@ defineExpose({
 </script>
 
 <style scoped>
-:deep(.el-table--fit ){
-  height: 300px!important;
+:deep(.el-table--fit ) {
+  height: 300px !important;
 }
 </style>
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 6e8bcab..4dc848a 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -233,16 +233,16 @@ const tableConfig = reactive({
         let btn = []
         let buttons = new Set(Array.from(row.buttons))
         if (buttons.has("details")) {
-          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
+          btn.push({label: '详情', prem: ['project:management:filing:detail'], func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("attachments")) {
-          btn.push({label: '附件', prem: ['mosr:requirement:resubmit'], func: () => handleAttachment(row), type: 'primary'})
+          btn.push({label: '附件', prem: ['project:management:filing:attachment'], func: () => handleAttachment(row), type: 'primary'})
         }
         if (buttons.has("entry")) {
-          btn.push({label: '结项', prem: ['mosr:requirement:del'], func: () => handleConclusion(row), type: 'primary'})
+          btn.push({label: '结项', prem: ['project:management:filing:conclusion'], func: () => handleConclusion(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
-          btn.push({label: '编辑', prem: ['mosr:requirement:info'], func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '编辑', prem: ['project:management:filing:conclusion'], func: () => handleEdit(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 7541b91..4065da3 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -251,22 +251,22 @@ const tableConfig = reactive({
         let btn = []
         let buttons = new Set(Array.from(row.buttons))
         if (buttons.has("details")) {
-          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
+          btn.push({label: '详情', prem: ['mosr:implementation:info'], func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("check")) {
-          btn.push({label: '验收', prem: ['mosr:requirement:resubmit'], func: () => handleCheck(row), type: 'primary'})
+          btn.push({label: '验收', prem: ['mosr:implementation:check'], func: () => handleCheck(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
-        btn.push({label: '编辑', prem: ['mosr:requirement:info'], func: () => handleEdit(row), type: 'primary'})
+        btn.push({label: '编辑', prem: ['mosr:implementation:resubmit'], func: () => handleEdit(row), type: 'primary'})
         }
         if (buttons.has("standing")) {
-          btn.push({label: '台账', prem: ['mosr:requirement:info'], func: () => handleStandingBook(row), type: 'primary'})
+          btn.push({label: '台账', prem: ['project:management:implementation:account'], func: () => handleStandingBook(row), type: 'primary'})
         }
         if (buttons.has("attachments")) {
-        btn.push({label: '附件', prem: ['mosr:requirement:info'], func: () => handleAttachment(row), type: 'primary'})
+        btn.push({label: '附件', prem: ['project:management:implementation:attachment'], func: () => handleAttachment(row), type: 'primary'})
         }
         if (buttons.has("viewAllocation")) {
-          btn.push({label: '查看分摊', prem: ['mosr:requirement:info'], func: () => handleShare(row), type: 'primary'})
+          btn.push({label: '查看分摊', prem: ['project:management:implementation:share'], func: () => handleShare(row), type: 'primary'})
         }
         if (buttons.has("phaseChange")) {
           btn.push({label: '阶段变更', prem: ['mosr:phase:change'], func: () => handlePhaseChange(row), type: 'primary'})
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index b56acd7..d80ec63 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -232,16 +232,16 @@ const tableConfig = reactive({
         let btn = []
         let buttons = new Set(Array.from(row.buttons))
         if (buttons.has("details")) {
-          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
+          btn.push({label: '详情', prem: ['mosr:approval:info'], func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
-          btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '编辑', prem: ['mosr:approval:resubmit'], func: () => handleEdit(row), type: 'primary'})
         }
         // if (buttons.has("delete")) {
         //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
         // }
         if (buttons.has("apply")) {
-          btn.push({label: '立项',prem: ['mosr:requirement:info'], func: () => handleApply(row), type: 'primary'})
+          btn.push({label: '立项',prem: ['mosr:approval:apply'], func: () => handleApply(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>