|
@@ -2207,7 +2207,7 @@ const Task = React.createClass({
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (this.state.pictureUrl && Array.isArray(this.state.pictureUrl) && this.state.pictureUrl.length !== 0){
|
|
|
+ if (_this.state.pictureUrl && Array.isArray(_this.state.pictureUrl) && _this.state.pictureUrl.length !== 0){
|
|
|
data.pictureUrl = _this.getUrl(_this.state.pictureUrl).length
|
|
|
? _this.getUrl(_this.state.pictureUrl)
|
|
|
: ''
|
|
@@ -2235,7 +2235,8 @@ const Task = React.createClass({
|
|
|
}
|
|
|
}.bind(_this)
|
|
|
)
|
|
|
- }).catch(() => console.log('Oops errors!'));
|
|
|
+
|
|
|
+ }).catch((err) => console.log(err));
|
|
|
},
|
|
|
onCancel() {},
|
|
|
});
|
|
@@ -2720,14 +2721,6 @@ const Task = React.createClass({
|
|
|
this.setState({
|
|
|
currentTotalPrice: currentTotalPrice,
|
|
|
})
|
|
|
- console.log(
|
|
|
- 'thirdUnitPrice:',
|
|
|
- this.state.thirdUnitPrice,
|
|
|
- 'thirdQuantity:',
|
|
|
- this.state.thirdQuantity,
|
|
|
- 'currentTotalPrice:',
|
|
|
- currentTotalPrice
|
|
|
- )
|
|
|
},
|
|
|
// 付款节点自动计算总金额
|
|
|
payNodeCalculatedAmount(num) {
|
|
@@ -2939,9 +2932,13 @@ const Task = React.createClass({
|
|
|
})
|
|
|
let id = '';
|
|
|
if(index === -1){
|
|
|
- this.state.thirdInfoList.map((value,index)=>{
|
|
|
- id+=value.id+',';
|
|
|
- })
|
|
|
+ if(this.state.thirdInfoList.length === 1){
|
|
|
+ id = this.state.thirdInfoList[0].id
|
|
|
+ }else{
|
|
|
+ this.state.thirdInfoList.map((value,index)=>{
|
|
|
+ id+=value.id+',';
|
|
|
+ })
|
|
|
+ }
|
|
|
}else{
|
|
|
id = index.id
|
|
|
}
|
|
@@ -3015,6 +3012,9 @@ const Task = React.createClass({
|
|
|
thirdMaterial: record.material, //有无材料
|
|
|
thirdUrgent: record.urgent, //加急情况
|
|
|
thirdRemarks: record.remarks,
|
|
|
+ audit: record.audit,//审计
|
|
|
+ assets: record.assets,//公司资产
|
|
|
+ income: record.income,//收入
|
|
|
})
|
|
|
},
|
|
|
//点击付款节点详情
|
|
@@ -3556,41 +3556,41 @@ const Task = React.createClass({
|
|
|
loading={this.state.loading}
|
|
|
/>
|
|
|
</div>
|
|
|
- <div className="clearfix">
|
|
|
- <h3 className="sub-title">外包信息</h3>
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="外包公司"
|
|
|
- >
|
|
|
- <Input
|
|
|
- value={this.state.outsourceName}
|
|
|
- onChange={(e) => {
|
|
|
- this.setState({
|
|
|
- outsourceName: e.target.value,
|
|
|
- })
|
|
|
- }}
|
|
|
- placeholder="请输入外包公司"
|
|
|
- style={{ width: '200px' }}
|
|
|
- />
|
|
|
- </FormItem>
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="外包成本(万元)"
|
|
|
- >
|
|
|
- <Input
|
|
|
- value={this.state.outsourcePrice}
|
|
|
- onChange={(e) => {
|
|
|
- this.setState({
|
|
|
- outsourcePrice: e.target.value,
|
|
|
- })
|
|
|
- }}
|
|
|
- placeholder="请输入外包成本"
|
|
|
- style={{ width: '200px' }}
|
|
|
- />
|
|
|
- </FormItem>
|
|
|
- </div>
|
|
|
+ {/*<div className="clearfix">*/}
|
|
|
+ {/* <h3 className="sub-title">外包信息</h3>*/}
|
|
|
+ {/* <FormItem*/}
|
|
|
+ {/* className="half-item"*/}
|
|
|
+ {/* {...formItemLayout}*/}
|
|
|
+ {/* label="外包公司"*/}
|
|
|
+ {/* >*/}
|
|
|
+ {/* <Input*/}
|
|
|
+ {/* value={this.state.outsourceName}*/}
|
|
|
+ {/* onChange={(e) => {*/}
|
|
|
+ {/* this.setState({*/}
|
|
|
+ {/* outsourceName: e.target.value,*/}
|
|
|
+ {/* })*/}
|
|
|
+ {/* }}*/}
|
|
|
+ {/* placeholder="请输入外包公司"*/}
|
|
|
+ {/* style={{ width: '200px' }}*/}
|
|
|
+ {/* />*/}
|
|
|
+ {/* </FormItem>*/}
|
|
|
+ {/* <FormItem*/}
|
|
|
+ {/* className="half-item"*/}
|
|
|
+ {/* {...formItemLayout}*/}
|
|
|
+ {/* label="外包成本(万元)"*/}
|
|
|
+ {/* >*/}
|
|
|
+ {/* <Input*/}
|
|
|
+ {/* value={this.state.outsourcePrice}*/}
|
|
|
+ {/* onChange={(e) => {*/}
|
|
|
+ {/* this.setState({*/}
|
|
|
+ {/* outsourcePrice: e.target.value,*/}
|
|
|
+ {/* })*/}
|
|
|
+ {/* }}*/}
|
|
|
+ {/* placeholder="请输入外包成本"*/}
|
|
|
+ {/* style={{ width: '200px' }}*/}
|
|
|
+ {/* />*/}
|
|
|
+ {/* </FormItem>*/}
|
|
|
+ {/*</div>*/}
|
|
|
{/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
|
|
|
<div className="clearfix">
|
|
|
<h3 className="sub-title">联系信息</h3>
|
|
@@ -4311,14 +4311,14 @@ const Task = React.createClass({
|
|
|
span={24}
|
|
|
offset={9}
|
|
|
style={{ marginTop: '15px' }}
|
|
|
- ></Col>
|
|
|
+ />
|
|
|
</Form>
|
|
|
</Spin>
|
|
|
</div>
|
|
|
+ {/*如果是软著类或者专利类,隐藏付款节点*/}
|
|
|
<div
|
|
|
style={{
|
|
|
- // display: this.state.type == 1 ? "block" : "none",
|
|
|
- display: this.state.type == 1 ? 'block' : 'block',
|
|
|
+ display: this.state.projectType === 1 || this.state.projectType === 2? 'none' : 'block', //0正常 1专利 2软著 3审计
|
|
|
}}
|
|
|
>
|
|
|
<span
|
|
@@ -4350,11 +4350,11 @@ const Task = React.createClass({
|
|
|
+新增付款节点
|
|
|
</Button>
|
|
|
</div>
|
|
|
+ {/*如果是软著类或者专利类,隐藏付款节点*/}
|
|
|
<div
|
|
|
className="clearfix"
|
|
|
style={{
|
|
|
- // display: this.state.type == 1 ? "block" : "none",
|
|
|
- display: this.state.type == 1 ? 'block' : 'block',
|
|
|
+ display: this.state.projectType === 1 || this.state.projectType === 2? 'none' : 'block', //0正常 1专利 2软著 3审计
|
|
|
}}
|
|
|
>
|
|
|
<Spin spinning={this.state.loading}>
|
|
@@ -5642,6 +5642,9 @@ const Task = React.createClass({
|
|
|
visible={this.state.ThirdListVisible}
|
|
|
thirdMaterial={this.state.thirdMaterial}
|
|
|
thirdUrgent={this.state.thirdUrgent}
|
|
|
+ audit={this.state.audit}
|
|
|
+ assets={this.state.assets}
|
|
|
+ income={this.state.income}
|
|
|
onDetermine={this.handleCancelq}
|
|
|
onCancel={()=>{
|
|
|
this.thirdTable(this.state.tid);
|
|
@@ -5655,6 +5658,9 @@ const Task = React.createClass({
|
|
|
thirdMaterial: '', //有无材料
|
|
|
thirdUrgent: 0, //加急情况
|
|
|
thirdRemarks: '',
|
|
|
+ audit: 0,
|
|
|
+ assets: '',
|
|
|
+ income: '',
|
|
|
})
|
|
|
}}
|
|
|
otherOperations={(data)=>{
|
|
@@ -5770,17 +5776,17 @@ const Task = React.createClass({
|
|
|
</div>
|
|
|
{this.state.projectType !== 2 ? <div className="clearfix">
|
|
|
<FormItem {...formItemLayout} label="总价(万元)">
|
|
|
- {/* <span>{this.state.currentTotalPrice}</span> */}
|
|
|
<Input
|
|
|
+ type={'number'}
|
|
|
value={this.state.currentTotalPrice}
|
|
|
- placeholder=""
|
|
|
+ placeholder="请输入总价"
|
|
|
// required="required"
|
|
|
// onBlur={this.payNodeCalculatedAmount}
|
|
|
- // onChange={(e) =>
|
|
|
- // this.setState({
|
|
|
- // toltalAmount: e.target.value,
|
|
|
- // })
|
|
|
- // }
|
|
|
+ onChange={(e) =>
|
|
|
+ this.setState({
|
|
|
+ currentTotalPrice: e.target.value,
|
|
|
+ })
|
|
|
+ }
|
|
|
style={{ width: '220px' }}
|
|
|
/>
|
|
|
<span className="mandatory">*</span>
|