dev01 преди 10 месеца
родител
ревизия
6897c9366a
променени са 74 файла, в които са добавени 9498 реда и са изтрити 7062 реда
  1. 2 2
      js/component/common/enterpriseNameChange/index.jsx
  2. 69 6
      js/component/common/enterpriseNameChange/inforChange.jsx
  3. 11 7
      js/component/common/mysuspend/index.jsx
  4. 285 83
      js/component/common/projectOperation/newAddProject.jsx
  5. 260 15
      js/component/common/projectOperation/newEditProject.jsx
  6. 34 0
      js/component/dataDic.js
  7. 49 10
      js/component/manageCenter/customer/NEW/crm/crm.jsx
  8. 53 0
      js/component/manageCenter/customer/NEW/intentionCustomer/addIntention.jsx
  9. 39 0
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx
  10. 545 4
      js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx
  11. 552 13
      js/component/manageCenter/customer/NEW/query/queryCutomer.jsx
  12. 40 3
      js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx
  13. 876 866
      js/component/manageCenter/customer/operationalData/reexamine/details.jsx
  14. 11 1
      js/component/manageCenter/customerService/administration/followUpDetails.jsx
  15. 11 1
      js/component/manageCenter/customerService/administration/order.jsx
  16. 11 1
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  17. 11 1
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  18. 11 1
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  19. 11 1
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  20. 11 1
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  21. 14 6
      js/component/manageCenter/operate/personnel/personnelAll.jsx
  22. 1553 1545
      js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx
  23. 2015 2007
      js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx
  24. 572 564
      js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx
  25. 486 478
      js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx
  26. 56 7
      js/component/manageCenter/order/orderNew/addService.jsx
  27. 11 3
      js/component/manageCenter/order/orderNew/addorders.js
  28. 11 1
      js/component/manageCenter/order/orderNew/approveds.jsx
  29. 22 2
      js/component/manageCenter/order/orderNew/changeComponent/changeApply.js
  30. 11 1
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  31. 22 2
      js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx
  32. 11 1
      js/component/manageCenter/order/orderNew/chargeback.jsx
  33. 11 1
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  34. 12 4
      js/component/manageCenter/order/orderNew/contractCwjl.js
  35. 11 3
      js/component/manageCenter/order/orderNew/contractCwzj.js
  36. 11 3
      js/component/manageCenter/order/orderNew/contractCwzy.js
  37. 11 3
      js/component/manageCenter/order/orderNew/contractJsjl.js
  38. 11 3
      js/component/manageCenter/order/orderNew/contractJsy.js
  39. 12 4
      js/component/manageCenter/order/orderNew/contractJszj.js
  40. 11 3
      js/component/manageCenter/order/orderNew/contractYxgly.js
  41. 11 3
      js/component/manageCenter/order/orderNew/contractYxjl.js
  42. 11 3
      js/component/manageCenter/order/orderNew/contractYxy.js
  43. 11 3
      js/component/manageCenter/order/orderNew/contractYybz.js
  44. 11 3
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js
  45. 11 1
      js/component/manageCenter/order/orderNew/examine.jsx
  46. 11 1
      js/component/manageCenter/order/orderNew/examinejl.jsx
  47. 11 1
      js/component/manageCenter/order/orderNew/examineyybz.jsx
  48. 11 3
      js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js
  49. 11 1
      js/component/manageCenter/order/orderNew/inquiry.jsx
  50. 11 1
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  51. 11 1
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  52. 11 1
      js/component/manageCenter/order/orderNew/reject.jsx
  53. 13 5
      js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx
  54. 13 5
      js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx
  55. 11 3
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  56. 542 536
      js/component/manageCenter/project/patent/patentDetails.jsx
  57. 11 3
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  58. 11 6
      js/component/manageCenter/project/project/projectAssignment.jsx
  59. 11 3
      js/component/manageCenter/project/project/projectQuery.jsx
  60. 11 3
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  61. 11 3
      js/component/manageCenter/project/summary/projectDetails.jsx
  62. 797 787
      js/component/manageCenter/project/task/businessManagement/orderInfor.jsx
  63. 11 3
      js/component/manageCenter/project/task/myTask.jsx
  64. 11 3
      js/component/manageCenter/project/task/myTaskCount.jsx
  65. 11 3
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  66. 11 3
      js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js
  67. 11 3
      js/component/manageCenter/project/task/taskAssignment.jsx
  68. 11 3
      js/component/manageCenter/project/task/taskCount.jsx
  69. 11 3
      js/component/manageCenter/project/task/taskQuery.jsx
  70. 13 5
      js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx
  71. 27 0
      js/component/manageCenter/set/business/businessProject.jsx
  72. 24 0
      js/component/manageCenter/set/business/businessQuery.jsx
  73. 11 3
      js/component/project.jsx
  74. 17 0
      js/component/tools.js

+ 2 - 2
js/component/common/enterpriseNameChange/index.jsx

@@ -153,7 +153,7 @@ class EnterpriseNameChange extends Component {
           loading={this.state.loading}
           style={this.props.style}
           onClick={() => {
-            if (!this.props.data.level && this.props.data.level != 0) {
+            if (!!this.props.data && !this.props.data.level && this.props.data.level != 0) {
               Modal.warning({
                 title: '系统提示',
                 content: (
@@ -247,7 +247,7 @@ class EnterpriseNameChange extends Component {
             }
           </div>
         </Modal>
-      </span>
+      </span >
     )
   }
 }

+ 69 - 6
js/component/common/enterpriseNameChange/inforChange.jsx

@@ -14,8 +14,8 @@ import {
   Tooltip
 } from "antd";
 import { areaSelect, getProvince } from '@/NewDicProvinceList';
-import { industry } from '@/dataDic.js'
-import { getIndustry } from '@/tools.js'
+import { industry, natureList } from '@/dataDic.js'
+import { getIndustry, getNatureType } from '@/tools.js'
 import $ from "jquery/src/ajax";
 import TextArea from "antd/es/input/TextArea";
 
@@ -68,6 +68,8 @@ class InforChange extends Component {
       businessScope: props.data.businessScope,
       intendedProject: props.data.intendedProject,
       industryName: props.data.industry,
+      nature: props.data.nature,
+      natureOther: props.data.natureOther,
     }
     this.onChange = this.onChange.bind(this);
     this.onCancel = this.onCancel.bind(this);
@@ -171,6 +173,10 @@ class InforChange extends Component {
       message.warning('请选择企业行业');
       return
     }
+    if (this.state.changeType === 5 && dataArrar.length === 0) {
+      message.warning('请选择客户性质');
+      return
+    }
     this.setState({
       loading: true
     });
@@ -199,6 +205,10 @@ class InforChange extends Component {
     if (this.state.changeType === 4) {
       data.industry = dataArrar
     }
+    if (this.state.changeType === 5) {
+      data.nature = dataArrar
+      data.natureOther = this.state.natureOther
+    }
     $.ajax({
       url: globalConfig.context + "/api/admin/customer/updateUserDate",
       method: "post",
@@ -240,6 +250,11 @@ class InforChange extends Component {
               industryName: getIndustry(dataArrar)
             })
           }
+          if (this.state.changeType === 5) {
+            this.setState({
+              natureText: getNatureType(dataArrar, this.state.natureOther)
+            })
+          }
           this.onCancel();
         } else {
           message.warning(data.error[0].message);
@@ -405,7 +420,19 @@ class InforChange extends Component {
           </div>
           {this.props.type === 'modify' && <Button style={{ marginLeft: '5px' }} type="primary" onClick={(e) => { e.stopPropagation(); this.onChange(4) }}>修改</Button>}
         </div>
-
+        <div style={{
+          display: 'flex',
+          alignItems: 'center',
+          paddingBottom: '5px'
+        }}>
+          <div style={{ width: '123px' }}>客户性质:</div>
+          <div>
+            {
+              this.state.natureText
+            }
+          </div>
+          {this.props.type === 'modify' && <Button style={{ marginLeft: '5px' }} type="primary" onClick={(e) => { e.stopPropagation(); this.onChange(5) }}>修改</Button>}
+        </div>
         <Modal
           footer={null}
           maskClosable={false}
@@ -423,7 +450,8 @@ class InforChange extends Component {
                         this.state.changeType === 1 ? '企业主管产品/服务' :
                           this.state.changeType === 2 ? '意向合作项目' :
                             this.state.changeType === 3 ? '统一社会信用代码' :
-                              this.state.changeType === 4 ? '企业行业' : ''
+                              this.state.changeType === 4 ? '企业行业' :
+                                this.state.changeType === 5 ? '客户性质' : ''
                     }
                     :
                   </div>
@@ -433,7 +461,8 @@ class InforChange extends Component {
                         this.state.changeType === 1 ? this.state.businessScope :
                           this.state.changeType === 2 ? this.state.intendedProject :
                             this.state.changeType === 3 ? this.state.orgCode :
-                              this.state.changeType === 4 ? this.state.industryName : ''
+                              this.state.changeType === 4 ? this.state.industryName :
+                                this.state.changeType === 5 ? this.state.natureText : ''
                     }
                   </div>
                 </div>
@@ -566,7 +595,41 @@ class InforChange extends Component {
                                     }
                                   </Select>
                                 </div>
-                                : ''
+                                : this.state.changeType === 5 ?
+                                  <div>
+                                    <div>
+                                      <Select
+                                        style={{ width: 200 }}
+                                        placeholder="请选择客户性质"
+                                        onChange={e => {
+                                          this.setState({
+                                            dataArrar: e
+                                          })
+                                        }}
+                                      >
+                                        {
+                                          natureList.map(function (item) {
+                                            return <Option key={item.value} value={item.value}>{item.key}</Option>
+                                          })
+                                        }
+                                      </Select>
+                                    </div>
+                                    {
+                                      this.state.dataArrar === '0' &&
+                                      <div>
+                                        <TextArea
+                                          style={{ width: '300px', height: '100px' }}
+                                          placeholder='其他说明'
+                                          value={this.state.natureOther}
+                                          onChange={(e) => {
+                                            this.setState({
+                                              natureOther: e.target.value
+                                            })
+                                          }} />
+                                      </div>
+                                    }
+                                  </div>
+                                  : ''
                     }
                   </div>
                 </div>

+ 11 - 7
js/component/common/mysuspend/index.jsx

@@ -421,13 +421,17 @@ class MySuspend extends Component {
                 <div style={{ marginLeft: 20, marginBottom: 20 }}>
                   {
                     logList.map((item) =>
-                      <div key={item.id}>
-                        {item.createName + ":" + item.createTimes + " "}
-                        <span style={{ color: ["", "green", "red"][item.status], fontWeight: "bold" }}>
-                          {" " + ["【发起】", "【通过】", "【拒绝】"][item.status] + " "}
-                        </span>
-                        {"备注:" + item.reason}
-                      </div>
+                      item.status == null
+                        ? <div key={item.id}>
+                          {item.createName + ":" + "【审核中】"}
+                        </div>
+                        : <div key={item.id}>
+                          {item.createName + ":" + item.createTimes + " "}
+                          <span style={{ color: ["", "green", "red"][item.status], fontWeight: "bold" }}>
+                            {" " + ["【发起】", "【通过】", "【拒绝】"][item.status] + " "}
+                          </span>
+                          {"备注:" + item.reason}
+                        </div>
                     )
                   }
                 </div>

+ 285 - 83
js/component/common/projectOperation/newAddProject.jsx

@@ -1,5 +1,9 @@
 import React, { Component } from "react";
-import { AutoComplete, Button, Form, Input, message, Modal, Radio, Select, Spin, Tag, DatePicker } from "antd";
+import {
+  AutoComplete, Button, Form, Input, message,
+  Modal, Radio, Select, Spin, Tag, DatePicker,
+  Checkbox
+} from "antd";
 import { boutique } from "../../dataDic";
 import $ from "jquery";
 import { getboutique, splitUrl } from "../../tools";
@@ -11,6 +15,7 @@ const FormItem = Form.Item;
 const Option = Select.Option;
 const RadioGroup = Radio.Group;
 const confirm = Modal.confirm;
+const CheckboxGroup = Checkbox.Group;
 
 const formItemLayout = {
   labelCol: { span: 8 },
@@ -114,6 +119,8 @@ class NewAddProject extends Component {
       splitList: [],//子集
       addFrom: false,
       serviceYear: '',
+      checkType: [], //会员项目勾选的类型
+      newCheck: [], // 子项勾选的类型
     }
     this.onSubmit = this.onSubmit.bind(this);
     this.httpChange = this.httpChange.bind(this);
@@ -236,11 +243,38 @@ class NewAddProject extends Component {
       //   message.warning("请选择本次派单年份!");
       //   return
       // }
+      // if (this.state.projectType == 1 && !this.state.checkType.includes(1)) {
+      //   message.warning("请勾选高新会员");
+      //   return
+      // }
+
       if (this.state.contractTerm.length === 0 || this.state.contractTerm[1] == "") {
         message.warning("请填写合同期!");
         return
       }
     }
+    if (this.state.isVip == 3) { //科技项目
+      if (!this.state.technologyProjectType && this.state.technologyProjectType != 0) {
+        message.warning("请选择科技项目!");
+        return
+      }
+    }
+    if (this.state.isVip == 8 && this.state.addProjectType != 2) { //知识产权
+      if (!this.state.ordinaryRisk && this.state.ordinaryRisk != 0) {
+        message.warning("请选择申请类型!");
+        return
+      }
+    }
+    if (this.state.addProjectType == 2) {
+      if (!this.state.days && this.state.days != 0) {//天数
+        message.warning("请选择是否加急!");
+        return
+      }
+      if (!this.state.scheme && this.state.scheme != 0) {//方案
+        message.warning("请选择是否有方案!");
+        return
+      }
+    }
     this.setState({
       loading: true,
     });
@@ -285,6 +319,21 @@ class NewAddProject extends Component {
       infor.serviceLife = JSON.stringify(this.state.serviceLife) //会员服务年限
       // infor.serviceYear = this.state.serviceYear //本次派单年份
       infor.contractTerm = JSON.stringify(this.state.contractTerm)//合同期
+      if (this.state.projectType == 1) {
+        infor.htMember = this.state.checkType.includes(1) ? 1 : 0
+        infor.additionalDeduction = this.state.checkType.includes(2) ? 1 : 0
+        infor.rdAwardsubsidy = this.state.checkType.includes(3) ? 1 : 0
+      }
+    }
+    if (this.state.isVip == 3) { //科技项目
+      infor.technologyProjectType = this.state.technologyProjectType
+    }
+    if (this.state.isVip == 8 && this.state.addProjectType != 2) { //知识产权
+      infor.ordinaryRisk = this.state.ordinaryRisk
+    }
+    if (this.state.addProjectType == 2) {
+      infor.days = this.state.days //天数
+      infor.scheme = this.state.scheme   //方案
     }
     $.ajax({
       method: "POST",
@@ -398,6 +447,7 @@ class NewAddProject extends Component {
       isVip: kid.cSort,//暂时判断等于6的时候会员
       commodityQuantity: kid.cSort == 6 ? 1 : undefined,//服务数量
       histYear: [],
+      projectType: kid.projectType, // 会员项目类型
     });
     if (newData && newData.length > 0 && kid.cSort == 6) {
       for (var i = newData.length - 1; i >= 0; i--) {
@@ -412,6 +462,18 @@ class NewAddProject extends Component {
               histYear: list, // 已派单
             })
           }
+          let newCheckType = []
+          if (newData[i].projectType == 1) {
+            if (newData[i].htMember == 1) {
+              newCheckType.push(1)
+            }
+            if (newData[i].additionalDeduction == 1) {
+              newCheckType.push(2)
+            }
+            if (newData[i].rdAwardsubsidy == 1) {
+              newCheckType.push(3)
+            }
+          }
           this.setState({
             commodityPrice: newData[i].commodityPrice, // 实签价格
             main: newData[i].main.toString(), // 是否为主要项目
@@ -422,6 +484,8 @@ class NewAddProject extends Component {
             isEdit: true, // 不可编辑
             splitList: newData[i][children] || [],
             tid: newData[i].id, // 父级项目id
+            projectType: newData[i].projectType, // 项目类型
+            checkType: newCheckType, // 会员项目勾选类型
           })
           return
         } else {
@@ -545,6 +609,15 @@ class NewAddProject extends Component {
       serviceYear: this.state.serviceYear,
       taskComment: this.state.taskComment,
     }
+    if (this.state.projectType == 1) {
+      info.htMember = this.state.newCheck.includes(1) ? 1 : 0
+      info.additionalDeduction = this.state.newCheck.includes(2) ? 1 : 0
+      info.rdAwardsubsidy = this.state.newCheck.includes(3) ? 1 : 0
+
+      changeInfo.htMember = this.state.newCheck.includes(1) ? 1 : 0
+      changeInfo.additionalDeduction = this.state.newCheck.includes(2) ? 1 : 0
+      changeInfo.rdAwardsubsidy = this.state.newCheck.includes(3) ? 1 : 0
+    }
     let vipAddInfo = {
       tid: this.state.tid,
       serviceYear: this.state.serviceYear,//本次派单
@@ -580,6 +653,8 @@ class NewAddProject extends Component {
             taskComment: undefined,
             memberType: undefined,
             orgCodeUrl: [],
+            newCheck: [],
+            checkType: this.getNewCheckType(data.data, this.state.checkType), // 临时显示
           })
         } else {
           message.warning(data.error[0].message);
@@ -592,6 +667,20 @@ class NewAddProject extends Component {
     this.setState({ orgCodeUrl: e });
   }
 
+  getNewCheckType(item, list = []) {
+    let newCheckType = list
+    if (item.htMember == 1) {
+      newCheckType.push(1)
+    }
+    if (item.additionalDeduction == 1) {
+      newCheckType.push(2)
+    }
+    if (item.rdAwardsubsidy == 1) {
+      newCheckType.push(3)
+    }
+    return [...new Set(newCheckType)]
+  }
+
   render() {
     let newOptions = this.state.customerArr.map((group, index) => (
       <Select.Option key={index} value={group.bname}>
@@ -612,6 +701,14 @@ class NewAddProject extends Component {
     let children = vipYear.map(its => (
       <Option key={its}>{its}</Option>
     ));
+    let plainOptions = this.state.projectType == 3
+      ? [{ label: '仅提供单变会员', value: 1 },] : this.state.projectType == 2
+        ? [{ label: '仅填报表,仅咨询,不出备查资料', value: 1 }] : this.state.projectType == 1
+          ? [
+            { label: '高新会员', value: 1 },
+            { label: '加计扣除', value: 2 },
+            { label: '研发奖补', value: 3 }
+          ] : []
     const { RangePicker } = DatePicker;
     const { type = "" } = this.props;
     const { isVip, histYear, isEdit } = this.state
@@ -776,6 +873,75 @@ class NewAddProject extends Component {
                     *
                   </span>
                 </FormItem>}
+              {
+                // 知识产权
+                isVip == 8 && this.state.addProjectType != 2 &&
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="申请"
+                  >
+                    {
+                      <Radio.Group
+                        value={this.state.ordinaryRisk}
+                        onChange={(e) => {
+                          this.setState({ ordinaryRisk: e.target.value });
+                        }}
+                      >
+                        <Radio value={0}>普通申请</Radio>
+                        <Radio value={1}>风险代理</Radio>
+                      </Radio.Group>
+                    }
+                  </FormItem>
+                </div>
+              }
+              {
+                // 软著
+                this.state.addProjectType == 2 &&
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="天数"
+                  >
+                    {
+                      <Radio.Group
+                        value={this.state.days}
+                        onChange={(e) => {
+                          this.setState({ days: e.target.value });
+                        }}
+                      >
+                        <Radio value={0}>普通</Radio>
+                        <Radio value={1}>加急</Radio>
+                      </Radio.Group>
+                    }
+                  </FormItem>
+                </div>
+              }
+              {
+                // 软著
+                this.state.addProjectType == 2 &&
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="方案"
+                  >
+                    {
+                      <Radio.Group
+                        value={this.state.scheme}
+                        onChange={(e) => {
+                          this.setState({ scheme: e.target.value });
+                        }}
+                      >
+                        <Radio value={0}>无方案</Radio>
+                        <Radio value={1}>有方案</Radio>
+                      </Radio.Group>
+                    }
+                  </FormItem>
+                </div>
+              }
               <div className="clearfix">
                 <FormItem
                   className="half-item"
@@ -860,88 +1026,6 @@ class NewAddProject extends Component {
                   {<span className="mandatory">*</span>}
                 </FormItem>
               }
-              {/* {
-                isVip == 6 &&
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="科技项目"
-                >
-                  <RadioGroup onChange={() => { }}>
-                    <Radio value={1}>国家级</Radio>
-                    <Radio value={2}>省级</Radio>
-                    <Radio value={3}>市区级</Radio>
-                    <Radio value={4}>简易项目</Radio>
-                  </RadioGroup>
-                </FormItem>
-              } */}
-
-              {/* {
-                isVip == 6 &&
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="标准会员"
-                >
-                  <RadioGroup onChange={() => { }}>
-                    <Radio value={1}>高新会员</Radio>
-                    <Radio value={2}>加计扣除</Radio>
-                    <Radio value={3}>研发奖补</Radio>
-                  </RadioGroup>
-                </FormItem>
-              } */}
-
-              {/* {
-                isVip == 6 &&
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="简单会员"
-                >
-                  <RadioGroup onChange={() => { }} value={1}>
-                    <Radio value={1}>仅填报表,仅咨询,不出备查资料</Radio>
-                  </RadioGroup>
-                </FormItem>
-              } */}
-
-              {/* {
-                isVip == 6 &&
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="简单会员"
-                >
-                  <RadioGroup onChange={() => { }} value={1}>
-                    <Radio value={1}>仅提供单边会员服务</Radio>
-                  </RadioGroup>
-                </FormItem>
-              } */}
-
-              {
-                isVip == 6 &&
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="会员总服务年限"
-                >
-                  {
-                    !this.state.yearSum ? "" :
-                      [
-                        { value: "0", key: "" },
-                        { value: "1", key: "一年" },
-                        { value: "2", key: "二年" },
-                        { value: "3", key: "三年" },
-                        { value: "4", key: "四年" },
-                        { value: "5", key: "五年" },
-                        { value: "6", key: "六年" },
-                        { value: "7", key: "七年" },
-                        { value: "8", key: "八年" },
-                        { value: "9", key: "九年" },
-                        { value: "10", key: "十年" },
-                      ][this.state.yearSum]["key"]
-                  }
-                </FormItem>
-              }
               {
                 // 会员合同期
                 isVip == 6 &&
@@ -982,6 +1066,55 @@ class NewAddProject extends Component {
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
+                    label="会员总服务年限"
+                  >
+                    {
+                      !this.state.yearSum ? "" :
+                        [
+                          { value: "0", key: "" },
+                          { value: "1", key: "一年" },
+                          { value: "2", key: "二年" },
+                          { value: "3", key: "三年" },
+                          { value: "4", key: "四年" },
+                          { value: "5", key: "五年" },
+                          { value: "6", key: "六年" },
+                          { value: "7", key: "七年" },
+                          { value: "8", key: "八年" },
+                          { value: "9", key: "九年" },
+                          { value: "10", key: "十年" },
+                        ][this.state.yearSum]["key"]
+                    }
+                  </FormItem>
+                </div>
+              }
+              {
+                isVip == 6 &&
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label={this.state.projectType == 3
+                      ? '单边会员' : this.state.projectType == 2
+                        ? '简单会员' : this.state.projectType == 1
+                          ? '高新会员' : this.state.projectType == 0
+                            ? '其他' : ' '}
+                  >
+                    <CheckboxGroup
+                      // disabled={this.state.projectType == 3 || this.state.projectType == 2 || isEdit}
+                      disabled
+                      style={{ width: 200 }}
+                      options={plainOptions}
+                      value={this.state.checkType}
+                      onChange={e => {
+                        this.setState({
+                          checkType: e
+                        })
+                      }}
+                    />
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
                     label="合同期"
                   >
                     {
@@ -1006,6 +1139,31 @@ class NewAddProject extends Component {
                 </div>
               }
               {
+                // 科技项目
+                isVip == 3 &&
+                <div className="clearfix">
+                  <FormItem
+                    labelCol={{ span: 4 }}
+                    wrapperCol={{ span: 16 }}
+                    label='科技项目'
+                  >
+                    <RadioGroup
+                      onChange={e => {
+                        this.setState({
+                          technologyProjectType: e.target.value
+                        })
+                      }}
+                      value={this.state.technologyProjectType}
+                    >
+                      <Radio value={3}>国家级</Radio>
+                      <Radio value={2}>省级</Radio>
+                      <Radio value={1}>市区级</Radio>
+                      <Radio value={0}>简易项目</Radio>
+                    </RadioGroup>
+                  </FormItem>
+                </div>
+              }
+              {
                 // 审计
                 this.state.addProjectType == "3" &&
                 <div className="clearfix">
@@ -1212,6 +1370,25 @@ class NewAddProject extends Component {
                       {item.commodityQuantity}
                     </FormItem>
                     {
+                      this.state.projectType == 1 &&
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="高新会员"
+                      >
+                        <CheckboxGroup
+                          disabled
+                          style={{ width: 200 }}
+                          options={[
+                            { label: '高新会员', value: 1 },
+                            { label: '加计扣除', value: 2 },
+                            { label: '研发奖补', value: 3 }
+                          ]}
+                          value={this.getNewCheckType(item)}
+                        />
+                      </FormItem>
+                    }
+                    {
                       type == "vipAdd" &&
                       <FormItem
                         className="half-item"
@@ -1329,6 +1506,31 @@ class NewAddProject extends Component {
                         {<span className="mandatory">*</span>}
                       </FormItem>
                       {
+                        this.state.projectType == 1 &&
+                        <div className="clearfix">
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label={'高新会员'}
+                          >
+                            <CheckboxGroup
+                              style={{ width: 200 }}
+                              options={[
+                                { label: '高新会员', value: 1 },
+                                { label: '加计扣除', value: 2 },
+                                { label: '研发奖补', value: 3 }
+                              ]}
+                              value={this.state.newCheck}
+                              onChange={e => {
+                                this.setState({
+                                  newCheck: e
+                                })
+                              }}
+                            />
+                          </FormItem>
+                        </div>
+                      }
+                      {
                         this.props.type == "vipAdd" &&
                         <FormItem
                           className="half-item"

+ 260 - 15
js/component/common/projectOperation/newEditProject.jsx

@@ -1,5 +1,9 @@
 import React, { Component } from "react";
-import { AutoComplete, Button, Icon, Form, Input, message, Modal, Radio, Select, Spin, Tag, DatePicker } from "antd";
+import {
+  AutoComplete, Button, Icon, Form, Input, message,
+  Modal, Radio, Select, Spin, Tag, DatePicker,
+  Checkbox
+} from "antd";
 import { boutique } from "../../dataDic";
 import $ from "jquery";
 import { getboutique, splitUrl } from "../../tools";
@@ -11,6 +15,7 @@ const FormItem = Form.Item;
 const Option = Select.Option;
 const RadioGroup = Radio.Group;
 const confirm = Modal.confirm;
+const CheckboxGroup = Checkbox.Group;
 
 const formItemLayout = {
   labelCol: { span: 8 },
@@ -53,6 +58,8 @@ class newEditProject extends Component {
       addFrom: false,
       isMedit: 0,
       isYear: false,//审计是否需要修改上年度年份
+      checkType: [], //会员项目勾选的类型
+      newCheck: [], // 子项勾选的类型
     }
     this.getpatentTypeList = this.getpatentTypeList.bind(this);
     this.setValue = this.setValue.bind(this);
@@ -107,6 +114,18 @@ class newEditProject extends Component {
         }
       }
     }
+    let newCheckType = []
+    if (dataInfor.projectType == 1) {
+      if (dataInfor.htMember == 1) {
+        newCheckType.push(1)
+      }
+      if (dataInfor.additionalDeduction == 1) {
+        newCheckType.push(2)
+      }
+      if (dataInfor.rdAwardsubsidy == 1) {
+        newCheckType.push(3)
+      }
+    }
     this.setState({
       jid: dataInfor.id, //项目ID
       kid: dataInfor.commodityId, //商品ID
@@ -136,6 +155,13 @@ class newEditProject extends Component {
       splitList: dataInfor[children] || [],
       tid: dataInfor.id, // 父级项目id
       isMedit: readOnly ? 3 : dataInfor.cSort == 6 ? 0 : 1,// 会员项目默认0不可编辑   普通项目默认1可编辑
+      projectType: dataInfor.projectType, // 会员项目类型
+      checkType: newCheckType, // 会员项目勾选类型
+
+      technologyProjectType: dataInfor.technologyProjectType, //科技项目
+      ordinaryRisk: dataInfor.ordinaryRisk, //知识产权申请类型
+      days: dataInfor.days, // 软著 天数
+      scheme: dataInfor.scheme, // 软著 方案
     });
   }
 
@@ -208,11 +234,37 @@ class newEditProject extends Component {
       //   message.warning("请选择本次派单年份!");
       //   return
       // }
+      // if (this.state.projectType == 1 && !this.state.checkType.includes(1)) {
+      //   message.warning("请勾选高新会员");
+      //   return
+      // }
       if (this.state.contractTerm.length === 0 || this.state.contractTerm[1] == "") {
         message.warning("请填写合同期!");
         return
       }
     }
+    if (this.state.isVip == 3) { //科技项目
+      if (!this.state.technologyProjectType && this.state.technologyProjectType != 0) {
+        message.warning("请选择科技项目!");
+        return
+      }
+    }
+    if (this.state.isVip == 8 && this.state.addProjectType != 2) { //知识产权
+      if (!this.state.ordinaryRisk && this.state.ordinaryRisk != 0) {
+        message.warning("请选择申请类型!");
+        return
+      }
+    }
+    if (this.state.addProjectType == 2) {
+      if (!this.state.days && this.state.days != 0) {//天数
+        message.warning("请选择是否加急!");
+        return
+      }
+      if (!this.state.scheme && this.state.scheme != 0) {//方案
+        message.warning("请选择是否有方案!");
+        return
+      }
+    }
     this.setState({
       loading: true,
     });
@@ -248,6 +300,21 @@ class newEditProject extends Component {
       infor.serviceLife = JSON.stringify(this.state.serviceLife) //会员服务年限
       // infor.serviceYear = this.state.serviceYear //本次派单年份
       infor.contractTerm = JSON.stringify(this.state.contractTerm)//合同期
+      if (this.state.projectType == 1) {
+        infor.htMember = this.state.checkType.includes(1) ? 1 : 0
+        infor.additionalDeduction = this.state.checkType.includes(2) ? 1 : 0
+        infor.rdAwardsubsidy = this.state.checkType.includes(3) ? 1 : 0
+      }
+    }
+    if (this.state.isVip == 3) { //科技项目
+      infor.technologyProjectType = this.state.technologyProjectType
+    }
+    if (this.state.isVip == 8 && this.state.addProjectType != 2) { //知识产权
+      infor.ordinaryRisk = this.state.ordinaryRisk
+    }
+    if (this.state.addProjectType == 2) {
+      infor.days = this.state.days //天数
+      infor.scheme = this.state.scheme   //方案
     }
     // 新开单与签单项目变更 -- 编辑项目
     if (type == "change") {
@@ -473,6 +540,15 @@ class newEditProject extends Component {
       serviceYear: this.state.serviceYear,
       taskComment: this.state.taskComment,
     }
+    if (this.state.projectType == 1) {
+      info.htMember = this.state.newCheck.includes(1) ? 1 : 0
+      info.additionalDeduction = this.state.newCheck.includes(2) ? 1 : 0
+      info.rdAwardsubsidy = this.state.newCheck.includes(3) ? 1 : 0
+
+      changeInfo.htMember = this.state.newCheck.includes(1) ? 1 : 0
+      changeInfo.additionalDeduction = this.state.newCheck.includes(2) ? 1 : 0
+      changeInfo.rdAwardsubsidy = this.state.newCheck.includes(3) ? 1 : 0
+    }
     if (this.state.recoveryId != "") {
       this.updateMemberSonProject(this.state.recoveryId, this.state.taskComment)
       return
@@ -506,6 +582,8 @@ class newEditProject extends Component {
             serviceYear: undefined,
             taskComment: undefined,
             isMedit: 0,
+            newCheck: [],
+            checkType: this.getNewCheckType(data.data, this.state.checkType), // 临时显示
           })
         } else {
           message.warning(data.error[0].message);
@@ -514,10 +592,32 @@ class newEditProject extends Component {
     });
   }
 
+  getNewCheckType(item, list = []) {
+    let newCheckType = list
+    if (item.htMember == 1) {
+      newCheckType.push(1)
+    }
+    if (item.additionalDeduction == 1) {
+      newCheckType.push(2)
+    }
+    if (item.rdAwardsubsidy == 1) {
+      newCheckType.push(3)
+    }
+    return [...new Set(newCheckType)]
+  }
+
   render() {
     let children = vipYear.map(its => (
       <Option key={its}>{its}</Option>
     ));
+    let plainOptions = this.state.projectType == 3
+      ? [{ label: '仅提供单变会员', value: 1 },] : this.state.projectType == 2
+        ? [{ label: '仅填报表,仅咨询,不出备查资料', value: 1 }] : this.state.projectType == 1
+          ? [
+            { label: '高新会员', value: 1 },
+            { label: '加计扣除', value: 2 },
+            { label: '研发奖补', value: 3 }
+          ] : []
     const { RangePicker } = DatePicker;
     const { readOnly } = this.props;
     const { isVip, histYear, isMedit } = this.state
@@ -646,6 +746,78 @@ class newEditProject extends Component {
                   </span>
                 </FormItem>
               }
+              {
+                // 知识产权
+                isVip == 8 && this.state.addProjectType != 2 &&
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="申请"
+                  >
+                    {
+                      <Radio.Group
+                        disabled={readOnly}
+                        value={this.state.ordinaryRisk}
+                        onChange={(e) => {
+                          this.setState({ ordinaryRisk: e.target.value });
+                        }}
+                      >
+                        <Radio value={0}>普通申请</Radio>
+                        <Radio value={1}>风险代理</Radio>
+                      </Radio.Group>
+                    }
+                  </FormItem>
+                </div>
+              }
+              {
+                // 软著
+                this.state.addProjectType == 2 &&
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="天数"
+                  >
+                    {
+                      <Radio.Group
+                        disabled={readOnly}
+                        value={this.state.days}
+                        onChange={(e) => {
+                          this.setState({ days: e.target.value });
+                        }}
+                      >
+                        <Radio value={0}>普通</Radio>
+                        <Radio value={1}>加急</Radio>
+                      </Radio.Group>
+                    }
+                  </FormItem>
+                </div>
+              }
+              {
+                // 软著
+                this.state.addProjectType == 2 &&
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="方案"
+                  >
+                    {
+                      <Radio.Group
+                        disabled={readOnly}
+                        value={this.state.scheme}
+                        onChange={(e) => {
+                          this.setState({ scheme: e.target.value });
+                        }}
+                      >
+                        <Radio value={0}>无方案</Radio>
+                        <Radio value={1}>有方案</Radio>
+                      </Radio.Group>
+                    }
+                  </FormItem>
+                </div>
+              }
               <div className="clearfix">
                 <FormItem
                   className="half-item"
@@ -822,7 +994,24 @@ class newEditProject extends Component {
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
+                    label={this.state.projectType == 3
+                      ? '单边会员' : this.state.projectType == 2
+                        ? '简单会员' : this.state.projectType == 1
+                          ? '高新会员' : this.state.projectType == 0
+                            ? '其他' : ' '}
                   >
+                    <CheckboxGroup
+                      // disabled={this.state.projectType == 3 || this.state.projectType == 2 || isMedit != 1}
+                      disabled
+                      style={{ width: 200 }}
+                      options={plainOptions}
+                      value={this.state.checkType}
+                      onChange={e => {
+                        this.setState({
+                          checkType: e
+                        })
+                      }}
+                    />
                   </FormItem>
                   <FormItem
                     className="half-item"
@@ -847,26 +1036,38 @@ class newEditProject extends Component {
                             this.setState({ contractTerm: dataString });
                           }}
                         />
-                      // <Select
-                      //   mode="multiple"
-                      //   style={{ width: '200px' }}
-                      //   placeholder="请选择合同期"
-                      //   disabled={isMedit != 1}
-                      //   value={this.state.contractTerm}
-                      //   onChange={e => {
-                      //     this.setState({
-                      //       contractTerm: e,
-                      //     })
-                      //   }}
-                      // >
-                      //   {children}
-                      // </Select>
                     }
                     {!readOnly && <span className="mandatory">*</span>}
                   </FormItem>
                 </div>
               }
               {
+                // 科技项目
+                isVip == 3 &&
+                <div className="clearfix">
+                  <FormItem
+                    labelCol={{ span: 4 }}
+                    wrapperCol={{ span: 16 }}
+                    label='科技项目'
+                  >
+                    <RadioGroup
+                      disabled={readOnly}
+                      onChange={e => {
+                        this.setState({
+                          technologyProjectType: e.target.value
+                        })
+                      }}
+                      value={this.state.technologyProjectType}
+                    >
+                      <Radio value={3}>国家级</Radio>
+                      <Radio value={2}>省级</Radio>
+                      <Radio value={1}>市区级</Radio>
+                      <Radio value={0}>简易项目</Radio>
+                    </RadioGroup>
+                  </FormItem>
+                </div>
+              }
+              {
                 // 审计
                 this.state.addProjectType == "3" &&
                 <div className="clearfix">
@@ -1142,6 +1343,25 @@ class newEditProject extends Component {
                       {item.commodityQuantity}
                     </FormItem>
                     {
+                      this.state.projectType == 1 &&
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="高新会员"
+                      >
+                        <CheckboxGroup
+                          disabled
+                          style={{ width: 200 }}
+                          options={[
+                            { label: '高新会员', value: 1 },
+                            { label: '加计扣除', value: 2 },
+                            { label: '研发奖补', value: 3 }
+                          ]}
+                          value={this.getNewCheckType(item)}
+                        />
+                      </FormItem>
+                    }
+                    {
                       (item.memberType == "0" || item.memberType == "1" || item.memberType == "2") &&
                       <FormItem
                         className="half-item"
@@ -1295,6 +1515,31 @@ class newEditProject extends Component {
                         />
                         {<span className="mandatory">*</span>}
                       </FormItem>
+                      {
+                        this.state.projectType == 1 &&
+                        <div className="clearfix">
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label={'高新会员'}
+                          >
+                            <CheckboxGroup
+                              style={{ width: 200 }}
+                              options={[
+                                { label: '高新会员', value: 1 },
+                                { label: '加计扣除', value: 2 },
+                                { label: '研发奖补', value: 3 }
+                              ]}
+                              value={this.state.newCheck}
+                              onChange={e => {
+                                this.setState({
+                                  newCheck: e
+                                })
+                              }}
+                            />
+                          </FormItem>
+                        </div>
+                      }
                       <div className="clearfix">
                         <FormItem
                           labelCol={{ span: 4 }}

+ 34 - 0
js/component/dataDic.js

@@ -770,6 +770,37 @@ module.exports = {
       key: "T 国际组织",
     },
   ],
+  // 客户性质
+  natureList: [
+    {
+      value: "1",
+      key: "政府机构",
+    },
+    {
+      value: "2",
+      key: "科研院所",
+    },
+    {
+      value: "3",
+      key: "高等院校",
+    },
+    {
+      value: "4",
+      key: "国有企业",
+    },
+    {
+      value: "5",
+      key: "民营企业",
+    },
+    {
+      value: "6",
+      key: "社会团体",
+    },
+    {
+      value: "0",
+      key: "其他",
+    },
+  ],
   //企业规模(注册资金
   scaleList: [
     {
@@ -4119,6 +4150,9 @@ module.exports = {
     }, {
       value: 26,
       label: '领取线索客户',
+    }, {
+      value: 27,
+      label: '线索客户到期释放',
     }
   ],
   //消息提醒状态

+ 49 - 10
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -113,6 +113,7 @@ const IntentionCustomer = Form.create()(React.createClass({
       follow: this.state.follow,
       province: !(this.state.addressSearch).length ? this.state.provinceSearch : this.state.addressSearch[0],
       city: !(this.state.addressSearch).length ? undefined : this.state.addressSearch[1],
+      nature: this.state.nature,
     }
     if (this.props.isMaintain) {
       data.shiroType = this.props.shiroType;
@@ -401,12 +402,12 @@ const IntentionCustomer = Form.create()(React.createClass({
             return (
               <Tooltip title={onReplace(text)}>
                 <div
-                  // style={{
-                  //   maxWidth: '200px',
-                  //   overflow: 'hidden',
-                  //   textOverflow: "ellipsis",
-                  //   whiteSpace: 'nowrap',
-                  // }}
+                // style={{
+                //   maxWidth: '200px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
                 >{onReplace(text)}</div>
               </Tooltip>
             )
@@ -500,7 +501,7 @@ const IntentionCustomer = Form.create()(React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div 
+                <div
                 // style={{
                 //   maxWidth: '200px',
                 //   overflow: 'hidden',
@@ -617,7 +618,7 @@ const IntentionCustomer = Form.create()(React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div 
+                <div
                 // style={{
                 //   maxWidth: '200px',
                 //   overflow: 'hidden',
@@ -630,6 +631,25 @@ const IntentionCustomer = Form.create()(React.createClass({
           }
         },
         {
+          title: "客户性质",
+          dataIndex: "nature",
+          key: "nature",
+          render: (text, record) => {
+            return <div>
+              {
+                text == 0
+                  ? `其他(${record.natureOther})` : text == 1
+                    ? '政府机构' : text == 2
+                      ? '科研院所' : text == 3
+                        ? '高等院校' : text == 4
+                          ? '国有企业' : text == 5
+                            ? '民营企业' : text == 6
+                              ? '社会团体' : ''
+              }
+            </div>;
+          },
+        },
+        {
           title: '客户类型',
           dataIndex: 'shareType',
           key: 'shareType',
@@ -751,7 +771,7 @@ const IntentionCustomer = Form.create()(React.createClass({
         render: text => {
           return (
             <Tooltip title={text}>
-              <div 
+              <div
               // style={{
               //   maxWidth: '200px',
               //   overflow: 'hidden',
@@ -1078,7 +1098,8 @@ const IntentionCustomer = Form.create()(React.createClass({
       shareType: undefined,
       depId: undefined,
       citySearch: undefined,
-      releaseDate: []
+      releaseDate: [],
+      nature: undefined,
     }, () => {
       this.loadData();
     })
@@ -2062,6 +2083,24 @@ const IntentionCustomer = Form.create()(React.createClass({
                   this.setState({ releaseDate: dataString });
                 }}
               />
+              {<span style={{ marginRight: "10px" }}>
+                  <Select
+                    placeholder="客户性质"
+                    style={{ width: 110 }}
+                    value={this.state.nature}
+                    onChange={(e) => {
+                      this.setState({ nature: e });
+                    }}
+                  >
+                    <Option value={1}>政府机构</Option>
+                    <Option value={2}>科研院所</Option>
+                    <Option value={3}>高等院校</Option>
+                    <Option value={4}>国有企业</Option>
+                    <Option value={5}>民营企业</Option>
+                    <Option value={6}>社会团体</Option>
+                    <Option value={0}>其他</Option>
+                  </Select>
+                </span>}
               <Button type="primary" onClick={this.search} style={{ marginRight: 10 }}>
                 搜索
               </Button>

+ 53 - 0
js/component/manageCenter/customer/NEW/intentionCustomer/addIntention.jsx

@@ -83,6 +83,14 @@ const AchievementDetailForm = Form.create()(React.createClass({
         message.warning('请选择客户类型')
         return false;
       }
+      if (!this.state.nature && this.state.nature != 0) {
+        message.warning('请选择客户性质')
+        return false;
+      }
+      if (this.state.nature == 0 && !this.state.natureOther) {
+        message.warning('其他说明不能为空')
+        return false;
+      }
       let arr = [];
       for (let i of this.state.selectCooperationProjects) {
         arr.push(i.label)
@@ -111,6 +119,8 @@ const AchievementDetailForm = Form.create()(React.createClass({
             businessScope: this.state.businessScope.join(','),
             position: values.position,
             level: this.state.level,
+            nature: this.state.nature,
+            natureOther: this.state.natureOther,
           }
         }).done(function (data) {
           this.setState({
@@ -516,6 +526,49 @@ const AchievementDetailForm = Form.create()(React.createClass({
                   </Select>
                 </FormItem>
               </div>
+              <div className="clearfix">
+                <FormItem
+                  className="mid-item"
+                  {...formItemLayout}
+                  required
+                  label="客户性质" >
+                  <Select
+                    placeholder="请选择客户性质"
+                    value={this.state.nature}
+                    onChange={(e) => {
+                      this.setState({ nature: e });
+                    }}
+                  >
+                    <Option value={1}>政府机构</Option>
+                    <Option value={2}>科研院所</Option>
+                    <Option value={3}>高等院校</Option>
+                    <Option value={4}>国有企业</Option>
+                    <Option value={5}>民营企业</Option>
+                    <Option value={6}>社会团体</Option>
+                    <Option value={0}>其他(请注明)</Option>
+                  </Select>
+                </FormItem>
+              </div>
+              {
+                this.state.nature == 0 &&
+                <div className="clearfix">
+                  <FormItem
+                    className="mid-item"
+                    {...formItemLayout}
+                    required
+                    label="其他说明" >
+                    <Input
+                      placeholder="其他说明"
+                      value={this.state.natureOther}
+                      onChange={e => {
+                        this.setState({
+                          natureOther: e.target.value
+                        })
+                      }}
+                    />
+                  </FormItem>
+                </div>
+              }
               {/*<div className="clearfix">*/}
               {/*	<FormItem className="mid-item"*/}
               {/*      {...formItemLayout}*/}

+ 39 - 0
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -64,6 +64,7 @@ const IntentionCustomer = Form.create()(
             : this.state.addressSearch[1],
           startDate: this.state.releaseDate[0],
           endDate: this.state.releaseDate[1],
+          nature: this.state.nature,
         },
         success: function (data) {
           ShowModal(this);
@@ -230,6 +231,25 @@ const IntentionCustomer = Form.create()(
             },
           },
           {
+            title: "客户性质",
+            dataIndex: "nature",
+            key: "nature",
+            render: (text, record) => {
+              return <div>
+                {
+                  text == 0
+                    ? `其他(${record.natureOther})` : text == 1
+                      ? '政府机构' : text == 2
+                        ? '科研院所' : text == 3
+                          ? '高等院校' : text == 4
+                            ? '国有企业' : text == 5
+                              ? '民营企业' : text == 6
+                                ? '社会团体' : ''
+                }
+              </div>;
+            },
+          },
+          {
             title: "地区",
             dataIndex: "locationProvince",
             key: "locationProvince",
@@ -635,6 +655,7 @@ const IntentionCustomer = Form.create()(
       this.state.citySearch = undefined;
       this.state.releaseDate[0] = undefined;
       this.state.releaseDate[1] = undefined;
+      this.state.nature = undefined;
       this.loadData();
     },
     searchSwitch() {
@@ -1055,6 +1076,24 @@ const IntentionCustomer = Form.create()(
                     this.setState({ releaseDate: dataString });
                   }}
                 />
+                <span style={{ marginLeft: "10px" }}>
+                  <Select
+                    placeholder="客户性质"
+                    style={{ width: 110 }}
+                    value={this.state.nature}
+                    onChange={(e) => {
+                      this.setState({ nature: e });
+                    }}
+                  >
+                    <Option value={1}>政府机构</Option>
+                    <Option value={2}>科研院所</Option>
+                    <Option value={3}>高等院校</Option>
+                    <Option value={4}>国有企业</Option>
+                    <Option value={5}>民营企业</Option>
+                    <Option value={6}>社会团体</Option>
+                    <Option value={0}>其他</Option>
+                  </Select>
+                </span>
                 <Button
                   type="primary"
                   style={{ marginLeft: "10px", marginRight: 10 }}

+ 545 - 4
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -1,12 +1,17 @@
 import React from 'react';
-import { Button, Cascader, Input, Select, Spin, Table, message, Form, Tabs, Modal, Icon } from 'antd';
+import {
+  Button, Cascader, Input, Select, Tag,
+  Spin, Table, message, Form, Col, Tabs, Modal, Icon, AutoComplete
+} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import { citySelect, provinceList } from '@/NewDicProvinceList';
+import {areaSelect, citySelect, provinceList } from '@/NewDicProvinceList';
 import { ShowModal, onReplace } from '../../../../tools.js'
+import { socialAttribute, customerSource } from '@/dataDic.js';
 import Outbound from '../../NEW/components/outbound';
 import ShowModalDiv from "@/showModal.jsx";
 import { ChooseList } from "../../../order/orderNew/chooseList";
+import TextArea from "antd/es/input/TextArea";
 
 const QueryCustomer = React.createClass({
   loadData(pageNo, apiUrl) {
@@ -85,6 +90,11 @@ const QueryCustomer = React.createClass({
   },
   getInitialState() {
     return {
+      verification: false,
+      businessScope: [],
+      cooperationProjects: [],
+      selectCooperationProjects: [],
+
       sort: 0,
       addressSearch: [],
       dataSource: [],
@@ -167,7 +177,90 @@ const QueryCustomer = React.createClass({
       ],
     }
   },
-  /*单个领取*/
+  handleClose(removedTag) {
+    let businessScope = this.state.businessScope.filter(tag => { return tag !== removedTag });
+    this.setState({ businessScope });
+  },
+  handleCloseCooperation(removedTag) {
+    let selectCooperationProjects = this.state.selectCooperationProjects.filter(tag => { return tag.value !== removedTag.value });
+    this.setState({ selectCooperationProjects });
+  },
+  showInput() {
+    let str = this.state.businessScope.join('/')
+    this.setState({
+      inputVisible: true,
+      inputValue: str
+    });
+  },
+  handleInputConfirm() {
+    let inputValue = this.state.inputValue;
+    let arr = inputValue.split('/');
+    let lv = true;
+    for (let i of arr) {
+      if (!i.replace(/\s+/g, '')) {
+        message.warning("请填写关键词且不为空");
+        return;
+      }
+      if (i.length > 16) {
+        message.warning('单个标签字数不能超过16个字符')
+        lv = false;
+        return;
+      }
+    }
+    if (lv) {
+      arr = Array.from(new Set(arr));
+      arr = arr.filter(v => v);
+      this.setState({
+        businessScope: arr,
+        inputVisible: false,
+        inputValue: '',
+      });
+    }
+  },
+  //加载(自动补全)
+  supervisor(value) {
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + '/api/admin/order/getBusinessProjectByName',
+      data: {
+        businessName: value
+      },
+      success: function (data) {
+        let thedata = data.data;
+        if (data.error.length === 0) {
+          this.setState({
+            cooperationProjects: thedata,
+          });
+        } else {
+          message.warning(data.error[0].message);
+        }
+      }.bind(this),
+    }).always(
+      function () {
+
+      }.bind(this)
+    );
+  },
+  onSelect(value) {
+    let arr = this.state.cooperationProjects.filter(v => v.id === value);
+    let arr1 = this.state.selectCooperationProjects.filter(v => v.value === value);
+    if (arr.length > 0) {
+      if (arr1.length > 0) {
+        message.warning('选项已存在');
+      } else {
+        this.state.selectCooperationProjects.push({
+          label: arr[0].bname,
+          value: arr[0].id,
+        })
+        this.setState({
+          selectCooperationProjects: this.state.selectCooperationProjects
+        })
+      }
+    }
+  },
+  // 查询客户补充完整
   receive(e) {
     this.setState({
       loading: true,
@@ -177,6 +270,52 @@ const QueryCustomer = React.createClass({
       method: "get",
       dataType: "json",
       crossDomain: false,
+      url: globalConfig.context + "/api/admin/customer/checkUser",
+      data: {
+        id: e.id || e.uid,
+      }
+    }).done(function (data) {
+      if (!data.error.length) {
+        let obj = data.data
+        let selectCooperationProjects = !!obj.intendedProject ? obj.intendedProject.split(',') : []
+        if (selectCooperationProjects.length > 0) {
+          selectCooperationProjects = selectCooperationProjects.map((item) => {
+            return { label: item }
+          })
+        }
+        this.setState({
+          loading: false,
+          verification: true,
+
+          id: obj.id,
+          name: obj.name,
+          orgCode: obj.orgCode,
+          ProvinceCity: [obj.province, obj.city, obj.area],
+          // content: obj.contacts,
+          position: obj.position,
+          // telnum: obj.contactMobile,
+          businessScope: !!obj.businessScope ? obj.businessScope.split(',') : [],
+          selectCooperationProjects: selectCooperationProjects,
+          level: obj.level,
+          nature: obj.nature,
+          natureOther: obj.natureOther,
+        });
+      } else {
+        message.warning(data.error[0].message);
+      };
+    }.bind(this));
+  },
+
+  /*单个领取(旧)*/
+  receives(e) {
+    this.setState({
+      loading: true,
+      selectedRowKeys: [],
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
       url: globalConfig.context + "/api/admin/customer/receiveCustomer",
       data: {
         uid: e.id,
@@ -282,8 +421,132 @@ const QueryCustomer = React.createClass({
       changeList: newArr
     });
   },
+  // 补充客户并领取
+  handleSubmit(e) {
+    e.preventDefault();
+    this.props.form.validateFields((err, values) => {
+      let re = new RegExp("^[\u4e00-\u9fa5]");
+      if (!re.test(values.name)) {
+        message.warning('公司名称必须以汉字开头!')
+        return
+      }
+      if (!re.test(values.name.charAt(values.name.length - 1))) {
+        message.warning('公司名称必须以汉字结尾!')
+        return
+      }
+      if (values.name.length > 64) {
+        message.warning('公司名称字数不超过64个!')
+        return false;
+      };
+      let regu = /[`~!#$%^&*'_[\]+=<>?:"{}|~!#¥%……&*=-@-!{}|/《》?:“”【】、;;‘’,,.。、\s+]/g;
+      if (regu.test(values.name)) {
+        message.warning('公司名称不能存在特殊符号或空格!')
+        return false;
+      }
+      if (!/^[A-Z0-9]{15}$|^[A-Z0-9]{17}$|^[A-Z0-9]{18}$|^[A-Z0-9]{20}$/.test(values.orgCode)) {
+        message.warning('请输入正确的统一社会信用代码!')
+        return
+      }
+      if (/.*[\u4e00-\u9fa5]+.*$/.test(values.content)) {
+      } else {
+        message.error("请填写正确的联系人,且至少包含一个汉字");
+        return false;
+      };
+      if (/.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
+      } else {
+        message.error("请填写正确的职位,且至少包含一个汉字");
+        return false;
+      };
+      if (!values.ProvinceCity[1]) {
+        message.warning('请选择地区');
+        return false;
+      };
+      if (values.content.length > 32) {
+        message.warning('联系人字数不超过32个')
+        return false;
+      };
+      if (values.length > 13) {
+        message.warning('电话号码字数不超过13个')
+        return false;
+      };
+      if (this.state.businessScope.length === 0) {
+        message.warning('请选择主营产品')
+        return false;
+      }
+      if (this.state.selectCooperationProjects.length === 0) {
+        message.warning('请选择意向合作项目')
+        return false;
+      }
+      if (!this.state.level && this.state.level != 0) {
+        message.warning('请选择客户类型')
+        return false;
+      }
+      if (!this.state.nature && this.state.nature != 0) {
+        message.warning('请选择客户性质')
+        return false;
+      }
+      if (this.state.nature == 0 && !this.state.natureOther) {
+        message.warning('其他说明不能为空')
+        return false;
+      }
+      let arr = [];
+      for (let i of this.state.selectCooperationProjects) {
+        arr.push(i.label)
+      }
+      if (!err) {
+        this.setState({
+          loading: true
+        });
+        $.ajax({
+          method: "POST",
+          dataType: "json",
+          crossDomain: false,
+          url: globalConfig.context + '/api/admin/customer/updateAndReceiveCustomer',
+          data: {
+            id: this.state.id,
+            orgCode: values.orgCode,
+            contacts: values.content,
+            contactMobile: values.telnum,
+            societyTag: '0',                       //社会属性默认为 社会企业
+            //source:values.customerSource,
+            province: (values.ProvinceCity)[0],//省
+            city: (values.ProvinceCity)[1],//市
+            area: (values.ProvinceCity)[2],//区
+            type: '1',
+            intendedProject: arr.join(','),
+            businessScope: this.state.businessScope.join(','),
+            position: values.position,
+            level: this.state.level,
+            nature: this.state.nature,
+            natureOther: this.state.natureOther,
+          }
+        }).done(function (data) {
+          this.setState({
+            loading: false
+          });
+          if (!data.error.length) {
+            message.success('领取成功!');
+            this.setState({
+              verification: false
+            })
+            this.loadData(this.state.ispage);
+          } else {
+            message.warning(data.error[0].message);
+          }
+        }.bind(this));
+      }
+    });
+  },
+
+
+
   render() {
     const intentionState = this.props.intentionState;
+    const { getFieldDecorator } = this.props.form;
+    const formItemLayout = {
+      labelCol: { span: 6 },
+      wrapperCol: { span: 14 },
+    };
     const FormItem = Form.Item;
     const { TabPane } = Tabs
     const rowSelection = {
@@ -378,8 +641,286 @@ const QueryCustomer = React.createClass({
             />
           </Spin>
         </div>
+        <Modal maskClosable={false}
+          visible={this.state.verification}
+          onCancel={() => {
+            this.setState({
+              verification: false,
+              id: undefined,
+              name: undefined,
+              orgCode: undefined,
+              ProvinceCity: [],
+              content: undefined,
+              position: undefined,
+              telnum: undefined,
+              businessScope: [],
+              selectCooperationProjects: [],
+              level: undefined,
+              nature: undefined,
+              natureOther: undefined,
+            })
+            this.props.form.resetFields();
+          }}
+          width='600px'
+          title='客户信息'
+          footer={null}
+          className="admin-desc-content">
+          <Spin spinning={this.state.loading}>
+            <div>
+              <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form">
+                <Spin spinning={this.state.loading}>
+                  <div>
+                    <Col style={{ color: 'red', marginBottom: '10px' }} span={12} offset={6}>注意:请录入真实有效的客户信息</Col>
+                    <div className="clearfix">
+                      <FormItem className="mid-item"
+                        {...formItemLayout}
+                        label="公司名称" >
+                        {getFieldDecorator('name', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.name
+                        })(
+                          <Input placeholder="公司名称" disabled />
+                          // <span style={{ display: 'flex', alignItems: 'center', position: 'relative' }}>
+                          //   <Input placeholder="公司名称" value={this.state.name} />
+                          //   {this.state.verification && <Icon type="check-circle" style={{
+                          //     fontSize: 16,
+                          //     color: '#30e031',
+                          //     position: 'absolute',
+                          //     right: '80px',
+                          //   }} />}
+                          //   <Button onClick={this.checkUserName} type="primary" style={{ marginLeft: '10px' }}>验证</Button>
+                          // </span>
+                        )}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        {...formItemLayout}
+                        label="统一社会信用代码"
+                      >
+                        {getFieldDecorator('orgCode', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.orgCode
+                        })(
+                          <Input placeholder="统一社会信用代码" />
+                        )}
+                      </FormItem>
+                    </div>
+                    <Col style={{ color: 'red', marginBottom: '10px' }} span={12} offset={6}>如,科德集团则填写91430105670766451M</Col>
+                    <div className="clearfix">
+                      <FormItem
+                        {...formItemLayout}
+                        label="省-市-区"
+                      >
+                        {getFieldDecorator('ProvinceCity', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.ProvinceCity
+                        })(
+                          <Cascader options={areaSelect()} placeholder="选择城市" />
+                        )}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem className="mid-item"
+                        {...formItemLayout}
+                        label="联系人" >
+                        {getFieldDecorator('content', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.content
+                        })(
+                          <Input placeholder="联系人姓名" />
+                        )}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem className="mid-item"
+                        {...formItemLayout}
+                        label="职位" >
+                        {getFieldDecorator('position', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.position
+                        })(
+                          <Input placeholder="联系人职位" />
+                        )}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem className="mid-item"
+                        {...formItemLayout}
+                        label="联系电话" >
+                        {getFieldDecorator('telnum', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.telnum
+                        })(
+                          <Input placeholder="请填写手机号,仅填座机号时,请后续补充手机号" />
+                        )}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem className="mid-item"
+                        {...formItemLayout}
+                        required
+                        label="主营产品" >
+                        <div>
+                          {this.state.businessScope.map((tag, index) => {
+                            const isLongTag = tag.length > 20;
+                            const tagElem = (
+                              <Tag closable key={tag} afterClose={() => this.handleClose(tag)}>
+                                {isLongTag ? `${tag.slice(0, 20)}...` : tag}
+                              </Tag>
+                            );
+                            return isLongTag ? <Tooltip title={tag} key={tag}>{tagElem}</Tooltip> : tagElem;
+                          })}
+                          {
+                            !this.state.inputVisible &&
+                            <Button
+                              size="small"
+                              type="primary"
+                              onClick={this.showInput}>
+                              + 新增主营产品
+                            </Button>
+                          }
+                        </div>
+                        {this.state.inputVisible && (<div>
+                          <TextArea
+                            style={{ width: '300px', height: '100px' }}
+                            value={this.state.inputValue}
+                            onChange={(e) => {
+                              this.setState({
+                                inputValue: e.target.value
+                              })
+                            }} />
+                          <div style={{ color: '#f00' }}>提示:请用 / 符号隔开关键字</div>
+                          <div>
+                            <Button
+                              size="small"
+                              type="primary"
+                              onClick={this.handleInputConfirm}>
+                              确定
+                            </Button>
+                            <Button
+                              size="small"
+                              style={{ marginLeft: '5px' }}
+                              onClick={() => {
+                                this.setState({
+                                  inputVisible: false,
+                                  inputValue: ''
+                                })
+                              }}>
+                              取消
+                            </Button>
+                          </div>
+                        </div>)}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        className="mid-item"
+                        {...formItemLayout}
+                        required
+                        label="意向合作项目" >
+                        <div>
+                          <div style={{ paddingBottom: this.state.selectCooperationProjects.length === 0 ? 0 : '10px' }}>
+                            {this.state.selectCooperationProjects.map((tag, index) => {
+                              const isLongTag = tag.label.length > 20;
+                              const tagElem = (
+                                <Tag closable key={tag.label} afterClose={() => this.handleCloseCooperation(tag)}>
+                                  {isLongTag ? `${tag.label.slice(0, 20)}...` : tag.label}
+                                </Tag>
+                              );
+                              return isLongTag ? <Tooltip title={tag.label} key={tag.label}>{tagElem}</Tooltip> : tagElem;
+                            })}
+                          </div>
+                          <div>
+                            <AutoComplete
+                              style={{ width: 200 }}
+                              onSearch={this.supervisor}
+                              onSelect={this.onSelect}
+                              placeholder="请输入关键字"
+                            >
+                              {
+                                this.state.cooperationProjects.map(function (item) {
+                                  return <Select.Option key={item.id} value={item.id}>{item.bname}</Select.Option>
+                                })
+                              }
+                            </AutoComplete>
+                          </div>
+                        </div>
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        className="mid-item"
+                        {...formItemLayout}
+                        required
+                        label="客户类型" >
+                        <Select
+                          placeholder="请选择客户类型"
+                          value={this.state.level}
+                          onChange={(e) => {
+                            this.setState({ level: e });
+                          }}
+                        >
+                          <Option value={0}>一般客户(一年以上预签)</Option>
+                          <Option value={1}>意向客户(半年内预签)</Option>
+                          <Option value={2}>重点客户(一个月内预签)</Option>
+                        </Select>
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        className="mid-item"
+                        {...formItemLayout}
+                        required
+                        label="客户性质" >
+                        <Select
+                          placeholder="请选择客户性质"
+                          value={this.state.nature}
+                          onChange={(e) => {
+                            this.setState({ nature: e });
+                          }}
+                        >
+                          <Option value={1}>政府机构</Option>
+                          <Option value={2}>科研院所</Option>
+                          <Option value={3}>高等院校</Option>
+                          <Option value={4}>国有企业</Option>
+                          <Option value={5}>民营企业</Option>
+                          <Option value={6}>社会团体</Option>
+                          <Option value={0}>其他(请注明)</Option>
+                        </Select>
+                      </FormItem>
+                    </div>
+                    {
+                      this.state.nature == 0 &&
+                      <div className="clearfix">
+                        <FormItem
+                          className="mid-item"
+                          {...formItemLayout}
+                          required
+                          label="其他说明" >
+                          <Input
+                            placeholder="其他说明"
+                            value={this.state.natureOther}
+                            onChange={e => {
+                              this.setState({
+                                natureOther: e.target.value
+                              })
+                            }}
+                          />
+                        </FormItem>
+                      </div>
+                    }
+                  </div>
+                  <FormItem wrapperCol={{ span: 12, offset: 6 }}>
+                    <Button type="primary" htmlType="submit" style={{}}>领取客户</Button>
+                  </FormItem>
+                </Spin>
+              </Form >
+            </div>
+          </Spin>
+        </Modal>
       </div>
     );
   }
 })
-export default QueryCustomer;
+export default Form.create({})(QueryCustomer);

+ 552 - 13
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -1,13 +1,17 @@
 import React from 'react';
-import { Button, Modal, Input, Select, Spin, Table, Tabs, message, Form, Tooltip } from 'antd';
+import {
+  Button, Cascader, Modal, Input, Select, Tag,
+  Spin, Table, Tabs, Form, Col, message, Tooltip, AutoComplete
+} from 'antd';
 import $ from 'jquery/src/ajax';
 import { ShowModal } from '../../../../tools.js'
-import { provinceList } from '@/NewDicProvinceList';
+import { areaSelect, citySelect, provinceList } from '@/NewDicProvinceList';
 import ShowModalDiv from "@/showModal.jsx";
 import ZhuanjiaoDetail from "@/zhuanjiaoDetail.jsx";
 import Detaile from './detail.jsx';
 import { ChooseList } from "../../../order/orderNew/chooseList";
 import EnterpriseNameChange from "../../../../common/enterpriseNameChange";
+import TextArea from "antd/es/input/TextArea";
 
 const confirm = Modal.confirm;
 
@@ -126,6 +130,11 @@ const QueryCustomer = React.createClass({
   //
   getInitialState() {
     return {
+      verification: false,
+      businessScope: [],
+      cooperationProjects: [],
+      selectCooperationProjects: [],
+
       addressSearch: [],
       dataSource: [],
       zhuanjiaoVisible: false,
@@ -252,19 +261,21 @@ const QueryCustomer = React.createClass({
                 <EnterpriseNameChange
                   type='journal'
                   style={{ marginLeft: 10 }}
+                  data={record}
                   enterpriseId={record.uid} />
                 {record.shareType === '1' &&
                   <Button style={{ marginLeft: 10 }} onClick={(e) => {
                     e.stopPropagation();
-                    let _this = this;
-                    confirm({
-                      title: '提醒!',
-                      content: '确定要领取此客户吗?',
-                      onOk() {
-                        _this.receive(record);
-                      },
-                      onCancel() { },
-                    });
+                    this.receive(record)
+                    // let _this = this;
+                    // confirm({
+                    //   title: '提醒!',
+                    //   content: '确定要领取此客户吗?',
+                    //   onOk() {
+                    //     _this.receive(record);
+                    //   },
+                    //   onCancel() { },
+                    // });
                   }} type="primary">领取</Button>
                 }
               </div>
@@ -274,10 +285,255 @@ const QueryCustomer = React.createClass({
       ],
     };
   },
-  //
+
+  handleClose(removedTag) {
+    let businessScope = this.state.businessScope.filter(tag => { return tag !== removedTag });
+    this.setState({ businessScope });
+  },
+  handleCloseCooperation(removedTag) {
+    let selectCooperationProjects = this.state.selectCooperationProjects.filter(tag => { return tag.value !== removedTag.value });
+    this.setState({ selectCooperationProjects });
+  },
+  showInput() {
+    let str = this.state.businessScope.join('/')
+    this.setState({
+      inputVisible: true,
+      inputValue: str
+    });
+  },
+  handleInputConfirm() {
+    let inputValue = this.state.inputValue;
+    let arr = inputValue.split('/');
+    let lv = true;
+    for (let i of arr) {
+      if (!i.replace(/\s+/g, '')) {
+        message.warning("请填写关键词且不为空");
+        return;
+      }
+      if (i.length > 16) {
+        message.warning('单个标签字数不能超过16个字符')
+        lv = false;
+        return;
+      }
+    }
+    if (lv) {
+      arr = Array.from(new Set(arr));
+      arr = arr.filter(v => v);
+      this.setState({
+        businessScope: arr,
+        inputVisible: false,
+        inputValue: '',
+      });
+    }
+  },
+  //加载(自动补全)
+  supervisor(value) {
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + '/api/admin/order/getBusinessProjectByName',
+      data: {
+        businessName: value
+      },
+      success: function (data) {
+        let thedata = data.data;
+        if (data.error.length === 0) {
+          this.setState({
+            cooperationProjects: thedata,
+          });
+        } else {
+          message.warning(data.error[0].message);
+        }
+      }.bind(this),
+    }).always(
+      function () {
+
+      }.bind(this)
+    );
+  },
+  onSelect(value) {
+    let arr = this.state.cooperationProjects.filter(v => v.id === value);
+    let arr1 = this.state.selectCooperationProjects.filter(v => v.value === value);
+    if (arr.length > 0) {
+      if (arr1.length > 0) {
+        message.warning('选项已存在');
+      } else {
+        this.state.selectCooperationProjects.push({
+          label: arr[0].bname,
+          value: arr[0].id,
+        })
+        this.setState({
+          selectCooperationProjects: this.state.selectCooperationProjects
+        })
+      }
+    }
+  },
+  // 查询客户补充完整
   receive(e) {
     this.setState({
       loading: true,
+      selectedRowKeys: [],
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/customer/checkUser",
+      data: {
+        id: e.id || e.uid,
+      }
+    }).done(function (data) {
+      if (!data.error.length) {
+        let obj = data.data
+        let selectCooperationProjects = !!obj.intendedProject ? obj.intendedProject.split(',') : []
+        if (selectCooperationProjects.length > 0) {
+          selectCooperationProjects = selectCooperationProjects.map((item) => {
+            return { label: item }
+          })
+        }
+        this.setState({
+          loading: false,
+          verification: true,
+
+          id: obj.id,
+          name: obj.name,
+          orgCode: obj.orgCode,
+          ProvinceCity: [obj.province, obj.city, obj.area],
+          // content: obj.contacts,
+          position: obj.position,
+          // telnum: obj.contactMobile,
+          businessScope: !!obj.businessScope ? obj.businessScope.split(',') : [],
+          selectCooperationProjects: selectCooperationProjects,
+          level: obj.level,
+          nature: obj.nature,
+          natureOther: obj.natureOther,
+        });
+      } else {
+        message.warning(data.error[0].message);
+      };
+    }.bind(this));
+  },
+
+  // 补充客户并领取
+  handleSubmit(e) {
+    e.preventDefault();
+    this.props.form.validateFields((err, values) => {
+      let re = new RegExp("^[\u4e00-\u9fa5]");
+      if (!re.test(values.name)) {
+        message.warning('公司名称必须以汉字开头!')
+        return
+      }
+      if (!re.test(values.name.charAt(values.name.length - 1))) {
+        message.warning('公司名称必须以汉字结尾!')
+        return
+      }
+      if (values.name.length > 64) {
+        message.warning('公司名称字数不超过64个!')
+        return false;
+      };
+      let regu = /[`~!#$%^&*'_[\]+=<>?:"{}|~!#¥%……&*=-@-!{}|/《》?:“”【】、;;‘’,,.。、\s+]/g;
+      if (regu.test(values.name)) {
+        message.warning('公司名称不能存在特殊符号或空格!')
+        return false;
+      }
+      if (!/^[A-Z0-9]{15}$|^[A-Z0-9]{17}$|^[A-Z0-9]{18}$|^[A-Z0-9]{20}$/.test(values.orgCode)) {
+        message.warning('请输入正确的统一社会信用代码!')
+        return
+      }
+      if (/.*[\u4e00-\u9fa5]+.*$/.test(values.content)) {
+      } else {
+        message.error("请填写正确的联系人,且至少包含一个汉字");
+        return false;
+      };
+      if (/.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
+      } else {
+        message.error("请填写正确的职位,且至少包含一个汉字");
+        return false;
+      };
+      if (!values.ProvinceCity[1]) {
+        message.warning('请选择地区');
+        return false;
+      };
+      if (values.content.length > 32) {
+        message.warning('联系人字数不超过32个')
+        return false;
+      };
+      if (values.length > 13) {
+        message.warning('电话号码字数不超过13个')
+        return false;
+      };
+      if (this.state.businessScope.length === 0) {
+        message.warning('请选择主营产品')
+        return false;
+      }
+      if (this.state.selectCooperationProjects.length === 0) {
+        message.warning('请选择意向合作项目')
+        return false;
+      }
+      if (!this.state.level && this.state.level != 0) {
+        message.warning('请选择客户类型')
+        return false;
+      }
+      if (!this.state.nature && this.state.nature != 0) {
+        message.warning('请选择客户性质')
+        return false;
+      }
+      if (this.state.nature == 0 && !this.state.natureOther) {
+        message.warning('其他说明不能为空')
+        return false;
+      }
+      let arr = [];
+      for (let i of this.state.selectCooperationProjects) {
+        arr.push(i.label)
+      }
+      if (!err) {
+        this.setState({
+          loading: true
+        });
+        $.ajax({
+          method: "POST",
+          dataType: "json",
+          crossDomain: false,
+          url: globalConfig.context + '/api/admin/customer/updateAndReceiveCustomer',
+          data: {
+            id: this.state.id,
+            orgCode: values.orgCode,
+            contacts: values.content,
+            contactMobile: values.telnum,
+            societyTag: '0',                       //社会属性默认为 社会企业
+            //source:values.customerSource,
+            province: (values.ProvinceCity)[0],//省
+            city: (values.ProvinceCity)[1],//市
+            area: (values.ProvinceCity)[2],//区
+            type: '1',
+            intendedProject: arr.join(','),
+            businessScope: this.state.businessScope.join(','),
+            position: values.position,
+            level: this.state.level,
+            nature: this.state.nature,
+            natureOther: this.state.natureOther,
+          }
+        }).done(function (data) {
+          this.setState({
+            loading: false
+          });
+          if (!data.error.length) {
+            message.success('领取成功!');
+            this.setState({
+              verification: false
+            })
+            this.loadData(this.state.ispage);
+          } else {
+            message.warning(data.error[0].message);
+          }
+        }.bind(this));
+      }
+    });
+  },
+  receives(e) {
+    this.setState({
+      loading: true,
     });
     $.ajax({
       method: "get",
@@ -441,6 +697,11 @@ const QueryCustomer = React.createClass({
   render() {
     let departmentArr = this.state.departmentArr || [];
     const intentionState = this.props.intentionState;
+    const { getFieldDecorator } = this.props.form;
+    const formItemLayout = {
+      labelCol: { span: 6 },
+      wrapperCol: { span: 14 },
+    };
     const FormItem = Form.Item;
     const rowSelection = {
       selectedRowKeys: this.state.selectedRowKeys,
@@ -554,8 +815,286 @@ const QueryCustomer = React.createClass({
         ) : (
           ""
         )}
+        <Modal maskClosable={false}
+          visible={this.state.verification}
+          onCancel={() => {
+            this.setState({
+              verification: false,
+              id: undefined,
+              name: undefined,
+              orgCode: undefined,
+              ProvinceCity: [],
+              content: undefined,
+              position: undefined,
+              telnum: undefined,
+              businessScope: [],
+              selectCooperationProjects: [],
+              level: undefined,
+              nature: undefined,
+              natureOther: undefined,
+            })
+            this.props.form.resetFields();
+          }}
+          width='600px'
+          title='客户信息'
+          footer={null}
+          className="admin-desc-content">
+          <Spin spinning={this.state.loading}>
+            <div>
+              <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form">
+                <Spin spinning={this.state.loading}>
+                  <div>
+                    <Col style={{ color: 'red', marginBottom: '10px' }} span={12} offset={6}>注意:请录入真实有效的客户信息</Col>
+                    <div className="clearfix">
+                      <FormItem className="mid-item"
+                        {...formItemLayout}
+                        label="公司名称" >
+                        {getFieldDecorator('name', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.name
+                        })(
+                          <Input placeholder="公司名称" disabled />
+                          // <span style={{ display: 'flex', alignItems: 'center', position: 'relative' }}>
+                          //   <Input placeholder="公司名称" value={this.state.name} />
+                          //   {this.state.verification && <Icon type="check-circle" style={{
+                          //     fontSize: 16,
+                          //     color: '#30e031',
+                          //     position: 'absolute',
+                          //     right: '80px',
+                          //   }} />}
+                          //   <Button onClick={this.checkUserName} type="primary" style={{ marginLeft: '10px' }}>验证</Button>
+                          // </span>
+                        )}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        {...formItemLayout}
+                        label="统一社会信用代码"
+                      >
+                        {getFieldDecorator('orgCode', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.orgCode
+                        })(
+                          <Input placeholder="统一社会信用代码" />
+                        )}
+                      </FormItem>
+                    </div>
+                    <Col style={{ color: 'red', marginBottom: '10px' }} span={12} offset={6}>如,科德集团则填写91430105670766451M</Col>
+                    <div className="clearfix">
+                      <FormItem
+                        {...formItemLayout}
+                        label="省-市-区"
+                      >
+                        {getFieldDecorator('ProvinceCity', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.ProvinceCity
+                        })(
+                          <Cascader options={areaSelect()} placeholder="选择城市" />
+                        )}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem className="mid-item"
+                        {...formItemLayout}
+                        label="联系人" >
+                        {getFieldDecorator('content', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.content
+                        })(
+                          <Input placeholder="联系人姓名" />
+                        )}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem className="mid-item"
+                        {...formItemLayout}
+                        label="职位" >
+                        {getFieldDecorator('position', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.position
+                        })(
+                          <Input placeholder="联系人职位" />
+                        )}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem className="mid-item"
+                        {...formItemLayout}
+                        label="联系电话" >
+                        {getFieldDecorator('telnum', {
+                          rules: [{ required: true, message: '此项为必填项!' }],
+                          initialValue: this.state.telnum
+                        })(
+                          <Input placeholder="请填写手机号,仅填座机号时,请后续补充手机号" />
+                        )}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem className="mid-item"
+                        {...formItemLayout}
+                        required
+                        label="主营产品" >
+                        <div>
+                          {this.state.businessScope.map((tag, index) => {
+                            const isLongTag = tag.length > 20;
+                            const tagElem = (
+                              <Tag closable key={tag} afterClose={() => this.handleClose(tag)}>
+                                {isLongTag ? `${tag.slice(0, 20)}...` : tag}
+                              </Tag>
+                            );
+                            return isLongTag ? <Tooltip title={tag} key={tag}>{tagElem}</Tooltip> : tagElem;
+                          })}
+                          {
+                            !this.state.inputVisible &&
+                            <Button
+                              size="small"
+                              type="primary"
+                              onClick={this.showInput}>
+                              + 新增主营产品
+                            </Button>
+                          }
+                        </div>
+                        {this.state.inputVisible && (<div>
+                          <TextArea
+                            style={{ width: '300px', height: '100px' }}
+                            value={this.state.inputValue}
+                            onChange={(e) => {
+                              this.setState({
+                                inputValue: e.target.value
+                              })
+                            }} />
+                          <div style={{ color: '#f00' }}>提示:请用 / 符号隔开关键字</div>
+                          <div>
+                            <Button
+                              size="small"
+                              type="primary"
+                              onClick={this.handleInputConfirm}>
+                              确定
+                            </Button>
+                            <Button
+                              size="small"
+                              style={{ marginLeft: '5px' }}
+                              onClick={() => {
+                                this.setState({
+                                  inputVisible: false,
+                                  inputValue: ''
+                                })
+                              }}>
+                              取消
+                            </Button>
+                          </div>
+                        </div>)}
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        className="mid-item"
+                        {...formItemLayout}
+                        required
+                        label="意向合作项目" >
+                        <div>
+                          <div style={{ paddingBottom: this.state.selectCooperationProjects.length === 0 ? 0 : '10px' }}>
+                            {this.state.selectCooperationProjects.map((tag, index) => {
+                              const isLongTag = tag.label.length > 20;
+                              const tagElem = (
+                                <Tag closable key={tag.label} afterClose={() => this.handleCloseCooperation(tag)}>
+                                  {isLongTag ? `${tag.label.slice(0, 20)}...` : tag.label}
+                                </Tag>
+                              );
+                              return isLongTag ? <Tooltip title={tag.label} key={tag.label}>{tagElem}</Tooltip> : tagElem;
+                            })}
+                          </div>
+                          <div>
+                            <AutoComplete
+                              style={{ width: 200 }}
+                              onSearch={this.supervisor}
+                              onSelect={this.onSelect}
+                              placeholder="请输入关键字"
+                            >
+                              {
+                                this.state.cooperationProjects.map(function (item) {
+                                  return <Select.Option key={item.id} value={item.id}>{item.bname}</Select.Option>
+                                })
+                              }
+                            </AutoComplete>
+                          </div>
+                        </div>
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        className="mid-item"
+                        {...formItemLayout}
+                        required
+                        label="客户类型" >
+                        <Select
+                          placeholder="请选择客户类型"
+                          value={this.state.level}
+                          onChange={(e) => {
+                            this.setState({ level: e });
+                          }}
+                        >
+                          <Option value={0}>一般客户(一年以上预签)</Option>
+                          <Option value={1}>意向客户(半年内预签)</Option>
+                          <Option value={2}>重点客户(一个月内预签)</Option>
+                        </Select>
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        className="mid-item"
+                        {...formItemLayout}
+                        required
+                        label="客户性质" >
+                        <Select
+                          placeholder="请选择客户性质"
+                          value={this.state.nature}
+                          onChange={(e) => {
+                            this.setState({ nature: e });
+                          }}
+                        >
+                          <Option value={1}>政府机构</Option>
+                          <Option value={2}>科研院所</Option>
+                          <Option value={3}>高等院校</Option>
+                          <Option value={4}>国有企业</Option>
+                          <Option value={5}>民营企业</Option>
+                          <Option value={6}>社会团体</Option>
+                          <Option value={0}>其他(请注明)</Option>
+                        </Select>
+                      </FormItem>
+                    </div>
+                    {
+                      this.state.nature == 0 &&
+                      <div className="clearfix">
+                        <FormItem
+                          className="mid-item"
+                          {...formItemLayout}
+                          required
+                          label="其他说明" >
+                          <Input
+                            placeholder="其他说明"
+                            value={this.state.natureOther}
+                            onChange={e => {
+                              this.setState({
+                                natureOther: e.target.value
+                              })
+                            }}
+                          />
+                        </FormItem>
+                      </div>
+                    }
+                  </div>
+                  <FormItem wrapperCol={{ span: 12, offset: 6 }}>
+                    <Button type="primary" htmlType="submit" style={{}}>领取客户</Button>
+                  </FormItem>
+                </Spin>
+              </Form >
+            </div>
+          </Spin>
+        </Modal>
       </div>
     );
   },
 });
-export default QueryCustomer;
+export default Form.create({})(QueryCustomer);

+ 40 - 3
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -55,6 +55,7 @@ const IntentionCustomer = Form.create()(React.createClass({
         city: !(this.state.addressSearch).length ? '' : this.state.addressSearch[1],
         startDate: this.state.releaseDate[0],
         endDate: this.state.releaseDate[1],
+        nature: this.state.nature,
       },
       success: function (data) {
         ShowModal(this);
@@ -72,7 +73,7 @@ const IntentionCustomer = Form.create()(React.createClass({
             thisdata.transferTime = thisdata.transferTime && thisdata.transferTime.split(" ")[0];
             thisdata.lastSignTime = thisdata.lastSignTime && thisdata.lastSignTime.split(" ")[0];
             thisdata.lastFollowTime = thisdata.lastFollowTime && thisdata.lastFollowTime.split(" ")[0];
-            thisdata.locationProvince = diqu
+            thisdata.locationProvince = diqu;
             theArr.push(thisdata);
           };
           this.state.pagination.current = data.data.pageNo;
@@ -201,6 +202,25 @@ const IntentionCustomer = Form.create()(React.createClass({
           },
         },
         {
+          title: "客户性质",
+          dataIndex: "nature",
+          key: "nature",
+          render: (text, record) => {
+            return <div>
+              {
+                text == 0
+                  ? `其他(${record.natureOther})` : text == 1
+                    ? '政府机构' : text == 2
+                      ? '科研院所' : text == 3
+                        ? '高等院校' : text == 4
+                          ? '国有企业' : text == 5
+                            ? '民营企业' : text == 6
+                              ? '社会团体' : ''
+              }
+            </div>;
+          },
+        },
+        {
           title: "地区",
           dataIndex: "locationProvince",
           key: "locationProvince",
@@ -418,6 +438,7 @@ const IntentionCustomer = Form.create()(React.createClass({
     this.state.citySearch = undefined;
     this.state.releaseDate[0] = undefined;
     this.state.releaseDate[1] = undefined;
+    this.state.nature = undefined;
     this.loadData();
   },
   searchSwitch() {
@@ -732,8 +753,24 @@ const IntentionCustomer = Form.create()(React.createClass({
                   this.setState({ releaseDate: dataString });
                 }}
               />
-              {/* </div>
-              </div> */}
+              <span style={{ marginLeft: "10px" }}>
+                <Select
+                  placeholder="客户性质"
+                  style={{ width: 110 }}
+                  value={this.state.nature}
+                  onChange={(e) => {
+                    this.setState({ nature: e });
+                  }}
+                >
+                  <Option value={1}>政府机构</Option>
+                  <Option value={2}>科研院所</Option>
+                  <Option value={3}>高等院校</Option>
+                  <Option value={4}>国有企业</Option>
+                  <Option value={5}>民营企业</Option>
+                  <Option value={6}>社会团体</Option>
+                  <Option value={0}>其他</Option>
+                </Select>
+              </span>
               <Button
                 type="primary"
                 onClick={this.search}

Файловите разлики са ограничени, защото са твърде много
+ 876 - 866
js/component/manageCenter/customer/operationalData/reexamine/details.jsx


+ 11 - 1
js/component/manageCenter/customerService/administration/followUpDetails.jsx

@@ -36,7 +36,17 @@ class FollowUpDetails extends Component {
                     dataIndex: "commodityName",
                     key: "commodityName",
                     render: (text, record) => {
-                        return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                                      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 && record.projectType == 3 && <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>
                     }
                 },
                 {

+ 11 - 1
js/component/manageCenter/customerService/administration/order.jsx

@@ -267,7 +267,17 @@ const Order = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 1
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -1200,7 +1200,17 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'commodityName',
           key: 'commodityName',
           render: (text, record) => {
-            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                          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 && record.projectType == 3 && <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>
           }
         },
         {

+ 11 - 1
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -1147,7 +1147,17 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                          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 && record.projectType == 3 && <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>
           }
         },
         {

+ 11 - 1
js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx

@@ -218,7 +218,17 @@ const outsourcingPaiDan = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                          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 && record.projectType == 3 && <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>
           }
         },
         {

+ 11 - 1
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -266,7 +266,17 @@ const outsourcingPaiDan = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                          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 && record.projectType == 3 && <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>
           }
         },
         {

+ 11 - 1
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -104,7 +104,17 @@ const OrderDetail = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 14 - 6
js/component/manageCenter/operate/personnel/personnelAll.jsx

@@ -158,7 +158,7 @@ const PersonnelAll = React.createClass({
           render: (text) => {
             return (
               <Tooltip title={text}>
-                <div 
+                <div
                 // style={{
                 //   maxWidth: '150px',
                 //   overflow: 'hidden',
@@ -266,9 +266,17 @@ const PersonnelAll = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {
@@ -340,7 +348,7 @@ const PersonnelAll = React.createClass({
           key: "serviceLife",
           render: (text, record) => {
             return (
-<div>{!!text && JSON.parse(text).toString()}</div>
+              <div>{!!text && JSON.parse(text).toString()}</div>
             );
           }
         },
@@ -718,7 +726,7 @@ const PersonnelAll = React.createClass({
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div 
+                  <div
                   // style={{
                   //   maxWidth: '150px',
                   //   overflow: 'hidden',

Файловите разлики са ограничени, защото са твърде много
+ 1553 - 1545
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx


Файловите разлики са ограничени, защото са твърде много
+ 2015 - 2007
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx


Файловите разлики са ограничени, защото са твърде много
+ 572 - 564
js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx


+ 486 - 478
js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx

@@ -7,485 +7,493 @@ import { getApprovedState, getPaymentState, getOrderState, getProjectState, getO
 import ProjectOperation from "../../../../common/projectOperation";
 
 const ApproveDetaile = Form.create()(React.createClass({
-	loadData(record) {
-		this.state.data = [];
-		this.setState({
-			loading: true
-		});
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/order/getOrderCommodity',
-			data: {
-				orderNo: record ? record.orderNo : this.props.datauser.orderNo
-			},
-			success: function (data) {
-				let theArr = [];
-				if (!data.data) {
-					if (data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-				} else {
-					for (let i = 0; i < data.data.length; i++) {
-						let thisdata = data.data[i];
-						theArr.push({
-							key: i,
-							id: thisdata.id,
-							orderNo: thisdata.orderNo,
-							commodityName: thisdata.commodityName,
-							commodityType: thisdata.commodityType,
-							commodityMode: thisdata.commodityMode,
-							commodityQuantity: thisdata.commodityQuantity,
-							commodityPrice: thisdata.commodityPrice,
-							discountPrice: thisdata.discountPrice,
-							commodityFirstPayment: thisdata.commodityFirstPayment,
-							createTimes: thisdata.createTimes,
-							discountFirstPayment: thisdata.discountFirstPayment,
-							remarks: thisdata.remarks,
-						});
-					};
-				}
-				this.setState({
-					dataSource: theArr,
-				});
-			}.bind(this),
-		}).always(function () {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
-	getInitialState() {
-		return {
-			loading: false,
-			visible: false,
-			lookState: true,
-			orgCodeUrl: [],
-			lookflowList: [],
-			checkedKeys: [],
-			columns: [
-				{
-					title: '业务项目名称',
-					dataIndex: 'commodityName',
-					key: 'commodityName',
-					render: (text, record) => {
-						return (
-								<span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-						)
-				}
-				}, {
-					title: '项目类别',
-					dataIndex: 'commodityType',
-					key: 'commodityType',
-					render: (text) => {
-						return (getOrderType(text))
-					}
-				}, {
-					title: '项目数量',
-					dataIndex: 'commodityQuantity',
-					key: 'commodityQuantity'
-				}, {
-					title: '服务市价(万元)',
-					dataIndex: 'commodityPrice',
-					key: 'commodityPrice'
-				}, {
-					title: '实签价格(万元)',
-					dataIndex: 'discountPrice',
-					key: 'discountPrice'
-				}, {
-					title: '下单时间',
-					dataIndex: 'createTimes',
-					key: 'createTimes'
-				}, {
-					title: '项目说明',
-					dataIndex: 'remarks',
-					key: 'remarks',
-					render: (text) => {
-						return (text && text.length > 8 ? text.substr(0, 8) + '…' : text)
-					}
-				}
-			],
-			flowList: [
-				{
-					title: '平台流水号',
-					dataIndex: 'billNo',
-					key: 'billNo',
-				}, {
-					title: '平台流水时间',
-					dataIndex: 'createTime',
-					key: 'createTime'
-				}, {
-					title: '流水金额(万元)',
-					dataIndex: 'transactionAmount',
-					key: 'transactionAmount'
-				}, {
-					title: '付款人名称',
-					dataIndex: 'payerName',
-					key: 'payerName'
-				}, {
-					title: '收款人名称',
-					dataIndex: 'payeeName',
-					key: 'payeeName'
-				},
-				{
-					title: '流水科目',
-					dataIndex: 'transactionSubject',
-					key: 'transactionSubject',
-					render: (text) => { return getTransactionProject(text) }
-				}, {
-					title: '流水外联',
-					dataIndex: 'transactionChannel',
-					key: 'transactionChannel',
-					render: (text) => { return getTransactionChannel(text) }
-				}, {
-					title: '财务流水号',
-					dataIndex: 'financialPayNo',
-					key: 'financialPayNo',
-				}, {
-					title: '财务流水时间',
-					dataIndex: 'financialPayTime',
-					key: 'financialPayTime',
-				}, {
-					title: '流水确认',
-					dataIndex: 'confirmSign',
-					key: 'confirmSign',
-					render: (text) => { return text ? '已确认' : '待确认' }
-				}, {
-					title: '确认时间',
-					dataIndex: 'confirmTime',
-					key: 'confirmTime',
-				}
-			]
-		};
-	},
-	//查看基本详情基本信息
-	loaduser(record) {
-		if (record) {
-			this.state.orderList = []
-			$.ajax({
-				method: "get",
-				dataType: "json",
-				crossDomain: false,
-				url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
-				data: {
-					orderNo: record.orderNo
-				},
-				success: function (data) {
-					let thisData = data.data;
-					if (!thisData) {
-						if (data.error && data.error.length) {
-							message.warning(data.error[0].message);
-						};
-						thisData = {};
-					};
-					this.setState({
-						id: thisData.id,
-						orderList: thisData,
-						orderAmount: thisData.orderAmount,
-						firstPayment: thisData.firstPayment,
-						signTotalAmount: thisData.signTotalAmount,
-						signFirstPayment: thisData.signFirstPayment,
-						approval: thisData.approval == 0 ? thisData.approval.toString() : thisData.approval,
-						orderRemarks: thisData.orderRemarks,
-						orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
-						//签单
-						orderNo: thisData.orderNo,//订单编号
-						buyerName: thisData.buyerName,
-					});
-				}.bind(this),
-			}).always(function () {
-				this.setState({
-					loading: false
-				});
-			}.bind(this));
-		}
-	},
-	handleOk(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false, true);
-	},
-	handleCancel(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false);
-	},
-	nextCancel() {
-		this.setState({
-			addnextVisible: false
-		})
-	},
-	lookflow() {
-		this.setState({
-			loading: true,
-			lookVisible: true,
-		})
-		this.state.lookSource = [];
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/order/getBillByOrderNo',
-			data: {
-				orderNo: this.props.datauser.orderNo,
-			},
-			success: function (data) {
-				let theArr = [];
-				if (!data.data) {
-					if (data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-				} else {
-					for (let i = 0; i < data.data.length; i++) {
-						let thisdata = data.data[i];
-						theArr.push({
-							key: i,
-							billNo: thisdata.billNo,
-							transactionAmount: thisdata.transactionAmount,
-							createTime: thisdata.createTime,
-							payerName: thisdata.payerName,
-							payeeName: thisdata.payeeName,
-							transactionSubject: thisdata.transactionSubject,
-							transactionChannel: thisdata.transactionChannel,
-							financialPayNo: thisdata.financialPayNo,
-							financialPayTime: thisdata.financialPayTime,
-							orderNo: thisdata.orderNo,
-							departmentName: thisdata.departmentName,
-							salesmanName: thisdata.salesmanName,
-							financeName: thisdata.financeName,
-							confirmSign: thisdata.confirmSign,
-							deleteSign: thisdata.deleteSign,
-							confirmTime: thisdata.confirmTime
-						});
-					};
-				};
-				this.setState({
-					lookflowList: theArr,
-				});
-			}.bind(this),
-		}).always(function () {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
-	lookCancel() {
-		this.setState({
-			lookVisible: false
-		})
-	},
-	tableRowClick(record, index) {
-		this.setState({
-			editFw: record,
-			projectOperationVisible: true,
-		});
-	},
-	componentWillMount() {
+  loadData(record) {
+    this.state.data = [];
+    this.setState({
+      loading: true
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + '/api/admin/order/getOrderCommodity',
+      data: {
+        orderNo: record ? record.orderNo : this.props.datauser.orderNo
+      },
+      success: function (data) {
+        let theArr = [];
+        if (!data.data) {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          };
+        } else {
+          for (let i = 0; i < data.data.length; i++) {
+            let thisdata = data.data[i];
+            theArr.push({
+              key: i,
+              id: thisdata.id,
+              orderNo: thisdata.orderNo,
+              commodityName: thisdata.commodityName,
+              commodityType: thisdata.commodityType,
+              commodityMode: thisdata.commodityMode,
+              commodityQuantity: thisdata.commodityQuantity,
+              commodityPrice: thisdata.commodityPrice,
+              discountPrice: thisdata.discountPrice,
+              commodityFirstPayment: thisdata.commodityFirstPayment,
+              createTimes: thisdata.createTimes,
+              discountFirstPayment: thisdata.discountFirstPayment,
+              remarks: thisdata.remarks,
+            });
+          };
+        }
+        this.setState({
+          dataSource: theArr,
+        });
+      }.bind(this),
+    }).always(function () {
+      this.setState({
+        loading: false
+      });
+    }.bind(this));
+  },
+  getInitialState() {
+    return {
+      loading: false,
+      visible: false,
+      lookState: true,
+      orgCodeUrl: [],
+      lookflowList: [],
+      checkedKeys: [],
+      columns: [
+        {
+          title: '业务项目名称',
+          dataIndex: 'commodityName',
+          key: 'commodityName',
+          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 && record.projectType == 3 && <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: '项目类别',
+          dataIndex: 'commodityType',
+          key: 'commodityType',
+          render: (text) => {
+            return (getOrderType(text))
+          }
+        }, {
+          title: '项目数量',
+          dataIndex: 'commodityQuantity',
+          key: 'commodityQuantity'
+        }, {
+          title: '服务市价(万元)',
+          dataIndex: 'commodityPrice',
+          key: 'commodityPrice'
+        }, {
+          title: '实签价格(万元)',
+          dataIndex: 'discountPrice',
+          key: 'discountPrice'
+        }, {
+          title: '下单时间',
+          dataIndex: 'createTimes',
+          key: 'createTimes'
+        }, {
+          title: '项目说明',
+          dataIndex: 'remarks',
+          key: 'remarks',
+          render: (text) => {
+            return (text && text.length > 8 ? text.substr(0, 8) + '…' : text)
+          }
+        }
+      ],
+      flowList: [
+        {
+          title: '平台流水号',
+          dataIndex: 'billNo',
+          key: 'billNo',
+        }, {
+          title: '平台流水时间',
+          dataIndex: 'createTime',
+          key: 'createTime'
+        }, {
+          title: '流水金额(万元)',
+          dataIndex: 'transactionAmount',
+          key: 'transactionAmount'
+        }, {
+          title: '付款人名称',
+          dataIndex: 'payerName',
+          key: 'payerName'
+        }, {
+          title: '收款人名称',
+          dataIndex: 'payeeName',
+          key: 'payeeName'
+        },
+        {
+          title: '流水科目',
+          dataIndex: 'transactionSubject',
+          key: 'transactionSubject',
+          render: (text) => { return getTransactionProject(text) }
+        }, {
+          title: '流水外联',
+          dataIndex: 'transactionChannel',
+          key: 'transactionChannel',
+          render: (text) => { return getTransactionChannel(text) }
+        }, {
+          title: '财务流水号',
+          dataIndex: 'financialPayNo',
+          key: 'financialPayNo',
+        }, {
+          title: '财务流水时间',
+          dataIndex: 'financialPayTime',
+          key: 'financialPayTime',
+        }, {
+          title: '流水确认',
+          dataIndex: 'confirmSign',
+          key: 'confirmSign',
+          render: (text) => { return text ? '已确认' : '待确认' }
+        }, {
+          title: '确认时间',
+          dataIndex: 'confirmTime',
+          key: 'confirmTime',
+        }
+      ]
+    };
+  },
+  //查看基本详情基本信息
+  loaduser(record) {
+    if (record) {
+      this.state.orderList = []
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
+        data: {
+          orderNo: record.orderNo
+        },
+        success: function (data) {
+          let thisData = data.data;
+          if (!thisData) {
+            if (data.error && data.error.length) {
+              message.warning(data.error[0].message);
+            };
+            thisData = {};
+          };
+          this.setState({
+            id: thisData.id,
+            orderList: thisData,
+            orderAmount: thisData.orderAmount,
+            firstPayment: thisData.firstPayment,
+            signTotalAmount: thisData.signTotalAmount,
+            signFirstPayment: thisData.signFirstPayment,
+            approval: thisData.approval == 0 ? thisData.approval.toString() : thisData.approval,
+            orderRemarks: thisData.orderRemarks,
+            orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
+            //签单
+            orderNo: thisData.orderNo,//订单编号
+            buyerName: thisData.buyerName,
+          });
+        }.bind(this),
+      }).always(function () {
+        this.setState({
+          loading: false
+        });
+      }.bind(this));
+    }
+  },
+  handleOk(e) {
+    this.setState({
+      visible: false,
+    });
+    this.props.closeDesc(false, true);
+  },
+  handleCancel(e) {
+    this.setState({
+      visible: false,
+    });
+    this.props.closeDesc(false);
+  },
+  nextCancel() {
+    this.setState({
+      addnextVisible: false
+    })
+  },
+  lookflow() {
+    this.setState({
+      loading: true,
+      lookVisible: true,
+    })
+    this.state.lookSource = [];
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + '/api/admin/order/getBillByOrderNo',
+      data: {
+        orderNo: this.props.datauser.orderNo,
+      },
+      success: function (data) {
+        let theArr = [];
+        if (!data.data) {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          };
+        } else {
+          for (let i = 0; i < data.data.length; i++) {
+            let thisdata = data.data[i];
+            theArr.push({
+              key: i,
+              billNo: thisdata.billNo,
+              transactionAmount: thisdata.transactionAmount,
+              createTime: thisdata.createTime,
+              payerName: thisdata.payerName,
+              payeeName: thisdata.payeeName,
+              transactionSubject: thisdata.transactionSubject,
+              transactionChannel: thisdata.transactionChannel,
+              financialPayNo: thisdata.financialPayNo,
+              financialPayTime: thisdata.financialPayTime,
+              orderNo: thisdata.orderNo,
+              departmentName: thisdata.departmentName,
+              salesmanName: thisdata.salesmanName,
+              financeName: thisdata.financeName,
+              confirmSign: thisdata.confirmSign,
+              deleteSign: thisdata.deleteSign,
+              confirmTime: thisdata.confirmTime
+            });
+          };
+        };
+        this.setState({
+          lookflowList: theArr,
+        });
+      }.bind(this),
+    }).always(function () {
+      this.setState({
+        loading: false
+      });
+    }.bind(this));
+  },
+  lookCancel() {
+    this.setState({
+      lookVisible: false
+    })
+  },
+  tableRowClick(record, index) {
+    this.setState({
+      editFw: record,
+      projectOperationVisible: true,
+    });
+  },
+  componentWillMount() {
 
-	},
-	componentWillReceiveProps(nextProps) { //props改变时触发
-		this.state.visible = nextProps.showDesc;
-		if (nextProps.userDetaile && nextProps.showDesc) {
-			this.loaduser(nextProps.datauser);
-			this.loadData(nextProps.datauser);
-		}
-	},
-	render() {
-		const FormItem = Form.Item
-		const formItemLayout = {
-			labelCol: { span: 8 },
-			wrapperCol: { span: 14 },
-		};
-		const orderDetaiel = this.state.orderList || [];
-		return (
-			<div>
-				<Modal maskClosable={false} visible={this.state.visible}
-					onOk={this.handleOk} onCancel={this.handleCancel}
-					width='1200px'
-					title='订单详情'
-					footer=''
-					className="admin-desc-content">
-					<Form layout="horizontal" id="demand-form" style={{ paddingBottom: '40px' }}  >
-						<Spin spinning={this.state.loading}>
-							<div className="clearfix">
-								<div className="clearfix">
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="订单编号" >
-										<span>{orderDetaiel.orderNo}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="下单时间" >
-										<span>{orderDetaiel.createTime}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="客户名称" >
-										<span>{orderDetaiel.buyerName}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="订单类型" >
-										<span>{getOrderType(orderDetaiel.orderType)}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="订单外联" >
-										<span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="订单状态" >
-										<span>{getOrderState(orderDetaiel.orderStatus)}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="已收款项" >
-										<span>{orderDetaiel.actuallyTotalAmount + '万元'}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="结算状态" >
-										<span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="市价订单金额" >
-										<span>{orderDetaiel.orderAmount + '万元'}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="市价首款金额" >
-										<span>{orderDetaiel.firstPayment + '万元'}</span>
-									</FormItem>
-									<div className='clearfix'>
-										<FormItem className="half-item"
-											{...formItemLayout}
-											label="实签订单金额" >
-											<span>{orderDetaiel.signTotalAmount + '万元'}</span>
-										</FormItem>
-										<FormItem className="half-item"
-											{...formItemLayout}
-											label="实签首款金额" >
-											<span>{orderDetaiel.signFirstPayment + '万元'}</span>
-										</FormItem>
-										<FormItem className="half-item"
-											{...formItemLayout}
-											label="特批立项" >
-											<span>{getApprovedState(orderDetaiel.approval)}</span>
-										</FormItem>
-										<FormItem className="half-item"
-											{...formItemLayout}
-											label="合同编号" >
-											<span>{orderDetaiel.contractNo}</span>
-										</FormItem>
-										<div className='clearfix'>
-											<FormItem
-												labelCol={{ span: 4 }}
-												wrapperCol={{ span: 16 }}
-												label="订单留言" >
-												<span>{orderDetaiel.orderRemarks}</span>
-											</FormItem>
-										</div>
-									</div>
-								</div>
-								<div className='clearfix'>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="订单负责人" >
-										<span>{orderDetaiel.salesmanName}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="业务品类" >
-										<span>{orderDetaiel.projectType}</span>
-									</FormItem>
-								</div>
-								<div className='clearfix'>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="意向时间" >
-										<span>{orderDetaiel.createTime}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="签单时间" >
-										<span>{orderDetaiel.signTime}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="财务负责人" >
-										<span>{orderDetaiel.financeName}</span>
-										<Button onClick={this.lookflow} style={{ float: 'right' }}>查看流水</Button>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="项目负责人" >
-										<span>{orderDetaiel.technicianName}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="立项时间" >
-										<span>{orderDetaiel.setUpTime}</span>
-									</FormItem>
-									<FormItem className="half-item"
-										{...formItemLayout}
-										label="项目状态" >
-										<span>{getProjectState(orderDetaiel.projectStage)}</span>
-									</FormItem>
-								</div>
-								<div>
-									<span style={{ marginLeft: '50px', fontSize: '20px' }}>业务项目</span>
-								</div>
-								<div className="patent-table">
-									<Spin spinning={this.state.loading}>
-										<Table size="middle" columns={this.state.columns}
-											dataSource={this.state.dataSource}
-											pagination={false}
-											onRowClick={this.tableRowClick}
-										/>
-									</Spin>
-								</div>
-							</div>
-						</Spin>
-					</Form >
-				</Modal>
-				{this.state.projectOperationVisible ? <ProjectOperation
-					readOnly={true}
-					orderNo={this.state.orderNo}
-					visible={this.state.projectOperationVisible}
-					dataInfor={this.state.editFw}
-					onCancel={() => {
-						this.setState({
-							projectOperationVisible: false,
-							editFw: {},
-						});
-					}}
-				/> : null}
-				<Modal maskClosable={false} visible={this.state.lookVisible}
-					onOk={this.lookCancel} onCancel={this.lookCancel}
-					width='1300px'
-					title='查看流水'
-					footer=''
-					className="admin-desc-content">
-					<Form layout="horizontal" id="demand-form">
-						<Spin spinning={this.state.loading}>
-							<div className="clearfix">
-								<Table columns={this.state.flowList}
-									dataSource={this.state.lookflowList}
-									pagination={false}
-								/>
-							</div>
-						</Spin>
-					</Form >
-				</Modal>
-			</div>
-		)
-	}
+  },
+  componentWillReceiveProps(nextProps) { //props改变时触发
+    this.state.visible = nextProps.showDesc;
+    if (nextProps.userDetaile && nextProps.showDesc) {
+      this.loaduser(nextProps.datauser);
+      this.loadData(nextProps.datauser);
+    }
+  },
+  render() {
+    const FormItem = Form.Item
+    const formItemLayout = {
+      labelCol: { span: 8 },
+      wrapperCol: { span: 14 },
+    };
+    const orderDetaiel = this.state.orderList || [];
+    return (
+      <div>
+        <Modal maskClosable={false} visible={this.state.visible}
+          onOk={this.handleOk} onCancel={this.handleCancel}
+          width='1200px'
+          title='订单详情'
+          footer=''
+          className="admin-desc-content">
+          <Form layout="horizontal" id="demand-form" style={{ paddingBottom: '40px' }}  >
+            <Spin spinning={this.state.loading}>
+              <div className="clearfix">
+                <div className="clearfix">
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="订单编号" >
+                    <span>{orderDetaiel.orderNo}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="下单时间" >
+                    <span>{orderDetaiel.createTime}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="客户名称" >
+                    <span>{orderDetaiel.buyerName}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="订单类型" >
+                    <span>{getOrderType(orderDetaiel.orderType)}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="订单外联" >
+                    <span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="订单状态" >
+                    <span>{getOrderState(orderDetaiel.orderStatus)}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="已收款项" >
+                    <span>{orderDetaiel.actuallyTotalAmount + '万元'}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="结算状态" >
+                    <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="市价订单金额" >
+                    <span>{orderDetaiel.orderAmount + '万元'}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="市价首款金额" >
+                    <span>{orderDetaiel.firstPayment + '万元'}</span>
+                  </FormItem>
+                  <div className='clearfix'>
+                    <FormItem className="half-item"
+                      {...formItemLayout}
+                      label="实签订单金额" >
+                      <span>{orderDetaiel.signTotalAmount + '万元'}</span>
+                    </FormItem>
+                    <FormItem className="half-item"
+                      {...formItemLayout}
+                      label="实签首款金额" >
+                      <span>{orderDetaiel.signFirstPayment + '万元'}</span>
+                    </FormItem>
+                    <FormItem className="half-item"
+                      {...formItemLayout}
+                      label="特批立项" >
+                      <span>{getApprovedState(orderDetaiel.approval)}</span>
+                    </FormItem>
+                    <FormItem className="half-item"
+                      {...formItemLayout}
+                      label="合同编号" >
+                      <span>{orderDetaiel.contractNo}</span>
+                    </FormItem>
+                    <div className='clearfix'>
+                      <FormItem
+                        labelCol={{ span: 4 }}
+                        wrapperCol={{ span: 16 }}
+                        label="订单留言" >
+                        <span>{orderDetaiel.orderRemarks}</span>
+                      </FormItem>
+                    </div>
+                  </div>
+                </div>
+                <div className='clearfix'>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="订单负责人" >
+                    <span>{orderDetaiel.salesmanName}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="业务品类" >
+                    <span>{orderDetaiel.projectType}</span>
+                  </FormItem>
+                </div>
+                <div className='clearfix'>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="意向时间" >
+                    <span>{orderDetaiel.createTime}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="签单时间" >
+                    <span>{orderDetaiel.signTime}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="财务负责人" >
+                    <span>{orderDetaiel.financeName}</span>
+                    <Button onClick={this.lookflow} style={{ float: 'right' }}>查看流水</Button>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="项目负责人" >
+                    <span>{orderDetaiel.technicianName}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="立项时间" >
+                    <span>{orderDetaiel.setUpTime}</span>
+                  </FormItem>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="项目状态" >
+                    <span>{getProjectState(orderDetaiel.projectStage)}</span>
+                  </FormItem>
+                </div>
+                <div>
+                  <span style={{ marginLeft: '50px', fontSize: '20px' }}>业务项目</span>
+                </div>
+                <div className="patent-table">
+                  <Spin spinning={this.state.loading}>
+                    <Table size="middle" columns={this.state.columns}
+                      dataSource={this.state.dataSource}
+                      pagination={false}
+                      onRowClick={this.tableRowClick}
+                    />
+                  </Spin>
+                </div>
+              </div>
+            </Spin>
+          </Form >
+        </Modal>
+        {this.state.projectOperationVisible ? <ProjectOperation
+          readOnly={true}
+          orderNo={this.state.orderNo}
+          visible={this.state.projectOperationVisible}
+          dataInfor={this.state.editFw}
+          onCancel={() => {
+            this.setState({
+              projectOperationVisible: false,
+              editFw: {},
+            });
+          }}
+        /> : null}
+        <Modal maskClosable={false} visible={this.state.lookVisible}
+          onOk={this.lookCancel} onCancel={this.lookCancel}
+          width='1300px'
+          title='查看流水'
+          footer=''
+          className="admin-desc-content">
+          <Form layout="horizontal" id="demand-form">
+            <Spin spinning={this.state.loading}>
+              <div className="clearfix">
+                <Table columns={this.state.flowList}
+                  dataSource={this.state.lookflowList}
+                  pagination={false}
+                />
+              </div>
+            </Spin>
+          </Form >
+        </Modal>
+      </div>
+    )
+  }
 }));
 
 export default ApproveDetaile;

+ 56 - 7
js/component/manageCenter/order/orderNew/addService.jsx

@@ -357,7 +357,17 @@ const NewService = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+              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 && record.projectType == 3 && <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>
             }
           },
           {
@@ -590,7 +600,17 @@ const NewService = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+              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 && record.projectType == 3 && <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>
             }
           },
           {
@@ -766,7 +786,17 @@ const NewService = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+              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 && record.projectType == 3 && <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>
             }
           },
           {
@@ -4312,6 +4342,7 @@ const NewService = Form.create()(
             message.success("删除成功");
             this.proList();
             this.cuiList();
+            this.loadData();
           }
         }.bind(this),
       }).always(
@@ -5503,7 +5534,17 @@ const NewService = Form.create()(
                 dataIndex: "commodityName",
                 key: "commodityName",
                 render: (text, record) => {
-                  return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                  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 && record.projectType == 3 && <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>
                 }
               },
               {
@@ -5873,9 +5914,17 @@ const NewService = Form.create()(
                 dataIndex: "commodityName",
                 key: "commodityName",
                 render: (text, record) => {
-                  return (
-                    <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-                  )
+                  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 && record.projectType == 3 && <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>
                 }
               },
               {

+ 11 - 3
js/component/manageCenter/order/orderNew/addorders.js

@@ -157,9 +157,17 @@ const Addorders = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 1
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -379,7 +379,17 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 22 - 2
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -593,7 +593,17 @@ class ChangeApply extends Component {
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                          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 && record.projectType == 3 && <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>
           }
         },
         {
@@ -2075,7 +2085,17 @@ class ChangeApply extends Component {
               dataIndex: "commodityName",
               key: "commodityName",
               render: (text, record) => {
-                return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                              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 && record.projectType == 3 && <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>
               }
             },
             {

+ 11 - 1
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -148,7 +148,17 @@ class OrderDetail extends Component {
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                          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 && record.projectType == 3 && <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>
           }
         },
         {

+ 22 - 2
js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx

@@ -67,7 +67,17 @@ const ProAndCuiList = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                          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 && record.projectType == 3 && <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>
           }
         },
         {
@@ -546,7 +556,17 @@ const ProAndCuiList = React.createClass({
               dataIndex: "commodityName",
               key: "commodityName",
               render: (text, record) => {
-                return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                              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 && record.projectType == 3 && <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>
               }
             },
             {

+ 11 - 1
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -211,7 +211,17 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 1
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -212,7 +212,17 @@ const checkOutsourcing = Form.create()(
             dataIndex: 'commodityName',
             key: 'commodityName',
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 12 - 4
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -165,7 +165,7 @@ const contractChange = Form.create()(
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div 
+                  <div
                   // style={{
                   //   maxWidth: '150px',
                   //   overflow: 'hidden',
@@ -251,9 +251,17 @@ const contractChange = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -248,9 +248,17 @@ const contractChange = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -251,9 +251,17 @@ const contractChange = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -248,9 +248,17 @@ const contractChange = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -245,9 +245,17 @@ const contractChange = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 12 - 4
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -161,7 +161,7 @@ const contractChange = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div 
+                  <div
                   // style={{
                   //   maxWidth: '150px',
                   //   overflow: 'hidden',
@@ -247,9 +247,17 @@ const contractChange = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -243,9 +243,17 @@ const contractChange = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/order/orderNew/contractYxjl.js

@@ -243,9 +243,17 @@ const contractChange = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -251,9 +251,17 @@ const contractChange = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/order/orderNew/contractYybz.js

@@ -243,9 +243,17 @@ const contractChange = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -87,9 +87,17 @@ class projectOverview extends Component {
           dataIndex: 'commodityName',
           key: 'commodityName',
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

+ 11 - 1
js/component/manageCenter/order/orderNew/examine.jsx

@@ -418,7 +418,17 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 1
js/component/manageCenter/order/orderNew/examinejl.jsx

@@ -421,7 +421,17 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 1
js/component/manageCenter/order/orderNew/examineyybz.jsx

@@ -418,7 +418,17 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js

@@ -96,9 +96,17 @@ class projectOverview extends Component {
                     dataIndex: 'commodityName',
                     key: 'commodityName',
                     render: (text, record) => {
-                        return (
-                            <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-                        )
+                      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 && record.projectType == 3 && <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>
                     }
                 },
                 {

+ 11 - 1
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -289,7 +289,17 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 1
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -591,7 +591,17 @@ const outsourcingList = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 1
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -320,7 +320,17 @@ const outsourcingPro = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 1
js/component/manageCenter/order/orderNew/reject.jsx

@@ -221,7 +221,17 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                            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 && record.projectType == 3 && <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>
             }
           },
           {

+ 13 - 5
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx

@@ -67,11 +67,19 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					title: '业务项目名称',
 					dataIndex: 'commodityName',
 					key: 'commodityName',
-					render: (text, record) => {
-						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 && record.projectType == 3 && <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: '项目类别',
 					dataIndex: 'commodityType',

+ 13 - 5
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx

@@ -68,11 +68,19 @@ const ManagementDetaile = Form.create()(React.createClass({
 					title: '业务项目名称',
 					dataIndex: 'commodityName',
 					key: 'commodityName',
-					render: (text, record) => {
-						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 && record.projectType == 3 && <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: '项目类别',
 					dataIndex: 'commodityType',

+ 11 - 3
js/component/manageCenter/personnel/personnel/personnelAll.jsx

@@ -274,9 +274,17 @@ const PersonnelAll = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

Файловите разлики са ограничени, защото са твърде много
+ 542 - 536
js/component/manageCenter/project/patent/patentDetails.jsx


+ 11 - 3
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -274,9 +274,17 @@ const OutsourceTaskAssignment = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

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

@@ -310,12 +310,17 @@ const PaiDan = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return (
-              <span>
-                {record.change == 1 && <Tag color="#87d068">增</Tag>}
-                {text}
-                <span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

+ 11 - 3
js/component/manageCenter/project/project/projectQuery.jsx

@@ -221,9 +221,17 @@ const PaiDan = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

+ 11 - 3
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -330,9 +330,17 @@ const zxsglyOutSourcingPaiDan = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

+ 11 - 3
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -185,9 +185,17 @@ class ProjectDetails extends Component {
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

Файловите разлики са ограничени, защото са твърде много
+ 797 - 787
js/component/manageCenter/project/task/businessManagement/orderInfor.jsx


+ 11 - 3
js/component/manageCenter/project/task/myTask.jsx

@@ -525,9 +525,17 @@ const Task = React.createClass({
           dataIndex: 'commodityName',
           key: 'commodityName',
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

+ 11 - 3
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -379,9 +379,17 @@ const MyTaskCount = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -567,9 +567,17 @@ const MyTaskOutsource = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

+ 11 - 3
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -100,9 +100,17 @@ class projectOverview extends Component {
                     dataIndex: 'commodityName',
                     key: 'commodityName',
                     render: (text, record) => {
-                        return (
-                            <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-                        )
+                      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 && record.projectType == 3 && <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>
                     }
                 },
                 {

+ 11 - 3
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -273,9 +273,17 @@ const Task = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

+ 11 - 3
js/component/manageCenter/project/task/taskCount.jsx

@@ -344,9 +344,17 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-              )
+              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 && record.projectType == 3 && <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>
             }
           },
           {

+ 11 - 3
js/component/manageCenter/project/task/taskQuery.jsx

@@ -281,9 +281,17 @@ const Task = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

+ 13 - 5
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx

@@ -69,11 +69,19 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					title: '业务项目名称',
 					dataIndex: 'commodityName',
 					key: 'commodityName',
-					render: (text, record) => {
-						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 && record.projectType == 3 && <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: '项目类别',
 					dataIndex: 'commodityType',

+ 27 - 0
js/component/manageCenter/set/business/businessProject.jsx

@@ -97,6 +97,7 @@ const BusinessProject = Form.create()(React.createClass({
       data: {
         pageNo: pageNo || 1,
         pageSize: this.state.pagination.pageSize,
+        projectType: this.state.projectType, //会员类型
         bname: this.state.bname, //项目名称
         cid: superText, //品类名称
         country: isCountry, //是否全国
@@ -140,6 +141,7 @@ const BusinessProject = Form.create()(React.createClass({
               key: i,
               id: thisdata.id, //业务名称
               bname: thisdata.bname, //业务名称
+              projectType: thisdata.projectType, //会员类型
               cname: thisdata.cname, //业务品类
               area: isCountry ? isCountry : ProvinceCity,
               price: thisdata.price, //市场价
@@ -200,6 +202,7 @@ const BusinessProject = Form.create()(React.createClass({
               formatId: thisdata.id,//规格ID
               formatPname: thisdata.pname,//规格名称
               formatBname: thisdata.bname,//项目品类
+              projectType: thisdata.projectType, //会员类型
               formatPrice: thisdata.price,//市场价
               formatOffset: thisdata.offset,//最低折扣
               formatActivityPrice: thisdata.activityPrice,//活动价
@@ -518,6 +521,7 @@ const BusinessProject = Form.create()(React.createClass({
             id: this.state.editId,//项目ID
             cid: superText,//项目业务品类
             bname: this.state.editName,//业务项目名称
+            projectType: this.state.projectType, //会员类型
             price: this.state.editPrice,//市场价
             firstPayment: this.state.firstPayment,//首付金额
             offset: offsetText,//最低折扣
@@ -629,6 +633,7 @@ const BusinessProject = Form.create()(React.createClass({
           theArr.push({
             editId: thisdata.id,//每一条记录的ID
             editName: thisdata.bname,//项目名称
+            projectType: thisdata.projectType, //会员类型
             editCname: thisdata.cname,//项目分类
             editCid: thisdata.cid,//项目分类
             restrictStatus: thisdata.restrictStatus,//是否限定项目
@@ -682,6 +687,7 @@ const BusinessProject = Form.create()(React.createClass({
         this.setState({
           editId: thisdata.id, //每一条记录的ID
           editName: thisdata.bname, //项目名称
+          projectType: thisdata.projectType, //会员类型
           editCname: thisdata.cname, //项目分类
           restrictStatus: thisdata.restrictStatus,//是否限定项目
           editCid: thisdata.cid,
@@ -1992,6 +1998,27 @@ const BusinessProject = Form.create()(React.createClass({
                           </span>
                         </FormItem>
                       </div>
+                      <div className="clearfix" style={{ paddingLeft: '60px' }}>
+                        <FormItem className="half-item"
+                          labelCol={{ span: 4 }}
+                          wrapperCol={{ span: 12 }}
+                          label="会员类型"
+                        >
+                          <Select
+                            placeholder="请选择会员类型"
+                            value={this.state.projectType}
+                            onChange={(e) => { this.setState({ projectType: e }) }}
+                            notFoundContent="未获取到会员类型"
+                            style={{ width: '94%' }}
+                            required="required"
+                          >
+                            <Select.Option value={1}>高新会员</Select.Option>
+                            <Select.Option value={2}>简单会员</Select.Option>
+                            <Select.Option value={3}>单边会员</Select.Option>
+                            <Select.Option value={0}>其他</Select.Option>
+                          </Select>
+                        </FormItem>
+                      </div>
                       <div
                         className="clearfix"
                         style={{ paddingLeft: "60px" }}

+ 24 - 0
js/component/manageCenter/set/business/businessQuery.jsx

@@ -443,6 +443,7 @@ const BusinessProject = Form.create()(React.createClass({
             id: this.state.editId,//项目ID
             cid: superText,//项目业务品类
             bname: this.state.editName,//业务项目名称
+            projectType: this.state.projectType, //会员类型
             price: this.state.editPrice,//市场价
             offset: offsetText,//最低折扣
             activityPrice: this.state.editActivityPrice,//活动价
@@ -531,6 +532,7 @@ const BusinessProject = Form.create()(React.createClass({
             editId: thisdata.id,//每一条记录的ID
             editName: thisdata.bname,//项目名称
             editCname: thisdata.cname,//项目分类
+            projectType: thisdata.projectType, //会员类型
             editCid: thisdata.cid,//项目分类
             editCountry: thisdata.country,//是否全国
             lvlType: thisdata.lvlType,//国家级
@@ -559,6 +561,7 @@ const BusinessProject = Form.create()(React.createClass({
           editId: thisdata.id,//每一条记录的ID
           editName: thisdata.bname,//项目名称
           editCname: thisdata.cname,//项目分类
+          projectType: thisdata.projectType, //会员类型
           editCid: thisdata.cid,//项目分类
           editCountry: thisdata.country,//是否全国
           lvlType: thisdata.lvlType,//国家级
@@ -1402,6 +1405,27 @@ const BusinessProject = Form.create()(React.createClass({
                         </FormItem>
                       </div>
                       <div className="clearfix" style={{ paddingLeft: '60px' }}>
+                        <FormItem className="half-item"
+                          labelCol={{ span: 4 }}
+                          wrapperCol={{ span: 12 }}
+                          label="会员类型"
+                        >
+                          <Select
+                            placeholder="请选择会员类型"
+                            value={this.state.projectType}
+                            onChange={(e) => { this.setState({ projectType: e }) }}
+                            notFoundContent="未获取到会员类型"
+                            style={{ width: '94%' }}
+                            required="required"
+                          >
+                            <Select.Option value={1}>高新会员</Select.Option>
+                            <Select.Option value={2}>简单会员</Select.Option>
+                            <Select.Option value={3}>单边会员</Select.Option>
+                            <Select.Option value={0}>其他</Select.Option>
+                          </Select>
+                        </FormItem>
+                      </div>
+                      <div className="clearfix" style={{ paddingLeft: '60px' }}>
                         <FormItem
                           className="half-item"
                           labelCol={{ span: 4 }}

+ 11 - 3
js/component/project.jsx

@@ -52,9 +52,17 @@ const project = React.createClass({
           dataIndex: 'commodityName',
           key: 'commodityName',
           render: (text, record) => {
-            return (
-              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-            )
+            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 && record.projectType == 3 && <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>
           }
         },
         {

+ 17 - 0
js/component/tools.js

@@ -21,6 +21,7 @@ import {
   scaleList,
   companyType,
   industryList,
+  natureList,
   contractTypeList,
   contractStateList,
   demandTypeList,
@@ -721,6 +722,22 @@ const obj = {
       return theType;
     }
   },
+  //获取客户性质
+  getNatureType(e, other) {
+    if (e) {
+      let theType = "";
+      natureList.map(function (item) {
+        if (item.value == e) {
+          if (e == 0) {
+            theType = other
+          } else {
+            theType = item.key;
+          }
+        }
+      });
+      return theType;
+    }
+  },
   //获取合同状态
   getContractType: function (e) {
     if (e) {