From bab959773956fad1fdbb079e7b3732c6f0e3c946 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 25 Jul 2024 17:09:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=85=AC=E5=8F=B8=E6=90=9C=E7=B4=A2,?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=89=8D=E7=BD=AE=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=80=97=E5=8F=B7=E5=88=86=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ApprovalDetail.vue        |  4 +--
 src/views/expense-management/ledger/index.vue | 34 ++++++++++++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index a8b14c9..2e481b9 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -246,9 +246,9 @@ let preProcess = {
   component: () => (
       <div>
         {
-          props.formData.preProcess ? props.formData.preProcess.map(item => {
+          props.formData.preProcess ? props.formData.preProcess.map((item,index) => {
             return <span><a target="_blank" style={{color: '#409EFF', cursor: 'pointer'}}
-                            href={props.formData.preProcessBaseUrl + item.requestId}>{item.requestName}</a> </span>
+                            href={props.formData.preProcessBaseUrl + item.requestId}>{item.requestName} {index != (props.formData.preProcess.length -1)? <span>，</span>:''}</a></span>
           }) : <span>{'--'}</span>
         }
       </div>
diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue
index 74034a5..4fa73d9 100644
--- a/src/views/expense-management/ledger/index.vue
+++ b/src/views/expense-management/ledger/index.vue
@@ -10,9 +10,10 @@
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {toThousands} from '@/utils/changePrice.js'
+import { getSubCompOpt } from '@/api/user/user.js';
 const router = useRouter()
 const route = useRoute()
-const searchConfig = reactive([
+const searchConfig = ref([
   {
     label: '项目名称',
     prop: 'projectName',
@@ -24,6 +25,18 @@ const searchConfig = reactive([
       checkStrictly: true
     }
   },
+  {
+    label: '公司名称',
+    prop: 'affiliatedCompanyIds',
+    component: 'el-tree-select',
+    props: {
+      placeholder: '请输入',
+      clearable: true,
+      data: [],
+      filterable: true,
+      checkStrictly: true
+    }
+  },
   {
     label: '时间',
     prop: 'time',
@@ -90,14 +103,20 @@ const tableConfig = reactive({
       prop: 'name',
       type: 'index',
       label: '序号',
-      width:'80',
-      align: 'center'
+      align: 'center',
+      width:85
     },
     {
       prop: 'projectName',
       label: '项目名称',
       align: 'center'
-    },{
+    },
+    {
+      prop: 'affiliatedCompany',
+      label: '公司名称',
+      align: 'center'
+    },
+    {
       prop: 'time',
       label: '时间',
       align: 'center'
@@ -162,6 +181,13 @@ const search = (val) => {
   tableConfig.params = {...val}
   tableIns.value.refresh()
 }
+const init = async () => {
+  const res = await getSubCompOpt()
+  searchConfig.value.find(item=>item.prop == 'affiliatedCompanyIds').props.data = res.data
+}
+
+init()
+
 </script>
 
 <style scoped>