Merge pull request 'master' (#345) from master into prod

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

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),
@@ -109,7 +111,7 @@ const tableConfig = reactive({
       prop: 'name',
       type: 'index',
       label: '序号',
-      width:'80',
+      width: '80',
       align: 'center'
     },
     {
@@ -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}/>)
-          }
+        if (row.projectCost !== null && row.projectCost !== null && row.projectCost !== undefined) {
+          return (<Tag dictType={'project_cost'} value={row.projectCost}/>)
         } else {
           return '--'
         }
@@ -137,8 +136,9 @@ const tableConfig = reactive({
       prop: 'researchStage',
       label: '项目阶段',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) {
+        if (row.researchStage && row.researchStage !== null && row.researchStage !== undefined) {
           return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
         } else {
           return '--'
@@ -154,20 +154,20 @@ const tableConfig = reactive({
       prop: 'afterTax',
       label: '税后余额(元)',
       align: 'center',
-      currentRender:({row})=>{
+      currentRender: ({row}) => {
         return <span>{toThousands(row.afterTax)}</span>
       }
     }
   ],
   api: '/workflow/mosr/expense/ledger',
   params: {
-    projectId:route.query.id
+    projectId: route.query.id
   },
   btns: [
-    {name: '上传费用', key: 'add', color: '#DED0B2',auth: ''}
+    {name: '上传费用', key: 'add', color: '#DED0B2', auth: ''}
   ]
 })
-const tableIns=ref()
+const tableIns = ref()
 const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
@@ -188,14 +188,14 @@ const handleUploadFee = () => {
   router.push({
     name: 'Implementation/uploadFee',
     query: {
-      id:route.query.id
+      id: route.query.id
     }
   })
 }
 
 const search = (val) => {
-  console.log('val',val)
-  tableConfig.params = {...val}
+  console.log('val', val)
+  tableConfig.params = {...val, projectId: route.query.id}
   tableIns.value.refresh()
 }
 </script>