|
@@ -57,6 +57,8 @@ import DeclarationProgress from "../../../common/declarationProgress";
|
|
|
import OrderItemStatus from "../../../common/orderItemStatus";
|
|
|
import ProjectLog from "./projectLog";
|
|
|
import EnterpriseNameChange from "../../../common/enterpriseNameChange";
|
|
|
+import PatentCheck from "../../../common/patentCheck";
|
|
|
+import ProjectOperation from "../../../common/projectOperation";
|
|
|
const FormItem = Form.Item;
|
|
|
const { Option } = Select;
|
|
|
const { TextArea } = Input;
|
|
@@ -1095,6 +1097,7 @@ const MyTaskOutsource = React.createClass({
|
|
|
outsourcePrice: thisdata.outsourcePrice, //外包价格
|
|
|
declarationBatch: thisdata.declarationBatch,
|
|
|
orderTaskOfficialCost: thisdata.officialCost, //官费 0无 1有
|
|
|
+ orderTaskCostReduction: thisdata.costReduction,//费减
|
|
|
bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
|
|
|
specialComment: thisdata.specialComment,
|
|
|
urgentDay: thisdata.urgentDay, //有无材料
|
|
@@ -1109,6 +1112,8 @@ const MyTaskOutsource = React.createClass({
|
|
|
commodityQuantity:thisdata.commodityQuantity, //派单项目数PatentSchedule
|
|
|
timeRecord: thisdata.timeRecord || '{}',//项目状态JSON
|
|
|
timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},//项目状态JSON
|
|
|
+ checkStatus:thisdata.checkStatus,//核对状态
|
|
|
+ patentTypeName:thisdata.patentTypeName
|
|
|
});
|
|
|
}
|
|
|
}.bind(this),
|
|
@@ -1633,36 +1638,17 @@ const MyTaskOutsource = React.createClass({
|
|
|
},
|
|
|
nextCancel() {
|
|
|
this.setState({
|
|
|
- addnextVisible: false,
|
|
|
- displayFees: "none",
|
|
|
- costReduction: '',
|
|
|
- officialCost: '',
|
|
|
+ projectOperationVisible: false,
|
|
|
+ dataInfor:{},
|
|
|
+ },()=>{
|
|
|
+ this.xiangmu(this.state.orderNo);
|
|
|
});
|
|
|
},
|
|
|
//点击打卡项目详情
|
|
|
tableRowClickX(record) {
|
|
|
- if (record.type == "1") {
|
|
|
- this.setState({
|
|
|
- displayFees: "block",
|
|
|
- costReduction: record.costReduction,
|
|
|
- officialCost: record.officialCost,
|
|
|
- });
|
|
|
- }else{
|
|
|
- this.setState({
|
|
|
- displayFees: "none",
|
|
|
- });
|
|
|
- }
|
|
|
this.setState({
|
|
|
- jid: record.id, //项目ID
|
|
|
- kid: record.commodityId, //商品ID
|
|
|
- commodityName: record.commodityName, //金额
|
|
|
- commodityPrice: record.commodityPrice, //金额
|
|
|
- commodityQuantity: record.commodityQuantity, //数量
|
|
|
- taskComment: record.taskComment, //备注
|
|
|
- taskCommentData: record.taskComment, //原项目说明
|
|
|
- main: record.main.toString(), //是否为主要
|
|
|
- addnextVisible: true,
|
|
|
- addState: 0,
|
|
|
+ projectOperationVisible:true,
|
|
|
+ dataInfor:record,
|
|
|
});
|
|
|
},
|
|
|
//关闭添加工时
|
|
@@ -2490,22 +2476,22 @@ const MyTaskOutsource = React.createClass({
|
|
|
申请付款
|
|
|
</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>
|
|
|
- }
|
|
|
+ {/*{*/}
|
|
|
+ {/* <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
|
|
|
title="是否删除?"
|
|
|
onConfirm={() => {
|
|
@@ -4385,21 +4371,40 @@ const MyTaskOutsource = React.createClass({
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
{/*外包类型无此选项*/}
|
|
|
- {this.state.orderTaskOfficialCost === 1 && this.state.startType !== 0 ? <div className="clearfix">
|
|
|
+ {this.state.startType !== 0 && this.state.projectType === 1 ? <div className="clearfix">
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
|
- labelCol={{ span: 4 }}
|
|
|
- wrapperCol={{ span: 14 }}
|
|
|
+ labelCol={{ span: 3 }}
|
|
|
+ wrapperCol={{ span: 15 }}
|
|
|
label={<span>官费</span>}>
|
|
|
- <Radio.Group
|
|
|
- value={this.state.containOfficialFees}
|
|
|
- onChange={(e) => {
|
|
|
- this.setState({ containOfficialFees: e.target.value })
|
|
|
- }}
|
|
|
- >
|
|
|
- <Radio value={0}>实际已缴费</Radio>
|
|
|
- <Radio value={1}>实际未缴费</Radio>
|
|
|
- </Radio.Group>
|
|
|
+ {
|
|
|
+ this.state.patentType === 1 ?
|
|
|
+ <Radio.Group
|
|
|
+ value={this.state.containOfficialFees}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({ containOfficialFees: e.target.value })
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ <Radio value={0}>实际已缴费</Radio>
|
|
|
+ <Radio value={1}>实际未缴费</Radio>
|
|
|
+ </Radio.Group>:
|
|
|
+ <PatentCheck
|
|
|
+ style={{
|
|
|
+ display:'flex',
|
|
|
+ alignItems:'center',
|
|
|
+ }}
|
|
|
+ id={this.state.id}
|
|
|
+ patentTypeName={this.props.patentTypeName}
|
|
|
+ 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={true}
|
|
|
+ status={this.state.refundStatus}
|
|
|
+ />
|
|
|
+ }
|
|
|
</FormItem>
|
|
|
</div> : <div/>}
|
|
|
{/* 第三方信息专利 */}
|
|
@@ -4628,6 +4633,10 @@ const MyTaskOutsource = React.createClass({
|
|
|
<CheckProject
|
|
|
{...this.props}
|
|
|
tid={this.state.tid}
|
|
|
+ orderTaskCostReduction={this.state.orderTaskCostReduction} //是否含费减 0无1有
|
|
|
+ patentTypeName={this.state.patentTypeName} //官费类型
|
|
|
+ commodityQuantity={this.state.commodityQuantity} //项目数量
|
|
|
+ checkStatus={this.state.checkStatus}
|
|
|
orderTaskOfficialCost={this.state.orderTaskOfficialCost} //是否含官费 0无1有
|
|
|
containOfficialFees={this.state.containOfficialFees} //0:实际已缴费 1:实际未缴费
|
|
|
status={this.state.refundStatus}
|
|
@@ -4757,80 +4766,13 @@ const MyTaskOutsource = 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}</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.projectOperationVisible ? <ProjectOperation
|
|
|
+ readOnly={this.state.dataInfor && Object.keys(this.state.dataInfor).length > 0 && this.state.processStatus !== 0}
|
|
|
+ orderNo={this.state.orderNo}
|
|
|
+ visible={this.state.projectOperationVisible}
|
|
|
+ dataInfor={this.state.dataInfor}
|
|
|
+ onCancel={this.nextCancel}
|
|
|
+ /> : null}
|
|
|
<Modal
|
|
|
maskClosable={false}
|
|
|
visible={this.state.speVisible}
|
|
@@ -5484,6 +5426,10 @@ const MyTaskOutsource = React.createClass({
|
|
|
{this.state.speVisible && this.state.modKey === '2'?<CheckProject
|
|
|
{...this.props}
|
|
|
tid={this.state.tid}
|
|
|
+ orderTaskCostReduction={this.state.orderTaskCostReduction} //是否含费减 0无1有
|
|
|
+ patentTypeName={this.state.patentTypeName} //官费类型
|
|
|
+ commodityQuantity={this.state.commodityQuantity} //项目数量
|
|
|
+ checkStatus={this.state.checkStatus}
|
|
|
orderTaskOfficialCost={this.state.orderTaskOfficialCost} //是否含官费 0无1有
|
|
|
containOfficialFees={this.state.containOfficialFees} //0:实际已缴费 1:实际未缴费
|
|
|
status={this.state.refundStatus}
|