Browse Source

项目汇总更新

HW 4 years ago
parent
commit
6e3fbd61b4

+ 81 - 64
js/component/manageCenter/project/summary/highTech.jsx

@@ -93,7 +93,10 @@ class HighTech extends Component{
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/api/admin/statistis/selectTaskList",
-            data: {
+            data: this.props.searchData ? Object.assign({
+                    pageNo: pageNo || 1,
+                    pageSize: this.state.pagination.pageSize || 10,
+                },this.props.searchData) : {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize || 10,
                 startDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[0]: undefined, //开始时间
@@ -276,12 +279,25 @@ class HighTech extends Component{
         this.loadData();
         this.departmentList();
         this.selectSuperId();
+        if(this.props.searchData){
+            let e = this.props.searchData.projectType;
+            this.setState({
+                columns:e === 0 ? currency :
+                    e === 1 ? patent :
+                        e === 2 ? softWriting :
+                            e === 3 ? currency :
+                                e === 4 ? doubleSoft :
+                                    e === 5 ? highTechColumns :
+                                        e === 6 ? currency : currency,
+            })
+        }
     }
 
     render() {
         return (
             <div className="user-content">
-                <div className="content-title">
+                {this.props.introduce ? this.props.introduce() :<div>
+                    <div className="content-title">
                     <span>
                         项目汇总表
                         (
@@ -293,39 +309,39 @@ class HighTech extends Component{
                         }
                         )
                     </span>
-                </div>
-                <Tabs defaultActiveKey="1" className="test">
-                    <TabPane tab="搜索" key="1">
-                        <div className="user-search" style={{
-                            marginTop:'10px',
-                            marginLeft:'10px',
-                            marginRight:'10px'
-                        }}>
-                            <Input
-                                placeholder="订单编号"
-                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
-                                value={this.state.searchOrderNo}
-                                onChange={e => {
-                                    this.setState({ searchOrderNo: e.target.value });
-                                }}
-                            />
-                            <Input
-                                placeholder="合同编号"
-                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
-                                value={this.state.searchContractNo}
-                                onChange={e => {
-                                    this.setState({ searchContractNo: e.target.value });
-                                }}
-                            />
-                            <Input
-                                placeholder="企业名称"
-                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
-                                value={this.state.searchEnterpriseName}
-                                onChange={e => {
-                                    this.setState({ searchEnterpriseName: e.target.value });
-                                }}
-                            />
-                            <span style={{display:"inline-block"}}>
+                    </div>
+                    <Tabs defaultActiveKey="1" className="test">
+                        <TabPane tab="搜索" key="1">
+                            <div className="user-search" style={{
+                                marginTop:'10px',
+                                marginLeft:'10px',
+                                marginRight:'10px'
+                            }}>
+                                <Input
+                                    placeholder="订单编号"
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    value={this.state.searchOrderNo}
+                                    onChange={e => {
+                                        this.setState({ searchOrderNo: e.target.value });
+                                    }}
+                                />
+                                <Input
+                                    placeholder="合同编号"
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    value={this.state.searchContractNo}
+                                    onChange={e => {
+                                        this.setState({ searchContractNo: e.target.value });
+                                    }}
+                                />
+                                <Input
+                                    placeholder="企业名称"
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    value={this.state.searchEnterpriseName}
+                                    onChange={e => {
+                                        this.setState({ searchEnterpriseName: e.target.value });
+                                    }}
+                                />
+                                <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>项目类别 :</span>
                                 <Select
                                     value={this.state.projectStatus || undefined}
@@ -362,7 +378,7 @@ class HighTech extends Component{
                                     {this.state.contactsOption}
                                 </Select>
                             </span>
-                            <span style={{display:"inline-block"}}>
+                                <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>项目分类 :</span>
                                 <Select
                                     value={typeof this.state.projectType === 'number' ? this.state.projectType : undefined}
@@ -377,7 +393,7 @@ class HighTech extends Component{
                                                             e === 3 ? currency :
                                                                 e === 4 ? doubleSoft :
                                                                     e === 5 ? highTechColumns :
-                                                                        e === 6 ? currency : [],
+                                                                        e === 6 ? currency : currency,
                                             changeList: [],
                                             projectType: e,
                                             status: e === 4 ? 2 : e === 2 ? 3 : e === 1 ? 4 : e === 5 ? 1 : 0,
@@ -396,7 +412,7 @@ class HighTech extends Component{
                                     <Option value={6}>商标</Option>
                                 </Select>
                             </span>
-                            <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
+                                <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
                                 <span>订单部门:</span>
                                 <Select
                                     placeholder="请选择部门"
@@ -413,7 +429,7 @@ class HighTech extends Component{
                                     }
                                 </Select>
                             </span>
-                            <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
+                                <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
                                 <span>负责部门:</span>
                                 <Select
                                     placeholder="请选择部门"
@@ -430,7 +446,7 @@ class HighTech extends Component{
                                     }
                                 </Select>
                             </span>
-                            <span style={{display:"inline-block"}}>
+                                <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>申报批次 :</span>
                                 <Select
                                     value={this.state.declarationBatch || undefined}
@@ -448,7 +464,7 @@ class HighTech extends Component{
                                     <Option value={4}>第四批</Option>
                                 </Select>
                             </span>
-                            <span style={{display:"inline-block"}}>
+                                <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>项目金额 :</span>
                                 <Select
                                     value={this.state.projectAmount || undefined}
@@ -471,7 +487,7 @@ class HighTech extends Component{
                                     <Option value={9}>80万上</Option>
                                 </Select>
                             </span>
-                            <span style={{display:"inline-block"}}>
+                                <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>项目情况 :</span>
                                 <Select
                                     value={typeof this.state.projectSituation === 'number' ? this.state.projectSituation : undefined}
@@ -493,7 +509,7 @@ class HighTech extends Component{
                                     <Option value={6}>已完成退单</Option>
                                 </Select>
                             </span>
-                            <span style={{display:"inline-block"}}>
+                                <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>派单时间 :</span>
                                 <RangePicker
                                     style={{marginRight:'10px',marginBottom:'10px'}}
@@ -510,27 +526,28 @@ class HighTech extends Component{
                                     }}
                                 />
                             </span>
-                            <Button type="primary" onClick={()=>{
-                                this.loadData();
-                            }} style={{marginRight:'10px',marginBottom:'10px'}}>搜索</Button>
-                            <Button onClick={this.resetAll} style={{marginRight:'10px',marginBottom:'10px'}}>重置</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>
-                    <TabPane tab="导出EXCEL" key="3">
-                        <Button type="primary" style={{margin: '10px'}} onClick={this.exportPending}>导出</Button>
-                    </TabPane>
-                </Tabs>
+                                <Button type="primary" onClick={()=>{
+                                    this.loadData();
+                                }} style={{marginRight:'10px',marginBottom:'10px'}}>搜索</Button>
+                                <Button onClick={this.resetAll} style={{marginRight:'10px',marginBottom:'10px'}}>重置</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>
+                        <TabPane tab="导出EXCEL" key="3">
+                            <Button type="primary" style={{margin: '10px'}} onClick={this.exportPending}>导出</Button>
+                        </TabPane>
+                    </Tabs>
+                </div>}
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                         <Table

+ 7 - 0
js/component/manageCenter/project/summary/index.less

@@ -0,0 +1,7 @@
+.projectTable{
+  cursor: pointer;
+}
+
+.projectTable:hover{
+  background: #71a7e885 !important;
+}

+ 116 - 13
js/component/manageCenter/project/summary/projecCount.jsx

@@ -1,5 +1,5 @@
 import React,{ Component } from 'react';
-import {AutoComplete, Button, DatePicker, Input, message, Select, Spin, Table, Tabs} from "antd";
+import {AutoComplete, Button, DatePicker, Input, message, Modal, Select, Spin, Table, Tabs} from "antd";
 import {
     ShowModal,
     getNewDiccityArr
@@ -16,6 +16,8 @@ import {
     otherTrademarks,
     currency,
 } from './projecCountConfig';
+import HighTech from './highTech';
+import './index.less';
 
 const {TabPane} = Tabs;
 const { RangePicker } = DatePicker;
@@ -27,7 +29,7 @@ class ProjecCount extends Component{
         this.state={
             loading:false,
             changeList:[],
-            columns: currency,
+            columns: currency((v,screen)=>{this.openProjectSummary(v,screen)}),
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -71,6 +73,7 @@ class ProjecCount extends Component{
         this.supervisorCui = this.supervisorCui.bind(this);
         this.httpChangeCui = this.httpChangeCui.bind(this);
         this.selectAuto = this.selectAuto.bind(this);
+        this.openProjectSummary = this.openProjectSummary.bind(this);
     }
 
     changeList(arr) {
@@ -185,7 +188,7 @@ class ProjecCount extends Component{
             depId: '',
             projectType: '',
             projectStatus: '',
-            columns: currency,
+            columns: currency((v,screen)=>{this.openProjectSummary(v,screen)}),
             commodityName: '',
             kid:'',
             status: 0,
@@ -328,6 +331,16 @@ class ProjecCount extends Component{
         this.selectSuperId();
     }
 
+    openProjectSummary(record,screen){
+        this.setState({
+            projectSummary: true,
+            taberProvince: record.province,
+            taberProjectStatus: record.bpId,//项目类别
+            taberdepId: record.thchDepId,
+            screen: screen,
+        })
+    }
+
     render() {
         const dataSources=this.state.customerArr || [];
         const options = dataSources.map((group,index) =>
@@ -385,9 +398,9 @@ class ProjecCount extends Component{
                                         this.setState({
                                             projectStatus: e,
                                         },()=>{
-                                            if((infor[0].cname === '高新') && typeof this.state.projectType !== 'number'){
+                                            if(infor.length && infor[0].cname === '高新' && typeof this.state.projectType !== 'number'){
                                                 this.setState({
-                                                    columns: highTechColumns,
+                                                    columns: highTechColumns((v,screen)=>{this.openProjectSummary(v,screen)}),
                                                     changeList: [],
                                                     status: 1,
                                                 },()=>{
@@ -395,7 +408,7 @@ class ProjecCount extends Component{
                                                 })
                                             }else if (typeof this.state.projectType !== 'number'){
                                                 this.setState({
-                                                    columns: currency,
+                                                    columns: currency((v,screen)=>{this.openProjectSummary(v,screen)}),
                                                     changeList: [],
                                                     status: 0,
                                                 },()=>{
@@ -419,13 +432,13 @@ class ProjecCount extends Component{
                                     onChange={(e) => {
                                         this.setState({
                                             columns:
-                                                e === 0 ? currency :
-                                                    e === 1 ? invention :
-                                                        e === 2 ? softWriting :
-                                                            e === 3 ? currency :
-                                                                e === 4 ? currency:
-                                                                    e === 5 ? highTechColumns :
-                                                                        e === 6 ? otherTrademarks :[],
+                                                e === 0 ? currency((v,screen)=>{this.openProjectSummary(v,screen)}) :
+                                                    e === 1 ? invention((v,screen)=>{this.openProjectSummary(v,screen)}) :
+                                                        e === 2 ? softWriting((v,screen)=>{this.openProjectSummary(v,screen)}) :
+                                                            e === 3 ? currency((v,screen)=>{this.openProjectSummary(v,screen)}) :
+                                                                e === 4 ? currency((v,screen)=>{this.openProjectSummary(v,screen)}):
+                                                                    e === 5 ? highTechColumns((v,screen)=>{this.openProjectSummary(v,screen)}) :
+                                                                        e === 6 ? otherTrademarks((v,screen)=>{this.openProjectSummary(v,screen)}) :[],
                                             changeList: [],
                                             projectType: e,
                                             status: e === 1 ? 2 : e === 2 ? 4 : e === 5 ? 1 : e === 6 ? 5 : 0, // 0通用 1高新 2发明专利 3实用新型 4软著 5商标
@@ -539,6 +552,96 @@ class ProjecCount extends Component{
                         />
                     </Spin>
                 </div>
+                {this.state.projectSummary ? <Modal
+                    className="customeDetails"
+                    footer=""
+                    title=""
+                    width="1800px"
+                    visible={this.state.projectSummary}
+                    onOk={()=>{
+                        this.setState({
+                            projectSummary: false
+                        })
+                    }}
+                    onCancel={()=>{
+                        this.setState({
+                            projectSummary: false
+                        })
+                    }}
+                >
+                    <HighTech
+                        searchData={{
+                            startDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[0]: undefined, //开始时间
+                            endDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[1]: undefined, //结束时间
+                            projectType: typeof this.state.projectType === 'number' ? this.state.projectType : undefined,//项目分类
+                            projectId: this.state.kid || undefined,
+
+                            province: this.state.taberProvince || undefined,
+                            projectStatus: this.state.taberProjectStatus || undefined,//项目类别
+                            thchDepId: this.state.taberdepId || undefined,
+
+                            status: this.state.projectType === 4 ? 2 :
+                                        this.state.projectType === 2 ? 3 :
+                                            this.state.projectType === 1 ? 4 :
+                                                this.state.projectType === 5 ? 1 :
+                                                    this.state.contactsOptionData.filter((v)=>v.id === this.state.taberProjectStatus).length > 0 ?
+                                                        (this.state.contactsOptionData.filter((v)=>v.id === this.state.taberProjectStatus)[0].cname === '高新' ? 1 : 0) : 0,
+                            screen: this.state.screen,//筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+                        }}
+                        introduce={()=>(
+                            <div className="user-search" style={{
+                                marginTop:'10px',
+                                marginLeft:'10px',
+                                marginRight:'10px'
+                            }}>
+                                {this.state.commodityName ? <span style={{display: "inline-block",marginBottom:'10px'}}>
+                                    <span>项目名称:</span>
+                                    <span  style={{ width: 100,marginLeft:'10px' }}>{this.state.commodityName}</span>
+                                </span> : null}
+                                {this.state.projectStatus ? <span style={{display:"inline-block"}}>
+                                    <span style={{marginRight:'20px',marginBottom:'10px'}}>项目类别 :</span>
+                                    <span style={{ width: 100,marginRight:'20px',marginBottom:'10px' }}>
+                                        {
+                                            this.state.contactsOptionData.filter((v)=>v.id === this.state.projectStatus)[0].cname
+                                        }
+                                    </span>
+                                </span> : null}
+                                {typeof this.state.projectType === 'number'?<span style={{display:"inline-block"}}>
+                                    <span style={{marginRight:'10px',marginBottom:'10px'}}>项目分类 :</span>
+                                    <span style={{ width: 100,marginRight:'20px',marginBottom:'10px' }}>
+                                        {
+                                            this.state.projectType === 0 ? '通用' :
+                                                this.state.projectType === 1 ? '专利' :
+                                                    this.state.projectType === 2 ? '软著' :
+                                                        this.state.projectType === 3 ? '审计' :
+                                                            this.state.projectType === 4 ? '双软':
+                                                                this.state.projectType === 5 ? '高新' :
+                                                                    this.state.projectType === 6 ? '商标' : ''
+                                        }
+                                    </span>
+                                </span> : null}
+                                {this.state.province ? <span style={{display: "inline-block",marginRight:'20px',marginBottom:'10px'}}>
+                                    <span>派单省份:</span>
+                                    <span style={{ width: 100,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}>{getNewDiccityArr(this.state.province)}</span>
+                                </span> : null}
+                                {this.state.depId ? <span style={{display: "inline-block",marginRight:'20px',marginBottom:'10px'}}>
+                                <span>负责部门:</span>
+                                    <span style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}>
+                                        {
+                                            this.state.departmentArr.filter((v)=>v.id === this.state.depId)[0].name
+                                        }
+                                    </span>
+                                </span> : null}
+                                {this.state.releaseDate.length > 0 ? <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>派单时间 :</span>
+                                    <span style={{marginRight:'10px',marginBottom:'10px'}}>
+                                        {this.state.releaseDate[0]+'~'+this.state.releaseDate[1]}
+                                    </span>
+                                </span> : null}
+                            </div>
+                        )}
+                    />
+                </Modal> : null}
             </div>
         )
     }

+ 192 - 10
js/component/manageCenter/project/summary/projecCountConfig.jsx

@@ -1,5 +1,7 @@
+import React from 'react';
+
 //高新
-const highTechColumns = [
+const highTechColumns =(fn)=> [
     {
         title: "序号",
         dataIndex: "key",
@@ -24,31 +26,67 @@ const highTechColumns = [
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,1);
+        }
     },
     {
         title: "库存数(个)",
         dataIndex: "stockCount",
         key: "stockCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,0);
+        }
     },
     {
         title: "完成数",
         dataIndex: "completeCount",
         key: "completeCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,2);
+        }
     },
     {
         title: "立项数",
         dataIndex: "setUpCount",
         key: "setUpCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,3);
+        }
     },
     {
         title: "抽查数",
         dataIndex: "spotCheckCount",
         key: "spotCheckCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,4);
+        }
     },
     {
         title: "未通过数",
         dataIndex: "failedCount",
         key: "failedCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,5);
+        }
     },
     {
         title: "签单额(万元)",
@@ -68,7 +106,7 @@ const highTechColumns = [
 ];
 
 //发明专利
-const invention = [
+const invention =(fn)=> [
     {
         title: "序号",
         dataIndex: "key",
@@ -98,31 +136,67 @@ const invention = [
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,1);
+        }
     },
     {
         title: "库存数(个)",
         dataIndex: "stockCount",
         key: "stockCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,0);
+        }
     },
     {
         title: "受理数(个)",
         dataIndex: "acceptCount",
         key: "acceptCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,6);
+        }
     },
     {
         title: "完结总数",
         dataIndex: "completeCount",
         key: "completeCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,7);
+        }
     },
     {
         title: "授权数",
-        dataIndex: "authorizeCount",
-        key: "authorizeCount",
+        dataIndex: "certificatesCount",
+        key: "certificatesCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,8);
+        }
     },
     {
         title: "驳回数",
         dataIndex: "rejectCount",
         key: "rejectCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,9);
+        }
     },
     {
         title: "签单额(万元)",
@@ -142,7 +216,7 @@ const invention = [
 ];
 
 //实用新型
-const utilityModel = [
+const utilityModel =(fn)=> [
     {
         title: "序号",
         dataIndex: "key",
@@ -167,31 +241,67 @@ const utilityModel = [
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,1);
+        }
     },
     {
         title: "库存数(个)",
         dataIndex: "stockCount",
         key: "stockCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,0);
+        }
     },
     {
         title: "受理数(个)",
         dataIndex: "acceptCount",
         key: "acceptCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,6);
+        }
     },
     {
         title: "完结总数",
         dataIndex: "completeCount",
         key: "completeCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,7);
+        }
     },
     {
         title: "授权数",
-        dataIndex: "authorizeCount",
-        key: "authorizeCount",
+        dataIndex: "certificatesCount",
+        key: "certificatesCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,8);
+        }
     },
     {
         title: "驳回数",
         dataIndex: "rejectCount",
         key: "rejectCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,9);
+        }
     },
     {
         title: "签单额(万元)",
@@ -211,7 +321,7 @@ const utilityModel = [
 ];
 
 //软著
-const softWriting = [
+const softWriting =(fn)=> [
     {
         title: "序号",
         dataIndex: "key",
@@ -236,16 +346,34 @@ const softWriting = [
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,1);
+        }
     },
     {
         title: "库存数(个)",
         dataIndex: "stockCount",
         key: "stockCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,0);
+        }
     },
     {
         title: "下证数(个)",
         dataIndex: "certificatesCount",
         key: "certificatesCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,10);
+        }
     },
     {
         title: "签单额(万元)",
@@ -265,7 +393,7 @@ const softWriting = [
 ];
 
 //商标
-const otherTrademarks = [
+const otherTrademarks =(fn)=> [
     {
         title: "序号",
         dataIndex: "key",
@@ -290,26 +418,56 @@ const otherTrademarks = [
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,1);
+        }
     },
     {
         title: "库存数(个)",
         dataIndex: "stockCount",
         key: "stockCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,0);
+        }
     },
     {
         title: "申请数(个)",
         dataIndex: "applyCount",
         key: "applyCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,11);
+        }
     },
     {
         title: "驳回数(个)",
         dataIndex: "rejectCount",
         key: "rejectCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,9);
+        }
     },
     {
         title: "下证数(个)",
         dataIndex: "certificatesCount",
         key: "certificatesCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,10);
+        }
     },
     {
         title: "签单额(万元)",
@@ -329,7 +487,7 @@ const otherTrademarks = [
 ];
 
 //通用
-const currency = [
+const currency =(fn)=> [
     {
         title: "序号",
         dataIndex: "key",
@@ -354,21 +512,45 @@ const currency = [
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,1);
+        }
     },
     {
         title: "库存数(个)",
         dataIndex: "stockCount",
         key: "stockCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,0);
+        }
     },
     {
         title: "完成数",
         dataIndex: "completeCount",
         key: "completeCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,2);
+        }
     },
     {
         title: "公示/立项数",
         dataIndex: "setUpCount",
         key: "setUpCount",
+        className: 'projectTable',
+        onCellClick :(record, event)=>{
+            event.stopPropagation();
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+            fn(record,3);
+        }
     },
     {
         title: "签单额(万元)",

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

@@ -489,7 +489,7 @@ class ProjectDetails extends Component{
                         setUpTime: thisdata.setUpTime,
                         highTechStatus: thisdata.highTechStatus,
                         acceptCount:thisdata.acceptCount,       //受理数
-                        authorizeCount:thisdata.authorizeCount, //授权数
+                        certificatesCount:thisdata.certificatesCount, //授权数
                         rejectCount:thisdata.rejectCount,       //驳回数
                         commodityQuantity:thisdata.commodityQuantity, //派单项目数
                     });
@@ -1259,7 +1259,7 @@ class ProjectDetails extends Component{
                                                             bpType={this.state.bpType}
                                                             taskId={this.state.id}
                                                             acceptCount={this.state.acceptCount}
-                                                            authorizeCount={this.state.authorizeCount}
+                                                            certificatesCount={this.state.certificatesCount}
                                                             rejectCount={this.state.rejectCount}
                                                             commodityQuantity={this.state.commodityQuantity}
                                                             refresh={()=>{this.xiangqing(this.state.id)}}

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

@@ -1614,7 +1614,7 @@ const Task = React.createClass({
             setUpTime: thisdata.setUpTime,
             highTechStatus: thisdata.highTechStatus,
             acceptCount:thisdata.acceptCount,       //受理数
-            authorizeCount:thisdata.authorizeCount, //授权数
+            certificatesCount:thisdata.certificatesCount, //授权数
             rejectCount:thisdata.rejectCount,       //驳回数
             commodityQuantity:thisdata.commodityQuantity, //派单项目数
           })
@@ -4177,7 +4177,7 @@ const Task = React.createClass({
                                         taskId={this.state.id}
                                         bpType={this.state.bpType}
                                         acceptCount={this.state.acceptCount}
-                                        authorizeCount={this.state.authorizeCount}
+                                        certificatesCount={this.state.certificatesCount}
                                         rejectCount={this.state.rejectCount}
                                         commodityQuantity={this.state.commodityQuantity}
                                         refresh={()=>{this.xiangqing(this.state.id)}}

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

@@ -570,7 +570,7 @@ const MyTaskCount = Form.create()(
               setUpTime: thisdata.setUpTime,
               highTechStatus: thisdata.highTechStatus,
               acceptCount:thisdata.acceptCount,       //受理数
-              authorizeCount:thisdata.authorizeCount, //授权数
+              certificatesCount:thisdata.certificatesCount, //授权数
               rejectCount:thisdata.rejectCount,       //驳回数
               commodityQuantity:thisdata.commodityQuantity, //派单项目数
             });
@@ -1586,7 +1586,7 @@ const MyTaskCount = Form.create()(
                                 bpType={this.state.bpType}
                                 taskId={this.state.id}
                                 acceptCount={this.state.acceptCount}
-                                authorizeCount={this.state.authorizeCount}
+                                certificatesCount={this.state.certificatesCount}
                                 rejectCount={this.state.rejectCount}
                                 commodityQuantity={this.state.commodityQuantity}
                                 refresh={()=>{this.xiangqing(this.state.id)}}

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

@@ -1057,7 +1057,7 @@ const MyTaskOutsource = React.createClass({
             setUpTime: thisdata.setUpTime,
             highTechStatus: thisdata.highTechStatus,
             acceptCount:thisdata.acceptCount,       //受理数
-            authorizeCount:thisdata.authorizeCount, //授权数
+            certificatesCount:thisdata.certificatesCount, //授权数
             rejectCount:thisdata.rejectCount,       //驳回数
             commodityQuantity:thisdata.commodityQuantity, //派单项目数PatentSchedule
           });
@@ -3894,7 +3894,7 @@ const MyTaskOutsource = React.createClass({
                                   bpType={this.state.bpType}
                                   taskId={this.state.id}
                                   acceptCount={this.state.acceptCount}
-                                  authorizeCount={this.state.authorizeCount}
+                                  certificatesCount={this.state.certificatesCount}
                                   rejectCount={this.state.rejectCount}
                                   commodityQuantity={this.state.commodityQuantity}
                                   refresh={()=>{this.xiangqing(this.state.id)}}

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

@@ -456,7 +456,7 @@ class PatentSchedule extends Component{
                 }}>
                     <div style={{paddingRight:'10px'}}>派单项目数:{this.props.commodityQuantity}</div>
                     <div style={{paddingRight:'10px'}}>受理数:{this.props.acceptCount}</div>
-                    <div style={{paddingRight:'10px'}}>下证数(即授权数):{this.props.authorizeCount}</div>
+                    <div style={{paddingRight:'10px'}}>下证数(即授权数):{this.props.certificatesCount}</div>
                     <div>驳回数:{this.props. rejectCount}</div>
                     <div style={{display:'flex',alignItems:'center',marginLeft:'auto'}}>
                         {!this.props.readOnly ? <Button

+ 2 - 2
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -308,7 +308,7 @@ class projectOverview extends Component{
                         setUpTime: thisdata.setUpTime,
                         highTechStatus: thisdata.highTechStatus,
                         acceptCount:thisdata.acceptCount,       //受理数
-                        authorizeCount:thisdata.authorizeCount, //授权数
+                        certificatesCount:thisdata.certificatesCount, //授权数
                         rejectCount:thisdata.rejectCount,       //驳回数
                         commodityQuantity:thisdata.commodityQuantity, //派单项目数
                     })
@@ -909,7 +909,7 @@ class projectOverview extends Component{
                                             bpType={this.state.bpType}
                                             taskId={this.state.id}
                                             acceptCount={this.state.acceptCount}
-                                            authorizeCount={this.state.authorizeCount}
+                                            certificatesCount={this.state.certificatesCount}
                                             rejectCount={this.state.rejectCount}
                                             commodityQuantity={this.state.commodityQuantity}
                                         />

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

@@ -567,7 +567,7 @@ const IntentionCustomer = Form.create()(
               setUpTime: thisdata.setUpTime,
               highTechStatus: thisdata.highTechStatus,
               acceptCount:thisdata.acceptCount,       //受理数
-              authorizeCount:thisdata.authorizeCount, //授权数
+              certificatesCount:thisdata.certificatesCount, //授权数
               rejectCount:thisdata.rejectCount,       //驳回数
               commodityQuantity:thisdata.commodityQuantity, //派单项目数
             });
@@ -1667,7 +1667,7 @@ const IntentionCustomer = Form.create()(
                                 bpType={this.state.bpType}
                                 taskId={this.state.id}
                                 acceptCount={this.state.acceptCount}
-                                authorizeCount={this.state.authorizeCount}
+                                certificatesCount={this.state.certificatesCount}
                                 rejectCount={this.state.rejectCount}
                                 commodityQuantity={this.state.commodityQuantity}
                             />

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

@@ -479,7 +479,7 @@ const Task = React.createClass({
             setUpTime: thisdata.setUpTime,
             highTechStatus: thisdata.highTechStatus,
             acceptCount:thisdata.acceptCount,       //受理数
-            authorizeCount:thisdata.authorizeCount, //授权数
+            certificatesCount:thisdata.certificatesCount, //授权数
             rejectCount:thisdata.rejectCount,       //驳回数
             commodityQuantity:thisdata.commodityQuantity, //派单项目数
           });
@@ -1578,7 +1578,7 @@ const Task = React.createClass({
                                   bpType={this.state.bpType}
                                   taskId={this.state.id}
                                   acceptCount={this.state.acceptCount}
-                                  authorizeCount={this.state.authorizeCount}
+                                  certificatesCount={this.state.certificatesCount}
                                   rejectCount={this.state.rejectCount}
                                   commodityQuantity={this.state.commodityQuantity}
                                   refresh={()=>{this.xiangqing(this.state.id)}}