浏览代码

修改表格为小表格
修复 新增联系人 字段不重置
移除客户后,页面不再重置
增加转交业务操作

mentoswzq 4 年之前
父节点
当前提交
41ac9adc42
共有 100 个文件被更改,包括 335 次插入308 次删除
  1. 1 1
      js/component/account/achievement/techAchievement.jsx
  2. 1 1
      js/component/account/achievement/techAchievementDesc.jsx
  3. 1 1
      js/component/account/demand/techDemand.jsx
  4. 1 1
      js/component/account/demand/techDemandDesc.jsx
  5. 1 1
      js/component/account/index/consultList.jsx
  6. 1 1
      js/component/account/index/serviceList.jsx
  7. 2 2
      js/component/account/index/techList.jsx
  8. 1 1
      js/component/account/services/achievement.jsx
  9. 1 1
      js/component/account/services/activityCostList.jsx
  10. 1 1
      js/component/account/services/annualReport.jsx
  11. 1 1
      js/component/account/services/copyright/comPatentChange.jsx
  12. 1 1
      js/component/account/services/copyright/copyright.jsx
  13. 1 1
      js/component/account/services/finance.jsx
  14. 1 1
      js/component/account/services/orgList.jsx
  15. 1 1
      js/component/account/services/orgTechCenter.jsx
  16. 1 1
      js/component/account/services/ratepay.jsx
  17. 1 1
      js/component/account/set/hrSituation.jsx
  18. 1 0
      js/component/manageCenter/achievement/sichuan/sichuan.jsx
  19. 1 1
      js/component/manageCenter/achievement/techAchievementAudit/techAchievementAudit.jsx
  20. 1 1
      js/component/manageCenter/achievement/techAchievementRelease/auditDesc.jsx
  21. 1 1
      js/component/manageCenter/achievement/techAchievementRelease/techAchievementAudit.jsx
  22. 3 3
      js/component/manageCenter/components/checkProject/index.jsx
  23. 4 1
      js/component/manageCenter/customer/NEW/crm/crm.jsx
  24. 0 47
      js/component/manageCenter/customer/NEW/crm/crmCount.jsx
  25. 1 1
      js/component/manageCenter/customer/NEW/crm/patentPayment.jsx
  26. 1 0
      js/component/manageCenter/customer/NEW/intentionCustomer/followDetail.jsx
  27. 2 1
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx
  28. 3 4
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/contactPerson.jsx
  29. 1 0
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/visit.jsx
  30. 1 1
      js/component/manageCenter/customer/NEW/query/detail.jsx
  31. 1 1
      js/component/manageCenter/customer/NEW/query/queryCutomer.jsx
  32. 1 0
      js/component/manageCenter/customer/NEW/signCustomer/followDetail.jsx
  33. 1 0
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/business.jsx
  34. 2 1
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/businessDetail.jsx
  35. 1 0
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/contactPerson.jsx
  36. 2 1
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visit.jsx
  37. 2 1
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visitDetail.jsx
  38. 1 1
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/intentionDetail.jsx
  39. 35 13
      js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx
  40. 1 1
      js/component/manageCenter/customer/customerMarketing/timeStatistics.jsx
  41. 1 1
      js/component/manageCenter/customer/customerMarketing/timeStatisticsOne.jsx
  42. 3 2
      js/component/manageCenter/customer/individualCustomer/expertQuery.jsx
  43. 13 7
      js/component/manageCenter/customer/individualCustomer/publicQuery.jsx
  44. 1 0
      js/component/manageCenter/customer/statistics/departmentStatistics/index.jsx
  45. 1 1
      js/component/manageCenter/customer/statistics/followStatistics.jsx
  46. 1 1
      js/component/manageCenter/customer/statistics/statusStatistics.jsx
  47. 1 1
      js/component/manageCenter/customer/statistics/visitStatistics.jsx
  48. 2 2
      js/component/manageCenter/demand/demandOrder.jsx
  49. 7 4
      js/component/manageCenter/demand/myTechDemand.jsx
  50. 1 1
      js/component/manageCenter/demand/techDemand.jsx
  51. 1 1
      js/component/manageCenter/demand/techDemandDesc.jsx
  52. 1 1
      js/component/manageCenter/demand/techDemandQueryDesc.jsx
  53. 18 18
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  54. 12 12
      js/component/manageCenter/financialManage/distribute/outSpecial.jsx
  55. 12 15
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  56. 12 3
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  57. 3 3
      js/component/manageCenter/idea/bigShot/lecture.jsx
  58. 3 3
      js/component/manageCenter/idea/bigShot/star.jsx
  59. 1 1
      js/component/manageCenter/idea/news/news.jsx
  60. 1 0
      js/component/manageCenter/idea/policy/inquiry.jsx
  61. 1 1
      js/component/manageCenter/idea/policy/manage.jsx
  62. 1 1
      js/component/manageCenter/idea/policy/techPolicyAudits.jsx
  63. 1 1
      js/component/manageCenter/idea/policy/techPolicyPublishs.jsx
  64. 1 1
      js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx
  65. 2 2
      js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx
  66. 1 1
      js/component/manageCenter/order/orderManagement/publicOrder/publicOrder.jsx
  67. 1 1
      js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx
  68. 2 3
      js/component/manageCenter/order/orderNew/billing.jsx
  69. 1 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  70. 1 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js
  71. 1 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  72. 1 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  73. 1 0
      js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx
  74. 12 16
      js/component/manageCenter/order/orderNew/contractCwjl.js
  75. 19 12
      js/component/manageCenter/order/orderNew/contractYxy.js
  76. 2 2
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js
  77. 60 50
      js/component/manageCenter/order/orderStatistics/orderStatistics.jsx
  78. 2 2
      js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx
  79. 2 2
      js/component/manageCenter/order/settlementOrder/settlementManage/settlementManagement.jsx
  80. 1 0
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  81. 3 2
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  82. 1 1
      js/component/manageCenter/project/project/projectQuery.jsx
  83. 11 11
      js/component/manageCenter/project/task/myTask.jsx
  84. 11 11
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  85. 1 1
      js/component/manageCenter/publicComponent/assign.jsx
  86. 1 1
      js/component/manageCenter/servicesManage/contract/contract.jsx
  87. 1 1
      js/component/manageCenter/servicesManage/contract/contractDetail.jsx
  88. 1 1
      js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx
  89. 1 1
      js/component/manageCenter/servicesManage/copyright/copyright.jsx
  90. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/achievement.jsx
  91. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx
  92. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/ratepay.jsx
  93. 1 1
      js/component/manageCenter/servicesManage/patent/applyFee.jsx
  94. 1 0
      js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx
  95. 1 1
      js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx
  96. 1 1
      js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageNew.jsx
  97. 1 1
      js/component/manageCenter/servicesManage/technology/websiteManage.jsx
  98. 1 1
      js/component/manageCenter/set/business/businessCategory.jsx
  99. 2 0
      js/component/manageCenter/set/business/businessProject.jsx
  100. 0 0
      js/component/manageCenter/set/organization/organization.jsx

+ 1 - 1
js/component/account/achievement/techAchievement.jsx

@@ -277,7 +277,7 @@ const AchievementList = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 1 - 1
js/component/account/achievement/techAchievementDesc.jsx

@@ -1405,7 +1405,7 @@ const AchievementDetail = React.createClass({
                                 })()}
                             </Tabs.TabPane>
                             <Tabs.TabPane tab="匹配列表" key="2">
-                                <Table columns={this.state.columns}
+                                <Table size="middle" columns={this.state.columns}
                                     dataSource={this.state.dataSource}
                                     pagination={false}
                                     onRowClick={this.tableRowClick} />

+ 1 - 1
js/component/account/demand/techDemand.jsx

@@ -316,7 +316,7 @@ const DemandList = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 1 - 1
js/component/account/demand/techDemandDesc.jsx

@@ -1127,7 +1127,7 @@ const DemandDetail = React.createClass({
                                 })()}
                             </Tabs.TabPane>
                             <Tabs.TabPane tab="匹配列表" key="2">
-                                <Table columns={this.state.columns}
+                                <Table size="middle" columns={this.state.columns}
                                     dataSource={this.state.dataSource}
                                     pagination={false}
                                     onRowClick={this.tableRowClick} />

+ 1 - 1
js/component/account/index/consultList.jsx

@@ -246,7 +246,7 @@ const OrderList = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             onRowClick={this.tableRowClick} />

+ 1 - 1
js/component/account/index/serviceList.jsx

@@ -233,7 +233,7 @@ const OrderList = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             onRowClick={this.tableRowClick} />

+ 2 - 2
js/component/account/index/techList.jsx

@@ -291,13 +291,13 @@ const Content = React.createClass({
                 <Spin spinning={this.state.loading} >
                     <Tabs defaultActiveKey="1" onChange={this.tabChange}>
                         <TabPane tab="我的成果订单" key="1">
-                            <Table columns={this.state.achievementColumns}
+                            <Table size="middle" columns={this.state.achievementColumns}
                                 dataSource={this.state.achievementDataSource}
                                 pagination={this.state.achievementPagination}
                                 onRowClick={this.achievementRowClick} />
                         </TabPane>
                         <TabPane tab="我的需求订单" key="2">
-                            <Table columns={this.state.demandColumns}
+                            <Table size="middle" columns={this.state.demandColumns}
                                 dataSource={this.state.demandDataSource}
                                 pagination={this.state.demandPagination}
                                 onRowClick={this.demandRowClick} />

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

@@ -447,7 +447,7 @@ const Achievement = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             rowSelection={rowSelection}

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

@@ -662,7 +662,7 @@ const Activity = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             rowSelection={rowSelection}

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

@@ -767,7 +767,7 @@ const AnnualReport = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             //rowSelection={rowSelection}

+ 1 - 1
js/component/account/services/copyright/comPatentChange.jsx

@@ -381,7 +381,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     <p style={{ margin: '10px 0' }}>{theData.certificateUrl ? <a onClick={copyrightDownloadFile.bind(null, theData.id, 'copyright_auth', '/api/user/copyright/download')}>软著证书</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                 </div>
                 <p>状态流转记录: </p>
-                <Table style={{ margin: '10px 0' }}
+                <Table size="middle" style={{ margin: '10px 0' }}
                     pagination={false}
                     dataSource={this.state.stateTable}
                     columns={this.state.stateColumns} />

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

@@ -279,7 +279,7 @@ const copyright = React.createClass({
                     </div>
                     <div className="foster-table">
                         <Spin spinning={this.state.loading}>
-                            <Table columns={this.state.columns}
+                            <Table size="middle" columns={this.state.columns}
                                 dataSource={this.state.dataSource}
                                 pagination={this.state.pagination}
                                 onRowClick={this.tableRowClick} />

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

@@ -572,7 +572,7 @@ const Finance = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             rowSelection={rowSelection}

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

@@ -275,7 +275,7 @@ const OrgList = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             onRowClick={this.tableRowClick} />

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

@@ -517,7 +517,7 @@ const CenterList = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             rowSelection={rowSelection}

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

@@ -513,7 +513,7 @@ const Ratepay = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             rowSelection={rowSelection}

+ 1 - 1
js/component/account/set/hrSituation.jsx

@@ -785,7 +785,7 @@ const HrSituation = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             rowSelection={rowSelection}

+ 1 - 0
js/component/manageCenter/achievement/sichuan/sichuan.jsx

@@ -420,6 +420,7 @@ class Achievement extends React.Component {
 									? this.state.changeList
 									: this.state.columns
 							}
+							size="small"
 							dataSource={this.state.dataSource}
 							rowSelection={rowSelection}
 							pagination={this.state.pagination}

+ 1 - 1
js/component/manageCenter/achievement/techAchievementAudit/techAchievementAudit.jsx

@@ -456,7 +456,7 @@ const AchievementList = React.createClass({
                 </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={
+                        <Table size="middle" columns={
                             this.state.changeList
                                 ? this.state.changeList
                                 : this.state.columns

+ 1 - 1
js/component/manageCenter/achievement/techAchievementRelease/auditDesc.jsx

@@ -935,7 +935,7 @@ const AchievementDetail = React.createClass({
                                         handleOk={this.handleOk} />
                                 </Tabs.TabPane>
                                 <Tabs.TabPane tab="匹配列表" key="2" disabled={!this.props.data.id}>
-                                    <Table columns={this.state.columns}
+                                    <Table size="middle" columns={this.state.columns}
                                         dataSource={this.state.dataSource}
                                         pagination={false}
                                         onRowClick={this.tableRowClick} />

+ 1 - 1
js/component/manageCenter/achievement/techAchievementRelease/techAchievementAudit.jsx

@@ -419,7 +419,7 @@ const AchievementList = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 3 - 3
js/component/manageCenter/components/checkProject/index.jsx

@@ -1048,7 +1048,7 @@ class CheckProject extends Component {
                             onRowClick={this.tableRowClickOne}
                             scroll={{ x: 'max-content', y: 0 }}
                             bordered
-                            size="small"
+                            size="middle"
                         />
                         <Col span={24} offset={9} style={{ marginTop: '15px' }}/>
                       </Form>
@@ -1074,7 +1074,7 @@ class CheckProject extends Component {
                             onRowClick={this.payNodeTableRowClickOne}
                             scroll={{ x: 'max-content', y: 0 }}
                             bordered
-                            size="small"
+                            size="middle"
                         />
                         <Col span={24} offset={9} style={{ marginTop: '15px' }}/>
                       </Form>
@@ -1184,7 +1184,7 @@ class CheckProject extends Component {
                             }}
                             scroll={{ x: 'max-content', y: 0 }}
                             bordered
-                            size="small"
+                            size="middle"
                         />
                         <Col span={24} offset={9} style={{ marginTop: '15px' }}/>
                       </Form>

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

@@ -1497,7 +1497,7 @@ const IntentionCustomer = Form.create()(React.createClass({
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick}
               bordered
-              size="small"
+				size="middle"
             />
           </Spin>
         </div>
@@ -2091,6 +2091,7 @@ const IntentionCustomer = Form.create()(React.createClass({
               </Button>
               <Spin spinning={this.state.loading}>
                 <Table
+				  size="middle"
                   columns={this.state.columnsDate}
                   dataSource={this.state.dataSourceDate}
                   rowSelection={rowSelection}
@@ -2110,6 +2111,7 @@ const IntentionCustomer = Form.create()(React.createClass({
               </Button>
               <Spin spinning={this.state.loading}>
                 <Table
+				  size="middle"
                   columns={this.state.columnsc}
                   dataSource={this.state.dataSourcec}
                   rowSelection={rowSelection}
@@ -2128,6 +2130,7 @@ const IntentionCustomer = Form.create()(React.createClass({
               </Button>
               <Spin spinning={this.state.loading}>
                 <Table
+				  size="middle"
                   columns={this.state.columnsx}
                   dataSource={this.state.dataSourcex}
                   rowSelection={rowSelection}

+ 0 - 47
js/component/manageCenter/customer/NEW/crm/crmCount.jsx

@@ -98,7 +98,6 @@ const DiurnalStatisticsOne = React.createClass({
 				} 
 				this.loadData(timeTypes,thedata);
 				this.selectSuperId();
-				this.selectSuperIdS();
 			}.bind(this),
 		}).always(function() {
 			this.setState({
@@ -158,52 +157,6 @@ const DiurnalStatisticsOne = React.createClass({
 	            });
 	        }.bind(this));
 	},
-	 //获取上级组织
-    selectSuperIdS() {  
-    	this.state.data = []
-         $.ajax({
-                method: "get",
-                dataType: "json",
-                crossDomain: false,
-                url: globalConfig.context + "/api/admin/organization/selectSuperIdS",
-                data:{
-                  
-                },
-                success: function (data) {                	  
-                		let theArr = [];
-                		let theId=[];//用于保存上级组织的ID和名称
-					    let thedata=data.data;
-					    if (!thedata) {
-		                    if (data.error && data.error.length) {
-		                        message.warning(data.error[0].message);
-		                    };	
-		                    thedata = {}; 
-		              };   
-					    var contactIds=[];
-				        for(var i=0;i<data.data.length;i++){
-		                    let theData = data.data[i];
-		                    theArr.push(
-		                        <Select.Option value={theData.id} key={theData.id}>{theData.name}</Select.Option>
-		                    );
-		                    theId.push(
-		                        [theData.id,theData.name]
-		                    );
-		                };
-		                console.log(theArr);
-						this.setState({	
-							SuperArr:thedata,
-		                    //contactsOption: theArr, 
-		                    theId: theId, 
-		                    orderStatusOptions:data.data,
-	                    });
-	                    
-					}.bind(this),
-				}).always(function () {
-				this.setState({
-	                loading: false
-	            });
-	        }.bind(this));
-	},
 	//判断浏览器类型
 	getExplorer() {
 		var explorer = window.navigator.userAgent;

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

@@ -681,7 +681,7 @@ const PatentPayment = Form.create()(React.createClass({
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
                 onRowClick={this.tableRowClick}
-                size="small"
+				size="middle"
                 bordered
               />
             </Spin>

+ 1 - 0
js/component/manageCenter/customer/NEW/intentionCustomer/followDetail.jsx

@@ -528,6 +528,7 @@ const FollowDetail = React.createClass({
                   <div className="clearfix">
                     <Spin spinning={this.state.loading}>
                       <Table
+						size="middle"
                         rowKey={(record) => record.id}
                         pagination={false}
                         columns={this.state.intentionList}

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

@@ -724,7 +724,7 @@ const IntentionCustomer = Form.create()(
             thedata = {};
           }else {
             message.success("移除成功");
-            this.loadData()
+            this.loadData(this.state.dataSource.length === 1 ? (this.state.ispage === 1?1:this.state.ispage - 1) : this.state.ispage)
           }
 
         }.bind(this),
@@ -984,6 +984,7 @@ const IntentionCustomer = Form.create()(
           <div className="patent-table">
             <Spin spinning={this.state.loading}>
               <Table
+                size="middle"
                 className={'intentionCustomerTable'}
                 columns={
                   this.state.changeList

+ 3 - 4
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/contactPerson.jsx

@@ -459,14 +459,13 @@ const ContactPerson = React.createClass({
           </Spin>
         </div>
         {/* 新增联系人 */}
-        <Modal
+        {this.state.addcontactModul ? <Modal
               footer=''
               width='800px'
               title="新增联系人"
               visible={this.state.addcontactModul}
               onOk={this.contactSave}
-              onCancel={this.addcontactModulcancel}						          							          
-                  >
+              onCancel={this.addcontactModulcancel}>
               <Form layout="horizontal" onSubmit={this.submitcontactman} id="demand-form">
               <Spin spinning={this.state.loading}> 											             						               
                 <Row style={{ paddingLeft:'50px' }}>
@@ -523,7 +522,7 @@ const ContactPerson = React.createClass({
                   </Row>
                 </Spin>
             </Form>   
-			    </Modal>
+			    </Modal> : <div/>}
       </div>
     );
   }

+ 1 - 0
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/visit.jsx

@@ -315,6 +315,7 @@ const Visit = React.createClass({
                   </Button> : <div/>}
 			    <Spin spinning={this.state.loading}>
 				  <Table
+					 size="middle"
 				     style={{marginTop:this.props.isGuidanceLv ? '0px' : '60px'}}
 	            	 pagination={this.state.paginations}
 	            	 columns={this.state.visitsList} 

+ 1 - 1
js/component/manageCenter/customer/NEW/query/detail.jsx

@@ -92,7 +92,7 @@ const Detail = React.createClass({
 				  onCancel={this.visitCancel}							          							          
 			        >		
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}    
                             pagination={false} 
                            />

+ 1 - 1
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -176,7 +176,7 @@ const QueryCustomer = React.createClass({
 				  type="primary"
 				  style={{ marginRight: 10 }}
                 >
-                  {record.signBills === 0 ? '暂未签单' : '查看详情'}
+                  {record.signBills === 0 ? '暂未签单' : '查看签单详情'}
                 </Button>
                 <Button
                   onClick={(e) => {

+ 1 - 0
js/component/manageCenter/customer/NEW/signCustomer/followDetail.jsx

@@ -439,6 +439,7 @@ const FollowDetail = React.createClass({
                   <div className="clearfix">
                     <Spin spinning={this.state.loading}>
                       <Table
+						size="middle"
                         pagination={false}
                         columns={this.state.intentionList}
                         dataSource={this.state.data}

+ 1 - 0
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/business.jsx

@@ -346,6 +346,7 @@ const Business = React.createClass({
       <div className="clearfix">
         <Spin spinning={this.state.loading}>
           <Table
+            size="middle"
             pagination={this.state.paginationt}
             columns={this.state.businessIntentionList}
             dataSource={this.state.dataBusiness}

+ 2 - 1
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/businessDetail.jsx

@@ -312,7 +312,8 @@ const BusinessDetail =React.createClass({
 			                        	<div style={{fontSize:'18px',lineHeight:'24px',marginBottom:'10px'}}>业务跟进</div>
 			                        	<div className="clearfix">
 		                    			    <Spin spinning={this.state.loading}>
-										      <Table 
+										      <Table
+												 size="middle"
 								            	 pagination={this.state.paginationst}
 								            	 columns={this.state.businessFollowList} 
 								            	 dataSource={this.state.visitArrList}

+ 1 - 0
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/contactPerson.jsx

@@ -438,6 +438,7 @@ const ContactPerson = React.createClass({
               onSubmit={this.contactSave}
             >
               <Table
+                size="middle"
                 pagination={false}
                 columns={this.state.ContactsLists}
                 dataSource={this.state.contactList}

+ 2 - 1
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visit.jsx

@@ -224,7 +224,8 @@ const Visit = React.createClass({
                     客户跟进
                   </Button>
 			    <Spin spinning={this.state.loading}>
-				  <Table 
+				  <Table
+					 size="middle"
 				     style={{marginTop:'60px'}}
 	            	 pagination={this.state.paginations}
 	            	 columns={this.state.visitsList} 

+ 2 - 1
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visitDetail.jsx

@@ -312,7 +312,8 @@ const VisitDetail = React.createClass({
 					                 	<div style={{fontSize:'18px',marginLeft:'100px',marginTop:'15px',marginBottom:'10px'}}>业务意向</div>
 					                 	<div className="clearfix" >
 		                    			    <Spin spinning={this.state.loading}>
-										      <Table 
+										      <Table
+												 size="middle"
 										         rowKey={record => record.id}
 								            	 pagination={false}
 								            	 columns={this.state.intentionList} 

+ 1 - 1
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/intentionDetail.jsx

@@ -105,7 +105,7 @@ const IntentionDetail = React.createClass({
 		if(nextProps.modalVisible && nextProps.IntentionData.id) {
 			this.setState({
 				modalVisible:true,
-				callnub:(this.props.detailApi.indexOf('Organization'))>0?"2":'1',
+				callnub:this.props.defaultActiveKey ? String(this.props.defaultActiveKey) : (this.props.detailApi.indexOf('Organization'))>0?"2":'1',
 			})
 		};
 		this.setState({

+ 35 - 13
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -105,6 +105,7 @@ const IntentionCustomer = Form.create()(React.createClass({
       selectedRowKey: [],
       selectedRows: [],
       loading: false,
+	  defaultActiveKey: '',
       modalVisible: false,
       pagination: {
         defaultCurrent: 1,
@@ -278,6 +279,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 		this.state.visitModul=e;
 		this.state.modalVisible=e;
 		this.state.showDesc = e;
+		this.setState({
+			defaultActiveKey:''
+		})
 		if(s) {
 			this.loadData(this.state.ispage);
 		};
@@ -301,7 +305,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		});
 	},
 	//整行点击
-	tableRowClick(record, index) {
+	tableRowClick(record) {
 		this.state.visitModul=false;
 		this.state.RowData = record;
 		this.setState({
@@ -368,7 +372,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 		});
 	},
 	render() {
-		const FormItem = Form.Item;
 		const rowSelection = {
 			selectedRowKeys: this.state.selectedRowKeys,
 			onChange: (selectedRowKeys, selectedRows) => {
@@ -483,17 +486,35 @@ const IntentionCustomer = Form.create()(React.createClass({
               </span> */}
             </div>
           </TabPane>
-			<TabPane tab="更改表格显示数据" key="2">
-				<div style={{ marginLeft: 10 }}>
-					<ChooseList
-						columns={this.state.columns}
-						changeFn={this.changeList}
-						changeList={this.state.changeList}
-						top={55}
-						margin={11}
-					/>
-				</div>
-			</TabPane>
+		  <TabPane tab="更改表格显示数据" key="2">
+			<div style={{ marginLeft: 10 }}>
+				<ChooseList
+					columns={this.state.columns}
+					changeFn={this.changeList}
+					changeList={this.state.changeList}
+					top={55}
+					margin={11}
+				/>
+			</div>
+		</TabPane>
+		  <TabPane tab="操作" key="3">
+			  <div className="user-search">
+				  <Button
+					  disabled={this.state.selectedRows.length === 0}
+					  type="primary"
+					  onClick={()=>{
+						this.setState({
+							defaultActiveKey: '5'
+						},()=>{
+							this.tableRowClick(this.state.selectedRows[0]);
+						})
+					  }}
+					  style={{ marginLeft: 10 }}
+				  >
+					  转交业务
+				  </Button>
+			  </div>
+		  </TabPane>
         </Tabs>
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
@@ -522,6 +543,7 @@ const IntentionCustomer = Form.create()(React.createClass({
           IntentionData={this.state.RowData}
           loadData={this.loadData}
           modalVisible={this.state.modalVisible}
+		  defaultActiveKey={this.state.defaultActiveKey}
           name={this.state.modalName}
           closeDesc={this.closeDesc}
           basicState={this.state.basicState}

+ 1 - 1
js/component/manageCenter/customer/customerMarketing/timeStatistics.jsx

@@ -548,7 +548,7 @@ const DiurnalStatistics = React.createClass({
 					<div className="patent-table" id='daochu'>
 						<div className="scroll">
 		                    <Spin spinning={this.state.loading}>
-		                        <Table columns={
+		                        <Table size="middle" columns={
 									this.state.changeList
 										? this.state.changeList
 										: this.state.columns

+ 1 - 1
js/component/manageCenter/customer/customerMarketing/timeStatisticsOne.jsx

@@ -562,7 +562,7 @@ const DiurnalStatisticsOne = React.createClass({
 					<div className="patent-table">
 						<div className="scroll">
 		                    <Spin spinning={this.state.loading}>
-		                        <Table columns={
+		                        <Table size="middle" columns={
 									this.state.changeList
 										? this.state.changeList
 										: this.state.columns

+ 3 - 2
js/component/manageCenter/customer/individualCustomer/expertQuery.jsx

@@ -1341,7 +1341,7 @@ const QueryCustomer = Form.create()(React.createClass({
                 </div>                                               
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}    
                             rowSelection={rowSelection}
                             pagination={this.state.pagination} 
@@ -1900,7 +1900,8 @@ const QueryCustomer = Form.create()(React.createClass({
 						       <div className="clearfix">
                     			  <Spin spinning={this.state.loading}>
                     			     <Form horizontal id="demand-form"  >
-								      <Table 
+								      <Table
+										 size="middle"
 						            	 pagination={false}
 						            	 columns={this.state.ContactsLists} 
 						            	 dataSource={this.state.contactList}

+ 13 - 7
js/component/manageCenter/customer/individualCustomer/publicQuery.jsx

@@ -1467,7 +1467,7 @@ const PublicCustomer = Form.create()(React.createClass({
                 </div>                                               
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}    
                             rowSelection={rowSelection}
                             pagination={this.state.pagination} 
@@ -1921,7 +1921,8 @@ const PublicCustomer = Form.create()(React.createClass({
 						       <div className="clearfix">
                     			  <Spin spinning={this.state.loading}>
                     			     <Form horizontal id="demand-form"  >
-								      <Table 
+								      <Table
+										 size="middle"
 						            	 pagination={false}
 						            	 columns={this.state.ContactsLists} 
 						            	 dataSource={this.state.contactList}
@@ -2029,7 +2030,8 @@ const PublicCustomer = Form.create()(React.createClass({
 							<TabPane tab="客户拜访" key="4">
 							     <div className="clearfix">
                     			    <Spin spinning={this.state.loading}>
-								      <Table 
+								      <Table
+										 size="middle"
 						            	 pagination={false}
 						            	 columns={this.state.visitsList} 
 						            	 dataSource={this.state.visitArrList}
@@ -2041,7 +2043,8 @@ const PublicCustomer = Form.create()(React.createClass({
 							<TabPane tab="业务意向" key="5">
 							    <div className="clearfix">
                     			    <Spin spinning={this.state.loading}>
-								      <Table 
+								      <Table
+										 size="middle"
 						            	 pagination={this.state.paginationt}
 						            	 columns={this.state.businessIntentionList} 
 						            	 dataSource={this.state.dataBusiness}
@@ -2150,7 +2153,8 @@ const PublicCustomer = Form.create()(React.createClass({
 					                 	<div style={{fontSize:'18px',marginLeft:'100px',marginTop:'15px',marginBottom:'10px'}}>业务意向<Button onClick={this.addNew} style={{marginLeft:'420px',background:'green',color:'#ffffff'}}>添加新业务</Button></div>
 					                 	<div className="clearfix" style={{paddingLeft:'50px',paddingRight:'50px'}}>
 		                    			    <Spin spinning={this.state.loading}>
-										      <Table 
+										      <Table
+												 size="middle"
 										         rowKey={record => record.id}
 								            	 pagination={false}
 								            	 columns={this.state.intentionList} 
@@ -2210,7 +2214,8 @@ const PublicCustomer = Form.create()(React.createClass({
 					                <div className="clearfix">
 					                 	<div className="clearfix" style={{paddingLeft:'50px',paddingRight:'50px'}}>
 		                    			    <Spin spinning={this.state.loading}>
-										      <Table 
+										      <Table
+												 size="middle"
 										         rowKey={record => record.id}
 								            	 pagination={false}
 								            	 columns={this.state.intentionList} 
@@ -2277,7 +2282,8 @@ const PublicCustomer = Form.create()(React.createClass({
 			                        	<div style={{fontSize:'18px',lineHeight:'24px',marginBottom:'10px'}}>业务跟进</div>
 			                        	<div className="clearfix">
 		                    			    <Spin spinning={this.state.loading}>
-										      <Table 
+										      <Table
+												 size="middle"
 								            	 pagination={this.state.paginations}
 								            	 columns={this.state.businessFollowList} 
 								            	 dataSource={this.state.visitArrList}

+ 1 - 0
js/component/manageCenter/customer/statistics/departmentStatistics/index.jsx

@@ -389,6 +389,7 @@ class DepartmentStatistics extends Component{
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                         <Table
+                            size="middle"
                             columns={
                                 this.state.changeList
                                     ? this.state.changeList

+ 1 - 1
js/component/manageCenter/customer/statistics/followStatistics.jsx

@@ -301,7 +301,7 @@ const FollowStatistics = React.createClass({
 							<div className="maintitle">业务跟进进度情况统计表</div>
 							<div className="patent-table">
 			                    <Spin spinning={this.state.loading}>
-			                        <Table columns={
+			                        <Table size="middle" columns={
 										this.state.changeList
 											? this.state.changeList
 											: this.state.columns

+ 1 - 1
js/component/manageCenter/customer/statistics/statusStatistics.jsx

@@ -293,7 +293,7 @@ const StatusStatistics = React.createClass({
 							<div className="maintitle">业务客户状态情况统计表</div>
 							<div className="patent-table">
 			                    <Spin spinning={this.state.loading}>
-			                        <Table columns={
+			                        <Table size="middle" columns={
 										this.state.changeList
 											? this.state.changeList
 											: this.state.columns

+ 1 - 1
js/component/manageCenter/customer/statistics/visitStatistics.jsx

@@ -293,7 +293,7 @@ const VisitStatistics = React.createClass({
 							<div className="maintitle">客户拜访情况统计表</div>
 							<div className="patent-table">
 			                    <Spin spinning={this.state.loading}>
-			                        <Table columns={
+			                        <Table size="middle" columns={
 										this.state.changeList
 											? this.state.changeList
 											: this.state.columns

+ 2 - 2
js/component/manageCenter/demand/demandOrder.jsx

@@ -227,7 +227,7 @@ const DemandDetail = React.createClass({
                                 </Col>
                             </Row>
                             <p>订单状态流转记录</p>
-                            <Table columns={this.state.columns}
+                            <Table size="middle" columns={this.state.columns}
                                 dataSource={this.state.dataSource}
                                 pagination={false} />
                             <Row style={{ marginTop: '20px' }}>
@@ -595,7 +595,7 @@ const DemandOrderList = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             //rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 7 - 4
js/component/manageCenter/demand/myTechDemand.jsx

@@ -1225,7 +1225,7 @@ const DemandList = React.createClass({
                 </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={
+                        <Table size="middle" columns={
                             this.state.changeList
                                 ? this.state.changeList
                                 : this.state.columns
@@ -1255,7 +1255,8 @@ const DemandList = React.createClass({
 			                    <div className="clearfix" >
 	                			  <Spin spinning={this.state.loading}>
 	                			     <Form horizontal id="demand-form" onSubmit={this.contactSave} >
-								      <Table 
+								      <Table
+                                         size="middle"
 						            	 pagination={this.state.matepagination}
 						            	 columns={this.state.mateColumns} 
 						            	 dataSource={this.state.mateDataSource}
@@ -1268,7 +1269,8 @@ const DemandList = React.createClass({
 								<div className="clearfix" id='daochu' style={{'display':'none'}}>
 	                			  <Spin spinning={this.state.loading}>
 	                			     <Form horizontal id="demand-form" onSubmit={this.contactSave} >
-								      <Table 
+								      <Table
+                                         size="middle"
 						            	 pagination={this.state.matepagination}
 						            	 columns={this.state.mateColumnsExport} 
 						            	 dataSource={this.state.mateDataSource}
@@ -1563,7 +1565,8 @@ const DemandList = React.createClass({
 			                <Spin spinning={this.state.loading}>
 			                    <div className="clearfix">
 	                			     <Form horizontal id="demand-form" onSubmit={this.contactSave} >
-								      <Table 
+								      <Table
+                                         size="middle"
 						            	 pagination={this.state.lookpagination}
 						            	 columns={this.state.lookColumns} 
 						            	 dataSource={this.state.lookDataSource}

+ 1 - 1
js/component/manageCenter/demand/techDemand.jsx

@@ -587,7 +587,7 @@ const DemandList = React.createClass({
                 </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={
+                        <Table size="middle" columns={
                             this.state.changeList
                                 ? this.state.changeList
                                 : this.state.columns

+ 1 - 1
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -1589,7 +1589,7 @@ const DemandDetail = React.createClass({
                                     })()}
                                 </Tabs.TabPane>
                                 <Tabs.TabPane tab="匹配列表" key="2" disabled={!this.props.data.id}>
-                                    <Table columns={this.state.columns}
+                                    <Table size="middle" columns={this.state.columns}
                                         dataSource={this.state.dataSource}
                                         pagination={false}
                                         onRowClick={this.tableRowClick} />

+ 1 - 1
js/component/manageCenter/demand/techDemandQueryDesc.jsx

@@ -1579,7 +1579,7 @@ const DemandDetail = React.createClass({
                                     })()}
                                 </Tabs.TabPane>
                                 <Tabs.TabPane tab="匹配列表" key="2" disabled={!this.props.data.id}>
-                                    <Table columns={this.state.columns}
+                                    <Table size="middle" columns={this.state.columns}
                                         dataSource={this.state.dataSource}
                                         pagination={false}
                                         onRowClick={this.tableRowClick} />

+ 18 - 18
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -2723,18 +2723,7 @@ const approvedOutsourcing = React.createClass({
         <div className="content-title" style={{ marginBottom: 10 }}>
           <span style={{ fontWeight: 900, fontSize: 16 }}>外包结算管理</span>
         </div>
-        <Tabs defaultActiveKey="2" onChange={this.callback} className="test">
-          <TabPane tab="更改表格显示数据" key="1">
-            <div style={{ marginLeft: 10 }}>
-              <ChooseList
-                columns={this.state.columns}
-                changeFn={this.changeList}
-                changeList={this.state.changeList}
-                top={55}
-                margin={11}
-              />
-            </div>
-          </TabPane>
+        <Tabs defaultActiveKey="2" className="test">
           <TabPane tab="搜索" key="2">
             <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
@@ -3046,6 +3035,17 @@ const approvedOutsourcing = React.createClass({
               项目进度
             </Button>
           </TabPane>
+          <TabPane tab="更改表格显示数据" key="1">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+              />
+            </div>
+          </TabPane>
           {/* <TabPane tab="批量操作" key="6">
             <Button
               type="primary"
@@ -3076,7 +3076,7 @@ const approvedOutsourcing = React.createClass({
               pagination={this.state.pagination}
               onRowDoubleClick={this.tableRowClick.bind(this)}
               rowSelection={rowSelection}
-              size="small"
+              size="middle"
             />
           </Spin>
           <p
@@ -3485,7 +3485,7 @@ const approvedOutsourcing = React.createClass({
                             columns={this.state.columnsX}
                             dataSource={this.state.dataSourceX}
                             pagination={false}
-                            size="small"
+                            size="middle"
                             bordered
                           />
                         </Spin>
@@ -3511,7 +3511,7 @@ const approvedOutsourcing = React.createClass({
                           <Table
                             pagination={false}
                             bordered
-                            size="small"
+                            size="middle"
                             columns={
                               cuiDataList.length
                                 ? this.state.ContactsLists
@@ -3545,7 +3545,7 @@ const approvedOutsourcing = React.createClass({
                         columns={this.state.columnsW}
                         dataSource={this.state.dataSourceW}
                         pagination={false}
-                        size="small"
+                        size="middle"
                         expandedRowRender={(record) => (
                           <p style={{ margin: 0 }}>{record.remarks}</p>
                         )}
@@ -3798,7 +3798,7 @@ const approvedOutsourcing = React.createClass({
                 onRowClick={this.kaiPiaoData}
                 pagination={false}
                 bordered
-                size="small"
+                size="middle"
               />
               <div className="clearfix" style={{ marginTop: "20px" }}>
                 <FormItem
@@ -3850,7 +3850,7 @@ const approvedOutsourcing = React.createClass({
                 pagination={false}
                 scroll={{ x: "max-content", y: 0 }}
                 bordered
-                size="small"
+                size="middle"
               />
               <div className="clearfix" style={{ marginTop: "20px" }}>
                 <FormItem

+ 12 - 12
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -601,18 +601,7 @@ const outSpecial = React.createClass({
           defaultActiveKey="1"
           onChange={this.callback}
           className="test">
-          <TabPane tab="更改表格显示数据" key="1">
-            <div style={{ marginLeft: 10 }}>
-              <ChooseList
-                  columns={this.state.columns}
-                  changeFn={this.changeList}
-                  changeList={this.state.changeList}
-                  top={55}
-                  margin={11}
-              />
-            </div>
-          </TabPane>
-          <TabPane tab="搜索" key="2">
+          <TabPane tab="搜索" key="1">
         <div className="user-search">
           <Input
             placeholder="营销员名称"
@@ -649,6 +638,17 @@ const outSpecial = React.createClass({
           <Button onClick={this.reset}>重置</Button>
         </div>
           </TabPane>
+          <TabPane tab="更改表格显示数据" key="2">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+              />
+            </div>
+          </TabPane>
         </Tabs>
         <div className="patent-table">
           <Spin spinning={this.state.loading}>

+ 12 - 15
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -1244,9 +1244,6 @@ const ShouKuang = React.createClass({
       changeList: newArr,
     });
   },
-  callback(key) {
-    console.log(key);
-  },
   onSelectChange(selectedRowKeys) {
     // for(var i=0; i<selectedRowKeys.length; i++){
     //   for(var j=i+1; j<selectedRowKeys.length; j++){
@@ -1797,18 +1794,7 @@ const ShouKuang = React.createClass({
           <span style={{ fontWeight: 900, fontSize: 16 }}>收款结算</span>
         </div>
 
-        <Tabs defaultActiveKey="2" onChange={this.callback} className="test">
-          <TabPane tab="更改表格显示数据" key="1">
-            <div style={{ marginLeft: 10 }}>
-              <ChooseList
-                columns={this.state.columns}
-                changeFn={this.changeList}
-                changeList={this.state.changeList}
-                top={55}
-                margin={11}
-              />
-            </div>
-          </TabPane>
+        <Tabs defaultActiveKey="2" className="test">
           <TabPane tab="搜索" key="2">
             <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
@@ -2120,6 +2106,17 @@ const ShouKuang = React.createClass({
               项目进度
             </Button>
           </TabPane>
+          <TabPane tab="更改表格显示数据" key="1">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+              />
+            </div>
+          </TabPane>
           {/* <TabPane tab="批量操作" key="6">
             <Button
               type="primary"

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

@@ -1791,7 +1791,7 @@ const ShouKuang = React.createClass({
     this.setState({
       loading: true,
     });
-    $.ajax({
+    let ajaxObj = $.ajax({
       method: "post",
       dataType: "json",
       crossDomain: false,
@@ -1819,9 +1819,13 @@ const ShouKuang = React.createClass({
       function () {
         this.setState({
           loading: false,
+          financeApprovalAjaxObj: null
         });
       }.bind(this)
     );
+    this.setState({
+      financeApprovalAjaxObj: ajaxObj
+    })
   },
   tableRowClickPro(record) {
     this.setState({
@@ -2763,12 +2767,17 @@ const ShouKuang = React.createClass({
           />
         </Modal>
         <Spin spinning={this.state.loading}>
-          <Modal
+          {this.state.checkVisible ? <Modal
             title="审核订单"
             visible={this.state.checkVisible}
             onOk={this.checkOk}
+            confirmLoading={this.state.loading}
             okText={"通过"}
             onCancel={() => {
+              this.state.financeApprovalAjaxObj ? this.state.financeApprovalAjaxObj.abort() : null;
+              this.setState({
+                financeApprovalAjaxObj: null
+              })
               this.loadData();
               this.setState({
                 checkVisible: false,
@@ -2785,7 +2794,7 @@ const ShouKuang = React.createClass({
               }}
               placeholder="请填写审核内容"
             />
-          </Modal>
+          </Modal> : <div/>}
         </Spin>
         <KaiPiaoModal
           visible={this.state.avisible}

+ 3 - 3
js/component/manageCenter/idea/bigShot/lecture.jsx

@@ -436,7 +436,7 @@ const Lecture = React.createClass({
                         <Button onClick={this.resetList}>重置</Button>
                     </div>
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.lectureColumns}
+                        <Table size="middle" columns={this.state.lectureColumns}
                             dataSource={this.state.lectureTableData}
                             rowSelection={rowSelection}
                             onRowClick={this.listTableRowClick}
@@ -450,7 +450,7 @@ const Lecture = React.createClass({
                             <Button type="primary" onClick={() => { this.cleanCache('big_shot_lecture_cache_key'); }}>清除缓存</Button>
                         </div>
                         <Spin spinning={this.state.loading}>
-                            <Table columns={this.state.lectureColumns}
+                            <Table size="middle" columns={this.state.lectureColumns}
                                 dataSource={this.state.hotTableData}
                                 onRowClick={this.listTableRowClick}
                                 pagination={false} />
@@ -462,7 +462,7 @@ const Lecture = React.createClass({
                             <Button type="primary" onClick={() => { this.cleanCache('lecture_dynamic_list_cache_key'); }}>清除缓存</Button>
                         </div>
                         <Spin spinning={this.state.loading}>
-                            <Table columns={this.state.lectureColumns}
+                            <Table size="middle" columns={this.state.lectureColumns}
                                 dataSource={this.state.dynamicTableData}
                                 onRowClick={this.listTableRowClick}
                                 pagination={false} />

+ 3 - 3
js/component/manageCenter/idea/bigShot/star.jsx

@@ -430,7 +430,7 @@ const Star = React.createClass({
                         <Button type="primary" onClick={() => { this.cleanCache(); }}>清除缓存</Button>
                     </div>
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination} />
                     </Spin>
@@ -444,7 +444,7 @@ const Star = React.createClass({
                             </Button>
                         </div>
                         <Spin spinning={this.state.loading}>
-                            <Table columns={this.state.otherColumns}
+                            <Table size="middle" columns={this.state.otherColumns}
                                 dataSource={this.state.hotTableData}
                                 rowSelection={hotRowSelection}
                                 pagination={false} />
@@ -458,7 +458,7 @@ const Star = React.createClass({
                             </Button>
                         </div>
                         <Spin spinning={this.state.loading}>
-                            <Table columns={this.state.otherColumns}
+                            <Table size="middle" columns={this.state.otherColumns}
                                 dataSource={this.state.starTableData}
                                 rowSelection={starRowSelection}
                                 pagination={false} />

+ 1 - 1
js/component/manageCenter/idea/news/news.jsx

@@ -401,7 +401,7 @@ const News = React.createClass({
                         {this.props.newsType == 2 || this.props.newsType == 3 ? <Button type="primary" onClick={() => { this.cleanCache('news_index_list_cache_key'); }}>清除首页缓存</Button> : <div></div>}
                     </div>
                     <Spin spinning={this.state.loading}>
-                        <Table className="no-all-select" columns={this.state.columns}
+                        <Table size="middle" className="no-all-select" columns={this.state.columns}
                             dataSource={this.state.tableData}
                             pagination={this.state.pagination}
                             rowSelection={rowSelection}

+ 1 - 0
js/component/manageCenter/idea/policy/inquiry.jsx

@@ -539,6 +539,7 @@ const Inquiry=React.createClass({
             </div>
             <Spin spinning={this.state.loading}>
               <Table
+                size="middle"
                 className="no-all-select"
                 columns={this.state.columns}
                 dataSource={this.state.tableData}

+ 1 - 1
js/component/manageCenter/idea/policy/manage.jsx

@@ -528,7 +528,7 @@ const Manage=React.createClass({
 				    </Tabs>
 				</div>
 				<Spin spinning={this.state.loading}>
-                    <Table className="no-all-select" columns={this.state.columns}
+                    <Table size="middle" className="no-all-select" columns={this.state.columns}
                         dataSource={this.state.tableData}
                         pagination={this.state.pagination}
                         rowSelection={rowSelection}

+ 1 - 1
js/component/manageCenter/idea/policy/techPolicyAudits.jsx

@@ -531,7 +531,7 @@ const Inquiry=React.createClass({
 				    </Tabs>
 				</div>
 				<Spin spinning={this.state.loading}>
-                    <Table className="no-all-select" columns={this.state.columns}
+                    <Table size="middle" className="no-all-select" columns={this.state.columns}
                         dataSource={this.state.tableData}
                         pagination={this.state.pagination}
                         rowSelection={rowSelection}

+ 1 - 1
js/component/manageCenter/idea/policy/techPolicyPublishs.jsx

@@ -536,7 +536,7 @@ const Inquiry=React.createClass({
 				    </Tabs>
 				</div>
 				<Spin spinning={this.state.loading}>
-                    <Table className="no-all-select" columns={this.state.columns}
+                    <Table size="middle" className="no-all-select" columns={this.state.columns}
                         dataSource={this.state.tableData}
                         pagination={this.state.pagination}
                         rowSelection={rowSelection}

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

@@ -1125,7 +1125,7 @@ const NewService = Form.create()(React.createClass({
 								                </div>
 								                <div className="patent-table">
 								                    <Spin spinning={this.state.loading}>
-								                        <Table columns={this.state.columns}
+								                        <Table size="middle" columns={this.state.columns}
 								                            dataSource={this.state.dataSource}
 								                            pagination={this.state.pagination}
 								                            onRowClick={this.tableRowClick} 

+ 2 - 2
js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx

@@ -492,7 +492,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 					                </div>
 					                <div className="patent-table">
 					                    <Spin spinning={this.state.loading}>
-					                        <Table columns={this.state.columns}
+					                        <Table size="middle" columns={this.state.columns}
 					                            dataSource={this.state.dataSource}
 					                            pagination={false}
 					                            onRowClick={this.tableRowClick} 
@@ -563,7 +563,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			            <Form layout="horizontal" id="demand-form">
 			                <Spin spinning={this.state.loading}>
 		                        <div className="clearfix">
-                        	   			<Table columns={this.state.flowList}
+                        	   			<Table size="middle" columns={this.state.flowList}
 					                           dataSource={this.state.lookflowList}
 					                           pagination={false}
 			                             />

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

@@ -521,7 +521,7 @@ const PublicOrder=Form.create()(React.createClass({
 			                	</div>
 			                	 <div className="patent-table" style={{marginTop:'10px'}}>
 				                    <Spin spinning={this.state.loading}>
-				                        <Table columns={this.state.userList}
+				                        <Table size="middle" columns={this.state.userList}
 				                            dataSource={this.state.distributionList}
 				                            pagination={false}
 				                             />

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

@@ -439,7 +439,7 @@ const ApproveDetaile = Form.create()(React.createClass({
 					                </div>
 					                <div className="patent-table">
 					                    <Spin spinning={this.state.loading}>
-					                        <Table columns={this.state.columns}
+					                        <Table size="middle" columns={this.state.columns}
 					                            dataSource={this.state.dataSource}
 					                            pagination={false}
 					                            onRowClick={this.tableRowClick} 

+ 2 - 3
js/component/manageCenter/order/orderNew/billing.jsx

@@ -1481,8 +1481,7 @@ const MyService = Form.create()(
       });
     },
     onSelectChange(selectedRowKeys) {
-      this.setState({ selectedRowKeys });
-      console.log(selectedRowKeys);
+      this.setState({ selectedRowKeys:selectedRowKeys.slice(-1) });
     },
     // inRecordData() {
     //   this.setState({
@@ -1688,7 +1687,7 @@ const MyService = Form.create()(
         selectedRowKeys,
         onChange: this.onSelectChange,
         hideDefaultSelections: true,
-        type: "radio"
+        // type: "radio"
       };
       return (
         <div className="user-content">

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

@@ -738,6 +738,7 @@ class ChangeDetail extends Component {
               ""
             )} */}
             <Table
+              size="middle"
               pagination={false}
               bordered
               columns={this.state.ContactsLists}

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

@@ -622,6 +622,7 @@ class ChangeDetail extends Component {
             </h3>
 
             <Table
+              size="middle"
               pagination={false}
               bordered
               columns={this.state.ContactsLists}

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

@@ -631,6 +631,7 @@ class ChangeDetail extends Component {
             </h3>
 
             <Table
+              size="middle"
               pagination={false}
               bordered
               columns={this.state.ContactsLists}

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

@@ -605,6 +605,7 @@ class ChangeDetail extends Component {
             </h3>
 
             <Table
+              size="middle"
               pagination={false}
               bordered
               columns={this.state.ContactsLists}

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

@@ -430,6 +430,7 @@ const ProAndCuiList = React.createClass({
         ];
         return (
           <Table
+            size="middle"
             columns={columns}
             dataSource={data}
             pagination={false}

+ 12 - 16
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -1281,22 +1281,7 @@ const contractChange = Form.create()(
               changeList={this.state.changeList}
               top={55}
             /> */}
-            <Tabs
-              defaultActiveKey="2"
-              onChange={this.callbackTab}
-              className="test"
-            >
-              <TabPane tab="更改表格显示数据" key="1">
-                <div style={{ marginLeft: 10 }}>
-                  <ChooseList
-                    columns={this.state.columns}
-                    changeFn={this.changeList}
-                    changeList={this.state.changeList}
-                    top={55}
-                    margin={11}
-                  />
-                </div>
-              </TabPane>
+            <Tabs defaultActiveKey="2" className="test">
               <TabPane tab="搜索" key="2">
                 <div style={{ marginLeft: 10 }}>
                   <SearchInput search={this.search} />
@@ -1321,6 +1306,17 @@ const contractChange = Form.create()(
                   导出当前列表
                 </Button>
               </TabPane>
+              <TabPane tab="更改表格显示数据" key="1">
+                <div style={{ marginLeft: 10 }}>
+                  <ChooseList
+                      columns={this.state.columns}
+                      changeFn={this.changeList}
+                      changeList={this.state.changeList}
+                      top={55}
+                      margin={11}
+                  />
+                </div>
+              </TabPane>
               {/* <TabPane tab="批量操作" key="6">
             <Button
               type="primary"

+ 19 - 12
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -1137,24 +1137,31 @@ const contractChange = Form.create()(
             <span>合同变更审核订单</span>
           </div>
           <div className="user-search">
-            <SearchInput search={this.search} isYxy={true} />
-
-            <ChooseList
-              columns={this.state.columns}
-              changeFn={this.changeList}
-              changeList={this.state.changeList}
-              top={65}
-            />
-
+            <Tabs defaultActiveKey="1" className="test">
+              <TabPane tab="搜索" key="1">
+                <SearchInput search={this.search} isYxy={true} />
+              </TabPane>
+              <TabPane tab="更改表格显示数据" key="2">
+                <div style={{ marginLeft: 10 }}>
+                  <ChooseList
+                      columns={this.state.columns}
+                      changeFn={this.changeList}
+                      changeList={this.state.changeList}
+                      top={55}
+                      margin={11}
+                  />
+                </div>
+              </TabPane>
+            </Tabs>
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
                   size="small"
                   bordered
                   columns={
-                    this.state.changeList == undefined
-                      ? this.state.columns
-                      : this.state.changeList
+                    this.state.changeList
+                        ? this.state.changeList
+                        : this.state.columns
                   }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}

+ 2 - 2
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -961,7 +961,7 @@ class projectOverview extends Component{
                                     pagination={this.state.paginations}
                                     onRowClick={this.tableRowClickX}
                                     bordered
-                                    size="small"
+                                    size="middle"
                                 />
                             </Spin>
                         </div>
@@ -982,7 +982,7 @@ class projectOverview extends Component{
                                 dataSource={this.state.dataSourceA}
                                 pagination={false}
                                 bordered
-                                size="small"
+                                size="middle"
                             />
                         </Spin>
                     </div>

+ 60 - 50
js/component/manageCenter/order/orderStatistics/orderStatistics.jsx

@@ -758,56 +758,66 @@ const DiurnalStatistics = React.createClass({
 			<div className='set-content'>
 				<p style={{fontSize:'20px',marginBottom:'10px'}}>订单统计报表</p>
 				<div className="clearfix">
-					<Button type="primary" onClick={this.tabExel} style={{ float:'right' }}>导出到表格</Button>
-					<span style={{fontSize:'16px'}}>部门机构 : </span>
-					<Select placeholder="选择部门"
-                            style={{ width:'200px',marginRight:'10px' }}
-                            value={this.state.superId}
-                            onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
-                            {this.state.contactsOption}
-		          	</Select>
-		          	
-                  		<Select placeholder="任务状态"
-                            style={{ width: 150 ,marginRight:'10px'}}
-                            value={this.state.taskStatus}
-                            onChange={(e) => { this.setState({ taskStatus: e }) }}>
-                            {
-                                taskStatus.map(function (item) {
-                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                })
-                            }
-                        </Select>
-                        <Select placeholder="公示状态"
-                            style={{ width: 150 ,marginRight:'10px'}}
-                            value={this.state.publishStatus}
-                            onChange={(e) => { this.setState({ publishStatus: e }) }}>
-                            {
-                                publishStatus.map(function (item) {
-                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                })
-                            }
-                        </Select>
-                        <Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
-	                	<Button onClick={this.reset}>重置</Button>
-                        <div className="clearfix" style={{marginTop:"10px"}}>
-                        	<Button onClick={this.week} style={{marginRight:'5px'}} type={this.state.weekColor?"primary":''}>本周</Button>
-				          	<Button onClick={this.month} style={{marginRight:'5px'}} type={this.state.monthColor?"primary":''}>本月</Button>
-				          	<Button onClick={this.quarter} style={{marginRight:'5px'}} type={this.state.quarterColor?"primary":''}>本季</Button>
-				          	<Button onClick={this.year} style={{marginRight:'5px'}} type={this.state.yearColor?"primary":''}>本年</Button>
-				          	<span className="titleTime" style={{marginRight:'5px',marginTop:"0px"}}>起止时间:</span>
-								<RangePicker style={{marginRight:'5px',marginTop:"0px"}}
-		                            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 }); }} />
-							<ChooseList
-								columns={this.state.columns}
-								changeFn={this.changeList}
-								changeList={this.state.changeList}
-								top={55}
-								margin={11}
-							/>
-                        </div>
-                  	
+					<Tabs defaultActiveKey="1" className="test">
+						<TabPane tab="搜索" key="1">
+							<div className="user-search" style={{padding:'11px'}}>
+								<Button type="primary" onClick={this.tabExel} style={{ float:'right' }}>导出到表格</Button>
+								<span style={{fontSize:'16px'}}>部门机构 : </span>
+								<Select placeholder="选择部门"
+										style={{ width:'200px',marginRight:'10px' }}
+										value={this.state.superId}
+										onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
+									{this.state.contactsOption}
+								</Select>
+								<Select placeholder="任务状态"
+										style={{ width: 150 ,marginRight:'10px'}}
+										value={this.state.taskStatus}
+										onChange={(e) => { this.setState({ taskStatus: e }) }}>
+									{
+										taskStatus.map(function (item) {
+											return <Select.Option key={item.value} >{item.key}</Select.Option>
+										})
+									}
+								</Select>
+								<Select placeholder="公示状态"
+										style={{ width: 150 ,marginRight:'10px'}}
+										value={this.state.publishStatus}
+										onChange={(e) => { this.setState({ publishStatus: e }) }}>
+									{
+										publishStatus.map(function (item) {
+											return <Select.Option key={item.value} >{item.key}</Select.Option>
+										})
+									}
+								</Select>
+								<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+								<Button onClick={this.reset}>重置</Button>
+								<div className="clearfix" style={{marginTop:"10px"}}>
+									<Button onClick={this.week} style={{marginRight:'5px'}} type={this.state.weekColor?"primary":''}>本周</Button>
+									<Button onClick={this.month} style={{marginRight:'5px'}} type={this.state.monthColor?"primary":''}>本月</Button>
+									<Button onClick={this.quarter} style={{marginRight:'5px'}} type={this.state.quarterColor?"primary":''}>本季</Button>
+									<Button onClick={this.year} style={{marginRight:'5px'}} type={this.state.yearColor?"primary":''}>本年</Button>
+									<span className="titleTime" style={{marginRight:'5px',marginTop:"0px"}}>起止时间:</span>
+									<RangePicker
+										style={{marginRight:'5px',marginTop:"0px"}}
+										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 }); }}
+									/>
+								</div>
+							</div>
+						</TabPane>
+						<TabPane tab="更改表格显示数据" key="2">
+							<div style={{ marginLeft: 10 }}>
+								<ChooseList
+									columns={this.state.columns}
+									changeFn={this.changeList}
+									changeList={this.state.changeList}
+									top={55}
+									margin={11}
+								/>
+							</div>
+						</TabPane>
+					</Tabs>
 				</div>
 				<div id='daochu'>
 					{/* <div className="surfaceTitle">

+ 2 - 2
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx

@@ -439,7 +439,7 @@ const ManagementDetaile = Form.create()(React.createClass({
 					                </div>
 					                <div className="patent-table">
 					                    <Spin spinning={this.state.loading}>
-					                        <Table columns={this.state.columns}
+					                        <Table size="middle" columns={this.state.columns}
 					                            dataSource={this.state.dataSource}
 					                            pagination={false}
 					                            onRowClick={this.tableRowClick} 
@@ -510,7 +510,7 @@ const ManagementDetaile = Form.create()(React.createClass({
 			            <Form layout="horizontal" id="demand-form">
 			                <Spin spinning={this.state.loading}>
 		                        <div className="clearfix">
-                        	   			<Table columns={this.state.flowList}
+                        	   			<Table size="middle" columns={this.state.flowList}
 					                           dataSource={this.state.lookflowList}
 					                           pagination={false}
 			                             />

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

@@ -501,7 +501,7 @@ const SettlementManage = Form.create()(React.createClass({
 	                </div>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table size="middle" columns={this.state.columns}
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}
@@ -542,7 +542,7 @@ const SettlementManage = Form.create()(React.createClass({
 			                	</div>
 			                	 <div className="patent-table" style={{marginTop:'10px'}}>
 				                    <Spin spinning={this.state.loading}>
-				                        <Table columns={this.state.userList}
+				                        <Table size="middle" columns={this.state.userList}
 				                            dataSource={this.state.distributionList}
 				                            pagination={false}
 				                             />

+ 1 - 0
js/component/manageCenter/personnel/personnel/personnelAll.jsx

@@ -733,6 +733,7 @@ const PersonnelAll = React.createClass({
         ];
         return (
           <Table
+            size="middle"
             columns={columns}
             dataSource={data}
             pagination={false}

+ 3 - 2
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -897,6 +897,7 @@ const OutsourceTaskAssignment = React.createClass({
         ];
         return (
           <Table
+            size="middle"
             columns={columns}
             dataSource={data}
             pagination={false}
@@ -1033,7 +1034,7 @@ const OutsourceTaskAssignment = React.createClass({
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick.bind(this)}
               bordered
-              size="small"
+              size="middle"
             />
           </Spin>
         </div>
@@ -1303,7 +1304,7 @@ const OutsourceTaskAssignment = React.createClass({
                           pagination={this.state.paginations}
                           onRowClick={this.tableRowClickX}
                           bordered
-                          size="small"
+                          size="middle"
                         />
                       </Spin>
                     </div>

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

@@ -825,7 +825,7 @@ const PaiDan = React.createClass({
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick.bind(this)}
               bordered
-              size="small"
+              size="middle"
             />
           </Spin>
         </div>

+ 11 - 11
js/component/manageCenter/project/task/myTask.jsx

@@ -3225,17 +3225,6 @@ const Task = React.createClass({
           <span style={{ fontWeight: 900, fontSize: 16 }}>项目任务</span>
         </div>
         <Tabs defaultActiveKey="2" className="test" bordered>
-          <TabPane tab="更改表格显示数据" key="1">
-            <div style={{ marginLeft: 10 }}>
-              <ChooseList
-                columns={this.state.columns}
-                changeFn={this.changeList}
-                changeList={this.state.changeList}
-                top={55}
-                margin={11}
-              />
-            </div>
-          </TabPane>
           <TabPane tab="搜索" key="2">
             <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
@@ -3351,6 +3340,17 @@ const Task = React.createClass({
               导出Excel
             </Button>
           </TabPane>
+          <TabPane tab="更改表格显示数据" key="1">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+              />
+            </div>
+          </TabPane>
 
           {/* <TabPane tab="批量操作" key="6">
             <Button

+ 11 - 11
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -2013,17 +2013,6 @@ const MyTaskOutsource = React.createClass({
           <span style={{ fontWeight: 900, fontSize: 16 }}>我的外包项目</span>
         </div>
         <Tabs defaultActiveKey="2" onChange={this.callback} className="test">
-          <TabPane tab="更改表格显示数据" key="1">
-            <div style={{ marginLeft: 10 }}>
-              <ChooseList
-                columns={this.state.columns}
-                changeFn={this.changeList}
-                changeList={this.state.changeList}
-                top={55}
-                margin={11}
-              />
-            </div>
-          </TabPane>
           <TabPane tab="搜索" key="2">
             <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
@@ -2121,6 +2110,17 @@ const MyTaskOutsource = React.createClass({
               导出Excel
             </Button>
           </TabPane>
+          <TabPane tab="更改表格显示数据" key="1">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+              />
+            </div>
+          </TabPane>
 
           {/* <TabPane tab="批量操作" key="6">
             <Button

+ 1 - 1
js/component/manageCenter/publicComponent/assign.jsx

@@ -383,7 +383,7 @@ const Assign = React.createClass({
                             </div>
                             <div className="patent-table" style={{ marginTop: '10px' }}>
                                 <Spin spinning={this.state.loading}>
-                                    <Table columns={this.state.userList}
+                                    <Table size="middle" columns={this.state.userList}
                                         dataSource={this.state.distributionList}
                                         pagination={false}
                                         scroll={{ y: 400 }}

+ 1 - 1
js/component/manageCenter/servicesManage/contract/contract.jsx

@@ -570,7 +570,7 @@ const Contract = React.createClass({
                     </div>
                     <div className="foster-table">
                         <Spin spinning={this.state.loading}>
-                            <Table columns={this.state.columns}
+                            <Table size="middle" columns={this.state.columns}
                                 dataSource={this.state.dataSource}
                                 rowSelection={rowSelection}
                                 pagination={this.state.pagination}

+ 1 - 1
js/component/manageCenter/servicesManage/contract/contractDetail.jsx

@@ -591,7 +591,7 @@ const ContractDetailForm = Form.create()(React.createClass({
                     </FormItem>
                 </div>
                 <p style={{ fontSize: '14px', color: '#333' }}>状态流转记录: </p>
-                <Table style={{ margin: '10px 0', background: "#eee" }}
+                <Table size="middle" style={{ margin: '10px 0', background: "#eee" }}
                     pagination={false}
                     dataSource={this.state.stateTable}
                     columns={this.state.stateColumns} />

+ 1 - 1
js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx

@@ -248,7 +248,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     </FormItem>
                 </div>
                 <p>状态流转记录: </p>
-                <Table style={{ margin: '10px 0', background: "#eee" }}
+                <Table size="middle" style={{ margin: '10px 0', background: "#eee" }}
                     pagination={false}
                     dataSource={this.state.stateTable}
                     columns={this.state.stateColumns} />

+ 1 - 1
js/component/manageCenter/servicesManage/copyright/copyright.jsx

@@ -590,7 +590,7 @@ const copyright = React.createClass({
                     </div>
                     <div className="foster-table">
                         <Spin spinning={this.state.loading}>
-                            <Table columns={columns}
+                            <Table size="middle" columns={columns}
                                 rowSelection={rowSelection}
                                 dataSource={this.state.dataSource}
                                 pagination={this.state.pagination}

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

@@ -472,7 +472,7 @@ const Achievement = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             rowSelection={rowSelection}

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

@@ -534,7 +534,7 @@ const CenterList = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             rowSelection={rowSelection}

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

@@ -532,7 +532,7 @@ const Ratepay = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             rowSelection={rowSelection}

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

@@ -220,7 +220,7 @@ const applyFee = React.createClass({
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             onRowClick={this.tableRowClick} />

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

@@ -351,6 +351,7 @@ const PatentDesc = React.createClass({
                             </div>
                             <p>专利状态流转记录:</p>
                             <Table
+
                                 style={{ margin: '10px 0', background: "#eee" }}
                                 pagination={false}
                                 dataSource={this.state.stateTable}

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

@@ -582,7 +582,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                </div>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.props.queryProject?this.state.queryColumns:this.state.columns}
+	                        <Table size="middle" columns={this.props.queryProject?this.state.queryColumns:this.state.columns}
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

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

@@ -583,7 +583,7 @@ const ProjectOrderNew=Form.create()(React.createClass({
 	                </div>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.props.queryProject?this.state.queryColumns:this.state.columns}
+	                        <Table size="middle" columns={this.props.queryProject?this.state.queryColumns:this.state.columns}
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

+ 1 - 1
js/component/manageCenter/servicesManage/technology/websiteManage.jsx

@@ -240,7 +240,7 @@ const Cognizance = React.createClass({
 
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table size="middle" columns={this.state.columns}
                             rowSelection={rowSelection}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}

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

@@ -765,7 +765,7 @@ const BusinessCategory=Form.create()(React.createClass({
                    
                     <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={
+	                        <Table size="middle" columns={
                                 this.state.changeList
                                     ? this.state.changeList
                                     : this.state.columns

+ 2 - 0
js/component/manageCenter/set/business/businessProject.jsx

@@ -1321,6 +1321,7 @@ const BusinessProject=Form.create()(React.createClass({
               <div className="patent-table">
                 <Spin spinning={this.state.loading}>
                   <Table
+                    size="middle"
                     columns={
                       this.state.changeList
                           ? this.state.changeList
@@ -2390,6 +2391,7 @@ const BusinessProject=Form.create()(React.createClass({
                             onSubmit={this.contactSave}
                           >
                             <Table
+                              size="middle"
                               pagination={this.state.formatPagination}
                               columns={this.state.ContactsLists}
                               dataSource={this.state.formatDataSource}

+ 0 - 0
js/component/manageCenter/set/organization/organization.jsx


部分文件因为文件数量过多而无法显示