liting2017 7 years ago
parent
commit
c7b38d92e5

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

@@ -461,7 +461,7 @@ const ServiceManage=Form.create()(React.createClass({
 	                  		<Checkbox checked={this.state.intentOrder} onChange={(e)=>{this.setState({intentOrder:!this.state.intentOrder})}}>意向订单</Checkbox>
 	                  		<Checkbox checked={this.state.formalOrder} onChange={(e)=>{this.setState({formalOrder:!this.state.formalOrder})}}>正式订单</Checkbox>
 	                  		<Select placeholder="订单状态"
-	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
 	                            value={this.state.orderStatusSearch}
 	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
 	                            {

+ 4 - 3
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?'有效':'锁定/作废' }
+                    render:(text)=>{return text==0?'有效':'锁定/作废' }
                 },
             ],
             dataSource: [],
@@ -295,8 +295,9 @@ const MyBill=Form.create()(React.createClass({
 	                        style={{ width: 150 ,marginRight:'10px'}}
 	                        value={this.state.term}
 	                        onChange={(e) => { this.setState({ term: e }) }}>
-	                        <Select.Option value='0'>作废</Select.Option>
-	                        <Select.Option value='1'>有效</Select.Option>
+	                        <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>

+ 4 - 3
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?'有效':'锁定/作废' }
+                    render:(text)=>{return text==0?'有效':'锁定/作废' }
                 },
                 {
                     title: '操作',
@@ -305,8 +305,9 @@ const MyBill=Form.create()(React.createClass({
 	                        style={{ width: 150 ,marginRight:'10px'}}
 	                        value={this.state.term}
 	                        onChange={(e) => { this.setState({ term: e }) }}>
-	                        <Select.Option value='0'>作废</Select.Option>
-	                        <Select.Option value='1'>有效</Select.Option>
+	                        <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>

+ 9 - 4
js/component/manageCenter/order/flowSettlement/billManagement/myBillDetaile.jsx

@@ -40,6 +40,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 	                	orderList:thisData,
 	                	financialPayNo:thisData.financialPayNo,
 	                	financialPayTime:thisData.financialPayTime?moment(thisData.financialPayTime,'YYYY-MM-DD HH:mm:ss'):undefined,
+	                	times:thisData.financialPayTime,
 	                	remarks:thisData.remarks,
 						billNoId:record.billNo,
 	                });                  
@@ -57,9 +58,13 @@ const MyBillDetaile = Form.create()(React.createClass({
         	message.warning('请输入财务流水号');
         	return false;
         };
-        if(this.state.selTime==undefined){
-        	message.warning('请选择财务流水时间');
-        	return false;
+        console.log(this.state.times)
+        console.log(this.state.selTime)
+        if(!this.state.times){
+        	if(this.state.selTime==undefined){
+        		message.warning('请选择财务流水时间');
+        		return false;
+        	}
         };
 		this.setState({
 			loading: true
@@ -74,7 +79,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 				billNo:this.state.billNoId,
 				orderNo:this.props.datauser.orderNo,
 				financialPayNo:this.state.financialPayNo,
-				financialPayTime:this.state.selTime,
+				financialPayTime:this.state.selTime==undefined?this.state.times:this.state.selTime,
 				remarks:this.state.remarks
 			}
 		}).done(function(data) {

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

@@ -18,7 +18,7 @@ const MyBill=Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/queryMyBill',
+            url: globalConfig.context + '/api/admin/order/listMyBill',
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -203,7 +203,7 @@ const MyBill=Form.create()(React.createClass({
                     title: '是否有效',
                     dataIndex: 'deleteSign',
                     key: 'deleteSign',
-                    render:(text)=>{return !text?'有效':'锁定/作废' }
+                    render:(text)=>{return text==0?'有效':'锁定/作废' }
                 },
             ],
             dataSource: [],
@@ -295,8 +295,9 @@ const MyBill=Form.create()(React.createClass({
 	                        style={{ width: 150 ,marginRight:'10px'}}
 	                        value={this.state.term}
 	                        onChange={(e) => { this.setState({ term: e }) }}>
-	                        <Select.Option value='0'>作废</Select.Option>
-	                        <Select.Option value='1'>有效</Select.Option>
+	                        <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>

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

@@ -18,7 +18,7 @@ const MyBill=Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/listMyBill',
+            url: globalConfig.context + '/api/admin/order/queryMyBill',
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -206,7 +206,7 @@ const MyBill=Form.create()(React.createClass({
                     title: '是否有效',
                     dataIndex: 'deleteSign',
                     key: 'deleteSign',
-                    render:(text)=>{return !text?'有效':'锁定/作废' }
+                    render:(text)=>{return text==0?'有效':'锁定/作废' }
                 },
                 {
                     title: '操作',
@@ -308,8 +308,9 @@ const MyBill=Form.create()(React.createClass({
 	                        style={{ width: 150 ,marginRight:'10px'}}
 	                        value={this.state.term}
 	                        onChange={(e) => { this.setState({ term: e }) }}>
-	                        <Select.Option value='0'>作废</Select.Option>
-	                        <Select.Option value='1'>有效</Select.Option>
+	                        <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/myOrder/servicesOrder/myService.jsx

@@ -412,7 +412,7 @@ const MyService=Form.create()(React.createClass({
 	                  		<Checkbox checked={this.state.intentOrder} onChange={(e)=>{this.setState({intentOrder:!this.state.intentOrder})}}>意向订单</Checkbox>
 	                  		<Checkbox checked={this.state.formalOrder} onChange={(e)=>{this.setState({formalOrder:!this.state.formalOrder})}}>正式订单</Checkbox>
 	                  		<Select placeholder="订单状态"
-	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
 	                            value={this.state.orderStatusSearch}
 	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
 	                            {

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

@@ -375,7 +375,7 @@ const ApproveOrder=Form.create()(React.createClass({
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
 	                  		<Checkbox checked={this.state.approvalHistorySearch} onChange={(e)=>{this.setState({approvalHistorySearch:!this.state.approvalHistorySearch})}}>特批历史订单</Checkbox>
 	                        <Select placeholder="订单状态"
-	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
 	                            value={this.state.orderStateSearch}
 	                            onChange={(e) => { this.setState({ orderStateSearch: e }) }}>
 	                            {

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

@@ -406,7 +406,7 @@ const PublicOrder=Form.create()(React.createClass({
 	                <div className='clearfix' style={{marginTop:'5px'}}>
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
 	                        <Select placeholder="订单状态"
-	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
 	                            value={this.state.orderStatusSearch}
 	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
 	                            {

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

@@ -463,7 +463,7 @@ const SettlementManage=Form.create()(React.createClass({
 	                <div className='clearfix' style={{marginTop:'5px'}}>
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
 	                        <Select placeholder="订单状态"
-	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
 	                            value={this.state.orderStatusSearch}
 	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
 	                            {

+ 1 - 1
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrder.jsx

@@ -324,7 +324,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                <div className='clearfix' style={{marginTop:'5px'}}>
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
 	                    <Select placeholder="订单部门"
-	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
 	                            value={this.state.departmenttSearch}
 	                            onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
 	                            {

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

@@ -401,14 +401,6 @@ const ProjectOrder=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='1'>作废</Select.Option>
-	                            <Select.Option value='2'>锁定</Select.Option>
-	                        </Select>
 	                        <Input placeholder="订单编号" style={{width:'150px',margin:'10px'}}
 		                        value={this.state.orderNoSearch}
 		                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
@@ -417,7 +409,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                            onChange={(e) => { this.setState({ departmentt: e }) }}>
 	                            {
 	                                departmentArr.map(function (item) {
-	                                        return <Select.Option key={item.depNo} >{item.name}</Select.Option>
+	                                        return <Select.Option key={item.id} >{item.name}</Select.Option>
 	                                })
 	                            }
 	                        </Select>