|
@@ -25,7 +25,7 @@ import {
|
|
|
Icon,
|
|
|
Upload,
|
|
|
AutoComplete,
|
|
|
- Tag,
|
|
|
+ Tag, Row,
|
|
|
} from 'antd'
|
|
|
import Assign from '@/manageCenter/publicComponent/assign'
|
|
|
import { areaSelect } from '@/NewDicProvinceList'
|
|
@@ -1387,9 +1387,11 @@ const Task = React.createClass({
|
|
|
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
|
|
|
this.getCsortData(localStorage.getItem('cSort'))
|
|
|
this.projectTypeTabContent(record.projectType)
|
|
@@ -2167,6 +2169,12 @@ const Task = React.createClass({
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ //refundStatus 0-待审核 ,1-审核通过,2-审核拒绝
|
|
|
+ if(!this.state.reason && this.state.refundStatus === 2){
|
|
|
+ message.warning('发起原因不能为空')
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
// if (!this.state.pictureUrl && !Array.isArray(this.state.pictureUrl)) {
|
|
|
// message.warning('合同扫描件不能为空')
|
|
|
// return
|
|
@@ -2199,6 +2207,11 @@ const Task = React.createClass({
|
|
|
id: _this.state.refundStatus == 2 ? _this.state.mid : undefined,
|
|
|
}
|
|
|
|
|
|
+ //refundStatus 0-待审核 ,1-审核通过,2-审核拒绝 审核被驳回时,要填写发起原因
|
|
|
+ if(_this.state.refundStatus === 2){
|
|
|
+ data.reason = _this.state.reason
|
|
|
+ }
|
|
|
+
|
|
|
if (_this.state.projectType === 1) {
|
|
|
data.patentType = _this.state.patentType;
|
|
|
data.patentNameType = _this.state.patentNameType;
|
|
@@ -2634,6 +2647,33 @@ const Task = React.createClass({
|
|
|
}.bind(this)
|
|
|
)
|
|
|
},
|
|
|
+ //外包日志列表
|
|
|
+ getSelectOutsourceLog(tid){
|
|
|
+ $.ajax({
|
|
|
+ method: 'get',
|
|
|
+ dataType: 'json',
|
|
|
+ crossDomain: false,
|
|
|
+ url: globalConfig.context + '/api/admin/outsourceOrg/selectOutsourceLog',
|
|
|
+ data: {
|
|
|
+ tid: tid,
|
|
|
+ },
|
|
|
+ success: function (data) {
|
|
|
+ if (data.error.length) {
|
|
|
+ if (data.error && data.error.length) {
|
|
|
+ message.warning(data.error[0].message);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.setState({
|
|
|
+ outsourceLogs: data.data
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }.bind(this),
|
|
|
+ }).always(
|
|
|
+ function () {
|
|
|
+
|
|
|
+ }.bind(this)
|
|
|
+ )
|
|
|
+ },
|
|
|
payNodeTable(id) {
|
|
|
this.setState({
|
|
|
loadData: true,
|
|
@@ -3295,7 +3335,8 @@ const Task = React.createClass({
|
|
|
if (e == 2) {
|
|
|
this.waiDetail();
|
|
|
this.thirdTable(this.state.tid);
|
|
|
- this.payNodeTable(this.state.tid)
|
|
|
+ this.payNodeTable(this.state.tid);
|
|
|
+ this.getSelectOutsourceLog(this.state.tid);
|
|
|
}
|
|
|
}}
|
|
|
>
|
|
@@ -4450,6 +4491,29 @@ const Task = React.createClass({
|
|
|
<p style={{ color: 'red' }}>图片建议:要清晰。</p>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
+ {/*只有审核拒绝的时候才要填写发起原因*/}
|
|
|
+ {this.state.refundStatus === 2 ? <div className="clearfix">
|
|
|
+ <FormItem
|
|
|
+ className="half-item"
|
|
|
+ {...formItemLayout}
|
|
|
+ label={
|
|
|
+ <span>
|
|
|
+ <strong style={{ color: '#f00' }}>*</strong>发起原因
|
|
|
+ </span>
|
|
|
+ }
|
|
|
+ >
|
|
|
+ <TextArea
|
|
|
+ rows={4}
|
|
|
+ value={this.state.reason}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({
|
|
|
+ reason: e.target.value,
|
|
|
+ })
|
|
|
+ }}
|
|
|
+ placeholder="请输入发起原因"
|
|
|
+ />
|
|
|
+ </FormItem>
|
|
|
+ </div> : <div/>}
|
|
|
<div className="clearfix">
|
|
|
<div
|
|
|
style={{
|
|
@@ -4498,6 +4562,7 @@ const Task = React.createClass({
|
|
|
onRefresh={()=>{
|
|
|
this.waiDetail();
|
|
|
this.thirdTable(this.state.tid);
|
|
|
+ this.getSelectOutsourceLog(this.state.tid);
|
|
|
this.payNodeTable(this.state.tid)
|
|
|
this.loadData(this.state.page)
|
|
|
}}
|
|
@@ -4507,46 +4572,94 @@ const Task = React.createClass({
|
|
|
)}
|
|
|
{(this.state.refundStatus == 1 ||
|
|
|
this.state.refundStatus == 0 ||
|
|
|
- this.state.refundStatus == 2) && this.state.startType !== 1 ? (
|
|
|
- <div className="clearfix">
|
|
|
+ this.state.refundStatus == 2) &&
|
|
|
+ this.state.startType !== 1
|
|
|
+ ? (
|
|
|
+ <div className="clearfix"
|
|
|
+ style={{
|
|
|
+ display: this.state.refundStatus == 0 ? 'none' : 'block',
|
|
|
+ }}
|
|
|
+ >
|
|
|
<hr className="division" />
|
|
|
- <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>
|
|
|
+ {parseInt(this.state.startType) !== 1 ? <div style={{
|
|
|
+ color:'#F00',
|
|
|
+ fontWeight: 'bolder',
|
|
|
+ paddingBottom: '20px',
|
|
|
+ }}>
|
|
|
+ 审核结果: <span style={{paddingLeft:'20px'}}>{getRefundStatus(this.state.refundStatus)}</span>
|
|
|
</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 className="outsourceLogList">
|
|
|
+ {
|
|
|
+ this.state.outsourceLogs && this.state.outsourceLogs.map((value,index)=>(
|
|
|
+ <div key={index} className="outsourceLogItem outsource">
|
|
|
+ <div style={{
|
|
|
+ display:'flex',
|
|
|
+ flexFlow:'row nowrap',
|
|
|
+ paddingBottom: '3px',
|
|
|
+ paddingTop: '3px',
|
|
|
+ }}>
|
|
|
+ <div>
|
|
|
+ {value.aname}
|
|
|
+ </div>
|
|
|
+ <div style={{paddingLeft:'5px'}}>
|
|
|
+ {
|
|
|
+ value.status === 0 ?
|
|
|
+ <Tag color="#2db7f5">发起外包审核</Tag> :
|
|
|
+ value.status === 1 ? <Tag color="#87d068">通过</Tag> :
|
|
|
+ <Tag color="#f50">驳回</Tag>
|
|
|
+ }
|
|
|
+ </div>
|
|
|
+ <div style={{
|
|
|
+ wordBreak: 'break-all',
|
|
|
+ maxWidth:'67%',
|
|
|
+ }}>
|
|
|
+ {value.remarks}
|
|
|
+ </div>
|
|
|
+ <div style={{paddingLeft: '10px'}}>
|
|
|
+ {value.createTimes}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ ))
|
|
|
+ }
|
|
|
</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>
|
|
|
) : (
|
|
|
''
|