|
@@ -10,8 +10,7 @@ const ExpressDesc = React.createClass({
|
|
getInitialState() {
|
|
getInitialState() {
|
|
return {
|
|
return {
|
|
visible: false,
|
|
visible: false,
|
|
- loading: false,
|
|
|
|
- theBool: true
|
|
|
|
|
|
+ loading: false
|
|
};
|
|
};
|
|
},
|
|
},
|
|
showModal() {
|
|
showModal() {
|
|
@@ -30,6 +29,7 @@ const ExpressDesc = React.createClass({
|
|
url: globalConfig.context + "/techservice/patent/saveRecieveSend",
|
|
url: globalConfig.context + "/techservice/patent/saveRecieveSend",
|
|
data: {
|
|
data: {
|
|
"rid": this.props.data.rid,
|
|
"rid": this.props.data.rid,
|
|
|
|
+ "pid": this.props.data.pid,
|
|
"acceptanceReceiveTime": this.state.acceptanceReceiveTime,
|
|
"acceptanceReceiveTime": this.state.acceptanceReceiveTime,
|
|
"acceptanceIssueTime": this.state.acceptanceIssueTime,
|
|
"acceptanceIssueTime": this.state.acceptanceIssueTime,
|
|
"acceptanceTrackingNumber": this.state.acceptanceTrackingNumber,
|
|
"acceptanceTrackingNumber": this.state.acceptanceTrackingNumber,
|
|
@@ -67,7 +67,7 @@ const ExpressDesc = React.createClass({
|
|
},
|
|
},
|
|
componentWillReceiveProps(nextProps) {
|
|
componentWillReceiveProps(nextProps) {
|
|
this.state.visible = nextProps.showDesc;
|
|
this.state.visible = nextProps.showDesc;
|
|
- if (this.state.theBool && nextProps.data) {
|
|
|
|
|
|
+ if (nextProps.data) {
|
|
this.state.acceptanceReceiveTime = nextProps.data.acceptanceReceiveTime;
|
|
this.state.acceptanceReceiveTime = nextProps.data.acceptanceReceiveTime;
|
|
this.state.acceptanceIssueTime = nextProps.data.acceptanceIssueTime;
|
|
this.state.acceptanceIssueTime = nextProps.data.acceptanceIssueTime;
|
|
this.state.acceptanceTrackingNumber = nextProps.data.acceptanceTrackingNumber;
|
|
this.state.acceptanceTrackingNumber = nextProps.data.acceptanceTrackingNumber;
|
|
@@ -77,15 +77,13 @@ const ExpressDesc = React.createClass({
|
|
this.state.certificateRecieveTime = nextProps.data.certificateRecieveTime;
|
|
this.state.certificateRecieveTime = nextProps.data.certificateRecieveTime;
|
|
this.state.certificateIssueTime = nextProps.data.certificateIssueTime;
|
|
this.state.certificateIssueTime = nextProps.data.certificateIssueTime;
|
|
this.state.certificateTrackingNumber = nextProps.data.certificateTrackingNumber;
|
|
this.state.certificateTrackingNumber = nextProps.data.certificateTrackingNumber;
|
|
- this.state.theBool = false;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ };
|
|
},
|
|
},
|
|
render() {
|
|
render() {
|
|
let theData = this.props.data;
|
|
let theData = this.props.data;
|
|
if (this.props.data) {
|
|
if (this.props.data) {
|
|
return (
|
|
return (
|
|
- <div className="payment-desc">
|
|
|
|
|
|
+ <div className="express-desc">
|
|
<Spin spinning={this.state.loading} className='spin-box'>
|
|
<Spin spinning={this.state.loading} className='spin-box'>
|
|
<Modal title="收发登记详情" visible={this.state.visible}
|
|
<Modal title="收发登记详情" visible={this.state.visible}
|
|
onOk={this.handleOk} onCancel={this.handleCancel}
|
|
onOk={this.handleOk} onCancel={this.handleCancel}
|
|
@@ -99,73 +97,73 @@ const ExpressDesc = React.createClass({
|
|
<p className="widthHalf"><span>专利号:</span>{theData.patentNumber}</p>
|
|
<p className="widthHalf"><span>专利号:</span>{theData.patentNumber}</p>
|
|
<p className="widthHalf"><span>专利名:</span>{theData.patentName}</p>
|
|
<p className="widthHalf"><span>专利名:</span>{theData.patentName}</p>
|
|
</div>
|
|
</div>
|
|
- <Row>
|
|
|
|
- <Col span={4}>收发内容</Col>
|
|
|
|
|
|
+ <Row className="express-desc-row">
|
|
|
|
+ <Col span={3}>收发内容</Col>
|
|
<Col span={4}>收到时间</Col>
|
|
<Col span={4}>收到时间</Col>
|
|
<Col span={4}>发出时间</Col>
|
|
<Col span={4}>发出时间</Col>
|
|
- <Col span={6}>发出快递单号</Col>
|
|
|
|
- <Col span={6}>发出快递公司</Col>
|
|
|
|
|
|
+ <Col span={5}>发出快递单号</Col>
|
|
|
|
+ <Col span={5}>发出快递公司</Col>
|
|
</Row>
|
|
</Row>
|
|
- <Row>
|
|
|
|
- <Col span={4}>受理通知书</Col>
|
|
|
|
|
|
+ <Row className="express-desc-row">
|
|
|
|
+ <Col span={3}>受理通知书</Col>
|
|
<Col span={4}>
|
|
<Col span={4}>
|
|
<DatePicker
|
|
<DatePicker
|
|
- value={moment(this.state.acceptanceReceiveTime)}
|
|
|
|
|
|
+ value={this.state.acceptanceReceiveTime ? moment(this.state.acceptanceReceiveTime) : null}
|
|
onChange={(data, dataString) => { this.setState({ acceptanceReceiveTime: dataString }); }} />
|
|
onChange={(data, dataString) => { this.setState({ acceptanceReceiveTime: dataString }); }} />
|
|
</Col>
|
|
</Col>
|
|
<Col span={4}>
|
|
<Col span={4}>
|
|
<DatePicker
|
|
<DatePicker
|
|
- value={moment(this.state.acceptanceIssueTime)}
|
|
|
|
|
|
+ value={this.state.acceptanceIssueTime ? moment(this.state.acceptanceIssueTime) : null}
|
|
onChange={(data, dataString) => { this.setState({ acceptanceIssueTime: dataString }); }} />
|
|
onChange={(data, dataString) => { this.setState({ acceptanceIssueTime: dataString }); }} />
|
|
</Col>
|
|
</Col>
|
|
- <Col span={6}>
|
|
|
|
|
|
+ <Col span={5}>
|
|
<Input value={this.state.acceptanceTrackingNumber}
|
|
<Input value={this.state.acceptanceTrackingNumber}
|
|
onChange={(e) => { this.setState({ acceptanceTrackingNumber: e.target.value }); }} />
|
|
onChange={(e) => { this.setState({ acceptanceTrackingNumber: e.target.value }); }} />
|
|
</Col>
|
|
</Col>
|
|
- <Col span={6}>
|
|
|
|
|
|
+ <Col span={5}>
|
|
<Select defaultValue="顺丰">
|
|
<Select defaultValue="顺丰">
|
|
<Select.Option value="顺丰">顺丰</Select.Option>
|
|
<Select.Option value="顺丰">顺丰</Select.Option>
|
|
</Select>
|
|
</Select>
|
|
</Col>
|
|
</Col>
|
|
</Row>
|
|
</Row>
|
|
- <Row>
|
|
|
|
- <Col span={4}>授权通知书</Col>
|
|
|
|
|
|
+ <Row className="express-desc-row">
|
|
|
|
+ <Col span={3}>授权通知书</Col>
|
|
<Col span={4}>
|
|
<Col span={4}>
|
|
<DatePicker
|
|
<DatePicker
|
|
- value={moment(this.state.authorizationReceiveTime)}
|
|
|
|
|
|
+ value={this.state.authorizationReceiveTime ? moment(this.state.authorizationReceiveTime) : null}
|
|
onChange={(data, dataString) => { this.setState({ authorizationReceiveTime: dataString }); }} />
|
|
onChange={(data, dataString) => { this.setState({ authorizationReceiveTime: dataString }); }} />
|
|
</Col>
|
|
</Col>
|
|
<Col span={4}>
|
|
<Col span={4}>
|
|
<DatePicker
|
|
<DatePicker
|
|
- value={moment(this.state.authorizationIssueTime)}
|
|
|
|
|
|
+ value={this.state.authorizationIssueTime ? moment(this.state.authorizationIssueTime) : null}
|
|
onChange={(data, dataString) => { this.setState({ authorizationIssueTime: dataString }); }} />
|
|
onChange={(data, dataString) => { this.setState({ authorizationIssueTime: dataString }); }} />
|
|
</Col>
|
|
</Col>
|
|
- <Col span={6}>
|
|
|
|
|
|
+ <Col span={5}>
|
|
<Input value={this.state.authorizationTrackingNumber}
|
|
<Input value={this.state.authorizationTrackingNumber}
|
|
onChange={(e) => { this.setState({ authorizationTrackingNumber: e.target.value }); }} />
|
|
onChange={(e) => { this.setState({ authorizationTrackingNumber: e.target.value }); }} />
|
|
</Col>
|
|
</Col>
|
|
- <Col span={6}>
|
|
|
|
|
|
+ <Col span={5}>
|
|
<Select defaultValue="顺丰">
|
|
<Select defaultValue="顺丰">
|
|
<Select.Option value="顺丰">顺丰</Select.Option>
|
|
<Select.Option value="顺丰">顺丰</Select.Option>
|
|
</Select>
|
|
</Select>
|
|
</Col>
|
|
</Col>
|
|
</Row>
|
|
</Row>
|
|
- <Row>
|
|
|
|
- <Col span={4}>专利证书</Col>
|
|
|
|
|
|
+ <Row className="express-desc-row">
|
|
|
|
+ <Col span={3}>专利证书</Col>
|
|
<Col span={4}>
|
|
<Col span={4}>
|
|
<DatePicker
|
|
<DatePicker
|
|
- value={moment(this.state.certificateRecieveTime)}
|
|
|
|
|
|
+ value={this.state.certificateRecieveTime ? moment(this.state.certificateRecieveTime) : null}
|
|
onChange={(data, dataString) => { this.setState({ certificateRecieveTime: dataString }); }} />
|
|
onChange={(data, dataString) => { this.setState({ certificateRecieveTime: dataString }); }} />
|
|
</Col>
|
|
</Col>
|
|
<Col span={4}>
|
|
<Col span={4}>
|
|
- <DatePicker value={moment(this.state.certificateIssueTime)}
|
|
|
|
|
|
+ <DatePicker value={this.state.certificateIssueTime ? moment(this.state.certificateIssueTime) : null}
|
|
onChange={(data, dataString) => { this.setState({ certificateIssueTime: dataString }); }} />
|
|
onChange={(data, dataString) => { this.setState({ certificateIssueTime: dataString }); }} />
|
|
</Col>
|
|
</Col>
|
|
- <Col span={6}>
|
|
|
|
|
|
+ <Col span={5}>
|
|
<Input value={this.state.certificateTrackingNumber}
|
|
<Input value={this.state.certificateTrackingNumber}
|
|
onChange={(e) => { this.setState({ certificateTrackingNumber: e.target.value }); }} />
|
|
onChange={(e) => { this.setState({ certificateTrackingNumber: e.target.value }); }} />
|
|
</Col>
|
|
</Col>
|
|
- <Col span={6}>
|
|
|
|
|
|
+ <Col span={5}>
|
|
<Select defaultValue="顺丰">
|
|
<Select defaultValue="顺丰">
|
|
<Select.Option value="顺丰">顺丰</Select.Option>
|
|
<Select.Option value="顺丰">顺丰</Select.Option>
|
|
</Select>
|
|
</Select>
|