浏览代码

修复Bug

mentoswzq 4 年之前
父节点
当前提交
1508be959e

+ 39 - 0
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -274,6 +274,9 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'outsourceAmount',
           key: 'outsourceAmount',
           className: 'title-table',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '签单日期',
@@ -292,36 +295,54 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'signTotalAmount',
           key: 'signTotalAmount',
           className: 'title-table',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '开票金额(万元)',
           dataIndex: 'invoiceAmount',
           key: 'invoiceAmount',
           className: 'title-table',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '已收款(万元)',
           dataIndex: 'actuallyTotalAmount',
           key: 'actuallyTotalAmount',
           className: 'title-table',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '应收款(万元)',
           dataIndex: 'orderReceivables',
           key: 'orderReceivables',
           className: 'title-table',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '欠款(万元)',
           dataIndex: 'orderArrears',
           key: 'orderArrears',
           className: 'title-table',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '最近收款(万元)',
           dataIndex: 'finalReceivables',
           key: 'finalReceivables',
           className: 'title-table',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '最近收款时间',
@@ -1133,6 +1154,9 @@ const approvedOutsourcing = React.createClass({
           title: '开票金额(万元)',
           dataIndex: 'amount',
           key: 'amount',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '申请时间',
@@ -1275,21 +1299,33 @@ const approvedOutsourcing = React.createClass({
           title: '签单金额(万元)',
           dataIndex: 'signTotalAmount',
           key: 'signTotalAmount',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '开票金额(万元)',
           dataIndex: 'invoiceAmount',
           key: 'invoiceAmount',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '已收款(万元)',
           dataIndex: 'actuallyTotalAmount',
           key: 'actuallyTotalAmount',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '最近收款(万元)',
           dataIndex: 'finalReceivables',
           key: 'finalReceivables',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '最近收款时间',
@@ -1337,6 +1373,9 @@ const approvedOutsourcing = React.createClass({
           title: '金额(万元)',
           dataIndex: 'transactionAmount',
           key: 'transactionAmount',
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: '收款方',

+ 33 - 1
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -144,7 +144,6 @@ const approvedOutsourcing = React.createClass({
               signTotalAmount: thisdata.signTotalAmount,
               outsourceAmount: thisdata.outsourceAmount,
               financeName: thisdata.financeName,
-              outsourceAmount: thisdata.outsourceAmount,
               backStatus: thisdata.backStatus,
               orderReceivables: thisdata.orderReceivables,
               orderArrears: thisdata.orderArrears,
@@ -276,6 +275,9 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "outsourceAmount",
           key: "outsourceAmount",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "签单日期",
@@ -294,36 +296,54 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "signTotalAmount",
           key: "signTotalAmount",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "开票金额(万元)",
           dataIndex: "invoiceAmount",
           key: "invoiceAmount",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "已收款(万元)",
           dataIndex: "actuallyTotalAmount",
           key: "actuallyTotalAmount",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "应收款(万元)",
           dataIndex: "orderReceivables",
           key: "orderReceivables",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "欠款(万元)",
           dataIndex: "orderArrears",
           key: "orderArrears",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
           key: "finalReceivables",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "最近收款时间",
@@ -898,21 +918,33 @@ const approvedOutsourcing = React.createClass({
           title: "签单金额(万元)",
           dataIndex: "signTotalAmount",
           key: "signTotalAmount",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "开票金额(万元)",
           dataIndex: "invoiceAmount",
           key: "invoiceAmount",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "已收款(万元)",
           dataIndex: "actuallyTotalAmount",
           key: "actuallyTotalAmount",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
           key: "finalReceivables",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "最近收款时间",

+ 36 - 0
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -692,26 +692,41 @@ const ShouKuang = React.createClass({
           title: "签单金额(万元)",
           dataIndex: "signTotalAmount",
           key: "signTotalAmount",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          },
         },
         {
           title: "开票金额(万元)",
           dataIndex: "invoiceAmount",
           key: "invoiceAmount",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          },
         },
         {
           title: "已收款(万元)",
           dataIndex: "actuallyTotalAmount",
           key: "actuallyTotalAmount",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          },
         },
         {
           title: "已付成本(万元)",
           dataIndex: "costAmount",
           key: "costAmount",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          },
         },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
           key: "finalReceivables",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          },
         },
         {
           title: "最近收款时间",
@@ -813,42 +828,63 @@ const ShouKuang = React.createClass({
           dataIndex: "signTotalAmount",
           key: "signTotalAmount",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "开票金额(万元)",
           dataIndex: "invoiceAmount",
           key: "invoiceAmount",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "已收款(万元)",
           dataIndex: "actuallyTotalAmount",
           key: "actuallyTotalAmount",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "应收款(万元)",
           dataIndex: "orderReceivables",
           key: "orderReceivables",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "欠款(万元)",
           dataIndex: "orderArrears",
           key: "orderArrears",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "已付成本(万元)",
           dataIndex: "costAmount",
           key: "costAmount",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
           key: "finalReceivables",
           className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
         },
         {
           title: "最近收款时间",

+ 6 - 0
js/component/manageCenter/order/orderNew/costAuditList/index.js

@@ -103,11 +103,17 @@ class CostAuditList extends Component{
                     title: "本次付款金额",
                     dataIndex: "paymentAmount",
                     key: "paymentAmount",
+                    render: (text) => {
+                        return isNaN(parseFloat(text)) ? text : parseFloat(text);
+                    },
                 },
                 {
                     title: "本次申请金额",
                     dataIndex: "applicationAmount",
                     key: "applicationAmount",
+                    render: (text) => {
+                        return isNaN(parseFloat(text)) ? text : parseFloat(text);
+                    }
                 },
                 {
                     title: "申请人",

+ 9 - 7
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -398,8 +398,8 @@ const MyTaskOutsource = React.createClass({
                   type="primary"
                   style={{ marginLeft: 10 }}
                   onClick={(e) => {
-                    e.stopPropagation(),
-                      this.evaluate(record, "咨询师经理", true);
+                    e.stopPropagation();
+                    this.evaluate(record, "咨询师经理", true);
                   }}
                 >
                   回退
@@ -408,7 +408,8 @@ const MyTaskOutsource = React.createClass({
                   type="primary"
                   style={{ margin: "0 10px" }}
                   onClick={(e) => {
-                    e.stopPropagation(), this.okCancel(record);
+                    e.stopPropagation();
+                    this.okCancel(record);
                   }}
                 >
                   添加工时
@@ -617,7 +618,8 @@ const MyTaskOutsource = React.createClass({
                   <Button
                     type="primary"
                     onClick={(e) => {
-                      e.stopPropagation(), this.contactSave(record, index);
+                      e.stopPropagation();
+                      this.contactSave(record, index);
                     }}
                   >
                     保存
@@ -2588,7 +2590,7 @@ const MyTaskOutsource = React.createClass({
                         className="half-item"
                         {...formItemLayout}
                         label=""
-                      ></FormItem>
+                      />
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
@@ -3466,7 +3468,7 @@ const MyTaskOutsource = React.createClass({
                   className="half-item"
                   {...formItemLayout}
                   label=""
-                ></FormItem>
+                />
                 <FormItem className="half-item" {...formItemLayout} label="">
                   <Input
                     placeholder="请输入详细地址"
@@ -3781,7 +3783,7 @@ const MyTaskOutsource = React.createClass({
                     className="three-item"
                     {...formItemLayout}
                     label=""
-                  ></FormItem>
+                  />
                   <div className="clearfix">
                     <FormItem
                       labelCol={{ span: 3 }}

+ 1 - 1
js/component/manageCenter/project/task/operationPayNode.js

@@ -250,7 +250,7 @@ class OperationPayNode extends Component{
                             {this.props.projectType !== 2 ? <div className="clearfix">
                                 <Form.Item {...formItemLayout} label="总价(万元)">
                                     {getFieldDecorator('totalAmount', {
-                                        initialValue: parseFloat(payNodeInfor.totalAmount),
+                                        initialValue: isNaN(parseFloat(payNodeInfor.totalAmount)) ? payNodeInfor.totalAmount : parseFloat(payNodeInfor.totalAmount),
                                         rules: [{ required: true, message: '请输入总价' }],
                                     })(
                                         <Input