|
@@ -36,13 +36,12 @@ import {getMaterialStatus,
|
|
|
getApproval,
|
|
|
getTaskStatus,
|
|
|
getLiquidationStatus,
|
|
|
- getProjectStatus,
|
|
|
splitUrl,
|
|
|
getboutique,
|
|
|
ShowModal,
|
|
|
getRefundStatus,
|
|
|
getProjectName} from '@/tools'
|
|
|
-import { taskStatus, projectStatus, cuiJieDian,projectStatusCascader } from '@/dataDic.js'
|
|
|
+import {cuiJieDian,projectStatusCascader } from '@/dataDic.js'
|
|
|
import ShowModalDiv from '@/showModal.jsx';
|
|
|
import NowProjectStatus from '../../../common/nowProjectStatus';
|
|
|
import DeclarationProgress from '../../../../component/common/declarationProgress';
|
|
@@ -52,8 +51,7 @@ import NewSupplier from './newSupplier';
|
|
|
import ImgList from "../../../common/imgList";
|
|
|
import OperationPayNode from "./operationPayNode";
|
|
|
import PatentSchedule from './patentSchedule';
|
|
|
-import {number, object} from "prop-types";
|
|
|
-import {currency, highTechColumns, highTechColumnsVIP, patent, science} from "../../../common/nowProjectStatus/type";
|
|
|
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
|
|
|
const confirm = Modal.confirm
|
|
|
const FormItem = Form.Item
|
|
|
const { TabPane } = Tabs
|
|
@@ -173,6 +171,8 @@ const Task = React.createClass({
|
|
|
return {
|
|
|
containOfficialFees:0,//官费缴费情况
|
|
|
audit: 1,
|
|
|
+ declarationBatch: 1,
|
|
|
+ dataInfor: {},
|
|
|
projectType: '', //项目分类
|
|
|
paySubject: [],
|
|
|
paySubjectName: '', //付款科目名称
|
|
@@ -1715,28 +1715,9 @@ const Task = React.createClass({
|
|
|
} else {
|
|
|
for (let i = 0; i < data.data.length; i++) {
|
|
|
let thisdata = data.data[i]
|
|
|
- theArr.push({
|
|
|
- key: i,
|
|
|
- id: thisdata.id,
|
|
|
- orderNo: thisdata.orderNo, //订单编号
|
|
|
- commodityId: thisdata.commodityId, //项目ID
|
|
|
- commodityName: thisdata.commodityName, //项目名称
|
|
|
- cname: thisdata.cname, //项目类别
|
|
|
- commodityPrice: thisdata.commodityPrice, //项目价格
|
|
|
- commodityQuantity: thisdata.commodityQuantity, //项目数量
|
|
|
- main: thisdata.main, //是否为主要项目
|
|
|
- taskComment: thisdata.taskComment, //项目说明
|
|
|
- contacts: thisdata.contacts, //联系人
|
|
|
- contactsMobile: thisdata.contactsMobile, //联系人电话
|
|
|
- taskStatus: thisdata.taskStatus, //是否分配
|
|
|
- contractNo: thisdata.contractNo, //合同编号
|
|
|
- certificateNumber: thisdata.certificateNumber,
|
|
|
- splitStatus: thisdata.splitStatus,
|
|
|
- officialCost: thisdata.officialCost,
|
|
|
- costReduction: thisdata.costReduction,
|
|
|
- type: thisdata.type,
|
|
|
- cSort: thisdata.cSort,
|
|
|
- })
|
|
|
+ thisdata.key = i;
|
|
|
+ thisdata.sort = thisdata.cSort;
|
|
|
+ theArr.push(thisdata);
|
|
|
}
|
|
|
}
|
|
|
this.setState({
|
|
@@ -2040,6 +2021,7 @@ const Task = React.createClass({
|
|
|
taskCommentData: record.taskComment,
|
|
|
main: record.main.toString(), //是否为主要
|
|
|
addnextVisible: true,
|
|
|
+ dataInfor:record,
|
|
|
addState: 0,
|
|
|
})
|
|
|
},
|
|
@@ -2214,7 +2196,7 @@ const Task = React.createClass({
|
|
|
)
|
|
|
},
|
|
|
showDeleteConfirm(num, fn) {
|
|
|
- let text = getProjectStatus(num)
|
|
|
+ let text = getProjectName(num)
|
|
|
confirm({
|
|
|
title: <p style={{ fontSize: 16, fontWeight: 900 }}>注意</p>,
|
|
|
content: (
|
|
@@ -3380,21 +3362,6 @@ const Task = React.createClass({
|
|
|
})
|
|
|
}}
|
|
|
/>
|
|
|
- {/*<Select*/}
|
|
|
- {/* */}
|
|
|
- {/* */}
|
|
|
- {/* value={this.state.projectStatusSearch}*/}
|
|
|
- {/* onChange={(e) => {*/}
|
|
|
- {/* this.setState({ projectStatusSearch: e })*/}
|
|
|
- {/* console.log(this.state.projectStatusSearch)*/}
|
|
|
- {/* }}*/}
|
|
|
- {/*>*/}
|
|
|
- {/* {projectStatus.map(function (item) {*/}
|
|
|
- {/* return (*/}
|
|
|
- {/* <Select.Option key={item.value}>{item.key}</Select.Option>*/}
|
|
|
- {/* )*/}
|
|
|
- {/* })}*/}
|
|
|
- {/*</Select>*/}
|
|
|
<Select
|
|
|
placeholder="特批状态"
|
|
|
style={{ width: 150, marginRight: '10px' }}
|
|
@@ -4045,9 +4012,9 @@ const Task = React.createClass({
|
|
|
<div className="clearfix">
|
|
|
<h3 className="sub-title">项目信息</h3>
|
|
|
{/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
|
|
|
- {/*高新与贯标需要显示*/}
|
|
|
+ {/*贯标需要显示*/}
|
|
|
{
|
|
|
- this.state.projectType === 5 || this.state.isIso ?
|
|
|
+ this.state.isIso ?
|
|
|
<div>
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -4185,6 +4152,17 @@ const Task = React.createClass({
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
|
<h3 className="sub-title">项目申报进度</h3>
|
|
|
+ <DeclarationProgress
|
|
|
+ timeRecordparse={this.state.timeRecordparse}
|
|
|
+ startDate={this.state.startDate}
|
|
|
+ taskDate={this.state.taskDate}
|
|
|
+ list={[
|
|
|
+ {id:4,name:'完成时间',value:this.state.endDate},
|
|
|
+ {id:6,name:'受理时间',value:this.state.acceptDate},
|
|
|
+ {id:8,name:'公示时间',value:this.state.publicityDate},
|
|
|
+ {id:10,name:'发证时间',value:this.state.licenceDate},
|
|
|
+ {id:15,name:'立项金额',value:this.state.setUpAmount}
|
|
|
+ ]}/>
|
|
|
{/*专利显示 bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
|
|
|
{
|
|
|
this.state.bpType === 1 || this.state.bpType === 6 ?
|
|
@@ -4233,16 +4211,6 @@ const Task = React.createClass({
|
|
|
/>
|
|
|
</div> :
|
|
|
<div>
|
|
|
- <DeclarationProgress
|
|
|
- timeRecordparse={this.state.timeRecordparse}
|
|
|
- startDate={this.state.startDate}
|
|
|
- list={[
|
|
|
- {id:4,name:'完成时间',value:this.state.endDate},
|
|
|
- {id:6,name:'受理时间',value:this.state.acceptDate},
|
|
|
- {id:8,name:'公示时间',value:this.state.publicityDate},
|
|
|
- {id:10,name:'发证时间',value:this.state.licenceDate},
|
|
|
- {id:15,name:'立项金额',value:this.state.setUpAmount}
|
|
|
- ]}/>
|
|
|
{/*高新显示 bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
|
|
|
{this.state.bpType === 5 ? <FormItem
|
|
|
className="half-item"
|
|
@@ -4299,7 +4267,9 @@ const Task = React.createClass({
|
|
|
}}
|
|
|
/> : null }
|
|
|
</FormItem> : null}
|
|
|
- <FormItem
|
|
|
+ {/*高新和科技项目显示 bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
|
|
|
+ {/*cSort: 3 科技项目 6: 会员*/}
|
|
|
+ {(this.state.bpType === 5 || this.state.cSort === 3) && <FormItem
|
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
|
label="申报批次"
|
|
@@ -4323,22 +4293,24 @@ const Task = React.createClass({
|
|
|
<Option value={3}>第三批</Option>
|
|
|
<Option value={4}>第四批</Option>
|
|
|
</Select>
|
|
|
- </FormItem>
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="是否到款"
|
|
|
- >
|
|
|
- <Radio.Group
|
|
|
- value={this.state.arrivalMoney}
|
|
|
- onChange={(e) => {
|
|
|
- this.setState({ arrivalMoney: e.target.value })
|
|
|
- }}
|
|
|
+ </FormItem>}
|
|
|
+ {/*只有科技项目才有是否到款*/}
|
|
|
+ {/*cSort: 3 科技项目 6: 会员*/}
|
|
|
+ {this.state.cSort === 3 && <FormItem
|
|
|
+ className="half-item"
|
|
|
+ {...formItemLayout}
|
|
|
+ label="是否到款"
|
|
|
>
|
|
|
- <Radio value={0}>未到企业</Radio>
|
|
|
- <Radio value={1}>已到企业</Radio>
|
|
|
- </Radio.Group>
|
|
|
- </FormItem>
|
|
|
+ <Radio.Group
|
|
|
+ value={this.state.arrivalMoney}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({ arrivalMoney: e.target.value })
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ <Radio value={0}>未到企业</Radio>
|
|
|
+ <Radio value={1}>已到企业</Radio>
|
|
|
+ </Radio.Group>
|
|
|
+ </FormItem>}
|
|
|
</div>}
|
|
|
</div>
|
|
|
{this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
|
|
@@ -4424,13 +4396,9 @@ const Task = React.createClass({
|
|
|
onClick={() => {
|
|
|
let num = this.state.projectStatus
|
|
|
if (
|
|
|
- num != 0 &&
|
|
|
- num != 10 &&
|
|
|
- num != 11 &&
|
|
|
- num != 12 &&
|
|
|
- num != 2 &&
|
|
|
- num != 5 &&
|
|
|
- num != 6
|
|
|
+ num != 1 &&
|
|
|
+ num != 20 &&
|
|
|
+ num != 21
|
|
|
) {
|
|
|
this.showDeleteConfirm(num, this.tijiaoOk)
|
|
|
} else {
|
|
@@ -5125,80 +5093,6 @@ const Task = React.createClass({
|
|
|
</Spin>
|
|
|
</Form>
|
|
|
</Modal>
|
|
|
- {this.state.addnextVisible ? <Modal
|
|
|
- maskClosable={false}
|
|
|
- visible={this.state.addnextVisible}
|
|
|
- onOk={this.nextCancel}
|
|
|
- onCancel={this.nextCancel}
|
|
|
- width="800px"
|
|
|
- title="项目详情"
|
|
|
- footer=""
|
|
|
- className="admin-desc-content"
|
|
|
- >
|
|
|
- <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
|
|
|
- <Spin spinning={this.state.loading}>
|
|
|
- <div className="clearfix">
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="项目名称"
|
|
|
- >
|
|
|
- <span>{this.state.commodityName}</span>
|
|
|
- </FormItem>
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="项目数量"
|
|
|
- >
|
|
|
- <span>{this.state.commodityQuantity}</span>
|
|
|
- </FormItem>
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="官费"
|
|
|
- style={{ display: this.state.displayFees }}
|
|
|
- >
|
|
|
- <span>
|
|
|
- {this.state.officialCost == 0 ? '无官费' : '有官费'}
|
|
|
- </span>
|
|
|
- </FormItem>
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="费减"
|
|
|
- style={{ display: this.state.displayFees }}
|
|
|
- >
|
|
|
- <span>
|
|
|
- {this.state.costReduction == 0 ? '无费减' : '有费减'}
|
|
|
- </span>
|
|
|
- </FormItem>
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="金额(万元)"
|
|
|
- >
|
|
|
- <span>{this.state.commodityPrice ? '***' : 0}</span>
|
|
|
- </FormItem>
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="主要项目"
|
|
|
- >
|
|
|
- <span>{getboutique(this.state.main)}</span>
|
|
|
- </FormItem>
|
|
|
- <div className="clearfix">
|
|
|
- <FormItem
|
|
|
- labelCol={{ span: 3 }}
|
|
|
- wrapperCol={{ span: 18 }}
|
|
|
- label="服务说明"
|
|
|
- >
|
|
|
- <span>{this.state.taskComment}</span>
|
|
|
- </FormItem>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </Spin>
|
|
|
- </Form>
|
|
|
- </Modal> : <div/>}
|
|
|
{this.state.speVisible ? <Modal
|
|
|
maskClosable={false}
|
|
|
visible={this.state.speVisible}
|
|
@@ -5307,28 +5201,6 @@ const Task = React.createClass({
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
|
- {/*<FormItem*/}
|
|
|
- {/* className="half-item"*/}
|
|
|
- {/* {...formItemLayout}*/}
|
|
|
- {/* label="项目状态"*/}
|
|
|
- {/*>*/}
|
|
|
- {/* <Select*/}
|
|
|
- {/* placeholder="选择项目状态"*/}
|
|
|
- {/* style={{ width: '200px' }}*/}
|
|
|
- {/* value={this.state.projectStatus}*/}
|
|
|
- {/* onChange={(e) => {*/}
|
|
|
- {/* this.setState({ projectStatus: e })*/}
|
|
|
- {/* }}*/}
|
|
|
- {/* >*/}
|
|
|
- {/* {projectStatus.map(function (item) {*/}
|
|
|
- {/* return (*/}
|
|
|
- {/* <Select.Option key={item.value}>*/}
|
|
|
- {/* {item.key}*/}
|
|
|
- {/* </Select.Option>*/}
|
|
|
- {/* )*/}
|
|
|
- {/* })}*/}
|
|
|
- {/* </Select>*/}
|
|
|
- {/*</FormItem>*/}
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
@@ -5778,6 +5650,7 @@ const Task = React.createClass({
|
|
|
<DeclarationProgress
|
|
|
timeRecordparse={this.state.timeRecordparse}
|
|
|
startDate={this.state.startDate}
|
|
|
+ taskDate={this.state.taskDate}
|
|
|
list={[
|
|
|
{id:4,name:'完成时间',value:this.state.endDate},
|
|
|
{id:6,name:'受理时间',value:this.state.acceptDate},
|
|
@@ -5785,7 +5658,9 @@ const Task = React.createClass({
|
|
|
{id:10,name:'发证时间',value:this.state.licenceDate},
|
|
|
{id:15,name:'立项金额',value:this.state.setUpAmount}
|
|
|
]}/>
|
|
|
- <FormItem
|
|
|
+ {/*高新和科技项目显示 bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
|
|
|
+ {/*cSort: 3 科技项目 6: 会员*/}
|
|
|
+ {(this.state.bpType === 5 || this.state.cSort === 3) && <FormItem
|
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
|
label="申报批次"
|
|
@@ -5809,7 +5684,7 @@ const Task = React.createClass({
|
|
|
<Option value={3}>第三批</Option>
|
|
|
<Option value={4}>第四批</Option>
|
|
|
</Select>
|
|
|
- </FormItem>
|
|
|
+ </FormItem>}
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
@@ -6543,6 +6418,11 @@ const Task = React.createClass({
|
|
|
}}
|
|
|
/> : null
|
|
|
}
|
|
|
+ {this.state.addnextVisible && <ProjectDetailsReadOnly
|
|
|
+ infor={this.state.dataInfor}
|
|
|
+ visible={this.state.addnextVisible}
|
|
|
+ onCancel={this.nextCancel}
|
|
|
+ />}
|
|
|
</div>
|
|
|
)
|
|
|
},
|