Browse Source

11-29合并

mentoswzq 5 years ago
parent
commit
315ff06e63
55 changed files with 159 additions and 69 deletions
  1. 1 1
      css/changeDetail.less
  2. 2 2
      js/component/account/content.less
  3. 7 7
      js/component/account/leftTab.less
  4. 10 9
      js/component/account/topTab.less
  5. 1 1
      js/component/manageCenter/achievement/content.jsx
  6. 3 3
      js/component/manageCenter/content.less
  7. 3 1
      js/component/manageCenter/customer/NEW/crm/crm.jsx
  8. 3 1
      js/component/manageCenter/customer/NEW/crm/crmAll.jsx
  9. 3 1
      js/component/manageCenter/customer/NEW/crm/crmCount.jsx
  10. 3 1
      js/component/manageCenter/customer/NEW/crm/patentPayment.jsx
  11. 0 3
      js/component/manageCenter/customer/customerMarketing/timeStatistics.jsx
  12. 2 1
      js/component/manageCenter/customer/report/departmentReport.jsx
  13. 1 0
      js/component/manageCenter/financialManage/bonus/yxBonus.jsx
  14. 15 0
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  15. 2 0
      js/component/manageCenter/financialManage/distribute/tuiDan.jsx
  16. 2 2
      js/component/manageCenter/leftTab.less
  17. 2 0
      js/component/manageCenter/order/bonus/yxBonus.jsx
  18. 4 1
      js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx
  19. 3 1
      js/component/manageCenter/order/flowSettlement/billManage/myBill.jsx
  20. 2 0
      js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx
  21. 3 1
      js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx
  22. 4 1
      js/component/manageCenter/order/orderManagement/publicOrder/publicOrder.jsx
  23. 2 0
      js/component/manageCenter/order/orderNew/approveds.jsx
  24. 4 1
      js/component/manageCenter/order/orderNew/billing.jsx
  25. 2 0
      js/component/manageCenter/order/orderNew/chargeback.jsx
  26. 2 0
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  27. 1 0
      js/component/manageCenter/order/orderNew/contractCwzj.js
  28. 1 0
      js/component/manageCenter/order/orderNew/contractJsjl.js
  29. 1 0
      js/component/manageCenter/order/orderNew/contractJsy.js
  30. 1 0
      js/component/manageCenter/order/orderNew/contractJszj.js
  31. 1 0
      js/component/manageCenter/order/orderNew/contractYxgly.js
  32. 1 0
      js/component/manageCenter/order/orderNew/contractYxy.js
  33. 2 0
      js/component/manageCenter/order/orderNew/examine.jsx
  34. 2 0
      js/component/manageCenter/order/orderNew/inquiry.jsx
  35. 2 0
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  36. 1 0
      js/component/manageCenter/order/orderNew/press.jsx
  37. 1 0
      js/component/manageCenter/order/orderNew/pressList.jsx
  38. 2 0
      js/component/manageCenter/order/orderNew/reject.jsx
  39. 6 5
      js/component/manageCenter/order/orderStatistics/orderStatistics.jsx
  40. 3 0
      js/component/manageCenter/order/orderStatistics/report.less
  41. 1 1
      js/component/manageCenter/order/userMangagement.less
  42. 2 0
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  43. 2 0
      js/component/manageCenter/project/project/projectAssignment.jsx
  44. 2 0
      js/component/manageCenter/project/project/projectQuery.jsx
  45. 2 0
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  46. 1 1
      js/component/manageCenter/project/task/myTask.jsx
  47. 2 0
      js/component/manageCenter/project/task/myTaskCount.jsx
  48. 2 0
      js/component/manageCenter/project/task/taskAssignment.jsx
  49. 9 5
      js/component/manageCenter/project/task/taskCount.jsx
  50. 2 0
      js/component/manageCenter/project/task/taskQuery.jsx
  51. 2 0
      js/component/manageCenter/statistics/order/index.jsx
  52. 15 14
      js/component/manageCenter/topTab.less
  53. 4 1
      js/component/manageCenter/userManage/customerList.jsx
  54. 0 2
      template/template.html
  55. 2 2
      webpack.config.js

+ 1 - 1
css/changeDetail.less

@@ -12,4 +12,4 @@
 .ant-form-item-control p {
     width: 731px !important;
     height: auto !important;
-}
+}

+ 2 - 2
js/component/account/content.less

@@ -5,11 +5,11 @@
     padding-bottom: 40px;
     background: #f0f0f0;
     .content-right {
-        width: 84%;
+        width: 92%;
         height: 100%;
         float: left;
         overflow-y: auto;
-        padding: 20px;
+        padding: 15px;
         .ant-spin-nested-loading {
             height: 100%;
             .ant-spin-container {

+ 7 - 7
js/component/account/leftTab.less

@@ -1,12 +1,12 @@
 .acc-content {
     .account-left {
-        width: 16%;
-        height: 100%;
-        margin-top: 40px;
-        padding-bottom: 50px;
-        float: left;
-        border-right: none;
-        overflow-y: auto;
+            width: 8%;
+            height: 100%;
+            margin-top: 2px;
+            padding-bottom: 50px;
+            float: left;
+            border-right: none;
+            overflow-y: auto;
         //background: #e8f2fc;
         .ant-menu-submenu {
             .ant-menu-submenu-title {

+ 10 - 9
js/component/account/topTab.less

@@ -20,14 +20,15 @@
             }
         }
         .acc-index {
-            height: 90px;
-            width: 16%;
+            height: 50px;
+            width: 8%;
             position: absolute;
             top: 34px;
             left: 0;
             color: #fff;
             background: #4665bf;
-            padding:27px 10px;
+            padding-top: 12px;
+            padding-left: 8px;
             .acc-index-imgbox{
                 width: 36px;
                 height: 36px;
@@ -38,22 +39,22 @@
                 img {
                     position: absolute;
                     top: 0;
-                    left: 0;
-                    height: 36px;
+                    left: 4px;
+                    height: 27px;
                     width: auto;
                 }
             }
             span {
-                margin-left: 10px;
-                font-size: 20px;
-                line-height: 36px;
+                margin-left: 5px;
+                font-size: 14px;
+                line-height: 27px;
                 a {
                     color:#fff;
                 }
             }
         }
         .acc-top-tab {
-            margin-left: 16%;
+            margin-left: 8%;
             height: 50px;
             line-height: 50px;
             font-size: 16px;

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

@@ -153,7 +153,7 @@ class Content extends Component {
             <div className="manage-content">
                 <LeftTab handlekey={this.getKey.bind(this)} />
                 <div className="content-right">
-                    <this.state.component
+                    <this.state.component 
                         data-listApiUrl={this.state.listApiUrl}
                         data-detailApiUrl={this.state.detailApiUrl} />
                 </div>

+ 3 - 3
js/component/manageCenter/content.less

@@ -5,10 +5,10 @@
     padding-bottom: 40px;
     background: #f0f0f0;
     .content-right {
-        width: 86%;
+        width: 92%;
         height: 100%;
-        float:left;
-        overflow-y:auto;
+        float: left;
+        overflow-y: auto;
         padding: 15px;
         .ant-spin-nested-loading {
             height: 100%;

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

@@ -1396,7 +1396,9 @@ const IntentionCustomer = Form.create()(React.createClass({
                             dataSource={this.state.dataSource}    
                             rowSelection={rowSelection}
                             pagination={this.state.pagination} 
-                            onRowClick={this.tableRowClick}
+							onRowClick={this.tableRowClick}
+							bordered
+							size="small"
                            />
                     </Spin>
                 </div> 

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

@@ -972,7 +972,9 @@ const IntentionCustomer = Form.create()(React.createClass({
                             dataSource={this.state.dataSource}    
                             rowSelection={rowSelection}
                             pagination={this.state.pagination} 
-                            onRowClick={this.tableRowClick}
+							onRowClick={this.tableRowClick}
+							bordered
+							size="small"
                            />
                     </Spin>
                 </div> 

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

@@ -592,7 +592,9 @@ const DiurnalStatisticsOne = React.createClass({
 		                        <Table columns={this.state.columns}
 		                            dataSource={this.state.dataSource}
 		                            bordered
-		                            pagination={false}
+									pagination={false}
+									bordered
+									size="small"
 		                            />
 		                    </Spin>
 		                </div>

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

@@ -544,7 +544,9 @@ const PatentPayment = Form.create()(React.createClass({
 			                <Table columns={this.state.columns}
 			                    dataSource={this.state.dataSource}
 			                    pagination={this.state.pagination}
-			                    onRowClick={this.tableRowClick} />
+								onRowClick={this.tableRowClick}
+								size="small"
+								bordered />
 			            </Spin>
 			        </div>
 					<Modal maskClosable={false} visible={this.state.avisible}

+ 0 - 3
js/component/manageCenter/customer/customerMarketing/timeStatistics.jsx

@@ -516,9 +516,6 @@ const DiurnalStatistics = React.createClass({
 	                <Button onClick={this.reset}>重置</Button>
 				</div>
 				<div id='daochu'>
-					<div className="surfaceTitle">
-				   	<span>客户营销统计表(部门)</span>
-					</div>
 					<div className="patent-table" id='daochu'>
 						<div className="scroll">
 		                    <Spin spinning={this.state.loading}>

+ 2 - 1
js/component/manageCenter/customer/report/departmentReport.jsx

@@ -555,7 +555,8 @@ const PersonalReport = React.createClass({
 	                            dataSource={this.state.dataSource}
 	                            scroll={{ x: 3200,y:500}}
 	                            bordered
-	                            pagination={false}
+								pagination={false}
+								size="small"
 	                            />
 	                    </Spin>
 	                </div>

+ 1 - 0
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -490,6 +490,7 @@ const YxBonus = React.createClass({
         <div className="patent-table" id="table">
           <Spin spinning={this.state.loading}>
             <Table
+              size="small"
               bordered
               columns={
                 this.state.changeList == undefined

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

@@ -1173,6 +1173,7 @@ const ShouKuang = React.createClass({
       }.bind(this)
     );
   },
+<<<<<<< HEAD
   exportTime() {
     const data = {
       orderNo: this.state.selectedRowKeys[0],
@@ -1379,6 +1380,17 @@ const ShouKuang = React.createClass({
       }.bind(this)
     );
   },
+=======
+  exportTime () {
+    const data = {
+      orderNo: this.state.selectedRowKeys[0]
+    }
+    window.location.href =
+      globalConfig.context +
+      "/api/admin/orderProject/exportMyTaskList?" +
+      $.param(data);
+  },
+>>>>>>> origin/xqh
   render() {
     const formItemLayout = {
       labelCol: { span: 8 },
@@ -1618,6 +1630,7 @@ const ShouKuang = React.createClass({
             >
               导出所选工时信息
             </Button>
+<<<<<<< HEAD
             <Button
               type="primary"
               disabled={this.state.selectedRowKeys.length != 1}
@@ -1634,6 +1647,8 @@ const ShouKuang = React.createClass({
             >
               导出项目详情
             </Button>
+=======
+>>>>>>> origin/xqh
           </TabPane>
           <TabPane tab="查看" key="5">
             <Button

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

@@ -425,6 +425,8 @@ const TuiDan = React.createClass({
               rowSelection={false}
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick.bind(this)}
+              bordered
+              size="small"
             />
           </Spin>
         </div>

+ 2 - 2
js/component/manageCenter/leftTab.less

@@ -1,8 +1,8 @@
 .manage-content {
     .account-left {
-        width: 14%;
+        width: 8%;
         height: 100%;
-        margin-top: 40px;
+        margin-top: 2px;
         padding-bottom: 50px;
         float: left;
         border-right: none;

+ 2 - 0
js/component/manageCenter/order/bonus/yxBonus.jsx

@@ -379,6 +379,8 @@ const YxBonus = React.createClass({
                   rowSelection={false}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}
+                  bordered
+                  size="small"
                 />
               </Spin>
             </div>

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

@@ -525,7 +525,10 @@ const ServiceManage=Form.create()(React.createClass({
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}
-	                            onRowClick={this.tableRowClick} />
+                                onRowClick={this.tableRowClick}
+                                size="small"
+                                bordered
+                                />
 	                    </Spin>
 	                </div>
 	                <NewService

+ 3 - 1
js/component/manageCenter/order/flowSettlement/billManage/myBill.jsx

@@ -331,7 +331,9 @@ const MyBill=Form.create()(React.createClass({
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}
-	                            onRowClick={this.tableRowClick}
+                                onRowClick={this.tableRowClick}
+                                bordered
+                                size="small"
                             />
 	                    </Spin>
 	                </div>

+ 2 - 0
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx

@@ -603,6 +603,8 @@ const MyService=Form.create()(React.createClass({
                     rowSelection={rowSelection}
                     pagination={this.state.pagination}
                     onRowClick={this.tableRowClick}
+                    bordered
+                    size="small"
                   />
                 </Spin>
               </div>

+ 3 - 1
js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx

@@ -402,7 +402,9 @@ const ApproveOrder=Form.create()(React.createClass({
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}
-	                            onRowClick={this.tableRowClick} />
+                                onRowClick={this.tableRowClick}
+                                bordered
+                                size="small" />
 	                    </Spin>
 	                </div>
 	                <ApproveOrderDetaile

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

@@ -443,7 +443,10 @@ const PublicOrder=Form.create()(React.createClass({
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}
-	                            onRowClick={this.tableRowClick} />
+                                onRowClick={this.tableRowClick}
+                                bordered
+                                size="small"
+                                 />
 	                    </Spin>
 	                </div>
 	                <PublicOrderDetaile

+ 2 - 0
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -798,6 +798,8 @@ const IntentionCustomer = Form.create()(React.createClass({
                 rowSelection={rowSelection}
                 pagination={this.state.pagination}
                 onRowClick={this.tableRowClick}
+                bordered
+                size="small"
               />
             </Spin>
           </div>

+ 4 - 1
js/component/manageCenter/order/orderNew/billing.jsx

@@ -1100,7 +1100,10 @@ const MyService=Form.create()(React.createClass({
 	                            dataSource={this.state.dataSource}
 								scroll={{ x: 1500, y: 0 }}
 	                            pagination={this.state.pagination}
-	                            onRowClick={this.tableRowClick} />
+								onRowClick={this.tableRowClick}
+								bordered
+								size="small"
+								/>
 	                    </Spin>
 	                </div>
 	                <NewService

+ 2 - 0
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -664,6 +664,8 @@ const IntentionCustomer = Form.create()(React.createClass({
                 rowSelection={rowSelection}
                 pagination={this.state.pagination}
                 onRowClick={this.tableRowClick}
+                bordered
+                size="small"
               />
             </Spin>
           </div>

+ 2 - 0
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -820,6 +820,8 @@ const checkOutsourcing = Form.create()(React.createClass({
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
                 onRowClick={this.tableRowClick}
+                bordered
+                size="small"
               />
             </Spin>
           </div>

+ 1 - 0
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -1034,6 +1034,7 @@ const contractChange = Form.create()(
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
+                  size="small"
                   bordered
                   columns={
                     this.state.changeList == undefined

+ 1 - 0
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -1015,6 +1015,7 @@ const contractChange = Form.create()(
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
+                  size="small"
                   bordered
                   columns={this.state.columns}
                   dataSource={this.state.dataSource}

+ 1 - 0
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -955,6 +955,7 @@ const contractChange = Form.create()(
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
+                  size="small"
                   bordered
                   columns={this.state.columns}
                   dataSource={this.state.dataSource}

+ 1 - 0
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -1007,6 +1007,7 @@ const contractChange = Form.create()(
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
+                 size="small"
                   bordered
                   columns={this.state.columns}
                   dataSource={this.state.dataSource}

+ 1 - 0
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -1008,6 +1008,7 @@ const contractChange = Form.create()(
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
+                  size="small"
                   bordered
                   columns={this.state.columns}
                   dataSource={this.state.dataSource}

+ 1 - 0
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -1048,6 +1048,7 @@ const contractChange = Form.create()(
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
+                  size="small"
                   bordered
                   columns={
                     this.state.changeList == undefined

+ 2 - 0
js/component/manageCenter/order/orderNew/examine.jsx

@@ -1035,6 +1035,8 @@ const IntentionCustomer = Form.create()(
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}
+                  bordered
+                  size="small"
                 />
               </Spin>
             </div>

+ 2 - 0
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -664,6 +664,8 @@ const IntentionCustomer = Form.create()(React.createClass({
                 rowSelection={rowSelection}
                 pagination={this.state.pagination}
                 onRowClick={this.tableRowClick}
+                bordered
+                size="small"
               />
             </Spin>
           </div>

+ 2 - 0
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -1019,6 +1019,8 @@ const outsourcingList = Form.create()(
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}
+                  bordered
+                  size="small"
                 />
               </Spin>
             </div>

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

@@ -513,6 +513,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                            pagination={this.state.pagination} 
 								onRowClick={this.tableRowClick}
 								bordered
+								size="small"
 	                           />
 	                    </Spin>
                		 </div> 

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

@@ -517,6 +517,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                            pagination={this.state.pagination} 
 								onRowClick={this.tableRowClick}
 								bordered
+								size="small"
 	                           />
 	                    </Spin>
                		 </div> 

+ 2 - 0
js/component/manageCenter/order/orderNew/reject.jsx

@@ -1145,6 +1145,8 @@ const IntentionCustomer = Form.create()(React.createClass({
                 rowSelection={rowSelection}
                 pagination={this.state.pagination}
                 onRowClick={this.tableRowClick}
+                bordered
+                size="small"
               />
             </Spin>
           </div>

+ 6 - 5
js/component/manageCenter/order/orderStatistics/orderStatistics.jsx

@@ -789,18 +789,19 @@ const DiurnalStatistics = React.createClass({
                   	
 				</div>
 				<div id='daochu'>
-					<div className="surfaceTitle">
+					{/* <div className="surfaceTitle">
 				   	<span style={{marginTop:"10px"}}>订单统计报表</span>
-					</div>
+					</div> */}
 					<div className="patent-table" id='daochu'>
 						<div className="scroll">
 		                    <Spin spinning={this.state.loading}>
-		                        <Table columns={this.state.columns}
+								<Table 
+								    size="small"
+								    columns={this.state.columns}
 		                            dataSource={this.state.dataSource}
-		                            //scroll={{ x: 600,y:500}}
 		                            bordered
 		                            onChange={this.tabChange}
-		                            pagination={false}
+									pagination={false}
 		                            />
 		                    </Spin>
 		                </div>

+ 3 - 0
js/component/manageCenter/order/orderStatistics/report.less

@@ -7,6 +7,9 @@
     .ant-table-thead > tr > th[rowspan],.ant-table-bordered .ant-table-thead > tr > th,.ant-table-bordered .ant-table-thead > tr > th, .ant-table-bordered .ant-table-tbody > tr > td{
         text-align: center;
     }
+    .patent-table{
+        margin-top: 10px;
+    }
     .surfaceTitle{
         font-size: 18px;
         text-align: center;

+ 1 - 1
js/component/manageCenter/order/userMangagement.less

@@ -80,7 +80,7 @@
 .setSave{margin-right: 10px;margin-left: 188px;}
 .toVoid{float: left;margin-right: 10px;}
 .btnSave{text-align: center;margin-top: 10px;overflow: hidden;}
-.ant-calendar-picker{vertical-align: top;margin-top: 11px;}
+.ant-calendar-picker{}
 .ant-calendar-picker-input{height: 27px;}
 /*变更说明*/
 .changeBorder .half-item{

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

@@ -554,6 +554,8 @@ const OutsourceTaskAssignment = React.createClass({
               rowSelection={rowSelection}
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick.bind(this)}
+              bordered
+              size="small"
             />
           </Spin>
         </div>

+ 2 - 0
js/component/manageCenter/project/project/projectAssignment.jsx

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

+ 2 - 0
js/component/manageCenter/project/project/projectQuery.jsx

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

+ 2 - 0
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -1110,6 +1110,8 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick.bind(this)}
+                  bordered
+                  size="small"
                 />
               </Spin>
             </div>

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

@@ -1205,7 +1205,7 @@ const Task = 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">
+        <Tabs defaultActiveKey="2" onChange={this.callback} className="test" bordered>
           <TabPane tab="更改表格显示数据" key="1">
             <div style={{ marginLeft: 10 }}>
               <ChooseList

+ 2 - 0
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -684,6 +684,8 @@ const MyTaskCount = Form.create()(React.createClass({
 	                            dataSource={this.state.dataSource}    
 	                            pagination={this.state.pagination} 
 								onRowClick={this.tableRowClick.bind(this)}
+								bordered
+								size="small"
 	                           />
 	                    </Spin>
                		 </div> 

+ 2 - 0
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -553,6 +553,8 @@ const Task = React.createClass({
               rowSelection={rowSelection}
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick.bind(this)}
+              bordered
+              size="small"
             />
           </Spin>
         </div>

+ 9 - 5
js/component/manageCenter/project/task/taskCount.jsx

@@ -15,7 +15,8 @@ import {
 import ShowModalDiv from "@/showModal.jsx";
 
 
-const IntentionCustomer = Form.create()(React.createClass({
+const IntentionCustomer = Form.create()(
+  React.createClass({
 	loadData(pageNo) {
 		this.setState({
 			visitModul:false,
@@ -424,7 +425,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 	            loading: false
 	        });
 	    }.bind(this));  
-	},
+  },
+  //操作日志
 	caozuorizhi(){
 		this.setState({
 			visibleA:true
@@ -544,14 +546,14 @@ const IntentionCustomer = Form.create()(React.createClass({
     	this.state.orderNo='';
     	this.state.customerName='';
     	this.state.releaseDate[0] = undefined;
-		this.state.releaseDate[1] = undefined;
-        this.loadData(this.state.page);       
+		  this.state.releaseDate[1] = undefined;
+      this.loadData(this.state.page);       
     },
     resets(){
     	this.state.orderNo='';
     	this.state.customerName='';
     	this.state.releaseDate[0] = undefined;
-		this.state.releaseDate[1] = undefined;
+		  this.state.releaseDate[1] = undefined;
     },
 	getOrgCodeUrl(e) {
         this.setState({ orgCodeUrl: e });
@@ -718,6 +720,8 @@ const IntentionCustomer = Form.create()(React.createClass({
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
                 onRowClick={this.tableRowClick.bind(this)}
+                bordered
+                size="small"
               />
             </Spin>
           </div>

+ 2 - 0
js/component/manageCenter/project/task/taskQuery.jsx

@@ -740,6 +740,8 @@ const Task = React.createClass({
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
+                  bordered
+                  size="small"
                   columns={this.state.columns}
                   dataSource={this.state.dataSource}
                   onHeaderRow={column => {

+ 2 - 0
js/component/manageCenter/statistics/order/index.jsx

@@ -351,6 +351,8 @@ const Order = React.createClass({
                         <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
+                            bordered
+                            size="small"
                             />
                     </Spin>
                 </div>

+ 15 - 14
js/component/manageCenter/topTab.less

@@ -42,14 +42,15 @@
             }
         }
         .acc-index {
-            height: 90px;
-            width: 14%;
-            position: absolute;
-            top: 34px;
-            left: 0;
-            color: #fff;
-            background: #4665bf;
-            padding: 27px 10px;
+                height: 50px;
+                width: 8%;
+                position: absolute;
+                top: 34px;
+                left: 0;
+                color: #fff;
+                background: #4665bf;
+                padding-top: 12px;
+                padding-left: 8px;
             .acc-index-imgbox {
                 width: 36px;
                 height: 36px;
@@ -60,22 +61,22 @@
                 img {
                     position: absolute;
                     top: 0;
-                    left: 0;
-                    height: 36px;
+                    left: 4px;
+                    height: 27px;
                     width: auto;
                 }
             }
             span {
-                margin-left: 10px;
-                font-size: 20px;
-                line-height: 36px;
+                margin-left: 5px;
+                font-size: 14px;
+                line-height: 27px;
                 a {
                     color: #fff;
                 }
             }
         }
         .acc-top-tab {
-            margin-left: 14%;
+            margin-left: 8%;
             height: 50px;
             line-height: 50px;
             font-size: 16px;

+ 4 - 1
js/component/manageCenter/userManage/customerList.jsx

@@ -390,7 +390,10 @@ const CustomerList = React.createClass({
                         <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
-                            onRowClick={this.tableRowClick} />
+                            onRowClick={this.tableRowClick} 
+                            size="small"
+                            bordered
+                            />
                     </Spin>
                 </div>
                 <UserDesc data={this.state.RowData} showDesc={this.state.userShowDesc} closeDesc={this.closeDesc} />

+ 0 - 2
template/template.html

@@ -7,8 +7,6 @@
         <%= htmlWebpackPlugin.options.title %>
     </title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap.min.css">
-
-
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap-theme.min.css">
     <script>
         window.userData = {

+ 2 - 2
webpack.config.js

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