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

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

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

@@ -104,7 +104,7 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if (row.projectCost !== null) {
+        if (row.projectCost !== null&&row.projectCost !== null&&row.projectCost!==undefined) {
           return (<Tag dictType={'project_cost'} value={row.projectCost}/>)
         } else {
           return '--'

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

@@ -122,8 +122,12 @@ const tableConfig = reactive({
       label: '项目费用',
       align: 'center',
       currentRender: ({row, index}) => {
-        if (row.projectCost !== null) {
-          return (<Tag dictType={'project_cost'} value={row.projectCost}/>)
+        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 '--'
         }