From 80d84c4a85dbb8fd1fa94acd01aaa5646bc76dc9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 5 Jun 2024 11:01:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=B4=B9=E7=94=A8=E5=88=86=E6=91=8A=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ExpenseDetail.vue         | 10 ++++++--
 src/views/expense-management/share/detail.vue | 25 ++++++++++++++-----
 src/views/home/index.vue                      |  3 +--
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/components/DetailComponent/ExpenseDetail.vue b/src/components/DetailComponent/ExpenseDetail.vue
index ab9039f..3f42a22 100644
--- a/src/components/DetailComponent/ExpenseDetail.vue
+++ b/src/components/DetailComponent/ExpenseDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading">
     <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
-    <fvTable ref="tableIns" :tableConfig="tableConfig" :data="detailList" style="width: 100%">
+    <fvTable ref="tableIns" :tableConfig="tableConfig" :data="detailList.formData">
       <template #empty>
         <el-empty description="暂无数据"/>
       </template>
@@ -108,8 +108,14 @@ const search = (val) => {
   tableConfig.params = {...val}
   tableIns.value.refresh()
 }
+watch(() => props.loading, (val) => {
+  props.loading=val
+})
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit ){
+  width: 100%;
+  height: 400px!important;
+}
 </style>
diff --git a/src/views/expense-management/share/detail.vue b/src/views/expense-management/share/detail.vue
index c07dcf7..fe82ad9 100644
--- a/src/views/expense-management/share/detail.vue
+++ b/src/views/expense-management/share/detail.vue
@@ -26,15 +26,26 @@
 <!--      </fvTable>-->
     </el-tab-pane>
   </el-tabs>
+    <div v-if="shareData.taskId">
+      <baseTitle title="审核意见"></baseTitle>
+      <el-form-item prop="auditOpinion">
+        <el-input
+            v-model="auditOpinion"
+            :rows="3"
+            type="textarea"
+            placeholder="请输入审核意见"
+        />
+      </el-form-item>
+    </div>
   <div class="approval-record">
     <baseTitle title="审批记录"></baseTitle>
     <div class="process">
       <operation-render v-if="shareProcessViewer" :operation-list="shareData.operationList"
-                        :state="data.state"/>
-      <process-diagram-viewer v-if="shareProcessViewer" id-name="fundProcess"/>
+                        :state="shareData.state"/>
+      <process-diagram-viewer v-if="shareProcessViewer" id-name="shareProcess"/>
     </div>
   </div>
-  <opinion v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"></opinion>
+  <opinion v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"  v-model:value="auditOpinion"></opinion>
 </template>
 
 <script setup lang="jsx">
@@ -49,6 +60,7 @@ const route = useRoute()
 const shareData = ref({})
 const detailList = ref([])
 const formData = ref({})
+const auditOpinion = ref('')
 const shareProcessViewer = ref(true)
 const loading = ref(false)
 const activeName = ref('first')
@@ -59,14 +71,15 @@ const getDetail = async () => {
   if (code === 1000) {
     shareData.value = data
     formData.value = data.formData
+    loading.value = false
   } else {
     ElNotification({
       title: '提示',
       message: msg,
-      type:  'error'
+      type: 'error'
     })
+    loading.value = false
   }
-  loading.value = false
 }
 const getDetailList = async () => {
   let params = {
@@ -94,7 +107,7 @@ const getDetailList = async () => {
   }
 }
 getDetail()
-getDetailList()
+// getDetailList()
 </script>
 <style scoped lang="scss">
 :deep(.el-tabs__nav-scroll) {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 76961c5..92c78c7 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -206,8 +206,7 @@ const handleView = (row) => {
     router.push({
       name: 'Phase/detail',
       query: {
-        id: row.targetId,
-        state: row.state,
+        projectId: row.targetId,
         source: 'home'
       }
     })