liting2017 7 years ago
parent
commit
fe4557b6df

+ 1 - 1
js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx

@@ -184,7 +184,7 @@ const ServiceManage=Form.create()(React.createClass({
                     dataIndex: 'buyerName',
                     key: 'buyerName',
                     render:(text)=>{
-                    	return (text.length>9?text.substr(0,9)+'...':text)
+                    	return (text&&text.length>9?text.substr(0,9)+'...':text)
                     }
                 }, {
                     title: '实际下单金额(万元)',

+ 1 - 1
js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx

@@ -175,7 +175,7 @@ const ApproveOrder=Form.create()(React.createClass({
                     title: '订单客户',
                     dataIndex: 'buyerName',
                     key: 'buyerName',
-                    render:(text)=>{return (text.length>8)?(text).substr(0,8)+'…':text}
+                    render:(text)=>{return (text&&text.length>8)?(text).substr(0,8)+'…':text}
                 },
                 {
                     title: '实际下单金额(万元)',

+ 1 - 1
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlement.jsx

@@ -167,7 +167,7 @@ const MySettlement=Form.create()(React.createClass({
                     dataIndex: 'buyerName',
                     key: 'buyerName',
                     render:(text)=>{
-                    	return (text.length>9?text.substr(0,9)+'...':text)
+                    	return (text&&text.length>9?text.substr(0,9)+'...':text)
                     }
                 }, {
                     title: '实际下单金额(万元)',

+ 1 - 11
js/component/manageCenter/order/settlementOrder/settlementManage/settlementManagement.jsx

@@ -170,7 +170,7 @@ const SettlementManage=Form.create()(React.createClass({
                     dataIndex: 'buyerName',
                     key: 'buyerName',
                     render:(text)=>{
-                    	return (text.length>9?text.substr(0,9)+'...':text)
+                    	return (text&&text.length>9?text.substr(0,9)+'...':text)
                     }
                 }, {
                     title: '实际下单金额(万元)',
@@ -456,16 +456,6 @@ const SettlementManage=Form.create()(React.createClass({
 	                </div>
 	                <div className='clearfix' style={{marginTop:'5px'}}>
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
-	                        <Select placeholder="订单状态"
-	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
-	                            value={this.state.orderStatusSearch}
-	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
-	                            {
-                                    orderState.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
 	                        <Input placeholder="订单编号" style={{width:'150px',marginRight:'10px'}}
 	                        	value={this.state.orderNoSearch}
 	                        	onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />

+ 1 - 4
js/component/manageCenter/servicesManage/projectOrder/myTask/projectManage.jsx

@@ -504,12 +504,9 @@ const MyTask=Form.create()(React.createClass({
                                     })
                                 }
 	                        </Select>
-	                        <Input placeholder="项目编号" style={{width:'150px',margin:'10px'}}
+	                        <Input placeholder="项目编号" style={{width:'150px'}}
 		                        value={this.state.orderNoSearch}
 		                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
-	                        <Input placeholder="任务名称" style={{width:'150px',margin:'10px'}}
-		                        value={this.state.salesmanNameSearch}
-		                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
 	                    </div>
 	                </div>
 	                <div className="patent-table">

+ 0 - 3
js/component/manageCenter/servicesManage/projectOrder/taskManagement/projectManage.jsx

@@ -491,9 +491,6 @@ const TaskManagement=Form.create()(React.createClass({
 	                        <Input placeholder="项目编号" style={{width:'150px',margin:'10px'}}
 		                        value={this.state.orderNoSearch}
 		                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
-	                        <Input placeholder="任务名称" style={{width:'150px',}}
-		                        value={this.state.salesmanNameSearch}
-		                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
 	                    </div>
 	                </div>
 	                <div className="patent-table">