|
@@ -418,8 +418,7 @@ const Addorders = Form.create()(
|
|
|
},
|
|
|
|
|
|
//新建订单、编辑订单保存
|
|
|
- handleSubmit(e) {
|
|
|
- e.preventDefault();
|
|
|
+ handleSubmit() {
|
|
|
let theorgCodeUrl = [];
|
|
|
if (this.state.orgCodeUrl.length) {
|
|
|
let picArr = [];
|
|
@@ -434,30 +433,17 @@ const Addorders = Form.create()(
|
|
|
});
|
|
|
theorgCodeUrl = picArr.join(",");
|
|
|
}
|
|
|
- if (this.props.userDetaile) {
|
|
|
- if (!this.state.totalAmount) {
|
|
|
- message.warning("签单金额不能为空");
|
|
|
- this.refs.signFirstPayment.focus();
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (!this.state.firstAmount) {
|
|
|
- message.warning("首付金额不能为空");
|
|
|
- this.refs.signFirstPayment.focus();
|
|
|
- return false;
|
|
|
- }
|
|
|
+ if (this.props.data) {
|
|
|
if (!theorgCodeUrl) {
|
|
|
message.warning("图片过大,上传失败");
|
|
|
- this.refs.signFirstPayment.focus();
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.state.signDate) {
|
|
|
message.warning("签单日期不能为空");
|
|
|
- this.refs.signFirstPayment.focus();
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.state.orderRemarks) {
|
|
|
message.warning("订单留言不能为空");
|
|
|
- this.refs.signFirstPayment.focus();
|
|
|
return false;
|
|
|
}
|
|
|
} else {
|
|
@@ -465,9 +451,6 @@ const Addorders = Form.create()(
|
|
|
this.setState({
|
|
|
loading: true
|
|
|
});
|
|
|
- // let api = this.props.userDetaile
|
|
|
- // ? "/api/admin/newOrder/updateServiceOrderNew"
|
|
|
- // : "/api/admin/newOrder/createOrder";
|
|
|
let api = "/api/admin/newOrder/updateServiceOrderNew";
|
|
|
$.ajax({
|
|
|
method: "POST",
|
|
@@ -475,12 +458,6 @@ const Addorders = Form.create()(
|
|
|
crossDomain: false,
|
|
|
url: globalConfig.context + api,
|
|
|
data:
|
|
|
- // !this.props.userDetaile
|
|
|
- // ? {
|
|
|
- // uid: this.state.autoId,
|
|
|
- // orderType: this.state.orderType
|
|
|
- // }
|
|
|
- // :
|
|
|
{
|
|
|
orderNo: this.state.orderNo, //订单编号
|
|
|
totalAmount: this.state.totalAmount, //总金额
|
|
@@ -1408,12 +1385,6 @@ const Addorders = Form.create()(
|
|
|
|
|
|
return (
|
|
|
<div>
|
|
|
- <Form
|
|
|
- layout="horizontal"
|
|
|
- onSubmit={this.handleSubmit}
|
|
|
- id="demand-form"
|
|
|
- style={{ paddingBottom: "40px" }}
|
|
|
- >
|
|
|
<Spin spinning={this.state.loading}>
|
|
|
<div className="clearfix">
|
|
|
<FormItem
|
|
@@ -1838,7 +1809,9 @@ const Addorders = Form.create()(
|
|
|
wrapperCol={{ span: 16 }}
|
|
|
label="订单留言"
|
|
|
>
|
|
|
- <span>{this.state.orderRemarks}</span>
|
|
|
+ <p style={{ width: 500, wordWrap: "break-word" }}>
|
|
|
+ {this.state.orderRemarks}
|
|
|
+ </p>
|
|
|
</FormItem>
|
|
|
)}
|
|
|
</div>
|
|
@@ -1967,7 +1940,7 @@ const Addorders = Form.create()(
|
|
|
<Button
|
|
|
className="cancel"
|
|
|
type="primary"
|
|
|
- onClick={this.handleCancels}
|
|
|
+ onClick={this.handleCancelq}
|
|
|
style={{ marginRight: 40 }}
|
|
|
htmlType="submit"
|
|
|
>
|
|
@@ -1978,7 +1951,6 @@ const Addorders = Form.create()(
|
|
|
""
|
|
|
)}
|
|
|
</Spin>
|
|
|
- </Form>
|
|
|
<Modal
|
|
|
maskClosable={false}
|
|
|
visible={this.state.addnextVisible}
|