|
@@ -229,10 +229,12 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
theArr.push({
|
|
|
key: i,
|
|
|
id: thisdata.id,//年报ID
|
|
|
+ uid: thisdata.uid,//客户ID
|
|
|
year:thisdata.year,//年份
|
|
|
salesAmount: thisdata.salesAmount,//营销额
|
|
|
researchAmount: thisdata.researchAmount,//研发费用
|
|
|
assets: thisdata.assets,//总资产
|
|
|
+ fixedAssets:thisdata.fixedAssets,//固定资产
|
|
|
aid: thisdata.aid,//录入人
|
|
|
});
|
|
|
};
|
|
@@ -281,6 +283,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
theArr.push({
|
|
|
key: i,
|
|
|
id: thisdata.id,//用户ID
|
|
|
+ uid: thisdata.uid,//客户ID
|
|
|
projectName:thisdata.projectName,//项目名称
|
|
|
year: thisdata.year,//年份
|
|
|
status: thisdata.status?thisdata.status.toString():"",//项目状态
|
|
@@ -430,7 +433,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
dataIndex: 'year',
|
|
|
key: 'year',
|
|
|
}, {
|
|
|
- title: '营销额(万)',
|
|
|
+ title: '营销收入(万)',
|
|
|
dataIndex: 'salesAmount',
|
|
|
key: 'salesAmount',
|
|
|
},
|
|
@@ -438,6 +441,11 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
title: '总资产(万)',
|
|
|
dataIndex: 'assets',
|
|
|
key: 'assets'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '固定资产(万)',
|
|
|
+ dataIndex: 'fixedAssets',
|
|
|
+ key: 'fixedAssets'
|
|
|
}, {
|
|
|
title: '研发费用(万)',
|
|
|
dataIndex: 'researchAmount',
|
|
@@ -547,6 +555,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
resetc() {
|
|
|
this.state.id=undefined;//年报ID
|
|
|
this.state.assets=undefined;//总资产
|
|
|
+ this.state.fixedAssets=undefined;//固定资产
|
|
|
this.state.researchAmount=undefined;//研发费用
|
|
|
this.state.salesAmount = undefined;//销售额
|
|
|
this.state.year = undefined;//年份清零
|
|
@@ -780,6 +789,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
year:this.state.year,//年份
|
|
|
researchAmount:this.state.researchAmount,//研发费用
|
|
|
assets:this.state.assets,//总资产
|
|
|
+ fixedAssets:this.state.fixedAssets,//固定资产
|
|
|
salesAmount:this.state.salesAmount,//销售额
|
|
|
}
|
|
|
}).done(function(data) {
|
|
@@ -1180,6 +1190,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
year:record.year.toString(),//年份
|
|
|
id:record.id,//年报详情ID
|
|
|
assets:record.assets,//总资产
|
|
|
+ fixedAssets:record.fixedAssets,//固定资产
|
|
|
researchAmount:record.researchAmount,//研发费用
|
|
|
salesAmount:record.salesAmount,//销售额
|
|
|
});
|
|
@@ -1641,7 +1652,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
if(isPDF[isIndex]=="pdf"){
|
|
|
message.success(`${info.file.name} 文件上传成功!`);
|
|
|
}else{
|
|
|
- message.success("请上传pdf文件!");
|
|
|
+ message.error("请上传pdf文件!");
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1773,9 +1784,9 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
<div className="clearfix" >
|
|
|
<FormItem
|
|
|
{...formItemLayoutc}
|
|
|
- label="销售额"
|
|
|
+ label="营销收入"
|
|
|
>
|
|
|
- <Input placeholder="销售额" style={{width:'90%'}} value={this.state.salesAmount} onChange={(e) => {
|
|
|
+ <Input placeholder="营销收入" style={{width:'90%'}} value={this.state.salesAmount} onChange={(e) => {
|
|
|
this.setState({ salesAmount: e.target.value }) }} />万
|
|
|
</FormItem>
|
|
|
</div>
|
|
@@ -1791,6 +1802,15 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
<div className="clearfix" >
|
|
|
<FormItem
|
|
|
{...formItemLayoutc}
|
|
|
+ label="固定资产"
|
|
|
+ >
|
|
|
+ <Input placeholder="总资产" style={{width:'90%'}} value={this.state.fixedAssets} onChange={(e) => {
|
|
|
+ this.setState({ fixedAssets: e.target.value }) }} />万
|
|
|
+ </FormItem>
|
|
|
+ </div>
|
|
|
+ <div className="clearfix" >
|
|
|
+ <FormItem
|
|
|
+ {...formItemLayoutc}
|
|
|
label="研发费用"
|
|
|
>
|
|
|
<Input placeholder="研发费用" style={{width:'90%'}} value={this.state.researchAmount} onChange={(e) => {
|