|
@@ -1027,22 +1027,6 @@ const Task = React.createClass({
|
|
申请付款
|
|
申请付款
|
|
</Button>
|
|
</Button>
|
|
}
|
|
}
|
|
- {
|
|
|
|
- <Button
|
|
|
|
- type="primary"
|
|
|
|
- style={{
|
|
|
|
- marginLeft: '10px',
|
|
|
|
- }}
|
|
|
|
- disabled={!(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)}
|
|
|
|
- onClick={() => {
|
|
|
|
- this.setState({
|
|
|
|
- previewPayVisible: true,
|
|
|
|
- previewPayInfor: record,
|
|
|
|
- })
|
|
|
|
- }}>
|
|
|
|
- 付官费
|
|
|
|
- </Button>
|
|
|
|
- }
|
|
|
|
<Popconfirm
|
|
<Popconfirm
|
|
title="是否删除?"
|
|
title="是否删除?"
|
|
onConfirm={() => {
|
|
onConfirm={() => {
|
|
@@ -1682,6 +1666,8 @@ const Task = React.createClass({
|
|
commodityQuantity:thisdata.commodityQuantity, //派单项目数
|
|
commodityQuantity:thisdata.commodityQuantity, //派单项目数
|
|
timeRecord: thisdata.timeRecord || '{}',//项目状态JSON
|
|
timeRecord: thisdata.timeRecord || '{}',//项目状态JSON
|
|
timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},//项目状态JSON
|
|
timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},//项目状态JSON
|
|
|
|
+ checkStatus:thisdata.checkStatus,//核对状态
|
|
|
|
+ patentTypeName:thisdata.patentTypeName
|
|
})
|
|
})
|
|
}
|
|
}
|
|
}.bind(this),
|
|
}.bind(this),
|
|
@@ -2333,7 +2319,13 @@ const Task = React.createClass({
|
|
id: _this.state.refundStatus === 2 ? _this.state.mid : undefined,//被拒绝外包申请时,需要传id
|
|
id: _this.state.refundStatus === 2 ? _this.state.mid : undefined,//被拒绝外包申请时,需要传id
|
|
}
|
|
}
|
|
|
|
|
|
- if(_this.state.startType !== 0){
|
|
+ for(let i of Object.keys(data)){
|
|
|
|
+ if(data[i] === null){
|
|
|
|
+ delete data[i];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if(_this.state.startType !== 0 && _this.state.patentType === 1){
|
|
data.actualOfficial = _this.state.containOfficialFees;//0实际已缴费 1实际未缴费
|
|
data.actualOfficial = _this.state.containOfficialFees;//0实际已缴费 1实际未缴费
|
|
}
|
|
}
|
|
|
|
|
|
@@ -4544,19 +4536,6 @@ const Task = React.createClass({
|
|
<Radio value={1}>供应商信息</Radio>
|
|
<Radio value={1}>供应商信息</Radio>
|
|
</Radio.Group>
|
|
</Radio.Group>
|
|
</FormItem>
|
|
</FormItem>
|
|
- <PatentCheck
|
|
|
|
- style={{
|
|
|
|
- position:"absolute",
|
|
|
|
- right: '102px',
|
|
|
|
- border: '1px solid rgb(199 187 187)',
|
|
|
|
- padding:'20px 18px 20px 20px'
|
|
|
|
- }}
|
|
|
|
- id={this.state.id}
|
|
|
|
- projectType={this.state.projectType} //项目类型
|
|
|
|
- startType={this.state.startType} //1供应商 0外包
|
|
|
|
- orderTaskOfficialCost={this.state.orderTaskOfficialCost} //1含官费 0不含官费
|
|
|
|
- orderTaskCostReduction={this.state.orderTaskCostReduction} //1有费减 0无费减
|
|
|
|
- />
|
|
|
|
</div>
|
|
</div>
|
|
{/* 专利类型 */}
|
|
{/* 专利类型 */}
|
|
<div
|
|
<div
|
|
@@ -4677,21 +4656,39 @@ const Task = React.createClass({
|
|
</FormItem>
|
|
</FormItem>
|
|
</div>
|
|
</div>
|
|
{/*外包类型无此选项*/}
|
|
{/*外包类型无此选项*/}
|
|
- {this.state.orderTaskOfficialCost === 1 && this.state.startType !== 0 ? <div className="clearfix">
|
|
+ {this.state.startType !== 0 && this.state.projectType === 1 ? <div className="clearfix">
|
|
<FormItem
|
|
<FormItem
|
|
className="half-item"
|
|
className="half-item"
|
|
- labelCol={{ span: 4 }}
|
|
+ labelCol={{ span: 3 }}
|
|
- wrapperCol={{ span: 14 }}
|
|
+ wrapperCol={{ span: 15 }}
|
|
label={<span>官费</span>}>
|
|
label={<span>官费</span>}>
|
|
- <Radio.Group
|
|
+ {
|
|
- value={this.state.containOfficialFees}
|
|
+ this.state.patentType === 1 ?
|
|
- onChange={(e) => {
|
|
+ <Radio.Group
|
|
- this.setState({ containOfficialFees: e.target.value })
|
|
+ value={this.state.containOfficialFees}
|
|
- }}
|
|
+ onChange={(e) => {
|
|
- >
|
|
+ this.setState({ containOfficialFees: e.target.value })
|
|
- <Radio value={0}>实际已缴费</Radio>
|
|
+ }}
|
|
- <Radio value={1}>实际未缴费</Radio>
|
|
+ >
|
|
- </Radio.Group>
|
|
+ <Radio value={0}>实际已缴费</Radio>
|
|
|
|
+ <Radio value={1}>实际未缴费</Radio>
|
|
|
|
+ </Radio.Group>:
|
|
|
|
+ <PatentCheck
|
|
|
|
+ style={{
|
|
|
|
+ display:'flex',
|
|
|
|
+ alignItems:'center',
|
|
|
|
+ }}
|
|
|
|
+ id={this.state.id}
|
|
|
|
+ checkStatus={this.state.checkStatus} //核对状态
|
|
|
|
+ projectType={this.state.projectType} //项目类型
|
|
|
|
+ patentType={this.state.patentType} //专利类型
|
|
|
|
+ startType={this.state.startType} //1供应商 0外包
|
|
|
|
+ orderTaskOfficialCost={this.state.orderTaskOfficialCost} //1含官费 0不含官费
|
|
|
|
+ orderTaskCostReduction={this.state.orderTaskCostReduction} //1有费减 0无费减
|
|
|
|
+ isPreviewPay={false}
|
|
|
|
+ status={this.state.refundStatus}
|
|
|
|
+ />
|
|
|
|
+ }
|
|
</FormItem>
|
|
</FormItem>
|
|
</div> : <div/>}
|
|
</div> : <div/>}
|
|
{/* 第三方信息专利 */}
|
|
{/* 第三方信息专利 */}
|
|
@@ -4951,6 +4948,9 @@ const Task = React.createClass({
|
|
this.state.visible && this.state.activeKey === '2' ?
|
|
this.state.visible && this.state.activeKey === '2' ?
|
|
<CheckProject
|
|
<CheckProject
|
|
{...this.props}
|
|
{...this.props}
|
|
|
|
+ patentTypeName={this.state.patentTypeName} //官费类型
|
|
|
|
+ commodityQuantity={this.state.commodityQuantity} //项目数量
|
|
|
|
+ checkStatus={this.state.checkStatus} //核对状态
|
|
orderTaskOfficialCost={this.state.orderTaskOfficialCost} //是否含官费 0无1有
|
|
orderTaskOfficialCost={this.state.orderTaskOfficialCost} //是否含官费 0无1有
|
|
orderTaskCostReduction={this.state.orderTaskCostReduction} //是否含费减 0无1有
|
|
orderTaskCostReduction={this.state.orderTaskCostReduction} //是否含费减 0无1有
|
|
containOfficialFees={this.state.containOfficialFees} //0:实际已缴费 1:实际未缴费
|
|
containOfficialFees={this.state.containOfficialFees} //0:实际已缴费 1:实际未缴费
|
|
@@ -6019,21 +6019,39 @@ const Task = React.createClass({
|
|
</Radio.Group>
|
|
</Radio.Group>
|
|
</FormItem>
|
|
</FormItem>
|
|
</div>
|
|
</div>
|
|
- {this.state.orderTaskOfficialCost === 1 && this.state.startType !== 0 ? <div className="clearfix">
|
|
+ {this.state.startType !== 0 && this.state.projectType === 1 ? <div className="clearfix">
|
|
<FormItem
|
|
<FormItem
|
|
className="half-item"
|
|
className="half-item"
|
|
- labelCol={{ span: 4 }}
|
|
+ labelCol={{ span: 3 }}
|
|
- wrapperCol={{ span: 14 }}
|
|
+ wrapperCol={{ span: 15 }}
|
|
label={<span>官费</span>}>
|
|
label={<span>官费</span>}>
|
|
- <Radio.Group
|
|
+ {
|
|
- value={this.state.containOfficialFees}
|
|
+ this.state.patentType === 1 ?
|
|
- onChange={(e) => {
|
|
+ <Radio.Group
|
|
- this.setState({ containOfficialFees: e.target.value })
|
|
+ value={this.state.containOfficialFees}
|
|
- }}
|
|
+ onChange={(e) => {
|
|
- >
|
|
+ this.setState({ containOfficialFees: e.target.value })
|
|
- <Radio value={0}>实际已缴费</Radio>
|
|
+ }}
|
|
- <Radio value={1}>实际未缴费</Radio>
|
|
+ >
|
|
- </Radio.Group>
|
|
+ <Radio value={0}>实际已缴费</Radio>
|
|
|
|
+ <Radio value={1}>实际未缴费</Radio>
|
|
|
|
+ </Radio.Group>:
|
|
|
|
+ <PatentCheck
|
|
|
|
+ style={{
|
|
|
|
+ display:'flex',
|
|
|
|
+ alignItems:'center',
|
|
|
|
+ }}
|
|
|
|
+ id={this.state.id}
|
|
|
|
+ checkStatus={this.state.checkStatus} //核对状态
|
|
|
|
+ projectType={this.state.projectType} //项目类型
|
|
|
|
+ patentType={this.state.patentType} //专利类型
|
|
|
|
+ startType={this.state.startType} //1供应商 0外包
|
|
|
|
+ orderTaskOfficialCost={this.state.orderTaskOfficialCost} //1含官费 0不含官费
|
|
|
|
+ orderTaskCostReduction={this.state.orderTaskCostReduction} //1有费减 0无费减
|
|
|
|
+ isPreviewPay={false}
|
|
|
|
+ status={this.state.refundStatus}
|
|
|
|
+ />
|
|
|
|
+ }
|
|
</FormItem>
|
|
</FormItem>
|
|
</div> : <div/>}
|
|
</div> : <div/>}
|
|
{/* 第三方信息专利 */}
|
|
{/* 第三方信息专利 */}
|
|
@@ -6273,6 +6291,7 @@ const Task = React.createClass({
|
|
<CheckProject
|
|
<CheckProject
|
|
{...this.props}
|
|
{...this.props}
|
|
tid={this.state.tid}
|
|
tid={this.state.tid}
|
|
|
|
+ checkStatus={this.state.checkStatus} //核对状态
|
|
orderTaskOfficialCost={this.state.orderTaskOfficialCost} //是否含官费 0无1有
|
|
orderTaskOfficialCost={this.state.orderTaskOfficialCost} //是否含官费 0无1有
|
|
containOfficialFees={this.state.containOfficialFees} //0:实际已缴费 1:实际未缴费
|
|
containOfficialFees={this.state.containOfficialFees} //0:实际已缴费 1:实际未缴费
|
|
oldInfor={this.state.oldInfor}
|
|
oldInfor={this.state.oldInfor}
|