dengzhiguo 7 years ago
parent
commit
655fdb6e27

+ 32 - 0
js/component/dataDic.js

@@ -2056,6 +2056,38 @@ module.exports = {
 	        key: "锁定"
 	        key: "锁定"
 	    }
 	    }
     ],
     ],
+     //是否特批		
+    specially:[
+    	{
+	        value: "0",
+	        key: "非特批"
+	    },{
+	        value: "1",
+	        key: "特批待审核"
+	    },{
+	        value: "2",
+	        key: "特批通过"
+	    }, {
+	        value: "3",
+	        key: "特批未通过"
+	    },{
+	        value: "4",
+	        key: "所有特批订单"
+	    }
+    ],
+     //特批状态		
+    specialBatchState:[
+    	{
+	        value: "1",
+	        key: "特批待审核"
+	    },{
+	        value: "2",
+	        key: "特批通过"
+	    }, {
+	        value: "3",
+	        key: "特批未通过"
+	    }
+    ],
     //项目状态		
     //项目状态		
     projectState:[
     projectState:[
     	 {
     	 {

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

@@ -6,7 +6,7 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import NewService from "./addService.jsx";
 import NewService from "./addService.jsx";
 import moment from 'moment';
 import moment from 'moment';
 import '../../userMangagement.less';
 import '../../userMangagement.less';
-import {intentProgress,transactionProgress,contractProgress,projectProgress,orderType, orderStage, orderState,paymentState, projectState,orderChannel, approvedState, lock,paymentMethod,transactionChannel} from '../../../../dataDic.js';
+import {intentProgress,transactionProgress,contractProgress,projectProgress,orderType, orderStage, orderState,paymentState, projectState,orderChannel, approvedState, lock,paymentMethod,transactionChannel,specially} from '../../../../dataDic.js';
 import {getProjectState,getOrderType,getOrderStage,getOrderState,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel} from '../../../../tools.js';
 import {getProjectState,getOrderType,getOrderStage,getOrderState,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel} from '../../../../tools.js';
 
 
 const ServiceManage=Form.create()(React.createClass({
 const ServiceManage=Form.create()(React.createClass({
@@ -40,6 +40,7 @@ const ServiceManage=Form.create()(React.createClass({
 				projectStage:this.state.projectProgress,
 				projectStage:this.state.projectProgress,
 				liquidationStatus:this.state.settlementState, //结算
 				liquidationStatus:this.state.settlementState, //结算
 				orderStatus:this.state.orderStatusSearch,
 				orderStatus:this.state.orderStatusSearch,
+				approval:this.state.approval,
 				orderChannel:this.state.orderChannel,
 				orderChannel:this.state.orderChannel,
 				intention:this.state.intentOrder?1:0,
 				intention:this.state.intentOrder?1:0,
 				formal:this.state.formalOrder?1:0,
 				formal:this.state.formalOrder?1:0,
@@ -405,6 +406,7 @@ const ServiceManage=Form.create()(React.createClass({
 		this.state.projectProgress = undefined;
 		this.state.projectProgress = undefined;
 		this.state.settlementState = undefined;
 		this.state.settlementState = undefined;
 		this.state.orderStatusSearch = undefined;
 		this.state.orderStatusSearch = undefined;
+		this.state.approval= undefined;
 		this.state.orderChannel = undefined;
 		this.state.orderChannel = undefined;
 		this.state.formalOrder = true;
 		this.state.formalOrder = true;
 		this.state.intentOrder = true;
 		this.state.intentOrder = true;
@@ -454,6 +456,16 @@ const ServiceManage=Form.create()(React.createClass({
 	                                })
 	                                })
 	                            }
 	                            }
 	                    </Select>
 	                    </Select>
+	                    <Select placeholder="特批筛选"
+                            style={{ width: 150 ,marginLeft:'10px'}}
+                            value={this.state.approval}
+                            onChange={(e) => { this.setState({ approval: e }) }}>
+                            {
+                                specially.map(function (item) {
+                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                })
+                            }
+                        </Select>
 	                    <Input placeholder="订单负责人" style={{width:'150px'}}
 	                    <Input placeholder="订单负责人" style={{width:'150px'}}
 	                        value={this.state.orderPersonSearch}
 	                        value={this.state.orderPersonSearch}
 	                        onChange={(e) => { this.setState({ orderPersonSearch: e.target.value }); }} />
 	                        onChange={(e) => { this.setState({ orderPersonSearch: e.target.value }); }} />

+ 15 - 3
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx

@@ -6,7 +6,7 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import NewService from "./addService.jsx";
 import NewService from "./addService.jsx";
 import moment from 'moment';
 import moment from 'moment';
 import '../../userMangagement.less';
 import '../../userMangagement.less';
-import {intentProgress,transactionProgress,contractProgress,projectProgress,orderType, orderStage, orderState,paymentState, projectState,orderChannel, approvedState, lock,paymentMethod,transactionChannel} from '../../../../dataDic.js';
+import {intentProgress,transactionProgress,contractProgress,projectProgress,orderType, orderStage, orderState,paymentState,specially,specialBatchState, projectState,orderChannel, approvedState, lock,paymentMethod,transactionChannel} from '../../../../dataDic.js';
 import {getIntentProgress,getTransactionProgress,getProjectState,getContractProgress,getProjectProgress,splitUrl,getOrderType,getOrderStage,getOrderState,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel} from '../../../../tools.js';
 import {getIntentProgress,getTransactionProgress,getProjectState,getContractProgress,getProjectProgress,splitUrl,getOrderType,getOrderStage,getOrderState,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel} from '../../../../tools.js';
 
 
 const MyService=Form.create()(React.createClass({
 const MyService=Form.create()(React.createClass({
@@ -29,6 +29,7 @@ const MyService=Form.create()(React.createClass({
 				projectStage:this.state.projectProgress,
 				projectStage:this.state.projectProgress,
 				liquidationStatus:this.state.settlementState, //结算
 				liquidationStatus:this.state.settlementState, //结算
 				orderStatus:this.state.orderStatusSearch,
 				orderStatus:this.state.orderStatusSearch,
+				approval:this.state.approval,
 				orderChannel:this.state.orderChannelSearch,
 				orderChannel:this.state.orderChannelSearch,
 				intention:this.state.intentOrder?1:0,
 				intention:this.state.intentOrder?1:0,
 				formal:this.state.formalOrder?1:0,
 				formal:this.state.formalOrder?1:0,
@@ -383,6 +384,7 @@ const MyService=Form.create()(React.createClass({
 		this.state.settlementState = undefined;
 		this.state.settlementState = undefined;
 		this.state.orderStatusSearch = undefined;
 		this.state.orderStatusSearch = undefined;
 		this.state.orderChannelSearch = undefined;
 		this.state.orderChannelSearch = undefined;
+		this.state.approval= undefined;
 		this.state.formalOrder=true;
 		this.state.formalOrder=true;
 		this.state.intentOrder=true;
 		this.state.intentOrder=true;
         this.loadData();       
         this.loadData();       
@@ -420,8 +422,18 @@ const MyService=Form.create()(React.createClass({
 	                    <RangePicker
 	                    <RangePicker
 		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
 		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />     
-	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索<Icon type="search" /></Button>
+		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />    
+		                <Select placeholder="特批筛选"
+                            style={{ width: 150 ,marginLeft:'10px'}}
+                            value={this.state.approval}
+                            onChange={(e) => { this.setState({ approval: e }) }}>
+                            {
+                                specially.map(function (item) {
+                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                })
+                            }
+                        </Select>
+                        <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索<Icon type="search" /></Button>
 	                    <Button onClick={this.reset}>重置 <Icon type="reload" /></Button>
 	                    <Button onClick={this.reset}>重置 <Icon type="reload" /></Button>
 	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
 	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
 	                    <Button type="primary" className="addButton" onClick={this.addClick} >开单<Icon type="plus" /></Button>
 	                    <Button type="primary" className="addButton" onClick={this.addClick} >开单<Icon type="plus" /></Button>