Browse Source

Accept Merge Request #9 v1.0.3 merge : (master -> test)

Merge Request: v1.0.3 merge
Created By: @seirios
Accepted By: @seirios
URL: https://coding.net/t/aft/p/AFT-WEB/git/merge/9
seirios 8 years ago
parent
commit
59612dbea2
51 changed files with 457 additions and 207 deletions
  1. 7 5
      js/component/account/services/achievement.jsx
  2. 5 3
      js/component/account/services/activity.jsx
  3. 7 5
      js/component/account/services/activityCostList.jsx
  4. 12 8
      js/component/account/services/annualReport.jsx
  5. 12 8
      js/component/account/services/cognizance.jsx
  6. 7 5
      js/component/account/services/finance.jsx
  7. 7 5
      js/component/account/services/honorList.jsx
  8. 4 2
      js/component/account/services/intellectual.jsx
  9. 3 3
      js/component/account/services/intellectualDesc.jsx
  10. 7 5
      js/component/account/services/orgTechCenter.jsx
  11. 4 2
      js/component/account/services/patent.jsx
  12. 3 3
      js/component/account/services/patentAdd.jsx
  13. 1 1
      js/component/account/services/patentDesc.jsx
  14. 7 5
      js/component/account/services/ratepay.jsx
  15. 5 3
      js/component/account/services/standard.jsx
  16. 7 5
      js/component/account/services/techProduct.jsx
  17. 9 9
      js/component/account/set/group.jsx
  18. 7 5
      js/component/account/set/hrSituation.jsx
  19. 12 8
      js/component/manageCenter/servicesManage/highTech/HighTechApply.jsx
  20. 7 5
      js/component/manageCenter/servicesManage/highTech/fosterDesc/achievement.jsx
  21. 5 3
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx
  22. 7 5
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx
  23. 12 8
      js/component/manageCenter/servicesManage/highTech/fosterDesc/annualReport.jsx
  24. 7 5
      js/component/manageCenter/servicesManage/highTech/fosterDesc/finance.jsx
  25. 7 5
      js/component/manageCenter/servicesManage/highTech/fosterDesc/honorList.jsx
  26. 7 5
      js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx
  27. 4 2
      js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectual.jsx
  28. 3 3
      js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectualDesc.jsx
  29. 7 5
      js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx
  30. 7 5
      js/component/manageCenter/servicesManage/highTech/fosterDesc/ratepay.jsx
  31. 5 3
      js/component/manageCenter/servicesManage/highTech/fosterDesc/standard.jsx
  32. 7 5
      js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx
  33. 4 2
      js/component/manageCenter/servicesManage/patent/applyFee.jsx
  34. 1 1
      js/component/manageCenter/servicesManage/patent/applyFeeDesc.jsx
  35. 3 3
      js/component/manageCenter/servicesManage/patent/clientInputPatent.jsx
  36. 2 2
      js/component/manageCenter/servicesManage/patent/comPatentAdd.jsx
  37. 1 1
      js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx
  38. 4 2
      js/component/manageCenter/servicesManage/patent/comprehensive.jsx
  39. 4 2
      js/component/manageCenter/servicesManage/patent/correction.jsx
  40. 1 1
      js/component/manageCenter/servicesManage/patent/correctionDesc.jsx
  41. 4 2
      js/component/manageCenter/servicesManage/patent/express.jsx
  42. 1 1
      js/component/manageCenter/servicesManage/patent/expressDesc.jsx
  43. 4 2
      js/component/manageCenter/servicesManage/patent/payment.jsx
  44. 1 1
      js/component/manageCenter/servicesManage/patent/paymentDesc.jsx
  45. 17 11
      js/component/manageCenter/userManage/orgCertify.jsx
  46. 10 3
      js/component/manageCenter/userManage/orgDesc.jsx
  47. 78 3
      js/component/manageCenter/userManage/orgList.jsx
  48. 26 12
      js/component/manageCenter/userManage/userDesc.jsx
  49. 75 5
      js/component/manageCenter/userManage/userList.jsx
  50. 9 3
      js/component/manageCenter/userManage/userList.less
  51. 1 1
      package.json

+ 7 - 5
js/component/account/services/achievement.jsx

@@ -71,7 +71,7 @@ const AchievementDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -205,7 +205,7 @@ const AchievementDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false, true);
     },
     handleCancel(e) {
         this.setState({
@@ -230,7 +230,7 @@ const AchievementDesc = React.createClass({
                         <AchievementDescFrom
                             data={this.props.data}
                             activityNumberList={this.props.activityNumberList}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -390,9 +390,11 @@ const Achievement = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 5 - 3
js/component/account/services/activity.jsx

@@ -54,7 +54,7 @@ const ActivityDesc = React.createClass({
                     loading: false,
                     visible: false
                 });
-                this.props.closeDesc(false);
+                this.props.closeDesc(false,true);
             } else {
                 message.warning(data.error[0].message);
                 this.setState({
@@ -483,9 +483,11 @@ const Activity = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 7 - 5
js/component/account/services/activityCostList.jsx

@@ -78,7 +78,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                     }
                 }.bind(this)).always(function () {
                     this.props.spinState(false);
-                    this.props.closeModal();
+                    this.props.clickOk();
                     this.props.form.resetFields();
                 }.bind(this));
             }
@@ -320,7 +320,7 @@ const ActivityDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -343,7 +343,7 @@ const ActivityDesc = React.createClass({
                         footer=''
                     >
                         <ActivityDescFrom data={this.props.data} activityNumberList={this.props.activityNumberList}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -566,9 +566,11 @@ const Activity = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 12 - 8
js/component/account/services/annualReport.jsx

@@ -46,7 +46,7 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -403,7 +403,7 @@ const AnnualReportDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false, true);
     },
     handleCancel(e) {
         this.setState({
@@ -428,7 +428,7 @@ const AnnualReportDesc = React.createClass({
                         <AnnualReportDescFrom
                             data={this.props.data}
                             detailData={this.state.detailData}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -492,7 +492,7 @@ const AnnualReportAdd = React.createClass({
                 this.setState({
                     visible: false
                 });
-                this.props.closeAdd(false);
+                this.props.closeAdd(false, true);
             } else {
                 message.warning(data.error[0].message);
                 this.setState({
@@ -699,18 +699,22 @@ const AnnualReport = React.createClass({
     //         this.loadData();
     //     }.bind(this));
     // },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     addClick() {
         this.setState({
             showAdd: true
         });
     },
-    closeAdd(e) {
+    closeAdd(e, s) {
         this.state.showAdd = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     // search() {
     //     this.loadData();

+ 12 - 8
js/component/account/services/cognizance.jsx

@@ -165,7 +165,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.form.resetFields();
                         this.state.targetKeys = [];
                         this.state.selectedKeys = [];
@@ -338,7 +338,7 @@ const CognizanceDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false, true);
     },
     handleCancel(e) {
         this.setState({
@@ -363,7 +363,7 @@ const CognizanceDesc = React.createClass({
                         <CognizanceDescFrom
                             visible={this.state.visible}
                             data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -433,7 +433,7 @@ const CognizanceAdd = React.createClass({
                 this.setState({
                     visible: false
                 });
-                this.props.closeAdd(false);
+                this.props.closeAdd(false, true);
             } else {
                 message.warning(data.error[0].message);
                 this.setState({
@@ -676,13 +676,17 @@ const Cognizance = React.createClass({
     //         this.loadData();
     //     }.bind(this));
     // },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
-    closeAdd(e) {
+    closeAdd(e, s) {
         this.state.showAdd = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     // search() {
     //     this.loadData();

+ 7 - 5
js/component/account/services/finance.jsx

@@ -56,7 +56,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -261,7 +261,7 @@ const FinanceDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -285,7 +285,7 @@ const FinanceDesc = React.createClass({
                     >
                         <FinanceDescFrom
                             data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -447,9 +447,11 @@ const Finance = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 7 - 5
js/component/account/services/honorList.jsx

@@ -32,7 +32,7 @@ const HonorListDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -143,7 +143,7 @@ const HonorListDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -166,7 +166,7 @@ const HonorListDesc = React.createClass({
                         footer=''
                     >
                         <HonorListDescFrom data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -304,9 +304,11 @@ const HonorList = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 4 - 2
js/component/account/services/intellectual.jsx

@@ -153,9 +153,11 @@ const Intellectual = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 3 - 3
js/component/account/services/intellectualDesc.jsx

@@ -57,7 +57,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                     }
                 }.bind(this)).always(function () {
                     this.props.spinState(false);
-                    this.props.closeModal();
+                    this.props.clickOk();
                     this.props.form.resetFields();
                 }.bind(this));
             }
@@ -219,7 +219,7 @@ const intellectualDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -241,7 +241,7 @@ const intellectualDesc = React.createClass({
                         width='600px'
                         footer=''
                     >
-                        <IntellectualDescFrom data={this.props.data} spinState={this.spinChange} closeModal={this.handleCancel} />
+                        <IntellectualDescFrom data={this.props.data} spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>

+ 7 - 5
js/component/account/services/orgTechCenter.jsx

@@ -33,7 +33,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -157,7 +157,7 @@ const CenterListDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -180,7 +180,7 @@ const CenterListDesc = React.createClass({
                         footer=''
                     >
                         <CenterListDescFrom data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -359,9 +359,11 @@ const CenterList = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     saveCenterDetail() {
         this.setState({

+ 4 - 2
js/component/account/services/patent.jsx

@@ -160,9 +160,11 @@ const Patent = React.createClass({
             showDesc: true
         });
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.state.searchNum;

+ 3 - 3
js/component/account/services/patentAdd.jsx

@@ -97,7 +97,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     }
                 }.bind(this)).always(function () {
                     this.props.spinState(false);
-                    this.props.closeModal();
+                    this.props.clickOk();
                     this.props.form.resetFields();
                 }.bind(this));
             }
@@ -236,7 +236,7 @@ const PatentAdd = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -259,7 +259,7 @@ const PatentAdd = React.createClass({
                         width='720px'
                         footer=''
                     >
-                        <PatentAddFrom spinState={this.spinChange} closeModal={this.handleCancel} />
+                        <PatentAddFrom spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>

+ 1 - 1
js/component/account/services/patentDesc.jsx

@@ -22,7 +22,7 @@ const PatentDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     getStepList(thepid) {
         $.ajax({

+ 7 - 5
js/component/account/services/ratepay.jsx

@@ -53,7 +53,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -239,7 +239,7 @@ const RatepayDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false, true);
     },
     handleCancel(e) {
         this.setState({
@@ -262,7 +262,7 @@ const RatepayDesc = React.createClass({
                         footer=''
                     >
                         <RatepayDescFrom data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -414,9 +414,11 @@ const Ratepay = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 5 - 3
js/component/account/services/standard.jsx

@@ -50,7 +50,7 @@ const StandardDesc = React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.props.closeDesc(false);
+            this.props.closeDesc(false,true);
         }.bind(this));
     },
     handleCancel(e) {
@@ -262,9 +262,11 @@ const Standard = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 7 - 5
js/component/account/services/techProduct.jsx

@@ -59,7 +59,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.form.resetFields();
                         this.state.targetKeys = [];
                         this.state.selectedKeys = [];
@@ -279,7 +279,7 @@ const TechProductDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false, true);
     },
     handleCancel(e) {
         this.setState({
@@ -302,7 +302,7 @@ const TechProductDesc = React.createClass({
                         footer=''
                     >
                         <TechProductDescFrom data={this.props.data} mockData={this.props.mockData}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -491,9 +491,11 @@ const TechProduct = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 9 - 9
js/component/account/set/group.jsx

@@ -24,11 +24,11 @@ const BaseFrom = Form.create()(React.createClass({
                     this.setState({
                         fixedTel: data.data.fixedTel,
                         firstContacts: data.data.firstContacts,
-                        firstMobile:data.data.firstMobil,
+                        firstMobile:data.data.firstMobile,
                         secondContacts: data.data.secondContacts,
-                        secondMobile:data.data.secondMobil,
+                        secondMobile:data.data.secondMobile,
                         thirdContacts: data.data.thirdContacts,
-                        thirdMobile:data.data.thirdMobil,
+                        thirdMobile:data.data.thirdMobile,
                         qq: data.data.qq,
                         address: data.data.postalAddress,
                         postcode: data.data.postcode,
@@ -56,7 +56,7 @@ const BaseFrom = Form.create()(React.createClass({
         e.preventDefault();
         this.props.form.validateFields((err, values) => {
             if (!err) {
-
+                debugger
                 this.props.spinState(true);
                 $.ajax({
                     method: "POST",
@@ -65,11 +65,11 @@ const BaseFrom = Form.create()(React.createClass({
                     url: globalConfig.context + "/api/user/orgIdentity",
                     data: {
                         "firstContacts": values.firstContacts,
-                        "firstMobile":values.firstMobil,
+                        "firstMobile":values.firstMobile,
                         "secondContacts": values.secondContacts,
-                        "secondMobile":values.secondMobil,
+                        "secondMobile":values.secondMobile,
                         "thirdContacts": values.thirdContacts,
-                        "thirdMobile":values.thirdMobil,
+                        "thirdMobile":values.thirdMobile,
                         "email": values.email,
                         "fixedTel": values.telephone,
                         "qq": values.qq,
@@ -140,8 +140,8 @@ const BaseFrom = Form.create()(React.createClass({
                     {...formItemLayout}
                     label="手机号码"
                 >
-                    {getFieldDecorator('firstMoblie', {
-                        initialValue: this.state.firstMoblie,
+                    {getFieldDecorator('firstMobile', {
+                        initialValue: this.state.firstMobile,
                         rules: [
                             {
                                 validator: this.checkPhone

+ 7 - 5
js/component/account/set/hrSituation.jsx

@@ -85,7 +85,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -526,7 +526,7 @@ const HrSituationDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -549,7 +549,7 @@ const HrSituationDesc = React.createClass({
                         footer=''
                     >
                         <HrSituationDescFrom data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -724,9 +724,11 @@ const HrSituation = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     render() {
         const rowSelection = {

+ 12 - 8
js/component/manageCenter/servicesManage/highTech/HighTechApply.jsx

@@ -177,7 +177,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.form.resetFields();
                         this.state.targetKeys = [];
                         this.state.selectedKeys = [];
@@ -386,7 +386,7 @@ const CognizanceDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false, true);
     },
     handleCancel(e) {
         this.setState({
@@ -412,7 +412,7 @@ const CognizanceDesc = React.createClass({
                             visible={this.state.visible}
                             authorOption={this.props.authorOption}
                             data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -510,7 +510,7 @@ const CognizanceAdd = React.createClass({
                 this.setState({
                     visible: false
                 });
-                this.props.closeAdd(false);
+                this.props.closeAdd(false, true);
             } else {
                 message.warning(data.error[0].message);
                 this.setState({
@@ -825,13 +825,17 @@ const Cognizance = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
-    closeAdd(e) {
+    closeAdd(e, s) {
         this.state.showAdd = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 7 - 5
js/component/manageCenter/servicesManage/highTech/fosterDesc/achievement.jsx

@@ -72,7 +72,7 @@ const AchievementDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -207,7 +207,7 @@ const AchievementDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -233,7 +233,7 @@ const AchievementDesc = React.createClass({
                             uid={this.props.uid}
                             data={this.props.data}
                             activityNumberList={this.props.activityNumberList}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -397,9 +397,11 @@ const Achievement = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 5 - 3
js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx

@@ -77,7 +77,7 @@ const ActivityDesc = React.createClass({
                     loading: false,
                     visible: false
                 });
-                this.props.closeDesc(false);
+                this.props.closeDesc(false, true);
             } else {
                 message.warning(data.error[0].message);
                 this.setState({
@@ -508,9 +508,11 @@ const Activity = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 7 - 5
js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx

@@ -79,7 +79,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                     }
                 }.bind(this)).always(function () {
                     this.props.spinState(false);
-                    this.props.closeModal();
+                    this.props.clickOk();
                     this.props.form.resetFields();
                 }.bind(this));
             }
@@ -321,7 +321,7 @@ const ActivityDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -347,7 +347,7 @@ const ActivityDesc = React.createClass({
                             uid={this.props.uid}
                             data={this.props.data}
                             activityNumberList={this.props.activityNumberList}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -574,9 +574,11 @@ const Activity = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
 

+ 12 - 8
js/component/manageCenter/servicesManage/highTech/fosterDesc/annualReport.jsx

@@ -37,7 +37,7 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -401,7 +401,7 @@ const AnnualReportDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false, true);
     },
     handleCancel(e) {
         this.setState({
@@ -427,7 +427,7 @@ const AnnualReportDesc = React.createClass({
                             uid={this.props.uid}
                             data={this.props.data}
                             detailData={this.state.detailData}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -492,7 +492,7 @@ const AnnualReportAdd = React.createClass({
                 this.setState({
                     visible: false
                 });
-                this.props.closeAdd(false);
+                this.props.closeAdd(false, true);
             } else {
                 message.warning(data.error[0].message);
                 this.setState({
@@ -700,18 +700,22 @@ const AnnualReport = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     addClick() {
         this.setState({
             showAdd: true
         });
     },
-    closeAdd(e) {
+    closeAdd(e, s) {
         this.state.showAdd = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     // search() {
     //     this.loadData();

+ 7 - 5
js/component/manageCenter/servicesManage/highTech/fosterDesc/finance.jsx

@@ -59,7 +59,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -264,7 +264,7 @@ const FinanceDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -289,7 +289,7 @@ const FinanceDesc = React.createClass({
                         <FinanceDescFrom
                             uid={this.props.uid}
                             data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -452,9 +452,11 @@ const Finance = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 7 - 5
js/component/manageCenter/servicesManage/highTech/fosterDesc/honorList.jsx

@@ -33,7 +33,7 @@ const HonorListDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -144,7 +144,7 @@ const HonorListDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -169,7 +169,7 @@ const HonorListDesc = React.createClass({
                         <HonorListDescFrom
                             uid={this.props.uid}
                             data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -308,9 +308,11 @@ const HonorList = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 7 - 5
js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx

@@ -85,7 +85,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -517,7 +517,7 @@ const HrSituationDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false, true);
     },
     handleCancel(e) {
         this.setState({
@@ -542,7 +542,7 @@ const HrSituationDesc = React.createClass({
                         <HrSituationDescFrom
                             uid={this.props.uid}
                             data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -718,9 +718,11 @@ const HrSituation = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     render() {
         const rowSelection = {

+ 4 - 2
js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectual.jsx

@@ -153,9 +153,11 @@ const Intellectual = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 3 - 3
js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectualDesc.jsx

@@ -57,7 +57,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                     }
                 }.bind(this)).always(function () {
                     this.props.spinState(false);
-                    this.props.closeModal();
+                    this.props.clickOk();
                     this.props.form.resetFields();
                 }.bind(this));
             }
@@ -219,7 +219,7 @@ const intellectualDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -241,7 +241,7 @@ const intellectualDesc = React.createClass({
                         width='600px'
                         footer=''
                     >
-                        <IntellectualDescFrom uid={this.props.uid} data={this.props.data} spinState={this.spinChange} closeModal={this.handleCancel} />
+                        <IntellectualDescFrom uid={this.props.uid} data={this.props.data} spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>

+ 7 - 5
js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx

@@ -34,7 +34,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -158,7 +158,7 @@ const CenterListDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -181,7 +181,7 @@ const CenterListDesc = React.createClass({
                         footer=''
                     >
                         <CenterListDescFrom data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -360,9 +360,11 @@ const CenterList = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     saveCenterDetail() {
         this.setState({

+ 7 - 5
js/component/manageCenter/servicesManage/highTech/fosterDesc/ratepay.jsx

@@ -54,7 +54,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.spinState(false);
                         this.props.form.resetFields();
                     } else {
@@ -240,7 +240,7 @@ const RatepayDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -265,7 +265,7 @@ const RatepayDesc = React.createClass({
                         <RatepayDescFrom
                             uid={this.props.uid}
                             data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -418,9 +418,11 @@ const Ratepay = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 5 - 3
js/component/manageCenter/servicesManage/highTech/fosterDesc/standard.jsx

@@ -50,7 +50,7 @@ const StandardDesc = React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.props.closeDesc(false);
+            this.props.closeDesc(false,true);
         }.bind(this));
     },
     handleCancel(e) {
@@ -263,9 +263,11 @@ const Standard = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 7 - 5
js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx

@@ -60,7 +60,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
                 }).done(function (data) {
                     if (!data.error.length) {
                         message.success('保存成功!');
-                        this.props.closeModal();
+                        this.props.clickOk();
                         this.props.form.resetFields();
                         this.state.targetKeys = [];
                         this.state.selectedKeys = [];
@@ -282,7 +282,7 @@ const TechProductDesc = React.createClass({
             visible: false,
             resetForm: true
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -310,7 +310,7 @@ const TechProductDesc = React.createClass({
                             uid={this.props.uid}
                             resetForm={this.state.resetForm}
                             mockData={this.props.mockData}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -501,9 +501,11 @@ const TechProduct = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 4 - 2
js/component/manageCenter/servicesManage/patent/applyFee.jsx

@@ -184,9 +184,11 @@ const applyFee = React.createClass({
             });
         };
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     searchAuthorizedDate(data, dataString) {
         this.state.searchData = dataString;

+ 1 - 1
js/component/manageCenter/servicesManage/patent/applyFeeDesc.jsx

@@ -48,7 +48,7 @@ const PatentDesc = React.createClass({
                 visible: false,
             });
         }.bind(this));
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleConfirm() {
         this.state.paymentState = 1;

+ 3 - 3
js/component/manageCenter/servicesManage/patent/clientInputPatent.jsx

@@ -83,7 +83,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     }
                 }.bind(this)).always(function () {
                     this.props.spinState(false);
-                    this.props.closeModal();
+                    this.props.clickOk();
                     this.props.form.resetFields();
                 }.bind(this));
             }
@@ -225,7 +225,7 @@ const PatentAdd = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({
@@ -248,7 +248,7 @@ const PatentAdd = React.createClass({
                         width='720px'
                         footer=''
                     >
-                        <PatentAddFrom spinState={this.spinChange} closeModal={this.handleCancel} />
+                        <PatentAddFrom spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>

+ 2 - 2
js/component/manageCenter/servicesManage/patent/comPatentAdd.jsx

@@ -119,7 +119,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     }
                 }.bind(this)).always(function () {
                     this.props.spinState(false);
-                    this.props.closeModal();
+                    this.props.clickOk();
                     this.props.form.resetFields();
                 }.bind(this));
             }
@@ -278,7 +278,7 @@ const PatentAdd = React.createClass({
                         width='800px'
                         footer=''
                     >
-                        <PatentAddFrom spinState={this.spinChange} closeModal={this.handleCancel} />
+                        <PatentAddFrom spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>

+ 1 - 1
js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx

@@ -164,7 +164,7 @@ const PatentDesc = React.createClass({
             this.setState({
                 visible: false,
             });
-            this.props.closeDesc(false);
+            this.props.closeDesc(false,true);
         }.bind(this));
     },
     checkPatentProcess() {

+ 4 - 2
js/component/manageCenter/servicesManage/patent/comprehensive.jsx

@@ -263,9 +263,11 @@ const Patent = React.createClass({
             showDesc: true
         });
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 4 - 2
js/component/manageCenter/servicesManage/patent/correction.jsx

@@ -147,9 +147,11 @@ const Correction = React.createClass({
             showDesc: true
         });
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     render() {
         const { MonthPicker, RangePicker } = DatePicker;

+ 1 - 1
js/component/manageCenter/servicesManage/patent/correctionDesc.jsx

@@ -43,7 +43,7 @@ const CorrectionDesc = React.createClass({
                 visible: false,
             });
         }.bind(this));
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({

+ 4 - 2
js/component/manageCenter/servicesManage/patent/express.jsx

@@ -168,9 +168,11 @@ const Express = React.createClass({
             showDesc: true
         });
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     render() {
         return (

+ 1 - 1
js/component/manageCenter/servicesManage/patent/expressDesc.jsx

@@ -57,7 +57,7 @@ const ExpressDesc = React.createClass({
                 visible: false,
             });
         }.bind(this));
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({

+ 4 - 2
js/component/manageCenter/servicesManage/patent/payment.jsx

@@ -150,9 +150,11 @@ const Payment = React.createClass({
             });
         };
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();

+ 1 - 1
js/component/manageCenter/servicesManage/patent/paymentDesc.jsx

@@ -42,7 +42,7 @@ const PatentDesc = React.createClass({
                 visible: false,
             });
         }.bind(this));
-        this.props.closeDesc(false);
+        this.props.closeDesc(false,true);
     },
     handleCancel(e) {
         this.setState({

+ 17 - 11
js/component/manageCenter/userManage/orgCertify.jsx

@@ -30,10 +30,12 @@ const OrgCertify = Form.create()(React.createClass({
                 uid: this.props.uid
             },
             success: function (data) {
-                if (data.error.length || !data.data) {
-                    message.warning(data.error[0].message);
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
                     return;
-                }
+                };
                 addressInit('licenceProvince', 'licenceCity', 'licenceArea',
                     data.data.licenceProvince, data.data.licenceCity, data.data.licenceArea);
                 addressInit('locationProvince', 'locationCity', 'locationArea',
@@ -127,11 +129,14 @@ const OrgCertify = Form.create()(React.createClass({
                     this.setState({
                         visible: false,
                     });
-                    this.props.closeDesc(false);
+                    this.props.handleOk();
                 }.bind(this));
             }
         });
     },
+    handleCancel() {
+        this.props.closeDesc(false);
+    },
     componentWillMount() {
         let _me = this;
         eduLevelList.map(function (item, i) {
@@ -160,7 +165,7 @@ const OrgCertify = Form.create()(React.createClass({
         const { getFieldDecorator } = this.props.form;
         const FormItem = Form.Item
         const formItemLayout = {
-            labelCol: { span: 4 },
+            labelCol: { span: 6 },
             wrapperCol: { span: 12 },
         };
         return (
@@ -259,7 +264,7 @@ const OrgCertify = Form.create()(React.createClass({
                         )}
                 </FormItem>
                 <FormItem
-                    labelCol={{ span: 4 }}
+                    labelCol={{ span: 6 }}
                     wrapperCol={{ span: 18 }}
                     label="营业执照所在地"
                 >
@@ -272,7 +277,7 @@ const OrgCertify = Form.create()(React.createClass({
                     )}
                 </FormItem>
                 <FormItem
-                    labelCol={{ span: 4 }}
+                    labelCol={{ span: 6 }}
                     wrapperCol={{ span: 18 }}
                     label="营业执照图片"
                 >
@@ -296,7 +301,7 @@ const OrgCertify = Form.create()(React.createClass({
                         )}
                 </FormItem>
                 <FormItem
-                    labelCol={{ span: 4 }}
+                    labelCol={{ span: 6 }}
                     wrapperCol={{ span: 18 }}
                     label="组织机构代码证图片"
                 >
@@ -310,7 +315,7 @@ const OrgCertify = Form.create()(React.createClass({
                     </div>
                 </FormItem>
                 <FormItem
-                    labelCol={{ span: 4 }}
+                    labelCol={{ span: 6 }}
                     wrapperCol={{ span: 18 }}
                     label="上年度纳税报表"
                 >
@@ -354,7 +359,7 @@ const OrgCertify = Form.create()(React.createClass({
                         )}
                 </FormItem>
                 <FormItem
-                    labelCol={{ span: 4 }}
+                    labelCol={{ span: 6 }}
                     wrapperCol={{ span: 18 }}
                     label="开户行所在地"
                 >
@@ -411,10 +416,11 @@ const OrgCertify = Form.create()(React.createClass({
                 </FormItem>
                 <FormItem wrapperCol={{ span: 12, offset: 4 }}>
                     <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
+                    <Button className="set-submit" type="ghost" onClick={this.handleCancel} >取消</Button>
                 </FormItem>
             </Form >
         );
-    },
+    }
 }));
 
 export default OrgCertify;

+ 10 - 3
js/component/manageCenter/userManage/orgDesc.jsx

@@ -21,6 +21,12 @@ const OrgDesc = React.createClass({
         });
         this.props.closeDesc(false);
     },
+    handleOk(e) {
+        this.setState({
+            visible: false,
+        });
+        this.props.closeDesc(false,true);
+    },
     componentWillReceiveProps(nextProps) {
         this.state.visible = nextProps.showDesc;
     },
@@ -31,13 +37,14 @@ const OrgDesc = React.createClass({
                     <Spin spinning={this.state.loading} className='spin-box'>
                         <Modal title="用户详情" visible={this.state.visible}
                             onCancel={this.handleCancel}
-                            width='800px'
-                            footer={[]}
+                            width='600px'
+                            footer=''
                             className="admin-desc-content">
                             <OrgCertify
                                 visible={this.state.visible}
                                 uid={this.props.data.id}
-                                closeDesc={this.handleCancel} />
+                                closeDesc={this.handleCancel}
+                                handleOk={this.handleOk} />
                         </Modal>
                     </Spin>
                 </div>

+ 78 - 3
js/component/manageCenter/userManage/orgList.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker } from 'antd';
+import { Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -7,6 +7,78 @@ import './userList.less';
 import OrgDesc from './orgDesc.jsx';
 import { auditStatusList } from '../../dataDic.js';
 
+const OrgAdd = React.createClass({
+    getInitialState() {
+        return {
+            visible: false,
+            loading: false
+        };
+    },
+    showModal() {
+        this.setState({
+            visible: true,
+        });
+    },
+    handleCancel(e) {
+        this.setState({
+            visible: false,
+        });
+    },
+    handleOk() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/addNewUser",
+            data: {
+                mobile: this.state.mobile,
+                unitName: this.state.unitName,
+                type: 1
+            }
+        }).done(function (data) {
+            this.setState({
+                loading: false
+            });
+            if (!data.error.length) {
+                message.success('新增成功!');
+                this.setState({
+                    visible: false,
+                });
+                this.props.closeDesc(false,true);
+            } else {
+                message.warning(data.error[0].message);
+            };
+        }.bind(this));
+    },
+    render() {
+        return (
+            <div className="patent-desc" style={{ float: 'right', marginRight: '20px' }}>
+                <Button type="primary" onClick={this.showModal}>添加用户</Button>
+                <Modal title="新增团体用户" visible={this.state.visible}
+                    onCancel={this.handleCancel}
+                    width='350px'
+                    footer={[
+                        <Button key="submit" type="primary" loading={this.state.loading} onClick={this.handleOk}>提交</Button>,
+                        <Button key="back" onClick={this.handleCancel}>返回</Button>
+                    ]}
+                    className="admin-desc-content">
+                    <div className='orgAdd-input'>
+                        <span>用户手机号码:</span>
+                        <Input onChange={(e) => { this.state.mobile = e.target.value }} />
+                    </div>
+                    <div className='orgAdd-input'>
+                        <span>公司名称:</span>
+                        <Input onChange={(e) => { this.state.unitName = e.target.value }} />
+                    </div>
+                </Modal>
+            </div>
+        );
+    }
+});
+
 const OrgList = React.createClass({
     loadData(pageNo) {
         this.state.data = [];
@@ -143,9 +215,11 @@ const OrgList = React.createClass({
             showDesc: true
         });
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();
@@ -173,6 +247,7 @@ const OrgList = React.createClass({
             <div className="user-content" >
                 <div className="content-title">
                     <span>组织用户管理</span>
+                    <OrgAdd />
                 </div>
                 <div className="user-search">
                     <Input placeholder="阿凡提号" value={this.state.searchAftId}

+ 26 - 12
js/component/manageCenter/userManage/userDesc.jsx

@@ -28,10 +28,12 @@ const UserForm = Form.create()(React.createClass({
                 uid: this.props.uid
             },
             success: function (data) {
-                if (data.error.length || !data.data) {
-                    message.warning(data.error[0].message);
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
                     return;
-                }
+                };
                 let d = new Date()
                 if (data.data.dateOfBirthMonth && data.data.dateOfBirthYear) {
                     d.setMonth(data.data.dateOfBirthMonth - 1);
@@ -111,7 +113,7 @@ const UserForm = Form.create()(React.createClass({
                     this.setState({
                         visible: false,
                     });
-                    this.props.closeDesc(false);
+                    this.props.handleOk();
                 }.bind(this));
             }
         });
@@ -120,15 +122,17 @@ const UserForm = Form.create()(React.createClass({
         addressInit('cmbProvince', 'cmbCity', 'cmbArea');
         this.loadData();
     },
-    componentWillReceiveProps() {
-        this.loadData();
+    componentWillReceiveProps(nextProps) {
+        if (!this.props.visible && nextProps.visible) {
+            this.loadData();
+        };
     },
     render() {
         const { getFieldDecorator } = this.props.form;
         const { MonthPicker } = DatePicker;
         const FormItem = Form.Item
         const formItemLayout = {
-            labelCol: { span: 4 },
+            labelCol: { span: 6 },
             wrapperCol: { span: 12 },
         };
         return (
@@ -177,7 +181,7 @@ const UserForm = Form.create()(React.createClass({
                         )}
                 </FormItem>
                 <FormItem
-                    labelCol={{ span: 4 }}
+                    labelCol={{ span: 6 }}
                     wrapperCol={{ span: 18 }}
                     label="身份证图片"
                 >
@@ -217,7 +221,7 @@ const UserForm = Form.create()(React.createClass({
                         )}
                 </FormItem>
                 <FormItem
-                    labelCol={{ span: 4 }}
+                    labelCol={{ span: 6 }}
                     wrapperCol={{ span: 18 }}
                     label="所在地"
                 >
@@ -322,6 +326,12 @@ const PatentDesc = React.createClass({
         });
         this.props.closeDesc(false);
     },
+    handleOk(e) {
+        this.setState({
+            visible: false,
+        });
+        this.props.closeDesc(false, true);
+    },
     componentWillReceiveProps(nextProps) {
         this.state.visible = nextProps.showDesc;
     },
@@ -332,10 +342,14 @@ const PatentDesc = React.createClass({
                     <Spin spinning={this.state.loading} className='spin-box'>
                         <Modal title="用户详情" visible={this.state.visible}
                             onOk={this.checkPatentProcess} onCancel={this.handleCancel}
-                            width='800px'
-                            footer={[]}
+                            width='600px'
+                            footer=''
                             className="admin-desc-content">
-                            <UserForm uid={this.props.data.id} closeDesc={this.handleCancel} />
+                            <UserForm
+                                uid={this.props.data.id}
+                                closeDesc={this.handleCancel}
+                                visible={this.state.visible}
+                                handleOk={this.handleOk} />
                         </Modal>
                     </Spin>
                 </div>

+ 75 - 5
js/component/manageCenter/userManage/userList.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker } from 'antd';
+import { Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -7,6 +7,73 @@ import './userList.less';
 import UserDesc from './userDesc.jsx';
 import { auditStatusList } from '../../dataDic.js';
 
+const OrgAdd = React.createClass({
+    getInitialState() {
+        return {
+            visible: false,
+            loading: false
+        };
+    },
+    showModal() {
+        this.setState({
+            visible: true,
+        });
+    },
+    handleCancel(e) {
+        this.setState({
+            visible: false,
+        });
+    },
+    handleOk() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/addNewUser",
+            data: {
+                mobile: this.state.mobile,
+                type: 0
+            }
+        }).done(function (data) {
+            this.setState({
+                loading: false
+            });
+            if (!data.error.length) {
+                message.success('新增成功!');
+                this.setState({
+                    visible: false,
+                });
+                this.props.closeDesc(false, true);
+            } else {
+                message.warning(data.error[0].message);
+            };
+        }.bind(this));
+    },
+    render() {
+        return (
+            <div className="patent-desc" style={{ float: 'right', marginRight: '20px' }}>
+                <Button type="primary" onClick={this.showModal}>添加用户</Button>
+                <Modal title="新增个人用户" visible={this.state.visible}
+                    onCancel={this.handleCancel}
+                    width='350px'
+                    footer={[
+                        <Button key="submit" type="primary" loading={this.state.loading} onClick={this.handleOk}>提交</Button>,
+                        <Button key="back" onClick={this.handleCancel}>返回</Button>
+                    ]}
+                    className="admin-desc-content">
+                    <div className='orgAdd-input'>
+                        <span>用户手机号码:</span>
+                        <Input onChange={(e) => { this.state.mobile = e.target.value }} />
+                    </div>
+                </Modal>
+            </div>
+        );
+    }
+});
+
 const UserList = React.createClass({
     loadData(pageNo) {
         this.state.data = [];
@@ -43,9 +110,9 @@ const UserList = React.createClass({
                         createTime: thisdata.createTime,
                         aftUsername: thisdata.aftUsername,
                         number: thisdata.number,
-                        auditStatus:thisdata.auditStatus,
+                        auditStatus: thisdata.auditStatus,
                         createTimeFormattedDate: thisdata.createTimeFormattedDate,
-                        adminName:thisdata.adminName
+                        adminName: thisdata.adminName
                     });
                 };
                 this.state.pagination.current = data.data.pageNo;
@@ -138,9 +205,11 @@ const UserList = React.createClass({
             showDesc: true
         });
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        };
     },
     search() {
         this.loadData();
@@ -168,6 +237,7 @@ const UserList = React.createClass({
             <div className="user-content" >
                 <div className="content-title">
                     <span>个人用户管理</span>
+                    <OrgAdd closeDesc={this.closeDesc} />
                 </div>
                 <div className="user-search">
                     <Input placeholder="阿凡提号" value={this.state.searchAftId}

+ 9 - 3
js/component/manageCenter/userManage/userList.less

@@ -23,6 +23,15 @@
         }
     }
 }
+.ant-modal-body {
+    .orgAdd-input {
+        margin-bottom: 20px;
+        >span {
+            display: inline-block;
+            width: 100px;
+        }
+    }
+}
 
 .admin-desc-content {
     #address,
@@ -35,7 +44,4 @@
             border-color: #d9d9d9;
         }
     }
-    .ant-input {
-        width: 200px;
-    }
 }

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "main": "index.js",
   "scripts": {