Ver código fonte

防止重复提交

HW 4 anos atrás
pai
commit
1fc07d2c38
29 arquivos alterados com 438 adições e 326 exclusões
  1. 1 2
      js/component/manageCenter/customer/NEW/crm/crm.jsx
  2. 1 1
      js/component/manageCenter/customer/NEW/crm/crmAll.jsx
  3. 8 0
      js/component/manageCenter/customer/NEW/crm/patentPayment.jsx
  4. 4 4
      js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx
  5. 22 11
      js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx
  6. 4 0
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  7. 3 0
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  8. 9 3
      js/component/manageCenter/financialManage/distribute/huiKuan.jsx
  9. 33 25
      js/component/manageCenter/financialManage/distribute/inSpecial.jsx
  10. 30 22
      js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx
  11. 37 27
      js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx
  12. 33 25
      js/component/manageCenter/financialManage/distribute/outSpecial.jsx
  13. 3 0
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  14. 3 0
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  15. 16 16
      js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx
  16. 153 150
      js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx
  17. 10 10
      js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx
  18. 16 7
      js/component/manageCenter/order/orderNew/changeComponent/agreeButton.js
  19. 0 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  20. 0 1
      js/component/manageCenter/order/orderNew/changeComponent/rizhi.js
  21. 1 1
      js/component/manageCenter/order/orderNew/chargeback.jsx
  22. 13 3
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  23. 2 1
      js/component/manageCenter/order/orderNew/costAuditList/index.js
  24. 1 1
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  25. 7 5
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  26. 7 4
      js/component/manageCenter/project/task/myTask.jsx
  27. 1 0
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  28. 19 6
      js/component/manageCenter/project/task/patentSchedule.jsx
  29. 1 0
      js/component/manageCenter/project/task/resolutionPro.jsx

+ 1 - 2
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -2412,7 +2412,6 @@ const IntentionCustomer = Form.create()(React.createClass({
         >
           {" "}
           <Form layout="horizontal" onSubmit={this.newSubmitx} id="demand-form">
-            <Spin spinning={this.state.loading}>
               <div className="clearfix">
                 <FormItem {...formItemLayoutc} label="年份">
                   <Select
@@ -2484,6 +2483,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                 className="setSubmit"
                 type="primary"
                 htmlType="submit"
+				loading={this.state.loading}
                 style={{ marginLeft: "100px" }}
               >
                 保存
@@ -2491,7 +2491,6 @@ const IntentionCustomer = Form.create()(React.createClass({
               <Button type="ghost" onClick={this.visitCancelc}>
                 取消
               </Button>
-            </Spin>
           </Form>
         </Modal>
         <TechAchievementDesc

+ 1 - 1
js/component/manageCenter/customer/NEW/crm/crmAll.jsx

@@ -1029,7 +1029,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 								: this.state.columns
 						}
                             dataSource={this.state.dataSource}
-                            rowSelection={rowSelection}
+                            // rowSelection={rowSelection}
                             pagination={this.state.pagination}
 							onRowClick={this.tableRowClick}
 							bordered

+ 8 - 0
js/component/manageCenter/customer/NEW/crm/patentPayment.jsx

@@ -331,6 +331,9 @@ const PatentPayment = Form.create()(React.createClass({
 			message.warning('电子邮箱格式不正确');
 			return
 		}
+		this.setState({
+			loading:true
+		})
 		$.ajax({
 			method: "POST",
 			dataType: "json",
@@ -418,6 +421,9 @@ const PatentPayment = Form.create()(React.createClass({
 			message.warning('电子邮箱格式不正确');
 			return
 		}
+		this.setState({
+			loading: true
+		})
 		$.ajax({
 			method: "POST",
 			dataType: "json",
@@ -908,6 +914,7 @@ const PatentPayment = Form.create()(React.createClass({
               <Button
                 type="primary"
                 style={{ float: "right", marginRight: "10px" }}
+				loading={this.state.loading}
                 onClick={this.baocunxiugai}
               >
                 保存
@@ -1123,6 +1130,7 @@ const PatentPayment = Form.create()(React.createClass({
               <Button
                 type="primary"
                 style={{ float: "right", marginRight: "10px" }}
+				loading={this.state.loading}
                 onClick={this.onSure}
               >
                 保存

+ 4 - 4
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -125,14 +125,14 @@ const QueryCustomer = React.createClass({
 					title: '转换时间',
 					dataIndex: 'transferTime',
 					key: 'transferTime',
-				}, 
+				},
 				{
 					title: '操作',
 					dataIndex: 'abc',
 					key: 'abc',
 					render: (text, record, index) => {
 						return <div>
-                            <Button onClick={(e) =>{ e.stopPropagation(), this.receive(record)}} type="primary">领取</Button>                            							    
+                            <Button onClick={(e) =>{ e.stopPropagation(), this.receive(record)}} type="primary">领取</Button>
                         </div>
 					}
 				}
@@ -229,7 +229,7 @@ const QueryCustomer = React.createClass({
 					recordt: recordt.id
 				})
 			},
-			
+
 		};
 		return (
       <div className="user-content">
@@ -302,7 +302,7 @@ const QueryCustomer = React.createClass({
 					  : this.state.columns
 			  }
               dataSource={this.state.dataSource}
-              rowSelection={rowSelection}
+              // rowSelection={rowSelection}
               pagination={this.state.pagination}
             />
           </Spin>

+ 22 - 11
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -231,7 +231,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			zhuanjiaoVisible: false
 		})
 	},
-	
+
 	//进入新增拜访记录
 	visit(e) {
 		this.setState({
@@ -259,7 +259,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			crossDomain: false,
 			url: globalConfig.context + "/api/admin/customer/deleteCustomer",
 			data: {
-				uid: deletedIds, //删除的ID    
+				uid: deletedIds, //删除的ID
 			}
 		}).done(function(data) {
 			if(!data.error.length) {
@@ -336,7 +336,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		})
 	},
 	//指定转交人自动补全
-	supervisor(e){ 
+	supervisor(e){
 		$.ajax({
             method: "get",
             dataType: "json",
@@ -345,23 +345,23 @@ const IntentionCustomer = Form.create()(React.createClass({
             data:{
             	adminName:e
             },
-            success: function (data) {                	  
+            success: function (data) {
 				       let thedata=data.data;
 				    if (!thedata) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
-                    };	
-                    thedata = {}; 
-              }; 
+                    };
+                    thedata = {};
+              };
 					this.setState({
-						customerArr:thedata,	
+						customerArr:thedata,
                     });
 				}.bind(this),
 			}).always(function () {
             this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
 	},
 	componentWillReceiveProps(nextProps) {
 		if(nextProps.ApiUrl!=this.props.ApiUrl) {
@@ -406,6 +406,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 		});
 	},
 	showConfirm(fn, record) {
+		if(this.state.confirmLoading){
+			return false;
+		}
 		Modal.confirm({
 			title: "提示",
 			content: (
@@ -429,6 +432,10 @@ const IntentionCustomer = Form.create()(React.createClass({
 	//转交
 	changeAssigner() {
 		if (this.state.theTypes) {
+			this.setState({
+				confirmLoading: true
+			})
+			const hide = message.loading('转交中...', 0);
 			let changeIds  = '';
 			let oldAid = '';
 			for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
@@ -467,6 +474,10 @@ const IntentionCustomer = Form.create()(React.createClass({
 							Math.ceil((this.state.pagination.total - 1) / 10)
 						)
 					);
+					hide();
+					this.setState({
+						confirmLoading: false
+					})
 				}.bind(this)
 			);
 		} else {
@@ -588,7 +599,7 @@ const IntentionCustomer = Form.create()(React.createClass({
               <Button onClick={this.reset}>重置</Button>
               {/* {adminData.isSuperAdmin?<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 							     <Button type="danger" style={{marginLeft:'10px'}}
-	                       			 disabled={!hasSelected} 
+	                       			 disabled={!hasSelected}
 	                       		 >删除<Icon type="minus" />
 	                        </Button>
 	                </Popconfirm>:''
@@ -683,4 +694,4 @@ const IntentionCustomer = Form.create()(React.createClass({
     );
 	}
 }));
-export default IntentionCustomer;
+export default IntentionCustomer;

+ 4 - 0
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -1959,6 +1959,9 @@ const approvedOutsourcing = React.createClass({
     }
   },
   search() {
+    this.setState({
+      selectedRowKeys: [],
+    })
     this.loadData()
   },
   reset() {
@@ -4249,6 +4252,7 @@ const approvedOutsourcing = React.createClass({
           <Modal
             maskClosable={false}
             title="审核订单"
+            confirmLoading={this.state.loading}
             visible={this.state.checkVisible}
             onOk={this.checkOk}
             okText={'通过'}

+ 3 - 0
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -1917,6 +1917,9 @@ const approvedOutsourcing = React.createClass({
     }
   },
   search() {
+    this.setState({
+      selectedRowKeys: []
+    })
     this.loadData();
   },
   reset() {

+ 9 - 3
js/component/manageCenter/financialManage/distribute/huiKuan.jsx

@@ -176,13 +176,11 @@ const HuiKuan = React.createClass({
       releaseDate: [],
       totalPage: 0,
       boHuivisible: false,
-      selectedRowKeys: [],
       selectedRows: [],
       // 弹出层数据
       modalData: {},
       // userName: "",
       contractNo: "",
-      loading: false,
       reason: "",
       foo: 0,
       // 子组件改变的表格title数组
@@ -386,6 +384,9 @@ const HuiKuan = React.createClass({
   },
 
   search() {
+    this.setState({
+      selectedRowKeys:[]
+    })
     this.loadData();
   },
 
@@ -609,6 +610,9 @@ const HuiKuan = React.createClass({
   },
   mergeAll() {
     // console.log("合并全部");
+    this.setState({
+      confirmLoading:true
+    })
     $.ajax({
       method: "POST",
       dataType: "json",
@@ -633,7 +637,8 @@ const HuiKuan = React.createClass({
         this.setState({
           selectedRowKeys: this.state.selectedRowKeys,
           pagination: this.state.pagination,
-          mergeModal: false
+          mergeModal: false,
+          confirmLoading:false,
         })
         // window.location.reload();
       }.bind(this)
@@ -1131,6 +1136,7 @@ const HuiKuan = React.createClass({
           visible={this.state.mergeModal}
           width={1300}
           onOk={this.mergeAll}
+          confirmLoading={this.state.confirmLoading}
           onCancel={() => {
             this.setState({
               mergeModal: false

+ 33 - 25
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -11,7 +11,7 @@ import {
   message,
   Modal,
   Upload,
-  Tabs
+  Tabs, Popconfirm
 } from "antd";
 import {
   getProjectStatus,
@@ -315,34 +315,42 @@ const inSpecial = React.createClass({
                   </Button>
                 }
                 {record.approval !== 2 ? (
-                  <Button
-                    type="primary"
-                    style={{ marginLeft: "10px" }}
-                    onClick={e => {
-                      e.stopPropagation(),
-                        this.setState({ examine: 2 }, () => {
-                          this.sende(record);
-                        });
-                    }}
-                  >
-                    通过
-                  </Button>
+                    <Popconfirm placement="top" title="确定要通过吗?" onConfirm={(e)=>{
+                      e.stopPropagation();
+                      this.setState({ examine: 2 }, () => {
+                        this.sende(record);
+                      });
+                    }} okText="确定" cancelText="取消">
+                      <Button
+                        type="primary"
+                        style={{ marginLeft: "10px" }}
+                        onClick={e => {
+                            e.stopPropagation();
+                        }}
+                      >
+                        通过
+                      </Button>
+                    </Popconfirm>
                 ) : (
                   ""
                 )}
                 {record.approval !== 2 ? (
-                  <Button
-                    type="danger"
-                    onClick={e => {
-                      e.stopPropagation(),
-                        this.setState({ examine: 3 }, () => {
-                          this.reject(record);
-                        });
-                    }}
-                    style={{ marginLeft: "10px" }}
-                  >
-                    拒绝
-                  </Button>
+                    <Popconfirm placement="top" title="确定要拒绝吗?" onConfirm={(e)=>{
+                      e.stopPropagation();
+                      this.setState({ examine: 3 }, () => {
+                        this.reject(record);
+                      });
+                    }} okText="确定" cancelText="取消">
+                      <Button
+                          type="danger"
+                          onClick={e => {
+                            e.stopPropagation();
+                          }}
+                          style={{ marginLeft: "10px" }}
+                      >
+                        拒绝
+                      </Button>
+                    </Popconfirm>
                 ) : (
                   ""
                 )}

+ 30 - 22
js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx

@@ -10,7 +10,7 @@ import {
   Table,
   message,
   Modal,
-  Upload,
+  Popconfirm,
   Tabs
 } from "antd";
 import {
@@ -314,34 +314,42 @@ const invoiceApplyList = React.createClass({
                   </Button>
                 }
                 {record.status !== 2 ? (
-                  <Button
-                    type="primary"
-                    style={{ marginLeft: "10px" }}
-                    onClick={e => {
-                      e.stopPropagation(),
-                        this.setState({ examine: 2 }, () => {
-                          this.sende(record);
-                        });
-                    }}
-                  >
-                    通过
-                  </Button>
+                        <Popconfirm placement="top" title="确定要通过吗?" onConfirm={(e)=>{
+                            e.stopPropagation();
+                            this.setState({ examine: 2 }, () => {
+                              this.sende(record);
+                            });
+                        }} okText="确定" cancelText="取消">
+                          <Button
+                              type="primary"
+                              style={{ marginLeft: "10px" }}
+                              onClick={e => {
+                                e.stopPropagation()
+                              }}
+                          >
+                            通过
+                          </Button>
+                        </Popconfirm>
                 ) : (
                     ""
                   )}
                 {record.status !== 2 ? (
-                  <Button
-                    type="danger"
-                    onClick={e => {
-                      e.stopPropagation(),
+                    <Popconfirm placement="top" title="确定要拒绝吗?" onConfirm={(e)=>{
+                        e.stopPropagation();
                         this.setState({ examine: 3 }, () => {
                           this.reject(record);
                         });
-                    }}
-                    style={{ marginLeft: "10px" }}
-                  >
-                    拒绝
-                  </Button>
+                    }} okText="确定" cancelText="取消">
+                      <Button
+                          type="danger"
+                          onClick={e => {
+                            e.stopPropagation()
+                          }}
+                          style={{ marginLeft: "10px" }}
+                      >
+                        拒绝
+                      </Button>
+                    </Popconfirm>
                 ) : (
                     ""
                   )}

+ 37 - 27
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -11,7 +11,7 @@ import {
   message,
   Modal,
   Upload,
-  Tabs
+  Tabs, Popconfirm
 } from "antd";
 import {
   getProjectStatus,
@@ -314,34 +314,42 @@ const invoiceApplyListWai = React.createClass({
                   </Button>
                 }
                 {record.status !== 2 ? (
-                  <Button
-                    type="primary"
-                    style={{ marginLeft: "10px" }}
-                    onClick={e => {
-                      e.stopPropagation(),
-                        this.setState({ examine: 2 }, () => {
-                          this.sende(record);
-                        });
-                    }}
-                  >
-                    通过
-                  </Button>
+                    <Popconfirm placement="top" title="确定要通过吗?" onConfirm={(e)=>{
+                      e.stopPropagation();
+                      this.setState({ examine: 2 }, () => {
+                        this.sende(record);
+                      });
+                    }} okText="确定" cancelText="取消">
+                      <Button
+                          type="primary"
+                          style={{ marginLeft: "10px" }}
+                          onClick={e => {
+                            e.stopPropagation();
+                          }}
+                      >
+                        通过
+                      </Button>
+                    </Popconfirm>
                 ) : (
                   ""
                 )}
                 {record.status !== 2 ? (
-                  <Button
-                    type="danger"
-                    onClick={e => {
-                      e.stopPropagation(),
-                        this.setState({ examine: 3 }, () => {
-                          this.reject(record);
-                        });
-                    }}
-                    style={{ marginLeft: "10px" }}
-                  >
-                    拒绝
-                  </Button>
+                    <Popconfirm placement="top" title="确定要拒绝吗?" onConfirm={(e)=>{
+                      e.stopPropagation();
+                      this.setState({ examine: 3 }, () => {
+                        this.reject(record);
+                      });
+                    }} okText="确定" cancelText="取消">
+                      <Button
+                          type="danger"
+                          onClick={e => {
+                            e.stopPropagation();
+                          }}
+                          style={{ marginLeft: "10px" }}
+                      >
+                        拒绝
+                      </Button>
+                    </Popconfirm>
                 ) : (
                   ""
                 )}
@@ -686,12 +694,14 @@ const invoiceApplyListWai = React.createClass({
             onChange={e => {
               this.setState({ reason: e.target.value });
             }}
-          ></Input.TextArea>
+          />
           <div className="clearfix" style={{ marginTop: "20px" }}>
             <Button
+              loading={this.state.loading}
               type="primary"
               onClick={e => {
-                e.stopPropagation(), this.commit();
+                e.stopPropagation();
+                this.commit();
               }}
               style={{ float: "right" }}
             >

+ 33 - 25
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import $ from "jquery/src/ajax";
 import "./public.less";
-import { Form, Button, Input, Spin, Table, message, Modal, Upload,Tabs } from "antd";
+import {Form, Button, Input, Spin, Table, message, Modal, Upload, Tabs, Popconfirm} from "antd";
 import {
   getProjectStatus,
   getProvinceA,
@@ -293,34 +293,42 @@ const outSpecial = React.createClass({
                   </Button>
                 }
                 {record.approval !== 2 ? (
-                  <Button
-                    type="primary"
-                    style={{ marginLeft: "10px" }}
-                    onClick={e => {
-                      e.stopPropagation(),
-                        this.setState({ examine: 2 }, () => {
-                          this.sende(record);
-                        });
-                    }}
-                  >
-                    通过
-                  </Button>
+                    <Popconfirm placement="top" title="确定要通过吗?" onConfirm={(e)=>{
+                      e.stopPropagation();
+                      this.setState({ examine: 2 }, () => {
+                        this.sende(record);
+                      });
+                    }} okText="确定" cancelText="取消">
+                      <Button
+                          type="primary"
+                          style={{ marginLeft: "10px" }}
+                          onClick={e => {
+                            e.stopPropagation();
+                          }}
+                      >
+                        通过
+                      </Button>
+                    </Popconfirm>
                 ) : (
                   ""
                 )}
                 {record.approval !== 2 ? (
-                  <Button
-                    type="danger"
-                    onClick={e => {
-                      e.stopPropagation(),
-                        this.setState({ examine: 3 }, () => {
-                          this.reject(record);
-                        });
-                    }}
-                    style={{ marginLeft: "10px" }}
-                  >
-                    拒绝
-                  </Button>
+                    <Popconfirm placement="top" title="确定要拒绝吗?" onConfirm={(e)=>{
+                      e.stopPropagation();
+                      this.setState({ examine: 3 }, () => {
+                        this.reject(record);
+                      });
+                    }} okText="确定" cancelText="取消">
+                      <Button
+                          type="danger"
+                          onClick={e => {
+                            e.stopPropagation();
+                          }}
+                          style={{ marginLeft: "10px" }}
+                      >
+                        拒绝
+                      </Button>
+                    </Popconfirm>
                 ) : (
                   ""
                 )}

+ 3 - 0
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -1164,6 +1164,9 @@ const ShouKuang = React.createClass({
     }
   },
   search() {
+    this.setState({
+      selectedRowKeys: []
+    })
     this.loadData();
   },
 

+ 3 - 0
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -1249,6 +1249,9 @@ const ShouKuang = React.createClass({
     }
   },
   search() {
+    this.setState({
+      selectedRowKeys: []
+    })
     this.loadData();
   },
 

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

@@ -111,7 +111,7 @@ const ServiceManage=Form.create()(React.createClass({
 			crossDomain: false,
 			url: globalConfig.context + "/api/admin/order/selectMyDeps",
 			data: {
-				
+
 			},
 			success: function(data) {
 				let thedata = data.data;
@@ -245,20 +245,20 @@ const ServiceManage=Form.create()(React.createClass({
                     render: (text, record, index) => {
 						return <div>
 							{text.confirmIntention&&<Popconfirm title={'请确认您是否受理来自【'+record.buyerName+'】发起的服务意向订单?'} onConfirm={(e)=>{this.admissibleOrderOk(record)}} onCancel={(e)=>{this.admissibleOrderCancel(record)}} okText="同意" cancelText="拒绝">
-							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">受理意向</Button>                 
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">受理意向</Button>
 							</Popconfirm>}
-							{/*{text.applySign&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.signBill(record)}} type="primary">签单</Button> } */}              
+							{/*{text.applySign&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.signBill(record)}} type="primary">签单</Button> } */}
 							{text.applyForCancel&&<Popconfirm title={'请确认您是否取消客户【'+record.buyerName+'】的服务订单,订单取消将导致业务终止!'} onConfirm={(e)=>{this.cancelOrder(record)}} okText="确认" cancelText="取消">
-								<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">取消订单</Button>                 
+								<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">取消订单</Button>
 							</Popconfirm>}
 							{text.applyRevoke&&<Popconfirm title={'请确认您是否作废客户【'+record.buyerName+'】的服务订单,订单作废将导致订单失效!'} onConfirm={(e)=>{this.scrapOrder(record)}} okText="确认" cancelText="取消">
-							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>                 
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>
 							</Popconfirm>}
 							{text.applyLock &&<Popconfirm title={'请确认您是否锁定客户【'+record.buyerName+'】的服务订单,订单锁定将导致订单暂停!'} onConfirm={(e)=>{this.lockOrder(record)}} okText="确认" cancelText="取消">
-							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">锁定<Icon type="lock" /></Button>                 
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">锁定<Icon type="lock" /></Button>
 							</Popconfirm>}
 							{text.applyUnLock&&<Popconfirm title={'请确认您是否解锁客户【'+record.buyerName+'】的服务订单,订单解锁将导致订单正常!'} onConfirm={(e)=>{this.unlockOrder(record)}} okText="确认" cancelText="取消">
-							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">解锁<Icon type="unlock" /></Button>                 
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">解锁<Icon type="unlock" /></Button>
 							</Popconfirm>}
                         </div>
 					}
@@ -341,7 +341,7 @@ const ServiceManage=Form.create()(React.createClass({
             showDesc: true
         });
     },
-    
+
     //列表各种骚操作
     //列表各种骚操作
     operation(record,index) {
@@ -426,7 +426,7 @@ const ServiceManage=Form.create()(React.createClass({
 		this.state.orderChannel = undefined;
 		this.state.formalOrder = true;
 		this.state.intentOrder = true;
-        this.loadData();       
+        this.loadData();
     },
     render() {
     	const FormItem = Form.Item;
@@ -440,7 +440,7 @@ const ServiceManage=Form.create()(React.createClass({
 	                this.setState({
 	                    selectedRows: selectedRows.slice(-1),
 	                    selectedRowKeys: selectedRowKeys.slice(-1)
-	                }); 
+	                });
             },
             onSelectAll: (selected, selectedRows, changeRows) => {
 			   this.setState({
@@ -454,7 +454,7 @@ const ServiceManage=Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                	<span style={{fontSize:'16px'}}>部门科技服务订单</span>	
+                	<span style={{fontSize:'16px'}}>部门科技服务订单</span>
                     <Tabs
             defaultActiveKey="1"
             onChange={this.callback}
@@ -478,7 +478,7 @@ const ServiceManage=Form.create()(React.createClass({
 	                    <RangePicker
 		                        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 }); }} /> 
+		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
 		                <Select placeholder="部门机构" style={{width:'150px',marginLeft:'10px'}}
 	                            value={this.state.departmenttSearch}
 	                            onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
@@ -503,11 +503,11 @@ const ServiceManage=Form.create()(React.createClass({
 	                        onChange={(e) => { this.setState({ orderPersonSearch: e.target.value }); }} />
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索<Icon type="search" /></Button>
 	                    <Button onClick={this.reset}>重置 <Icon type="reload" /></Button>
-	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
+	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
 	                </div>
-	               
+
                     <div className='clearfix' style={{marginTop:'5px',marginLeft:10}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>   
+	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
 	                  		<Checkbox checked={this.state.intentOrder} onChange={(e)=>{this.setState({intentOrder:!this.state.intentOrder})}}>意向订单</Checkbox>
 	                  		<Checkbox checked={this.state.formalOrder} onChange={(e)=>{this.setState({formalOrder:!this.state.formalOrder})}}>正式订单</Checkbox>
 	                  		<Select placeholder="订单状态"
@@ -562,7 +562,7 @@ const ServiceManage=Form.create()(React.createClass({
                                     : this.state.columns
                             }
 	                            dataSource={this.state.dataSource}
-	                            rowSelection={rowSelection}
+	                            // rowSelection={rowSelection}
 	                            pagination={this.state.pagination}
                                 onRowClick={this.tableRowClick}
                                 size="small"

+ 153 - 150
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -3,7 +3,7 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
-import {orderType} from '../../../../dataDic.js';  
+import {orderType} from '../../../../dataDic.js';
 import {splitUrl,getOrderType,getOrderStage,getProjectState,getOrderState,getTransactionProject,getChangeState,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel,beforeUploadFile} from '../../../../tools.js';
 import ImgList from "../../../../common/imgList";
 const Option = AutoComplete.Option;
@@ -36,7 +36,7 @@ const PicturesWall = React.createClass({
         this.props.fileList(fileList);
     },
     componentWillReceiveProps(nextProps) {
-        this.state.fileList = nextProps.pictureUrl; 
+        this.state.fileList = nextProps.pictureUrl;
     },
     render() {
         const { fileList } = this.state;
@@ -169,7 +169,7 @@ const NewService = Form.create()(React.createClass({
                     render: (text, record, index) => {
 						return <div style={{display:this.props.datauser.active.applySign||this.state.changeStatus==1?'block':'none'}}>
 								<Popconfirm title="是否删除?" onConfirm={(e)=>{this.delectRow(record)}} okText="是" cancelText="否">
-								    <Button onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>                 
+								    <Button onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>
 								</Popconfirm>
 							</div>
 							}
@@ -273,16 +273,16 @@ const NewService = Form.create()(React.createClass({
 	        	message.warning('请选择订单类型');
 	        	return false;
 	        };
-	        
+
 	        if(this.state.contractType==undefined&&this.state.orderType==0){
 	        	message.warning('请选择业务品类');
 	        	return false;
 	        };
-        	if(!this.state.autoId){ 
+        	if(!this.state.autoId){
 	        	message.warning('客户名称不匹配');
 	        	return false;
         	};
-        	
+
         }
 		this.props.form.validateFields((err, values) => {
 			if(!err) {
@@ -333,7 +333,7 @@ const NewService = Form.create()(React.createClass({
               orderNo:record?record.orderNo:this.props.datauser.orderNo
             },
             success: function (data) {
-                let thisData = data.data;                
+                let thisData = data.data;
                 if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
@@ -359,10 +359,10 @@ const NewService = Form.create()(React.createClass({
                 });
             }.bind(this),
        }).always(function () {
-            this.setState({            	
+            this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
     },
 	handleOk(e) {
 		this.setState({
@@ -420,7 +420,7 @@ const NewService = Form.create()(React.createClass({
 			addnextVisible: true
 		})
 	},
-	
+
 	rizhi(){
 			console.log(this.state.orderNo)
 			this.setState({
@@ -436,7 +436,7 @@ const NewService = Form.create()(React.createClass({
 				},
 				success: function (data) {
 					let theArr = [];
-				    let thisData = data.data;                
+				    let thisData = data.data;
 				    if (!thisData.length) {
 				        if (data.error && data.error.length) {
 				            message.warning(data.error[0].message);
@@ -458,12 +458,12 @@ const NewService = Form.create()(React.createClass({
 					})
 				 }.bind(this),
 				}).always(function () {
-				     this.setState({            	
+				     this.setState({
 				         loading: false
 				     });
 				 }.bind(this));
 			},
-		
+
 		//查看订单日志
 		getOrderLog(){
 			this.setState({
@@ -476,7 +476,7 @@ const NewService = Form.create()(React.createClass({
 				rizhivisible:false
 			})
 		},
-	
+
 	nextCancel() {
 		this.setState({
 			addnextVisible: false
@@ -497,7 +497,7 @@ const NewService = Form.create()(React.createClass({
         this.setState({ orgCodeUrl: e });
     },
 	componentWillMount() {
-		
+
 	},
 	//查看订单详情里面的各种骚操作
 	//受理订单
@@ -570,24 +570,24 @@ const NewService = Form.create()(React.createClass({
             }:{
             	businessName:e
             },
-            success: function (data) {                	  
+            success: function (data) {
 				    let thedata=data.data;
 				    if (!thedata) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
-                    };	
-                    thedata = {}; 
-                    }; 
+                    };
+                    thedata = {};
+                    };
 					this.setState({
 						states:state,
-						customerArr:thedata,	
+						customerArr:thedata,
                     });
 				}.bind(this),
 			}).always(function () {
             this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
 	},
 	//上级主管输入框失去焦点是判断客户是否存在
 	selectAuto(value){
@@ -618,14 +618,14 @@ const NewService = Form.create()(React.createClass({
 			customerName:value,
 			autoId:autoIds
 		})
-		
+
 	},
 	//服务值改变时请求客户名称
 	httpChange(e){
 		this.state.gid='';
 		if(e.length>=1){
-			this.supervisor(e,false); 
-		}	
+			this.supervisor(e,false);
+		}
 		this.setState({
 			commodityName:e
 		})
@@ -634,8 +634,8 @@ const NewService = Form.create()(React.createClass({
 	customerChange(e){
 		this.state.autoId='';
 		if(e.length>=2){
-			this.supervisor(e,true); 
-		}	
+			this.supervisor(e,true);
+		}
 		this.setState({
 			customerName:e
 		})
@@ -718,6 +718,9 @@ const NewService = Form.create()(React.createClass({
 			message.warning('签单首付金额不能为空!');
 			return false;
 		};
+        this.setState({
+            loading: true
+        });
 		$.ajax({
 			method: "POST",
 			dataType: "json",
@@ -907,7 +910,7 @@ const NewService = Form.create()(React.createClass({
                              key: i,
 	                         billNo: thisdata.billNo,
 	                         transactionAmount:thisdata.transactionAmount,
-	                         createTime:thisdata.createTime, 
+	                         createTime:thisdata.createTime,
 	                         transactionAmount:thisdata.transactionAmount,
 	                         payerName:thisdata.payerName,
 	                         payeeName:thisdata.payeeName,
@@ -940,7 +943,7 @@ const NewService = Form.create()(React.createClass({
 			lookVisible:false
 		})
 	},
-	
+
 	/* -----变更操作开始----- */
 	//新建变更
 	addChange(){
@@ -1101,7 +1104,7 @@ const NewService = Form.create()(React.createClass({
 		}.bind(this));
 	},
 	/*-----变更操作结束----*/
-	
+
 	 //查看流失。项目列表
     lookSee(state) {
     	this.state.lookSource=[];
@@ -1177,7 +1180,7 @@ const NewService = Form.create()(React.createClass({
 			crossDomain: false,
 			url: globalConfig.context + "/api/admin/Varieties/getSuperList",
 			data: {
-				
+
 			},
 			success: function(data) {
 				let thedata = data.data;
@@ -1240,13 +1243,13 @@ const NewService = Form.create()(React.createClass({
 				     ):dataSources.map((group,index) =>
 				      <Select.Option key={index} value={group.bname}>{group.bname}</Select.Option>
 				     )
-		    
+
 		return(
 			<div>
                 {this.state.visible ? <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
-                        width={!this.props.userDetaile?'600px':'1000px'}  
-                        title={!this.props.userDetaile?'创建订单':'编辑订单'}                      
+                        width={!this.props.userDetaile?'600px':'1000px'}
+                        title={!this.props.userDetaile?'创建订单':'编辑订单'}
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
@@ -1255,9 +1258,9 @@ const NewService = Form.create()(React.createClass({
 			                            {!this.props.userDetaile?
 			                            <div className="clearfix">
 			                            	<div className="clearfix">
-						                    	<FormItem 
+						                    	<FormItem
 							                            {...formItemLayout}
-							                            label="订单类型" > 
+							                            label="订单类型" >
 							                            <Select placeholder="请选择订单类型"
 								                            style={{ width:'200px'}}
 								                            value={this.state.orderType}
@@ -1272,9 +1275,9 @@ const NewService = Form.create()(React.createClass({
 							                    </FormItem>
 							                </div>
 							                {this.state.bussStats&&<div className="clearfix">
-						                    	<FormItem 
+						                    	<FormItem
 							                            {...formItemLayout}
-							                            label="业务品类" > 
+							                            label="业务品类" >
 							                            <Select placeholder="请选择业务品类"
 								                            style={{ width:'200px'}}
 								                            value={this.state.contractType}
@@ -1288,18 +1291,18 @@ const NewService = Form.create()(React.createClass({
 							                    		<span className="mandatory">*</span>
 							                    </FormItem>
 							                </div>}
-							                <FormItem 
+							                <FormItem
 					                            {...formItemLayout}
-					                            label="客户所属类型" > 
+					                            label="客户所属类型" >
 					                            <Radio.Group onChange={(e)=>{this.setState({customType:e.target.value,customerArr:[]})}} value={this.state.customType}>
 											        <Radio value={0}>私有客户</Radio>
 											        <Radio value={1}>已签单客户</Radio>
 											    </Radio.Group>
 							                </FormItem>
 							                <div className="clearfix">
-							                    <FormItem 
+							                    <FormItem
 							                            {...formItemLayout}
-							                            label="客户名称" >                             
+							                            label="客户名称" >
 						                                    <AutoComplete
 													        className="certain-category-search"
 													        dropdownClassName="certain-category-search-dropdown"
@@ -1315,10 +1318,10 @@ const NewService = Form.create()(React.createClass({
 													        onSelect={this.selectAutoCUT}
 													      >
 													        <Input/>
-													      </AutoComplete> 
+													      </AutoComplete>
 													      <span className="mandatory">*</span>
 							                    </FormItem>
-							                </div>    
+							                </div>
 						                </div>:<div className="clearfix">
 						                       		<FormItem className="half-item"
 							                            {...formItemLayout}
@@ -1327,71 +1330,71 @@ const NewService = Form.create()(React.createClass({
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="下单时间" >  
+							                            label="下单时间" >
 							                            <span>{orderDetaiel.createTime}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="客户名称" >  
+							                            label="客户名称" >
 							                            <span>{orderDetaiel.buyerName}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="订单类型" >  
+							                            label="订单类型" >
 							                            <span>{getOrderType(orderDetaiel.orderType)}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="订单渠道" >  
+							                            label="订单渠道" >
 							                            <span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="订单状态" >  
+							                            label="订单状态" >
 							                            <span>{getOrderState(orderDetaiel.orderStatus)}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="已收款项" >  
+							                            label="已收款项" >
 							                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="结算状态" >  
+							                            label="结算状态" >
 							                            <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="市价订单金额" >    
+							                            label="市价订单金额" >
 						                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
 								                    </FormItem>
 								                    <FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="市价首款金额" >   
+							                            label="市价首款金额" >
 							                            <span>{orderDetaiel.firstPayment+'万元'}</span>
 								                    </FormItem>
 								                    {orderDetaiel.deleteSign==0&&orderDetaiel.orderStatus==2||orderDetaiel.changeStatus==1?
 							                    	<div className='clearfix'>
 									                    <FormItem className="half-item"
 								                            {...formItemLayout}
-								                            label="实签订单金额(万元)" >                             
+								                            label="实签订单金额(万元)" >
 							                                    <Input placeholder="实签订单金额" ref='signTotalAmount' value={this.state.signTotalAmount} onChange={(e)=>{this.setState({signTotalAmount:e.target.value})}} style={{width:'240px'}} />
 									                   			<span className="mandatory">*</span>
 									                    </FormItem>
 									                    <FormItem className="half-item"
 									                            {...formItemLayout}
-									                            label="实签首款金额(万元)" >                             
+									                            label="实签首款金额(万元)" >
 								                                    <Input placeholder="请输入实签首款金额" ref='signFirstPayment' value={this.state.signFirstPayment} onChange={(e)=>{this.setState({signFirstPayment:e.target.value})}} style={{width:'240px'}} />
 									                    		<span className="mandatory">*</span>
 									                    </FormItem>
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
-								                            label="特批立项" >  
+								                            label="特批立项" >
 								                            <span>{getApprovedState(this.state.approval)}</span>
 							                    		</FormItem>
 							                    		<FormItem className="half-item"
 									                            {...formItemLayout}
-									                            label="合同编号" >                             
+									                            label="合同编号" >
 								                                    <Input placeholder="请输入合同编号" value={this.state.contractNo}
 								                                    	onChange={(e)=>{this.setState({contractNo:e.target.value})}} style={{width:'240px'}} />
 									                    </FormItem>
@@ -1402,10 +1405,10 @@ const NewService = Form.create()(React.createClass({
 												                label={
 												                	<span>
 																		<strong style={{ color: '#f00' }}>*</strong>合同扫描件
-																	</span> 
+																	</span>
 												                }
 												                >
-												            	
+
 												                <PicturesWall
                                                                     domId={'addService1'}
 												                    fileList={this.getOrgCodeUrl}
@@ -1413,7 +1416,7 @@ const NewService = Form.create()(React.createClass({
 												                    <p>图片建议:要清晰。</p>
 																<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
 																															onClick={this.getOrderLog}
-																						>查看订单							日志</Button>	
+																						>查看订单							日志</Button>
 												            </FormItem>
 												        </div>
 												        <div className='clearfix'>
@@ -1421,8 +1424,8 @@ const NewService = Form.create()(React.createClass({
 													            labelCol={{ span: 4 }}
 													            wrapperCol={{ span: 16 }}
 													            label="订单留言" >
-													                <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.orderRemarks} 
-														    				onChange={(e)=>{this.setState({orderRemarks:e.target.value})}}/>			                      
+													                <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.orderRemarks}
+														    				onChange={(e)=>{this.setState({orderRemarks:e.target.value})}}/>
 													        </FormItem>
 												        </div>
 												        <div className='clearfix'>
@@ -1451,22 +1454,22 @@ const NewService = Form.create()(React.createClass({
 											        <div className='clearfix'>
 											        	<FormItem className="half-item"
 								                            {...formItemLayout}
-								                            label="实签订单金额" >   
+								                            label="实签订单金额" >
 								                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
 							                    		</FormItem>
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
-								                            label="实签首款金额" >   
+								                            label="实签首款金额" >
 								                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
 							                    		</FormItem>
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
-								                            label="特批立项" >   
+								                            label="特批立项" >
 								                            <span>{getApprovedState(orderDetaiel.approval)}</span>
 							                    		</FormItem>
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
-								                            label="合同编号" >   
+								                            label="合同编号" >
 								                            <span>{orderDetaiel.contractNo}</span>
 							                    		</FormItem>
 														<div className="clearfix">
@@ -1495,7 +1498,7 @@ const NewService = Form.create()(React.createClass({
 																<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
 																															onClick={this.getOrderLog}
 																						>查看订单							日志</Button>
-									                        </FormItem>    
+									                        </FormItem>
 								                        </div>
 								                        <div className='clearfix'>
 												        	<FormItem
@@ -1529,45 +1532,45 @@ const NewService = Form.create()(React.createClass({
 										        <div className='clearfix'>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="订单负责人" >  
+							                            label="订单负责人" >
 							                            <span>{orderDetaiel.salesmanName}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="业务品类" >  
+							                            label="业务品类" >
 			                            				<span>{orderDetaiel.projectType}</span>
 						                    		</FormItem>
 						                    	</div>
 						                    	<div className='clearfix'>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="意向时间" >  
+							                            label="意向时间" >
 							                            <span>{orderDetaiel.createTime}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="签单时间" >  
+							                            label="签单时间" >
 							                            <span>{orderDetaiel.signTime}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="财务负责人" >  
+							                            label="财务负责人" >
 							                            <span>{orderDetaiel.financeName}</span>
 							                            <Button onClick={this.lookflow} style={{float:'right'}}>查看流水</Button>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="项目负责人" >  
+							                            label="项目负责人" >
 							                            <span>{orderDetaiel.technicianName}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="立项时间" >  
+							                            label="立项时间" >
 							                            <span>{orderDetaiel.setUpTime}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
-							                            label="项目状态" >  
+							                            label="项目状态" >
 							                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
 						                    		</FormItem>
 					                    		</div>
@@ -1580,30 +1583,30 @@ const NewService = Form.create()(React.createClass({
 								                        <Table columns={this.state.columns}
 								                            dataSource={this.state.dataSource}
 								                            pagination={this.state.pagination}
-								                            onRowClick={this.tableRowClick} 
+								                            onRowClick={this.tableRowClick}
 								                            />
 								                    </Spin>
 									            </div>
 					                        </div>}
 						               		<div className='addSave' style={{marginTop:'15px'}}>
-							                    {!this.props.userDetaile||orderDetaiel.deleteSign==0&&orderDetaiel.orderStatus==2||orderDetaiel.changeStatus==1?<Button className="setSave" type="primary" htmlType="submit">保存</Button>:''}
+							                    {!this.props.userDetaile||orderDetaiel.deleteSign==0&&orderDetaiel.orderStatus==2||orderDetaiel.changeStatus==1?<Button className="setSave" type="primary" htmlType="submit" loading={this.state.loading}>保存</Button>:''}
 				                                {this.props.userDetaile?<div className='operations'>
 						                            {this.props.datauser.active.confirmIntention&&<Popconfirm title={'请确认您是否受理来自【'+this.props.datauser.buyerName+'】发起的服务意向订单?'} onConfirm={(e)=>{this.admissibleOrderOK()}} onCancel={(e)=>{this.admissibleOrderCancel()}} okText="同意" cancelText="拒绝">
-													    <Button style={{marginRight:'15px',marginLeft:'200px'}} type="primary">受理意向</Button>                 
+													    <Button style={{marginRight:'15px',marginLeft:'200px'}} type="primary">受理意向</Button>
 													</Popconfirm>}
-													{this.props.datauser.active.applySign&&<Button style={{marginRight:'10px'}} onClick={(e) =>{this.signBitt()}} type="primary">签单</Button>}             
+													{this.props.datauser.active.applySign&&<Button style={{marginRight:'10px'}} onClick={(e) =>{this.signBitt()}} type="primary">签单</Button>}
 													{this.props.datauser.active.applyForCancel&&<Popconfirm title={'请确认您是否取消客户【'+this.props.datauser.buyerName+'】的服务订单,订单取消将导致业务终止!'} onConfirm={(e)=>{this.cancelOrder()}} okText="确认" cancelText="取消">
-													    <Button style={{marginRight:'10px'}} type="danger">取消订单</Button>                 
+													    <Button style={{marginRight:'10px'}} type="danger">取消订单</Button>
 													</Popconfirm>}
 													{this.props.datauser.active.applyRevoke&&<Popconfirm title={'请确认您是否作废客户【'+this.props.datauser.buyerName+'】的服务订单,订单作废将导致订单失效!'} onConfirm={(e)=>{this.scrapOrder()}} okText="确认" cancelText="取消">
-													    <Button style={{marginRight:'10px',marginLeft:'200px'}} type="danger">作废</Button>                 
+													    <Button style={{marginRight:'10px',marginLeft:'200px'}} type="danger">作废</Button>
 													</Popconfirm>}
 													{this.props.datauser.active.applyLock&&<Popconfirm title={'请确认您是否锁定客户【'+this.props.datauser.buyerName+'】的服务订单,订单锁定将导致订单暂停!'} onConfirm={(e)=>{this.lockOrder()}} okText="确认" cancelText="取消">
-													    <Button style={{marginRight:'10px',marginLeft:'200px'}} type="danger">锁定</Button>                 
+													    <Button style={{marginRight:'10px',marginLeft:'200px'}} type="danger">锁定</Button>
 													</Popconfirm>}
 													{this.props.datauser.active.applyUnLock&&<Popconfirm title={'请确认您是否解锁客户【'+this.props.datauser.buyerName+'】的服务订单,订单解锁将导致订单正常!'} onConfirm={(e)=>{this.unlockOrder()}} okText="确认" cancelText="取消">
-													    <Button style={{marginRight:'10px',marginLeft:'200px'}} type="primary">解锁</Button>                 
-													</Popconfirm>}	
+													    <Button style={{marginRight:'10px',marginLeft:'200px'}} type="primary">解锁</Button>
+													</Popconfirm>}
 				                                </div>:''}
 				                                <Button className="cancel" type="ghost" onClick={this.handleCancel} style={{float:'right',marginRight:'200px'}}>返回</Button>
 			                            </div>
@@ -1614,7 +1617,7 @@ const NewService = Form.create()(React.createClass({
 			        <Modal maskClosable={false} visible={this.state.addnextVisible}
                         onOk={this.nextCancel} onCancel={this.nextCancel}
                         width='800px'
-                        title={this.state.addState?'添加服务':'服务详情'}                     
+                        title={this.state.addState?'添加服务':'服务详情'}
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
@@ -1622,7 +1625,7 @@ const NewService = Form.create()(React.createClass({
 			                        {this.state.addState?<div className="clearfix">
 				                    	<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="服务名称" >   
+				                            label="服务名称" >
 			                                    <AutoComplete
 										        className="certain-category-search"
 										        dropdownClassName="certain-category-search-dropdown"
@@ -1637,53 +1640,53 @@ const NewService = Form.create()(React.createClass({
 										        onSelect={this.selectAuto}
 										      >
 										        <Input/>
-										      </AutoComplete> 
+										      </AutoComplete>
 										      <span className="mandatory">*</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="市场价格(万元)" >   
-				                                <span>{this.state.commodityPrice}</span>    
+					                            label="市场价格(万元)" >
+				                                <span>{this.state.commodityPrice}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签价格(万元)" >   
+					                            label="实签价格(万元)" >
 				                                    <Input placeholder="请输入实签价格" value={this.state.discountPrice} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({discountPrice:e.target.value})}} ref="discountPrice"/>
-				                                <span className="mandatory">*</span>    
+				                                <span className="mandatory">*</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="服务数量" >   
+					                            label="服务数量" >
 				                                    <Input placeholder="请输入服务数量" value={this.state.commodityQuantity} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({commodityQuantity:e.target.value})}} ref="commodityQuantity"/>
-				                                <span className="mandatory">*</span>    
+				                                <span className="mandatory">*</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="市场首付金额(万元)" >   
-				                                <span>{this.state.commodityFirstPayment}</span>    
+					                            label="市场首付金额(万元)" >
+				                                <span>{this.state.commodityFirstPayment}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="签单首付金额(万元)" >   
+					                            label="签单首付金额(万元)" >
 				                                    <Input placeholder="请输入签单首付金额" value={this.state.discountFirstPayment} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({discountFirstPayment:e.target.value})}} ref='discountFirstPayment'/>
-				                                <span className="mandatory">*</span>    
+				                                <span className="mandatory">*</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
-						                    <FormItem 
+						                    <FormItem
 						                            labelCol={{ span: 4 }}
 										            wrapperCol={{ span: 16 }}
-						                            label="服务说明" >   
-					                                    <Input type='textarea' placeholder="请输入服务说明" value={this.state.remarks} 
+						                            label="服务说明" >
+					                                    <Input type='textarea' placeholder="请输入服务说明" value={this.state.remarks}
 					                                    onChange={(e)=>{this.setState({remarks:e.target.value})}} />
 						                    </FormItem>
 					                    </div>
 					                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-					                        <Button className="submitSave" type="primary" htmlType="submit">保存</Button>  
+					                        <Button className="submitSave" type="primary" htmlType="submit" loading={this.state.loading}>保存</Button>
 					                        <Button className="submitSave" type="ghost" onClick={this.nextCancel}>取消</Button>
-					                    </FormItem> 
+					                    </FormItem>
 				                    </div>:
 				                    <div className='clearfix'>
 				                    	<FormItem className="half-item"
@@ -1698,20 +1701,20 @@ const NewService = Form.create()(React.createClass({
 				                    	</FormItem>
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="市场首付金额" >   
-				                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
+					                            label="市场首付金额" >
+				                                <span>{editFws.commodityFirstPayment+'万元'}</span>
 					                    </FormItem>
 				                    	{this.state.active.applySign?<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签价格(万元)" >
 				                    			<Input placeholder="请输入签单首付金额" value={this.state.discountPrice} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({discountPrice:e.target.value})}} />
-				                                <span className="mandatory">*</span>      
+				                                <span className="mandatory">*</span>
 				                    	</FormItem>:
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签价格" >
-				                                <span>{this.state.discountPrice+'万元'}</span>      
+				                                <span>{this.state.discountPrice+'万元'}</span>
 				                    	</FormItem>}
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -1720,18 +1723,18 @@ const NewService = Form.create()(React.createClass({
 				                    	</FormItem>
 					                    {this.state.active.applySign?<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="签单首付金额(万元)" >  
+					                            label="签单首付金额(万元)" >
 					                            <Input placeholder="请输入签单首付金额" value={this.state.discountFirstPayment} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({discountFirstPayment:e.target.value})}}  />
-				                                <span className="mandatory">*</span>     
+				                                <span className="mandatory">*</span>
 					                    </FormItem>:
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="签单首付金额" >  
-				                                <span>{this.state.discountFirstPayment+'万元'}</span> 
+					                            label="签单首付金额" >
+				                                <span>{this.state.discountFirstPayment+'万元'}</span>
 					                    </FormItem>}
 					                    <div className='clearfix'>
-					                    	<FormItem 
+					                    	<FormItem
 						                            labelCol={{ span: 4 }}
 										            wrapperCol={{ span: 16 }}
 						                            label="服务说明" >
@@ -1739,7 +1742,7 @@ const NewService = Form.create()(React.createClass({
 					                    	</FormItem>
 				                    	</div>
 				                    	{this.state.active.applySign&&<FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-					                        <Button className="submitSave" type="primary" onClick={this.tabRowSave}>保存</Button>  
+					                        <Button className="submitSave" type="primary" onClick={this.tabRowSave} loading={this.state.loading}>保存</Button>
 					                        <Button className="submitSave" type="ghost" onClick={this.nextCancel}>取消</Button>
 					                    </FormItem>}
 				                    </div>}
@@ -1749,7 +1752,7 @@ const NewService = Form.create()(React.createClass({
 			        <Modal maskClosable={false} visible={this.state.signBillVisible}
                         onOk={this.signBillOk} onCancel={this.signBillOk}
                         width='800px'
-                        title='签单信息'                    
+                        title='签单信息'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.signOk} id="demand-form">
@@ -1757,31 +1760,31 @@ const NewService = Form.create()(React.createClass({
 			                        <div className="clearfix">
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="订单编号" > 
+					                            label="订单编号" >
 					                            <span>{this.state.orderNo}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="客户名称" >   
+					                            label="客户名称" >
 				                                   <span>{this.state.buyerName}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签款项(万元)" >   
+					                            label="实签款项(万元)" >
 				                                    <Input placeholder="请输入实签款项" value={this.state.signTotalAmount} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({signTotalAmount:e.target.value})}} />
 				                                    <span className="mandatory">*</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签首款(万元)" >   
+					                            label="实签首款(万元)" >
 				                                    <Input placeholder="请输入实签首款" value={this.state.signFirstPayment} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({signFirstPayment:e.target.value})}} />
 				                                    <span className="mandatory">*</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="特批立项" >  
+					                            label="特批立项" >
 					                            <Select placeholder="选择特批立项类型"
 						                            style={{ width:'200px'}}
 						                            value={this.state.approval}
@@ -1793,7 +1796,7 @@ const NewService = Form.create()(React.createClass({
 						                </FormItem>
 						                <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="合同编号" >                             
+					                            label="合同编号" >
 				                                    <Input placeholder="请输入合同编号"  value={this.state.contractNo}
 				                                    	onChange={(e)=>{this.setState({contractNo:e.target.value})}} style={{width:'200px'}} />
 					                    		<span className="mandatory">*</span>
@@ -1803,8 +1806,8 @@ const NewService = Form.create()(React.createClass({
 									            labelCol={{ span: 4 }}
 									            wrapperCol={{ span: 16 }}
 									            label="签单备注" >
-									                <Input type="textarea" placeholder="请输入签单备注" rows={4}  value={this.state.orderRemarks} 
-										    				onChange={(e)=>{this.setState({orderRemarks:e.target.value})}}/>			                      
+									                <Input type="textarea" placeholder="请输入签单备注" rows={4}  value={this.state.orderRemarks}
+										    				onChange={(e)=>{this.setState({orderRemarks:e.target.value})}}/>
 									        </FormItem>
 								        </div>
 								        <div className='clearfix'>
@@ -1822,24 +1825,24 @@ const NewService = Form.create()(React.createClass({
 								        </div>
 				                    </div>
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-			                        <Button className="submitSave" type="primary" htmlType="submit">确定签单</Button>  
+			                        <Button className="submitSave" type="primary" htmlType="submit">确定签单</Button>
 			                        <Button className="submitSave" type="ghost" onClick={this.signBillOk}>返回</Button>
-			                    </FormItem> 
+			                    </FormItem>
 			                </Spin>
 			            </Form >
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.signVisible}
                         onOk={this.signBittOk} onCancel={this.signBittOk}
                         width='600px'
-                        title='签单信息'                    
+                        title='签单信息'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.signSub} id="demand-form">
 			                <Spin spinning={this.state.loading}>
 			                        <div className="clearfix">
-					                    <FormItem 
+					                    <FormItem
 					                            {...formItemLayout}
-					                            label="特批立项" >  
+					                            label="特批立项" >
 					                            <Select placeholder="选择特批立项类型"
 						                            style={{ width:'200px'}}
 						                            value={this.state.approval}
@@ -1851,9 +1854,9 @@ const NewService = Form.create()(React.createClass({
 						                </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 				                            {...formItemLayout}
-				                            label="签单时间" >   
+				                            label="签单时间" >
 				                            <DatePicker
 				                              style={{marginTop:"2px"}}
 										      showTime
@@ -1864,18 +1867,18 @@ const NewService = Form.create()(React.createClass({
 										    />
 										    <span className="mandatory">*</span>
 			                    		</FormItem>
-			                    	</div>	
+			                    	</div>
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-			                        <Button className="submitSave" type="primary" htmlType="submit">确定签单</Button>  
+			                        <Button className="submitSave" type="primary" htmlType="submit">确定签单</Button>
 			                        <Button className="submitSave" type="ghost" onClick={this.signBittOk}>返回</Button>
-			                    </FormItem> 
+			                    </FormItem>
 			                </Spin>
 			            </Form >
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
                         width='1300px'
-                        title= '查看流水'                    
+                        title= '查看流水'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form">
@@ -1892,7 +1895,7 @@ const NewService = Form.create()(React.createClass({
 			        <Modal maskClosable={false} visible={this.state.addChangeState}
                         onOk={this.addChangeCancel} onCancel={this.addChangeCancel}
                         width='800px'
-                        title= {this.state.stateAdd?'添加变更':'查看变更记录'}                    
+                        title= {this.state.stateAdd?'添加变更':'查看变更记录'}
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form">
@@ -1903,11 +1906,11 @@ const NewService = Form.create()(React.createClass({
 									            labelCol={{ span: 4 }}
 									            wrapperCol={{ span: 16 }}
 									            label="变更说明" >
-								                <Input type="textarea" placeholder="请输入变更说明" rows={4}  value={this.state.changeRemarks} 
-									    				onChange={(e)=>{this.setState({changeRemarks:e.target.value})}}/>			                      
+								                <Input type="textarea" placeholder="请输入变更说明" rows={4}  value={this.state.changeRemarks}
+									    				onChange={(e)=>{this.setState({changeRemarks:e.target.value})}}/>
 									    </FormItem>
 									    <div className="clearfix">
-									    	<Button type="primary" onClick={this.subChangeState} style={{margin:"10px 50px 10px 128px"}}>保存</Button>
+									    	<Button type="primary" onClick={this.subChangeState} style={{margin:"10px 50px 10px 128px"}} loading={this.state.loading}>保存</Button>
 									    	<Button onClick={this.addChangeCancel}>取消</Button>
 									   </div>
 				                    </div>:
@@ -1917,23 +1920,23 @@ const NewService = Form.create()(React.createClass({
 				                    			return (<div className="changeBorder" key={index}>
 													    <FormItem className="half-item"
 													            {...formItemLayout}
-													            label="变更发起人" >                             
+													            label="变更发起人" >
 													               <span>{item.creater}</span>
 													    </FormItem>
 													    <FormItem className="half-item"
 													            {...formItemLayout}
-													            label="变更申请时间" >                             
+													            label="变更申请时间" >
 													               <span>{item.createTime}</span>
 													    </FormItem>
 													    <div className='clearfix'>
 													    	<FormItem className="half-item"
 													            {...formItemLayout}
-													            label="变更状态" >                             
+													            label="变更状态" >
 													                <span>{getChangeState(item.changeStatus)}</span>
 													   		</FormItem>
 													   		<FormItem className="half-item"
 													            {...formItemLayout}
-													            label="变更操作" >                             
+													            label="变更操作" >
 													            <Button onClick={(e)=>{this.modifyChange(item)}}>修改</Button>
 													   			{/*<Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>*/}
 													   		</FormItem>
@@ -1954,10 +1957,10 @@ const NewService = Form.create()(React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.modifyChangeState} 
+			        <Modal maskClosable={false} visible={this.state.modifyChangeState}
                         onOk={this.modifyChangeCancel} onCancel={this.modifyChangeCancel}
                         width='600px'
-                        title= "修改变更  "                 
+                        title= "修改变更  "
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form">
@@ -1966,23 +1969,23 @@ const NewService = Form.create()(React.createClass({
 		                       		<div className="clearfix">
 									    <FormItem className="half-item"
 									            {...formItemLayout}
-									            label="变更发起人" >                             
+									            label="变更发起人" >
 									               <span>{this.state.changePromoter}</span>
 									    </FormItem>
 									    <FormItem className="half-item"
 									            {...formItemLayout}
-									            label="变更申请时间" >                             
+									            label="变更申请时间" >
 									               <span>{this.state.changeTime}</span>
 									    </FormItem>
 									    <div className='clearfix'>
-									    	<FormItem 
+									    	<FormItem
 					                             labelCol={{ span: 4 }}
 										         wrapperCol={{ span: 16 }}
-					                             label="变更状态" >  
+					                             label="变更状态" >
 												<Radio.Group onChange={(e)=>{this.setState({changeState:e.target.value})}} value={this.state.changeState}>
 											        <Radio value={1}>变更中</Radio>
 											        <Radio value={2}>变更完成</Radio>
-											    </Radio.Group>    
+											    </Radio.Group>
 						                	</FormItem>
 									    </div>
 									    <div className='clearfix'>
@@ -1990,12 +1993,12 @@ const NewService = Form.create()(React.createClass({
 									            labelCol={{ span: 4 }}
 									            wrapperCol={{ span: 16 }}
 									            label="变更说明" >
-								                <Input type="textarea" placeholder="请输入变更说明" rows={4}  value={this.state.changeRemarks} 
-									    				onChange={(e)=>{this.setState({changeRemarks:e.target.value})}}/>			                      
+								                <Input type="textarea" placeholder="请输入变更说明" rows={4}  value={this.state.changeRemarks}
+									    				onChange={(e)=>{this.setState({changeRemarks:e.target.value})}}/>
 									   		</FormItem>
 									    </div>
 									    <div className="clearfix">
-									    	<Button type="primary" onClick={this.changeModify} style={{margin:"10px 95px"}}>保存</Button>
+									    	<Button type="primary" onClick={this.changeModify} style={{margin:"10px 95px"}} loading={this.state.loading}>保存</Button>
 									    	<Button onClick={this.modifyChangeCancel}>取消</Button>
 									    </div>
 									</div>
@@ -2024,4 +2027,4 @@ const NewService = Form.create()(React.createClass({
 	}
 }));
 
-export default NewService;
+export default NewService;

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

@@ -93,7 +93,7 @@ const ApproveOrder=Form.create()(React.createClass({
 			crossDomain: false,
 			url: globalConfig.context + "/api/admin/organization/selectSuperId",
 			data: {
-				
+
 			},
 			success: function(data) {
 				let thedata = data.data;
@@ -229,10 +229,10 @@ const ApproveOrder=Form.create()(React.createClass({
 						return <div>
 									{record.approval==1&&<div>
 										<Popconfirm title={'您确认驳回 【'+ record.salesmanName +'】的特批申请?'} onConfirm={(e)=>{this.reject(record)}} okText="确认" cancelText="取消">
-										    <Button style={{marginRight:'5px'}} type="danger" onClick={(e) =>{ e.stopPropagation()}}>驳回</Button>                 
+										    <Button style={{marginRight:'5px'}} type="danger" onClick={(e) =>{ e.stopPropagation()}}>驳回</Button>
 										</Popconfirm>
 										<Popconfirm title={'您确定同意 【'+ record.salesmanName +'】的特批申请?'} onConfirm={(e)=>{this.confirm(record)}} okText="确认" cancelText="取消">
-										    <Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation()}}>同意</Button>                 
+										    <Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation()}}>同意</Button>
 										</Popconfirm>
 									</div>}
                         	   </div>
@@ -325,7 +325,7 @@ const ApproveOrder=Form.create()(React.createClass({
 		this.state.approvalHistorySearch=true;
 		this.state.orderStateSearch  = undefined;
 		this.state.paymentStateSearch  = undefined;
-        this.loadData();       
+        this.loadData();
     },
     changeList(arr) {
         const newArr = [];
@@ -347,7 +347,7 @@ const ApproveOrder=Form.create()(React.createClass({
 	                this.setState({
 	                    selectedRows: selectedRows.slice(-1),
 	                    selectedRowKeys: selectedRowKeys.slice(-1)
-	                }); 
+	                });
             },
             onSelectAll: (selected, selectedRows, changeRows) => {
 			   this.setState({
@@ -361,7 +361,7 @@ const ApproveOrder=Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                    <span style={{fontSize:'16px'}}>特批订单</span>	
+                    <span style={{fontSize:'16px'}}>特批订单</span>
                     <Tabs
                         defaultActiveKey="1"
                         onChange={this.callback}
@@ -374,7 +374,7 @@ const ApproveOrder=Form.create()(React.createClass({
 	                    <RangePicker
 		                        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 }); }} /> 
+		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
                         <Select placeholder="部门机构"
 	                        style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
 	                        value={this.state.departmentSearch}
@@ -390,10 +390,10 @@ const ApproveOrder=Form.create()(React.createClass({
 	                        onChange={(e) => { this.setState({ orderLeader: e.target.value }); }} />
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
 	                    <Button onClick={this.reset}>重置</Button>
-	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
+	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
 	                </div>
 	                <div className='clearfix' style={{marginTop:'5px'}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
+	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
 	                  		<Checkbox checked={this.state.approvalHistorySearch} style={{marginLeft:10}} onChange={(e)=>{this.setState({approvalHistorySearch:!this.state.approvalHistorySearch})}}>特批历史订单</Checkbox>
 	                        <Select placeholder="订单状态"
 	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
@@ -438,7 +438,7 @@ const ApproveOrder=Form.create()(React.createClass({
                                     : this.state.columns
                                 }
 	                            dataSource={this.state.dataSource}
-	                            rowSelection={rowSelection}
+	                            // rowSelection={rowSelection}
 	                            pagination={this.state.pagination}
                                 onRowClick={this.tableRowClick}
                                 bordered

+ 16 - 7
js/component/manageCenter/order/orderNew/changeComponent/agreeButton.js

@@ -31,14 +31,15 @@ class ReasonInput extends Component {
   //   // // this.sendRequest()
   //   // this.onOk(data,backData)
   //   // console.log("222222",this.props);
-    
+
   // }
-    
+
   // 理由请求
   sendRequest(data, backData) {
     if(this.state.flagS) return
     this.setState({
-      flagS: true
+      flagS: true,
+      loading: true,
     });
     $.ajax({
       method: "post",
@@ -59,7 +60,7 @@ class ReasonInput extends Component {
             message.warning(data.error[0].message);
             // if (!this.state.flag) return;
             this.setState({
-              flagS: !this.state.flagS
+              flagS: !this.state.flagS,
             });
             return
           }
@@ -79,6 +80,9 @@ class ReasonInput extends Component {
         // if (this.props.loadData) {
         //   this.props.loadData("2");
         // }
+        this.setState({
+          loading: false,
+        })
       }.bind(this)
     );
   }
@@ -87,7 +91,8 @@ class ReasonInput extends Component {
   inputAjax(_data, backData) {
     if (this.state.flag) return;
     this.setState({
-      flag: true
+      flag: true,
+      loading: true,
     })
     $.ajax({
       method: "post",
@@ -114,6 +119,9 @@ class ReasonInput extends Component {
     }).done(
       function() {
         this.sendRequest(this.props.data, backData);
+        this.setState({
+          loading: false,
+        })
       }.bind(this)
     );
   }
@@ -160,7 +168,7 @@ class ReasonInput extends Component {
 
   onOk(data, backData) {
     console.log(this.props);
-    
+
     if (!this.props.reason) {
       message.error("理由不能为空!");
       return false;
@@ -197,6 +205,7 @@ class ReasonInput extends Component {
       <div style={{ display: "inline-block" }}>
         <Button
           type={data.type}
+          loading={this.state.loading}
           onClick={() => {
             this.changeModal();
           }}
@@ -222,7 +231,7 @@ class ReasonInput extends Component {
               value={this.state.reason}
               onChange={e => {
                 // console.log(this.props);
-                
+
                 this.setState({
                   reason: e.target.value
                 });

+ 0 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js

@@ -540,7 +540,6 @@ class ChangeDetail extends Component {
               overflow: "hidden",
               paddingLeft: "90px",
               position: "relative",
-              bottom: "20px",
             }}
           >
             {/* <span>操作人:</span> */}

+ 0 - 1
js/component/manageCenter/order/orderNew/changeComponent/rizhi.js

@@ -121,7 +121,6 @@ class Rizhi extends Component {
         style={{
           display: "inline-block",
           verticalAlign: "top",
-          marginLeft: 60
         }}
       >
         <Button

+ 1 - 1
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -1058,7 +1058,7 @@ const IntentionCustomer = Form.create()(
                         : this.state.columns
                   }
                   dataSource={this.state.dataSource}
-                  rowSelection={rowSelection}
+                  // rowSelection={rowSelection}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}
                   bordered

+ 13 - 3
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -925,6 +925,9 @@ const checkOutsourcing = Form.create()(
         message.warning('审核意见不能为空')
         return
       }
+      this.setState({
+        adoptLoading: true
+      })
       $.ajax({
         method: 'post',
         dataType: 'json',
@@ -947,7 +950,7 @@ const checkOutsourcing = Form.create()(
       }).done(
         function () {
           this.setState({
-            loading: false,
+            adoptLoading: false,
             remarks: '',
           })
           this.visitCancel()
@@ -956,6 +959,9 @@ const checkOutsourcing = Form.create()(
     },
 
     refuse() {
+      this.setState({
+        operationLoading:true
+      })
       $.ajax({
         method: 'post',
         dataType: 'json',
@@ -977,7 +983,7 @@ const checkOutsourcing = Form.create()(
       }).done(
         function () {
           this.setState({
-            loading: false,
+            operationLoading: false,
             remarks: '',
           })
           this.visitCancel()
@@ -1870,11 +1876,15 @@ const checkOutsourcing = Form.create()(
                       <Button
                         type="danger"
                         onClick={this.refuse}
+                        loading={this.state.operationLoading}
                         style={{ color: '#fff', backgroundColor: '#f04134' }}
                       >
                         驳回
                       </Button>
-                      <Button type="primary" onClick={this.pass}>
+                      <Button
+                          loading={this.state.adoptLoading}
+                          type="primary"
+                          onClick={this.pass}>
                         通过
                       </Button>
                     </div>

+ 2 - 1
js/component/manageCenter/order/orderNew/costAuditList/index.js

@@ -392,7 +392,8 @@ class CostAuditList extends Component{
                               {...this.props}
                               onSearch={(data)=>{
                                   this.setState({
-                                      searchInfor: data
+                                      searchInfor: data,
+                                      selectedRowKeys: [],
                                   });
                                   this.loadData(1,data);
                               }}

+ 1 - 1
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -1521,7 +1521,7 @@ const outsourcingPro = Form.create()(
                     </div>
                   }
               >
-                <TabPane tab="外包审核1" key="1">
+                <TabPane tab="外包审核" key="1">
                   {this.state.activeKey === '1' ? <Spin spinning={this.state.loading || this.state.getOrderTaskLoading}>
                     <CheckProject
                         {...this.props}

+ 7 - 5
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -223,7 +223,8 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                     type="primary"
                     style={{ margin: "0 10px" }}
                     onClick={e => {
-                      e.stopPropagation(), this.examNo(record);
+                      e.stopPropagation()
+                      this.examNo(record);
                     }}
                   >
                     驳回
@@ -437,6 +438,9 @@ const zxsglyOutSourcingPaiDan = React.createClass({
   },
   //审核不通过
   examOks() {
+    this.setState({
+      loading: true
+    });
     $.ajax({
       method: "post",
       dataType: "json",
@@ -1695,7 +1699,6 @@ const zxsglyOutSourcingPaiDan = React.createClass({
           className="admin-desc-content"
         >
           <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
-            <Spin spinning={this.state.loading}>
               <div className="clearfix">
                 <FormItem
                   className="half-item"
@@ -1845,6 +1848,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                     className="submitSave"
                     type="primary"
                     htmlType="submit"
+                    loading={this.state.loading}
                   >
                     保存
                   </Button>
@@ -1857,7 +1861,6 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                   </Button>
                 </FormItem>
               </div>
-            </Spin>
           </Form>
         </Modal>
 
@@ -1872,7 +1875,6 @@ const zxsglyOutSourcingPaiDan = React.createClass({
           className="admin-desc-content"
         >
           <Form layout="horizontal" id="demand-form">
-            <Spin spinning={this.state.loading}>
               <div className="clearfix">
                 <FormItem
                   labelCol={{ span: 4 }}
@@ -1895,6 +1897,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                   className="cancel"
                   type="primary"
                   onClick={this.examOks}
+                  loading={this.state.loading}
                   style={{ marginLeft: "50px" }}
                   htmlType="submit"
                 >
@@ -1909,7 +1912,6 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                   取消
                 </Button>
               </div>
-            </Spin>
           </Form>
         </Modal>
         {this.state.resVisible ? (

+ 7 - 4
js/component/manageCenter/project/task/myTask.jsx

@@ -1524,7 +1524,9 @@ const Task = React.createClass({
         }
       })
     }
-
+    this.setState({
+      loading: true,
+    })
     $.ajax({
       method: 'POST',
       dataType: 'json',
@@ -3173,6 +3175,7 @@ const Task = React.createClass({
       loading: true,
       ThirdListVisible: false,
     })
+    const hide = message.loading('删除中...', 0);
     let id = '';
     if(index === -1){
       if(this.state.thirdInfoList.length === 1){
@@ -3195,7 +3198,8 @@ const Task = React.createClass({
         function (data) {
           this.setState({
             loading: false,
-          })
+          });
+          hide();
           if (!data.error.length) {
             message.success('删除成功!')
             this.thirdTable(this.state.tid)
@@ -5036,7 +5040,6 @@ const Task = React.createClass({
           className="admin-desc-content"
         >
           <Form layout="horizontal" id="demand-form">
-            <Spin spinning={this.state.loading}>
               <div className="clearfix">
                 <FormItem {...formItemLayout} label="工作日期">
                   <DatePicker
@@ -5084,6 +5087,7 @@ const Task = React.createClass({
                   className="cancel"
                   type="primary"
                   onClick={this.tianjiaOk}
+                  loading={this.state.loading}
                   style={{ marginLeft: '100px' }}
                   htmlType="submit"
                 >
@@ -5098,7 +5102,6 @@ const Task = React.createClass({
                   取消
                 </Button>
               </div>
-            </Spin>
           </Form>
         </Modal>
         {this.state.speVisible ? <Modal

+ 1 - 0
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -693,6 +693,7 @@ const MyTaskOutsource = React.createClass({
                 ) : (
                   <Button
                     type="primary"
+                    lo
                     onClick={(e) => {
                       e.stopPropagation();
                       this.contactSave(record, index);

+ 19 - 6
js/component/manageCenter/project/task/patentSchedule.jsx

@@ -122,6 +122,7 @@ class PatentSchedule extends Component{
                                         background: '#f00',
                                         border: 'none',
                                     }}
+                                    loading={this.state.loading}
                                     onClick={()=>{
                                         let _this = this;
                                         if(record.isChange){
@@ -148,11 +149,14 @@ class PatentSchedule extends Component{
                                         dataSource: this.state.dataSource
                                     })
                                 }}>修改</Button>}
-                                {record.isChange &&<Button size={'small'} style={{
-                                    marginLeft:'10px',
-                                    color: '#ffffff',
-                                    background: '#4ad028',
-                                    border: 'none',
+                                {record.isChange &&<Button
+                                    size={'small'}
+                                    loading={this.state.loading}
+                                    style={{
+                                        marginLeft:'10px',
+                                        color: '#ffffff',
+                                        background: '#4ad028',
+                                        border: 'none',
                                 }} onClick={()=>{
                                     if(record.id){
                                         this.changeTaskProgress(record);
@@ -222,6 +226,9 @@ class PatentSchedule extends Component{
             message.warning('请选择状态');
             return;
         }
+        this.setState({
+            loading: true,
+        })
         let _this = this;
         let data = Object.assign({},record);
         delete data.isChange;
@@ -310,6 +317,9 @@ class PatentSchedule extends Component{
             message.warning('请选择状态');
             return;
         }
+        this.setState({
+            loading: true,
+        })
         let _this = this;
         let data = Object.assign({},record);
         delete data.isChange;
@@ -386,6 +396,9 @@ class PatentSchedule extends Component{
 
     //查看下证信息
     loaduserss() {
+        this.setState({
+            progressLogLoading: true,
+        })
         $.ajax({
             method: 'get',
             dataType: 'json',
@@ -409,7 +422,7 @@ class PatentSchedule extends Component{
         }).always(
             function () {
                 this.setState({
-                    loading: false,
+                    progressLogLoading: false,
                 })
             }.bind(this)
         )

+ 1 - 0
js/component/manageCenter/project/task/resolutionPro.jsx

@@ -251,6 +251,7 @@ const ResolutionPro = React.createClass({
             cancelText="取消"
           >
             <Button
+              loading={this.state.loading}
               type="primary"
               style={{
                 position: "relative",