|
@@ -305,40 +305,40 @@ const Task = React.createClass({
|
|
|
key: 'taskName',
|
|
|
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>
|
|
|
- }
|
|
|
// render: (text, record) => {
|
|
|
- // return <span>
|
|
|
- // {text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}
|
|
|
- // <div>
|
|
|
- // {record.cSort == 6 && record.projectType == 1 && <span>(含{record.htMember == 1 ? '高新会员&' : ''}{record.additionalDeduction == 1 ? '加计扣除&' : ''}{record.rdAwardsubsidy == 1 ? '研发奖补' : ''})</span>}
|
|
|
- // {record.cSort == 6 && ([0, 3].indexOf(record.projectType) > -1) && <span>(仅提供单边会员服务)</span>}
|
|
|
- // {record.cSort == 6 && record.projectType == 2 && <span>(仅填报表,仅咨询,不出备查资料)</span>}
|
|
|
- // {record.cSort == 3 && <span>{record.technologyProjectType==0?'(简易项目)':record.technologyProjectType==1?'(市区级)':record.technologyProjectType==2?'(省级)':record.technologyProjectType==3?'(国家级)':''}</span>}
|
|
|
- // {record.cSort == 8 ? (record.type != 2 && record.patentType == 1) ? <span>(变更)</span> : <span>{record.ordinaryRisk == 0 ? '(普通申请)' : record.ordinaryRisk == 1 ? '(风险代理)' : ''}</span> : ""}
|
|
|
- // {record.type == 2 && <span>({record.days == 0 ? '普通' : record.days == 1 ? '加急' : ''}{record.scheme == 0 ? '&无方案' : record.scheme == 1 ? '&有方案' : ''})</span>}
|
|
|
- // </div>
|
|
|
- // </span>
|
|
|
+ // 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>
|
|
|
// }
|
|
|
+ render: (text, record) => {
|
|
|
+ return <span>
|
|
|
+ {text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}
|
|
|
+ <div>
|
|
|
+ {record.cSort == 6 && record.projectType == 1 && <span>(含{record.htMember == 1 ? '高新会员&' : ''}{record.additionalDeduction == 1 ? '加计扣除&' : ''}{record.rdAwardsubsidy == 1 ? '研发奖补' : ''})</span>}
|
|
|
+ {record.cSort == 6 && ([0, 3].indexOf(record.projectType) > -1) && <span>(仅提供单边会员服务)</span>}
|
|
|
+ {record.cSort == 6 && record.projectType == 2 && <span>(仅填报表,仅咨询,不出备查资料)</span>}
|
|
|
+ {record.cSort == 3 && <span>{record.technologyProjectType==0?'(简易项目)':record.technologyProjectType==1?'(市区级)':record.technologyProjectType==2?'(省级)':record.technologyProjectType==3?'(国家级)':''}</span>}
|
|
|
+ {record.cSort == 8 ? (record.type != 2 && record.patentType == 1) ? <span>(变更)</span> : <span>{record.ordinaryRisk == 0 ? '(普通申请)' : record.ordinaryRisk == 1 ? '(风险代理)' : ''}</span> : ""}
|
|
|
+ {record.type == 2 && <span>({record.days == 0 ? '普通' : record.days == 1 ? '加急' : ''}{record.scheme == 0 ? '&无方案' : record.scheme == 1 ? '&有方案' : ''})</span>}
|
|
|
+ </div>
|
|
|
+ </span>
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title: '项目数量',
|
|
@@ -3862,21 +3862,28 @@ const Task = React.createClass({
|
|
|
title: "负责人",
|
|
|
dataIndex: "receiverName",
|
|
|
key: "receiverName",
|
|
|
+ width: 140,
|
|
|
},
|
|
|
{
|
|
|
title: "负责人电话",
|
|
|
dataIndex: "receiverMobile",
|
|
|
key: "receiverMobile",
|
|
|
+ align: "center",
|
|
|
+ width: 120,
|
|
|
},
|
|
|
{
|
|
|
title: "会员负责人",
|
|
|
dataIndex: "projectMemberName",
|
|
|
key: "projectMemberName",
|
|
|
+ width: 140,
|
|
|
+ align: "center",
|
|
|
},
|
|
|
{
|
|
|
title: "项目状态",
|
|
|
dataIndex: "projectStatus",
|
|
|
key: "projectStatus",
|
|
|
+ align: "center",
|
|
|
+ width: 100,
|
|
|
render: (text) => {
|
|
|
return getProjectName(text);
|
|
|
},
|
|
@@ -3885,6 +3892,8 @@ const Task = React.createClass({
|
|
|
title: "本次派单",
|
|
|
dataIndex: "serviceYear",
|
|
|
key: "serviceYear",
|
|
|
+ width: 80,
|
|
|
+ align: "center"
|
|
|
},
|
|
|
{
|
|
|
title: "项目说明",
|