liting2017 6 years ago
parent
commit
728685757d

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

@@ -64,6 +64,7 @@ const JsBonus = React.createClass({
                 salesName: this.state.orderRefundSearch,//订单负责人
                 targetName: this.state.projectMenSearch,//项目负责人
                 departmentId:this.state.departmenttList,
+                orderNo:this.state.orderNoSearch,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
                 grantStatus: this.state.grantStatus
@@ -88,6 +89,7 @@ const JsBonus = React.createClass({
 		                    commodityQuantity:thisdata.commodityQuantity,
 		                    projectStatus:thisdata.projectStatus,
                             byName:thisdata.byName,
+                            commodityName:thisdata.commodityName,
                             bonusSubject:thisdata.bonusSubject,
                             grantStatus:thisdata.grantStatus, 
                             grantTime:thisdata.grantTime,
@@ -150,6 +152,11 @@ const JsBonus = React.createClass({
                     key: 'orderNo',
                 }, 
                 {
+                    title: '任务名称',
+                    dataIndex: 'commodityName',
+                    key: 'commodityName',
+                },
+                {
                     title: '任务负责人',
                     dataIndex: 'targetName',
                     key: 'targetName',
@@ -315,6 +322,7 @@ const JsBonus = React.createClass({
         this.state.orderRefundSearch='';
         this.state.projectMenSearch='';
         this.state.releaseDate = [];
+        this.state.orderNoSearch='';
         this.state.grantStatus=undefined;
         this.state.departmenttList=undefined;
         this.loadData();
@@ -352,9 +360,9 @@ const JsBonus = React.createClass({
                             })
                         }
                     </Select>
-                    {/* <Input placeholder="订单负责人"
-                        value={this.state.orderRefundSearch}
-                        onChange={(e) => { this.setState({ orderRefundSearch: e.target.value }); }} />  */}
+                    <Input placeholder="订单编号"
+                        value={this.state.orderNoSearch}
+                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} /> 
                     <Input placeholder="任务负责人"
                         value={this.state.projectMenSearch}
                         onChange={(e) => { this.setState({ projectMenSearch: e.target.value }); }} /> 

+ 6 - 3
js/component/manageCenter/financialManage/bonus/jsBonusDetail.jsx

@@ -56,6 +56,9 @@ const BonusDetail=React.createClass({
                                     <FormItem className="half-item" {...formItemLayout} label="订单编号">
                                         <span>{theData.orderNo}</span>
                                     </FormItem>
+                                    <FormItem className="half-item" {...formItemLayout} label="任务名称">
+                                        <span>{theData.commodityName}</span>
+                                    </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="任务负责人">
                                         <span>{theData.targetName}</span>
                                     </FormItem>
@@ -69,13 +72,13 @@ const BonusDetail=React.createClass({
                                         <span>{getProjectStatus(theData.projectStatus)}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="受理日期">
-							            <span>{theData.acceptTime?(new Date(theData.acceptTime)).toLocaleString():''}</span>
+							            <span>{theData.acceptTime}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="评审日期">
-							            <span>{theData.reviewTime?(new Date(theData.reviewTime)).toLocaleString():''}</span>
+							            <span>{theData.reviewTime}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="下证日期">
-							            <span>{theData.licenceTime?(new Date(theData.licenceTime)).toLocaleString():''}</span>
+							            <span>{theData.licenceTime}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="订单结算状态">
                                         <span>{getLiquidationStatus(theData.liquidationStatus)}</span>

+ 13 - 8
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -63,6 +63,7 @@ const YxBonus = React.createClass({
                 pageSize:this.state.pagination.pageSize,
                 salesName: this.state.orderRefundSearch,//订单负责人
                 departmentId:this.state.departmenttList,
+                orderNo:this.state.orderNoSearch,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
                 grantStatus:this.state.grantStatus
@@ -121,6 +122,14 @@ const YxBonus = React.createClass({
                     key: 'orderNo',   
                 },
                 {
+                    title: '客户名称',
+                    dataIndex: 'buyName',
+                    key: 'buyName',
+                    render:text=>{
+                        return text&&text>8?text.substr(0,8)+'...':text
+                    }
+                },
+                {
                     title: '订单负责人',
                     dataIndex: 'salesName',
                     key: 'salesName',
@@ -131,14 +140,6 @@ const YxBonus = React.createClass({
                     key: 'signTime',
                 },
                 {
-                    title: '客户名称',
-                    dataIndex: 'buyName',
-                    key: 'buyName',
-                    render:text=>{
-                        return text&&text>8?text.substr(0,8)+'...':text
-                    }
-                },
-                {
                     title: '订单金额(万元)',
                     dataIndex: 'totalAmount',
                     key: 'totalAmount'
@@ -303,6 +304,7 @@ const YxBonus = React.createClass({
     reset() {
         this.state.orderRefundSearch='';
         this.state.releaseDate = [];
+        this.state.orderNoSearch='';
         this.state.departmenttList=undefined;
         this.state.grantStatus=undefined
         this.loadData();
@@ -340,6 +342,9 @@ const YxBonus = React.createClass({
                             })
                         }
                     </Select>
+                    <Input placeholder="订单编号"
+                        value={this.state.orderNoSearch}
+                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} /> 
                     <Input placeholder="订单负责人"
                         value={this.state.orderRefundSearch}
                         onChange={(e) => { this.setState({ orderRefundSearch: e.target.value }); }} /> 

+ 6 - 0
js/component/manageCenter/financialManage/distribute/public.less

@@ -38,6 +38,12 @@ button:focus,button:active{
     width: 50%;
     display: inline-block;
 }
+table tr span,table tr td{
+    overflow: hidden;
+    white-space:nowrap; 
+    text-overflow:ellipsis; 
+    -o-text-overflow:ellipsis;
+}
 .patent-addNew {
     float: right;
     margin-left: 20px;