From 9a789db8a71c973b36c04af988b0d0965c53aa15 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 3 Jul 2024 21:31:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E6=91=8A?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue        | 25 ++++++++++------------
 src/views/expense-management/share/add.vue | 19 +++++++++++-----
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 3a317b4..70bb806 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -223,21 +223,20 @@ const isSingleFile = ref(false)
 const allFileList = ref([])
 const deleteFileVal = ref({})
 const singleFileList = ref([])
-if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
-  allFileList.value = props.formData.fileList
-}
-
+// if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
+//   allFileList.value = props.formData.fileList
+// }
 watch(() => props.showSingleTable, (newVal) => {
   props.showSingleTable = 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.fileList, (newVal) => {
+  console.log('newVal-fileList', newVal)
+  if (props.preview) {
+    newVal?.forEach(item => {
+      allFileList.value.push(item)
+    })
+  }
+}, {immediate: true})
 // watch(() => props.otherFileList, (newVal) => {
 //   props.otherFileList=newVal
   // if (props.preview) {
@@ -280,8 +279,6 @@ const handleDelete = (row, type) => {
         singleFileList.value.splice(singleFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
         isSingleFile.value = false
       } else {
-        console.log('allFileList.value',allFileList.value,row)
-        console.log('allFileList.value.findIndex((item) => item.id === row.fileId)',allFileList.value.findIndex((item) => item.id === row.fileId))
         allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
       }
     }
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 1e868fe..d74d6b5 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -115,7 +115,7 @@
         <baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData?.operationList"></baseTitle>
         <div v-else></div>
         <div style="display: flex;align-items: center;justify-content: flex-start;">
-          <div class="base-title">流程图</div>
+          <div class="base-title" style="margin-left: 10px">流程图</div>
           <el-switch
               v-model="changeDiagram"
               style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
@@ -214,11 +214,14 @@ const showPersonnelPicker = (row, index) => {
       name: row.researchPersonnel,
       companyName: row.companyName,
     }
-    userList.value.push(userObj)
+    userList.value=[userObj]
   }
-  userPicker.value.showUserPicker()
+  nextTick(() => {
+    userPicker.value.showUserPicker()
+  })
 }
 const selected = (select) => {
+  console.log('select',select)
   if (!select || select.length === 0) {
     return
   }
@@ -228,7 +231,7 @@ const selected = (select) => {
       item.researchPersonnel = select[0].name
     }
   })
-  userList.value=select
+  // userList.value=select
 }
 const getResearchOptions = async () => {
   const res = await getResearchUser()
@@ -353,13 +356,18 @@ const handleResubmit = (instance) => {
         item.performance = null
       }
       newUsrAllocationsObj = {
+        allocationId: formData.value.allocationId,
+        id: item.id,
         projectId: item.projectId,
         projectName: item.projectName,
+        researchPersonnel: item.researchPersonnel,
         researchPersonnelId: item.researchPersonnelId,
         wagesPayable: item.wagesPayable,
         performance: item.performance,
         reserveFund: item.reserveFund,
         socialSecurity: item.socialSecurity,
+        time: item.time,
+        subtotal: item.subtotal,
         annuity: item.annuity,
         workday: item.workday,
         researchDuration: item.researchDuration,
@@ -378,9 +386,10 @@ const handleResubmit = (instance) => {
       allocationId: formData.value.allocationId,
       shareName: formData.value.shareName,
       apportionmentMonth: formData.value.apportionmentMonth,
-      usrAllocations: newUsrAllocationsObjArray,
+      usrAllocations:newUsrAllocationsObjArray,
       deploymentId: processInstanceData.value.deploymentId,
     }
+    console.log('params', params, formData.value.tableData)
     const {code, msg} = await editAllocation(params)
     ElNotification({
       title: '提示',