|
@@ -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>
|