dev01 3 years ago
parent
commit
a4a7544fd2
37 changed files with 158 additions and 144 deletions
  1. 2 2
      js/component/manageCenter/customer/NEW/crm/crm.jsx
  2. 2 2
      js/component/manageCenter/customer/NEW/crm/patentPayment.jsx
  3. 2 2
      js/component/manageCenter/customer/NEW/intentionCustomer/channel.jsx
  4. 2 2
      js/component/manageCenter/customer/NEW/intentionCustomer/channelStatistics.jsx
  5. 2 2
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx
  6. 2 2
      js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx
  7. 2 2
      js/component/manageCenter/customer/NEW/query/queryCutomer.jsx
  8. 2 2
      js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx
  9. 2 2
      js/component/manageCenter/customer/customerData/companyCustomer.jsx
  10. 2 2
      js/component/manageCenter/customer/individualCustomer/publicQuery.jsx
  11. 2 2
      js/component/manageCenter/customer/managementFollow/followUpSummary/index.jsx
  12. 2 2
      js/component/manageCenter/index/contacts/index.jsx
  13. 2 2
      js/component/manageCenter/index/content.jsx
  14. 2 2
      js/component/manageCenter/order/orderNew/chargeback.jsx
  15. 4 2
      js/component/manageCenter/order/orderNew/contractCwzj.js
  16. 4 2
      js/component/manageCenter/order/orderNew/contractJsjl.js
  17. 4 2
      js/component/manageCenter/order/orderNew/contractJsy.js
  18. 4 2
      js/component/manageCenter/order/orderNew/contractJszj.js
  19. 4 2
      js/component/manageCenter/order/orderNew/contractYxgly.js
  20. 4 2
      js/component/manageCenter/order/orderNew/contractYxy.js
  21. 2 2
      js/component/manageCenter/order/orderNew/costAuditList/index.js
  22. 2 2
      js/component/manageCenter/order/orderNew/examine.jsx
  23. 3 3
      js/component/manageCenter/order/orderNew/pressList.jsx
  24. 2 2
      js/component/manageCenter/order/orderNew/reject.jsx
  25. 2 2
      js/component/manageCenter/order/pressMoney/index.jsx
  26. 2 2
      js/component/manageCenter/project/patent/list.jsx
  27. 2 2
      js/component/manageCenter/project/project/projectAssignment.jsx
  28. 2 2
      js/component/manageCenter/project/project/projectQuery.jsx
  29. 2 2
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  30. 2 2
      js/component/manageCenter/project/summary/highTech.jsx
  31. 2 2
      js/component/manageCenter/project/summary/projecCount.jsx
  32. 74 72
      js/component/manageCenter/project/task/businessManagement/index.jsx
  33. 2 2
      js/component/manageCenter/project/task/myTaskCount.jsx
  34. 2 2
      js/component/manageCenter/project/task/payApplyReject/index.jsx
  35. 2 2
      js/component/manageCenter/project/task/taskCount.jsx
  36. 2 2
      js/component/manageCenter/project/task/taskQuery.jsx
  37. 1 1
      package.json

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

@@ -1934,8 +1934,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 		return (
 			<div className="user-content">
 				<ShowModalDiv ShowModal={this.state.showModal} />
-				<div className="content-title">
-					<span>客户资料维护</span>
+				<div className="content-title" style={{ marginBottom: 10 }}>
+					<span style={{ fontWeight: 900, fontSize: 16 }}>客户资料维护</span>
 				</div>
 				<div className="user-search">
 					<Tabs

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

@@ -651,8 +651,8 @@ const PatentPayment = Form.create()(React.createClass({
 		return (
 			<div className="user-content">
 				<ShowModalDiv ShowModal={this.state.showModal} />
-				<div className="content-title">
-					<span style={{ fontSize: "16px" }}>客户专利提醒</span>
+				<div className="content-title" style={{ marginBottom: 10 }}>
+					<span style={{ fontWeight: 900, fontSize: 16 }}>客户专利提醒</span>
 					<Tabs
 						defaultActiveKey="1"
 						className="test">

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

@@ -814,8 +814,8 @@ class Channel extends Component{
         return (
             <div className="user-content channel">
                 <ShowModalDiv ShowModal={this.state.showModal} />
-                <div className="content-title">
-                    <span>外联客户</span>
+                <div className="content-title" style={{ marginBottom: 10 }}>
+                    <span style={{ fontWeight: 900, fontSize: 16 }}>外联客户</span>
                 </div>
                 <div className="user-search">
                     <Tabs

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

@@ -235,8 +235,8 @@ class ChannelStatistics extends Component{
         return (
             <div className="user-content">
                 <ShowModalDiv ShowModal={this.state.showModal} />
-                <div className="content-title">
-                    <span>外联客户统计</span>
+                <div className="content-title" style={{ marginBottom: 10 }}>
+                    <span style={{ fontWeight: 900, fontSize: 16 }}>外联客户统计</span>
                 </div>
                 <div className="user-search">
                     <Tabs

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

@@ -857,8 +857,8 @@ const IntentionCustomer = Form.create()(
       return (
         <div className="user-content">
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>{!intentionState ? "私有单位客户" : "私有专家客户"}</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>{!intentionState ? "私有单位客户" : "私有专家客户"}</span>
           </div>
 
           <div className="user-search">

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

@@ -237,8 +237,8 @@ const QueryCustomer = React.createClass({
 		return (
 			<div className="user-content">
 				<ShowModalDiv ShowModal={this.state.showModal} />
-				<div className="content-title">
-					<span>{!intentionState ? "单位公共客户" : "个人公共客户"}</span>
+				<div className="content-title" style={{ marginBottom: 10 }}>
+					<span style={{ fontWeight: 900, fontSize: 16 }}>{!intentionState ? "单位公共客户" : "个人公共客户"}</span>
 				</div>
 				<Tabs defaultActiveKey="1" onChange={this.callback} className="test">
 					<TabPane tab="搜索" key="1">

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

@@ -430,8 +430,8 @@ const QueryCustomer = React.createClass({
     return (
       <div className="user-content">
         <ShowModalDiv ShowModal={this.state.showModal} />
-        <div className="content-title">
-          <span>{!intentionState ? "单位客户查询" : "个人客户查询"}</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>{!intentionState ? "单位客户查询" : "个人客户查询"}</span>
         </div>
         <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
           <TabPane tab="搜索" key="1">

+ 2 - 2
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -570,8 +570,8 @@ const IntentionCustomer = Form.create()(React.createClass({
         ) : (
           ""
         )}
-        <div className="content-title">
-          <span>{!intentionState ? "签单客户" : "签单客户"}</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>{!intentionState ? "签单客户" : "签单客户"}</span>
         </div>
         <Tabs defaultActiveKey="1" className="test">
           <TabPane tab="搜索" key="1">

+ 2 - 2
js/component/manageCenter/customer/customerData/companyCustomer.jsx

@@ -1184,8 +1184,8 @@ const PublicCustomer = Form.create()(React.createClass({
 		const contacts = this.state.contacts || '';
 		return(
 			<div className="user-content" >
-                <div className="content-title">
-                    <span>单位客户查询</span>
+                <div className="content-title" style={{ marginBottom: 10 }}>
+                    <span style={{ fontWeight: 900, fontSize: 16 }}>单位客户查询</span>
                 </div>
                 <div className="user-search">
                     <Input placeholder="客户名称"

+ 2 - 2
js/component/manageCenter/customer/individualCustomer/publicQuery.jsx

@@ -1312,8 +1312,8 @@ const PublicCustomer = Form.create()(React.createClass({
 		const contacts = this.state.contacts || '';
 		return(
 			<div className="user-content" >
-                <div className="content-title">                  
-                    <span>单位客户查询</span>
+                <div className="content-title" style={{ marginBottom: 10 }}>
+                    <span style={{ fontWeight: 900, fontSize: 16 }}>单位客户查询</span>
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="客户名称"

+ 2 - 2
js/component/manageCenter/customer/managementFollow/followUpSummary/index.jsx

@@ -411,8 +411,8 @@ class FollowUpSummary extends Component{
         return (
             <div className="user-content">
                 <ShowModalDiv ShowModal={this.state.showModal} />
-                <div className="content-title">
-                    <span>客户跟进汇总</span>
+                <div className="content-title" style={{ marginBottom: 10 }}>
+                    <span style={{ fontWeight: 900, fontSize: 16 }}>客户跟进汇总</span>
                 </div>
                 <Tabs defaultActiveKey="1" className="test">
                     <TabPane tab="搜索" key="1">

+ 2 - 2
js/component/manageCenter/index/contacts/index.jsx

@@ -217,8 +217,8 @@ const Contact = React.createClass({
         const hasSelected = this.state.selectedRowKeys.length > 0;
         let departmentArr = this.state.departmentArr || [];
         return ( <div className="user-content">
-            <div className="content-title">
-                <span>常用联系人</span>
+            <div className="content-title" style={{ marginBottom: 10 }}>
+                <span style={{ fontWeight: 900, fontSize: 16 }}>常用联系人</span>
                 </div>
                 <div className="user-search">
                     <Input placeholder="联系人姓名"

+ 2 - 2
js/component/manageCenter/index/content.jsx

@@ -520,8 +520,8 @@ const MessageModal = React.createClass({
     render() {
         return (
           <div className="set-content">
-            <div className="set-title">
-              <span>信息中心</span>
+            <div className="set-title" style={{ marginBottom: 10 }}>
+              <span style={{ fontWeight: 900, fontSize: 16 }}>信息中心</span>
             </div>
             <Spin spinning={this.state.loading} className="spin-box">
               <Tabs defaultActiveKey={this.state.unreadDataType} activeKey={this.state.unreadDataType} onChange={v=>{

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

@@ -992,8 +992,8 @@ const IntentionCustomer = Form.create()(
             ""
           )}
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>退单管理</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>退单管理</span>
           </div>
           <div className="user-search">
             <Tabs

+ 4 - 2
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -1138,8 +1138,10 @@ const contractChange = Form.create()(
       return (
         <div className="user-content">
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>合同变更审核订单</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>
+              合同变更审核订单
+            </span>
           </div>
           <div className="user-search">
             <Tabs

+ 4 - 2
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -1139,8 +1139,10 @@ const contractChange = Form.create()(
       return (
         <div className="user-content">
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>合同变更审核订单</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>
+              合同变更审核订单
+            </span>
           </div>
           <div className="user-search">
             <Tabs

+ 4 - 2
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -1083,8 +1083,10 @@ const contractChange = Form.create()(
       return (
         <div className="user-content">
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>合同变更审核订单</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>
+              合同变更审核订单
+            </span>
           </div>
           <div className="user-search">
             <Tabs

+ 4 - 2
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -1133,8 +1133,10 @@ const contractChange = Form.create()(
       return (
         <div className="user-content">
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>合同变更审核订单</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>
+              合同变更审核订单
+            </span>
           </div>
           <div className="user-search">
             <Tabs

+ 4 - 2
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -1142,8 +1142,10 @@ const contractChange = Form.create()(
       return (
         <div className="user-content">
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>合同变更审核订单</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>
+              合同变更审核订单
+            </span>
           </div>
           <div className="user-search">
             <Tabs

+ 4 - 2
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -1149,8 +1149,10 @@ const contractChange = Form.create()(
       return (
         <div className="user-content" style={{ position: "relative" }}>
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>合同变更审核订单</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>
+              合同变更审核订单
+            </span>
           </div>
           <div className="user-search">
             <Tabs defaultActiveKey="1" className="test">

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

@@ -507,8 +507,8 @@ class CostAuditList extends Component{
     render() {
         return (
           <div className="user-content">
-              <div className="content-title">
-                  <span>{this.props.isPatentManager ? '专利成本审核' : '成本付款申请'}</span>
+              <div className="content-title" style={{ marginBottom: 10 }}>
+                  <span style={{ fontWeight: 900, fontSize: 16 }}>{this.props.isPatentManager ? '专利成本审核' : '成本付款申请'}</span>
               </div>
               <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
                   <TabPane tab="搜索" key="1">

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

@@ -1359,8 +1359,8 @@ const IntentionCustomer = Form.create()(
             ""
           )}
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>订单审核</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>订单审核</span>
           </div>
           <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
             <TabPane tab="搜索" key="1">

+ 3 - 3
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -517,9 +517,9 @@ const IntentionCustomer = Form.create()(
       const { TabPane } = Tabs;
       return (
         <div className="user-content">
-          <div className="content-title">
-            <span>催款节点统计</span>
-          </div>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>催款节点统计</span>
+        </div>
           <div className="user-search">
             <Tabs
               defaultActiveKey="1"

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

@@ -1941,8 +1941,8 @@ const IntentionCustomer = Form.create()(
             ""
           )}
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>订单审核</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>订单审核</span>
           </div>
           <div className="user-search">
             <Tabs

+ 2 - 2
js/component/manageCenter/order/pressMoney/index.jsx

@@ -429,8 +429,8 @@ class PressMoney extends Component {
     // console.log(this.props.infor);
     return (
       <div className="user-content signatureStatistics">
-        <div className="content-title">
-          <span>催款记录</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>催款记录</span>
         </div>
         <TabelContent
           ref={(ref) => (this.tabelContentRef = ref)}

+ 2 - 2
js/component/manageCenter/project/patent/list.jsx

@@ -714,8 +714,8 @@ class List extends Component{
         return (
             <div className="user-content patentList">
                 <ShowModalDiv ShowModal={this.state.showModal} />
-                <div className="content-title">
-                    <span>专利列表</span>
+                <div className="content-title" style={{ marginBottom: 10 }}>
+                    <span style={{ fontWeight: 900, fontSize: 16 }}>专利列表</span>
                 </div>
                 <Tabs defaultActiveKey="1" className="test">
                     <TabPane tab="搜索" key="1">

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

@@ -988,8 +988,8 @@ const PaiDan = React.createClass({
           ""
         )}
         <ShowModalDiv ShowModal={this.state.showModal} />
-        <div className="content-title">
-          <span>项目派单管理</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>项目派单管理</span>
         </div>
         <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
           <TabPane tab="搜索" key="1">

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

@@ -713,8 +713,8 @@ const PaiDan = React.createClass({
           ""
         )}
         <ShowModalDiv ShowModal={this.state.showModal} />
-        <div className="content-title">
-          <span>项目派单管理</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>项目派单管理</span>
         </div>
         <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
           <TabPane tab="搜索" key="1">

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

@@ -1080,8 +1080,8 @@ const zxsglyOutSourcingPaiDan = React.createClass({
     return (
       <div className="user-content">
         <ShowModalDiv ShowModal={this.state.showModal} />
-        <div className="content-title">
-          <span>外包项目派单</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>外包项目派单</span>
         </div>
         <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
           <TabPane tab="搜索" key="1">

+ 2 - 2
js/component/manageCenter/project/summary/highTech.jsx

@@ -370,8 +370,8 @@ class HighTech extends Component {
           this.props.introduce()
         ) : (
           <div>
-            <div className="content-title">
-              <span>
+            <div className="content-title" style={{ marginBottom: 10 }}>
+              <span style={{ fontWeight: 900, fontSize: 16 }}>
                 项目汇总表 (
                 {this.state.status === 1
                   ? "高新"

+ 2 - 2
js/component/manageCenter/project/summary/projecCount.jsx

@@ -543,8 +543,8 @@ class ProjecCount extends Component {
     ));
     return (
       <div className="user-content">
-        <div className="content-title">
-          <span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>
             项目统计 (
             {this.state.status === 2
               ? "专利"

+ 74 - 72
js/component/manageCenter/project/task/businessManagement/index.jsx

@@ -1,20 +1,20 @@
-import React,{Component} from "react";
-import {Button, Cascader, Input, message, Select, Spin, Table, Tabs, Tooltip} from "antd";
+import React, { Component } from "react";
+import { Button, Cascader, Input, message, Select, Spin, Table, Tabs, Tooltip } from "antd";
 import $ from "jquery/src/ajax";
-import {ChooseList} from "../../../order/orderNew/chooseList";
-import {projectStatusCascader } from '@/dataDic.js';
+import { ChooseList } from "../../../order/orderNew/chooseList";
+import { projectStatusCascader } from '@/dataDic.js';
 import CheckInfor from './checkInfor';
 import OrderInfor from "./orderInfor";
 
 const TabPane = Tabs.TabPane;
 
-class BusinessManagement extends Component{
+class BusinessManagement extends Component {
     constructor(props) {
         super(props);
-        this.state={
-            changeList:[],
-            pageNo:1,
-            columns:[
+        this.state = {
+            changeList: [],
+            pageNo: 1,
+            columns: [
                 {
                     title: '项目编号',
                     dataIndex: 'id',
@@ -39,10 +39,10 @@ class BusinessManagement extends Component{
                         return (
                             <Tooltip title={text}>
                                 <div style={{
-                                    maxWidth:'100px',
-                                    overflow:'hidden',
+                                    maxWidth: '100px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -72,10 +72,10 @@ class BusinessManagement extends Component{
                         return (
                             <Tooltip title={text}>
                                 <div style={{
-                                    maxWidth:'100px',
-                                    overflow:'hidden',
+                                    maxWidth: '100px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -100,7 +100,7 @@ class BusinessManagement extends Component{
                     title: '操作',
                     dataIndex: 'operation',
                     key: 'operation',
-                    render: (text,record) => {
+                    render: (text, record) => {
                         return (
                             <Button
                                 type="primary"
@@ -108,8 +108,8 @@ class BusinessManagement extends Component{
                                 onClick={(e) => {
                                     e.stopPropagation();
                                     this.setState({
-                                        visible:true,
-                                        infor:record
+                                        visible: true,
+                                        infor: record
                                     })
                                 }}
                             >
@@ -120,18 +120,18 @@ class BusinessManagement extends Component{
                     }
                 },
             ],
-            dataSource:[],
-            infor:{},
+            dataSource: [],
+            infor: {},
 
 
-            nameSearch : '',
-            orderNoSearch : '',
-            contractNoSearch : undefined,
-            taskNoSearch : '',
-            departmenttSearch : undefined,
-            projectStatusSearch : [], //项目状态
-            approvalSearch : undefined,
-            outsourceStatusSearch : [],
+            nameSearch: '',
+            orderNoSearch: '',
+            contractNoSearch: undefined,
+            taskNoSearch: '',
+            departmenttSearch: undefined,
+            projectStatusSearch: [], //项目状态
+            approvalSearch: undefined,
+            outsourceStatusSearch: [],
 
             pagination: {
                 defaultCurrent: 1,
@@ -146,7 +146,7 @@ class BusinessManagement extends Component{
                 },
             },
 
-            departmentArr:[]
+            departmentArr: []
         }
         this.loadData = this.loadData.bind(this);
         this.changeList = this.changeList.bind(this);
@@ -188,7 +188,7 @@ class BusinessManagement extends Component{
             },
             success: function (data) {
                 let theArr = []
-                if(data.error.length === 0){
+                if (data.error.length === 0) {
                     for (let i = 0; i < data.data.list.length; i++) {
                         let thisdata = data.data.list[i];
                         thisdata.key = i;
@@ -203,9 +203,9 @@ class BusinessManagement extends Component{
                     this.setState({
                         dataSource: theArr,
                         pagination: this.state.pagination,
-                        pageNo:data.data.pageNo
+                        pageNo: data.data.pageNo
                     })
-                }else{
+                } else {
                     message.warning(data.error[0].message)
                 }
             }.bind(this),
@@ -218,7 +218,7 @@ class BusinessManagement extends Component{
         );
     }
 
-    changeList(arr){
+    changeList(arr) {
         const newArr = [];
         this.state.columns.forEach(item => {
             arr.forEach(val => {
@@ -273,17 +273,17 @@ class BusinessManagement extends Component{
         )
     }
 
-    reset(){
+    reset() {
         this.setState({
-            nameSearch : '',
-            orderNoSearch : '',
-            contractNoSearch : undefined,
-            taskNoSearch : '',
-            departmenttSearch : undefined,
-            projectStatusSearch : [], //项目状态
-            approvalSearch : undefined,
-            outsourceStatusSearch : [],
-        },()=>{
+            nameSearch: '',
+            orderNoSearch: '',
+            contractNoSearch: undefined,
+            taskNoSearch: '',
+            departmenttSearch: undefined,
+            projectStatusSearch: [], //项目状态
+            approvalSearch: undefined,
+            outsourceStatusSearch: [],
+        }, () => {
             this.loadData();
         })
     }
@@ -291,8 +291,10 @@ class BusinessManagement extends Component{
     render() {
         return (
             <div className="user-content">
-                <div className="content-title">
+                <div className="content-title" style={{ marginBottom: 10 }}>
                     <span style={{ fontWeight: 900, fontSize: 16 }}>核对专利</span>
+                </div>
+                <div className="user-search">
                     <Tabs
                         defaultActiveKey="1"
                         className="test"
@@ -346,7 +348,7 @@ class BusinessManagement extends Component{
                                     style={{ width: 150, marginRight: '10px' }}
                                     options={projectStatusCascader}
                                     value={this.state.projectStatusSearch}
-                                    onChange={(e)=>{
+                                    onChange={(e) => {
                                         this.setState({
                                             projectStatusSearch: e
                                         })
@@ -375,7 +377,7 @@ class BusinessManagement extends Component{
                                     <Select.Option key={2}>外包审核驳回</Select.Option>
                                     <Select.Option key={999}>全部</Select.Option>
                                 </Select>
-                                <Button type="primary" onClick={()=>{
+                                <Button type="primary" onClick={() => {
                                     this.loadData();
                                 }}>
                                     搜索
@@ -401,34 +403,34 @@ class BusinessManagement extends Component{
                             </div>
                         </TabPane>
                     </Tabs>
-                    <div className="patent-table">
-                        <Spin spinning={this.state.loading}>
-                            <Table
-                                size="middle"
-                                columns={
-                                    this.state.changeList.length !== 0
-                                        ? this.state.changeList
-                                        : this.state.columns
-                                }
-                                dataSource={this.state.dataSource}
-                                pagination={this.state.pagination}
-                                onRowClick={(record)=>{
-                                    this.setState({
-                                        orderVisible:true,
-                                        orderNo:record.orderNo
-                                    })
-                                }}
-                            />
-                        </Spin>
-                    </div>
+                </div>
+                <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                        <Table
+                            size="middle"
+                            columns={
+                                this.state.changeList.length !== 0
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
+                            dataSource={this.state.dataSource}
+                            pagination={this.state.pagination}
+                            onRowClick={(record) => {
+                                this.setState({
+                                    orderVisible: true,
+                                    orderNo: record.orderNo
+                                })
+                            }}
+                        />
+                    </Spin>
                 </div>
                 {this.state.visible ? <CheckInfor
                     visible={this.state.visible}
                     infor={this.state.infor}
-                    onCancel={()=>{
+                    onCancel={() => {
                         this.setState({
-                            visible:false,
-                            infor:{}
+                            visible: false,
+                            infor: {}
                         })
                         this.loadData(this.state.pageNo);
                     }}
@@ -436,10 +438,10 @@ class BusinessManagement extends Component{
                 {this.state.orderVisible ? <OrderInfor
                     visible={this.state.orderVisible}
                     orderNo={this.state.orderNo}
-                    onCancel={()=>{
+                    onCancel={() => {
                         this.setState({
-                            orderVisible:false,
-                            orderNo:''
+                            orderVisible: false,
+                            orderNo: ''
                         })
                     }}
                 /> : null}

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

@@ -1073,8 +1073,8 @@ const MyTaskCount = Form.create()(
           ) : (
             ""
           )}
-          <div className="content-title">
-            <span>工时数据统计</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>工时数据统计</span>
           </div>
           <div className="user-search">
             <Tabs

+ 2 - 2
js/component/manageCenter/project/task/payApplyReject/index.jsx

@@ -306,8 +306,8 @@ class PayApplyReject extends Component{
     render() {
         return (
             <div className="user-content">
-                <div className="content-title">
-                    <span>付款驳回列表</span>
+                <div className="content-title" style={{ marginBottom: 10 }}>
+                    <span style={{ fontWeight: 900, fontSize: 16 }}>付款驳回列表</span>
                 </div>
                 <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
                     <TabPane tab="搜索" key="1">

+ 2 - 2
js/component/manageCenter/project/task/taskCount.jsx

@@ -1102,8 +1102,8 @@ const IntentionCustomer = Form.create()(
             ""
           )}
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>工时数据统计</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>工时数据统计</span>
           </div>
           <div className="user-search">
             <Tabs

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

@@ -1061,8 +1061,8 @@ const Task = React.createClass({
     return (
       <div className="user-content">
         <ShowModalDiv ShowModal={this.state.showModal} />
-        <div className="content-title">
-          <span>任务查询</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>任务查询</span>
         </div>
         <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
           <TabPane tab="搜索" key="1">

+ 1 - 1
package.json

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