|
@@ -364,7 +364,7 @@ const Task = React.createClass({
|
|
|
render: (text, record) => {
|
|
|
if (record.outsourceType === 1) {
|
|
|
return '供应商'
|
|
|
- } else {
|
|
|
+ } else if ((record.outsourceType === 0)) {
|
|
|
if (text === 0) {
|
|
|
return <Tag color="#f50">外包待审核</Tag>
|
|
|
} else if (text === 1) {
|
|
@@ -374,6 +374,10 @@ const Task = React.createClass({
|
|
|
} else {
|
|
|
return <div style={{ textAlign: 'center' }}>/</div>
|
|
|
}
|
|
|
+ } else if ((record.outsourceType === 2)) {
|
|
|
+ return '高质量申请'
|
|
|
+ } else {
|
|
|
+ return <div style={{ textAlign: 'center' }}>/</div>
|
|
|
}
|
|
|
},
|
|
|
},
|
|
@@ -2198,6 +2202,7 @@ const Task = React.createClass({
|
|
|
approvalSearch: undefined,
|
|
|
category: undefined,
|
|
|
outsourceStatusSearch: [],
|
|
|
+ projectName: undefined,
|
|
|
})
|
|
|
}
|
|
|
this.setState({
|
|
@@ -2358,8 +2363,6 @@ const Task = React.createClass({
|
|
|
})
|
|
|
},
|
|
|
timeDetail(record) {
|
|
|
- console.log(record)
|
|
|
-
|
|
|
this.setState({
|
|
|
loading: true,
|
|
|
recordHour: record.hours,
|
|
@@ -2380,7 +2383,6 @@ const Task = React.createClass({
|
|
|
this.setState({
|
|
|
dataSourceTime: data.data,
|
|
|
})
|
|
|
- console.log(this.state.dataSourceTime)
|
|
|
}
|
|
|
}.bind(this),
|
|
|
}).always(
|
|
@@ -2412,7 +2414,7 @@ const Task = React.createClass({
|
|
|
},
|
|
|
// 项目发起外包
|
|
|
sureOut(startType) {
|
|
|
- if (this.state.startType !== 0 && this.state.startType !== 1) {
|
|
|
+ if (this.state.startType !== 0 && this.state.startType !== 1 && this.state.startType !== 2) {
|
|
|
message.warning('请选择类型')
|
|
|
return
|
|
|
}
|
|
@@ -2442,7 +2444,7 @@ const Task = React.createClass({
|
|
|
//refundStatus 0-待审核 ,1-审核通过,2-审核拒绝
|
|
|
//类型为供应商时不需要发起原因
|
|
|
//this.state.startType 0外包 1供应商
|
|
|
- if (!this.state.reason && (this.state.refundStatus === 2 || typeof this.state.refundStatus === 'undefined') && this.state.startType !== 1) {
|
|
|
+ if (!this.state.reason && (this.state.refundStatus === 2 || typeof this.state.refundStatus === 'undefined') && this.state.startType == 0) {
|
|
|
message.warning('发起原因不能为空')
|
|
|
return
|
|
|
}
|
|
@@ -2510,7 +2512,6 @@ const Task = React.createClass({
|
|
|
? _this.getUrl(_this.state.pictureUrl)
|
|
|
: ''
|
|
|
}
|
|
|
-
|
|
|
ajaxObj = $.ajax({
|
|
|
method: 'POST',
|
|
|
dataType: 'json',
|
|
@@ -5019,7 +5020,7 @@ const Task = React.createClass({
|
|
|
>
|
|
|
<Radio value={0}>外包(不走总部)</Radio>
|
|
|
<Radio value={1}>供应商信息</Radio>
|
|
|
- <Radio value={2}>转让专利</Radio>
|
|
|
+ {adminData.isTechTransfer && <Radio value={2}>高质量申请</Radio>}
|
|
|
</Radio.Group>
|
|
|
</FormItem>
|
|
|
</div>
|
|
@@ -5090,7 +5091,7 @@ const Task = React.createClass({
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
{/*外包类型无此选项*/}
|
|
|
- {this.state.startType !== 0 && this.state.projectType === 1 ?
|
|
|
+ {this.state.startType === 1 && this.state.projectType === 1 ?
|
|
|
<div className="clearfix">
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -5201,7 +5202,7 @@ const Task = React.createClass({
|
|
|
{/*this.state.startType 0外包 1供应商*/}
|
|
|
<div
|
|
|
style={{
|
|
|
- display: this.state.startType === 0 ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'), //0正常 1专利 2软著 3审计
|
|
|
+ display: (this.state.startType === 0 || this.state.startType === 2) ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'), //0正常 1专利 2软著 3审计
|
|
|
}}
|
|
|
>
|
|
|
<span
|
|
@@ -5236,7 +5237,7 @@ const Task = React.createClass({
|
|
|
<div
|
|
|
className="clearfix"
|
|
|
style={{
|
|
|
- display: this.state.startType === 0 ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'), //0正常 1专利 2软著 3审计
|
|
|
+ display: (this.state.startType === 0 || this.state.startType === 2) ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'), //0正常 1专利 2软著 3审计
|
|
|
}}
|
|
|
>
|
|
|
<Spin spinning={this.state.payNodeLoading}>
|
|
@@ -5280,36 +5281,12 @@ const Task = React.createClass({
|
|
|
/>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
- {/*<div className="clearfix">
|
|
|
- <FormItem className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="上传协议文件" style={{height:"auto"}}>
|
|
|
- <Upload header={{authorization: 'authorization-text'}} action={globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"}
|
|
|
- data={(e)=>{
|
|
|
- return {
|
|
|
- 'sign': e.name.substring(0,e.name.lastIndexOf("."))
|
|
|
- }
|
|
|
- }}
|
|
|
- fileList={this.state.fileUrl}
|
|
|
- onChange={(e)=>{
|
|
|
- this.setState({
|
|
|
- attachmentUrl:e.fileList,
|
|
|
- fileUrl:e.fileList
|
|
|
- })
|
|
|
- }}>
|
|
|
- {fileUrl.length>1?null:<Button>
|
|
|
- <Icon type="upload" /> 点击上传
|
|
|
- </Button>}
|
|
|
- </Upload>
|
|
|
- <span className="tip" style={{display:"inline-block"}}>支持文件格式: doc,excel,ppt</span>
|
|
|
- </FormItem>
|
|
|
- </div>*/}
|
|
|
<p
|
|
|
className="tip"
|
|
|
style={{
|
|
|
paddingBottom: '12px',
|
|
|
width: '240px',
|
|
|
- marginLeft: '145px',
|
|
|
+ marginLeft: '195px',
|
|
|
color: 'red',
|
|
|
}}
|
|
|
>
|
|
@@ -5333,7 +5310,7 @@ const Task = React.createClass({
|
|
|
</div>
|
|
|
{/*只有审核拒绝和第一次发起外包的时候才要填写发起原因 如果是类型为供应商则不需要发起原因*/}
|
|
|
{/*this.state.startType 0外包 1供应商*/}
|
|
|
- {(typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2) && this.state.startType !== 1 ?
|
|
|
+ {(typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2) && this.state.startType == 0 ?
|
|
|
<div className="clearfix">
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -5485,43 +5462,6 @@ const Task = React.createClass({
|
|
|
))
|
|
|
}
|
|
|
</div>
|
|
|
- {/* <div*/}
|
|
|
- {/* className="clearfix"*/}
|
|
|
- {/* style={{*/}
|
|
|
- {/* display: this.state.refundStatus == 0 ? 'none' : 'block',*/}
|
|
|
- {/* }}*/}
|
|
|
- {/* >*/}
|
|
|
- {/* <FormItem*/}
|
|
|
- {/* className="half-item"*/}
|
|
|
- {/* {...formItemLayout}*/}
|
|
|
- {/* label="审核意见"*/}
|
|
|
- {/* >*/}
|
|
|
- {/* <span>{this.state.remarks}</span>*/}
|
|
|
- {/* </FormItem>*/}
|
|
|
- {/* </div>*/}
|
|
|
- {/* {parseInt(this.state.startType) !== 1 ?<div className="clearfix">*/}
|
|
|
- {/* <FormItem*/}
|
|
|
- {/* className="half-item"*/}
|
|
|
- {/* {...formItemLayout}*/}
|
|
|
- {/* label="审核结果"*/}
|
|
|
- {/* >*/}
|
|
|
- {/* <span>{getRefundStatus(this.state.refundStatus)}</span>*/}
|
|
|
- {/* </FormItem>*/}
|
|
|
- {/* </div> : <div/>}*/}
|
|
|
- {/* <div*/}
|
|
|
- {/* className="clearfix"*/}
|
|
|
- {/* style={{*/}
|
|
|
- {/* display: this.state.refundStatus == 0 ? 'none' : 'block',*/}
|
|
|
- {/* }}*/}
|
|
|
- {/* >*/}
|
|
|
- {/* <FormItem*/}
|
|
|
- {/* className="half-item"*/}
|
|
|
- {/* {...formItemLayout}*/}
|
|
|
- {/* label="审核时间"*/}
|
|
|
- {/* >*/}
|
|
|
- {/* <span>{this.state.auditTimes}</span>*/}
|
|
|
- {/* </FormItem>*/}
|
|
|
- {/* </div>*/}
|
|
|
</div>
|
|
|
) : (
|
|
|
''
|
|
@@ -6339,6 +6279,7 @@ const Task = React.createClass({
|
|
|
>
|
|
|
<Radio value={0}>外包(不走总部)</Radio>
|
|
|
<Radio value={1}>供应商信息</Radio>
|
|
|
+ {adminData.isTechTransfer && <Radio value={2}>高质量申请</Radio>}
|
|
|
</Radio.Group>
|
|
|
</FormItem>
|
|
|
</div>
|
|
@@ -6408,7 +6349,7 @@ const Task = React.createClass({
|
|
|
</Radio.Group>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
- {this.state.startType !== 0 && this.state.projectType === 1 ?
|
|
|
+ {this.state.startType === 1 && this.state.projectType === 1 ?
|
|
|
<div className="clearfix">
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -6522,7 +6463,7 @@ const Task = React.createClass({
|
|
|
{/*如果是软著类或者专利类的专利申请,隐藏付款节点*/}
|
|
|
<div
|
|
|
style={{
|
|
|
- display: this.state.startType === 0 ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'), //0正常 1专利 2软著 3审计
|
|
|
+ display: (this.state.startType === 0 || this.state.startType === 2) ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'), //0正常 1专利 2软著 3审计
|
|
|
}}
|
|
|
>
|
|
|
<span
|
|
@@ -6557,7 +6498,7 @@ const Task = React.createClass({
|
|
|
<div
|
|
|
className="clearfix"
|
|
|
style={{
|
|
|
- display: this.state.startType === 0 ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'), //0正常 1专利 2软著 3审计
|
|
|
+ display: (this.state.startType === 0 || this.state.startType === 2) ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'), //0正常 1专利 2软著 3审计
|
|
|
}}
|
|
|
>
|
|
|
<Spin spinning={this.state.payNodeLoading}>
|
|
@@ -6632,7 +6573,7 @@ const Task = React.createClass({
|
|
|
</div>
|
|
|
{/*只有审核拒绝和第一次发起外包的时候才要填写发起原因 如果是类型为供应商则不需要发起原因*/}
|
|
|
{/*this.state.startType 0外包 1供应商*/}
|
|
|
- {(typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2) && this.state.startType !== 1 ?
|
|
|
+ {(typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2) && this.state.startType == 0 ?
|
|
|
<div className="clearfix">
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -6861,7 +6802,7 @@ const Task = React.createClass({
|
|
|
ThirdId={this.state.ThirdId}
|
|
|
tid={this.state.tid}
|
|
|
patentType={this.state.patentType}
|
|
|
- projectType={this.state.startType === 0 ? 0 : this.state.projectType}
|
|
|
+ projectType={(this.state.startType === 0 || this.state.startType === 2) ? 0 : this.state.projectType}
|
|
|
realProjectType={this.state.projectType} //真实的项目类型
|
|
|
startType={this.state.startType} //项目类型 0外包 1供应商
|
|
|
thirdCompanyName={this.state.thirdCompanyName}
|