|
@@ -115,7 +115,7 @@ const Order = Form.create()(
|
|
|
key: 'createTime'
|
|
|
},
|
|
|
{
|
|
|
- title: '订单金额',
|
|
|
+ title: '订单金额(万元)',
|
|
|
dataIndex: 'orderAmount',
|
|
|
key: 'orderAmount'
|
|
|
},
|
|
@@ -173,8 +173,8 @@ const Order = Form.create()(
|
|
|
|
|
|
//项目列表整行点击
|
|
|
tableRowClick(record, index) {
|
|
|
- this.state.RowData = record;
|
|
|
this.setState({
|
|
|
+ RowData:record,
|
|
|
editvisible: true
|
|
|
});
|
|
|
},
|
|
@@ -214,6 +214,7 @@ const Order = Form.create()(
|
|
|
};
|
|
|
const { RangePicker } = DatePicker;
|
|
|
const theData = this.state.RowData || {};
|
|
|
+ console.log(theData)
|
|
|
return (
|
|
|
<div className="user-content">
|
|
|
<div className="content-title">
|
|
@@ -304,7 +305,7 @@ const Order = Form.create()(
|
|
|
wrapperCol={{ span: 12 }}
|
|
|
label="订单编号"
|
|
|
>
|
|
|
- <span>{theData.name}</span>
|
|
|
+ <span>{theData.orderNo}</span>
|
|
|
</FormItem>
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -312,7 +313,7 @@ const Order = Form.create()(
|
|
|
wrapperCol={{ span: 12 }}
|
|
|
label="订单类型"
|
|
|
>
|
|
|
- <span>{getOrderType(theData.type)}</span>
|
|
|
+ <span>{getOrderType(theData.commodityType)}</span>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
@@ -322,7 +323,7 @@ const Order = Form.create()(
|
|
|
wrapperCol={{ span: 12 }}
|
|
|
label="订单日期"
|
|
|
>
|
|
|
- <span>{this.state.createTime}</span>
|
|
|
+ <span>{theData.createTime}</span>
|
|
|
</FormItem>
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -330,7 +331,7 @@ const Order = Form.create()(
|
|
|
wrapperCol={{ span: 12 }}
|
|
|
label="订单金额"
|
|
|
>
|
|
|
- <span>{theData.isHot ? theData.isHot + '万元' : ''}</span>
|
|
|
+ <span>{theData.orderAmount||theData.orderAmount=='0' ? theData.orderAmount + '万元' : ''}</span>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
@@ -340,7 +341,7 @@ const Order = Form.create()(
|
|
|
wrapperCol={{ span: 12 }}
|
|
|
label="项目名称"
|
|
|
>
|
|
|
- <span>{theData.name}</span>
|
|
|
+ <span>{theData.commodityName}</span>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
@@ -348,25 +349,9 @@ const Order = Form.create()(
|
|
|
className="half-item"
|
|
|
labelCol={{ span: 8 }}
|
|
|
wrapperCol={{ span: 12 }}
|
|
|
- label="买方名称"
|
|
|
- >
|
|
|
- <span>{theData.memberPrice1}</span>
|
|
|
- </FormItem>
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- labelCol={{ span: 8 }}
|
|
|
- wrapperCol={{ span: 12 }}
|
|
|
- label="卖方名称"
|
|
|
- >
|
|
|
- <span>{theData.activityFlag1}</span>
|
|
|
- </FormItem>
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- labelCol={{ span: 8 }}
|
|
|
- wrapperCol={{ span: 12 }}
|
|
|
label="买方联系人"
|
|
|
>
|
|
|
- <span>{theData.activityPrice}</span>
|
|
|
+ <span>{theData.buyerName}</span>
|
|
|
</FormItem>
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -374,7 +359,7 @@ const Order = Form.create()(
|
|
|
wrapperCol={{ span: 12 }}
|
|
|
label="卖方联系人"
|
|
|
>
|
|
|
- <span>{theData.offset}</span>
|
|
|
+ <span>{theData.sellerName}</span>
|
|
|
</FormItem>
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -382,7 +367,7 @@ const Order = Form.create()(
|
|
|
wrapperCol={{ span: 12 }}
|
|
|
label="买方联系方式"
|
|
|
>
|
|
|
- <span>{theData.memberPrice}</span>
|
|
|
+ <span>{theData.buyerMobile}</span>
|
|
|
</FormItem>
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -390,7 +375,7 @@ const Order = Form.create()(
|
|
|
wrapperCol={{ span: 12 }}
|
|
|
label="卖方联系方式"
|
|
|
>
|
|
|
- <span>{theData.activityFlag}</span>
|
|
|
+ <span>{theData.sellerMobile}</span>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
</Spin>
|