Merge pull request 'fix : 修复项目费用显示bug' (#344) from dj into master

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

src/views/expense-management/ledger/index.vue

@@ -36,7 +36,7 @@ const searchConfig = reactive([
     colProps: {}
   }, {
     label: '项目费用',
-    prop: 'requirementName',
+    prop: 'projectCost',
     component: shallowRef(fvSelect),
     props: {
       placeholder: '请选择项目费用查询',

src/views/project-management/implementation/account.vue

@@ -58,9 +58,10 @@ const searchConfig = reactive([
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
     colProps: {}
-  }, {
+  },
+  {
     label: '项目费用',
-    prop: 'requirementName',
+    prop: 'projectCost',
     component: shallowRef(fvSelect),
     props: {
       placeholder: '请选择项目费用查询',
@@ -68,7 +69,8 @@ const searchConfig = reactive([
       filterable: true,
       cacheKey: 'project_cost',
     }
-  }, {
+  },
+  {
     label: '项目阶段',
     prop: 'researchStage',
     component: shallowRef(fvSelect),
@@ -121,13 +123,10 @@ const tableConfig = reactive({
       prop: 'projectCost',
       label: '项目费用',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         if (row.projectCost !== null && row.projectCost !== null && row.projectCost !== undefined) {
-          if(typeof Number(row.projectCost) === 'number'){
-            return '--'
-          }else {
           return (<Tag dictType={'project_cost'} value={row.projectCost}/>)
-          }
         } else {
           return '--'
         }
@@ -137,6 +136,7 @@ const tableConfig = reactive({
       prop: 'researchStage',
       label: '项目阶段',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         if (row.researchStage && row.researchStage !== null && row.researchStage !== undefined) {
           return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
@@ -195,7 +195,7 @@ const handleUploadFee = () => {
 
 const search = (val) => {
   console.log('val', val)
-  tableConfig.params = {...val}
+  tableConfig.params = {...val, projectId: route.query.id}
   tableIns.value.refresh()
 }
 </script>