Browse Source

优化部分列表加载中

HW 4 years ago
parent
commit
8b788144cd

+ 69 - 0
js/component/common/departmentList/index.jsx

@@ -0,0 +1,69 @@
+import React,{Component} from "react";
+import {message, Select, Spin} from "antd";
+import $ from "jquery/src/ajax";
+
+class DepartmentList extends Component{
+    constructor(props) {
+        super(props);
+        this.state={
+            departmentArr:[],
+        }
+    }
+
+    componentDidMount() {
+        this.departmentList();
+    }
+
+    departmentList() {
+        $.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 () {
+
+            }.bind(this)
+        );
+    }
+
+    render() {
+        return(
+            <Select
+                placeholder="订单部门"
+                style={{ width: 150, marginRight: 10 }}
+                value={this.props.value}
+                onChange={e => {
+                    this.props.onChange(e);
+                }}
+            >
+                {this.state.departmentArr.map(function (item) {
+                    return <Select.Option key={item.id}>{item.name}</Select.Option>;
+                })}
+            </Select>
+        )
+    }
+}
+
+export default DepartmentList;

+ 6 - 54
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -43,47 +43,10 @@ import {
 import { ChooseList } from '../../../../component/manageCenter/order/orderNew/chooseList'
 import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
+import DepartmentList from "../../../common/departmentList";
 const FormItem = Form.Item
 
 const approvedOutsourcing = 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, pageSize) {
     this.state.data = []
     this.setState({
@@ -1581,7 +1544,6 @@ const approvedOutsourcing = React.createClass({
   },
   componentWillMount() {
     this.loadData()
-    this.departmentList()
   },
   tableRowClick(record) {
     this.state.RowData = record
@@ -2787,7 +2749,6 @@ const approvedOutsourcing = React.createClass({
     const { TextArea } = Input
     const { RangePicker } = DatePicker
     const { TabPane } = Tabs
-    var departmentArr = this.state.departmentArr || []
     const theData = this.state.orderList || {}
     const formItemLayout = {
       labelCol: { span: 8 },
@@ -2845,20 +2806,11 @@ const approvedOutsourcing = React.createClass({
                   this.setState({ nameSearch: e.target.value })
                 }}
               />
-              <Select
-                placeholder="订单部门"
-                style={{ width: 120, 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>
+              <DepartmentList
+                  value={this.state.departmenttList}
+                  onChange={e => {
+                    this.setState({ departmenttList: e });
+                  }}/>
               <Input
                 placeholder="合同编号"
                 value={this.state.contractNoSearch}

+ 7 - 52
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -31,45 +31,9 @@ const {TabPane} = Tabs
 import OrderDesc from "../../financialManage/orderDetail/orderDesc";
 import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
+import DepartmentList from "../../../common/departmentList";
 const inSpecial = 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({
@@ -574,7 +538,6 @@ const inSpecial = React.createClass({
   },
 
   componentWillMount() {
-    this.departmentList();
     this.loadData();
   },
   reset() {
@@ -617,7 +580,6 @@ const inSpecial = React.createClass({
       labelCol: { span: 8 },
       wrapperCol: { span: 14 }
     };
-    var departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content" style={{ position: "relative" }}>
         <ShowModalDiv ShowModal={this.state.showModal} />
@@ -663,18 +625,11 @@ const inSpecial = React.createClass({
             <Option value="1">处理中</Option>
             <Option value="2">通过</Option>
           </Select>
-          <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>
+          <DepartmentList
+              value={this.state.departmenttList}
+              onChange={e => {
+                this.setState({ departmenttList: e });
+              }}/>
           <Select
             placeholder="特批状态"
             onChange={e => {

+ 20 - 68
js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx

@@ -29,52 +29,15 @@ import ShowModalDiv from "@/showModal.jsx";
 import OrderDesc from "../orderDetail/orderDesc";
 import KaiPiaoModal from "./kaiPiaoModal"
 import {getProjectName} from "../../../tools";
+import DepartmentList from "../../../common/departmentList";
 const FormItem = Form.Item;
 const { TabPane } = Tabs
 
 const invoiceApplyList = 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({
-      loading: true
+      listLoading: true
     });
     $.ajax({
       method: "get",
@@ -121,23 +84,23 @@ const invoiceApplyList = React.createClass({
               notAmount: thisdata.notAmount
             });
           }
+          this.state.pagination.current = data.data.pageNo;
+          this.state.pagination.total = data.data.totalCount;
+          if (data.data && data.data.list && !data.data.list.length) {
+            this.state.pagination.current = 0;
+            this.state.pagination.total = 0;
+          }
+          this.setState({
+            totalPage: data.data.totalPage,
+            dataSource: theArr,
+            pagination: this.state.pagination
+          });
         }
-        this.state.pagination.current = data.data.pageNo;
-        this.state.pagination.total = data.data.totalCount;
-        if (data.data && data.data.list && !data.data.list.length) {
-          this.state.pagination.current = 0;
-          this.state.pagination.total = 0;
-        }
-        this.setState({
-          totalPage: data.data.totalPage,
-          dataSource: theArr,
-          pagination: this.state.pagination
-        });
       }.bind(this)
     }).always(
       function () {
         this.setState({
-          loading: false
+          listLoading: false
         });
       }.bind(this)
     );
@@ -573,7 +536,6 @@ const invoiceApplyList = React.createClass({
   },
 
   componentWillMount() {
-    this.departmentList();
     this.loadData();
   },
   reset() {
@@ -615,7 +577,6 @@ const invoiceApplyList = React.createClass({
       labelCol: { span: 8 },
       wrapperCol: { span: 14 }
     };
-    var departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
         <ShowModalDiv ShowModal={this.state.showModal} />
@@ -640,20 +601,11 @@ const invoiceApplyList = React.createClass({
                   this.setState({ orderNoSearch: 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>
+              <DepartmentList
+                  value={this.state.departmenttList}
+                  onChange={e => {
+                    this.setState({ departmenttList: e });
+                  }}/>
               <Button
                 type="primary"
                 onClick={this.search}
@@ -676,7 +628,7 @@ const invoiceApplyList = React.createClass({
           </TabPane>
         </Tabs>
         <div className="patent-table">
-          <Spin spinning={this.state.loading}>
+          <Spin spinning={this.state.listLoading}>
             <Table
               columns={
                 this.state.changeList == undefined

+ 9 - 55
js/component/manageCenter/financialManage/distribute/invoiceApplyListQuery.jsx

@@ -29,52 +29,15 @@ import { ChooseList } from "../../../../component/manageCenter/order/orderNew/ch
 import ShowModalDiv from "@/showModal.jsx";
 import OrderDesc from "../orderDetail/orderDesc";
 import {getProjectName} from "../../../tools";
+import DepartmentList from '../../../common/departmentList';
 const FormItem = Form.Item;
 const { TabPane } = Tabs
 
 const invoiceApplyListQuery = 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({
-      loading: true
+      listLoading: true
     });
     $.ajax({
       method: "get",
@@ -138,7 +101,7 @@ const invoiceApplyListQuery = React.createClass({
     }).always(
       function () {
         this.setState({
-          loading: false
+          listLoading: false
         });
       }.bind(this)
     );
@@ -549,7 +512,6 @@ const invoiceApplyListQuery = React.createClass({
   },
 
   componentWillMount() {
-    this.departmentList();
     this.loadData();
   },
   reset() {
@@ -592,7 +554,6 @@ const invoiceApplyListQuery = React.createClass({
       labelCol: { span: 8 },
       wrapperCol: { span: 14 }
     };
-    var departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
         <ShowModalDiv ShowModal={this.state.showModal} />
@@ -620,18 +581,11 @@ const invoiceApplyListQuery = React.createClass({
                   this.setState({ orderNoSearch: 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>
+              <DepartmentList
+                  value={this.state.departmenttList}
+                  onChange={e => {
+                this.setState({ departmenttList: e });
+              }}/>
               <Button
                 type="primary"
                 onClick={this.search}
@@ -655,7 +609,7 @@ const invoiceApplyListQuery = React.createClass({
           </TabPane>
         </Tabs>
         <div className="patent-table">
-          <Spin spinning={this.state.loading}>
+          <Spin spinning={this.state.listLoading}>
             <Table
               columns={
                 this.state.changeList == undefined

+ 6 - 52
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -29,45 +29,8 @@ const {TabPane}= Tabs
 import OrderDesc from "../orderDetail/orderDesc";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import {getProjectName} from "../../../tools";
+import DepartmentList from "../../../common/departmentList";
 const invoiceApplyListWai = 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({
@@ -573,7 +536,6 @@ const invoiceApplyListWai = React.createClass({
   },
 
   componentWillMount() {
-    this.departmentList();
     this.loadData();
   },
   reset() {
@@ -602,7 +564,6 @@ const invoiceApplyListWai = React.createClass({
       labelCol: { span: 8 },
       wrapperCol: { span: 14 }
     };
-    var departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
         <div className="content-title">
@@ -628,18 +589,11 @@ const invoiceApplyListWai = React.createClass({
               this.setState({ orderNoSearch: 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>
+          <DepartmentList
+              value={this.state.departmenttList}
+              onChange={e => {
+                this.setState({ departmenttList: e });
+              }}/>
           <Button
             type="primary"
             onClick={this.search}

+ 6 - 52
js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx

@@ -29,49 +29,12 @@ import ShowModalDiv from "@/showModal.jsx";
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
+import DepartmentList from "../../../common/departmentList";
 
 const FormItem = Form.Item;
 const { TabPane } = Tabs
 
 const outInvoiceQuery = 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({
@@ -552,7 +515,6 @@ const outInvoiceQuery = React.createClass({
   },
 
   componentWillMount() {
-    this.departmentList();
     this.loadData();
   },
   reset() {
@@ -569,7 +531,6 @@ const outInvoiceQuery = React.createClass({
       labelCol: { span: 8 },
       wrapperCol: { span: 14 }
     };
-    var departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
         <ShowModalDiv ShowModal={this.state.showModal} />
@@ -597,18 +558,11 @@ const outInvoiceQuery = React.createClass({
                   this.setState({ orderNoSearch: 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>
+              <DepartmentList
+                  value={this.state.departmenttList}
+                  onChange={e => {
+                    this.setState({ departmenttList: e });
+                  }}/>
               {/* <Select
                 placeholder="特批状态"
                 onChange={e => {

+ 0 - 39
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -20,44 +20,6 @@ import {ChooseList} from "../../order/orderNew/chooseList";
 import {getProjectName} from "../../../tools";
 
 const outSpecial = 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({
@@ -552,7 +514,6 @@ const outSpecial = React.createClass({
   },
 
   componentWillMount() {
-    this.departmentList();
     this.loadData();
   },
 

+ 3 - 49
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -17,48 +17,11 @@ import OrderDesc from "@/manageCenter/financialManage/orderDetail/orderDesc";
 import Assign from "@/manageCenter/publicComponent/assign";
 import { getProcessStatus, getApproval } from "@/tools";
 import {ChooseList} from "../../order/orderNew/chooseList";
+import DepartmentList from "../../../common/departmentList";
 const FormItem = Form.Item;
 const {TabPane} = Tabs;
 
 const PaiDan = 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({
@@ -299,7 +262,6 @@ const PaiDan = React.createClass({
     });
   },
   componentWillMount() {
-    this.departmentList();
     this.loadData();
   },
   tableRowClick(record) {
@@ -358,7 +320,6 @@ const PaiDan = React.createClass({
     });
   },
   render() {
-    var departmentArr = this.state.departmentArr || [];
     const { RangePicker } = DatePicker;
     return (
       <div className="user-content">
@@ -382,18 +343,11 @@ const PaiDan = React.createClass({
                     this.setState({ orderNoSearch: e.target.value });
                   }}
               />
-              <Select
-                  placeholder="订单部门"
-                  style={{ width: 150, marginRight: 10 }}
+              <DepartmentList
                   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
                   placeholder="流程状态"
                   onChange={e => {

+ 9 - 14
js/component/manageCenter/financialManage/flowWater/departWater.jsx

@@ -11,9 +11,6 @@ import {ChooseList} from "../../order/orderNew/chooseList";
 const {TabPane} = Tabs
 const MyWater = React.createClass({
     departmentList() {
-		this.setState({
-			loading: true
-		});
 		$.ajax({
 			method: "get",
 			dataType: "json",
@@ -42,9 +39,7 @@ const MyWater = React.createClass({
 				})
 			}.bind(this),
 			}).always(function() {
-				this.setState({
-					loading: false
-				});
+
 			}.bind(this));
 	},
     loadData(pageNo) {
@@ -53,7 +48,7 @@ const MyWater = React.createClass({
             selectedRowKeys:[],
             selectedRowKey:[],
             page:pageNo,
-            loading: true
+            listLoading: true
         });
         $.ajax({
             method: "get",
@@ -110,7 +105,7 @@ const MyWater = React.createClass({
             }.bind(this),
         }).always(function () {
             this.setState({
-                loading: false
+                listLoading: false
             });
         }.bind(this));
     },
@@ -121,7 +116,7 @@ const MyWater = React.createClass({
             RowData:{},
             selectedRowKeys: [],
             selectedRows: [],
-            loading: false,
+            listLoading: false,
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -149,7 +144,7 @@ const MyWater = React.createClass({
                     title: '收款方',
                     dataIndex: 'payeeName',
                     key: 'payeeName',
-                }, 
+                },
                 {
                     title: '付款方',
                     dataIndex: 'payerName',
@@ -262,7 +257,7 @@ const MyWater = React.createClass({
             changeList: newArr
         });
     },
-    render() { 
+    render() {
         const { RangePicker } = DatePicker;
         let departmentArr = this.state.departmentArr || [];
         return (
@@ -363,7 +358,7 @@ const MyWater = React.createClass({
              </TabPane>
             </Tabs>
             <div className="patent-table">
-              <Spin spinning={this.state.loading}>
+              <Spin spinning={this.state.listLoading}>
                 <Table
                     columns={
                         this.state.changeList
@@ -389,5 +384,5 @@ const MyWater = React.createClass({
         );
     }
 })
- 
-export default MyWater;
+
+export default MyWater;

+ 6 - 52
js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx

@@ -9,6 +9,7 @@ import '../../userMangagement.less';
 import {orderState,paymentState,orderChannel} from '../../../../dataDic.js';
 import {getOrderState,getPaymentState,getOrderChannel,getProjectState,getApprovedState,getOrderType } from '../../../../tools.js';
 import {ChooseList} from "../../orderNew/chooseList";
+import DepartmentList from "../../../../common/departmentList";
 
 
 const {TabPane} = Tabs
@@ -83,46 +84,6 @@ const ApproveOrder=Form.create()(React.createClass({
             });
         }.bind(this));
     },
-    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,
-							depNo:item.depNo
-						})
-					})
-				}
-				this.setState({
-					departmentArr:theArr,
-				})
-			}.bind(this),
-			}).always(function() {
-				this.setState({
-					loading: false
-				});
-			}.bind(this));
-	},
     getInitialState() {
         return {
         	datauser:{},
@@ -284,7 +245,6 @@ const ApproveOrder=Form.create()(React.createClass({
     },
     componentWillMount() {
         this.loadData();
-        this.departmentList()
     },
     tableRowClick(record, index) {
     	this.state.userDetaile=true;
@@ -355,7 +315,6 @@ const ApproveOrder=Form.create()(React.createClass({
 			   })
 			},
         };
-        let departmentArr = this.state.departmentArr || [];
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
         return (
@@ -375,16 +334,11 @@ const ApproveOrder=Form.create()(React.createClass({
 		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
 		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                        <Select placeholder="部门机构"
-	                        style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
-	                        value={this.state.departmentSearch}
-	                        onChange={(e) => { this.setState({ departmentSearch: e }) }}>
-	                        {
-	                            departmentArr.map(function (item) {
-	                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
-	                            })
-	                        }
-                  		</Select>
+                        <DepartmentList
+                            value={this.state.departmentSearch}
+                            onChange={e => {
+                                this.setState({ departmentSearch: e });
+                            }}/>
                   		<Input placeholder="订单负责人" style={{width:'150px'}}
 	                        value={this.state.orderLeader}
 	                        onChange={(e) => { this.setState({ orderLeader: e.target.value }); }} />

+ 6 - 57
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -41,6 +41,7 @@ import Project from "../../../../component/project";
 import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import DepartmentList from "../../../common/departmentList";
 const { TabPane } = Tabs;
 const { TextArea } = Input;
 //图片组件
@@ -188,7 +189,6 @@ const IntentionCustomer = Form.create()(
         selectedRowKeys: [],
         rotateDeg: 0,
         orgCodeUrl: [],
-        departmentArr: [],
         approvalSearch: "1",
         paginations: false,
         pagination: {
@@ -916,7 +916,6 @@ const IntentionCustomer = Form.create()(
     },
     //页面加载函数
     componentWillMount() {
-      this.departmentList();
       this.loadData();
     },
     //整行点击
@@ -1448,46 +1447,6 @@ const IntentionCustomer = Form.create()(
       });
       this.resets();
     },
-    //部门
-    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)
-      );
-    },
     waterData() {
       this.state.data = [];
       this.setState({
@@ -1881,7 +1840,6 @@ const IntentionCustomer = Form.create()(
           });
         },
       };
-      let departmentArr = this.state.departmentArr || [];
       return (
         <div className="user-content">
           {this.state.resVisible ? (
@@ -1926,20 +1884,11 @@ const IntentionCustomer = Form.create()(
                     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>
+                <DepartmentList
+                    value={this.state.departmenttList}
+                    onChange={e => {
+                      this.setState({ departmenttList: e });
+                    }}/>
                 <Input
                   placeholder="合同编号"
                   value={this.state.contractNoSearch}

+ 6 - 56
js/component/manageCenter/order/orderNew/arrearsList.jsx

@@ -24,6 +24,7 @@ import {
 import "./customer.less";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
+import DepartmentList from "../../../common/departmentList";
 
 const ArrearsList = Form.create()(
   React.createClass({
@@ -224,7 +225,6 @@ const ArrearsList = Form.create()(
 
     //页面加载函数
     componentWillMount() {
-      this.departmentList();
       this.loadData();
     },
     //搜索
@@ -270,46 +270,6 @@ const ArrearsList = Form.create()(
       this.state.chufaDate[0] = undefined;
       this.loadData();
     },
-    //部门
-    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)
-      );
-    },
     changeList(arr) {
       const newArr = [];
       this.state.columns.forEach(item => {
@@ -346,7 +306,6 @@ const ArrearsList = Form.create()(
           });
         },
       };
-      let departmentArr = this.state.departmentArr || [];
       const { TabPane } = Tabs;
       return (
         <div className="user-content">
@@ -394,20 +353,11 @@ const ArrearsList = Form.create()(
                     this.setState({ adminName: e.target.value });
                   }}
                 />
-                <Select
-                  placeholder="选择部门"
-                  style={{ width: 150, marginRight: "10px" }}
-                  value={this.state.departmenttSearch}
-                  onChange={(e) => {
-                    this.setState({ departmenttSearch: e });
-                  }}
-                >
-                  {departmentArr.map(function (item) {
-                    return (
-                      <Select.Option key={item.id}>{item.name}</Select.Option>
-                    );
-                  })}
-                </Select>
+                <DepartmentList
+                    value={this.state.departmenttSearch}
+                    onChange={e => {
+                      this.setState({ departmenttSearch: e });
+                    }}/>
                 <span style={{ marginRight: "10px" }}>下单时间 :</span>
                 <RangePicker
                   value={[

+ 5 - 56
js/component/manageCenter/order/orderNew/press.jsx

@@ -6,6 +6,7 @@ import { getLiquidationStatus,getjiedian,getNewOrderStatus,getProjectStatus} fro
 import './customer.less';
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
+import DepartmentList from "../../../common/departmentList";
 
 
 const IntentionCustomer = Form.create()(React.createClass({
@@ -130,7 +131,6 @@ const IntentionCustomer = Form.create()(React.createClass({
     releaseDate: [],
     selectedRowKeys: [],
     orgCodeUrl: [],
-    departmentArr: [],
     paginations: false,
     pagination: {
       defaultCurrent: 1,
@@ -290,7 +290,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 
 	//页面加载函数
 	componentWillMount() {
-		this.departmentList();
 		this.loadData();
 	},
 	//进入新增拜访记录
@@ -421,46 +420,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 		})
 		this.resets();
 	},
-	 //部门
-	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));
-	},
     changeList(arr) {
         const newArr = [];
         this.state.columns.forEach(item => {
@@ -497,7 +456,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 				})
 			},
 		};
-    let departmentArr = this.state.departmentArr || [];
     const { TabPane } = Tabs;
 		return (
       <div className="user-content">
@@ -540,20 +498,11 @@ const IntentionCustomer = Form.create()(React.createClass({
                   this.setState({ orderNo: e.target.value });
                 }}
               />
-              <Select
-                placeholder="选择部门"
-                style={{ width: 150, marginRight: "10px" }}
+            <DepartmentList
                 value={this.state.departmenttSearch}
-                onChange={(e) => {
-                  this.setState({ departmenttSearch: e });
-                }}
-              >
-                {departmentArr.map(function (item) {
-                  return (
-                    <Select.Option key={item.id}>{item.name}</Select.Option>
-                  );
-                })}
-              </Select>
+                onChange={e => {
+                    this.setState({ departmenttSearch: e });
+                }}/>
               <Select
                 placeholder="选择催款节点类型"
                 style={{ width: 150, marginRight: "10px" }}

+ 6 - 55
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -6,6 +6,7 @@ import { getLiquidationStatus,getjiedian,getNewOrderStatus,getProjectStatus} fro
 import './customer.less';
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
+import DepartmentList from "../../../common/departmentList";
 
 
 const IntentionCustomer = Form.create()(React.createClass({
@@ -131,7 +132,6 @@ const IntentionCustomer = Form.create()(React.createClass({
       releaseDate: [],
       selectedRowKeys: [],
       orgCodeUrl: [],
-      departmentArr: [],
       paginations: false,
       pagination: {
         defaultCurrent: 1,
@@ -291,7 +291,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 
 	//页面加载函数
 	componentWillMount() {
-		this.departmentList();
 		this.loadData();
 	},
 	//进入新增拜访记录
@@ -424,46 +423,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 		})
 		this.resets();
 	},
-	 //部门
-	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));
-	},
 	changeList(arr) {
 		const newArr = [];
 		this.state.columns.forEach(item => {
@@ -500,7 +459,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 				})
 			},
 		};
-    let departmentArr = this.state.departmentArr || [];
     const { TabPane } = Tabs;
 		return (
       <div className="user-content">
@@ -547,18 +505,11 @@ const IntentionCustomer = Form.create()(React.createClass({
               this.setState({ orderNo: e.target.value });
             }}
           />
-          <Select
-            placeholder="选择部门"
-            style={{ width: 150, marginRight: "10px" }}
-            value={this.state.departmenttSearch}
-            onChange={e => {
-              this.setState({ departmenttSearch: e });
-            }}
-          >
-            {departmentArr.map(function(item) {
-              return <Select.Option key={item.id}>{item.name}</Select.Option>;
-            })}
-          </Select>
+		  <DepartmentList
+			  value={this.state.departmenttSearch}
+			  onChange={e => {
+				  this.setState({ departmenttSearch: e });
+			  }}/>
           <Select
             placeholder="选择催款节点类型"
             style={{ width: 150, marginRight: "10px" }}

+ 1 - 1
js/component/manageCenter/project/project/projectQuery.jsx

@@ -1,4 +1,4 @@
-import React,{Component} from 'react';
+ import React,{Component} from 'react';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';

+ 4 - 4
js/component/manageCenter/set/business/businessCategory.jsx

@@ -68,7 +68,7 @@ const BusinessCategory=Form.create()(React.createClass({
 	loadData(pageNo, apiUrl) {
         this.state.data = [];
         this.setState({
-            loading: true,
+            listLoading: true,
             ispage:pageNo,
         });
         let nameText=this.state.SuperArr;
@@ -116,7 +116,7 @@ const BusinessCategory=Form.create()(React.createClass({
             }.bind(this),
         }).always(function () {
             this.setState({
-                loading: false
+                listLoading: false
             });
         }.bind(this));
     },
@@ -125,7 +125,7 @@ const BusinessCategory=Form.create()(React.createClass({
             searchMore: true,
             selectedRowKeys: [],
             selectedRows: [],
-            loading: false,
+            listLoading: false,
             orgCodeUrl: [],
 			companyLogoUrl: [],
             pagination: {
@@ -763,7 +763,7 @@ const BusinessCategory=Form.create()(React.createClass({
 					</Tabs>
 
                     <div className="patent-table">
-	                    <Spin spinning={this.state.loading}>
+	                    <Spin spinning={this.state.listLoading}>
 	                        <Table size="middle" columns={
                                 this.state.changeList
                                     ? this.state.changeList

+ 135 - 135
js/component/manageCenter/set/business/businessQuery.jsx

@@ -35,7 +35,7 @@ const PicturesWall = React.createClass({
         this.props.fileList(fileList);
     },
     componentWillReceiveProps(nextProps) {
-        this.state.fileList = nextProps.pictureUrl; 
+        this.state.fileList = nextProps.pictureUrl;
     },
     render() {
         const { previewVisible, previewImage, fileList } = this.state;
@@ -70,7 +70,7 @@ const BusinessProject=Form.create()(React.createClass({
 	loadData(pageNo, apiUrl) {
         this.state.data = [];
         this.setState({
-            loading: true,
+            listLoading: true,
             ispage:pageNo,
         });
         let nameText=this.state.SuperArr;
@@ -148,7 +148,7 @@ const BusinessProject=Form.create()(React.createClass({
                             arrProvinceCity:ProvinceCity,
                         });
                     };
-             
+
                     this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.total = data.data.totalCount;
                 };
@@ -159,7 +159,7 @@ const BusinessProject=Form.create()(React.createClass({
             }.bind(this),
         }).always(function () {
             this.setState({
-                loading: false
+                listLoading: false
             });
         }.bind(this));
     },
@@ -333,7 +333,7 @@ const BusinessProject=Form.create()(React.createClass({
        this.selectSuperId();
     },
     //获取上级品类
-    selectSuperId() {  
+    selectSuperId() {
     	this.state.data = []
          $.ajax({
                 method: "get",
@@ -343,15 +343,15 @@ const BusinessProject=Form.create()(React.createClass({
                 data:{
                   flag:0,
                 },
-                success: function (data) { 
+                success: function (data) {
                 		let theArr = [];
 					    let thedata=data.data;
 					    if (!thedata) {
 		                    if (data.error && data.error.length) {
 		                        message.warning(data.error[0].message);
-		                    };	
-		                    thedata = {}; 
-		              };   
+		                    };
+		                    thedata = {};
+		              };
 					    var contactIds=[];
 				        	for(var i=0;i<data.data.length;i++){
 		                    let theData = data.data[i];
@@ -359,12 +359,12 @@ const BusinessProject=Form.create()(React.createClass({
 		                        <Select.Option value={i.toString()} key={theData.cname}>{theData.cname}</Select.Option>
 		                    );
 		                };
-						this.setState({	
+						this.setState({
 							SuperArr:thedata,
-		                    contactsOption: theArr, 
+		                    contactsOption: theArr,
 		                    orderStatusOptions:data.data,
 	                    });
-	                    
+
 					}.bind(this),
 				}).always(function () {
 				this.loadData(this.state.ispage);
@@ -375,7 +375,7 @@ const BusinessProject=Form.create()(React.createClass({
 	},
 	//编辑部门,保存
     edithandleSubmit(e){
-    	e.preventDefault();	
+    	e.preventDefault();
     	let offsetText;
     	if(this.state.editOffset){
     		if(this.state.editOffset>10||this.state.editOffset<0){
@@ -406,7 +406,7 @@ const BusinessProject=Form.create()(React.createClass({
 				});
 				thecompanyLogoUrl = picArr.join(",");
 			};
-			
+
 			if(!err) {
 				this.setState({
 					loading: true
@@ -448,25 +448,25 @@ const BusinessProject=Form.create()(React.createClass({
 		            	activityPrice:this.state.editActivityPrice,//活动价
 		            	activityFlag:this.state.editActivityFlag,//活动生效标识
 		            	memberPrice:this.state.editMemberPrice,//项目ID
-		            	status:this.state.editStatus,//项目状态 
+		            	status:this.state.editStatus,//项目状态
 		            	country:isCountry,//是否全国
 		            	province:pro?pro:'',//省
 		            	city:city?city:'',//市
 		            	district:dis?dis:'',//区
 		            	minLogo:theorgCodeUrl,
 		            	maxLogo:thecompanyLogoUrl,
-		            	introduce:this.state.editIntroduce,//项目介绍 
+		            	introduce:this.state.editIntroduce,//项目介绍
 		            	projectUrl:this.state.editProjectUrl,//项目地址
 		            	valueEffect:this.state.editValueEffect,//项目价值及作用
-		            	clientSize:this.state.editClientSize,//项目基本条件 
+		            	clientSize:this.state.editClientSize,//项目基本条件
 		            	boutique:this.state.editBoutique,
 		            }
-		        }).done(function (data) { 
+		        }).done(function (data) {
 		            this.setState({
 		                loading: false
 		            });
 		            if (!data.error.length) {
-		                message.success('保存成功!'); 
+		                message.success('保存成功!');
 		                this.edithandleCancel();
 		                this.selectSuperId();
 		            } else {
@@ -474,7 +474,7 @@ const BusinessProject=Form.create()(React.createClass({
 		            }
 		        }.bind(this));
 			}
-		}) 
+		})
     },
     //规格列表整行点击
     formatTableRowClick(record, index){
@@ -489,7 +489,7 @@ const BusinessProject=Form.create()(React.createClass({
         	formatActivityPrice:record.formatActivityPrice,//活动价
         	formatActivityFlag:record.formatActivityFlag,//活动生效标识
         	formatMemberPrice:record.formatMemberPrice,//会员价
-        	formatStatus:record.formatStatus.toString(),//项目状态 
+        	formatStatus:record.formatStatus.toString(),//项目状态
         });
     },
     //项目列表整行点击
@@ -526,7 +526,7 @@ const BusinessProject=Form.create()(React.createClass({
 	                	ProvinceCity.push(parseInt(thisdata.city));
 	                	ProvinceCity.push(parseInt(thisdata.district));
                 	}
-                	
+
                     theArr.push({
                          editId: thisdata.id,//每一条记录的ID
                          editName:thisdata.bname,//项目名称
@@ -541,7 +541,7 @@ const BusinessProject=Form.create()(React.createClass({
                          editOffset: thisdata.offset,//最低折扣
                          editMemberPrice: thisdata.memberPrice,//会员价
                          editActivityFlag:thisdata.activityFlag,//活动生效标识
-                         editStatus:thisdata.status,//品类状态 
+                         editStatus:thisdata.status,//品类状态
                          editCreateId:thisdata.createName,//创建人
                          editTime:thisdata.createTimeFormattedDate,//创建时间
                          editIntroduce:thisdata.introduce,//服务内容
@@ -551,8 +551,8 @@ const BusinessProject=Form.create()(React.createClass({
                          editBoutique:thisdata.boutique,//是否精品
                          orgCodeUrl: thisdata.minLogo ? splitUrl(thisdata.minLogo, ',', globalConfig.avatarHost + '/upload') : [],
 						 cditCompanyLogoUrl: thisdata.maxLogo ? splitUrl(thisdata.maxLogo, ',', globalConfig.avatarHost + '/upload') : [],
-					
-                    }); 
+
+                    });
                 };
                 this.setState({
                 	 editId: thisdata.id,//每一条记录的ID
@@ -568,7 +568,7 @@ const BusinessProject=Form.create()(React.createClass({
                      editOffset: thisdata.offset,//最低折扣
                      editMemberPrice: thisdata.memberPrice,//会员价
                      editActivityFlag:thisdata.activityFlag,//活动生效标识
-                     editStatus:thisdata.status,//品类状态 
+                     editStatus:thisdata.status,//品类状态
                      editCreateId:thisdata.createName,//创建人
                      editTime:thisdata.createTimeFormattedDate,//创建时间
                      editIntroduce:thisdata.introduce,//服务内容
@@ -608,11 +608,11 @@ const BusinessProject=Form.create()(React.createClass({
     			offsetText=this.state.formatOffset;
     		}
     	}
-    	this.props.form.validateFields((err, values) => {                                 
+    	this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.setState({
                     loading: true
-                }); 
+                });
                 $.ajax({
                     method: "post",
                     dataType: "json",
@@ -626,14 +626,14 @@ const BusinessProject=Form.create()(React.createClass({
                     	activityPrice:this.state.formatActivityPrice,//活动价
                     	activityFlag:this.state.formatActivityFlag,//活动生效标识
                     	memberPrice:this.state.formatMemberPrice,//会员价
-                    	status:this.state.formatStatus,//项目状态 
+                    	status:this.state.formatStatus,//项目状态
                     	}
-                }).done(function (data) { 
+                }).done(function (data) {
                     this.setState({
                         loading: false
                     });
                     if (!data.error.length) {
-                        message.success('修改规格成功!'); 
+                        message.success('修改规格成功!');
                         this.formatLoadData();
                         this.editformathandleCancel();
                     } else {
@@ -655,11 +655,11 @@ const BusinessProject=Form.create()(React.createClass({
     			offsetText=this.state.formatOffset;
     		}
     	}
-    	this.props.form.validateFields((err, values) => {                                 
+    	this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.setState({
                     loading: true
-                }); 
+                });
                 $.ajax({
                     method: "post",
                     dataType: "json",
@@ -673,14 +673,14 @@ const BusinessProject=Form.create()(React.createClass({
                     	activityPrice:this.state.formatActivityPrice,//活动价
                     	activityFlag:this.state.formatActivityFlag,//活动生效标识
                     	memberPrice:this.state.formatMemberPrice,//会员价
-                    	status:this.state.formatStatus,//项目状态 
+                    	status:this.state.formatStatus,//项目状态
                     	}
-                }).done(function (data) { 
+                }).done(function (data) {
                     this.setState({
                         loading: false
                     });
                     if (!data.error.length) {
-                        message.success('新增规格成功!'); 
+                        message.success('新增规格成功!');
                         this.formathandleCancel();
                         this.formatLoadData();
                     } else {
@@ -692,7 +692,7 @@ const BusinessProject=Form.create()(React.createClass({
     },
     //新增一个项目,保存
     addhandleSubmit(e){
-    	e.preventDefault();	
+    	e.preventDefault();
     	if(!this.state.categoryName){
     		message.warning('请输入项目名称');
     		return false;
@@ -719,11 +719,11 @@ const BusinessProject=Form.create()(React.createClass({
        		isCountry=1;
        		pro='';
        	}
-		this.props.form.validateFields((err, values) => {                                 
+		this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.setState({
                     loading: true
-                }); 
+                });
                 //上级组织字典
                 let nameText=this.state.SuperArr;
                 let superText=nameText[parseInt(this.state.addCid)].id;
@@ -741,12 +741,12 @@ const BusinessProject=Form.create()(React.createClass({
                     	city:city,//市
                     	district:dis,//区
                     	}
-                }).done(function (data) { 
+                }).done(function (data) {
                     this.setState({
                         loading: false
                     });
                     if (!data.error.length) {
-                        message.success('新增项目成功!'); 
+                        message.success('新增项目成功!');
                         this.handleCancel();
                         this.selectSuperId();
                     } else {
@@ -918,18 +918,18 @@ const BusinessProject=Form.create()(React.createClass({
         this.setState({ visible: false })
     },
     edithandleCancel(e) {
-        this.setState({ 
-        	editvisible: false 
+        this.setState({
+        	editvisible: false
         });
     },
     formathandleCancel(e) {
-        this.setState({ 
-        	formatvisible: false 
+        this.setState({
+        	formatvisible: false
         });
     },
     editformathandleCancel(e) {
-        this.setState({ 
-        	editformatvisible: false 
+        this.setState({
+        	editformatvisible: false
         });
     },
     search() {
@@ -942,7 +942,7 @@ const BusinessProject=Form.create()(React.createClass({
         this.state.ressSearch= undefined;//省市区清零
         this.state.activityFlag = undefined;//活动生效清零
         this.state.status = undefined;//项目状态清零
-        this.loadData(); 
+        this.loadData();
     },
     //新增部分的清零
     addReset(){
@@ -960,7 +960,7 @@ const BusinessProject=Form.create()(React.createClass({
         this.state.formatMemberPrice = '';//会员价清零
         this.state.formatActivityFlag = undefined;//活动生效标识清零
         this.state.formatStatus= undefined;//项目状态清零
-        this.formatLoadData(); 
+        this.formatLoadData();
     },
     //详情tab切换数据处理
 	callback(e) {
@@ -968,7 +968,7 @@ const BusinessProject=Form.create()(React.createClass({
 			callnub: e,
 		})
 		if(e == 1) {
-			
+
 		}
 		if(e == 2) {
 			this.formatLoadData();
@@ -1011,7 +1011,7 @@ const BusinessProject=Form.create()(React.createClass({
        	const { getFieldDecorator } = this.props.form;
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
-        
+
         return (
             <div className="user-content" >
 				<div className="content-title">
@@ -1034,7 +1034,7 @@ const BusinessProject=Form.create()(React.createClass({
 	                    <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
                         <Popconfirm title="是否停用?" onConfirm={this.blockRow} okText="是" cancelText="否">
 						     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px',display:'none'}}
-	                   			 disabled={!hasSelected} 
+	                   			 disabled={!hasSelected}
 	                    		 >停用<Icon type="minus" />
 	           			     </Button>
 						</Popconfirm>
@@ -1042,15 +1042,15 @@ const BusinessProject=Form.create()(React.createClass({
 	                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {display: 'block'}}>
 	                    	<span style={{marginRight:'10px',marginBottom:'10px'}}>
 		                     	<Cascader options={provinceSelect()} style={{marginLeft:10}}  value={this.state.ressSearch} placeholder="选择省份"
-	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
                     		</span>
-                    		<span style={{marginRight:'10px',marginBottom:'10px'}}>                   
+                    		<span style={{marginRight:'10px',marginBottom:'10px'}}>
 		                     	<Cascader options={citySelect()}  value={this.state.ressSearch} placeholder="选择城市"
-	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
                     		</span>
 	                    	<span style={{marginRight:'10px'}}>
 		                     	<Cascader options={areaSelect()}  value={this.state.ressSearch} placeholder="选择地区"
-	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
                     		</span>
 		                    <Select placeholder="活动生效标识"
 		                            style={{width:'150px',marginRight:'10px',marginBottom:'10px'}}
@@ -1066,7 +1066,7 @@ const BusinessProject=Form.create()(React.createClass({
 		                            <Select.Option value="0" >正常</Select.Option>
 		                            <Select.Option value="1" >停用</Select.Option>
 		                    </Select>
-	                    </div>	
+	                    </div>
 	                </div>
 					</TabPane>
                         <TabPane tab="更改表格显示数据" key="3">
@@ -1082,7 +1082,7 @@ const BusinessProject=Form.create()(React.createClass({
                         </TabPane>
 					</Tabs>
 					<div className="patent-table">
-	                    <Spin spinning={this.state.loading}>
+	                    <Spin spinning={this.state.listLoading}>
 	                        <Table columns={
                                 this.state.changeList
                                     ? this.state.changeList
@@ -1091,16 +1091,16 @@ const BusinessProject=Form.create()(React.createClass({
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}
-	                            onRowClick={this.tableRowClick} 
+	                            onRowClick={this.tableRowClick}
 	                            current={this.state.aa}/>
 	                    </Spin>
 	                </div>
-	             
+
 	                 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.visible}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel}
 	                        width='400px'
-	                        title='新增业务项目'                       
+	                        title='新增业务项目'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.addhandleSubmit} id="demand-form">
@@ -1116,24 +1116,24 @@ const BusinessProject=Form.create()(React.createClass({
 					                    </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-					                    <FormItem  
+					                    <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="业务品类"
-			                               > 
+			                               >
 			                                <Select placeholder="请选择业务品类" value={this.state.addCid} onChange={(e)=>{this.setState({addCid:e})}}
 				                                notFoundContent="未获取到业务品类列表" style={{width:'94%'}} required="required">
 				                                {this.state.contactsOption}
-				                            </Select> 
+				                            </Select>
 				                            <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 			                   		    </FormItem>
 		                   		    </div>
 		                   		    <div className="clearfix">
-					                    <FormItem  
+					                    <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="是否精品"
-			                               > 
+			                               >
 			                               <Radio.Group value={this.state.boutique} onChange={(e) => {
 						                    this.setState({ boutique: e.target.value })
 						                    }}>
@@ -1143,33 +1143,33 @@ const BusinessProject=Form.create()(React.createClass({
 			                   		    </FormItem>
 		                   		    </div>
 	                    			<div className="clearfix">
-			                   		    <FormItem 
+			                   		    <FormItem
 					                           labelCol={{ span: 7 }}
 					                           wrapperCol={{ span: 12 }}
 					                           label="省"
-					                          > 
+					                          >
 					                            <Cascader options={provinceSelect()}  value={this.state.ProvinceCity} placeholder="选择省" style={{width:'94%'}}
 												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 												<span style={{color:'red',marginLeft:'5px'}}>*</span>
 							            </FormItem>
 						             </div>
 						             <div className="clearfix">
-			                   		    <FormItem 
+			                   		    <FormItem
 					                           labelCol={{ span: 7 }}
 					                           wrapperCol={{ span: 12 }}
 					                           label="省-市"
-					                          > 
+					                          >
 					                            <Cascader options={citySelect()}  value={this.state.ProvinceCity} placeholder="选择市" style={{width:'94%'}}
 												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 												<span style={{color:'red',marginLeft:'5px'}}>*</span>
 							            </FormItem>
 						             </div>
 						             <div className="clearfix">
-			                   		    <FormItem 
+			                   		    <FormItem
 					                           labelCol={{ span: 7 }}
 					                           wrapperCol={{ span: 12 }}
 					                           label="省-市-区"
-					                          > 
+					                          >
 					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择区" style={{width:'94%'}}
 												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 												<span style={{color:'red',marginLeft:'5px'}}>*</span>
@@ -1183,13 +1183,13 @@ const BusinessProject=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.formatvisible}
 	                        onOk={this.checkPatentProcess} onCancel={this.formathandleCancel}
 	                        width='400px'
-	                        title='新增项目规格'                       
+	                        title='新增项目规格'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.formathandleSubmit} id="demand-form">
 				                <Spin spinning={this.state.loading}>
 				                    <div className="clearfix">
-				                    	 <FormItem  
+				                    	 <FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="项目名称"
@@ -1212,7 +1212,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="市场价" value={this.state.formatPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="活动价"
@@ -1220,7 +1220,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="活动价" value={this.state.formatActivityPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatActivityPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="最低折扣"
@@ -1228,7 +1228,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="最低折扣" value={this.state.formatOffset} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatOffset:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="会员价"
@@ -1236,13 +1236,13 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="会员价" value={this.state.formatMemberPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatMemberPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem  
+						                 <FormItem
 					                         	labelCol={{ span: 7 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="活动生效"
-					                         > 
+					                         >
 					                          <Select placeholder="活动生效" value={this.state.formatActivityFlag} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({formatActivityFlag:e})}}> 
+				                                onChange={(e)=>{this.setState({formatActivityFlag:e})}}>
 				                                {
 				                                    gameState.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1250,13 +1250,13 @@ const BusinessProject=Form.create()(React.createClass({
 				                                }
 				                              </Select>
 				                   		 </FormItem>
-				                   		  <FormItem 
+				                   		  <FormItem
 					                         	labelCol={{ span: 7 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="项目状态"
-					                         > 
+					                         >
 					                          <Select placeholder="项目状态" value={this.state.formatStatus} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({formatStatus:e})}}> 
+				                                onChange={(e)=>{this.setState({formatStatus:e})}}>
 				                                {
 				                                    conditionOrganization.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1273,7 +1273,7 @@ const BusinessProject=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.editformatvisible}
 	                        onOk={this.checkPatentProcess} onCancel={this.editformathandleCancel}
 	                        width='400px'
-	                        title='编辑项目规格'                       
+	                        title='编辑项目规格'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.editformathandleSubmit} id="demand-form">
@@ -1289,7 +1289,7 @@ const BusinessProject=Form.create()(React.createClass({
 					                    </FormItem>
 				                    </div>
 		                   		     <div className="clearfix" >
-							              <FormItem  
+							              <FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="创建人"
@@ -1304,7 +1304,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="市场价" value={this.state.formatPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="活动价"
@@ -1312,7 +1312,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="活动价" value={this.state.formatActivityPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatActivityPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="最低折扣"
@@ -1320,7 +1320,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="最低折扣" value={this.state.formatOffset} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatOffset:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="会员价"
@@ -1328,13 +1328,13 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="会员价" value={this.state.formatMemberPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatMemberPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem  
+						                 <FormItem
 					                         	labelCol={{ span: 7 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="活动生效"
-					                         > 
+					                         >
 					                          <Select placeholder="活动生效" value={this.state.formatActivityFlag} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({formatActivityFlag:e})}}> 
+				                                onChange={(e)=>{this.setState({formatActivityFlag:e})}}>
 				                                {
 				                                    gameState.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1342,13 +1342,13 @@ const BusinessProject=Form.create()(React.createClass({
 				                                }
 				                              </Select>
 				                   		 </FormItem>
-				                   		  <FormItem 
+				                   		  <FormItem
 					                         	labelCol={{ span: 7 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="项目状态"
-					                         > 
+					                         >
 					                          <Select placeholder="项目状态" value={this.state.formatStatus} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({formatStatus:e})}}> 
+				                                onChange={(e)=>{this.setState({formatStatus:e})}}>
 				                                {
 				                                    conditionOrganization.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1357,23 +1357,23 @@ const BusinessProject=Form.create()(React.createClass({
 				                              </Select>
 				                   		 </FormItem>
 				                   	</div>
-	                    			
+
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
                 	 </div>
             	 <div className="patent-desc">
-                 	  <Modal	
-				      className="customeDetails"				      
+                 	  <Modal
+				      className="customeDetails"
 			          title="业务项目"
 			          width='1000px'
 			          visible={this.state.editvisible}
 			          onOk={this.edithandleCancel}
 			          onCancel={this.edithandleCancel}
 			          footer=''
-			        >				    
+			        >
 				     <Tabs defaultActiveKey="1" onChange={this.callback} activeKey={this.state.callnub}>
 					    <TabPane tab="业务项目基本资料" key="1">
 					        <Form horizontal onSubmit={this.edithandleSubmit} id="demand-form">
@@ -1391,11 +1391,11 @@ const BusinessProject=Form.create()(React.createClass({
 					                    	labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="业务品类"
-			                               > 
+			                               >
 			                                <Select placeholder="请选择业务品类" value={this.state.editCname} onChange={(e)=>{this.setState({editCname:e})}}
 				                                notFoundContent="未获取到业务品类列表" style={{width:'94%'}} required="required">
 				                                {this.state.contactsOption}
-				                            </Select> 
+				                            </Select>
 				                            <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 			                   		    </FormItem>
 		                   		    </div>
@@ -1404,34 +1404,34 @@ const BusinessProject=Form.create()(React.createClass({
 						                           labelCol={{ span: 4 }}
 						                           wrapperCol={{ span: 12 }}
 						                           label="省"
-						                          > 
+						                          >
 						                            <Cascader options={provinceSelect()}  value={this.state.ProvinceCity} placeholder="选择省" style={{width:'94%'}}
 													onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 													<span style={{color:'red',marginLeft:'5px'}}>*</span>
 								         </FormItem>
-			                   		    <FormItem className="half-item" 
+			                   		    <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                           wrapperCol={{ span: 12 }}
 					                           label="省-市"
-					                          > 
+					                          >
 					                            <Cascader options={citySelect()}  value={this.state.ProvinceCity} placeholder="选择市" style={{width:'94%'}}
 												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 												<span style={{color:'red',marginLeft:'5px'}}>*</span>
 							            </FormItem>
-			                   		    <FormItem className="half-item" 
+			                   		    <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                           wrapperCol={{ span: 12 }}
 					                           label="省-市-区"
-					                          > 
+					                          >
 					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择区" style={{width:'94%'}}
 												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 												<span style={{color:'red',marginLeft:'5px'}}>*</span>
 							            </FormItem>
-							            <FormItem  className="half-item" 
+							            <FormItem  className="half-item"
 					                    	labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="是否精品"
-			                               > 
+			                               >
 			                               <Radio.Group value={this.state.editBoutique} onChange={(e) => {
 						                    this.setState({ editBoutique: e.target.value })
 						                    }}>
@@ -1477,9 +1477,9 @@ const BusinessProject=Form.create()(React.createClass({
 					                         	labelCol={{ span: 4 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="活动生效"
-					                         > 
+					                         >
 					                          <Select placeholder="活动生效" value={this.state.editActivityFlag} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({editActivityFlag:e})}}> 
+				                                onChange={(e)=>{this.setState({editActivityFlag:e})}}>
 				                                {
 				                                    gameState.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1491,9 +1491,9 @@ const BusinessProject=Form.create()(React.createClass({
 					                         	labelCol={{ span: 4 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="项目状态"
-					                         > 
+					                         >
 					                          <Select placeholder="项目状态" value={this.state.editStatus} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({editStatus:e})}}> 
+				                                onChange={(e)=>{this.setState({editStatus:e})}}>
 				                                {
 				                                    conditionOrganization.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1520,38 +1520,38 @@ const BusinessProject=Form.create()(React.createClass({
 			                   		    <FormItem
 					                        labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="项目地址" >					                        
+					                        label="项目地址" >
 					                        <Input type="textarea" rows={1} placeholder="业务项目服务内容" value={this.state.editProjectUrl}
-	                           				 	onChange={(e) => { this.setState({ editProjectUrl: e.target.value }) }}/>					                           
+	                           				 	onChange={(e) => { this.setState({ editProjectUrl: e.target.value }) }}/>
 					                    </FormItem>
-					                </div> 
+					                </div>
 				                   	<div className="clearfix">
 			                   		    <FormItem
 					                        labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="业务项目服务内容" >					                        
+					                        label="业务项目服务内容" >
 					                        <Input type="textarea" rows={4} placeholder="业务项目服务内容" value={this.state.editIntroduce}
-	                           				 	onChange={(e) => { this.setState({ editIntroduce: e.target.value }) }}/>					                           
+	                           				 	onChange={(e) => { this.setState({ editIntroduce: e.target.value }) }}/>
 					                    </FormItem>
-					                </div>   
+					                </div>
 					                <div className="clearfix">
 			                   		    <FormItem
 					                        labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="业务项目价值及作用" >					                        
+					                        label="业务项目价值及作用" >
 					                        <Input type="textarea" rows={4} placeholder="业务项目价值及作用" value={this.state.editValueEffect}
-	                           				 	onChange={(e) => { this.setState({ editValueEffect: e.target.value }) }}/>					                           
+	                           				 	onChange={(e) => { this.setState({ editValueEffect: e.target.value }) }}/>
 					                    </FormItem>
-					                </div>   
+					                </div>
 					                <div className="clearfix">
 			                   		    <FormItem
 					                        labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="业务项目客户基本条件" >					                        
+					                        label="业务项目客户基本条件" >
 					                        <Input type="textarea" rows={4} placeholder="业务项目客户基本条件" value={this.state.editClientSize}
-	                           				 	onChange={(e) => { this.setState({ editClientSize: e.target.value }) }}/>					                           
+	                           				 	onChange={(e) => { this.setState({ editClientSize: e.target.value }) }}/>
 					                    </FormItem>
-					                </div> 
+					                </div>
 					                <div className="clearfix pictures" style={{"marginBottom":"60px"}}>
 				                        <FormItem className="half-item"
 					                        labelCol={{ span: 8 }}
@@ -1567,7 +1567,7 @@ const BusinessProject=Form.create()(React.createClass({
 				                        <FormItem className="half-item"
 					                        labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="业务项目图标" > 
+					                        label="业务项目图标" >
 					                        <PicturesWall
                                                 domId={'businessQuery2'}
 					                            pictureSign="business_project_max_picture"
@@ -1575,37 +1575,37 @@ const BusinessProject=Form.create()(React.createClass({
 					                            pictureUrl={this.state.companyLogoUrl} />
 					                            <p>图片建议:图片要清晰。(200*200)</p>
 					                    </FormItem>
-					                </div> 
+					                </div>
 				                </Spin>
-							</Form>		
+							</Form>
 						</TabPane>
 					    <TabPane tab="业务项目规格" key="2">
 					        <div className="clearfix" >
-						        
+
 								<Popconfirm title="是否停用?" onConfirm={this.blockRowSize} okText="是" cancelText="否" >
 								     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px',display:'none'}}
-			                   			 disabled={!hasSelected} 
+			                   			 disabled={!hasSelected}
 			                    		 >停用<Icon type="minus" />
 			           			     </Button>
-								</Popconfirm> 
+								</Popconfirm>
 						    </div>
 					       <div className="clearfix">
                 			  <Spin spinning={this.state.loading}>
                 			     <Form horizontal id="demand-form" onSubmit={this.contactSave} >
-							      <Table 
+							      <Table
 					            	 pagination={this.state.formatPagination}
-					            	 columns={this.state.ContactsLists} 
+					            	 columns={this.state.ContactsLists}
 					            	 dataSource={this.state.formatDataSource}
 					            	 rowSelection={rowSelection}
 					            	 onRowClick={this.formatTableRowClick}
 					            	 />
-					            </Form> 
-							   </Spin> 
+					            </Form>
+							   </Spin>
 							</div>
 					    </TabPane>
 					    </Tabs>
                     </Modal>
-            	 </div>	 
+            	 </div>
                </div>
             </div>
         );