|
@@ -1403,16 +1403,19 @@ const Task = React.createClass({
|
|
|
})
|
|
|
}
|
|
|
this.setState({
|
|
|
- projectType: record.projectType
|
|
|
+ projectType: record.projectType,
|
|
|
+ orderNo: record.orderNo,
|
|
|
+ id:record.id,
|
|
|
+ tid:record.id,
|
|
|
})
|
|
|
this.xiangqing(record.id, record.taskName)
|
|
|
this.xiangqings(record.orderNo)
|
|
|
this.xiangmu(record.orderNo)
|
|
|
this.loaduserss(record)
|
|
|
// 获取第三方信息表格
|
|
|
- this.thirdTable(record.id);
|
|
|
+ // this.thirdTable(record.id);
|
|
|
//获取支付节点信息表格
|
|
|
- this.payNodeTable(record.id);
|
|
|
+ // this.payNodeTable(record.id);
|
|
|
//查看外包状态日志
|
|
|
this.getSelectOutsourceLog(record.id);
|
|
|
// 获取Csort
|
|
@@ -2007,49 +2010,54 @@ const Task = React.createClass({
|
|
|
},
|
|
|
reset(flag) {
|
|
|
if (flag) {
|
|
|
- this.state.nameSearch = ''
|
|
|
- this.state.orderNoSearch = ''
|
|
|
- this.state.contractNoSearch = undefined
|
|
|
- this.state.taskNoSearch = ''
|
|
|
- this.state.departmenttSearch = undefined
|
|
|
- this.state.projectStatusSearch = undefined //项目状态
|
|
|
- this.state.approvalSearch = undefined
|
|
|
- this.state.outsourceStatusSearch = []
|
|
|
+ this.setState({
|
|
|
+ nameSearch : '',
|
|
|
+ orderNoSearch : '',
|
|
|
+ contractNoSearch : undefined,
|
|
|
+ taskNoSearch : '',
|
|
|
+ departmenttSearch : undefined,
|
|
|
+ projectStatusSearch : undefined, //项目状态
|
|
|
+ approvalSearch : undefined,
|
|
|
+ outsourceStatusSearch : [],
|
|
|
+ })
|
|
|
}
|
|
|
- this.state.id = '' //项目编号
|
|
|
- this.state.orderNo = '' //订单编号
|
|
|
- this.state.projectStatus = undefined //项目状态
|
|
|
- this.state.taskStatuSearch = undefined //项目状态
|
|
|
- this.state.taskComment = '' //说明
|
|
|
- this.state.startDate = '' //启动日期
|
|
|
- this.state.endDate = '' //结束日期
|
|
|
- this.state.acceptDate = '' //受理日期
|
|
|
- this.state.reviewDate = '' //评审日期
|
|
|
- this.state.publicityDate = '' //公示日期
|
|
|
- this.state.licenceDate = '' //发证日期
|
|
|
- this.state.partyTimes = '' //付款时间
|
|
|
- attachmentUrl: [] //附件
|
|
|
- this.state.contacts = '' //联系人
|
|
|
- this.state.contactMobile = '' //联系人电话
|
|
|
- this.state.legalPerson = '' //法人
|
|
|
- this.state.legalPersonTel = '' //法人电话
|
|
|
- this.state.taskId = '' //项目编号
|
|
|
- this.state.hours = '' //工时
|
|
|
- this.state.remarks = '' //说明
|
|
|
- this.state.taskDate = '' //日期
|
|
|
- this.state.taskComment = '' //说明
|
|
|
- this.state.releaseDate = []
|
|
|
- this.state.outsourceName = ''
|
|
|
- this.state.outsourcePrice = undefined
|
|
|
- this.state.distribution = undefined
|
|
|
- this.state.companyName = undefined
|
|
|
- this.state.unitPrice = undefined
|
|
|
- this.state.unitNumber = undefined
|
|
|
- this.state.amount = undefined
|
|
|
- this.state.pictureUrl = []
|
|
|
this.setState({
|
|
|
oldInfor: {},
|
|
|
- outsourceRemarks: undefined
|
|
|
+ outsourceRemarks: undefined,
|
|
|
+ thirdInfoList: [],
|
|
|
+ payNodeList: [],
|
|
|
+ orderNo: '',//订单编号
|
|
|
+ tid: '',
|
|
|
+
|
|
|
+ id : '', //项目编号
|
|
|
+ projectStatus : undefined, //项目状态
|
|
|
+ taskStatuSearch : undefined, //项目状态
|
|
|
+ startDate : '', //启动日期
|
|
|
+ endDate : '', //结束日期
|
|
|
+ acceptDate : '', //受理日期
|
|
|
+ reviewDate : '', //评审日期
|
|
|
+ publicityDate : '', //公示日期
|
|
|
+ licenceDate : '', //发证日期
|
|
|
+ partyTimes : '', //付款时间
|
|
|
+ attachmentUrl: [], //附件
|
|
|
+ contacts : '', //联系人
|
|
|
+ contactMobile : '', //联系人电话
|
|
|
+ legalPerson : '', //法人
|
|
|
+ legalPersonTel : '', //法人电话
|
|
|
+ taskId : '', //项目编号
|
|
|
+ hours : '', //工时
|
|
|
+ remarks : '', //说明
|
|
|
+ taskDate : '', //日期
|
|
|
+ taskComment : '', //说明
|
|
|
+ releaseDate : [],
|
|
|
+ outsourceName : '',
|
|
|
+ outsourcePrice : undefined,
|
|
|
+ distribution : undefined,
|
|
|
+ companyName : undefined,
|
|
|
+ unitPrice : undefined,
|
|
|
+ unitNumber : undefined,
|
|
|
+ amount : undefined,
|
|
|
+ pictureUrl : [],
|
|
|
})
|
|
|
this.loadData(flag ? '' : this.state.page)
|
|
|
},
|
|
@@ -2198,7 +2206,9 @@ const Task = React.createClass({
|
|
|
}
|
|
|
|
|
|
//refundStatus 0-待审核 ,1-审核通过,2-审核拒绝
|
|
|
- if(!this.state.reason && (this.state.refundStatus === 2 || typeof this.state.refundStatus === 'undefined')){
|
|
|
+ //类型为供应商时不需要发起原因
|
|
|
+ //this.state.startType 0外包 1供应商
|
|
|
+ if(!this.state.reason && (this.state.refundStatus === 2 || typeof this.state.refundStatus === 'undefined') && this.state.startType !== 1){
|
|
|
message.warning('发起原因不能为空')
|
|
|
return
|
|
|
}
|
|
@@ -2236,7 +2246,9 @@ const Task = React.createClass({
|
|
|
}
|
|
|
|
|
|
//refundStatus 0-待审核 ,1-审核通过,2-审核拒绝 审核被驳回时和第一次发起外包时,要填写发起原因
|
|
|
- if(_this.state.refundStatus === 2 || typeof _this.state.refundStatus === 'undefined'){
|
|
|
+ //this.state.startType 0外包 1供应商
|
|
|
+ //类型为外包时不需要传 发起原因
|
|
|
+ if((_this.state.refundStatus === 2 || typeof _this.state.refundStatus === 'undefined') && _this.state.startType !== 1){
|
|
|
data.reason = _this.state.reason
|
|
|
}
|
|
|
|
|
@@ -2269,7 +2281,10 @@ const Task = React.createClass({
|
|
|
if (!data.error.length) {
|
|
|
resolve();
|
|
|
message.success('提交成功!')
|
|
|
- _this.visitCancel()
|
|
|
+ _this.waiDetail();
|
|
|
+ _this.thirdTable(_this.state.tid);
|
|
|
+ _this.getSelectOutsourceLog(_this.state.tid);
|
|
|
+ _this.payNodeTable(_this.state.tid)
|
|
|
} else {
|
|
|
reject();
|
|
|
message.warning(data.error[0].message)
|
|
@@ -2312,9 +2327,9 @@ const Task = React.createClass({
|
|
|
waiDetail() {
|
|
|
let url = window.location.href.substring(7)
|
|
|
this.setState({
|
|
|
- loading: true,
|
|
|
+ waiDetailLoading: true,
|
|
|
})
|
|
|
- $.ajax({
|
|
|
+ let ajaxObj = $.ajax({
|
|
|
method: 'get',
|
|
|
dataType: 'json',
|
|
|
crossDomain: false,
|
|
@@ -2326,9 +2341,6 @@ const Task = React.createClass({
|
|
|
},
|
|
|
}).done(
|
|
|
function (data) {
|
|
|
- this.setState({
|
|
|
- loading: false,
|
|
|
- })
|
|
|
if (!data.error.length && data.data) {
|
|
|
if(data.data.unitNumber){
|
|
|
this.setState({
|
|
@@ -2377,16 +2389,27 @@ const Task = React.createClass({
|
|
|
: [], //图片地址
|
|
|
createTimes: data.data.createTimes,
|
|
|
auditTimes: data.data.auditTimes,
|
|
|
+ },()=>{
|
|
|
+ this.setState({
|
|
|
+ waiDetailLoading: false,
|
|
|
+ })
|
|
|
})
|
|
|
} else if (data.error && data.error.length) {
|
|
|
- message.warning(data.error[0].message)
|
|
|
+ message.warning(data.error[0].message);
|
|
|
+ this.setState({
|
|
|
+ waiDetailLoading: false,
|
|
|
+ })
|
|
|
} else if (!data.data) {
|
|
|
this.setState({
|
|
|
refundStatus: undefined,
|
|
|
+ waiDetailLoading: false,
|
|
|
})
|
|
|
}
|
|
|
}.bind(this)
|
|
|
)
|
|
|
+ this.setState({
|
|
|
+ orderOutsourceDtailsAjaxObj: ajaxObj
|
|
|
+ })
|
|
|
},
|
|
|
rizhi() {
|
|
|
this.setState({
|
|
@@ -2615,9 +2638,9 @@ const Task = React.createClass({
|
|
|
//查看第三方信息表格
|
|
|
thirdTable(id) {
|
|
|
this.setState({
|
|
|
- loading: true,
|
|
|
+ thirdInfoLoading: true,
|
|
|
})
|
|
|
- $.ajax({
|
|
|
+ let ajaxObj = $.ajax({
|
|
|
method: 'get',
|
|
|
dataType: 'json',
|
|
|
crossDomain: false,
|
|
@@ -2629,12 +2652,13 @@ const Task = React.createClass({
|
|
|
if (data.error && data.error.length) {
|
|
|
message.warning(data.error[0].message)
|
|
|
} else {
|
|
|
- let companyNameArr = []
|
|
|
- let theArr = []
|
|
|
- let thisData = []
|
|
|
- let arr = data.data || []
|
|
|
- let allTotalAmount = 0
|
|
|
+ let companyNameArr = [];
|
|
|
+ let theArr = [];
|
|
|
+ let thisData = [];
|
|
|
+ let arr = data.data || [];
|
|
|
+ let allTotalAmount = 0;
|
|
|
let type = 0;
|
|
|
+ let startType = 0;
|
|
|
let patentNameType = 0;
|
|
|
for (let i = 0; i < arr.length; i++) {
|
|
|
thisData = arr[i]
|
|
@@ -2644,7 +2668,8 @@ const Task = React.createClass({
|
|
|
thisData.key = i;
|
|
|
thisData.patentType = thisData.type;
|
|
|
theArr.push(thisData);
|
|
|
- type=thisData.type
|
|
|
+ type=thisData.type;
|
|
|
+ startType=thisData.startType;
|
|
|
patentNameType= thisData.patentNameType
|
|
|
}
|
|
|
if (!allTotalAmount) {
|
|
@@ -2666,6 +2691,11 @@ const Task = React.createClass({
|
|
|
})
|
|
|
}
|
|
|
|
|
|
+ //设置项目类型
|
|
|
+ this.setState({
|
|
|
+ startType: startType
|
|
|
+ })
|
|
|
+
|
|
|
this.setState({
|
|
|
tid: id,
|
|
|
PayNodeCompany: companyNameArr,
|
|
@@ -2679,10 +2709,13 @@ const Task = React.createClass({
|
|
|
}).always(
|
|
|
function () {
|
|
|
this.setState({
|
|
|
- loading: false,
|
|
|
+ thirdInfoLoading: false,
|
|
|
})
|
|
|
}.bind(this)
|
|
|
)
|
|
|
+ this.setState({
|
|
|
+ selectCompanyAjaxObj:ajaxObj
|
|
|
+ })
|
|
|
},
|
|
|
//外包日志列表
|
|
|
getSelectOutsourceLog(tid){
|
|
@@ -2721,9 +2754,9 @@ const Task = React.createClass({
|
|
|
},
|
|
|
payNodeTable(id) {
|
|
|
this.setState({
|
|
|
- loading: true,
|
|
|
+ payNodeLoading: true,
|
|
|
})
|
|
|
- $.ajax({
|
|
|
+ let ajaxObj = $.ajax({
|
|
|
method: 'get',
|
|
|
dataType: 'json',
|
|
|
crossDomain: false,
|
|
@@ -2771,7 +2804,6 @@ const Task = React.createClass({
|
|
|
payNodeArr[d].companyName = payNodeArr[d].companyName+ '-' + payNodeArr[d].cid;
|
|
|
}
|
|
|
|
|
|
- console.log('payNodeArr:', payNodeArr)
|
|
|
this.setState({
|
|
|
tid: id,
|
|
|
payNodeList: payNodeArr,
|
|
@@ -2781,10 +2813,13 @@ const Task = React.createClass({
|
|
|
}).always(
|
|
|
function () {
|
|
|
this.setState({
|
|
|
- loading: false,
|
|
|
+ payNodeLoading: false,
|
|
|
})
|
|
|
}.bind(this)
|
|
|
)
|
|
|
+ this.setState({
|
|
|
+ selectPaymentNodeAjaxObj: ajaxObj
|
|
|
+ })
|
|
|
},
|
|
|
// 新增第三方供应商信息
|
|
|
addThirdList() {
|
|
@@ -3382,8 +3417,19 @@ const Task = React.createClass({
|
|
|
title=""
|
|
|
width="900px"
|
|
|
visible={this.state.visible}
|
|
|
- onOk={this.visitOk}
|
|
|
- onCancel={this.visitCancel}
|
|
|
+ maskClosable={false}
|
|
|
+ onOk={()=>{
|
|
|
+ this.visitOk();
|
|
|
+ this.state.selectCompanyAjaxObj ? this.state.selectCompanyAjaxObj.abort() : null;
|
|
|
+ this.state.selectPaymentNodeAjaxObj ? this.state.selectPaymentNodeAjaxObj.abort() : null;
|
|
|
+ this.state.orderOutsourceDtailsAjaxObj ? this.state.orderOutsourceDtailsAjaxObj.abort() : null;
|
|
|
+ }}
|
|
|
+ onCancel={()=>{
|
|
|
+ this.visitCancel();
|
|
|
+ this.state.selectCompanyAjaxObj ? this.state.selectCompanyAjaxObj.abort() : null;
|
|
|
+ this.state.selectPaymentNodeAjaxObj ? this.state.selectPaymentNodeAjaxObj.abort() : null;
|
|
|
+ this.state.orderOutsourceDtailsAjaxObj ? this.state.orderOutsourceDtailsAjaxObj.abort() : null;
|
|
|
+ }}
|
|
|
>
|
|
|
<Tabs
|
|
|
tabBarExtraContent={
|
|
@@ -4238,6 +4284,7 @@ const Task = React.createClass({
|
|
|
}
|
|
|
>
|
|
|
<Radio.Group
|
|
|
+ disabled={this.state.payNodeLoading || this.state.thirdInfoLoading}
|
|
|
value={this.state.startType}
|
|
|
onChange={(e) => {
|
|
|
let _this = this;
|
|
@@ -4289,6 +4336,7 @@ const Task = React.createClass({
|
|
|
}
|
|
|
>
|
|
|
<Radio.Group
|
|
|
+ disabled={this.state.payNodeLoading || this.state.thirdInfoLoading}
|
|
|
value={this.state.patentType}
|
|
|
onChange={(e) => {
|
|
|
let _this = this;
|
|
@@ -4339,6 +4387,7 @@ const Task = React.createClass({
|
|
|
}
|
|
|
>
|
|
|
<Radio.Group
|
|
|
+ disabled={this.state.payNodeLoading || this.state.thirdInfoLoading}
|
|
|
value={this.state.patentNameType}
|
|
|
onChange={(e) => {
|
|
|
let _this = this;
|
|
@@ -4413,9 +4462,9 @@ const Task = React.createClass({
|
|
|
type="primary"
|
|
|
onClick={(e) => {
|
|
|
//this.state.startType 0外包 1供应商 类型为外包时,当普通单
|
|
|
- if(this.state.projectType === 1 && this.state.patentType === -1 && this.state.startType === 1){
|
|
|
+ if(this.state.projectType === 1 && this.state.patentType === -1){
|
|
|
message.info('请先选择专利类型');
|
|
|
- }else if(this.state.projectType === 1 && this.state.patentNameType === -1 && this.state.startType === 1){
|
|
|
+ }else if(this.state.projectType === 1 && this.state.patentNameType === -1){
|
|
|
message.info('请先选择专利名称');
|
|
|
} else{
|
|
|
this.addThirdList()
|
|
@@ -4437,7 +4486,7 @@ const Task = React.createClass({
|
|
|
display: this.state.type == 1 ? 'block' : 'block',
|
|
|
}}
|
|
|
>
|
|
|
- <Spin spinning={this.state.loading}>
|
|
|
+ <Spin spinning={this.state.thirdInfoLoading}>
|
|
|
<Form layout="horizontal">
|
|
|
<Table
|
|
|
pagination={false}
|
|
@@ -4498,7 +4547,7 @@ const Task = React.createClass({
|
|
|
display: this.state.startType === 0 ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2? 'none' : 'block'), //0正常 1专利 2软著 3审计
|
|
|
}}
|
|
|
>
|
|
|
- <Spin spinning={this.state.loading}>
|
|
|
+ <Spin spinning={this.state.payNodeLoading}>
|
|
|
<Form layout="horizontal">
|
|
|
<Table
|
|
|
pagination={false}
|
|
@@ -4540,29 +4589,29 @@ 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>*/}
|
|
|
+ <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={{
|
|
@@ -4592,8 +4641,9 @@ const Task = React.createClass({
|
|
|
<p style={{ color: 'red' }}>图片建议:要清晰。</p>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
- {/*只有审核拒绝和第一次发起外包的时候才要填写发起原因*/}
|
|
|
- {typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2 ? <div className="clearfix">
|
|
|
+ {/*只有审核拒绝和第一次发起外包的时候才要填写发起原因 如果是类型为供应商则不需要发起原因*/}
|
|
|
+ {/*this.state.startType 0外包 1供应商*/}
|
|
|
+ {(typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2) && this.state.startType !== 1 ? <div className="clearfix">
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
@@ -4781,6 +4831,12 @@ const Task = React.createClass({
|
|
|
pictureUrl={this.state.contractPictureUrl}
|
|
|
/> : <div/>}
|
|
|
</Spin>
|
|
|
+ <OrderRiZi
|
|
|
+ dataSourcerizhi={this.state.dataSourceY}
|
|
|
+ closeOrderLog={this.closeOrderLog}
|
|
|
+ visible={this.state.avisible}
|
|
|
+ loading={this.state.loading}
|
|
|
+ />
|
|
|
</TabPane>
|
|
|
) : (
|
|
|
''
|
|
@@ -4937,11 +4993,22 @@ const Task = React.createClass({
|
|
|
</Spin>
|
|
|
</Form>
|
|
|
</Modal> : <div/>}
|
|
|
- <Modal
|
|
|
+ {this.state.speVisible ? <Modal
|
|
|
maskClosable={false}
|
|
|
visible={this.state.speVisible}
|
|
|
- onOk={this.visitOk}
|
|
|
- onCancel={this.visitCancel}
|
|
|
+ onOk={()=>{
|
|
|
+ this.visitOk();
|
|
|
+ this.state.selectCompanyAjaxObj ? this.state.selectCompanyAjaxObj.abort() : null;
|
|
|
+ this.state.selectPaymentNodeAjaxObj ? this.state.selectPaymentNodeAjaxObj.abort() : null;
|
|
|
+ this.state.orderOutsourceDtailsAjaxObj ? this.state.orderOutsourceDtailsAjaxObj.abort() : null;
|
|
|
+
|
|
|
+ }}
|
|
|
+ onCancel={()=>{
|
|
|
+ this.visitCancel();
|
|
|
+ this.state.selectCompanyAjaxObj ? this.state.selectCompanyAjaxObj.abort() : null;
|
|
|
+ this.state.selectPaymentNodeAjaxObj ? this.state.selectPaymentNodeAjaxObj.abort() : null;
|
|
|
+ this.state.orderOutsourceDtailsAjaxObj ? this.state.orderOutsourceDtailsAjaxObj.abort() : null;
|
|
|
+ }}
|
|
|
width="900px"
|
|
|
title=""
|
|
|
footer=""
|
|
@@ -5295,7 +5362,7 @@ const Task = React.createClass({
|
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
|
label=""
|
|
|
- ></FormItem>
|
|
|
+ />
|
|
|
<FormItem className="half-item" {...formItemLayout} label="">
|
|
|
<Input
|
|
|
placeholder="请输入详细地址"
|
|
@@ -5515,6 +5582,7 @@ const Task = React.createClass({
|
|
|
}
|
|
|
>
|
|
|
<Radio.Group
|
|
|
+ disabled={this.state.payNodeLoading || this.state.thirdInfoLoading}
|
|
|
value={this.state.startType}
|
|
|
onChange={(e) => {
|
|
|
let _this = this;
|
|
@@ -5566,6 +5634,7 @@ const Task = React.createClass({
|
|
|
}
|
|
|
>
|
|
|
<Radio.Group
|
|
|
+ disabled={this.state.payNodeLoading || this.state.thirdInfoLoading}
|
|
|
value={this.state.patentType}
|
|
|
onChange={(e) => {
|
|
|
let _this = this;
|
|
@@ -5616,6 +5685,7 @@ const Task = React.createClass({
|
|
|
}
|
|
|
>
|
|
|
<Radio.Group
|
|
|
+ disabled={this.state.payNodeLoading || this.state.thirdInfoLoading}
|
|
|
value={this.state.patentNameType}
|
|
|
onChange={(e) => {
|
|
|
let _this = this;
|
|
@@ -5690,9 +5760,9 @@ const Task = React.createClass({
|
|
|
type="primary"
|
|
|
onClick={(e) => {
|
|
|
//this.state.startType 类型为外包时,当普通单
|
|
|
- if(this.state.projectType === 1 && this.state.patentType === -1 && this.state.startType === 1){
|
|
|
+ if(this.state.projectType === 1 && this.state.patentType === -1){
|
|
|
message.info('请先选择专利类型');
|
|
|
- }else if(this.state.projectType === 1 && this.state.patentNameType === -1 && this.state.startType === 1){
|
|
|
+ }else if(this.state.projectType === 1 && this.state.patentNameType === -1){
|
|
|
message.info('请先选择专利名称');
|
|
|
} else{
|
|
|
this.addThirdList()
|
|
@@ -5714,7 +5784,7 @@ const Task = React.createClass({
|
|
|
display: this.state.type == 1 ? 'block' : 'block',
|
|
|
}}
|
|
|
>
|
|
|
- <Spin spinning={this.state.loading}>
|
|
|
+ <Spin spinning={this.state.thirdInfoLoading}>
|
|
|
<Form layout="horizontal">
|
|
|
<Table
|
|
|
pagination={false}
|
|
@@ -5774,7 +5844,7 @@ const Task = React.createClass({
|
|
|
display: this.state.startType === 0 ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2? 'none' : 'block'), //0正常 1专利 2软著 3审计
|
|
|
}}
|
|
|
>
|
|
|
- <Spin spinning={this.state.loading}>
|
|
|
+ <Spin spinning={this.state.payNodeLoading}>
|
|
|
<Form layout="horizontal">
|
|
|
<Table
|
|
|
pagination={false}
|
|
@@ -5816,29 +5886,29 @@ 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>*/}
|
|
|
+ <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={{
|
|
@@ -5868,8 +5938,9 @@ const Task = React.createClass({
|
|
|
<p style={{ color: 'red' }}>图片建议:要清晰。</p>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
- {/*只有审核拒绝和第一次发起外包的时候才要填写发起原因*/}
|
|
|
- {typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2 ? <div className="clearfix">
|
|
|
+ {/*只有审核拒绝和第一次发起外包的时候才要填写发起原因 如果是类型为供应商则不需要发起原因*/}
|
|
|
+ {/*this.state.startType 0外包 1供应商*/}
|
|
|
+ {(typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2) && this.state.startType !== 1 ? <div className="clearfix">
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
@@ -6062,7 +6133,7 @@ const Task = React.createClass({
|
|
|
''
|
|
|
)}
|
|
|
</Tabs>
|
|
|
- </Modal>
|
|
|
+ </Modal> : <div/>}
|
|
|
<Modal
|
|
|
width="800px"
|
|
|
visible={this.state.visibleA}
|
|
@@ -6110,6 +6181,8 @@ const Task = React.createClass({
|
|
|
tid={this.state.tid}
|
|
|
patentType={this.state.patentType}
|
|
|
projectType={this.state.startType === 0 ? 0 : this.state.projectType}
|
|
|
+ realProjectType={this.state.projectType} //真实的项目类型
|
|
|
+ startType={this.state.startType} //项目类型 0外包 1供应商
|
|
|
thirdCompanyName={this.state.thirdCompanyName}
|
|
|
thirdUnitPrice={this.state.thirdUnitPrice}
|
|
|
thirdQuantity={this.state.thirdQuantity}
|