Kaynağa Gözat

退单、营销员奖金完成

liting2017 6 yıl önce
ebeveyn
işleme
6c2898ae46

+ 9 - 9
js/component/dataDic.js

@@ -2550,27 +2550,27 @@ module.exports = {
    //营销员发款类型
    paymentType:[
     {
-        value: "0",
-        key: "首"
+        value: "11",
+        key: "首付奖"
     }, {
-        value: "1",
-        key: "尾款"
+        value: "12",
+        key: "结算奖"
     }, {
-        value: "2",
+        value: "16",
         key: "退款"
     }
     ],
     //技术员发款类型
     jsyPaymentType:[
         {
-            value: "0",
+            value: "21",
             key: "申报奖"
         }, {
-            value: "1",
+            value: "23",
             key: "认证奖"
         }, {
-            value: "2",
-            key: "结项奖"
+            value: "34",
+            key: "认证奖"
         }
     ],
     //奖金发放状态

+ 14 - 14
js/component/manageCenter/financialManage/bonus/bonusDetail.jsx

@@ -33,7 +33,7 @@ const BonusDetail=React.createClass({
         this.state.visible=nextProps.showDesc;
     },
     render() {
-        const theData = this.state.data || {};
+        const theData = this.props.data || {};
         const FormItem = Form.Item;
         const formItemLayout = {
             labelCol: { span: 10 },
@@ -54,25 +54,25 @@ const BonusDetail=React.createClass({
                                         <span>{theData.orderNo}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="签单时间">
-							            <span>{theData.signTime?(new Date(theData.signTime)).toLocaleString():''}</span>
+							            <span>{theData.signTime}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="订单负责人">
-                                        <span>{theData.sellerName}</span>
+                                        <span>{theData.salesName}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="客户名称">
-                                        <span>{theData.buyerName}</span>
+                                        <span>{theData.buyName}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="签单金额(万元)">
-                                        <span>{theData.transactionAmount}</span>
+                                        <span>{theData.totalAmount}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="首付款(万元)">
-                                        <span>{theData.name}</span>
+                                        <span>{theData.firstAmount}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="已收(万元)">
-                                        <span>{theData.liquidationStatus}</span>
+                                        <span>{theData.settlementAmount}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="已退(万元)">
-                                        <span>{theData.orderNo}</span>
+                                        <span>{theData.refundAmount}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="订单状态">
                                         <span>{getNewOrderStatus(theData.orderStatus)}</span>
@@ -81,22 +81,22 @@ const BonusDetail=React.createClass({
                                         <span>{getProjectStatus(theData.projectStatus)}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="发放类型">
-                                        <span>{getPaymentType(theData.orderNo)}</span>
+                                        <span>{getPaymentType(theData.bonusSubject)}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="校对后单量">
-                                        <span>{theData.orderNo}</span>
+                                        <span>{theData.proofCount}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="当月认证项目数量">
-                                        <span>{theData.orderNo}</span>
+                                        <span>{theData.renzm}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="当月科技项目数量">
-                                        <span>{theData.orderNo}</span>
+                                        <span>{theData.kejim}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="年度认证项目数量">
-                                        <span>{theData.orderNo}</span>
+                                        <span>{theData.renzy}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="年度科技项目数量">
-                                        <span>{theData.orderNo}</span>
+                                        <span>{theData.kejiy}</span>
                                     </FormItem>
                                 </div>
 			                </Spin>

+ 11 - 4
js/component/manageCenter/financialManage/bonus/jsBonus.jsx

@@ -66,6 +66,7 @@ const JsBonus = React.createClass({
                 departmentId:this.state.departmenttList,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
+                grantStatus: this.state.grantStatus
             },
             success: function (data) {
                 let theArr = [];
@@ -279,6 +280,7 @@ const JsBonus = React.createClass({
             targetName: this.state.projectMenSearch,//项目负责人
             startTime: this.state.releaseDate[0],
             endTime: this.state.releaseDate[1],
+            grantStatus: this.state.grantStatus
         }
         window.location.href=(globalConfig.context+'/api/admin/bonus/exportTechnicianBonusData?'+$.param(data));
     },
@@ -312,6 +314,7 @@ const JsBonus = React.createClass({
         this.state.orderRefundSearch='';
         this.state.projectMenSearch='';
         this.state.releaseDate = [];
+        this.state.grantStatus=undefined;
         this.state.departmenttList=undefined;
         this.loadData();
     },
@@ -354,6 +357,13 @@ const JsBonus = React.createClass({
                     <Input placeholder="项目负责人"
                         value={this.state.projectMenSearch}
                         onChange={(e) => { this.setState({ projectMenSearch: e.target.value }); }} /> 
+                    <Select placeholder="发放状态"
+                        style={{ width: 150 ,marginRight:10}}
+                        value={this.state.grantStatus}
+                        onChange={(e) => { this.setState({ grantStatus: e }) }}>
+                        <Option value='0'>未发放</Option>
+                        <Option value="1">已发放</Option>
+                    </Select>    
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <div style={{float:'right'}}>
@@ -394,14 +404,11 @@ const JsBonus = React.createClass({
                     <Form layout="horizontal" onSubmit={this.boHuiSubmit}>
 			                <Spin spinning={this.state.loading}>
                                 <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label='应收人'>
-                                    <span>{this.state.proofData.targetName}</span>
+                                    <span>{this.state.proofData.salesName}</span>
                                 </FormItem>
                                 <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label='发放人'>
                                     <span>{this.state.proofData.byName}</span>
                                 </FormItem>
-                                <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label='发放日期'>
-                                    <span>{this.state.proofData.grantTime}</span>
-                                </FormItem>
                                 <FormItem wrapperCol={{ span: 12, offset:8 }}>  
                                     <Button type="primary" htmlType="submit"  style={{marginRight:20}}>保存</Button>
                                     <Button type="default" onClick={()=>{this.boHuiCancel()}}>取消</Button>

+ 46 - 62
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -3,7 +3,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '../distribute/public.less';
-import {  Button, Input, Spin, Table,Select, Switch, message, DatePicker,Modal ,Form } from 'antd';
+import {  Button, Input, Spin, Table,Select, Switch,InputNumber, message, DatePicker,Modal ,Form } from 'antd';
 import {getNewOrderStatus,getProjectStatus,getPaymentType,getTransactionProject,getBonusState} from '@/tools';
 import BonuseDetail from './bonusDetail';
 const FormItem= Form.Item;
@@ -54,17 +54,18 @@ const YxBonus = React.createClass({
             loading: true
         });
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/order/listAllSettlement",
+            url: globalConfig.context + "/api/admin/bonus/saleBonusStatistics",
             data: {
                 pageNo: pageNo || 1,
                 pageSize:this.state.pagination.pageSize,
-                ownerName: this.state.nameSearch,//客户名称
+                salesName: this.state.orderRefundSearch,//订单负责人
                 departmentId:this.state.departmenttList,
-                startDate: this.state.releaseDate[0],
-                endDate: this.state.releaseDate[1],
+                startTime: this.state.releaseDate[0],
+                endTime: this.state.releaseDate[1],
+                grantStatus:this.state.grantStatus
             },
             success: function (data) {
                 let theArr = [];
@@ -72,23 +73,7 @@ const YxBonus = React.createClass({
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
                     };
-                } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
-                        theArr.push({
-                            key: i,
-		                    orderNo: thisdata.orderNo,
-		                    orderType:thisdata.orderType,
-		                    orderStatus:thisdata.orderStatus,
-		                    processStatus:thisdata.processStatus,
-		                    projectStage:thisdata.projectStage,
-		                    approval:thisdata.approval,
-		                    creater:thisdata.creater,
-                            createTime:thisdata.createTime?(new Date(thisdata.createTime)).toLocaleString():'',
-                            signTime:thisdata.signTime?(new Date(thisdata.signTime)).toLocaleString():''
-                        });
-                    };
-                }
+                } 
                 this.state.pagination.current = data.data.pageNo;
                 this.state.pagination.total = data.data.totalCount;
                 if(data.data&&data.data.list&&!data.data.list.length){
@@ -96,11 +81,12 @@ const YxBonus = React.createClass({
 					this.state.pagination.total=0
 				}
                 this.setState({
-                    dataSource: theArr,
+                    dataSource: data.data.list,
                     pagination: this.state.pagination
                 });
             }.bind(this),
         }).always(function () {
+           
             this.setState({
                 loading: false
             });
@@ -136,8 +122,8 @@ const YxBonus = React.createClass({
                 },
                 {
                     title: '订单负责人',
-                    dataIndex: 'sellerName',
-                    key: 'sellerName',
+                    dataIndex: 'salesName',
+                    key: 'salesName',
                 }, 
                 {
                     title: '签单日期',
@@ -146,24 +132,16 @@ const YxBonus = React.createClass({
                 },
                 {
                     title: '客户名称',
-                    dataIndex: 'buyerName',
-                    key: 'buyerName',
+                    dataIndex: 'buyName',
+                    key: 'buyName',
                     render:text=>{
                         return text&&text>8?text.substr(0,8)+'...':text
                     }
                 },
                 {
-                    title: '订单金额',
-                    dataIndex: 'transactionAmount',
-                    key: 'transactionAmount'
-                },
-                {
-                    title: '流水科目',
-                    dataIndex: 'transactionSubject',
-                    key: 'transactionSubject',
-                    render:(text)=>{
-                        return getTransactionProject(text)
-                    }
+                    title: '订单金额(万元)',
+                    dataIndex: 'totalAmount',
+                    key: 'totalAmount'
                 },
                 {
                     title: '订单状态',
@@ -183,28 +161,28 @@ const YxBonus = React.createClass({
                 },
                  {
                     title: '发放状态',
-                    dataIndex: 'creater11',
-                    key: 'creater11',
+                    dataIndex: 'grantStatus',
+                    key: 'grantStatus',
                     render:(text)=>{
                         return getBonusState(text)
                     }
                 },
                 {
                     title: '发放类型',
-                    dataIndex: 'creater11t',
-                    key: 'creater11t',
+                    dataIndex: 'bonusSubject',
+                    key: 'bonusSubject',
                     render:text=>{
                         return getPaymentType(text)
                     }
                 },
                 {
-                    title: '已收',
-                    dataIndex: 'creater22',
-                    key: 'creater22'
+                    title: '已收(万元)',
+                    dataIndex: 'settlementAmount',
+                    key: 'settlementAmount'
                 },{
-                    title: '已退',
-                    dataIndex: 'creater33',
-                    key: 'creater33'
+                    title: '已退(万元)',
+                    dataIndex: 'refundAmount',
+                    key: 'refundAmount'
                 },
                 {
                     title: '操作',
@@ -212,8 +190,8 @@ const YxBonus = React.createClass({
                     key: 'state11',
                     render:(text,recard)=>{
                         return <div>
-                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.proofread(recard,0)}}>发放</Button>
-                            <Button type="primary" onClick={(e)=>{e.stopPropagation(),this.proofread(recard,1)}}>校对</Button>
+                            {(recard.proofStatus&&!recard.grantStatus)?<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.proofread(recard,0)}}>发放</Button>:''}
+                            {(!recard.proofStatus&&!recard.grantStatus)?<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.proofread(recard,1)}}>校对</Button>:''}
                         </div>
                     }
                 },
@@ -277,8 +255,9 @@ const YxBonus = React.createClass({
             salesName: this.state.orderRefundSearch,//订单负责人
             startTime: this.state.releaseDate[0],
             endTime: this.state.releaseDate[1],
+            grantStatus:this.state.grantStatus,
         }
-        window.location.href=(globalConfig.context+'/api/admin/financial/exportBillData?'+$.param(data));
+        window.location.href=(globalConfig.context+'/api/admin/bonus/exportSaleBonusData?'+$.param(data));
     },
     //保存发放状态
     boHuiSubmit(e){
@@ -290,11 +269,12 @@ const YxBonus = React.createClass({
         this.setState({
             loading:true
         });
+        var api = !this.state.proofreadState?"/api/admin/bonus/bonusPayment":"/api/admin/bonus/proofreading";
         $.ajax({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + !this.state.proofreadState?"/api/admin/bonus/bonusPayment":"/api/admin/bonus/proofreading",
+            url: globalConfig.context + api,
             data: !this.state.proofreadState?{   //0-发放   1-校对
                 id: this.state.proofData.id,
                 orderNo:this.state.proofData.orderNo,
@@ -318,6 +298,7 @@ const YxBonus = React.createClass({
         this.state.orderRefundSearch='';
         this.state.releaseDate = [];
         this.state.departmenttList=undefined;
+        this.state.grantStatus=undefined
         this.loadData();
     },
     searchSwitch() {
@@ -356,6 +337,14 @@ const YxBonus = React.createClass({
                     <Input placeholder="订单负责人"
                         value={this.state.orderRefundSearch}
                         onChange={(e) => { this.setState({ orderRefundSearch: e.target.value }); }} /> 
+                    <Select placeholder="发放状态"
+                        style={{ width: 150 ,marginRight:10}}
+                        value={this.state.grantStatus}
+                        onChange={(e) => { this.setState({ grantStatus: e }) }}>
+                        <Option value='0'>未发放</Option>
+                        <Option value="1">已发放</Option>
+                    </Select>
+
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <div style={{float:'right'}}>
@@ -369,6 +358,7 @@ const YxBonus = React.createClass({
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
                             this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
                             onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                            
                     </div>
                 </div>
                 <div className="patent-table" id="table">
@@ -397,12 +387,9 @@ const YxBonus = React.createClass({
 			                <Spin spinning={this.state.loading}>
                                 {this.state.proofreadState?<div>
                                     <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label={<span><strong style={{color:'#f00'}}>*</strong>单量校对结果</span>}>
-                                        <Input
-                                            placeholder="请输入单量校对结果"
+                                        <InputNumber min={0} max={1} placeholder="输入单量" 
                                             value={this.state.result}
-                                            onChange={(e) => {
-                                                this.setState({ result: e.target.value });
-                                            }}
+                                            onChange={(e)=>{this.setState({result:e})}}
                                         />
                                     </FormItem>   
                                     <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label='校对人'>
@@ -411,14 +398,11 @@ const YxBonus = React.createClass({
                                 </div>:
                                 <div>
                                     <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label='应收人'>
-                                        <span>{this.state.proofData.targetName}</span>
+                                        <span>{this.state.proofData.salesName}</span>
                                     </FormItem>
                                     <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label='发放人'>
                                         <span>{this.state.proofData.byName}</span>
                                     </FormItem>
-                                    <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label='发放日期'>
-                                        <span>{this.state.proofData.grantTime}</span>
-                                    </FormItem>
                                 </div>
                             }
                             <FormItem wrapperCol={{ span: 12, offset:8 }}>  

+ 3 - 16
js/component/manageCenter/financialManage/distribute/receivable.jsx

@@ -21,10 +21,6 @@ const Receivable=React.createClass({
                 message.warning('请填写金额');
                 return false;
         }
-        if(!this.state.transactionProject){
-            message.warning('请选择流水科目');
-            return false;
-        }
         if(!this.state.transactionChannel){
             message.warning('请选择交易渠道');
             return false;
@@ -43,7 +39,7 @@ const Receivable=React.createClass({
                 payeeId:data.companyId,
                 payerId:data.buyerId,
                 transactionAmount: this.state.settlementAmount,
-                transactionSubject: this.state.transactionProject,
+                transactionSubject: ~((this.props.title).indexOf('退款'))?'2':'0',
                 transactionChannel: this.state.transactionChannel,
                 financialPayNo:this.state.financialPayNo,
                 financialPayTimes:this.state.financialPayTimes,
@@ -125,17 +121,8 @@ const Receivable=React.createClass({
                                         />
                                         <span style={{ marginLeft: '5px' }}>万元</span>
                                     </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label={<span><strong style={{color:'#f00'}}>*</strong>流水科目</span>}>
-                                        <Select placeholder="流水科目" 
-                                            value={this.state.transactionProject}
-                                            onChange={(e)=>{this.setState({transactionProject:e})}}
-                                            >
-                                            { 
-                                                transactionProject.map(function (item) {
-                                                    return	<Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
-                                                })
-                                            }
-                                        </Select>
+                                    <FormItem className="half-item" {...formItemLayout} label="流水科目">
+                                        <span>{~((this.props.title).indexOf('退款'))?'退款':'代收'}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label={<span><strong style={{color:'#f00'}}>*</strong>交易渠道</span>}>
                                         <Select placeholder="交易渠道" 

+ 16 - 3
js/component/manageCenter/financialManage/distribute/tuiDan.jsx

@@ -6,6 +6,7 @@ import './public.less';
 import {  Button,Form,Select , Input,  Spin, Table, Switch, message, DatePicker } from 'antd';
 import Receivable from './receivable';
 import Examine from './examine';
+import OrderDesc from '../orderDetail/orderDesc';
 import {getLiquidationStatus,getNewOrderStatus,getRefundStatus} from '@/tools';
 
 const TuiDan = React.createClass({
@@ -47,6 +48,10 @@ const TuiDan = React.createClass({
 		                    orderNo: thisdata.orderNo,
                             orderType:thisdata.orderType,
                             buyName:thisdata.buyName,
+                            companyName:thisdata.buyName,
+                            buyerName:thisdata.saleName,
+                            buyerId:thisdata.buyid,
+                            companyId:'0',
 		                    orderStatus:thisdata.orderStatus,
 		                    liquidationStatus:thisdata.liquidationStatus,
                             refundStatus:thisdata.refundStatus,
@@ -101,7 +106,7 @@ const TuiDan = React.createClass({
                     key: 'id',   
                 },
                 {
-                    title: '退单时间',
+                    title: '申请退单时间',
                     dataIndex: 'createTime',
                     key: 'createTime',
                 }, 
@@ -144,7 +149,7 @@ const TuiDan = React.createClass({
                     key: 'caouzo',
                     render:(text,recard)=>{
                         return <div>
-                            {recard.refundStatus==1&&<Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>添加退款记录</Button>}
+                            {recard.refundStatus==1&&<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>添加退款记录</Button>}
                             {recard.refundStatus==0&&<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.reject(recard)}}>审批</Button>}
                         </div>
                     }
@@ -186,6 +191,7 @@ const TuiDan = React.createClass({
         };
     },
     closeDesc(e, s) {
+        this.state.RowData={};
         this.state.showDesc = e;
         if (s) {
             this.loadData(this.state.page);
@@ -266,12 +272,13 @@ const TuiDan = React.createClass({
                             dataSource={this.state.dataSource}
                             rowSelection={false}
                             pagination={this.state.pagination}
+                            onRowClick={this.tableRowClick.bind(this)}
                              />
                     </Spin>
                 </div>
                 <Receivable
                     title='退款记录'
-                    api='xxx'
+                    api='/api/admin/financial/addRefundFlow'
                     data={this.state.assignData}
                     showDesc={this.state.assignVisible}
                     closeDesc={this.closeAssign.bind(this)}
@@ -281,6 +288,12 @@ const TuiDan = React.createClass({
                     showDesc={this.state.examineVisible}
                     closeDesc={this.closeExamine.bind(this)}
                 />
+                <OrderDesc
+                    data={this.state.RowData}
+                    showDesc={this.state.showDesc}
+                    closeDesc={this.closeDesc.bind(this)}
+                />
+
         </div> )
     }
 })

+ 6 - 0
js/component/manageCenter/financialManage/flowWater/departWater.jsx

@@ -144,11 +144,17 @@ const MyWater = React.createClass({
                     title: '收款方',
                     dataIndex: 'payeeName',
                     key: 'payeeName',
+                    // render:(text,recard)=>{
+                    //     return (recard.transactionAmount&&Number(recard.transactionAmount)<0)?recard.payerName:text
+                    // }
                 }, 
                 {
                     title: '付款方',
                     dataIndex: 'payerName',
                     key: 'payerName',
+                    // render:(text,recard)=>{
+                    //     return (recard.transactionAmount&&Number(recard.transactionAmount)<0)?recard.payeeName:text
+                    // }
                 },
                 {
                     title: '流水科目',

+ 6 - 0
js/component/manageCenter/financialManage/flowWater/myWater.jsx

@@ -106,11 +106,17 @@ const MyWater = React.createClass({
                     title: '收款方',
                     dataIndex: 'payeeName',
                     key: 'payeeName',
+                    // render:(text,recard)=>{
+                    //     return (recard.transactionAmount&&Number(recard.transactionAmount)<0)?recard.payerName:text
+                    // }
                 }, 
                 {
                     title: '付款方',
                     dataIndex: 'payerName',
                     key: 'payerName',
+                    // render:(text,recard)=>{
+                    //     return (recard.transactionAmount&&Number(recard.transactionAmount)<0)?recard.payeeName:text
+                    // }
                 },
                 {
                     title: '流水科目',

+ 6 - 3
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -240,15 +240,18 @@ const OrderDetail = Form.create()(React.createClass({
                         <FormItem className="half-item" {...formItemLayout} label="流转状态">
 							<span>{getProcessStatus(theData.processStatus)}</span>
 						</FormItem>
+                        <FormItem className="half-item" {...formItemLayout} label="订单类型">
+							<span>{getNewOrderType(theData.orderType)}</span>
+						</FormItem>
                         <FormItem className="half-item" {...formItemLayout} label="结算状态">
 							<span>{getLiquidationStatus(theData.liquidationStatus)}</span>
 						</FormItem>
+                        <FormItem className="half-item" {...formItemLayout} label="签单总金额(万元)">
+							<span>{theData.totalAmount}</span>
+						</FormItem>
                         <FormItem className="half-item" {...formItemLayout} label="已收款(万元)">
 							<span>{theData.settlementAmount}</span>
 						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="订单类型">
-							<span>{getNewOrderType(theData.orderType)}</span>
-						</FormItem>
                         <FormItem className="half-item" {...formItemLayout} label="是否特批">
 							<span>{getApproval(theData.approval)}</span>
 						</FormItem>