|
@@ -100,6 +100,8 @@ const NewService = Form.create()(
|
|
|
type: thisdata.type,
|
|
|
officialCost: thisdata.officialCost,
|
|
|
costReduction: thisdata.costReduction,
|
|
|
+ declarationBatch: thisdata.declarationBatch,//申报批次
|
|
|
+ ifCertificationFee: String(thisdata.ifCertificationFee),//是否包含申报批次
|
|
|
});
|
|
|
}
|
|
|
}
|
|
@@ -2379,6 +2381,10 @@ const NewService = Form.create()(
|
|
|
displayFees: "none",
|
|
|
officialCost: "", //是否有官费
|
|
|
costReduction: "", //是否有费减
|
|
|
+ addProjectType: "",
|
|
|
+ ifCertificationFee: "",//是否包含认证费用
|
|
|
+ isIso: false,//是否为贯标项目
|
|
|
+ declarationBatch: '',
|
|
|
});
|
|
|
},
|
|
|
|
|
@@ -2761,7 +2767,6 @@ const NewService = Form.create()(
|
|
|
fwList.map(function (item) {
|
|
|
if (value == item.bname) {
|
|
|
kid = item;
|
|
|
- console.log(item);
|
|
|
}
|
|
|
});
|
|
|
if (kid.type == "1") {
|
|
@@ -2773,9 +2778,12 @@ const NewService = Form.create()(
|
|
|
displayFees: "none",
|
|
|
});
|
|
|
}
|
|
|
+ //0通用 1专利 2软著 3审计 4双软 5高新 6商标
|
|
|
this.setState({
|
|
|
commodityName: value,
|
|
|
gid: kid.id,
|
|
|
+ addProjectType: kid.type,
|
|
|
+ isIso: value.indexOf("贯标") !== -1,// 是否为贯标项目
|
|
|
//commodityPrice:kid.price==0?kid.price.toString():kid.price,
|
|
|
commodityFirstPayment:
|
|
|
kid.firstPayment == 0
|
|
@@ -2904,6 +2912,14 @@ const NewService = Form.create()(
|
|
|
this.refs.commodityQuantity.focus();
|
|
|
return false;
|
|
|
}
|
|
|
+ if(this.state.addProjectType === 5 && !this.state.declarationBatch){
|
|
|
+ message.warning("请选择企业要求申报批次!");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if((this.state.isIso || this.state.addProjectType === 5) && !this.state.ifCertificationFee){
|
|
|
+ message.warning("请选择是否包含认证费用!");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
this.setState({
|
|
|
loading: true,
|
|
|
});
|
|
@@ -2922,6 +2938,8 @@ const NewService = Form.create()(
|
|
|
commodityQuantity: this.state.commodityQuantity, //商品数量
|
|
|
commodityPrice: this.state.commodityPrice, //签单总价
|
|
|
taskComment: this.state.taskComment, //服务说明
|
|
|
+ declarationBatch:this.state.declarationBatch || undefined,//申报批次
|
|
|
+ ifCertificationFee:this.state.ifCertificationFee || undefined,//是否包含认证费用
|
|
|
main: this.state.main, //是否为主要项目
|
|
|
officialCost: this.state.displayFees==='block' ? this.state.officialCost : '', //是否有官费
|
|
|
costReduction: this.state.displayFees==='block' ?this.state.costReduction : '', //是否有费减
|
|
@@ -2944,7 +2962,6 @@ const NewService = Form.create()(
|
|
|
},
|
|
|
//点击打卡项目详情
|
|
|
tableRowClick(record) {
|
|
|
- console.log(record);
|
|
|
if (record.type=='1'){
|
|
|
this.setState({
|
|
|
displayFees: "block",
|
|
@@ -2959,13 +2976,17 @@ const NewService = Form.create()(
|
|
|
this.setState({
|
|
|
jid: record.id, //项目ID
|
|
|
kid: record.commodityId, //商品ID
|
|
|
- commodityName: record.commodityName, //金额
|
|
|
+ commodityName: record.commodityName, //项目名称
|
|
|
commodityPrice: record.commodityPrice, //金额
|
|
|
commodityQuantity: record.commodityQuantity, //数量
|
|
|
taskComment: record.taskComment, //备注
|
|
|
main: record.main.toString(), //是否为主要
|
|
|
addState: 0,
|
|
|
addnextVisible: true,
|
|
|
+ addProjectType: record.type,
|
|
|
+ declarationBatch: record.declarationBatch || '',//申报批次(只有高新有)
|
|
|
+ ifCertificationFee: record.ifCertificationFee || '',//是否包含认证费
|
|
|
+ isIso: record.commodityName.indexOf("贯标") !== -1,
|
|
|
});
|
|
|
},
|
|
|
//修改项目详情
|
|
@@ -3003,6 +3024,8 @@ const NewService = Form.create()(
|
|
|
taskComment: this.state.taskComment, //备注
|
|
|
officialCost: this.state.officialCost, //是否有官费
|
|
|
costReduction: this.state.costReduction, //是否有费减
|
|
|
+ declarationBatch: this.state.declarationBatch || undefined,//申报批次
|
|
|
+ ifCertificationFee: this.state.ifCertificationFee ||undefined,//是否包含官费
|
|
|
},
|
|
|
}).done(
|
|
|
function (data) {
|
|
@@ -6350,6 +6373,65 @@ const NewService = Form.create()(
|
|
|
/>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
+ {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
|
|
|
+ {this.state.addProjectType === 5 ?
|
|
|
+ <div className="clearfix">
|
|
|
+ <FormItem
|
|
|
+ className="half-item"
|
|
|
+ {...formItemLayout}
|
|
|
+ label="企业要求申报批次"
|
|
|
+ >
|
|
|
+ <Select
|
|
|
+ placeholder="请选择企业要求申报批次"
|
|
|
+ style={{ width: "200px" }}
|
|
|
+ value={this.state.declarationBatch}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({ declarationBatch: e });
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ <Select.Option value={1}>
|
|
|
+ 第一批
|
|
|
+ </Select.Option>
|
|
|
+ <Select.Option value={2}>
|
|
|
+ 第二批
|
|
|
+ </Select.Option>
|
|
|
+ <Select.Option value={3}>
|
|
|
+ 第三批
|
|
|
+ </Select.Option>
|
|
|
+ <Select.Option value={4}>
|
|
|
+ 第四批
|
|
|
+ </Select.Option>
|
|
|
+ </Select>
|
|
|
+ <span className="mandatory">*</span>
|
|
|
+ </FormItem>
|
|
|
+ </div>: null
|
|
|
+ }
|
|
|
+ {
|
|
|
+ this.state.isIso || this.state.addProjectType === 5 ?<div className="clearfix">
|
|
|
+ <FormItem
|
|
|
+ className="half-item"
|
|
|
+ {...formItemLayout}
|
|
|
+ label="是否包含认证费用"
|
|
|
+ >
|
|
|
+ <Select
|
|
|
+ placeholder="请选择是否包含认证费用"
|
|
|
+ style={{ width: "200px" }}
|
|
|
+ value={this.state.ifCertificationFee}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({ ifCertificationFee: e });
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ <Select.Option value={'0'}>
|
|
|
+ 否
|
|
|
+ </Select.Option>
|
|
|
+ <Select.Option value={'1'}>
|
|
|
+ 是
|
|
|
+ </Select.Option>
|
|
|
+ </Select>
|
|
|
+ <span className="mandatory">*</span>
|
|
|
+ </FormItem>
|
|
|
+ </div>: null
|
|
|
+ }
|
|
|
<FormItem
|
|
|
wrapperCol={{ span: 12, offset: 4 }}
|
|
|
className="half-middle"
|
|
@@ -6498,6 +6580,64 @@ const NewService = Form.create()(
|
|
|
/>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
+ {this.state.addProjectType === 5 ?
|
|
|
+ <div className="clearfix">
|
|
|
+ <FormItem
|
|
|
+ className="half-item"
|
|
|
+ {...formItemLayout}
|
|
|
+ label="企业要求申报批次"
|
|
|
+ >
|
|
|
+ <Select
|
|
|
+ placeholder="请选择企业要求申报批次"
|
|
|
+ style={{ width: "200px" }}
|
|
|
+ value={this.state.declarationBatch}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({ declarationBatch: e });
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ <Select.Option value={1}>
|
|
|
+ 第一批
|
|
|
+ </Select.Option>
|
|
|
+ <Select.Option value={2}>
|
|
|
+ 第二批
|
|
|
+ </Select.Option>
|
|
|
+ <Select.Option value={3}>
|
|
|
+ 第三批
|
|
|
+ </Select.Option>
|
|
|
+ <Select.Option value={4}>
|
|
|
+ 第四批
|
|
|
+ </Select.Option>
|
|
|
+ </Select>
|
|
|
+ <span className="mandatory">*</span>
|
|
|
+ </FormItem>
|
|
|
+ </div>: null
|
|
|
+ }
|
|
|
+ {
|
|
|
+ this.state.isIso || this.state.addProjectType === 5 ?<div className="clearfix">
|
|
|
+ <FormItem
|
|
|
+ className="half-item"
|
|
|
+ {...formItemLayout}
|
|
|
+ label="认证费用"
|
|
|
+ >
|
|
|
+ <Select
|
|
|
+ placeholder="请选择是否包含认证费用"
|
|
|
+ style={{ width: "200px" }}
|
|
|
+ value={this.state.ifCertificationFee}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({ ifCertificationFee: e });
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ <Select.Option value={'0'}>
|
|
|
+ 不包含
|
|
|
+ </Select.Option>
|
|
|
+ <Select.Option value={'1'}>
|
|
|
+ 包含
|
|
|
+ </Select.Option>
|
|
|
+ </Select>
|
|
|
+ <span className="mandatory">*</span>
|
|
|
+ </FormItem>
|
|
|
+ </div>: null
|
|
|
+ }
|
|
|
<FormItem
|
|
|
wrapperCol={{ span: 12, offset: 4 }}
|
|
|
className="half-middle"
|