Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc

src/components/userinfo/usercenter/components/dataStatistics.vue

@@ -63,11 +63,11 @@
             <div>在职人数</div>
           </div>
           <div class="table_left">
-             <span class="fwb">{{totalObj.entryGPA}}</span>
+             <span class="fwb">{{toFixed(totalObj.entryGPA)}}</span>
             <div>入职绩点</div>
           </div>
           <div>
-             <span class="fwb">{{totalObj.finshedGPA}}</span>
+             <span class="fwb">{{toFixed(totalObj.finshedGPA)}}</span>
             <div>交付绩点</div>
           </div>
           <!-- </div> -->
@@ -117,7 +117,7 @@
 <script>
 import { dataStatisticsListApi, dataStatisticsTeamDetailApi } from '../../../../api/userinfo'
 import moment from 'moment'
-import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById } from '../../../../utils/commonUtil'
+import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById ,toFixed} from '../../../../utils/commonUtil'
 const rowSelection = {
   onChange: (selectedRowKeys, selectedRows) => {
     console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
@@ -227,11 +227,13 @@ export default {
       isspinning: false,
       totalObj: {
         // 数据总计
-        arrived: null,
-        entry: null,
-        obJob: null,
-        passed: null,
-        signUps: null,
+        arrived: 0,
+        entry: 0,
+        obJob: 0,
+        passed: 0,
+        signUps: 0,
+		entryGPA: 0,
+		finshedGPA: 0,
       },
       pagination: {
         hideOnSinglePage: false,
@@ -336,9 +338,9 @@ export default {
           title: '入职绩点',
           dataIndex: 'entryGPA',
           key: 'entryGPA',
-          // customRender: (text, row, index) => {
-          //   return 32
-          // },
+          customRender: (text, row, index) => {
+            return toFixed(text)
+          },
           scopedSlots: { customRender: 'entryGPA' },
           ellipsis: true,
           width: 90,
@@ -347,9 +349,9 @@ export default {
           title: '交付绩点',
           dataIndex: 'finshedGPA',
           key: 'finshedGPA',
-          // customRender: (text, row, index) => {
-          //   return 23
-          // },
+         customRender: (text, row, index) => {
+           return toFixed(text)
+         },
           scopedSlots: { customRender: 'finshedGPA' },
           ellipsis: true,
           width: 90,
@@ -506,7 +508,7 @@ export default {
           dataIndex: 'applyUserName',
           key: 'applyUserName',
           ellipsis: true,
-          width: 120,
+          width: 150,
           slots: { title: 'applyUserName' },
           customRender: (text, row, index) => {
             return row.applyUserName
@@ -520,11 +522,7 @@ export default {
           width: 80,
           slots: { title: 'entryGPA' },
           customRender: (text, row, index) => {
-            if (text) {
-              return text
-            } else {
-              return 0
-            }
+            return toFixed(text)
           },
         },
         {
@@ -534,13 +532,9 @@ export default {
           ellipsis: true,
           width: 80,
           slots: { title: 'finshedGPA' },
-          customRender: (text, row, index) => {
-            if (text) {
-              return text
-            } else {
-              return 0
-            }
-          },
+			 customRender: (text, row, index) => {
+			   return toFixed(text)
+			 },
         },
       ]
       return columns
@@ -669,6 +663,9 @@ export default {
         this.isspinning = false
       }
     },
+	toFixed(value){
+		return toFixed(value)
+	},
     inputpageChange(e) {
       const pagenumcount = this.billPagination.total / this.billPagination.pageSize
       console.log(pagenumcount)
@@ -818,6 +815,7 @@ export default {
       }
       this.isspinning = false
     },
+	
   },
 }
 </script>

src/utils/commonUtil.js

@@ -19,6 +19,14 @@ export function isEmptyCheck(value) {
 export function isNotEmptyCheck(value) {
 	return !isEmptyCheck(value);
 }
+
+export function toFixed(value) {
+	if(value == 0 || value == '0'){
+		return 0
+	}else{
+		return  new Number(value).toFixed(2);
+	}
+}
 /**
  * 根据状态工单类型ID获取名称
  */