|
@@ -145,6 +145,7 @@ const Task = React.createClass({
|
|
|
: this.state.outsourceStatusSearch, //外包状态搜索
|
|
|
projectName: this.state.projectName, // 项目名称
|
|
|
type: this.state.approvaType.length > 0 ? this.state.approvaType.toString() : undefined, //特批类型
|
|
|
+ memberProjectType: this.state.memberProjectType
|
|
|
},
|
|
|
success: function (data) {
|
|
|
ShowModal(this)
|
|
@@ -305,6 +306,24 @@ const Task = React.createClass({
|
|
|
fixed: 'left',
|
|
|
width: 150,
|
|
|
render: (text, record) => {
|
|
|
+ let typeArr = [];
|
|
|
+ if (record.htMember === 1) {
|
|
|
+ typeArr.push("高新会员");
|
|
|
+ }
|
|
|
+ if (record.additionalDeduction === 1) {
|
|
|
+ typeArr.push("加计扣除");
|
|
|
+ }
|
|
|
+ if (record.rdAwardsubsidy === 1) {
|
|
|
+ typeArr.push("研发奖补");
|
|
|
+ }
|
|
|
+ if (typeArr.length) {
|
|
|
+ return (
|
|
|
+ <div>
|
|
|
+ <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
|
|
|
+ <div>{ typeArr.join("&") }</div>
|
|
|
+ </div>
|
|
|
+ )
|
|
|
+ }
|
|
|
return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
|
|
|
}
|
|
|
},
|
|
@@ -4080,6 +4099,20 @@ const Task = React.createClass({
|
|
|
>
|
|
|
{approvaChildren}
|
|
|
</Select>
|
|
|
+
|
|
|
+ <Select
|
|
|
+ placeholder="会员分类"
|
|
|
+ style={{ width: 150, marginRight: '10px' }}
|
|
|
+ value={this.state.memberProjectType}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({ memberProjectType: e })
|
|
|
+ }}
|
|
|
+ allowClear
|
|
|
+ >
|
|
|
+ <Select.Option key={1}>高新会员</Select.Option>
|
|
|
+ <Select.Option key={2}>加急扣除</Select.Option>
|
|
|
+ <Select.Option key={3}>研发奖补</Select.Option>
|
|
|
+ </Select>
|
|
|
<Button type="primary" onClick={this.search}>
|
|
|
搜索
|
|
|
</Button>
|