diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 222bfad5a..6d0a09feb 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -55,7 +55,8 @@ const OrderupdateMilepost = Loadable({ }) const OrderupdateDetail = Loadable({ - loader: () => import('../Order/UpdateDetail'), + // loader: () => import('../Order/UpdateDetail'), + loader: () => import('../Order/order_form'), loading: Loading, }) @@ -700,16 +701,16 @@ class Detail extends Component { (props) => () } > - {/* 修改详情 updatedetail*/} - () + (props) => () } > {/* 复制详情 copyetail*/} () + (props) => () } > diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index b0c82acd5..09a5958e1 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -273,7 +273,7 @@ class Detail extends Component { 编辑 diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js index 55126e3a1..6e661d69d 100644 --- a/src/forge/Order/OrderItem.js +++ b/src/forge/Order/OrderItem.js @@ -94,7 +94,7 @@ class OrderItem extends Component { user_admin_or_member ?
- +
diff --git a/src/forge/Order/UpdateDetail.js b/src/forge/Order/UpdateDetail.js index 0bf4f0f13..06fae4d1a 100644 --- a/src/forge/Order/UpdateDetail.js +++ b/src/forge/Order/UpdateDetail.js @@ -4,6 +4,7 @@ import OrderForm from './order_form' function CopyDetail(props){ const operateName = props.match.params.operateName; + console.log('operateName:'+operateName); return( ) diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index 8aa94cbc6..ef79eea8b 100644 --- a/src/forge/Order/order_form.js +++ b/src/forge/Order/order_form.js @@ -169,11 +169,12 @@ class order_form extends Component { // 创建 handleSubmit = () => { - this.setState({ - isSpin: true, - }); + this.props.form.validateFieldsAndScroll((err, values) => { if (!err) { + this.setState({ + isSpin: true, + }); const { form_type } = this.props; const { projectsId , orderId , owner } = this.props.match.params; @@ -247,9 +248,6 @@ class order_form extends Component { }); } } - this.setState({ - isSpin: false, - }); }); };