Merge pull request 'fix : 修复费用台账公司搜索,项目管理前置流程逗号分隔' (#627) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/627

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>

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>