liting2017 7 years ago
parent
commit
7ce3141bca

+ 4 - 1
js/component/manageCenter/order/flowSettlement/billManage/myBill.jsx

@@ -146,7 +146,10 @@ const MyBill=Form.create()(React.createClass({
                 {
                     title: '平台流水号',
                     dataIndex: 'billNo',
-                    key: 'billNo'
+                    key: 'billNo',
+                    render:(text)=>{
+                    	return text&&text.substr(0,9)+'…'
+                    }
                 }, {
                     title: '平台流水时间',
                     dataIndex: 'createTime',

+ 4 - 1
js/component/manageCenter/order/flowSettlement/billManagement/myBill.jsx

@@ -146,7 +146,10 @@ const MyBill=Form.create()(React.createClass({
                 {
                     title: '平台流水号',
                     dataIndex: 'billNo',
-                    key: 'billNo'
+                    key: 'billNo',
+                    render:(text)=>{
+                    	return text&&text.substr(0,9)+'…'
+                    }
                 }, {
                     title: '平台流水时间',
                     dataIndex: 'createTime',

+ 4 - 1
js/component/manageCenter/order/flowSettlement/billQuery/myBill.jsx

@@ -146,7 +146,10 @@ const MyBill=Form.create()(React.createClass({
                 {
                     title: '平台流水号',
                     dataIndex: 'billNo',
-                    key: 'billNo'
+                    key: 'billNo',
+                    render:(text)=>{
+                    	return text&&text.substr(0,9)+'…'
+                    }
                 }, {
                     title: '平台流水时间',
                     dataIndex: 'createTime',

+ 14 - 2
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlement.jsx

@@ -7,7 +7,7 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import MySettlementDetaile from "./mySettlementDetaile.jsx";
 import moment from 'moment';
 import '../../userMangagement.less';
-import {paymentState ,orderChannel} from '../../../../dataDic.js';
+import {paymentState ,orderChannel,orderState} from '../../../../dataDic.js';
 import {getProjectState,getOrderChannel,getOrderType,getOrderState,getPaymentState,getApprovedState} from '../../../../tools.js';
 
 const MySettlement=Form.create()(React.createClass({
@@ -32,6 +32,7 @@ const MySettlement=Form.create()(React.createClass({
 				liquidationStatus:this.state.liquidationStatusSearch, //结算
 				approval:this.state.orderChannelSearch,//特批
 				orderNo:this.state.orderNoSearch,
+				orderStatus:this.state.orderStatusSearch,
             },
             success: function (data) {
                 let theArr = [];
@@ -428,6 +429,7 @@ const MySettlement=Form.create()(React.createClass({
     	this.state.orderNoSearch='';
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
+		this.state.orderStatusSearch = undefined;
 		this.state.orderChannelSearch = undefined;
 		this.state.liquidationStatusSearch = undefined;
 		this.state.salesmanNameSearch = undefined;
@@ -498,6 +500,16 @@ const MySettlement=Form.create()(React.createClass({
                                     })
                                 }
 	                        </Select>
+	                        <Select placeholder="订单状态"
+	                            style={{ width: 150 ,marginRight:'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>
 	                        <Select placeholder="是否特批"
 	                            style={{ width: 150,marginRight:'10px',marginBottom:'10px' }}
 	                            value={this.state.orderChannelSearch}
@@ -554,7 +566,7 @@ const MySettlement=Form.create()(React.createClass({
 			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
 			                <Spin spinning={this.state.loading}>
 			                	<div>
-			                		<Select placeholder="订单部门"
+			                		<Select placeholder="部门"
 				                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
 				                            value={this.state.departmenttList}
 				                            onChange={(e) => { this.setState({ departmenttList: e }) }}>

+ 14 - 3
js/component/manageCenter/order/settlementOrder/settlementManage/settlementManagement.jsx

@@ -456,10 +456,10 @@ const SettlementManage=Form.create()(React.createClass({
 	                </div>
 	                <div className='clearfix' style={{marginTop:'5px'}}>
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
-	                        <Input placeholder="订单编号" style={{width:'150px',marginRight:'10px'}}
+	                        <Input placeholder="订单编号" style={{width:'150px'}}
 	                        	value={this.state.orderNoSearch}
 	                        	onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
-	                        <Select placeholder="订单类型"
+	                        {/*<Select placeholder="订单类型"
 	                            style={{ width: 150 }}
 	                            value={this.state.orderTypeSearch}
 	                            onChange={(e) => { this.setState({ orderTypeSearch: e }) }}>
@@ -469,6 +469,17 @@ const SettlementManage=Form.create()(React.createClass({
                                     })
                                 }
 	                        </Select>
+	                        */}
+	                        <Select placeholder="订单状态"
+	                            style={{ width: 150 ,margin:'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>
 	                    </div>
 	                </div>
 	                <div className="patent-table">
@@ -496,7 +507,7 @@ const SettlementManage=Form.create()(React.createClass({
 			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
 			                <Spin spinning={this.state.loading}>
 			                	<div>
-			                		<Select placeholder="订单部门"
+			                		<Select placeholder="部门"
 				                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
 				                            value={this.state.departmenttList}
 				                            onChange={(e) => { this.setState({ departmenttList: e }) }}>

+ 10 - 1
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx

@@ -59,7 +59,8 @@ const ProjectOrder=Form.create()(React.createClass({
 	                         liquidationStatus:thisdata.liquidationStatus,
 	                         approval:thisdata.approval,
 	                         buyerType:thisdata.buyerType,
-	                         salesmanName:thisdata.salesmanName
+	                         salesmanName:thisdata.salesmanName,
+	                         departmentName:thisdata.departmentName
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -156,6 +157,10 @@ const ProjectOrder=Form.create()(React.createClass({
                     dataIndex: 'salesmanName',
                     key: 'salesmanName',
                 },{
+                    title: '订单部门',
+                    dataIndex: 'departmentName',
+                    key: 'departmentName',
+                },{
                     title: '结算状态',
                     dataIndex: 'liquidationStatus',
                     key: 'liquidationStatus',
@@ -228,6 +233,10 @@ const ProjectOrder=Form.create()(React.createClass({
                     dataIndex: 'salesmanName',
                     key: 'salesmanName',
                 },{
+                    title: '订单部门',
+                    dataIndex: 'departmentName',
+                    key: 'departmentName',
+                },{
                     title: '结算状态',
                     dataIndex: 'liquidationStatus',
                     key: 'liquidationStatus',

+ 1 - 1
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -1085,7 +1085,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			            <Form layout="horizontal"  id="demand-form" style={{paddingBottom:'40px'}} >
 			                <Spin spinning={this.state.loading}>
 			                	<div>
-			                		<Select placeholder="订单部门"
+			                		<Select placeholder="部门"
 				                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
 				                            value={this.state.departmenttList}
 				                            onChange={(e) => { this.setState({ departmenttList: e }) }}>

+ 28 - 13
js/component/manageCenter/set/organization/organization.jsx

@@ -185,7 +185,7 @@ const Organization=Form.create()(React.createClass({
 			            data:{
 			            	name:this.state.editName,//组织名称
 			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.editManagerId,//负责人ID
+			            	managerId:this.state.managerIdOrganization,//负责人ID
 			                superId:changeSuper,//上级组织
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
@@ -214,7 +214,7 @@ const Organization=Form.create()(React.createClass({
 			            data:{
 			            	name:this.state.editName,//组织名称
 			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.editManagerId,//负责人ID
+			            	managerId:this.state.managerIdOrganization,//负责人ID
 			                superId:superText,//上级组织
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
@@ -246,7 +246,7 @@ const Organization=Form.create()(React.createClass({
 			            data:{
 			            	name:this.state.editName,//组织名称
 			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.editManagerId,//负责人ID
+			            	managerId:this.state.managerIdOrganization,//负责人ID
 			                superId:changeSuper,//上级组织
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
@@ -275,7 +275,7 @@ const Organization=Form.create()(React.createClass({
 			            data:{
 			            	name:this.state.editName,//组织名称
 			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.editManagerId,//负责人ID
+			            	managerId:this.state.managerIdOrganization,//负责人ID
 			                superId:superText,//上级组织
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
@@ -338,7 +338,7 @@ const Organization=Form.create()(React.createClass({
                 this.setState({
                 	 editId: thisdata.id,//每一条记录的ID
                 	 editName:thisdata.name,//组织名称
-                     editManagerId:thisdata.managerId,//负责人
+                     managerIdOrganization:thisdata.managerId,//负责人
                      editType:thisdata.type,//组织类型
                      editStatus:thisdata.status,//组织状态 
                      editSuperId:thisdata.superId,//上级组织
@@ -490,7 +490,7 @@ const Organization=Form.create()(React.createClass({
 	},
 	//值改变时请求客户名称
 	httpChange(e){
-		if(e.length>=2){
+		if(e.length>=1){
 			this.supervisor(e); 
 		}	
 		this.setState({
@@ -724,13 +724,28 @@ const Organization=Form.create()(React.createClass({
 					                    </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-				                    	<FormItem 
-					                            labelCol={{ span: 7 }}
-					                        	wrapperCol={{ span: 12}}
-					                            label="负责人" >
-					                             <Input placeholder="负责人" value={this.state.editManagerId} 
-				                                onChange={(e)=>{this.setState({editManagerId:e.target.value})}}/>
-					                    </FormItem>
+					                    <FormItem 
+			                           		 labelCol={{ span: 7 }}
+				                        	 wrapperCol={{ span: 12}}
+				                             label="负责人"
+				                             >
+						                    <AutoComplete
+											        className="certain-category-search"
+											        dropdownClassName="certain-category-search-dropdown"
+											        dropdownMatchSelectWidth={false}
+											        dataSource={options}
+											        placeholder="输入名称"
+											        value={this.state.managerIdOrganization}
+											        onChange={this.httpChange}
+											        filterOption={true}
+											        onBlur={this.blurChange}
+											        onSelect={this.selectAuto}
+											        style={{width:'95%'}} 
+											      >
+											        <Input />
+											</AutoComplete> 
+											<span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
+							            </FormItem>
 				                    </div>
 				                    <div className="clearfix">
 				                    	<FormItem