Browse Source

项目业务子项目项目说明增加会员类型

dev01 6 days ago
parent
commit
7af3bbb980

+ 27 - 6
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -216,9 +216,10 @@ const OrderDetail = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: (text) => {
+            render: (text, record) => {
+              let textStr = text;
               return (
-                <Tooltip title={text}>
+                <Tooltip title={textStr}>
                   <div
                     style={{
                       width: 100,
@@ -226,7 +227,7 @@ const OrderDetail = Form.create()(
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
                     }}
-                  >{text}</div>
+                  >{textStr}</div>
                 </Tooltip>
               )
             },
@@ -807,11 +808,31 @@ const OrderDetail = Form.create()(
                 title: "项目说明",
                 dataIndex: "taskComment",
                 key: "taskComment",
-                render: (text) => {
+                render: (text, record) => {
+                  let textStr = text;
+                  let textArr = [];
+                  if (record.htMember === 1) {
+                      textArr.push("高新会员");
+                  }
+                  if (record.additionalDeduction === 1) {
+                      textArr.push("加计扣除");
+                  }
+                  if (record.rdAwardsubsidy === 1) {
+                      textArr.push("研发补助");
+                  }
+                  if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                  }
                   return (
-                    <Tooltip title={text}>
+                    <Tooltip title={textStr}>
                       <div
-                      >{text}</div>
+                        style={{
+                          width: 100,
+                          overflow: "hidden",
+                          whiteSpace: "nowrap",
+                          textOverflow: "ellipsis",
+                        }}
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },

+ 113 - 22
js/component/manageCenter/order/orderNew/addService.jsx

@@ -459,9 +459,25 @@ const NewService = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: (text) => {
+            render: (text, record) => {
+              let textStr = text;
+              // let textArr = [];
+              // if (record.projectType == 1) {
+              // if (record.htMember === 1) {
+              //     textArr.push("高新会员");
+              // }
+              // if (record.additionalDeduction === 1) {
+              //     textArr.push("加计扣除");
+              // }
+              // if (record.rdAwardsubsidy === 1) {
+              //     textArr.push("研发补助");
+              // }
+              // }
+              // if (textArr.length) {
+              // textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+              // }
               return (
-                <Tooltip title={text}>
+                <Tooltip title={textStr}>
                   <div
                     style={{
                       width: 100,
@@ -469,7 +485,7 @@ const NewService = Form.create()(
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
                     }}
-                  >{text}</div>
+                  >{textStr}</div>
                 </Tooltip>
               )
             },
@@ -685,9 +701,25 @@ const NewService = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: (text) => {
+            render: (text, record) => {
+              let textStr = text;
+              let textArr = [];
+              if (record.projectType == 1) {
+              if (record.htMember === 1) {
+                  textArr.push("高新会员");
+              }
+              if (record.additionalDeduction === 1) {
+                  textArr.push("加计扣除");
+              }
+              if (record.rdAwardsubsidy === 1) {
+                  textArr.push("研发补助");
+              }
+              }
+              // if (textArr.length) {
+              // textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+              // }
               return (
-                <Tooltip title={text}>
+                <Tooltip title={textStr}>
                   <div
                     style={{
                       width: 100,
@@ -695,7 +727,7 @@ const NewService = Form.create()(
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
                     }}
-                  >{text}</div>
+                  >{textStr}</div>
                 </Tooltip>
               )
             },
@@ -873,9 +905,25 @@ const NewService = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: (text) => {
+            render: (text, record) => {
+              let textStr = text;
+              let textArr = [];
+              if (record.projectType == 1) {
+              if (record.htMember === 1) {
+                  textArr.push("高新会员");
+              }
+              if (record.additionalDeduction === 1) {
+                  textArr.push("加计扣除");
+              }
+              if (record.rdAwardsubsidy === 1) {
+                  textArr.push("研发补助");
+              }
+              }
+              // if (textArr.length) {
+              // textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+              // }
               return (
-                <Tooltip title={text}>
+                <Tooltip title={textStr}>
                   <div
                     style={{
                       width: 100,
@@ -883,7 +931,7 @@ const NewService = Form.create()(
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
                     }}
-                  >{text}</div>
+                  >{textStr}</div>
                 </Tooltip>
               )
             },
@@ -5589,9 +5637,10 @@ const NewService = Form.create()(
                 title: "项目说明",
                 dataIndex: "taskComment",
                 key: "taskComment",
-                render: (text) => {
+                render: (text, record) => {
+                  let textStr = text;
                   return (
-                    <Tooltip title={text}>
+                    <Tooltip title={textStr}>
                       <div
                         style={{
                           width: 100,
@@ -5599,7 +5648,7 @@ const NewService = Form.create()(
                           whiteSpace: "nowrap",
                           textOverflow: "ellipsis",
                         }}
-                      >{text}</div>
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },
@@ -5707,9 +5756,23 @@ const NewService = Form.create()(
                 title: "项目说明",
                 dataIndex: "taskComment",
                 key: "taskComment",
-                render: (text) => {
+                render: (text, record) => {
+                  let textStr = text;
+                  let textArr = [];
+                  if (record.htMember === 1) {
+                      textArr.push("高新会员");
+                  }
+                  if (record.additionalDeduction === 1) {
+                      textArr.push("加计扣除");
+                  }
+                  if (record.rdAwardsubsidy === 1) {
+                      textArr.push("研发补助");
+                  }
+                  if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                  }
                   return (
-                    <Tooltip title={text}>
+                    <Tooltip title={textStr}>
                       <div
                       // style={{
                       //   width: 100,
@@ -5717,7 +5780,7 @@ const NewService = Form.create()(
                       //   whiteSpace: "nowrap",
                       //   textOverflow: "ellipsis",
                       // }}
-                      >{text}</div>
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },
@@ -5836,9 +5899,23 @@ const NewService = Form.create()(
                 title: "项目说明",
                 dataIndex: "taskComment",
                 key: "taskComment",
-                render: (text) => {
+                render: (text, record) => {
+                  let textStr = text;
+                  let textArr = [];
+                  if (record.htMember === 1) {
+                      textArr.push("高新会员");
+                  }
+                  if (record.additionalDeduction === 1) {
+                      textArr.push("加计扣除");
+                  }
+                  if (record.rdAwardsubsidy === 1) {
+                      textArr.push("研发补助");
+                  }
+                  if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                  }
                   return (
-                    <Tooltip title={text}>
+                    <Tooltip title={textStr}>
                       <div
                       // style={{
                       //   width: 100,
@@ -5846,7 +5923,7 @@ const NewService = Form.create()(
                       //   whiteSpace: "nowrap",
                       //   textOverflow: "ellipsis",
                       // }}
-                      >{text}</div>
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },
@@ -5979,7 +6056,7 @@ const NewService = Form.create()(
                           whiteSpace: "nowrap",
                           textOverflow: "ellipsis",
                         }}
-                      >{text}</div>
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },
@@ -6043,9 +6120,23 @@ const NewService = Form.create()(
                 title: "项目说明",
                 dataIndex: "taskComment",
                 key: "taskComment",
-                render: (text) => {
+                render: (text, record) => {
+                  let textStr = text;
+                  let textArr = [];
+                  if (record.htMember === 1) {
+                      textArr.push("高新会员");
+                  }
+                  if (record.additionalDeduction === 1) {
+                      textArr.push("加计扣除");
+                  }
+                  if (record.rdAwardsubsidy === 1) {
+                      textArr.push("研发补助");
+                  }
+                  if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                  }
                   return (
-                    <Tooltip title={text}>
+                    <Tooltip title={textStr}>
                       <div
                         style={{
                           width: 100,
@@ -6053,7 +6144,7 @@ const NewService = Form.create()(
                           whiteSpace: "nowrap",
                           textOverflow: "ellipsis",
                         }}
-                      >{text}</div>
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },

+ 17 - 3
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -2028,9 +2028,23 @@ const IntentionCustomer = Form.create()(
                 title: "项目说明",
                 dataIndex: "taskComment",
                 key: "taskComment",
-                render: (text) => {
+                render: (text, record) => {
+                  let textStr = text;
+                  let textArr = [];
+                  if (record.htMember === 1) {
+                      textArr.push("高新会员");
+                  }
+                  if (record.additionalDeduction === 1) {
+                      textArr.push("加计扣除");
+                  }
+                  if (record.rdAwardsubsidy === 1) {
+                      textArr.push("研发补助");
+                  }
+                  if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                  }
                   return (
-                    <Tooltip title={text}>
+                    <Tooltip title={textStr}>
                       <div
                       // style={{
                       //   width: 100,
@@ -2038,7 +2052,7 @@ const IntentionCustomer = Form.create()(
                       //   whiteSpace: "nowrap",
                       //   textOverflow: "ellipsis",
                       // }}
-                      >{text}</div>
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },

+ 21 - 6
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -678,9 +678,10 @@ class ChangeApply extends Component {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
-          render: (text) => {
+          render: (text, record) => {
+            let textStr = text;
             return (
-              <Tooltip title={text}>
+              <Tooltip title={textStr}>
                 <div
                   style={{
                     width: 100,
@@ -688,7 +689,7 @@ class ChangeApply extends Component {
                     whiteSpace: "nowrap",
                     textOverflow: "ellipsis",
                   }}
-                >{text}</div>
+                >{textStr}</div>
               </Tooltip>
             )
           },
@@ -2284,11 +2285,25 @@ class ChangeApply extends Component {
               title: "项目说明",
               dataIndex: "taskComment",
               key: "taskComment",
-              render: (text) => {
+              render: (text, record) => {
+                let textStr = text;
+                let textArr = [];
+                if (record.htMember === 1) {
+                    textArr.push("高新会员");
+                }
+                if (record.additionalDeduction === 1) {
+                    textArr.push("加计扣除");
+                }
+                if (record.rdAwardsubsidy === 1) {
+                    textArr.push("研发补助");
+                }
+                if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                }
                 return (
-                  <Tooltip title={text}>
+                  <Tooltip title={textStr}>
                     <div
-                    >{text}</div>
+                    >{textStr}</div>
                   </Tooltip>
                 )
               },

+ 21 - 6
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -261,9 +261,10 @@ class OrderDetail extends Component {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
-          render: text => {
+          render: (text, record) => {
+            let textStr = text;
             return (
-              <Tooltip title={text}>
+              <Tooltip title={textStr}>
                 <div
                   style={{
                     width: 100,
@@ -271,7 +272,7 @@ class OrderDetail extends Component {
                     whiteSpace: "nowrap",
                     textOverflow: "ellipsis",
                   }}
-                >{text}</div>
+                >{textStr}</div>
               </Tooltip>
             )
           }
@@ -535,11 +536,25 @@ class OrderDetail extends Component {
               title: "项目说明",
               dataIndex: "taskComment",
               key: "taskComment",
-              render: (text) => {
+              render: (text, record) => {
+                let textStr = text;
+                let textArr = [];
+                if (record.htMember === 1) {
+                    textArr.push("高新会员");
+                }
+                if (record.additionalDeduction === 1) {
+                    textArr.push("加计扣除");
+                }
+                if (record.rdAwardsubsidy === 1) {
+                    textArr.push("研发补助");
+                }
+                if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                }
                 return (
-                  <Tooltip title={text}>
+                  <Tooltip title={textStr}>
                     <div
-                    >{text}</div>
+                    >{textStr}</div>
                   </Tooltip>
                 )
               },

+ 21 - 6
js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx

@@ -151,9 +151,10 @@ const ProAndCuiList = React.createClass({
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
-          render: (text) => {
+          render: (text, record) => {
+            let textStr = text;
             return (
-              <Tooltip title={text}>
+              <Tooltip title={textStr}>
                 <div
                   style={{
                     width: 100,
@@ -161,7 +162,7 @@ const ProAndCuiList = React.createClass({
                     whiteSpace: "nowrap",
                     textOverflow: "ellipsis",
                   }}
-                >{text}</div>
+                >{textStr}</div>
               </Tooltip>
             )
           },
@@ -478,9 +479,23 @@ const ProAndCuiList = React.createClass({
               title: "项目说明",
               dataIndex: "taskComment",
               key: "taskComment",
-              render: (text) => {
+              render: (text, record) => {
+                let textStr = text;
+                let textArr = [];
+                if (record.htMember === 1) {
+                    textArr.push("高新会员");
+                }
+                if (record.additionalDeduction === 1) {
+                    textArr.push("加计扣除");
+                }
+                if (record.rdAwardsubsidy === 1) {
+                    textArr.push("研发补助");
+                }
+                if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                }
                 return (
-                  <Tooltip title={text}>
+                  <Tooltip title={textStr}>
                     <div
                       // style={{
                       //   width: 100,
@@ -488,7 +503,7 @@ const ProAndCuiList = React.createClass({
                       //   whiteSpace: "nowrap",
                       //   textOverflow: "ellipsis",
                       // }}
-                    >{text}</div>
+                    >{textStr}</div>
                   </Tooltip>
                 )
               },

+ 21 - 6
js/component/manageCenter/order/orderNew/examine.jsx

@@ -527,9 +527,10 @@ const IntentionCustomer = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: (text) => {
+            render: (text, record) => {
+              let textStr = text;
               return (
-                <Tooltip title={text}>
+                <Tooltip title={textStr}>
                   <div
                     style={{
                       width: 100,
@@ -537,7 +538,7 @@ const IntentionCustomer = Form.create()(
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
                     }}
-                  >{text}</div>
+                  >{textStr}</div>
                 </Tooltip>
               )
             },
@@ -1581,9 +1582,23 @@ const IntentionCustomer = Form.create()(
                 title: "项目说明",
                 dataIndex: "taskComment",
                 key: "taskComment",
-                render: (text) => {
+                render: (text, record) => {
+                  let textStr = text;
+                  let textArr = [];
+                  if (record.htMember === 1) {
+                      textArr.push("高新会员");
+                  }
+                  if (record.additionalDeduction === 1) {
+                      textArr.push("加计扣除");
+                  }
+                  if (record.rdAwardsubsidy === 1) {
+                      textArr.push("研发补助");
+                  }
+                  if (textArr.length) {
+                    textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                  }
                   return (
-                    <Tooltip title={text}>
+                    <Tooltip title={textStr}>
                       <div
                       // style={{
                       //   width: 100,
@@ -1591,7 +1606,7 @@ const IntentionCustomer = Form.create()(
                       //   whiteSpace: "nowrap",
                       //   textOverflow: "ellipsis",
                       // }}
-                      >{text}</div>
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },

+ 21 - 6
js/component/manageCenter/order/orderNew/examinejl.jsx

@@ -530,9 +530,10 @@ const IntentionCustomer = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: (text) => {
+            render: (text, record) => {
+              let textStr = text;
               return (
-                <Tooltip title={text}>
+                <Tooltip title={textStr}>
                   <div
                     style={{
                       width: 100,
@@ -540,7 +541,7 @@ const IntentionCustomer = Form.create()(
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
                     }}
-                  >{text}</div>
+                  >{textStr}</div>
                 </Tooltip>
               )
             },
@@ -1588,9 +1589,23 @@ const IntentionCustomer = Form.create()(
                 title: "项目说明",
                 dataIndex: "taskComment",
                 key: "taskComment",
-                render: (text) => {
+                render: (text, record) => {
+                  let textStr = text;
+                  let textArr = [];
+                  if (record.htMember === 1) {
+                      textArr.push("高新会员");
+                  }
+                  if (record.additionalDeduction === 1) {
+                      textArr.push("加计扣除");
+                  }
+                  if (record.rdAwardsubsidy === 1) {
+                      textArr.push("研发补助");
+                  }
+                  if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                  }
                   return (
-                    <Tooltip title={text}>
+                    <Tooltip title={textStr}>
                       <div
                       // style={{
                       //   width: 100,
@@ -1598,7 +1613,7 @@ const IntentionCustomer = Form.create()(
                       //   whiteSpace: "nowrap",
                       //   textOverflow: "ellipsis",
                       // }}
-                      >{text}</div>
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },

+ 21 - 6
js/component/manageCenter/order/orderNew/examineyybz.jsx

@@ -527,9 +527,10 @@ const IntentionCustomer = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: (text) => {
+            render: (text, record) => {
+              let textStr = text;
               return (
-                <Tooltip title={text}>
+                <Tooltip title={textStr}>
                   <div
                     style={{
                       width: 100,
@@ -537,7 +538,7 @@ const IntentionCustomer = Form.create()(
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
                     }}
-                  >{text}</div>
+                  >{textStr}</div>
                 </Tooltip>
               )
             },
@@ -1581,9 +1582,23 @@ const IntentionCustomer = Form.create()(
                 title: "项目说明",
                 dataIndex: "taskComment",
                 key: "taskComment",
-                render: (text) => {
+                render: (text, record) => {
+                  let textStr = text;
+                  let textArr = [];
+                  if (record.htMember === 1) {
+                      textArr.push("高新会员");
+                  }
+                  if (record.additionalDeduction === 1) {
+                      textArr.push("加计扣除");
+                  }
+                  if (record.rdAwardsubsidy === 1) {
+                      textArr.push("研发补助");
+                  }
+                  if (textArr.length) {
+                    textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                  }
                   return (
-                    <Tooltip title={text}>
+                    <Tooltip title={textStr}>
                       <div
                       // style={{
                       //   width: 100,
@@ -1591,7 +1606,7 @@ const IntentionCustomer = Form.create()(
                       //   whiteSpace: "nowrap",
                       //   textOverflow: "ellipsis",
                       // }}
-                      >{text}</div>
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },

+ 21 - 6
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -389,9 +389,10 @@ const IntentionCustomer = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: (text) => {
+            render: (text, record) => {
+              let textStr = text;
               return (
-                <Tooltip title={text}>
+                <Tooltip title={textStr}>
                   <div
                     style={{
                       width: 100,
@@ -399,7 +400,7 @@ const IntentionCustomer = Form.create()(
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
                     }}
-                  >{text}</div>
+                  >{textStr}</div>
                 </Tooltip>
               )
             },
@@ -2567,9 +2568,23 @@ const IntentionCustomer = Form.create()(
                 title: "项目说明",
                 dataIndex: "taskComment",
                 key: "taskComment",
-                render: (text) => {
+                render: (text, record) => {
+                  let textStr = text;
+                  let textArr = [];
+                  if (record.htMember === 1) {
+                      textArr.push("高新会员");
+                  }
+                  if (record.additionalDeduction === 1) {
+                      textArr.push("加计扣除");
+                  }
+                  if (record.rdAwardsubsidy === 1) {
+                      textArr.push("研发补助");
+                  }
+                  if (textArr.length) {
+                    textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                  }
                   return (
-                    <Tooltip title={text}>
+                    <Tooltip title={textStr}>
                       <div
                       // style={{
                       //   width: 100,
@@ -2577,7 +2592,7 @@ const IntentionCustomer = Form.create()(
                       //   whiteSpace: "nowrap",
                       //   textOverflow: "ellipsis",
                       // }}
-                      >{text}</div>
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },

+ 17 - 3
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -699,9 +699,23 @@ const outsourcingList = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: (text) => {
+            render: (text, record) => {
+              let textStr = text;
+              let textArr = [];
+              if (record.htMember === 1) {
+                  textArr.push("高新会员");
+              }
+              if (record.additionalDeduction === 1) {
+                  textArr.push("加计扣除");
+              }
+              if (record.rdAwardsubsidy === 1) {
+                  textArr.push("研发补助");
+              }
+              if (textArr.length) {
+                textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+              }
               return (
-                <Tooltip title={text}>
+                <Tooltip title={textStr}>
                   <div
                     style={{
                       width: 100,
@@ -709,7 +723,7 @@ const outsourcingList = Form.create()(
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
                     }}
-                  >{text}</div>
+                  >{textStr}</div>
                 </Tooltip>
               )
             },

+ 19 - 3
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -429,9 +429,25 @@ const outsourcingPro = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: (text) => {
+            render: (text, record) => {
+              let textStr = text;
+              let textArr = [];
+              if (record.projectType == 1) {
+              if (record.htMember === 1) {
+                  textArr.push("高新会员");
+              }
+              if (record.additionalDeduction === 1) {
+                  textArr.push("加计扣除");
+              }
+              if (record.rdAwardsubsidy === 1) {
+                  textArr.push("研发补助");
+              }
+              }
+              if (textArr.length) {
+              textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+              }
               return (
-                <Tooltip title={text}>
+                <Tooltip title={textStr}>
                   <div
                     style={{
                       width: 100,
@@ -439,7 +455,7 @@ const outsourcingPro = Form.create()(
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
                     }}
-                  >{text}</div>
+                  >{textStr}</div>
                 </Tooltip>
               )
             },

+ 21 - 6
js/component/manageCenter/order/orderNew/reject.jsx

@@ -321,9 +321,10 @@ const IntentionCustomer = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: (text) => {
+            render: (text, record) => {
+              let textStr = text;
               return (
-                <Tooltip title={text}>
+                <Tooltip title={textStr}>
                   <div
                     style={{
                       width: 100,
@@ -331,7 +332,7 @@ const IntentionCustomer = Form.create()(
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
                     }}
-                  >{text}</div>
+                  >{textStr}</div>
                 </Tooltip>
               )
             },
@@ -2080,9 +2081,23 @@ const IntentionCustomer = Form.create()(
                 title: "项目说明",
                 dataIndex: "taskComment",
                 key: "taskComment",
-                render: (text) => {
+                render: (text, record) => {
+                  let textStr = text;
+                  let textArr = [];
+                  if (record.htMember === 1) {
+                      textArr.push("高新会员");
+                  }
+                  if (record.additionalDeduction === 1) {
+                      textArr.push("加计扣除");
+                  }
+                  if (record.rdAwardsubsidy === 1) {
+                      textArr.push("研发补助");
+                  }
+                  if (textArr.length) {
+                    textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                  }
                   return (
-                    <Tooltip title={text}>
+                    <Tooltip title={textStr}>
                       <div
                       // style={{
                       //   width: 100,
@@ -2090,7 +2105,7 @@ const IntentionCustomer = Form.create()(
                       //   whiteSpace: "nowrap",
                       //   textOverflow: "ellipsis",
                       // }}
-                      >{text}</div>
+                      >{textStr}</div>
                     </Tooltip>
                   )
                 },

+ 21 - 6
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -415,9 +415,10 @@ const PaiDan = React.createClass({
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
-          render: (text) => {
+          render: (text, record) => {
+            let textStr = text;
             return (
-              <Tooltip title={text}>
+              <Tooltip title={textStr}>
                 <div
                   style={{
                     width: 100,
@@ -425,7 +426,7 @@ const PaiDan = React.createClass({
                     whiteSpace: "nowrap",
                     textOverflow: "ellipsis",
                   }}
-                >{text}</div>
+                >{textStr}</div>
               </Tooltip>
             )
           },
@@ -1230,9 +1231,23 @@ const PaiDan = React.createClass({
               title: "项目说明",
               dataIndex: "taskComment",
               key: "taskComment",
-              render: (text) => {
+              render: (text, record) => {
+                let textStr = text;
+                let textArr = [];
+                if (record.htMember === 1) {
+                    textArr.push("高新会员");
+                }
+                if (record.additionalDeduction === 1) {
+                    textArr.push("加计扣除");
+                }
+                if (record.rdAwardsubsidy === 1) {
+                    textArr.push("研发补助");
+                }
+                if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                }
                 return (
-                  <Tooltip title={text}>
+                  <Tooltip title={textStr}>
                     <div
                     // style={{
                     //   width: 100,
@@ -1240,7 +1255,7 @@ const PaiDan = React.createClass({
                     //   whiteSpace: "nowrap",
                     //   textOverflow: "ellipsis",
                     // }}
-                    >{text}</div>
+                    >{textStr}</div>
                   </Tooltip>
                 )
               },

+ 21 - 6
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -292,9 +292,10 @@ class ProjectDetails extends Component {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
-          render: (text) => {
+          render: (text, record) => {
+            let textStr = text;
             return (
-              <Tooltip title={text}>
+              <Tooltip title={textStr}>
                 <div
                   style={{
                     width: 100,
@@ -302,7 +303,7 @@ class ProjectDetails extends Component {
                     whiteSpace: "nowrap",
                     textOverflow: "ellipsis",
                   }}
-                >{text}</div>
+                >{textStr}</div>
               </Tooltip>
             )
           },
@@ -1003,11 +1004,25 @@ class ProjectDetails extends Component {
               title: "项目说明",
               dataIndex: "taskComment",
               key: "taskComment",
-              render: (text) => {
+              render: (text, record) => {
+                let textStr = text;
+                let textArr = [];
+                if (record.htMember === 1) {
+                  textArr.push("高新会员");
+                }
+                if (record.additionalDeduction === 1) {
+                  textArr.push("加计扣除");
+                }
+                if (record.rdAwardsubsidy === 1) {
+                  textArr.push("研发补助");
+                }
+              if (textArr.length) {
+                textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+              }
                 return (
-                  <Tooltip title={text}>
+                  <Tooltip title={textStr}>
                     <div
-                    >{text}</div>
+                    >{textStr}</div>
                   </Tooltip>
                 )
               },

+ 21 - 6
js/component/manageCenter/project/task/myTask.jsx

@@ -632,9 +632,10 @@ const Task = React.createClass({
           title: '项目说明',
           dataIndex: 'taskComment',
           key: 'taskComment',
-          render: (text) => {
+          render: (text, record) => {
+            let textStr = text;
             return (
-              <Tooltip title={text}>
+              <Tooltip title={textStr}>
                 <div
                   style={{
                     width: 100,
@@ -642,7 +643,7 @@ const Task = React.createClass({
                     whiteSpace: "nowrap",
                     textOverflow: "ellipsis",
                   }}
-                >{text}</div>
+                >{textStr}</div>
               </Tooltip>
             )
           },
@@ -3856,9 +3857,23 @@ const Task = React.createClass({
               title: "项目说明",
               dataIndex: "taskComment",
               key: "taskComment",
-              render: (text) => {
+              render: (text, record) => {
+                let textStr = text;
+              let textArr = [];
+              if (record.htMember === 1) {
+                  textArr.push("高新会员");
+              }
+              if (record.additionalDeduction === 1) {
+                  textArr.push("加计扣除");
+              }
+              if (record.rdAwardsubsidy === 1) {
+                  textArr.push("研发补助");
+              }
+              if (textArr.length) {
+              textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+              }
                 return (
-                  <Tooltip title={text}>
+                  <Tooltip title={textStr}>
                     <div
                     // style={{
                     //     width: 100,
@@ -3866,7 +3881,7 @@ const Task = React.createClass({
                     //     whiteSpace: "nowrap",
                     //     textOverflow: "ellipsis",
                     // }}
-                    >{text}</div>
+                    >{textStr}</div>
                   </Tooltip>
                 )
               },

+ 21 - 6
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -373,9 +373,10 @@ const Task = React.createClass({
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
-          render: (text) => {
+          render: (text, record) => {
+            let textStr = text;
             return (
-              <Tooltip title={text}>
+              <Tooltip title={textStr}>
                 <div
                   style={{
                     width: 100,
@@ -383,7 +384,7 @@ const Task = React.createClass({
                     whiteSpace: "nowrap",
                     textOverflow: "ellipsis",
                   }}
-                >{text}</div>
+                >{textStr}</div>
               </Tooltip>
             )
           },
@@ -1060,9 +1061,23 @@ const Task = React.createClass({
               title: "项目说明",
               dataIndex: "taskComment",
               key: "taskComment",
-              render: (text) => {
+              render: (text, record) => {
+                let textStr = text;
+                let textArr = [];
+                if (record.htMember === 1) {
+                    textArr.push("高新会员");
+                }
+                if (record.additionalDeduction === 1) {
+                    textArr.push("加计扣除");
+                }
+                if (record.rdAwardsubsidy === 1) {
+                    textArr.push("研发补助");
+                }
+                if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                }
                 return (
-                  <Tooltip title={text}>
+                  <Tooltip title={textStr}>
                     <div
                     // style={{
                     //   width: 100,
@@ -1070,7 +1085,7 @@ const Task = React.createClass({
                     //   whiteSpace: "nowrap",
                     //   textOverflow: "ellipsis",
                     // }}
-                    >{text}</div>
+                    >{textStr}</div>
                   </Tooltip>
                 )
               },

+ 21 - 6
js/component/manageCenter/project/task/taskQuery.jsx

@@ -388,9 +388,10 @@ const Task = React.createClass({
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
-          render: (text) => {
+          render: (text, record) => {
+            let textStr = text;
             return (
-              <Tooltip title={text}>
+              <Tooltip title={textStr}>
                 <div
                   style={{
                     width: 100,
@@ -398,7 +399,7 @@ const Task = React.createClass({
                     whiteSpace: "nowrap",
                     textOverflow: "ellipsis",
                   }}
-                >{text}</div>
+                >{textStr}</div>
               </Tooltip>
             )
           },
@@ -1257,9 +1258,23 @@ const Task = React.createClass({
               title: "项目说明",
               dataIndex: "taskComment",
               key: "taskComment",
-              render: (text) => {
+              render: (text, record) => {
+                let textStr = text;
+                let textArr = [];
+                if (record.htMember === 1) {
+                    textArr.push("高新会员");
+                }
+                if (record.additionalDeduction === 1) {
+                    textArr.push("加计扣除");
+                }
+                if (record.rdAwardsubsidy === 1) {
+                    textArr.push("研发补助");
+                }
+                if (textArr.length) {
+                  textStr = `${textArr.join("&")} ${!!text ? `(${text})` : ''}`
+                }
                 return (
-                  <Tooltip title={text}>
+                  <Tooltip title={textStr}>
                     <div
                     // style={{
                     //   width: 100,
@@ -1267,7 +1282,7 @@ const Task = React.createClass({
                     //   whiteSpace: "nowrap",
                     //   textOverflow: "ellipsis",
                     // }}
-                    >{text}</div>
+                    >{textStr}</div>
                   </Tooltip>
                 )
               },