Commit b72770a0 authored by superman's avatar superman

1.3.4 -2

parent 19ebdb02
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -12,6 +12,7 @@ const Home = ({location}) => { ...@@ -12,6 +12,7 @@ const Home = ({location}) => {
<p> <p>
1. BUG修复: 订单合同物流单号设置。<br/> 1. BUG修复: 订单合同物流单号设置。<br/>
2. BUG修复: 自定义消息推送BUG; 自定义消息详情展示时微信渠道去除多余字段<br/> 2. BUG修复: 自定义消息推送BUG; 自定义消息详情展示时微信渠道去除多余字段<br/>
3. BUG修复: 报单审核失败时输出拒绝理由<br/>
</p> </p>
<h3>2016-08-18 更新 1.3.3</h3> <h3>2016-08-18 更新 1.3.3</h3>
......
...@@ -211,13 +211,23 @@ export default class PassItem extends Component { ...@@ -211,13 +211,23 @@ export default class PassItem extends Component {
</Form.Item> </Form.Item>
{ {
isEdit && isEdit ?
<Form.Item label="拒绝理由" {...leftRightFormItemLayout}> <Form.Item label="拒绝理由" {...leftRightFormItemLayout}>
<Input placeholder="拒绝理由" <Input placeholder="拒绝理由"
{...getFieldProps('memo', { {...getFieldProps('memo', {
initialValue: audit.memo initialValue: audit.memo
})} /> })} />
</Form.Item> </Form.Item>
:
(
audit.status === 5 &&
<Form.Item label="拒绝理由" {...leftRightFormItemLayout}>
<p style={{color: '#f00'}}>
<Icon type="cross-circle-o" style={{marginRight: '.5em'}}/>
{audit.memo || NULL}
</p>
</Form.Item>
)
} }
<Form.Item wrapperCol={{span: 16, offset: 6}} style={{marginTop: 30}}> <Form.Item wrapperCol={{span: 16, offset: 6}} style={{marginTop: 30}}>
{ {
...@@ -255,12 +265,12 @@ export default class PassItem extends Component { ...@@ -255,12 +265,12 @@ export default class PassItem extends Component {
</Button> </Button>
{ {
audit.status == 9 && audit.status == 9 &&
<Button style={{marginLeft:'1em'}} type="ghost" onClick={e=>{ <Button style={{marginLeft: '1em'}} type="ghost" onClick={e=> {
e.stopPropagation(); e.stopPropagation();
const iframe = document.createElement('iframe'); const iframe = document.createElement('iframe');
iframe.src = '/zip/' + params.id + '.zip?id=' + params.id; iframe.src = '/zip/' + params.id + '.zip?id=' + params.id;
document.body.appendChild(iframe); document.body.appendChild(iframe);
setTimeout(()=>{ setTimeout(()=> {
document.body.removeChild(iframe); document.body.removeChild(iframe);
}, 10000); }, 10000);
}}>下载</Button> }}>下载</Button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment