소스 검색

完善项目详情

HW 4 년 전
부모
커밋
570ea00c64

+ 42 - 31
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -63,12 +63,18 @@ const highTechColumns =[
     {
         title: "是否立项/时间",
         dataIndex: "setUpStatus",
-        key: "setUpStatus"
+        key: "setUpStatus",
+        render:(value,record)=>(
+                value === 1 ? '是'+'/'+record.setUpTime : value === 0 ? '否' : ''
+        )
     },
     {
         title: "是否抽查",
         dataIndex: "spotCheckStatus",
-        key: "spotCheckStatus"
+        key: "spotCheckStatus",
+        render:(value)=>(
+            value === 1 ? '是' : value === 0 ? '否' : ''
+        )
     },
     {
         title: "联系人电话",
@@ -100,16 +106,14 @@ const highTechColumns =[
         title: "项目状态",
         dataIndex: "projectStatus",
         key: "projectStatus",
-        render:(value)=>{
-            return (
+        render:(value)=>(
                 value === 0 ? '未开始' :
                     value === 1 ? '已开始' :
                         value === 2 ? '已暂停' :
                             value === 3 ? '已完成' :
                                 value === 4 ? '已驳回' :
                                     value === 5 ? '已退单' : ''
-            )
-        }
+        )
     },
     {
         title: "特别说明",
@@ -181,7 +185,7 @@ const doubleSoft = [
         key: "techName"
     },
     {
-        title: "下证/授权时间",
+        title: "下证时间",
         dataIndex: "licenceTime",
         key: "licenceTime"
     },
@@ -195,16 +199,14 @@ const doubleSoft = [
         title: "项目状态",
         dataIndex: "projectStatus",
         key: "projectStatus",
-        render:(value)=>{
-            return (
+        render:(value)=>(
                 value === 0 ? '未开始' :
                     value === 1 ? '已开始' :
                         value === 2 ? '已暂停' :
                             value === 3 ? '已完成' :
                                 value === 4 ? '已驳回' :
                                     value === 5 ? '已退单' : ''
-            )
-        }
+        )
     },
     {
         title: "特别说明",
@@ -278,20 +280,29 @@ const softWriting = [
     {
         title: "项目数量/下证数",
         dataIndex: "commodityQuantity",
-        key: "commodityQuantity"
+        key: "commodityQuantity",
+        render:(value,record)=>(
+                value+'/'+record.certificatesCount
+        )
     },
     {
         title: "有无材料",
         dataIndex: "ifMaterial",
-        key: "ifMaterial"
+        key: "ifMaterial",
+        render: (value)=>(
+            value === 1 ? '有' : value === 0 ? '无' : ''
+        )
     },
     {
         title: "加急天数",
         dataIndex: "urgentDay",
-        key: "urgentDay"
+        key: "urgentDay",
+        render: (value)=>(
+            value === 1 ? '有' : value === 0 ? '无' : ''
+        )
     },
     {
-        title: "下证/授权时间",
+        title: "下证时间",
         dataIndex: "licenceTime",
         key: "licenceTime"
     },
@@ -320,16 +331,14 @@ const softWriting = [
         title: "项目状态",
         dataIndex: "projectStatus",
         key: "projectStatus",
-        render:(value)=>{
-            return (
+        render:(value)=>(
                 value === 0 ? '未开始' :
                     value === 1 ? '已开始' :
                         value === 2 ? '已暂停' :
                             value === 3 ? '已完成' :
                                 value === 4 ? '已驳回' :
                                     value === 5 ? '已退单' : ''
-            )
-        }
+        )
     },
     {
         title: "特别说明",
@@ -403,12 +412,18 @@ const patent =[
     {
         title: "项目数量/下证数",
         dataIndex: "commodityQuantity",
-        key: "commodityQuantity"
+        key: "commodityQuantity",
+        render:(value,record)=>(
+                value+'/'+record.certificatesCount
+        )
     },
     {
         title: "是否高新",
         dataIndex: "highTechstatus",
         key: "highTechstatus",
+        render:(value)=>(
+                value === 1 ? '是' : value === 0 ? '否' : ''
+        )
     },
     {
         title: "驳回数",
@@ -417,8 +432,8 @@ const patent =[
     },
     {
         title: "专利号",
-        dataIndex: "patentNumber",
-        key: "patentNumber"
+        dataIndex: "patentNo",
+        key: "patentNo"
     },
     {
         title: "专利名称",
@@ -436,7 +451,7 @@ const patent =[
     //     key: "orderNo"
     // },
     {
-        title: "下证/授权时间",
+        title: "下证时间",
         dataIndex: "licenceTime",
         key: "licenceTime"
     },
@@ -460,16 +475,14 @@ const patent =[
         title: "项目状态",
         dataIndex: "projectStatus",
         key: "projectStatus",
-        render:(value)=>{
-            return (
+        render:(value)=>(
                 value === 0 ? '未开始' :
                     value === 1 ? '已开始' :
                         value === 2 ? '已暂停' :
                             value === 3 ? '已完成' :
                                 value === 4 ? '已驳回' :
                                     value === 5 ? '已退单' : ''
-            )
-        }
+        )
     },
     {
         title: "特别说明",
@@ -545,16 +558,14 @@ const currency = [
         title: "项目状态",
         dataIndex: "projectStatus",
         key: "projectStatus",
-        render:(value)=>{
-            return (
+        render:(value)=>(
                     value === 0 ? '未开始' :
                         value === 1 ? '已开始' :
                             value === 2 ? '已暂停' :
                                 value === 3 ? '已完成' :
                                     value === 4 ? '已驳回' :
                                         value === 5 ? '已退单' : ''
-            )
-        }
+        )
     },
     {
         title: "项目金额",

+ 115 - 52
js/component/manageCenter/project/summary/projecCount.jsx

@@ -60,6 +60,7 @@ class ProjecCount extends Component{
             customerArr: [],
             commodityName: '',
             kid: '',
+            status: 0,
         }
         this.loadData = this.loadData.bind(this);
         this.resetAll = this.resetAll.bind(this);
@@ -87,7 +88,6 @@ class ProjecCount extends Component{
     }
 
     loadData(pageNo) {
-        this.state.data = [];
         this.setState({
             page: pageNo,
             loading: true
@@ -96,15 +96,18 @@ class ProjecCount extends Component{
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/newOrder/orderNewList",
+            url: globalConfig.context + "/api/admin/statistis/selectProvincialStatistics",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
                 startDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[0]: undefined, //开始时间
                 endDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[1]: undefined, //结束时间
+                province: this.state.province || undefined,
                 projectStatus: this.state.projectStatus || undefined,//项目类别
                 projectType: typeof this.state.projectType === 'number' ? this.state.projectType : undefined,//项目分类
                 status: this.state.status,
+                thchDepId: this.state.depId || undefined,
+                projectId: this.state.kid || undefined,
             },
             success: function(data) {
                 ShowModal(this);
@@ -116,7 +119,7 @@ class ProjecCount extends Component{
                 } else {
                     for (let i = 0; i < data.data.list.length; i++) {
                         let thisdata = data.data.list[i];
-                        thisdata.key=i;
+                        thisdata.key=(data.data.pageNo - 1) * data.data.pageSize + i + 1;
                         theArr.push(thisdata);
                     }
                 }
@@ -182,13 +185,49 @@ class ProjecCount extends Component{
             depId: '',
             projectType: '',
             projectStatus: '',
+            columns: currency,
+            commodityName: '',
+            kid:'',
+            status: 0,
         },()=>{
             this.loadData();
         })
     }
 
     exportPending() {
-        window.open(globalConfig.context + "/api/admin/patent/exportPending")
+        let url = `/api/admin/statistis/exporProvincialList?status=${this.state.status}`;
+        let dep = this.state.departmentArr.filter((e)=> e.id === this.state.depId);//责任部门名称
+        let option = this.state.contactsOptionData.filter((e)=> e.id === this.state.projectStatus); //项目类别名称
+
+        if(dep.length > 0){url = url+`&thchDepName=${dep[0].name}`;}
+        if(option.length > 0){url = url+`&projectStatusName=${option[0].cname}`;}
+        if(typeof this.state.projectType === 'number'){url = url+`&projectTypeName=${
+            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? '商标' :''
+        }`;}
+        if(this.state.commodityName){url = url+`&projectName=${this.state.commodityName}`;}
+        if(this.state.province){url = url+`&provinceName=${getNewDiccityArr(this.state.province)}`;}
+        let data ={
+            startDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[0]: undefined, //开始时间
+            endDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[1]: undefined, //结束时间
+            thchDepId: this.state.depId || undefined,//责任部门ID
+            projectStatus: this.state.projectStatus || undefined,//项目类别
+            projectType: typeof this.state.projectType === 'number' ? this.state.projectType : undefined,//项目分类
+            province: this.state.province || undefined,
+            projectId: this.state.kid || undefined,
+        }
+
+        for(let key in data){
+            if(data[key]){
+                url = url+`&${key}=${data[key]}`;
+            }
+        }
+        window.open(globalConfig.context +url);
     }
 
     //项目类别
@@ -297,7 +336,17 @@ class ProjecCount extends Component{
         return (
             <div className="user-content">
                 <div className="content-title">
-                    <span>数据统计</span>
+                    <span>
+                        数据统计
+                        (
+                            {
+                                this.state.status === 2 ? '专利' :
+                                    this.state.status === 4 ? '软著' :
+                                        this.state.status === 1 ? '高新' :
+                                            this.state.status === 5 ? '商标' : '通用'
+                            }
+                        )
+                    </span>
                 </div>
                 <Tabs defaultActiveKey="1" className="test">
                     <TabPane tab="搜索" key="1">
@@ -318,10 +367,11 @@ class ProjecCount extends Component{
                                         this.setState({
                                             projectStatus: e,
                                         },()=>{
-                                            if((infor[0].cname === '科技项目' || infor[0].cname === '高新') && typeof this.state.projectType !== 'number'){
+                                            if((infor[0].cname === '高新') && typeof this.state.projectType !== 'number'){
                                                 this.setState({
                                                     columns: highTechColumns,
                                                     changeList: [],
+                                                    status: 1,
                                                 },()=>{
                                                     this.loadData();
                                                 })
@@ -329,6 +379,7 @@ class ProjecCount extends Component{
                                                 this.setState({
                                                     columns: currency,
                                                     changeList: [],
+                                                    status: 0,
                                                 },()=>{
                                                     this.loadData();
                                                 })
@@ -355,65 +406,67 @@ class ProjecCount extends Component{
                                                         e === 2 ? softWriting :
                                                             e === 3 ? currency :
                                                                 e === 4 ? currency:
-                                                                    e === 5 ? highTechColumns : [],
+                                                                    e === 5 ? highTechColumns :
+                                                                        e === 6 ? otherTrademarks :[],
                                             changeList: [],
                                             projectType: e,
+                                            status: e === 1 ? 2 : e === 2 ? 4 : e === 5 ? 1 : e === 6 ? 5 : 0, // 0通用 1高新 2发明专利 3实用新型 4软著 5商标
                                         },()=>{
                                             this.loadData();
                                         })
                                     }}
                                 >
-                                    {/*0正常 1专利 2软著 3审计 4双软*/}
                                     <Option value={0}>通用</Option>
                                     <Option value={1}>专利</Option>
                                     <Option value={2}>软著</Option>
                                     <Option value={3}>审计</Option>
                                     <Option value={4}>双软</Option>
                                     <Option value={5}>高新</Option>
+                                    <Option value={6}>商标</Option>
                                 </Select>
                             </span>
-                            <Input
-                                placeholder="订单编号"
-                                style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}
-                                value={this.state.searchOrderNo}
-                                onChange={e => {
-                                    this.setState({ searchOrderNo: e.target.value });
-                                }}
-                            />
-                            <Input
-                                placeholder="合同编号"
-                                style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}
-                                value={this.state.searchContractNo}
-                                onChange={e => {
-                                    this.setState({ searchContractNo: e.target.value });
-                                }}
-                            />
-                            <Input
-                                placeholder="企业名称"
-                                style={{ width: "150px",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.declarationBatch}
-                                    placeholder="请选择批次"
-                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
-                                    onChange={(e) => {
-                                        this.setState({
-                                            declarationBatch: e,
-                                        });
-                                    }}
-                                >
-                                    <Option value={1}>第一批</Option>
-                                    <Option value={2}>第二批</Option>
-                                    <Option value={3}>第三批</Option>
-                                    <Option value={4}>第四批</Option>
-                                </Select>
-                            </span>
+                            {/*<Input*/}
+                            {/*    placeholder="订单编号"*/}
+                            {/*    style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}*/}
+                            {/*    value={this.state.searchOrderNo}*/}
+                            {/*    onChange={e => {*/}
+                            {/*        this.setState({ searchOrderNo: e.target.value });*/}
+                            {/*    }}*/}
+                            {/*/>*/}
+                            {/*<Input*/}
+                            {/*    placeholder="合同编号"*/}
+                            {/*    style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}*/}
+                            {/*    value={this.state.searchContractNo}*/}
+                            {/*    onChange={e => {*/}
+                            {/*        this.setState({ searchContractNo: e.target.value });*/}
+                            {/*    }}*/}
+                            {/*/>*/}
+                            {/*<Input*/}
+                            {/*    placeholder="企业名称"*/}
+                            {/*    style={{ width: "150px",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.declarationBatch}*/}
+                            {/*        placeholder="请选择批次"*/}
+                            {/*        style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}*/}
+                            {/*        onChange={(e) => {*/}
+                            {/*            this.setState({*/}
+                            {/*                declarationBatch: e,*/}
+                            {/*            });*/}
+                            {/*        }}*/}
+                            {/*    >*/}
+                            {/*        <Option value={1}>第一批</Option>*/}
+                            {/*        <Option value={2}>第二批</Option>*/}
+                            {/*        <Option value={3}>第三批</Option>*/}
+                            {/*        <Option value={4}>第四批</Option>*/}
+                            {/*    </Select>*/}
+                            {/*</span>*/}
                             <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
                                 <span>派单省份:</span>
                                 <Select
@@ -432,7 +485,7 @@ class ProjecCount extends Component{
                                 </Select>
                             </span>
                             <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
-                                <span>服务项目名称:</span>
+                                <span>项目名称:</span>
                                 <AutoComplete
                                     className="certain-category-search"
                                     dropdownClassName="certain-category-search-dropdown"
@@ -483,7 +536,17 @@ class ProjecCount extends Component{
                                     }}
                                 />
                             </span>
-                            <Button type="primary" onClick={this.loadData} style={{marginRight:'10px',marginBottom:'10px'}}>搜索</Button>
+                            <Button type="primary" onClick={()=>{
+                                if(this.state.commodityName.length === 0){
+                                    this.setState({
+                                        kid: ''
+                                    },()=>{
+                                        this.loadData();
+                                    })
+                                }else{
+                                    this.loadData();
+                                }
+                            }} style={{marginRight:'10px',marginBottom:'10px'}}>搜索</Button>
                             <Button onClick={this.resetAll} style={{marginRight:'10px',marginBottom:'10px'}}>重置</Button>
                         </div>
                     </TabPane>

+ 147 - 147
js/component/manageCenter/project/summary/projecCountConfig.jsx

@@ -2,58 +2,58 @@
 const highTechColumns = [
     {
         title: "序号",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "key",
+        key: "key",
     },
     {
         title: "派单省份",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "provinceName",
+        key: "provinceName",
     },
     {
         title: "负责部门",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "thchDepName",
+        key: "thchDepName",
     },
     {
         title: "项目类别",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
     },
     {
         title: "库存数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "stockCount",
+        key: "stockCount",
     },
     {
         title: "派单数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "distributeCount",
+        key: "distributeCount",
     },
     {
         title: "完成数",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "completeCount",
+        key: "completeCount",
     },
     {
         title: "驳回数",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "rejectCount",
+        key: "rejectCount",
     },
     {
         title: "签单额(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "amountCount",
+        key: "amountCount",
     },
     {
         title: "成本(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "costAmount",
+        key: "costAmount",
     },
     {
         title: "利润(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "profit",
+        key: "profit",
     },
 ];
 
@@ -61,73 +61,73 @@ const highTechColumns = [
 const invention = [
     {
         title: "序号",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "key",
+        key: "key",
     },
     {
         title: "派单省份",
-        dataIndex: "orderNo",
-        key: "orderNo",
-    },
-    {
-        title: "订单部门",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "provinceName",
+        key: "provinceName",
     },
+    // {
+    //     title: "订单部门",
+    //     dataIndex: "orderNo",
+    //     key: "orderNo",
+    // },
     {
         title: "负责部门",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "thchDepName",
+        key: "thchDepName",
     },
     {
         title: "项目类别",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
     },
     {
         title: "库存数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "stockCount",
+        key: "stockCount",
     },
     {
         title: "派单数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "distributeCount",
+        key: "distributeCount",
     },
     {
         title: "受理数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "acceptCount",
+        key: "acceptCount",
     },
     {
         title: "完结总数",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "completeCount",
+        key: "completeCount",
     },
     {
         title: "授权数",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "authorizeCount",
+        key: "authorizeCount",
     },
     {
         title: "驳回数",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "rejectCount",
+        key: "rejectCount",
     },
     {
         title: "签单额(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "amountCount",
+        key: "amountCount",
     },
     {
         title: "成本(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "costAmount",
+        key: "costAmount",
     },
     {
         title: "利润(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "profit",
+        key: "profit",
     },
 ];
 
@@ -135,68 +135,68 @@ const invention = [
 const utilityModel = [
     {
         title: "序号",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "key",
+        key: "key",
     },
     {
         title: "派单省份",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "provinceName",
+        key: "provinceName",
     },
     {
         title: "负责部门",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "thchDepName",
+        key: "thchDepName",
     },
     {
-        title: "项目类",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        title: "项目类",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
     },
     {
         title: "库存数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "stockCount",
+        key: "stockCount",
     },
     {
         title: "派单数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "distributeCount",
+        key: "distributeCount",
     },
     {
         title: "受理数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "acceptCount",
+        key: "acceptCount",
     },
     {
         title: "完结总数",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "completeCount",
+        key: "completeCount",
     },
     {
         title: "授权数",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "authorizeCount",
+        key: "authorizeCount",
     },
     {
         title: "驳回数",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "rejectCount",
+        key: "rejectCount",
     },
     {
         title: "签单额(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "amountCount",
+        key: "amountCount",
     },
     {
         title: "成本(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "costAmount",
+        key: "costAmount",
     },
     {
         title: "利润(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "profit",
+        key: "profit",
     },
 ];
 
@@ -204,117 +204,117 @@ const utilityModel = [
 const softWriting = [
     {
         title: "序号",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "key",
+        key: "key",
     },
     {
         title: "派单省份",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "provinceName",
+        key: "provinceName",
     },
     {
         title: "负责部门",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "thchDepName",
+        key: "thchDepName",
     },
     {
         title: "项目类别",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
     },
     {
         title: "库存数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "stockCount",
+        key: "stockCount",
     },
     {
         title: "派单数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "distributeCount",
+        key: "distributeCount",
     },
     {
         title: "下证数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "certificatesCount",
+        key: "certificatesCount",
     },
     {
         title: "签单额(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "amountCount",
+        key: "amountCount",
     },
     {
         title: "成本(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "costAmount",
+        key: "costAmount",
     },
     {
         title: "利润(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "profit",
+        key: "profit",
     },
 ];
 
-//其他商标
+//商标
 const otherTrademarks = [
     {
         title: "序号",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "key",
+        key: "key",
     },
     {
         title: "派单省份",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "provinceName",
+        key: "provinceName",
     },
     {
         title: "负责部门",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "thchDepName",
+        key: "thchDepName",
     },
     {
         title: "项目类别",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
     },
     {
         title: "库存数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "stockCount",
+        key: "stockCount",
     },
     {
         title: "派单数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "distributeCount",
+        key: "distributeCount",
     },
     {
         title: "申请数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "applyCount",
+        key: "applyCount",
     },
     {
         title: "驳回数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "rejectCount",
+        key: "rejectCount",
     },
     {
         title: "下证数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "certificatesCount",
+        key: "certificatesCount",
     },
     {
         title: "签单额(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "amountCount",
+        key: "amountCount",
     },
     {
         title: "成本(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "costAmount",
+        key: "costAmount",
     },
     {
         title: "利润(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "profit",
+        key: "profit",
     },
 ];
 
@@ -322,58 +322,58 @@ const otherTrademarks = [
 const currency = [
     {
         title: "序号",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "key",
+        key: "key",
     },
     {
         title: "派单省份",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "provinceName",
+        key: "provinceName",
     },
     {
         title: "负责部门",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "thchDepName",
+        key: "thchDepName",
     },
     {
         title: "项目类别",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
     },
     {
         title: "库存数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "stockCount",
+        key: "stockCount",
     },
     {
         title: "派单数(个)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "distributeCount",
+        key: "distributeCount",
     },
     {
         title: "完成数",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "completeCount",
+        key: "completeCount",
     },
     {
         title: "公示/立项数",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "setUpCount",
+        key: "setUpCount",
     },
     {
         title: "签单额(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "amountCount",
+        key: "amountCount",
     },
     {
         title: "成本(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "costAmount",
+        key: "costAmount",
     },
     {
         title: "利润(万元)",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "profit",
+        key: "profit",
     },
 ];