Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT-WEB

dengzhiguo 7 years ago
parent
commit
2ac9aef558

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

@@ -203,7 +203,7 @@ const MyBill=Form.create()(React.createClass({
                     title: '是否有效',
                     dataIndex: 'deleteSign',
                     key: 'deleteSign',
-                    render:(text)=>{return text==0?'有效':'锁定/作废' }
+                    render:(text)=>{return text==0?'有效':'作废' }
                 },
             ],
             dataSource: [],
@@ -297,7 +297,6 @@ const MyBill=Form.create()(React.createClass({
 	                        onChange={(e) => { this.setState({ term: e }) }}>
 	                        <Select.Option value='0'>有效</Select.Option>
 	                        <Select.Option value='1'>作废</Select.Option>
-	                        <Select.Option value='2'>锁定</Select.Option>
                   		</Select>
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
 	                    <Button onClick={this.reset}>重置</Button>

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

@@ -203,7 +203,7 @@ const MyBill=Form.create()(React.createClass({
                     title: '是否有效',
                     dataIndex: 'deleteSign',
                     key: 'deleteSign',
-                    render:(text)=>{return text==0?'有效':'锁定/作废' }
+                    render:(text)=>{return text==0?'有效':'作废' }
                 },
                 {
                     title: '操作',
@@ -307,7 +307,6 @@ const MyBill=Form.create()(React.createClass({
 	                        onChange={(e) => { this.setState({ term: e }) }}>
 	                        <Select.Option value='0'>有效</Select.Option>
 	                        <Select.Option value='1'>作废</Select.Option>
-	                        <Select.Option value='2'>锁定</Select.Option>
                   		</Select>
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
 	                    <Button onClick={this.reset}>重置</Button>

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

@@ -203,7 +203,7 @@ const MyBill=Form.create()(React.createClass({
                     title: '是否有效',
                     dataIndex: 'deleteSign',
                     key: 'deleteSign',
-                    render:(text)=>{return text==0?'有效':'锁定/作废' }
+                    render:(text)=>{return text==0?'有效':'作废' }
                 },
             ],
             dataSource: [],
@@ -297,7 +297,6 @@ const MyBill=Form.create()(React.createClass({
 	                        onChange={(e) => { this.setState({ term: e }) }}>
 	                        <Select.Option value='0'>有效</Select.Option>
 	                        <Select.Option value='1'>作废</Select.Option>
-	                        <Select.Option value='2'>锁定</Select.Option>
                   		</Select>
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
 	                    <Button onClick={this.reset}>重置</Button>

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

@@ -206,7 +206,7 @@ const MyBill=Form.create()(React.createClass({
                     title: '是否有效',
                     dataIndex: 'deleteSign',
                     key: 'deleteSign',
-                    render:(text)=>{return text==0?'有效':'锁定/作废' }
+                    render:(text)=>{return text==0?'有效':'作废' }
                 },
                 {
                     title: '操作',
@@ -310,7 +310,6 @@ const MyBill=Form.create()(React.createClass({
 	                        onChange={(e) => { this.setState({ term: e }) }}>
 	                        <Select.Option value='0'>有效</Select.Option>
 	                        <Select.Option value='1'>作废</Select.Option>
-	                        <Select.Option value='2'>锁定</Select.Option>
                   		</Select>
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
 	                    <Button onClick={this.reset}>重置</Button>

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

@@ -403,7 +403,7 @@ const MySettlement=Form.create()(React.createClass({
                                 }
 	                        </Select>
 	                        <Select placeholder="是否特批"
-	                            style={{ width: 150,marginRight:'10px' }}
+	                            style={{ width: 150,marginRight:'10px',marginBottom:'10px' }}
 	                            value={this.state.orderChannelSearch}
 	                            onChange={(e) => { this.setState({ orderChannelSearch: e }) }}>
 	                            <Select.Option value='0'>未特批</Select.Option>

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

@@ -11,19 +11,11 @@ import {orderState,orderChannel,orderType} from '../../../../dataDic.js';
 import {getProjectState,getOrderChannel,getOrderType,getOrderState,getPaymentState,getApprovedState} from '../../../../tools.js';
 
 const SettlementManage=Form.create()(React.createClass({
-	loadData(pageNo,depart) {
+	loadData(pageNo) {
         this.state.data = [];
         this.setState({
             loading: true
         });
-        let departArr=depart!=undefined?depart:this.state.departmentArr;
-        let depIdList=[];
-        if(this.state.departmenttSearch==undefined){
-        	departArr.map(function(item){
-        		depIdList.push(item.id)
-        	})
-        }
-        let depNoList=depIdList.join(',');
         $.ajax({
             method: "post",
             dataType: "json",
@@ -33,7 +25,7 @@ const SettlementManage=Form.create()(React.createClass({
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
                 buyerName:this.state.buyerNameSearch,
-                depIds:this.state.departmenttSearch==undefined?depNoList:this.state.departmenttSearch,//部门
+                depId:this.state.departmenttSearch,//部门
                 salesmanName:this.state.salesmanNameSearch,//负责人
                 startDate: this.state.releaseDate[0],
 				endDate: this.state.releaseDate[1],
@@ -127,7 +119,6 @@ const SettlementManage=Form.create()(React.createClass({
 				this.setState({
 					departmentArr:theArr,
 				})
-				this.loadData(1,theArr);
 			}.bind(this),
 			}).always(function() {
 				this.setState({
@@ -361,6 +352,7 @@ const SettlementManage=Form.create()(React.createClass({
     },
     componentWillMount() {
         this.departmentList();
+        this.loadData();
     },
     tableRowClick(record, index) {
     	this.state.userDetaile=true;
@@ -472,16 +464,6 @@ const SettlementManage=Form.create()(React.createClass({
                                     })
                                 }
 	                        </Select>
-	                        <Select placeholder="订单渠道"
-	                            style={{ width: 150,marginRight:'10px' }}
-	                            value={this.state.orderChannelSearch}
-	                            onChange={(e) => { this.setState({ orderChannelSearch: e }) }}>
-	                            {
-                                    orderChannel.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
 	                        <Select placeholder="订单类型"
 	                            style={{ width: 150 }}
 	                            value={this.state.orderTypeSearch}

+ 7 - 14
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx

@@ -6,7 +6,7 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import MySettlementDetaile from "./projectManageDetaile.jsx";
 import moment from 'moment';
 import '../userMangagement.less';
-import {projectState} from '../../../../dataDic.js';
+import {projectState,orderState} from '../../../../dataDic.js';
 import {getProjectState,getOrderState,getOrderType,getPaymentState,getApprovedState} from '../../../../tools.js';
 
 const ProjectOrder=Form.create()(React.createClass({
@@ -25,8 +25,8 @@ const ProjectOrder=Form.create()(React.createClass({
                 setUpStartDate: this.state.releaseDate[0],
 				setUpEndDate: this.state.releaseDate[1],
 				depId:this.state.departmentt,
-				orderStartTime: this.state.releaseDateOrder[0],
-				orderEndTime: this.state.releaseDateOrder[1],
+				orderStartDate: this.state.releaseDateOrder[0],
+				orderEndDate: this.state.releaseDateOrder[1],
                 buyerName:this.state.buyerNameSearch,//客户名称
                 orderStatus:this.state.orderStatusSearch, //订单状态
                 salesmanName:this.state.salesmanNameSearch,//订单负责人
@@ -177,6 +177,7 @@ const ProjectOrder=Form.create()(React.createClass({
      //结项
     Knots(record){
     	this.setState({
+    		signComment:'',
     		contractId:record.id,
     		serial:record.serialNumber,
     		buyerName:record.buyerName,
@@ -380,6 +381,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                    <Input placeholder="客户名称" style={{width:'150px'}}
 	                        value={this.state.buyerNameSearch}
 	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
+	                    <span style={{fontSize:'14px',marginRight:'5px'}}>立项时间:</span>    
 	                    <RangePicker
 		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
@@ -391,17 +393,7 @@ const ProjectOrder=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'}}
-	                            value={this.state.orderStatusSearch}
-	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
-	                            {
-                                    projectState.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                        <Input placeholder="订单编号" style={{width:'150px',margin:'10px'}}
+	                        <Input placeholder="订单编号" style={{width:'150px',marginRight:'10px'}}
 		                        value={this.state.orderNoSearch}
 		                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
 	                        <Select placeholder="选择部门" style={{width:'150px'}}
@@ -416,6 +408,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                        <Input placeholder="订单负责人" style={{width:'150px',margin:'10px'}}
 		                        value={this.state.salesmanNameSearch}
 		                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
+	                        <span style={{fontSize:'14px',marginRight:'5px'}}>订单时间:</span>
 	                        <RangePicker
 		                        value={[this.state.releaseDateOrder[0] ? moment(this.state.releaseDateOrder[0]) : null,
 		                        this.state.releaseDateOrder[1] ? moment(this.state.releaseDateOrder[1]) : null]}

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

@@ -413,7 +413,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			data: {
 				uid:this.state.autoId,
 				signComment:this.state.signComment,
-				aid:this.state.aid
+				aid:this.state.aid,
+				projectType:0,
 			}
 		}).done(function(data) {
 			this.setState({

+ 2 - 9
js/component/manageCenter/servicesManage/projectOrder/taskManagement/projectManage.jsx

@@ -478,15 +478,8 @@ const TaskManagement=Form.create()(React.createClass({
                                     })
                                 }
 	                        </Select>
-	                        <Select placeholder="是否锁定"
-	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.deleteSignSearch}
-	                            onChange={(e) => { this.setState({ deleteSignSearch: e }) }}>
-	                            <Select.Option value='0'>未锁定</Select.Option>
-	                            <Select.Option value='2'>锁定</Select.Option>
-	                        </Select>
 	                        <Select placeholder="业务类别"
-	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            style={{ width: 150 }}
 	                            value={this.state.categoryIdSearch}
 	                            onChange={(e) => { this.setState({ categoryIdSearch: e }) }}>
 	                            {
@@ -498,7 +491,7 @@ 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',margin:'10px'}}
+	                        <Input placeholder="任务名称" style={{width:'150px',}}
 		                        value={this.state.salesmanNameSearch}
 		                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
 	                    </div>

+ 1 - 1
webpack.config.js

@@ -286,7 +286,7 @@ module.exports = (function () {
             staticHost = 'http://static.jishutao.com';
             break;
         case 'prod':
-            staticHost = 'http://s.jishutao.com';
+            staticHost = 'http://s.ganniutao.com';
             break;
         default:
             break;