Browse Source

修复研发活动费用详情计算结果错误的问题和高企导出显示问题

yee 7 years ago
parent
commit
a55e7974d8

+ 18 - 7
js/component/account/services/activityCostList.jsx

@@ -7,6 +7,14 @@ import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 
+const mathRound = function(p){
+    if ( !isNaN(p) ) { 
+        return Math.round(p*100)/100
+    } else {
+        return p
+    }
+}
+
 const ActivityDescFrom = Form.create()(React.createClass({
     getInitialState() {
         return {
@@ -25,14 +33,16 @@ const ActivityDescFrom = Form.create()(React.createClass({
     },
     allCostCount(formData) {
         let theData = formData || this.props.form;
-        this.state.internalAllCost = theData.getFieldValue('internalLaborCost') + theData.getFieldValue('internalDirectCost') +
+        let internalAllCost = theData.getFieldValue('internalLaborCost') + theData.getFieldValue('internalDirectCost') +
             theData.getFieldValue('internalDepreciationCost') + theData.getFieldValue('internalAmortizationCost') +
             theData.getFieldValue('internalDesignCost') + theData.getFieldValue('internalEquipmentCost') +
             theData.getFieldValue('internalOtherCost');
-        this.state.allCost = theData.getFieldValue('internalLaborCost') + theData.getFieldValue('internalDirectCost') +
+        this.state.internalAllCost = mathRound(internalAllCost)
+        let allCost = theData.getFieldValue('internalLaborCost') + theData.getFieldValue('internalDirectCost') +
             theData.getFieldValue('internalDepreciationCost') + theData.getFieldValue('internalAmortizationCost') +
             theData.getFieldValue('internalDesignCost') + theData.getFieldValue('internalEquipmentCost') +
             theData.getFieldValue('internalOtherCost') + theData.getFieldValue('externalTotalCost');
+        this.state.allCost = mathRound(allCost)
     },
     componentDidMount() {
         this.allCostCount();
@@ -58,10 +68,11 @@ const ActivityDescFrom = Form.create()(React.createClass({
         if (!this.props.visible && nextProps.visible) {
             this.state.fileList = [];
             this.state.accountUrl = undefined;
-            this.state.internalAllCost = nextProps.data.internalLaborCost + nextProps.data.internalDirectCost +
+            let internalAllCost = nextProps.data.internalLaborCost + nextProps.data.internalDirectCost +
                 nextProps.data.internalDepreciationCost + nextProps.data.internalAmortizationCost +
                 nextProps.data.internalDesignCost + nextProps.data.internalEquipmentCost +
                 nextProps.data.internalOtherCost;
+            this.state.internalAllCost = mathRound(internalAllCost)
             this.state.allCost = this.state.internalAllCost + nextProps.data.externalTotalCost;
         };
     },
@@ -426,9 +437,9 @@ const Activity = React.createClass({
                     endDate: thisdata.endDate,
 
                     internalAllCost:
-                    thisdata.internalLaborCost + thisdata.internalDirectCost + thisdata.internalDepreciationCost +
+                    mathRound(thisdata.internalLaborCost + thisdata.internalDirectCost + thisdata.internalDepreciationCost +
                     thisdata.internalAmortizationCost + thisdata.internalAmortizationCost + thisdata.internalDesignCost +
-                    thisdata.internalEquipmentCost + thisdata.internalOtherCost,
+                    thisdata.internalEquipmentCost + thisdata.internalOtherCost),
 
                     internalLaborCost: thisdata.internalLaborCost,
                     internalDirectCost: thisdata.internalDirectCost,
@@ -442,9 +453,9 @@ const Activity = React.createClass({
                     externalAbroadCost: thisdata.externalAbroadCost,
 
                     allCost:
-                    thisdata.internalLaborCost + thisdata.internalDirectCost + thisdata.internalDepreciationCost +
+                    mathRound(thisdata.internalLaborCost + thisdata.internalDirectCost + thisdata.internalDepreciationCost +
                     thisdata.internalAmortizationCost + thisdata.internalAmortizationCost + thisdata.internalDesignCost +
-                    thisdata.internalEquipmentCost + thisdata.internalOtherCost + thisdata.externalTotalCost,
+                    thisdata.internalEquipmentCost + thisdata.internalOtherCost + thisdata.externalTotalCost),
 
                     //enterpriseFiller: thisdata.enterpriseFiller,
                     //signDate: thisdata.signDate,

+ 18 - 7
js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx

@@ -6,6 +6,14 @@ import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 
+const mathRound = function(p){
+    if ( !isNaN(p) ) { 
+        return Math.round(p*100)/100
+    } else {
+        return p
+    }
+}
+
 const ActivityDescFrom = Form.create()(React.createClass({
     getInitialState() {
         return {
@@ -26,14 +34,16 @@ const ActivityDescFrom = Form.create()(React.createClass({
         });
     },
     allCostCount() {
-        this.state.internalAllCost = this.props.form.getFieldValue('internalLaborCost') + this.props.form.getFieldValue('internalDirectCost') +
+        let internalAllCost= this.props.form.getFieldValue('internalLaborCost') + this.props.form.getFieldValue('internalDirectCost') +
             this.props.form.getFieldValue('internalDepreciationCost') + this.props.form.getFieldValue('internalAmortizationCost') +
             this.props.form.getFieldValue('internalDesignCost') + this.props.form.getFieldValue('internalEquipmentCost') +
             this.props.form.getFieldValue('internalOtherCost');
-        this.state.allCost = this.props.form.getFieldValue('internalLaborCost') + this.props.form.getFieldValue('internalDirectCost') +
+        this.state.internalAllCost = mathRound(internalAllCost)
+        let allCost = this.props.form.getFieldValue('internalLaborCost') + this.props.form.getFieldValue('internalDirectCost') +
             this.props.form.getFieldValue('internalDepreciationCost') + this.props.form.getFieldValue('internalAmortizationCost') +
             this.props.form.getFieldValue('internalDesignCost') + this.props.form.getFieldValue('internalEquipmentCost') +
             this.props.form.getFieldValue('internalOtherCost') + this.props.form.getFieldValue('externalTotalCost');
+        this.state.allCost = mathRound(allCost)
     },
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
@@ -42,10 +52,11 @@ const ActivityDescFrom = Form.create()(React.createClass({
             nextProps.form.resetFields();
             this.state.fileList = [];
             this.state.accountUrl = undefined;
-            this.state.internalAllCost = nextProps.data.internalLaborCost + nextProps.data.internalDirectCost +
+            let internalAllCost = nextProps.data.internalLaborCost + nextProps.data.internalDirectCost +
                 nextProps.data.internalDepreciationCost + nextProps.data.internalAmortizationCost +
                 nextProps.data.internalDesignCost + nextProps.data.internalEquipmentCost +
                 nextProps.data.internalOtherCost;
+            this.state.internalAllCost = mathRound(internalAllCost)
             this.state.allCost = this.state.internalAllCost + nextProps.data.externalTotalCost
         } else {
             this.allCostCount();
@@ -414,9 +425,9 @@ const Activity = React.createClass({
                         endDate: thisdata.endDate,
 
                         internalAllCost:
-                        thisdata.internalLaborCost + thisdata.internalDirectCost + thisdata.internalDepreciationCost +
+                        mathRound(thisdata.internalLaborCost + thisdata.internalDirectCost + thisdata.internalDepreciationCost +
                         thisdata.internalAmortizationCost + thisdata.internalAmortizationCost + thisdata.internalDesignCost +
-                        thisdata.internalEquipmentCost + thisdata.internalOtherCost,
+                        thisdata.internalEquipmentCost + thisdata.internalOtherCost),
 
                         internalLaborCost: thisdata.internalLaborCost,
                         internalDirectCost: thisdata.internalDirectCost,
@@ -430,9 +441,9 @@ const Activity = React.createClass({
                         externalAbroadCost: thisdata.externalAbroadCost,
 
                         allCost:
-                        thisdata.internalLaborCost + thisdata.internalDirectCost + thisdata.internalDepreciationCost +
+                        mathRound(thisdata.internalLaborCost + thisdata.internalDirectCost + thisdata.internalDepreciationCost +
                         thisdata.internalAmortizationCost + thisdata.internalAmortizationCost + thisdata.internalDesignCost +
-                        thisdata.internalEquipmentCost + thisdata.internalOtherCost + thisdata.externalTotalCost,
+                        thisdata.internalEquipmentCost + thisdata.internalOtherCost + thisdata.externalTotalCost),
 
                         //enterpriseFiller: thisdata.enterpriseFiller,
                         //signDate: thisdata.signDate,

+ 1 - 0
js/component/manageCenter/servicesManage/highTech/highTechFoster.less

@@ -115,6 +115,7 @@
                 &:last-child {
                     display: inline-block;
                     width: 840px;
+                    word-wrap: break-word;
                 }
             }
         }

+ 19 - 13
js/component/manageCenter/servicesManage/highTech/highTechInfo.jsx

@@ -11,6 +11,13 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './highTechFoster.less';
 
+const mathRound = function(p){
+    if ( !isNaN(p) ) { 
+        return Math.round(p*100)/100
+    } else {
+        return p
+    }
+}
 
 const highTechInfo = React.createClass({
     getIntellectualNumber(text) {
@@ -775,10 +782,9 @@ const highTechInfo = React.createClass({
                         startDate: item.startDate,
                         endDate: item.endDate,
 
-                        internalAllCost:
-                        item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
+                        internalAllCost: mathRound(item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
                         item.internalAmortizationCost + item.internalAmortizationCost + item.internalDesignCost +
-                        item.internalEquipmentCost + item.internalOtherCost,
+                        item.internalEquipmentCost + item.internalOtherCost),
 
                         internalLaborCost: item.internalLaborCost,
                         internalDirectCost: item.internalDirectCost,
@@ -792,9 +798,9 @@ const highTechInfo = React.createClass({
                         externalAbroadCost: item.externalAbroadCost,
 
                         allCost:
-                        item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
+                        mathRound(item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
                         item.internalAmortizationCost + item.internalAmortizationCost + item.internalDesignCost +
-                        item.internalEquipmentCost + item.internalOtherCost + item.externalTotalCost,
+                        item.internalEquipmentCost + item.internalOtherCost + item.externalTotalCost),
 
                         enterpriseFiller: item.enterpriseFiller,
                         signDate: item.signDate,
@@ -825,9 +831,9 @@ const highTechInfo = React.createClass({
                         endDate: item.endDate,
 
                         internalAllCost:
-                        item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
+                        mathRound(item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
                         item.internalAmortizationCost + item.internalAmortizationCost + item.internalDesignCost +
-                        item.internalEquipmentCost + item.internalOtherCost,
+                        item.internalEquipmentCost + item.internalOtherCost),
 
                         internalLaborCost: item.internalLaborCost,
                         internalDirectCost: item.internalDirectCost,
@@ -841,9 +847,9 @@ const highTechInfo = React.createClass({
                         externalAbroadCost: item.externalAbroadCost,
 
                         allCost:
-                        item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
+                        mathRound(item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
                         item.internalAmortizationCost + item.internalAmortizationCost + item.internalDesignCost +
-                        item.internalEquipmentCost + item.internalOtherCost + item.externalTotalCost,
+                        item.internalEquipmentCost + item.internalOtherCost + item.externalTotalCost),
 
                         enterpriseFiller: item.enterpriseFiller,
                         signDate: item.signDate,
@@ -874,9 +880,9 @@ const highTechInfo = React.createClass({
                         endDate: item.endDate,
 
                         internalAllCost:
-                        item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
+                        mathRound(item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
                         item.internalAmortizationCost + item.internalAmortizationCost + item.internalDesignCost +
-                        item.internalEquipmentCost + item.internalOtherCost,
+                        item.internalEquipmentCost + item.internalOtherCost),
 
                         internalLaborCost: item.internalLaborCost,
                         internalDirectCost: item.internalDirectCost,
@@ -890,9 +896,9 @@ const highTechInfo = React.createClass({
                         externalAbroadCost: item.externalAbroadCost,
 
                         allCost:
-                        item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
+                        mathRound(item.internalLaborCost + item.internalDirectCost + item.internalDepreciationCost +
                         item.internalAmortizationCost + item.internalAmortizationCost + item.internalDesignCost +
-                        item.internalEquipmentCost + item.internalOtherCost + item.externalTotalCost,
+                        item.internalEquipmentCost + item.internalOtherCost + item.externalTotalCost),
 
                         enterpriseFiller: item.enterpriseFiller,
                         signDate: item.signDate,