Browse Source

Merge branch 'master' of ssh://git.jishutao.com:55555/jishutao/kede-client

dengzhiguo 6 years ago
parent
commit
e389418402

+ 51 - 2
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -3,13 +3,49 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './public.less';
-import { Button,Form, Input, Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
+import { Button,Form, Input, Spin, Table, Select,Switch, message, DatePicker, Modal } from 'antd';
 import OrderDesc from '../orderDetail/orderDesc'
 import Receivable from './receivable';
 import {getLiquidationStatus,getNewOrderStatus} from '@/tools';
 const FormItem = Form.Item;
 
 const ShouKuang = React.createClass({
+    departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {},
+			success: function(data) {
+                let thedata = data.data;
+				let theArr=[];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				}else{
+					thedata.map(function(item,index){
+						theArr.push({
+							key:index,
+							name:item.name,
+							id:item.id,
+						})
+					})
+				}
+				this.setState({
+					departmentArr:theArr,
+				})
+			}.bind(this),
+			}).always(function() {
+				this.setState({
+					loading: false
+				});
+			}.bind(this));
+	},
     loadData(pageNo) {
         this.state.data = [];
         this.setState({
@@ -30,6 +66,7 @@ const ShouKuang = React.createClass({
                 orderNo:this.state.orderNoSearch,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
+                departmentId:this.state.departmenttList
             },
             success: function (data) {
                 let theArr = [];
@@ -186,6 +223,7 @@ const ShouKuang = React.createClass({
     },
     componentWillMount() {
         this.loadData();
+        this.departmentList();
     },
     tableRowClick(record, index) {
         this.state.RowData = record;
@@ -213,6 +251,7 @@ const ShouKuang = React.createClass({
         this.state.nameSearch = '';
         this.state.releaseDate = [];
         this.state.orderNoSearch='';
+        this.state.departmenttList=undefined;
         this.loadData();
     },
     //驳回
@@ -261,9 +300,9 @@ const ShouKuang = React.createClass({
                 });
             }
         };
-        const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
         const hasSelect = this.state.selectedRowKeys.length;
+        var departmentArr = this.state.departmentArr ||[];
         return ( <div className="user-content">
             <div className="content-title">
                     <span>收款结算</span>
@@ -275,6 +314,16 @@ const ShouKuang = React.createClass({
                     <Input placeholder="客户名称"
                         value={this.state.nameSearch}
                         onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
+                    <Select placeholder="订单部门"
+                        style={{ width: 150 ,marginRight:10}}
+                        value={this.state.departmenttList}
+                        onChange={(e) => { this.setState({ departmenttList: e }) }}>
+                        {
+                            departmentArr.map(function (item) {
+                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+                            })
+                        }
+                    </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>

+ 50 - 0
js/component/manageCenter/financialManage/distribute/tuiDan.jsx

@@ -10,6 +10,42 @@ import OrderDesc from '../orderDetail/orderDesc';
 import {getLiquidationStatus,getNewOrderStatus,getRefundStatus} from '@/tools';
 
 const TuiDan = React.createClass({
+    departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {},
+			success: function(data) {
+                let thedata = data.data;
+				let theArr=[];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				}else{
+					thedata.map(function(item,index){
+						theArr.push({
+							key:index,
+							name:item.name,
+							id:item.id,
+						})
+					})
+				}
+				this.setState({
+					departmentArr:theArr,
+				})
+			}.bind(this),
+			}).always(function() {
+				this.setState({
+					loading: false
+				});
+			}.bind(this));
+	},
     loadData(pageNo) {
         this.state.data = [];
         this.setState({
@@ -32,6 +68,7 @@ const TuiDan = React.createClass({
                 refundStatus:this.state.refundStatus,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
+                departmentId:this.state.departmenttList
             },
             success: function (data) {
                 let theArr = [];
@@ -180,6 +217,7 @@ const TuiDan = React.createClass({
     },
     componentWillMount() {
         this.loadData();
+        this.departmentList();
     },
     tableRowClick(record, index) {
         this.state.RowData = record;
@@ -224,6 +262,7 @@ const TuiDan = React.createClass({
         this.state.orderRefundSearch='';
         this.state.releaseDate = [];
         this.state.orderNoSearch='';
+        this.state.departmenttList=undefined;
         this.state.refundStatus=undefined;
         this.loadData();
     },
@@ -244,6 +283,7 @@ const TuiDan = React.createClass({
         };
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
+        var departmentArr = this.state.departmentArr ||[];
         return ( <div className="user-content">
             <div className="content-title">
                 <span>退单管理</span>
@@ -258,6 +298,16 @@ const TuiDan = React.createClass({
                     <Input placeholder="客户名称"
                         value={this.state.nameSearch}
                         onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
+                    <Select placeholder="订单部门"
+                        style={{ width: 150 ,marginRight:10}}
+                        value={this.state.departmenttList}
+                        onChange={(e) => { this.setState({ departmenttList: e }) }}>
+                        {
+                            departmentArr.map(function (item) {
+                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+                            })
+                        }
+                    </Select>
                     <Select 
                         onChange={(e)=>{this.setState({refundStatus:e})}} 
                         style={{width:160,marginRight:5}} 

+ 53 - 2
js/component/manageCenter/financialManage/flowWater/myWater.jsx

@@ -3,11 +3,48 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '../distribute/public.less';
-import {  Button, Input, Spin, Table, Switch, message, DatePicker } from 'antd';
+import {  Button, Input, Spin, Table, Switch,Select, message, DatePicker } from 'antd';
 import {getTransactionProject} from '@/tools';
 import WaterDesc from './waterDetail';
 
 const MyWater = React.createClass({
+    departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {},
+			success: function(data) {
+                let thedata = data.data;
+				let theArr=[];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				}else{
+					thedata.map(function(item,index){
+						theArr.push({
+							key:index,
+							name:item.name,
+							id:item.id,
+						})
+					})
+				}
+				this.setState({
+					departmentArr:theArr,
+				})
+			}.bind(this),
+			}).always(function() {
+				this.setState({
+					loading: false
+				});
+			}.bind(this));
+	},
     loadData(pageNo) {
         this.state.data = [];
         this.setState({
@@ -28,7 +65,8 @@ const MyWater = React.createClass({
                 payerName:this.state.payerNameSearch,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
-                orderNo:this.state.orderNo
+                orderNo:this.state.orderNo,
+                departmentId:this.state.departmentId,
             },
             success: function (data) {
                 let theArr = [];
@@ -144,6 +182,7 @@ const MyWater = React.createClass({
     },
     componentWillMount() {
         this.loadData();
+        this.departmentList();
     },
     tableRowClick(record, index) {
         this.state.RowData = record;
@@ -165,6 +204,7 @@ const MyWater = React.createClass({
         this.state.orderNo = '';
         this.state.payeeNameSearch='';
         this.state.releaseDate = [];
+        this.state.departmentId = undefined;
         this.state.payerNameSearch='';
         this.loadData();
     },
@@ -185,6 +225,7 @@ const MyWater = React.createClass({
         };
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
+        var departmentArr =this.state.departmentArr || [];
         return ( <div className="user-content">
             <div className="content-title">
                 <span>我的流水订单</span>
@@ -199,6 +240,16 @@ const MyWater = React.createClass({
                     <Input placeholder="付款方"
                         value={this.state.payerNameSearch}
                         onChange={(e) => { this.setState({ payerNameSearch: e.target.value }); }} />  
+                     <Select placeholder="订单部门"
+                        style={{ width: 150 ,marginRight:10}}
+                        value={this.state.departmentId}
+                        onChange={(e) => { this.setState({ departmentId: e }) }}>
+                        {
+                            departmentArr.map(function (item) {
+                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+                            })
+                        }
+                    </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>

+ 2 - 2
webpack.config.js

@@ -304,7 +304,7 @@ module.exports = (function () {
     }
 
     //let staticHost = 'http://afts.hnzhiming.com';
-    let staticHost = 'http://192.168.0.190';
+    let staticHost = 'http://192.168.0.188';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://static.kedexinxi.com';
@@ -343,7 +343,7 @@ module.exports = (function () {
         // }
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.190',
+            host: '192.168.0.188',
             port: 80,
             allowedHosts: ['127.0.0.1','192.168.0.20','192.168.0.99'],
             headers: {