Browse Source

会员模块显示,及添加规则

dev01 2 years ago
parent
commit
96aeb34729
44 changed files with 7368 additions and 5020 deletions
  1. 0 1
      js/component/common/cascaders/index.less
  2. 127 45
      js/component/common/projectOperation/index.jsx
  3. 91 146
      js/component/common/projectOperation/vip.jsx
  4. 45 2
      js/component/manageCenter/customer/operationalData/reexamine/details.jsx
  5. 46 2
      js/component/manageCenter/customerService/administration/followUpDetails.jsx
  6. 44 1
      js/component/manageCenter/customerService/administration/order.jsx
  7. 70 27
      js/component/manageCenter/operate/personnel/personnelAll.jsx
  8. 730 215
      js/component/manageCenter/order/orderNew/addService.jsx
  9. 44 2
      js/component/manageCenter/order/orderNew/addorders.js
  10. 532 380
      js/component/manageCenter/order/orderNew/changeComponent/changeApply.js
  11. 18 7
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  12. 89 3
      js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx
  13. 97 54
      js/component/manageCenter/order/orderNew/chargeback.jsx
  14. 304 261
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  15. 44 1
      js/component/manageCenter/order/orderNew/contractCwjl.js
  16. 44 1
      js/component/manageCenter/order/orderNew/contractCwzj.js
  17. 44 1
      js/component/manageCenter/order/orderNew/contractCwzy.js
  18. 44 1
      js/component/manageCenter/order/orderNew/contractJsjl.js
  19. 44 1
      js/component/manageCenter/order/orderNew/contractJsy.js
  20. 44 1
      js/component/manageCenter/order/orderNew/contractJszj.js
  21. 44 1
      js/component/manageCenter/order/orderNew/contractYxgly.js
  22. 44 1
      js/component/manageCenter/order/orderNew/contractYxy.js
  23. 44 1
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js
  24. 33 2
      js/component/manageCenter/order/orderNew/examine.jsx
  25. 44 1
      js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js
  26. 44 1
      js/component/manageCenter/order/orderNew/inquiry.jsx
  27. 158 115
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  28. 442 399
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  29. 44 1
      js/component/manageCenter/order/orderNew/reject.jsx
  30. 71 28
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  31. 44 1
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  32. 33 2
      js/component/manageCenter/project/project/projectAssignment.jsx
  33. 44 1
      js/component/manageCenter/project/project/projectQuery.jsx
  34. 46 2
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  35. 613 570
      js/component/manageCenter/project/summary/projectDetails.jsx
  36. 32 0
      js/component/manageCenter/project/task/businessManagement/orderInfor.jsx
  37. 44 1
      js/component/manageCenter/project/task/myTask.jsx
  38. 44 1
      js/component/manageCenter/project/task/myTaskCount.jsx
  39. 2457 2414
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  40. 126 83
      js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js
  41. 44 1
      js/component/manageCenter/project/task/taskAssignment.jsx
  42. 283 240
      js/component/manageCenter/project/task/taskCount.jsx
  43. 44 1
      js/component/manageCenter/project/task/taskQuery.jsx
  44. 45 1
      js/component/project.jsx

+ 0 - 1
js/component/common/cascaders/index.less

@@ -28,7 +28,6 @@
   margin-bottom: 0;
   padding-left: 0;
   list-style: none;
-  margin-top: 2px;
   background-color: #fff;
   box-shadow: 0 1px 6px #d9d9d9;
   border-radius: 4px;

+ 127 - 45
js/component/common/projectOperation/index.jsx

@@ -39,9 +39,10 @@ class ProjectOperation extends Component {
             serviceLife: [],
             isVip: undefined,
             histYear: [],
-
+            isEdit: false,//是否可编辑
+            contractTerm: [],//合同期
             addyear: undefined,//
-            isGive: 0,//是否赠送
+            isGive: undefined,//是否赠送
         }
         this.onSubmit = this.onSubmit.bind(this);
         this.httpChange = this.httpChange.bind(this);
@@ -56,7 +57,7 @@ class ProjectOperation extends Component {
     }
 
     setValue() {
-        const { dataInfor } = this.props;
+        const { dataInfor, newData } = this.props;
         if (!(dataInfor && Object.keys(dataInfor).length > 0)) { return; }
         if (dataInfor.type === 1) {
             this.setState({
@@ -70,6 +71,14 @@ class ProjectOperation extends Component {
                 displayFees: "none",
             });
         }
+        let llist = []
+        if (newData && newData.length > 0) {
+            for (var i = 0; i < newData.length; i++) {
+                if (newData[i].commodityId == dataInfor.commodityId) {
+                    llist.push(newData[i].serviceYear != dataInfor.serviceYear && newData[i].serviceYear)
+                }
+            }
+        }
         this.setState({
             jid: dataInfor.id, //项目ID
             kid: dataInfor.commodityId, //商品ID
@@ -93,9 +102,12 @@ class ProjectOperation extends Component {
                 )
                 : [],
             isVip: dataInfor.cSort,
-            yearSum: parseInt(dataInfor.yearSum).toString(),//会员总服务年限
-            serviceLife: JSON.parse(dataInfor.serviceLife) || [],//会员服务年限
+            yearSum: dataInfor.yearSum,//会员总服务年限
+            serviceLife: !dataInfor.serviceLife ? [] : JSON.parse(dataInfor.serviceLife), // 会员服务年限
+            contractTerm: !dataInfor.contractTerm ? [] : JSON.parse(dataInfor.contractTerm), // 合同期
             serviceYear: dataInfor.serviceYear,//本次派单
+            isEdit: true, // 不可编辑
+            histYear: llist, // 本次已派单
         });
     }
 
@@ -175,6 +187,10 @@ class ProjectOperation extends Component {
                 message.warning("请选择本次派单年份!");
                 return
             }
+            if (this.state.contractTerm.length === 0) {
+                message.warning("请填写合同期!");
+                return
+            }
         }
         this.setState({
             loading: true,
@@ -186,14 +202,12 @@ class ProjectOperation extends Component {
             commodityQuantity: this.state.commodityQuantity, //商品数量
             commodityPrice: this.state.commodityPrice, //签单总价
             taskComment: this.state.taskComment, //服务说明
-
             main: this.state.main, //是否为主要项目
-            officialCost: this.state.displayFees === 'block' ? this.state.officialCost : '', //是否有官费
-            costReduction: this.state.displayFees === 'block' ? ((this.state.patentType === 0 || this.state.patentType === 2) ? (this.state.officialCost === 1 ? this.state.costReduction : 0) : 0) : '', //是否有费减
-            patentType: this.state.displayFees === 'block' && !this.state.patentTransfer ? this.state.patentType : undefined, // 专利类型
         }
-        if (this.state.addProjectType === 5) {
-            infor.declarationBatch = this.state.declarationBatch || 1//申报批次
+        if (this.state.displayFees === 'block') {
+            infor.officialCost = this.state.officialCost //是否有官费
+            infor.costReduction = (this.state.patentType === 0 || this.state.patentType === 2) ? (this.state.officialCost === 1 ? this.state.costReduction : 0) : 0//是否有费减
+            infor.patentType = this.state.patentType //专利类型
         }
         if (this.state.isIso) {
             infor.ifCertificationFee = this.state.ifCertificationFee || undefined;//是否包含认证费用
@@ -202,12 +216,14 @@ class ProjectOperation extends Component {
             infor.serviceLife = JSON.stringify(this.state.serviceLife) //服务年限
         }
         if (this.state.addProjectType == "5") {//高新
+            infor.declarationBatch = this.state.declarationBatch || 1//申报批次
             infor.serviceYear = this.state.serviceYear //申报年份
         }
         if (this.state.isVip == 6) {//会员
             infor.yearSum = this.state.yearSum //会员总服务年限
             infor.serviceLife = JSON.stringify(this.state.serviceLife) //会员服务年限
             infor.serviceYear = this.state.serviceYear //本次派单年份
+            infor.contractTerm = JSON.stringify(this.state.contractTerm)//合同期
         }
         $.ajax({
             method: "POST",
@@ -285,34 +301,50 @@ class ProjectOperation extends Component {
                 message.warning("请选择本次派单年份!");
                 return
             }
+            if (this.state.contractTerm.length === 0) {
+                message.warning("请填写合同期!");
+                return
+            }
         }
         this.setState({
             loading: true,
         });
+        let infor = {
+            id: this.state.jid, //项目ID
+            commodityId: this.state.kid, //商品ID
+            orderNo: this.props.orderNo, //订单编号
+            main: this.state.main, //是否为主要
+            commodityPrice: this.state.commodityPrice, //金额
+            commodityQuantity: this.state.commodityQuantity, //数量
+            taskComment: this.state.taskComment, //备注
+        }
+        if (this.state.displayFees === 'block') {
+            infor.officialCost = this.state.officialCost //是否有官费
+            infor.costReduction = (this.state.patentType === 0 || this.state.patentType === 2) ? (this.state.officialCost === 1 ? this.state.costReduction : 0) : 0//是否有费减
+            infor.patentType = this.state.patentType //专利类型
+        }
+        if (this.state.isIso) {
+            infor.ifCertificationFee = this.state.ifCertificationFee || undefined;//是否包含认证费用
+        }
+        if (this.state.addProjectType == "3") {//审计
+            infor.serviceLife = JSON.stringify(this.state.serviceLife) //服务年限
+        }
+        if (this.state.addProjectType == "5") {//高新
+            infor.declarationBatch = this.state.declarationBatch || undefined//申报批次
+            infor.serviceYear = this.state.serviceYear //申报年份
+        }
+        if (this.state.isVip == 6) {//会员
+            infor.yearSum = this.state.yearSum //会员总服务年限
+            infor.serviceLife = JSON.stringify(this.state.serviceLife) //会员服务年限
+            infor.serviceYear = this.state.serviceYear //本次派单年份
+            infor.contractTerm = JSON.stringify(this.state.contractTerm)//合同期
+        }
         $.ajax({
             method: "POST",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/api/admin/newOrder/updateOrderTask",
-            data: {
-                id: this.state.jid, //项目ID
-                commodityId: this.state.kid, //商品ID
-                orderNo: this.props.orderNo, //订单编号
-                main: this.state.main, //是否为主要
-                commodityPrice: this.state.commodityPrice, //金额
-                commodityQuantity: this.state.commodityQuantity, //数量
-                taskComment: this.state.taskComment, //备注
-                officialCost: this.state.displayFees === 'block' ? this.state.officialCost : '', //是否有官费
-                costReduction: this.state.displayFees === 'block' ? ((this.state.patentType === 0 || this.state.patentType === 2) ? (this.state.officialCost === 1 ? this.state.costReduction : 0) : 0) : '', //是否有费减
-                patentType: this.state.displayFees === 'block' ? this.state.patentType : '', //专利类型
-                declarationBatch: this.state.declarationBatch || undefined,//申报批次
-                ifCertificationFee: isNaN(parseInt(this.state.ifCertificationFee)) ? undefined : this.state.ifCertificationFee,//是否包含认证费用
-                yearSum: this.state.isVip == 6 ? this.state.yearSum : undefined,
-                serviceLife: this.state.isVip == 6 ? JSON.stringify(this.state.serviceLife) : undefined,//会员-服务年限
-                serviceYear: this.state.isVip == 6 ? this.state.serviceYear : undefined,// 会员-本次派单
-                serviceLife: this.state.addProjectType == "3" ? JSON.stringify(this.state.serviceLife) : undefined,//审计-服务年限
-                serviceYear: this.state.addProjectType == "5" ? this.state.serviceYear : undefined, //高新-申报年份
-            },
+            data: infor,
         }).done(
             function (data) {
                 this.setState({
@@ -407,8 +439,6 @@ class ProjectOperation extends Component {
             commodityQuantity: kid.cSort == 6 ? 1 : undefined,//服务数量
             histYear: [],
         });
-
-        console.log("newData===", newData)
         if (newData && newData.length > 0 && kid.cSort == 6) {
             let llist = []
             for (var i = 0; i < newData.length; i++) {
@@ -422,16 +452,26 @@ class ProjectOperation extends Component {
             for (var i = newData.length - 1; i >= 0; i--) {
                 if (newData[i].commodityId == kid.id) {
                     this.setState({
+                        commodityPrice: newData[i].commodityPrice, // 实签价格
+                        main: "0", // 是否为主要项目
                         yearSum: newData[i].yearSum.toString(), // 会员总服务年限
-                        serviceLife: JSON.parse(newData[i].serviceLife) || [], // 会员服务年限
+                        serviceLife: !newData[i].serviceLife ? [] : JSON.parse(newData[i].serviceLife), // 会员服务年限
+                        contractTerm: !newData[i].contractTerm ? [] : JSON.parse(newData[i].contractTerm), // 合同期
+                        taskComment: newData[i].taskComment, // 项目说明
+                        isEdit: true, // 不可编辑
                     })
+                    return
                 } else {
                     this.setState({
+                        commodityPrice: undefined,
+                        main: undefined,
                         yearSum: undefined,
                         serviceLife: [],
+                        contractTerm: [],
+                        taskComment: undefined,
+                        isEdit: false, // 可编辑
                     })
                 }
-                return
             }
         }
 
@@ -457,7 +497,7 @@ class ProjectOperation extends Component {
 
     handleClose(removedTag) {
         let serviceLife = this.state.serviceLife.filter(tag => { return tag !== removedTag });
-        this.setState({ serviceLife });
+        this.setState({ serviceLife, serviceYear: undefined });
     }
 
     render() {
@@ -476,7 +516,7 @@ class ProjectOperation extends Component {
             <Option key={its}>{its}</Option>
         ));
         const { readOnly } = this.props;
-        const { isVip, histYear } = this.state
+        const { isVip, histYear, isEdit } = this.state
         return (
             <Modal
                 maskClosable={false}
@@ -648,6 +688,7 @@ class ProjectOperation extends Component {
                                 {readOnly ? this.state.commodityPrice : <Input
                                     type='number'
                                     placeholder="请输入实签价格"
+                                    disabled={isEdit}
                                     value={this.state.commodityPrice}
                                     style={{ width: "200px" }}
                                     onChange={(e) => {
@@ -716,7 +757,7 @@ class ProjectOperation extends Component {
                                     label="会员总服务年限"
                                 >
                                     {readOnly ?
-                                        this.state.yearSum == null ? "" :
+                                        !this.state.yearSum ? "" :
                                             [
                                                 { value: "0", key: "" },
                                                 { value: "1", key: "一年" },
@@ -728,9 +769,14 @@ class ProjectOperation extends Component {
                                         <Select
                                             placeholder="请选择会员总服务年限"
                                             style={{ width: "200px" }}
-                                            value={this.state.yearSum}
+                                            disabled={isEdit}
+                                            value={typeof (this.state.yearSum) === "number" ? this.state.yearSum.toString() : this.state.yearSum}
                                             onChange={(e) => {
-                                                this.setState({ yearSum: e });
+                                                this.setState({
+                                                    yearSum: e,
+                                                    serviceLife: [],
+                                                    serviceYear: undefined,
+                                                });
                                             }}
                                         >
                                             {[
@@ -763,13 +809,13 @@ class ProjectOperation extends Component {
                                             <div>
                                                 {
                                                     this.state.serviceLife.map((tag) =>
-                                                        <Tag closable key={tag} afterClose={() => this.handleClose(tag)}>
+                                                        <Tag closable={!isEdit} key={tag} afterClose={() => this.handleClose(tag)}>
                                                             {tag}
                                                         </Tag>
                                                     )
                                                 }
                                                 {
-                                                    this.state.serviceLife.length < this.state.yearSum &&
+                                                    !isEdit && (this.state.serviceLife.length < this.state.yearSum) &&
                                                     <Button
                                                         size="small"
                                                         type="primary"
@@ -777,7 +823,7 @@ class ProjectOperation extends Component {
                                                             this.setState({
                                                                 addYears: true,
                                                                 addyear: undefined,
-                                                                isGive: 0,
+                                                                isGive: undefined,
                                                             })
                                                         }}>
                                                         + 添加服务年限
@@ -830,6 +876,34 @@ class ProjectOperation extends Component {
                                     {!readOnly && <span className="mandatory">*</span>}
                                 </FormItem>
                             }
+                            {
+                                isVip == 6 &&
+                                <FormItem
+                                    className="half-item"
+                                    {...formItemLayout}
+                                    label="合同期"
+                                >
+                                    {
+                                        readOnly ?
+                                            !!this.state.contractTerm ? this.state.contractTerm.toString() : "" :
+                                            <Select
+                                                mode="multiple"
+                                                style={{ width: '200px' }}
+                                                placeholder="请选择合同期"
+                                                disabled={isEdit}
+                                                value={this.state.contractTerm}
+                                                onChange={e => {
+                                                    this.setState({
+                                                        contractTerm: e,
+                                                    })
+                                                }}
+                                            >
+                                                {children}
+                                            </Select>
+                                    }
+                                    {!readOnly && <span className="mandatory">*</span>}
+                                </FormItem>
+                            }
                             {/* {
                                 this.state.orgCodeUrl.length > 0 &&
                                 <div className="clearfix">
@@ -854,7 +928,7 @@ class ProjectOperation extends Component {
                                     {readOnly ? this.state.taskComment :
                                         <Input
                                             type="textarea"
-                                            placeholder="如:派2022年会员服务,总会员服务三年,客户付款情况说明"
+                                            placeholder=""
                                             autosize={{ minRows: 4 }}
                                             value={this.state.taskComment}
                                             onChange={(e) => {
@@ -862,10 +936,10 @@ class ProjectOperation extends Component {
                                             }}
                                         />}
                                 </FormItem>
-                                <div style={{ color: "red", marginLeft: 144 }}>
+                                {/* <div style={{ color: "red", marginLeft: 144 }}>
                                     请详细说明项目服务时间,总服务时间及付款情况,如:<span style={{ color: "#333" }}>派2022年会员服务,总会员服务三年,客户付款情况说明</span>
                                     <p>未付款时,需进行特批审核,请详细说明预计付款时间等详细情况</p>
-                                </div>
+                                </div> */}
                             </div>
                             {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
                             {this.state.addProjectType === 5 ?
@@ -992,6 +1066,14 @@ class ProjectOperation extends Component {
                         visible={this.state.addYears}
                         okText="添加"
                         onOk={() => {
+                            if (!this.state.addyear) {
+                                message.warn("请选择年份!")
+                                return
+                            }
+                            if (this.state.isGive == undefined) {
+                                message.warn("请选择是否赠送!")
+                                return
+                            }
                             let slist = this.state.serviceLife
                             if (this.state.isGive == 0) {
                                 slist.push(this.state.addyear)

+ 91 - 146
js/component/common/projectOperation/vip.jsx

@@ -70,7 +70,7 @@ class ProjectOperationVip extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      commodityName: '',
+      commodityName: undefined,
       commodityQuantity: 1,
       patentType: 0,
       officialCost: '',
@@ -89,9 +89,9 @@ class ProjectOperationVip extends Component {
       serviceLife: [],
       histYear: [], //已派年份
       isEdit: false,//是否可编辑
-
+      contractTerm: [],//合同期
       addyear: undefined,//
-      isGive: 0,//是否赠送
+      isGive: undefined,//是否赠送
     }
     this.onSubmit = this.onSubmit.bind(this);
     this.httpChange = this.httpChange.bind(this);
@@ -105,24 +105,41 @@ class ProjectOperationVip extends Component {
   }
 
   setValue() {
-    const { dataInfor } = this.props;
-    if (!(dataInfor && Object.keys(dataInfor).length > 0)) {
-
-    } else {
+    const { dataInfor, newData } = this.props;
+    console.log("------", newData)
+    if (!!newData && newData.length > 0) {
+      let list = []
+      for (var i = 0; i < newData.length; i++) {
+        if (newData[i].cSort == 6) {
+          list.push({
+            commodityId: newData[i].commodityId,
+            commodityName: newData[i].commodityName,
+          })
+        }
+      }
+      console.log("list==", list)
       this.setState({
-        fid: dataInfor.id,
-        commodityId: dataInfor.commodityId, //项目ID
-        commodityName: dataInfor.commodityName, //项目名称
-        commodityQuantity: dataInfor.commodityQuantity, // 数量
-        memberType: dataInfor.memberType.toString(),// 付款情况
-        taskComment: dataInfor.taskComment, // 备注
-        orgCodeUrl: dataInfor.pictureUrl ? splitUrl(dataInfor.pictureUrl, ",", globalConfig.avatarHost + "/upload") : [],// 附件
-        yearSum: dataInfor.yearSum,//会员总服务年限
-        serviceLife: JSON.parse(dataInfor.serviceLife) || [],//会员服务年限
-        serviceYear: dataInfor.serviceYear,//本次派单
-        contract_term: dataInfor.contract_term,//合同期
-      });
+        customerArr: list
+      })
     }
+    // if (!(dataInfor && Object.keys(dataInfor).length > 0)) {
+
+    // } else {
+    //   this.setState({
+    //     fid: dataInfor.id,
+    //     commodityId: dataInfor.commodityId, //项目ID
+    //     commodityName: dataInfor.commodityName, //项目名称
+    //     commodityQuantity: dataInfor.commodityQuantity, // 数量
+    //     memberType: dataInfor.memberType.toString(),// 付款情况
+    //     taskComment: dataInfor.taskComment, // 备注
+    //     orgCodeUrl: dataInfor.pictureUrl ? splitUrl(dataInfor.pictureUrl, ",", globalConfig.avatarHost + "/upload") : [],// 附件
+    //     yearSum: dataInfor.yearSum,//会员总服务年限
+    //     serviceLife: JSON.parse(dataInfor.serviceLife) || [],//会员服务年限
+    //     serviceYear: dataInfor.serviceYear,//本次派单
+    //     contractTerm: JSON.parse(dataInfor.contractTerm),//合同期
+    //     taskComment: dataInfor.taskComment,//项目说明
+    //   });
+    // }
   }
   //
   getOrgCodeUrl(e) {
@@ -178,7 +195,7 @@ class ProjectOperationVip extends Component {
       message.warning("请选择本次派单年份!");
       return
     }
-    if (this.state.contract_term.length === 0) {
+    if (this.state.contractTerm.length === 0) {
       message.warning("请添加合同期!");
       return
     }
@@ -202,7 +219,7 @@ class ProjectOperationVip extends Component {
       yearSum: this.state.yearSum,//会员总服务年限
       serviceLife: JSON.stringify(this.state.serviceLife),//会员服务年限
       serviceYear: this.state.serviceYear,//本次派单
-      contract_term: JSON.stringify(this.state.contract_term),//合同期
+      contractTerm: JSON.stringify(this.state.contractTerm),//合同期
       pictureUrl: pictureUrl.length ? pictureUrl : "",//附件
     }
     $.ajax({
@@ -233,102 +250,6 @@ class ProjectOperationVip extends Component {
       }.bind(this)
     );
   }
-  // 修改会员项目
-  onChange() {
-
-    let pictureUrl = [];
-    if (this.state.orgCodeUrl.length) {
-      let picArr = [];
-      this.state.orgCodeUrl.map(function (item) {
-        if (
-          item.response &&
-          item.response.data &&
-          item.response.data.length
-        ) {
-          picArr.push(item.response.data);
-        }
-      });
-      pictureUrl = picArr.join(",");
-    }
-
-    if (this.state.commodityId === undefined || !this.state.commodityId) {
-      message.warning("服务名称不匹配!");
-      return
-    }
-    let reg = /^([0]|[1-9][0-9]*)$/;
-    if (
-      !this.state.commodityQuantity ||
-      !reg.test(this.state.commodityQuantity)
-    ) {
-      message.warning("请输入正确商品数量!");
-      return false;
-    }
-    if (this.state.memberType === undefined) {
-      message.warning("请选择付款情况!");
-      return
-    }
-    if (this.state.yearSum === undefined) {
-      message.warning("请选择会员总服务年限!");
-      return
-    }
-    if (this.state.serviceLife.length === 0) {
-      message.warning("请添加会员服务年限!");
-      return
-    }
-    if (this.state.serviceLife.length != this.state.yearSum) {
-      message.warning("会员服务年限与总年限不符合!");
-      return
-    }
-    if (this.state.serviceYear === undefined) {
-      message.warning("请选择本次派单年份!");
-      return
-    }
-    if (this.state.contract_term.length === 0) {
-      message.warning("请添加合同期!");
-      return
-    }
-    if (this.state.memberType == "1" || this.state.memberType == "2") {
-      if (typeof pictureUrl !== "string") {
-        message.warning("请上传附件!");
-        return
-      }
-    }
-    this.setState({
-      loading: true,
-    });
-    $.ajax({
-      method: "POST",
-      dataType: "json",
-      crossDomain: false,
-      url: globalConfig.context + "/api/admin/orderProject/updateMemberProject",
-      data: {
-        id: this.state.fid, //任务ID
-        commodityId: this.state.commodityId, //项目ID
-        commodityName: this.state.commodityName, //项目名称
-        orderNo: this.props.orderNo, //订单编号
-        commodityQuantity: this.state.commodityQuantity, //数量
-        taskComment: this.state.taskComment, //备注
-        memberType: this.state.memberType,//会员付款状态
-        yearSum: this.state.yearSum,//会员总服务年限
-        serviceLife: JSON.stringify(this.state.serviceLife),//会员服务年限
-        serviceYear: this.state.serviceYear,//本次派单
-        contract_term: JSON.stringify(this.state.contract_term),//合同期
-        pictureUrl: pictureUrl.length ? pictureUrl : "",//附件
-      },
-    }).done(
-      function (data) {
-        this.setState({
-          loading: false,
-        });
-        if (!data.error.length) {
-          message.success("保存成功!");
-          this.props.onCancel();
-        } else {
-          message.warning(data.error[0].message);
-        }
-      }.bind(this)
-    );
-  }
   //
   httpChange(e) {
     this.setState({
@@ -374,7 +295,7 @@ class ProjectOperationVip extends Component {
     const { customerArr } = this.state;
     const { newData } = this.props
     const newdataSources = JSON.stringify(customerArr) == "{}" ? [] : customerArr;
-    let cid = newdataSources.find((item) => item.bname == value).id
+    let cid = newdataSources.find((item) => item.commodityName == value).commodityId
     this.setState({
       commodityName: value,
       commodityId: cid,
@@ -390,35 +311,40 @@ class ProjectOperationVip extends Component {
       this.setState({
         histYear: llist
       })
-      for (var i = newData.length - 1; i >= 0; i--) {
-        if (newData[i].commodityId == cid) {
+      for (var j = newData.length - 1; j >= 0; j--) {
+        if (newData[j].commodityId == cid) {
           this.setState({
-            yearSum: newData[i].yearSum.toString(), // 会员总服务年限
-            serviceLife: JSON.parse(newData[i].serviceLife) || [], // 会员服务年限
+            memberType: !newData[j].memberType ? undefined : newData[j].memberType.toString(), // 付款情况
+            yearSum: newData[j].yearSum.toString(), // 会员总服务年限
+            serviceLife: !newData[j].serviceLife ? [] : JSON.parse(newData[j].serviceLife), // 会员服务年限
+            contractTerm: !newData[j].contractTerm ? [] : JSON.parse(newData[j].contractTerm), // 合同期
+            taskComment: newData[j].taskComment, // 项目说明
             isEdit: true, // 不可编辑
           })
+          return
         } else {
           this.setState({
             yearSum: undefined,
             serviceLife: [],
+            contractTerm: [],
+            taskComment: undefined,
             isEdit: false, // 可编辑
           })
         }
-        return
       }
     }
   }
 
   handleClose(removedTag) {
     let serviceLife = this.state.serviceLife.filter(tag => { return tag !== removedTag });
-    this.setState({ serviceLife });
+    this.setState({ serviceLife, serviceYear: undefined });
   }
 
 
   render() {
     let options = this.state.customerArr.map((group, index) => (
-      <Select.Option key={index} value={group.bname}>
-        {group.bname}
+      <Select.Option key={index} value={group.commodityName}>
+        {group.commodityName}
       </Select.Option>
     ));
     let contList = vipYear.map(its => (
@@ -448,20 +374,29 @@ class ProjectOperationVip extends Component {
                 label="服务名称"
               >
                 {readOnly ? this.state.commodityName :
-                  <AutoComplete
-                    className="certain-category-search"
-                    dropdownClassName="certain-category-search-dropdown"
-                    dropdownMatchSelectWidth={false}
-                    style={{ width: "200px" }}
-                    dataSource={options}
+                  // <AutoComplete
+                  //   className="certain-category-search"
+                  //   dropdownClassName="certain-category-search-dropdown"
+                  //   dropdownMatchSelectWidth={false}
+                  //   style={{ width: "200px" }}
+                  //   dataSource={options}
+                  //   placeholder="输入服务名称"
+                  //   value={this.state.commodityName}
+                  //   onChange={this.httpChange}
+                  //   filterOption={true}
+                  //   onSelect={this.selectAuto}
+                  // >
+                  //   <Input />
+                  // </AutoComplete>
+                  <Select
+                    style={{ width: '200px' }}
                     placeholder="输入服务名称"
                     value={this.state.commodityName}
-                    onChange={this.httpChange}
-                    filterOption={true}
-                    onSelect={this.selectAuto}
+                    onChange={this.selectAuto}
                   >
-                    <Input />
-                  </AutoComplete>}
+                    {options}
+                  </Select>
+                }
                 {!readOnly && <span className="mandatory">*</span>}
               </FormItem>
               <FormItem
@@ -526,7 +461,7 @@ class ProjectOperationVip extends Component {
                 label="会员总服务年限"
               >
                 {readOnly ?
-                  this.state.yearSum == null ? "" :
+                  !this.state.yearSum ? "" :
                     [
                       { value: "0", key: "" },
                       { value: "1", key: "一年" },
@@ -544,6 +479,7 @@ class ProjectOperationVip extends Component {
                       this.setState({
                         yearSum: e,
                         serviceLife: [],
+                        serviceYear: undefined,
                       });
                     }}
                   >
@@ -585,7 +521,7 @@ class ProjectOperationVip extends Component {
                         this.setState({
                           addYears: true,
                           addyear: undefined,
-                          isGive: 0,
+                          isGive: undefined,
                         })
                       }}>
                       + 添加服务年限
@@ -645,15 +581,16 @@ class ProjectOperationVip extends Component {
               >
                 {
                   readOnly ?
-                    this.state.contract_term.toString() :
+                    this.state.contractTerm.toString() :
                     <Select
                       mode="multiple"
                       style={{ width: '200px' }}
                       placeholder="请选择合同期"
-                      value={this.state.contract_term}
+                      disabled={isEdit}
+                      value={this.state.contractTerm}
                       onChange={e => {
                         this.setState({
-                          contract_term: e,
+                          contractTerm: e,
                         })
                       }}
                     >
@@ -692,7 +629,7 @@ class ProjectOperationVip extends Component {
                   {readOnly ? this.state.taskComment :
                     <Input
                       type="textarea"
-                      placeholder="如:派2022年会员服务,总会员服务三年,客户付款情况说明"
+                      placeholder=""
                       autosize={{ minRows: 4 }}
                       value={this.state.taskComment}
                       onChange={(e) => {
@@ -700,10 +637,10 @@ class ProjectOperationVip extends Component {
                       }}
                     />}
                 </FormItem>
-                <div style={{ color: "red", marginLeft: 144 }}>
+                {/* <div style={{ color: "red", marginLeft: 144 }}>
                   请详细说明项目服务时间,总服务时间及付款情况,如:<span style={{ color: "#333" }}>派2022年会员服务,总会员服务三年,客户付款情况说明</span>
                   <p>未付款时,需进行特批审核,请详细说明预计付款时间等详细情况</p>
-                </div>
+                </div> */}
               </div>
               {readOnly ? null : <FormItem
                 wrapperCol={{ span: 12, offset: 4 }}
@@ -716,7 +653,7 @@ class ProjectOperationVip extends Component {
                     if (!this.state.fid) {
                       this.onSubmit()
                     } else {
-                      this.onChange()
+                      // this.onChange()
                     }
                   }}
                 >
@@ -740,6 +677,14 @@ class ProjectOperationVip extends Component {
             visible={this.state.addYears}
             okText="添加"
             onOk={() => {
+              if (!this.state.addyear) {
+                message.warn("请选择年份!")
+                return
+              }
+              if (this.state.isGive == undefined) {
+                message.warn("请选择是否赠送!")
+                return
+              }
               let slist = this.state.serviceLife
               if (this.state.isGive == 0) {
                 slist.push(this.state.addyear)

+ 45 - 2
js/component/manageCenter/customer/operationalData/reexamine/details.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { Button, Form, message, Modal, Spin, Table, Tag } from "antd";
+import { Button, Form, message, Modal, Spin, Table, TagmTooltip } from "antd";
 import OrderItemStatus from "../../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../../common/enterpriseNameChange";
 import {
@@ -91,11 +91,54 @@ class Details extends Component {
                     },
                 },
                 {
+                    title: "总年限",
+                    dataIndex: "yearSum",
+                    key: "yearSum",
+                    render: (text, record) => {
+                        return (
+                            <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+                        );
+                    }
+                },
+                {
+                    title: "年限",
+                    dataIndex: "serviceLife",
+                    key: "serviceLife",
+                    render: (text, record) => {
+                        return (
+                            !!text && JSON.parse(text).map(item =>
+                                <div>{item}</div>
+                            )
+                        );
+                    }
+                },
+                {
+                    title: "本次派单",
+                    dataIndex: "serviceYear",
+                    key: "serviceYear",
+                    render: (text, record) => {
+                        return (
+                            <div>{!text ? "" : text}</div>
+                        );
+                    }
+                },
+                {
                     title: "项目说明",
                     dataIndex: "taskComment",
                     key: "taskComment",
                     render: (text) => {
-                        return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+                        return (
+                            <Tooltip title={text}>
+                                <div
+                                    style={{
+                                        width: 100,
+                                        overflow: "hidden",
+                                        whiteSpace: "nowrap",
+                                        textOverflow: "ellipsis",
+                                    }}
+                                >{text}</div>
+                            </Tooltip>
+                        )
                     },
                 },
             ],

+ 46 - 2
js/component/manageCenter/customerService/administration/followUpDetails.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { Button, Col, Form, message, Modal, Spin, Table, Tabs, Tag } from "antd";
+import { Button, Col, Form, message, Modal, Spin, Table, Tabs, Tag, Tooltip } from "antd";
 import {
     getApprovedState,
     getCuikuan,
@@ -87,16 +87,60 @@ class FollowUpDetails extends Component {
                     title: "主要项目",
                     dataIndex: "main",
                     key: "main",
+                    width: 50,
                     render: (text) => {
                         return text ? "是" : "否";
                     },
                 },
                 {
+                    title: "总年限",
+                    dataIndex: "yearSum",
+                    key: "yearSum",
+                    render: (text, record) => {
+                        return (
+                            <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+                        );
+                    }
+                },
+                {
+                    title: "年限",
+                    dataIndex: "serviceLife",
+                    key: "serviceLife",
+                    render: (text, record) => {
+                        return (
+                            !!text && JSON.parse(text).map(item =>
+                                <div>{item}</div>
+                            )
+                        );
+                    }
+                },
+                {
+                    title: "本次派单",
+                    dataIndex: "serviceYear",
+                    key: "serviceYear",
+                    render: (text, record) => {
+                        return (
+                            <div>{!text ? "" : text}</div>
+                        );
+                    }
+                },
+                {
                     title: "项目说明",
                     dataIndex: "taskComment",
                     key: "taskComment",
                     render: (text) => {
-                        return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+                        return (
+                            <Tooltip title={text}>
+                                <div
+                                    style={{
+                                        width: 100,
+                                        overflow: "hidden",
+                                        whiteSpace: "nowrap",
+                                        textOverflow: "ellipsis",
+                                    }}
+                                >{text}</div>
+                            </Tooltip>
+                        )
                     },
                 },
             ],

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

@@ -322,11 +322,54 @@ const Order = Form.create()(
             },
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: (text) => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             },
           },
         ],

+ 70 - 27
js/component/manageCenter/operate/personnel/personnelAll.jsx

@@ -157,14 +157,14 @@ const PersonnelAll = React.createClass({
           width: 150,
           render: (text) => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           },
         },
@@ -265,9 +265,9 @@ const PersonnelAll = React.createClass({
           key: "commodityName",
           render: (text, record) => {
             return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
             )
-        }
+          }
         },
         {
           title: "项目类别",
@@ -323,11 +323,54 @@ const PersonnelAll = React.createClass({
           },
         },
         {
+          title: "总年限",
+          dataIndex: "yearSum",
+          key: "yearSum",
+          render: (text, record) => {
+            return (
+              <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+            );
+          }
+        },
+        {
+          title: "年限",
+          dataIndex: "serviceLife",
+          key: "serviceLife",
+          render: (text, record) => {
+            return (
+              !!text && JSON.parse(text).map(item =>
+                <div>{item}</div>
+              )
+            );
+          }
+        },
+        {
+          title: "本次派单",
+          dataIndex: "serviceYear",
+          key: "serviceYear",
+          render: (text, record) => {
+            return (
+              <div>{!text ? "" : text}</div>
+            );
+          }
+        },
+        {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
           render: (text) => {
-            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+            return (
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 100,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
+              </Tooltip>
+            )
           },
         },
       ],
@@ -409,17 +452,17 @@ const PersonnelAll = React.createClass({
             orderRemarks: thisdata.orderRemarks, //订单留言
             orgCodeUrl: thisdata.contractPictureUrl
               ? splitUrl(
-                  thisdata.contractPictureUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.contractPictureUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [], //图片地址
             replenishUrl: thisdata.agreementUrl
               ? splitUrl(
-                  thisdata.agreementUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.agreementUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [],
             salesmanName: thisdata.salesmanName, //营销员名称
             salesmanMobile: thisdata.salesmanMobile, //营销员电话
@@ -674,14 +717,14 @@ const PersonnelAll = React.createClass({
             width: 150,
             render: (text) => {
               return (
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               )
             },
           },

File diff suppressed because it is too large
+ 730 - 215
js/component/manageCenter/order/orderNew/addService.jsx


+ 44 - 2
js/component/manageCenter/order/orderNew/addorders.js

@@ -12,7 +12,8 @@ import {
   AutoComplete,
   DatePicker,
   Col,
-  Tag
+  Tag,
+  Tooltip,
 } from "antd";
 import $ from "jquery/src/ajax";
 import "../userMangagement.less";
@@ -222,11 +223,52 @@ const Addorders = Form.create()(
             },
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: (text) => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 100,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
+              </Tooltip>
             },
           },
           {

File diff suppressed because it is too large
+ 532 - 380
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js


+ 18 - 7
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -247,7 +247,18 @@ class OrderDetail extends Component {
           dataIndex: "taskComment",
           key: "taskComment",
           render: text => {
-            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+            return (
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 100,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
+              </Tooltip>
+            )
           }
         }
       ],
@@ -880,12 +891,12 @@ class OrderDetail extends Component {
             <Col span={24} offset={9} style={{ marginTop: "15px" }}></Col>
           </Form>
         </div>
-        {this.state.visible && 
-        <ProjectDetailsReadOnly
-          infor={this.state.dataInfor}
-          visible={this.state.visible}
-          onCancel={this.nextCancel}
-        />}
+        {this.state.visible &&
+          <ProjectDetailsReadOnly
+            infor={this.state.dataInfor}
+            visible={this.state.visible}
+            onCancel={this.nextCancel}
+          />}
       </div>
     );
   }

+ 89 - 3
js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx

@@ -8,7 +8,7 @@ import {
   Modal,
   Form,
   Tag,
-  Col
+  Col, Tooltip
 } from "antd";
 import $ from "jquery/src/ajax";
 import { getProjectStatus } from "@/tools.js"
@@ -107,11 +107,54 @@ const ProAndCuiList = React.createClass({
           key: "receiverName",
         },
         {
+          title: "总年限",
+          dataIndex: "yearSum",
+          key: "yearSum",
+          render: (text, record) => {
+            return (
+              <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+            );
+          }
+        },
+        {
+          title: "年限",
+          dataIndex: "serviceLife",
+          key: "serviceLife",
+          render: (text, record) => {
+            return (
+              !!text && JSON.parse(text).map(item =>
+                <div>{item}</div>
+              )
+            );
+          }
+        },
+        {
+          title: "本次派单",
+          dataIndex: "serviceYear",
+          key: "serviceYear",
+          render: (text, record) => {
+            return (
+              <div>{!text ? "" : text}</div>
+            );
+          }
+        },
+        {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
           render: (text) => {
-            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+            return (
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 100,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
+              </Tooltip>
+            )
           },
         },
       ],
@@ -428,11 +471,54 @@ const ProAndCuiList = React.createClass({
             key: "receiverName",
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: (text) => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             },
           },
         ];

+ 97 - 54
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Input, Spin, Table, message,DatePicker, Tooltip, Form ,Modal,Col,Tabs, Tag} from 'antd';
+import { Button, Input, Spin, Table, message, DatePicker, Tooltip, Form, Modal, Col, Tabs, Tag } from 'antd';
 import $ from 'jquery/src/ajax';
 import Picture from '@/manageCenter/publicComponent/picture';
 import ResolutionDetail from "@/resolutionDetail";
@@ -19,7 +19,7 @@ import './customer.less';
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
-import {ChooseList} from "./chooseList";
+import { ChooseList } from "./chooseList";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderDetail from './changeComponent/orderDetail';
@@ -90,7 +90,7 @@ const IntentionCustomer = Form.create()(
     },
     getInitialState() {
       return {
-        orderNos:'',
+        orderNos: '',
         rotateDeg: 0,
         page: 1,
         resVisible: false,
@@ -129,14 +129,14 @@ const IntentionCustomer = Form.create()(
             key: "userName",
             render: (text) => {
               return (
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               );
             },
           },
@@ -266,11 +266,54 @@ const IntentionCustomer = Form.create()(
             },
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: (text) => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             },
           },
         ],
@@ -321,7 +364,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "dunTypeName",
             key: "dunTypeName",
             render: (text) => {
-              if(record.customizeName) {
+              if (record.customizeName) {
                 return text + record.customizeName;
               }
               return <span>{text}</span>;
@@ -436,17 +479,17 @@ const IntentionCustomer = Form.create()(
               refundStatus: thisdata.refundStatus, //退单状态
               applicationUrl: thisdata.applicationUrl
                 ? splitUrl(
-                    thisdata.applicationUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.applicationUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //申请表附件
               contractUrl: thisdata.contractUrl
                 ? splitUrl(
-                    thisdata.contractUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.contractUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //合同附件
               reason: thisdata.reason, //退单原因
               liquidationStatus: thisdata.liquidationStatus, //结算状态
@@ -536,7 +579,7 @@ const IntentionCustomer = Form.create()(
     tableRowClick(record) {
       this.setState({
         visible: true,
-        orderNos:record.orderNo
+        orderNos: record.orderNo
       });
       this.xiangqing(record.orderNo);
       this.xiangmu(record.orderNo);
@@ -646,17 +689,17 @@ const IntentionCustomer = Form.create()(
               orderRemarks: thisdata.orderRemarks, //订单留言
               orgCodeUrl: thisdata.contractPictureUrl
                 ? splitUrl(
-                    thisdata.contractPictureUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
               replenishUrl: thisdata.agreementUrl
                 ? splitUrl(
-                    thisdata.agreementUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.agreementUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [],
               salesmanName: thisdata.salesmanName, //营销员名称
               salesmanMobile: thisdata.salesmanMobile, //营销员电话
@@ -668,7 +711,7 @@ const IntentionCustomer = Form.create()(
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               approval: thisdata.approval.toString(), //特批状态
               //approval:thisdata.approval==0?thisdata.approval.toString():thisdata.approval,//特批状态
-              deleteSign:thisdata.deleteSign,
+              deleteSign: thisdata.deleteSign,
             });
           }
         }.bind(this),
@@ -1052,11 +1095,11 @@ const IntentionCustomer = Form.create()(
               <TabPane tab="更改表格显示数据" key="2">
                 <div style={{ marginLeft: 10 }}>
                   <ChooseList
-                      columns={this.state.columns}
-                      changeFn={this.changeList}
-                      changeList={this.state.changeList}
-                      top={55}
-                      margin={11}
+                    columns={this.state.columns}
+                    changeFn={this.changeList}
+                    changeList={this.state.changeList}
+                    top={55}
+                    margin={11}
                   />
                 </div>
               </TabPane>
@@ -1066,8 +1109,8 @@ const IntentionCustomer = Form.create()(
                 <Table
                   columns={
                     this.state.changeList
-                        ? this.state.changeList
-                        : this.state.columns
+                      ? this.state.changeList
+                      : this.state.columns
                   }
                   dataSource={this.state.dataSource}
                   // rowSelection={rowSelection}
@@ -1096,8 +1139,8 @@ const IntentionCustomer = Form.create()(
               >
                 <Spin spinning={this.state.loading}>
                   <div className="clearfix">
-                    <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
-                      <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                    <div style={{ position: "absolute", top: '-52px', left: '81px', zIndex: 10000 }}>
+                      <OrderItemStatus deleteSign={this.state.deleteSign} />
                     </div>
                     <FormItem
                       className="half-item"
@@ -1120,9 +1163,9 @@ const IntentionCustomer = Form.create()(
                     >
                       <span>{this.state.userName}</span>
                       <EnterpriseNameChange
-                          type='journal'
-                          style={{ marginLeft: 10 }}
-                          enterpriseId={this.state.orderUid}/>
+                        type='journal'
+                        style={{ marginLeft: 10 }}
+                        enterpriseId={this.state.orderUid} />
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -1229,8 +1272,8 @@ const IntentionCustomer = Form.create()(
                         {/*    });*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          {this.state.visible && this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                        <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          {this.state.visible && this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
                         </div>
                         <Modal
                           maskClosable={false}
@@ -1312,8 +1355,8 @@ const IntentionCustomer = Form.create()(
                         {/*    });*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          {this.state.visible && this.state.replenishUrl ? <ImgList domId={'chargeback1'} fileList={this.state.replenishUrl}/> : <div/>}
+                        <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          {this.state.visible && this.state.replenishUrl ? <ImgList domId={'chargeback1'} fileList={this.state.replenishUrl} /> : <div />}
                         </div>
                         <Modal
                           maskClosable={false}
@@ -1436,7 +1479,7 @@ const IntentionCustomer = Form.create()(
                       </FormItem>
                     </div>
                     {/* 协单人员 */}
-                            <OrderDetail orderNo={this.state.orderNos}/>
+                    <OrderDetail orderNo={this.state.orderNos} />
                     <div>
                       <span style={{ marginLeft: "50px", fontSize: "20px" }}>
                         项目业务
@@ -1498,7 +1541,7 @@ const IntentionCustomer = Form.create()(
                   </div>
                 </Spin>
               </Form>
-            </Modal> : <div/>}
+            </Modal> : <div />}
             {this.state.addnextVisible ? <Modal
               maskClosable={false}
               visible={this.state.addnextVisible}
@@ -1593,8 +1636,8 @@ const IntentionCustomer = Form.create()(
                           {/*    });*/}
                           {/*  }}*/}
                           {/*/>*/}
-                          <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                            {this.state.visible && this.state.orgCodeUrl ? <ImgList domId={'chargeback2'} fileList={this.state.orgCodeUrl}/> : <div/>}
+                          <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                            {this.state.visible && this.state.orgCodeUrl ? <ImgList domId={'chargeback2'} fileList={this.state.orgCodeUrl} /> : <div />}
                           </div>
                           <Modal
                             maskClosable={false}
@@ -1630,8 +1673,8 @@ const IntentionCustomer = Form.create()(
                         {/*    });*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          {this.state.visible && this.state.orgCodeUrl ? <ImgList domId={'chargeback3'} fileList={this.state.orgCodeUrl}/> : <div/>}
+                        <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          {this.state.visible && this.state.orgCodeUrl ? <ImgList domId={'chargeback3'} fileList={this.state.orgCodeUrl} /> : <div />}
                         </div>
                       </FormItem>
                     </div>
@@ -1682,7 +1725,7 @@ const IntentionCustomer = Form.create()(
                   </div>
                 </Spin>
               </Form>
-            </Modal> : <div/>}
+            </Modal> : <div />}
             <OrderRiZi
               dataSourcerizhi={this.state.dataSourcerizhi}
               closeOrderLog={this.closeOrderLog}

+ 304 - 261
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -30,8 +30,8 @@ import {
 import './customer.less'
 import ResolutionDetail from '@/resolutionDetail'
 import ImgList from "../../../common/imgList";
-import {ChooseList} from "./chooseList";
-import {getProjectName} from "../../../tools";
+import { ChooseList } from "./chooseList";
+import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
@@ -98,7 +98,7 @@ const checkOutsourcing = Form.create()(
     getInitialState() {
       return {
         rotateDeg: 0,
-        orderNos:'',
+        orderNos: '',
         page: 1,
         releaseDate: [],
         declarationBatch: 1,
@@ -147,16 +147,16 @@ const checkOutsourcing = Form.create()(
             title: '客户名称',
             dataIndex: 'userName',
             key: 'userName',
-            render:text=>{
+            render: text => {
               return (
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               )
             }
           },
@@ -276,11 +276,54 @@ const checkOutsourcing = Form.create()(
             },
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: '项目说明',
             dataIndex: 'taskComment',
             key: 'taskComment',
             render: (text) => {
-              return text && text.length > 8 ? text.substr(0, 8) + '…' : text
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             },
           },
         ],
@@ -425,7 +468,7 @@ const checkOutsourcing = Form.create()(
       this.setState({
         visible: true,
         refundStatus: record.refundStatus,
-        orderNos:record.orderNo
+        orderNos: record.orderNo
       })
       this.xiangqing(record.orderNo)
       this.xiangmu(record.orderNo)
@@ -457,7 +500,7 @@ const checkOutsourcing = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
-        dataInfor:record,
+        dataInfor: record,
         addState: 0,
       })
     },
@@ -503,24 +546,24 @@ const checkOutsourcing = Form.create()(
               orderRemarks: thisdata.orderRemarks, //订单留言
               orgCodeUrl: thisdata.contractPictureUrl
                 ? splitUrl(
-                    thisdata.contractPictureUrl,
-                    ',',
-                    globalConfig.avatarHost + '/upload'
-                  )
+                  thisdata.contractPictureUrl,
+                  ',',
+                  globalConfig.avatarHost + '/upload'
+                )
                 : [], //图片地址
               replenishUrl: thisdata.agreementUrl
                 ? splitUrl(
-                    thisdata.agreementUrl,
-                    ',',
-                    globalConfig.avatarHost + '/upload'
-                  )
+                  thisdata.agreementUrl,
+                  ',',
+                  globalConfig.avatarHost + '/upload'
+                )
                 : [],
-                contentUrl:thisdata.serviceContent
+              contentUrl: thisdata.serviceContent
                 ? splitUrl(
-                    thisdata.serviceContent,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.serviceContent,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
               salesmanName: thisdata.salesmanName, //营销员名称
               salesmanMobile: thisdata.salesmanMobile, //营销员电话
@@ -532,7 +575,7 @@ const checkOutsourcing = Form.create()(
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               depName: thisdata.depName,
               outsource: thisdata.outsource == 0 ? '否' : '是',
-              deleteSign:thisdata.deleteSign,
+              deleteSign: thisdata.deleteSign,
             })
           }
         }.bind(this),
@@ -913,17 +956,17 @@ const checkOutsourcing = Form.create()(
               remarks: thisdata.remarks,
               attachmentUrl: thisdata.attachmentUrl
                 ? splitUrl(
-                    thisdata.attachmentUrl,
-                    ',',
-                    globalConfig.avatarHost + '/upload'
-                  )
+                  thisdata.attachmentUrl,
+                  ',',
+                  globalConfig.avatarHost + '/upload'
+                )
                 : [],
               pictureUrl: thisdata.pictureUrl
                 ? splitUrl(
-                    thisdata.pictureUrl,
-                    ',',
-                    globalConfig.avatarHost + '/upload'
-                  )
+                  thisdata.pictureUrl,
+                  ',',
+                  globalConfig.avatarHost + '/upload'
+                )
                 : [], //图片地址
               amount: thisdata.amount,
               companyName: thisdata.companyName,
@@ -982,7 +1025,7 @@ const checkOutsourcing = Form.create()(
 
     refuse() {
       this.setState({
-        operationLoading:true
+        operationLoading: true
       })
       $.ajax({
         method: 'post',
@@ -1245,11 +1288,11 @@ const checkOutsourcing = Form.create()(
             <TabPane tab="更改表格显示数据" key="ChooseList">
               <div style={{ marginLeft: 10 }}>
                 <ChooseList
-                    columns={this.state.columns}
-                    changeFn={this.changeList}
-                    changeList={this.state.changeList}
-                    top={55}
-                    margin={11}
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
                 />
               </div>
             </TabPane>
@@ -1259,8 +1302,8 @@ const checkOutsourcing = Form.create()(
               <Table
                 columns={
                   this.state.changeList
-                      ? this.state.changeList
-                      : this.state.columns
+                    ? this.state.changeList
+                    : this.state.columns
                 }
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
@@ -1280,13 +1323,13 @@ const checkOutsourcing = Form.create()(
             onCancel={this.visitCancel}
           >
             <Tabs
-                activeKey={this.state.activeKey}
-                onChange={this.callback}
-                tabBarExtraContent={
-                  <div style={{fontWeight:'bold',paddingRight:'15px'}}>
-                    <OrderItemStatus deleteSign={this.state.deleteSign}/>
-                  </div>
-            }>
+              activeKey={this.state.activeKey}
+              onChange={this.callback}
+              tabBarExtraContent={
+                <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
+                  <OrderItemStatus deleteSign={this.state.deleteSign} />
+                </div>
+              }>
               <TabPane tab="订单详情" key="1">
                 {this.state.activeKey === '1' ? <Form
                   layout="horizontal"
@@ -1317,9 +1360,9 @@ const checkOutsourcing = Form.create()(
                       >
                         <span>{this.state.userName}</span>
                         <EnterpriseNameChange
-                            type='journal'
-                            style={{ marginLeft: 10 }}
-                            enterpriseId={this.state.orderUid}/>
+                          type='journal'
+                          style={{ marginLeft: 10 }}
+                          enterpriseId={this.state.orderUid} />
                       </FormItem>
                       <FormItem
                         className="half-item"
@@ -1442,8 +1485,8 @@ const checkOutsourcing = Form.create()(
                           {/*    })*/}
                           {/*  }}*/}
                           {/*/>*/}
-                          <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                            {this.state.orgCodeUrl && this.state.visible ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>: <div/>}
+                          <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                            {this.state.orgCodeUrl && this.state.visible ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
                           </div>
                           <Modal
                             maskClosable={false}
@@ -1525,8 +1568,8 @@ const checkOutsourcing = Form.create()(
                           {/*    })*/}
                           {/*  }}*/}
                           {/*/>*/}
-                          <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                            {this.state.replenishUrl && this.state.visible ? <ImgList domId={'checkOutsourcing1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/>: <div/>}
+                          <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                            {this.state.replenishUrl && this.state.visible ? <ImgList domId={'checkOutsourcing1'} fileList={this.state.replenishUrl} ItemWidth={'96px'} /> : <div />}
                           </div>
                           <Modal
                             maskClosable={false}
@@ -1584,10 +1627,10 @@ const checkOutsourcing = Form.create()(
                         </FormItem>
                       </div>
                       <ContentUrl
-                      processStatus={1}
-                      domId = {"checkContents"}
-                      contentUrl = {this.state.contentUrl}
-                      imgId = {"checkContentsImg"}
+                        processStatus={1}
+                        domId={"checkContents"}
+                        contentUrl={this.state.contentUrl}
+                        imgId={"checkContentsImg"}
                       />
                       <div className="clearfix">
                         <FormItem
@@ -1658,7 +1701,7 @@ const checkOutsourcing = Form.create()(
                         </FormItem>
                       </div>
                       {/* 协单人员 */}
-                              <OrderCoor orderNo={this.state.orderNos}/>
+                      <OrderCoor orderNo={this.state.orderNos} />
                       <div>
                         <span style={{ marginLeft: '50px', fontSize: '20px' }}>
                           项目业务
@@ -1735,56 +1778,56 @@ const checkOutsourcing = Form.create()(
                       </div>
                     </div>
                   </Spin>
-                </Form> : <div/>}
+                </Form> : <div />}
               </TabPane>
               <TabPane tab="外包(不走总部)" key="2">
                 {this.state.activeKey === '2' ? <div>
-                    <div className="clearfix">
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="外包公司"
-                  >
-                    <span>{this.state.companyName}</span>
-                  </FormItem>
-                </div>
-                <div className="clearfix">
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="单价(万元)"
-                  >
-                    <span>{this.state.unitPrice}</span>
-                  </FormItem>
-                </div>
-                <div className="clearfix">
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="数量(个)"
-                  >
-                    <span>{this.state.unitNumber}</span>
-                  </FormItem>
-                </div>
-                <div className="clearfix">
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="总金额(万元)"
-                  >
-                    <span>{this.state.amount}</span>
-                  </FormItem>
-                </div>
-                <div className="clearfix">
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="备注"
-                  >
-                    <span>{this.state.outsourceRemarks}</span>
-                  </FormItem>
-                </div>
-                {/*<div className="clearfix">
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="外包公司"
+                    >
+                      <span>{this.state.companyName}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="单价(万元)"
+                    >
+                      <span>{this.state.unitPrice}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="数量(个)"
+                    >
+                      <span>{this.state.unitNumber}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="总金额(万元)"
+                    >
+                      <span>{this.state.amount}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="备注"
+                    >
+                      <span>{this.state.outsourceRemarks}</span>
+                    </FormItem>
+                  </div>
+                  {/*<div className="clearfix">
 									<FormItem className="half-item" style={{height:'auto'}}
 									    {...formItemLayout}
 									    label="上传协议文件" >
@@ -1804,168 +1847,168 @@ const checkOutsourcing = Form.create()(
 										</Upload>
 									</FormItem>
 								</div>*/}
-                <div className="clearfix">
-                  <FormItem
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 18 }}
-                    label="合同/协议扫描件"
-                  >
-                    {/*<Upload*/}
-                    {/*  className="demandDetailShow-upload"*/}
-                    {/*  listType="picture-card"*/}
-                    {/*  fileList={this.state.pictureUrl}*/}
-                    {/*  onPreview={(file) => {*/}
-                    {/*    this.setState({*/}
-                    {/*      previewImage: file.url || file.thumbUrl,*/}
-                    {/*      previewVisible: true,*/}
-                    {/*    })*/}
-                    {/*  }}*/}
-                    {/*/>*/}
-                    <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                      {this.state.pictureUrl && this.state.visible ? <ImgList domId={'checkOutsourcing2'} fileList={this.state.pictureUrl} ItemWidth={'96px'}/>: <div/>}
-                    </div>
-                    <Modal
-                      maskClosable={false}
-                      footer={null}
-                      width={'50%'}
-                      visible={this.state.previewVisible}
-                      onCancel={() => {
-                        this.setState({ previewVisible: false, rotateDeg: 0 })
-                      }}
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 18 }}
+                      label="合同/协议扫描件"
                     >
-                      <img
-                        alt=""
-                        style={{
-                          width: '100%',
-                          transform: `rotate(${this.state.rotateDeg}deg)`,
-                        }}
-                        src={this.state.previewImage || ''}
-                      />
-                      <Button
-                        onClick={this.rotate}
-                        style={{
-                          position: 'relative',
-                          left: '50%',
-                          transform: 'translateX(-50%)',
-                        }}
-                      >
-                        旋转
-                      </Button>
-                      <Button
-                        onClick={this.upImg}
-                        style={{
-                          position: 'absolute',
-                          left: -81,
-                          top: '50%',
-                          transform: 'translateY(-50%)',
-                        }}
-                      >
-                        上一张
-                      </Button>
-                      <Button
-                        onClick={this.downImg}
-                        style={{
-                          position: 'absolute',
-                          right: -81,
-                          top: '50%',
-                          transform: 'translateY(-50%)',
+                      {/*<Upload*/}
+                      {/*  className="demandDetailShow-upload"*/}
+                      {/*  listType="picture-card"*/}
+                      {/*  fileList={this.state.pictureUrl}*/}
+                      {/*  onPreview={(file) => {*/}
+                      {/*    this.setState({*/}
+                      {/*      previewImage: file.url || file.thumbUrl,*/}
+                      {/*      previewVisible: true,*/}
+                      {/*    })*/}
+                      {/*  }}*/}
+                      {/*/>*/}
+                      <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                        {this.state.pictureUrl && this.state.visible ? <ImgList domId={'checkOutsourcing2'} fileList={this.state.pictureUrl} ItemWidth={'96px'} /> : <div />}
+                      </div>
+                      <Modal
+                        maskClosable={false}
+                        footer={null}
+                        width={'50%'}
+                        visible={this.state.previewVisible}
+                        onCancel={() => {
+                          this.setState({ previewVisible: false, rotateDeg: 0 })
                         }}
                       >
-                        下一张
-                      </Button>
-                    </Modal>
-                  </FormItem>
-                </div>
-                {!this.state.refundStatus ? (
-                  <div>
-                    <hr className="division" />
-                    <div className="clearfix" style={{ marginTop: '20px' }}>
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label={
-                          <span>
-                            <strong style={{ color: '#f00' }}>*</strong>
-                            审核意见
-                          </span>
-                        }
-                      >
-                        <Input
-                          type="textarea"
-                          placeholder="请输入备注"
-                          rows={4}
-                          value={this.state.remarks}
-                          onChange={(e) => {
-                            this.setState({ remarks: e.target.value })
+                        <img
+                          alt=""
+                          style={{
+                            width: '100%',
+                            transform: `rotate(${this.state.rotateDeg}deg)`,
                           }}
-                          style={{ width: '440px' }}
+                          src={this.state.previewImage || ''}
                         />
-                        <span
-                          className="tip"
+                        <Button
+                          onClick={this.rotate}
                           style={{
-                            width: '160px',
-                            verticalAlign: 'top',
-                            display: 'inline-block',
-                            marginLeft: '10px',
+                            position: 'relative',
+                            left: '50%',
+                            transform: 'translateX(-50%)',
                           }}
                         >
-                          通过或驳回都必须填写审核意见!
-                        </span>
-                      </FormItem>
-                    </div>
-                    <div className="clearfix fa">
-                      <Button
-                        type="danger"
-                        onClick={this.refuse}
-                        loading={this.state.operationLoading}
-                        style={{ color: '#fff', backgroundColor: '#f04134' }}
-                      >
-                        驳回
-                      </Button>
-                      <Button
+                          旋转
+                        </Button>
+                        <Button
+                          onClick={this.upImg}
+                          style={{
+                            position: 'absolute',
+                            left: -81,
+                            top: '50%',
+                            transform: 'translateY(-50%)',
+                          }}
+                        >
+                          上一张
+                        </Button>
+                        <Button
+                          onClick={this.downImg}
+                          style={{
+                            position: 'absolute',
+                            right: -81,
+                            top: '50%',
+                            transform: 'translateY(-50%)',
+                          }}
+                        >
+                          下一张
+                        </Button>
+                      </Modal>
+                    </FormItem>
+                  </div>
+                  {!this.state.refundStatus ? (
+                    <div>
+                      <hr className="division" />
+                      <div className="clearfix" style={{ marginTop: '20px' }}>
+                        <FormItem
+                          labelCol={{ span: 4 }}
+                          wrapperCol={{ span: 18 }}
+                          label={
+                            <span>
+                              <strong style={{ color: '#f00' }}>*</strong>
+                              审核意见
+                            </span>
+                          }
+                        >
+                          <Input
+                            type="textarea"
+                            placeholder="请输入备注"
+                            rows={4}
+                            value={this.state.remarks}
+                            onChange={(e) => {
+                              this.setState({ remarks: e.target.value })
+                            }}
+                            style={{ width: '440px' }}
+                          />
+                          <span
+                            className="tip"
+                            style={{
+                              width: '160px',
+                              verticalAlign: 'top',
+                              display: 'inline-block',
+                              marginLeft: '10px',
+                            }}
+                          >
+                            通过或驳回都必须填写审核意见!
+                          </span>
+                        </FormItem>
+                      </div>
+                      <div className="clearfix fa">
+                        <Button
+                          type="danger"
+                          onClick={this.refuse}
+                          loading={this.state.operationLoading}
+                          style={{ color: '#fff', backgroundColor: '#f04134' }}
+                        >
+                          驳回
+                        </Button>
+                        <Button
                           loading={this.state.adoptLoading}
                           type="primary"
                           onClick={this.pass}>
-                        通过
-                      </Button>
-                    </div>
-                  </div>
-                ) : (
-                  <div className="clearfix">
-                    <hr className="division" />
-                    <div className="clearfix">
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="审核意见"
-                      >
-                        <span>{this.state.remarks}</span>
-                      </FormItem>
-                    </div>
-                    <div className="clearfix">
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="审核结果"
-                      >
-                        <span>{getRefundStatus(this.state.refundStatus)}</span>
-                      </FormItem>
+                          通过
+                        </Button>
+                      </div>
                     </div>
+                  ) : (
                     <div className="clearfix">
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="审核时间"
-                      >
-                        <span>{this.state.auditTimes}</span>
-                      </FormItem>
+                      <hr className="division" />
+                      <div className="clearfix">
+                        <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label="审核意见"
+                        >
+                          <span>{this.state.remarks}</span>
+                        </FormItem>
+                      </div>
+                      <div className="clearfix">
+                        <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label="审核结果"
+                        >
+                          <span>{getRefundStatus(this.state.refundStatus)}</span>
+                        </FormItem>
+                      </div>
+                      <div className="clearfix">
+                        <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label="审核时间"
+                        >
+                          <span>{this.state.auditTimes}</span>
+                        </FormItem>
+                      </div>
                     </div>
-                  </div>
-                )}
-                </div> : <div/>}
+                  )}
+                </div> : <div />}
               </TabPane>
             </Tabs>
-          </Modal> : <div/>}
+          </Modal> : <div />}
           <Modal
             maskClosable={false}
             visible={this.state.noVisible}
@@ -2039,11 +2082,11 @@ const checkOutsourcing = Form.create()(
                 />
               </Spin>
             </div>
-          </Modal> : <div/>}
+          </Modal> : <div />}
           {this.state.addnextVisible && <ProjectDetailsReadOnly
-              infor={this.state.dataInfor}
-              visible={this.state.addnextVisible}
-              onCancel={this.nextCancel}
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
           />}
         </div>
       )

+ 44 - 1
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -295,11 +295,54 @@ const contractChange = Form.create()(
             }
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: text => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             }
           }
         ],

+ 44 - 1
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -292,11 +292,54 @@ const contractChange = Form.create()(
             }
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: text => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             }
           }
         ],

+ 44 - 1
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -295,11 +295,54 @@ const contractChange = Form.create()(
             }
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: text => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             }
           }
         ],

+ 44 - 1
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -292,11 +292,54 @@ const contractChange = Form.create()(
             }
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: text => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             }
           }
         ],

+ 44 - 1
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -289,11 +289,54 @@ const contractChange = Form.create()(
             }
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: text => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             }
           }
         ],

+ 44 - 1
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -291,11 +291,54 @@ const contractChange = Form.create()(
             }
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: text => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             }
           }
         ],

+ 44 - 1
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -287,11 +287,54 @@ const contractChange = Form.create()(
             }
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: text => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             }
           }
         ],

+ 44 - 1
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -295,11 +295,54 @@ const contractChange = Form.create()(
             }
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: text => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             }
           }
         ],

+ 44 - 1
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -152,11 +152,54 @@ class projectOverview extends Component {
                     },
                 },
                 {
+                    title: "总年限",
+                    dataIndex: "yearSum",
+                    key: "yearSum",
+                    render: (text, record) => {
+                        return (
+                            <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+                        );
+                    }
+                },
+                {
+                    title: "年限",
+                    dataIndex: "serviceLife",
+                    key: "serviceLife",
+                    render: (text, record) => {
+                        return (
+                            !!text && JSON.parse(text).map(item =>
+                                <div>{item}</div>
+                            )
+                        );
+                    }
+                },
+                {
+                    title: "本次派单",
+                    dataIndex: "serviceYear",
+                    key: "serviceYear",
+                    render: (text, record) => {
+                        return (
+                            <div>{!text ? "" : text}</div>
+                        );
+                    }
+                },
+                {
                     title: '项目说明',
                     dataIndex: 'taskComment',
                     key: 'taskComment',
                     render: (text) => {
-                        return text && text.length > 8 ? text.substr(0, 8) + '…' : text
+                        return (
+                            <Tooltip title={text}>
+                              <div
+                                style={{
+                                  width: 100,
+                                  overflow: "hidden",
+                                  whiteSpace: "nowrap",
+                                  textOverflow: "ellipsis",
+                                }}
+                              >{text}</div>
+                            </Tooltip>
+                          )
                     },
                 },
             ],

+ 33 - 2
js/component/manageCenter/order/orderNew/examine.jsx

@@ -460,16 +460,47 @@ const IntentionCustomer = Form.create()(
             },
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            width: 200,
             render: (text) => {
               return (
                 <Tooltip title={text}>
                   <div
                     style={{
-                      width: 180,
+                      width: 100,
                       overflow: "hidden",
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",

+ 44 - 1
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js

@@ -155,11 +155,54 @@ class projectOverview extends Component {
                     },
                 },
                 {
+                    title: "总年限",
+                    dataIndex: "yearSum",
+                    key: "yearSum",
+                    render: (text, record) => {
+                        return (
+                            <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+                        );
+                    }
+                },
+                {
+                    title: "年限",
+                    dataIndex: "serviceLife",
+                    key: "serviceLife",
+                    render: (text, record) => {
+                        return (
+                            !!text && JSON.parse(text).map(item =>
+                                <div>{item}</div>
+                            )
+                        );
+                    }
+                },
+                {
+                    title: "本次派单",
+                    dataIndex: "serviceYear",
+                    key: "serviceYear",
+                    render: (text, record) => {
+                        return (
+                            <div>{!text ? "" : text}</div>
+                        );
+                    }
+                },
+                {
                     title: '项目说明',
                     dataIndex: 'taskComment',
                     key: 'taskComment',
                     render: (text) => {
-                        return text && text.length > 8 ? text.substr(0, 8) + '…' : text
+                        return (
+                            <Tooltip title={text}>
+                                <div
+                                    style={{
+                                        width: 100,
+                                        overflow: "hidden",
+                                        whiteSpace: "nowrap",
+                                        textOverflow: "ellipsis",
+                                    }}
+                                >{text}</div>
+                            </Tooltip>
+                        )
                     },
                 },
             ],

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

@@ -333,11 +333,54 @@ const IntentionCustomer = Form.create()(
             },
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: (text) => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             },
           },
         ],

+ 158 - 115
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -36,8 +36,8 @@ import ResolutionDetail from "@/resolutionDetail";
 const confirm = Modal.confirm;
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
-import {ChooseList} from "./chooseList";
-import {getProjectName} from "../../../tools";
+import { ChooseList } from "./chooseList";
+import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
@@ -189,7 +189,7 @@ const outsourcingList = Form.create()(
       return {
         rotateDeg: 0,
         page: 1,
-        orderNos:"",
+        orderNos: "",
         releaseDate: [],
         selectedRowKeys: [],
         pictureUrl: [],
@@ -530,16 +530,16 @@ const outsourcingList = Form.create()(
             title: "客户名称",
             dataIndex: "userName",
             key: "userName",
-            render:text=>{
+            render: text => {
               return (
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               )
             }
           },
@@ -653,11 +653,54 @@ const outsourcingList = Form.create()(
             },
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: (text) => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             },
           },
         ],
@@ -713,7 +756,7 @@ const outsourcingList = Form.create()(
       this.setState({
         visible: true,
         refundStatus: record.refundStatus,
-        orderNos:record.orderNo
+        orderNos: record.orderNo
       });
       this.xiangqing(record.orderNo);
       this.xiangmu(record.orderNo);
@@ -731,7 +774,7 @@ const outsourcingList = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
-        dataInfor:record,
+        dataInfor: record,
         addState: 0,
       });
     },
@@ -777,24 +820,24 @@ const outsourcingList = Form.create()(
               orderRemarks: thisdata.orderRemarks, //订单留言
               orgCodeUrl: thisdata.contractPictureUrl
                 ? splitUrl(
-                    thisdata.contractPictureUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
               replenishUrl: thisdata.agreementUrl
                 ? splitUrl(
-                    thisdata.agreementUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.agreementUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
-                contentUrl:thisdata.serviceContent
+              contentUrl: thisdata.serviceContent
                 ? splitUrl(
-                    thisdata.serviceContent,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.serviceContent,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
               salesmanName: thisdata.salesmanName, //营销员名称
               salesmanMobile: thisdata.salesmanMobile, //营销员电话
@@ -806,7 +849,7 @@ const outsourcingList = Form.create()(
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               depName: thisdata.depName,
               outsource: thisdata.outsource == 0 ? "否" : "是",
-              deleteSign:thisdata.deleteSign,
+              deleteSign: thisdata.deleteSign,
             });
           }
         }.bind(this),
@@ -1202,27 +1245,27 @@ const outsourcingList = Form.create()(
               remarks: thisdata.remarks,
               attachmentUrl: thisdata.attachmentUrl
                 ? splitUrl(
-                    thisdata.attachmentUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload",
-                    url
-                  )
+                  thisdata.attachmentUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload",
+                  url
+                )
                 : [],
               fileUrl: thisdata.attachmentUrl
                 ? splitUrl(
-                    thisdata.attachmentUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload",
-                    url
-                  )
+                  thisdata.attachmentUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload",
+                  url
+                )
                 : [],
               pictureUrl: thisdata.pictureUrl
                 ? splitUrl(
-                    thisdata.pictureUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload",
-                    url
-                  )
+                  thisdata.pictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload",
+                  url
+                )
                 : [], //图片地址
               amount: thisdata.amount,
               companyName: thisdata.companyName,
@@ -1462,7 +1505,7 @@ const outsourcingList = Form.create()(
         onOk() {
           fn();
         },
-        onCancel() {},
+        onCancel() { },
       });
     },
     changeList(arr) {
@@ -1573,11 +1616,11 @@ const outsourcingList = Form.create()(
               <TabPane tab="更改表格显示数据" key="ChooseList">
                 <div style={{ marginLeft: 10 }}>
                   <ChooseList
-                      columns={this.state.columns}
-                      changeFn={this.changeList}
-                      changeList={this.state.changeList}
-                      top={55}
-                      margin={11}
+                    columns={this.state.columns}
+                    changeFn={this.changeList}
+                    changeList={this.state.changeList}
+                    top={55}
+                    margin={11}
                   />
                 </div>
               </TabPane>
@@ -1585,11 +1628,11 @@ const outsourcingList = Form.create()(
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
-                    columns={
-                      this.state.changeList
-                          ? this.state.changeList
-                          : this.state.columns
-                    }
+                  columns={
+                    this.state.changeList
+                      ? this.state.changeList
+                      : this.state.columns
+                  }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}
@@ -1607,8 +1650,8 @@ const outsourcingList = Form.create()(
               onCancel={this.visitCancel}
             >
               <Tabs activeKey={this.state.activeKey} onChange={this.callback} tabBarExtraContent={
-                <div style={{fontWeight:'bold',paddingRight:'15px'}}>
-                  <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
+                  <OrderItemStatus deleteSign={this.state.deleteSign} />
                 </div>
               }>
                 <TabPane tab="订单详情" key="1">
@@ -1642,9 +1685,9 @@ const outsourcingList = Form.create()(
                           <span>
                             {this.state.userName}
                             <EnterpriseNameChange
-                                type='journal'
-                                style={{ marginLeft: 10 }}
-                                enterpriseId={this.state.orderUid}/>
+                              type='journal'
+                              style={{ marginLeft: 10 }}
+                              enterpriseId={this.state.orderUid} />
                           </span>
                         </FormItem>
                         <FormItem
@@ -1770,8 +1813,8 @@ const outsourcingList = Form.create()(
                             {/*    });*/}
                             {/*  }}*/}
                             {/*/>*/}
-                            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                              {this.state.visible && this.state.activeKey === "1" ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                            <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                              {this.state.visible && this.state.activeKey === "1" ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
                             </div>
                             <Modal
                               maskClosable={false}
@@ -1853,8 +1896,8 @@ const outsourcingList = Form.create()(
                             {/*    });*/}
                             {/*  }}*/}
                             {/*/>*/}
-                            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                              {this.state.visible && this.state.activeKey === "1" && this.state.replenishUrl ? <ImgList domId={'outsourcingList1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> : <div/>}
+                            <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                              {this.state.visible && this.state.activeKey === "1" && this.state.replenishUrl ? <ImgList domId={'outsourcingList1'} fileList={this.state.replenishUrl} ItemWidth={'96px'} /> : <div />}
                             </div>
                             <Modal
                               maskClosable={false}
@@ -1912,10 +1955,10 @@ const outsourcingList = Form.create()(
                           </FormItem>
                         </div>
                         <ContentUrl
-                        processStatus={1}
-                        domId = {"outsourcingList"}
-                        contentUrl = {this.state.contentUrl}
-                        imgId = {"outsourcingList"}
+                          processStatus={1}
+                          domId={"outsourcingList"}
+                          contentUrl={this.state.contentUrl}
+                          imgId={"outsourcingList"}
                         />
                         <div className="clearfix">
                           <FormItem
@@ -1986,7 +2029,7 @@ const outsourcingList = Form.create()(
                           </FormItem>
                         </div>
                         {/* 实际操作人 */}
-                        <OrderCoor orderNo={this.state.orderNos}/>
+                        <OrderCoor orderNo={this.state.orderNos} />
                         <div>
                           <span
                             style={{ marginLeft: "50px", fontSize: "20px" }}
@@ -2176,7 +2219,7 @@ const outsourcingList = Form.create()(
                         )}
                       </div>
                     </Spin>
-                  </Form> : <div/>}
+                  </Form> : <div />}
                 </TabPane>
                 <TabPane tab="外包(不走总部)" key="2">
                   {this.state.refundStatus === 2 ? (
@@ -2442,8 +2485,8 @@ const outsourcingList = Form.create()(
                           {/*    });*/}
                           {/*  }}*/}
                           {/*/>*/}
-                          <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                            {this.state.visible && this.state.activeKey === "2" && this.state.pictureUrl ? <ImgList domId={'outsourcingList2'} fileList={this.state.pictureUrl} ItemWidth={'96px'}/> : <div/>}
+                          <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                            {this.state.visible && this.state.activeKey === "2" && this.state.pictureUrl ? <ImgList domId={'outsourcingList2'} fileList={this.state.pictureUrl} ItemWidth={'96px'} /> : <div />}
                           </div>
                           <Modal
                             maskClosable={false}
@@ -2455,45 +2498,45 @@ const outsourcingList = Form.create()(
                             }}
                           >
                             <img
-                                alt=""
-                                style={{
-                                  width: "100%",
-                                  transform: `rotate(${this.state.rotateDeg}deg)`,
-                                }}
-                                src={this.state.previewImage || ""}
-                              />
-                              <Button
-                                onClick={this.rotate}
-                                style={{
-                                  position: "relative",
-                                  left: "50%",
-                                  transform: "translateX(-50%)",
-                                }}
-                              >
-                                旋转
-                              </Button>
-                              <Button
-                                onClick={this.upImg}
-                                style={{
-                                  position: "absolute",
-                                  left: -81,
-                                  top: "50%",
-                                  transform: "translateY(-50%)",
-                                }}
-                              >
-                                上一张
-                              </Button>
-                              <Button
-                                onClick={this.downImg}
-                                style={{
-                                  position: "absolute",
-                                  right: -81,
-                                  top: "50%",
-                                  transform: "translateY(-50%)",
-                                }}
-                              >
-                                下一张
-                              </Button>
+                              alt=""
+                              style={{
+                                width: "100%",
+                                transform: `rotate(${this.state.rotateDeg}deg)`,
+                              }}
+                              src={this.state.previewImage || ""}
+                            />
+                            <Button
+                              onClick={this.rotate}
+                              style={{
+                                position: "relative",
+                                left: "50%",
+                                transform: "translateX(-50%)",
+                              }}
+                            >
+                              旋转
+                            </Button>
+                            <Button
+                              onClick={this.upImg}
+                              style={{
+                                position: "absolute",
+                                left: -81,
+                                top: "50%",
+                                transform: "translateY(-50%)",
+                              }}
+                            >
+                              上一张
+                            </Button>
+                            <Button
+                              onClick={this.downImg}
+                              style={{
+                                position: "absolute",
+                                right: -81,
+                                top: "50%",
+                                transform: "translateY(-50%)",
+                              }}
+                            >
+                              下一张
+                            </Button>
                           </Modal>
                         </FormItem>
                       </div>
@@ -2537,7 +2580,7 @@ const outsourcingList = Form.create()(
                   )}
                 </TabPane>
               </Tabs>
-            </Modal> : <div/>}
+            </Modal> : <div />}
             <Modal
               maskClosable={false}
               visible={this.state.noVisible}
@@ -2618,9 +2661,9 @@ const outsourcingList = Form.create()(
             />
           </div>
           {this.state.addnextVisible && <ProjectDetailsReadOnly
-              infor={this.state.dataInfor}
-              visible={this.state.addnextVisible}
-              onCancel={this.nextCancel}
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
           />}
         </div>
       );

File diff suppressed because it is too large
+ 442 - 399
js/component/manageCenter/order/orderNew/outsourcingPro.jsx


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

@@ -302,11 +302,54 @@ const IntentionCustomer = Form.create()(
             },
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: (text) => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             },
           },
           {

+ 71 - 28
js/component/manageCenter/personnel/personnel/personnelAll.jsx

@@ -26,7 +26,7 @@ import {
   ShowModal,
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
-import {getProjectName} from "../../../tools";
+import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 // import ResolutionPro from "../task/resolutionPro";
 const FormItem = Form.Item;
@@ -161,14 +161,14 @@ const PersonnelAll = React.createClass({
           width: 150,
           render: (text) => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           },
         },
@@ -269,9 +269,9 @@ const PersonnelAll = React.createClass({
           key: "commodityName",
           render: (text, record) => {
             return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
             )
-        }
+          }
         },
         {
           title: "项目类别",
@@ -327,11 +327,54 @@ const PersonnelAll = React.createClass({
           },
         },
         {
+          title: "总年限",
+          dataIndex: "yearSum",
+          key: "yearSum",
+          render: (text, record) => {
+            return (
+              <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+            );
+          }
+        },
+        {
+          title: "年限",
+          dataIndex: "serviceLife",
+          key: "serviceLife",
+          render: (text, record) => {
+            return (
+              !!text && JSON.parse(text).map(item =>
+                <div>{item}</div>
+              )
+            );
+          }
+        },
+        {
+          title: "本次派单",
+          dataIndex: "serviceYear",
+          key: "serviceYear",
+          render: (text, record) => {
+            return (
+              <div>{!text ? "" : text}</div>
+            );
+          }
+        },
+        {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
           render: (text) => {
-            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+            return (
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 100,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
+              </Tooltip>
+            )
           },
         },
       ],
@@ -413,10 +456,10 @@ const PersonnelAll = React.createClass({
             orderRemarks: thisdata.orderRemarks, //订单留言
             orgCodeUrl: thisdata.contractPictureUrl
               ? splitUrl(
-                  thisdata.contractPictureUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.contractPictureUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [], //图片地址
             salesmanName: thisdata.salesmanName, //营销员名称
             salesmanMobile: thisdata.salesmanMobile, //营销员电话
@@ -516,7 +559,7 @@ const PersonnelAll = React.createClass({
       taskComment: record.taskComment, //备注
       main: record.main.toString(), //是否为主要
       addnextVisible: true,
-      dataInfor:record,
+      dataInfor: record,
       addState: 0,
     });
   },
@@ -672,14 +715,14 @@ const PersonnelAll = React.createClass({
             width: 150,
             render: (text) => {
               return (
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               )
             },
           },
@@ -1157,9 +1200,9 @@ const PersonnelAll = React.createClass({
           </Form>
         </Modal>
         {this.state.addnextVisible && <ProjectDetailsReadOnly
-            infor={this.state.dataInfor}
-            visible={this.state.addnextVisible}
-            onCancel={this.nextCancel}
+          infor={this.state.dataInfor}
+          visible={this.state.addnextVisible}
+          onCancel={this.nextCancel}
         />}
       </div>
     );

+ 44 - 1
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -328,11 +328,54 @@ const OutsourceTaskAssignment = React.createClass({
           },
         },
         {
+          title: "总年限",
+          dataIndex: "yearSum",
+          key: "yearSum",
+          render: (text, record) => {
+            return (
+              <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+            );
+          }
+        },
+        {
+          title: "年限",
+          dataIndex: "serviceLife",
+          key: "serviceLife",
+          render: (text, record) => {
+            return (
+              !!text && JSON.parse(text).map(item =>
+                <div>{item}</div>
+              )
+            );
+          }
+        },
+        {
+          title: "本次派单",
+          dataIndex: "serviceYear",
+          key: "serviceYear",
+          render: (text, record) => {
+            return (
+              <div>{!text ? "" : text}</div>
+            );
+          }
+        },
+        {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
           render: (text) => {
-            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+            return (
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 100,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
+              </Tooltip>
+            )
           },
         },
       ],

+ 33 - 2
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -336,16 +336,47 @@ const PaiDan = React.createClass({
           }
         },
         {
+          title: "总年限",
+          dataIndex: "yearSum",
+          key: "yearSum",
+          render: (text, record) => {
+            return (
+              <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+            );
+          }
+        },
+        {
+          title: "年限",
+          dataIndex: "serviceLife",
+          key: "serviceLife",
+          render: (text, record) => {
+            return (
+              !!text && JSON.parse(text).map(item =>
+                <div>{item}</div>
+              )
+            );
+          }
+        },
+        {
+          title: "本次派单",
+          dataIndex: "serviceYear",
+          key: "serviceYear",
+          render: (text, record) => {
+            return (
+              <div>{!text ? "" : text}</div>
+            );
+          }
+        },
+        {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
-          width: 200,
           render: (text) => {
             return (
               <Tooltip title={text}>
                 <div
                   style={{
-                    width: 180,
+                    width: 100,
                     overflow: "hidden",
                     whiteSpace: "nowrap",
                     textOverflow: "ellipsis",

+ 44 - 1
js/component/manageCenter/project/project/projectQuery.jsx

@@ -276,11 +276,54 @@ const PaiDan = React.createClass({
           }
         },
         {
+          title: "总年限",
+          dataIndex: "yearSum",
+          key: "yearSum",
+          render: (text, record) => {
+            return (
+              <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+            );
+          }
+        },
+        {
+          title: "年限",
+          dataIndex: "serviceLife",
+          key: "serviceLife",
+          render: (text, record) => {
+            return (
+              !!text && JSON.parse(text).map(item =>
+                <div>{item}</div>
+              )
+            );
+          }
+        },
+        {
+          title: "本次派单",
+          dataIndex: "serviceYear",
+          key: "serviceYear",
+          render: (text, record) => {
+            return (
+              <div>{!text ? "" : text}</div>
+            );
+          }
+        },
+        {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
           render: text => {
-            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+            return (
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 100,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
+              </Tooltip>
+            )
           }
         }
       ],

+ 46 - 2
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -18,7 +18,8 @@ import {
   Modal,
   AutoComplete,
   Tabs,
-  Radio
+  Radio,
+  Tooltip,
 } from 'antd';
 import Assign from '@/manageCenter/publicComponent/assign';
 import ResolutionDetail from "@/resolutionDetail";
@@ -388,11 +389,54 @@ const zxsglyOutSourcingPaiDan = React.createClass({
           }
         },
         {
+          title: "总年限",
+          dataIndex: "yearSum",
+          key: "yearSum",
+          render: (text, record) => {
+            return (
+              <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+            );
+          }
+        },
+        {
+          title: "年限",
+          dataIndex: "serviceLife",
+          key: "serviceLife",
+          render: (text, record) => {
+            return (
+              !!text && JSON.parse(text).map(item =>
+                <div>{item}</div>
+              )
+            );
+          }
+        },
+        {
+          title: "本次派单",
+          dataIndex: "serviceYear",
+          key: "serviceYear",
+          render: (text, record) => {
+            return (
+              <div>{!text ? "" : text}</div>
+            );
+          }
+        },
+        {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
           render: text => {
-            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+            return (
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 100,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
+              </Tooltip>
+            )
           }
         },
         {

File diff suppressed because it is too large
+ 613 - 570
js/component/manageCenter/project/summary/projectDetails.jsx


+ 32 - 0
js/component/manageCenter/project/task/businessManagement/orderInfor.jsx

@@ -93,6 +93,38 @@ class OrderInfor extends Component {
                     },
                 },
                 {
+                    title: "总年限",
+                    dataIndex: "yearSum",
+                    key: "yearSum",
+                    render: (text, record) => {
+                        return (
+                            <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+                        );
+                    }
+                },
+                {
+                    title: "年限",
+                    dataIndex: "serviceLife",
+                    key: "serviceLife",
+                    render: (text, record) => {
+                        return (
+                            !!text && JSON.parse(text).map(item =>
+                                <div>{item}</div>
+                            )
+                        );
+                    }
+                },
+                {
+                    title: "本次派单",
+                    dataIndex: "serviceYear",
+                    key: "serviceYear",
+                    render: (text, record) => {
+                        return (
+                            <div>{!text ? "" : text}</div>
+                        );
+                    }
+                },
+                {
                     title: "项目说明",
                     dataIndex: "taskComment",
                     key: "taskComment",

+ 44 - 1
js/component/manageCenter/project/task/myTask.jsx

@@ -557,11 +557,54 @@ const Task = React.createClass({
                     },
                 },
                 {
+                    title: "总年限",
+                    dataIndex: "yearSum",
+                    key: "yearSum",
+                    render: (text, record) => {
+                        return (
+                            <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+                        );
+                    }
+                },
+                {
+                    title: "年限",
+                    dataIndex: "serviceLife",
+                    key: "serviceLife",
+                    render: (text, record) => {
+                        return (
+                            !!text && JSON.parse(text).map(item =>
+                                <div>{item}</div>
+                            )
+                        );
+                    }
+                },
+                {
+                    title: "本次派单",
+                    dataIndex: "serviceYear",
+                    key: "serviceYear",
+                    render: (text, record) => {
+                        return (
+                            <div>{!text ? "" : text}</div>
+                        );
+                    }
+                },
+                {
                     title: '项目说明',
                     dataIndex: 'taskComment',
                     key: 'taskComment',
                     render: (text) => {
-                        return text && text.length > 8 ? text.substr(0, 8) + '…' : text
+                        return (
+                            <Tooltip title={text}>
+                                <div
+                                    style={{
+                                        width: 100,
+                                        overflow: "hidden",
+                                        whiteSpace: "nowrap",
+                                        textOverflow: "ellipsis",
+                                    }}
+                                >{text}</div>
+                            </Tooltip>
+                        )
                     },
                 },
             ],

+ 44 - 1
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -435,11 +435,54 @@ const MyTaskCount = Form.create()(
             }
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: text => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             }
           }
         ],

File diff suppressed because it is too large
+ 2457 - 2414
js/component/manageCenter/project/task/myTaskOutsource.jsx


+ 126 - 83
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -1,4 +1,4 @@
-import React,{Component} from 'react';
+import React, { Component } from 'react';
 import {
     Button,
     Cascader,
@@ -72,11 +72,11 @@ const utils = {
     },
 }
 
-class projectOverview extends Component{
+class projectOverview extends Component {
     constructor(props) {
         super(props);
-        this.state={
-            timeRecordparse:{},
+        this.state = {
+            timeRecordparse: {},
             loading: false,
             projectStatus: props.projectStatus,
             pagination: {
@@ -117,7 +117,7 @@ class projectOverview extends Component{
                         if (record.splitStatus == 1) {
                             return (
                                 <span>
-                  {text}{' '}
+                                    {text}{' '}
                                     <Tag
                                         color="#108ee9"
                                         onClick={(e) => {
@@ -125,9 +125,9 @@ class projectOverview extends Component{
                                             this.showRes(record)
                                         }}
                                     >
-                    已拆
-                  </Tag>
-                </span>
+                                        已拆
+                                    </Tag>
+                                </span>
                             )
                         } else {
                             return text
@@ -158,11 +158,54 @@ class projectOverview extends Component{
                     },
                 },
                 {
+                    title: "总年限",
+                    dataIndex: "yearSum",
+                    key: "yearSum",
+                    render: (text, record) => {
+                        return (
+                            <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+                        );
+                    }
+                },
+                {
+                    title: "年限",
+                    dataIndex: "serviceLife",
+                    key: "serviceLife",
+                    render: (text, record) => {
+                        return (
+                            !!text && JSON.parse(text).map(item =>
+                                <div>{item}</div>
+                            )
+                        );
+                    }
+                },
+                {
+                    title: "本次派单",
+                    dataIndex: "serviceYear",
+                    key: "serviceYear",
+                    render: (text, record) => {
+                        return (
+                            <div>{!text ? "" : text}</div>
+                        );
+                    }
+                },
+                {
                     title: '项目说明',
                     dataIndex: 'taskComment',
                     key: 'taskComment',
                     render: (text) => {
-                        return text && text.length > 8 ? text.substr(0, 8) + '…' : text
+                        return (
+                            <Tooltip title={text}>
+                                <div
+                                    style={{
+                                        width: 100,
+                                        overflow: "hidden",
+                                        whiteSpace: "nowrap",
+                                        textOverflow: "ellipsis",
+                                    }}
+                                >{text}</div>
+                            </Tooltip>
+                        )
                     },
                 },
             ],
@@ -315,7 +358,7 @@ class projectOverview extends Component{
                         outsourceName: thisdata.outsourceName, //外包公司
                         outsourcePrice: thisdata.outsourcePrice, //外包价格
                         declarationBatch: thisdata.declarationBatch,
-                        bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+                        bpType: thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
                         specialComment: thisdata.specialComment,
                         urgentDay: thisdata.urgentDay, //有无材料
                         ifMaterial: thisdata.ifMaterial, //加急情况
@@ -323,10 +366,10 @@ class projectOverview extends Component{
                         setUpStatus: thisdata.setUpStatus,
                         setUpTime: thisdata.setUpTime,
                         highTechStatus: thisdata.highTechStatus,
-                        acceptCount:thisdata.acceptCount,       //受理数
-                        certificatesCount:thisdata.certificatesCount, //授权数
-                        rejectCount:thisdata.rejectCount,       //驳回数
-                        commodityQuantity:thisdata.commodityQuantity, //派单项目数
+                        acceptCount: thisdata.acceptCount,       //受理数
+                        certificatesCount: thisdata.certificatesCount, //授权数
+                        rejectCount: thisdata.rejectCount,       //驳回数
+                        commodityQuantity: thisdata.commodityQuantity, //派单项目数
                         timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},
                     })
                     this.loadData(thisdata.orderNo);
@@ -525,14 +568,14 @@ class projectOverview extends Component{
 
     tableRowClickX(record) {
         this.setState({
-            editFw:record,
+            editFw: record,
             projectOperationVisible: true,
         })
     }
 
     render() {
-        const {editFw} = this.state;
-        return(
+        const { editFw } = this.state;
+        return (
             <Form
                 layout="horizontal"
                 onSubmit={this.handleSubmit}
@@ -578,9 +621,9 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="结算状态"
                             >
-                      <span>
-                        {getLiquidationStatus(this.state.liquidationStatus)}
-                      </span>
+                                <span>
+                                    {getLiquidationStatus(this.state.liquidationStatus)}
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -610,9 +653,9 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="满意度表格"
                             >
-                              <span>
-                                {utils.getSatisfaction(this.state.formRetrieve)}
-                              </span>
+                                <span>
+                                    {utils.getSatisfaction(this.state.formRetrieve)}
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -647,8 +690,8 @@ class projectOverview extends Component{
                                 label="有无材料"
                             >
                                 {
-                                    this.state.ifMaterial === 1 ? '是':
-                                        this.state.ifMaterial === 0 ? '否': ''
+                                    this.state.ifMaterial === 1 ? '是' :
+                                        this.state.ifMaterial === 0 ? '否' : ''
                                 }
                             </FormItem>
                         </div> : null}
@@ -656,14 +699,14 @@ class projectOverview extends Component{
                             <div style={{
                                 paddingLeft: '8%',
                             }}>
-                                <div style={{color:'#000',fontWeight:500}}>
+                                <div style={{ color: '#000', fontWeight: 500 }}>
                                     特别说明
-                                    <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
+                                    <span style={{ color: '#58a3ff', }}>(针对项目的特殊情况说明)</span>
                                 </div>
                                 <div style={{
-                                    display:'flex',
+                                    display: 'flex',
                                 }}>
-                                    <span style={{paddingRight:'10px',whiteSpace:"nowrap"}}>备注:</span>
+                                    <span style={{ paddingRight: '10px', whiteSpace: "nowrap" }}>备注:</span>
                                     <span style={{
                                         flex: 1,
                                         wordBreak: 'break-all',
@@ -692,22 +735,22 @@ class projectOverview extends Component{
                                             {...formItemLayout}
                                             label="认证费"
                                         >
-                                <span>
-                                  {
-                                      this.state.ifCertificationFee === 1 ? '包含' : '不包含'
-                                  }
-                                </span>
+                                            <span>
+                                                {
+                                                    this.state.ifCertificationFee === 1 ? '包含' : '不包含'
+                                                }
+                                            </span>
                                         </FormItem>
-                                        {this.state.ifCertificationFee === 1 ?<FormItem
+                                        {this.state.ifCertificationFee === 1 ? <FormItem
                                             className="half-item"
                                             {...formItemLayout}
                                             label="认证费(万元)"
                                         >
-                                <span>
-                                    {
-                                        this.state.certificationFee
-                                    }
-                                </span>
+                                            <span>
+                                                {
+                                                    this.state.certificationFee
+                                                }
+                                            </span>
                                         </FormItem> : null}
                                         {this.state.ifCertificationFee === 1 ? <FormItem
                                             className="half-item"
@@ -719,10 +762,10 @@ class projectOverview extends Component{
                                             {...formItemLayout}
                                             label="付款公司名称"
                                         >
-                                  <span>
-                                      {this.state.certificationCorporate}
-                                  </span>
-                                        </FormItem>:null}
+                                            <span>
+                                                {this.state.certificationCorporate}
+                                            </span>
+                                        </FormItem> : null}
                                     </div> : null
                             }
                             <FormItem
@@ -794,7 +837,7 @@ class projectOverview extends Component{
                                 <EnterpriseNameChange
                                     type='journal'
                                     style={{ marginLeft: 10 }}
-                                    enterpriseId={this.state.orderUid}/>
+                                    enterpriseId={this.state.orderUid} />
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -829,11 +872,11 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="企业地址"
                             >
-                      <span>
-                        {getprovince(this.state.locationProvince)}/
-                          {getprovince(this.state.locationCity)}/
-                          {getprovince(this.state.locationArea)}
-                      </span>
+                                <span>
+                                    {getprovince(this.state.locationProvince)}/
+                                    {getprovince(this.state.locationCity)}/
+                                    {getprovince(this.state.locationArea)}
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -841,9 +884,9 @@ class projectOverview extends Component{
                                 label=""
                             ></FormItem>
                             <FormItem className="half-item" {...formItemLayout}>
-                      <span style={{ paddingLeft: '12em' }}>
-                        {this.state.postalAddress}
-                      </span>
+                                <span style={{ paddingLeft: '12em' }}>
+                                    {this.state.postalAddress}
+                                </span>
                             </FormItem>
                         </div>
                         {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
@@ -854,12 +897,12 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="负责人"
                             >
-                      <span>
-                        {this.state.salesmanName +
-                        '(' +
-                        this.state.depName +
-                        ')'}
-                      </span>
+                                <span>
+                                    {this.state.salesmanName +
+                                        '(' +
+                                        this.state.depName +
+                                        ')'}
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -940,12 +983,12 @@ class projectOverview extends Component{
                                 taskDate={this.state.taskDate}
                                 startDate={this.state.startDate}
                                 list={[
-                                    {id:4,name:'完成时间',value:this.state.endDate},
-                                    {id:6,name:'受理时间',value:this.state.acceptDate},
-                                    {id:8,name:'公示时间',value:this.state.publicityDate},
-                                    {id:10,name:'发证时间',value:this.state.licenceDate},
-                                    {id:15,name:'立项金额',value:this.state.setUpAmount}
-                                ]}/>
+                                    { id: 4, name: '完成时间', value: this.state.endDate },
+                                    { id: 6, name: '受理时间', value: this.state.acceptDate },
+                                    { id: 8, name: '公示时间', value: this.state.publicityDate },
+                                    { id: 10, name: '发证时间', value: this.state.licenceDate },
+                                    { id: 15, name: '立项金额', value: this.state.setUpAmount }
+                                ]} />
                             {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                             {
                                 this.state.bpType === 1 || this.state.bpType === 6 ?
@@ -956,13 +999,13 @@ class projectOverview extends Component{
                                             label="是否高新企业"
                                         >
                                             <span>
-                                              {
-                                                  this.state.highTechStatus === 1 ? '是':
-                                                      this.state.highTechStatus === 0 ? '否' : ''
-                                              }
+                                                {
+                                                    this.state.highTechStatus === 1 ? '是' :
+                                                        this.state.highTechStatus === 0 ? '否' : ''
+                                                }
                                             </span>
                                         </FormItem>
-                                        <FormItem/>
+                                        <FormItem />
                                         <PatentSchedule
                                             readOnly
                                             bpType={this.state.bpType}
@@ -980,12 +1023,12 @@ class projectOverview extends Component{
                                             {...formItemLayout}
                                             label="是否抽查">
                                             {
-                                                this.state.spotCheckStatus === 0 ? '否':
-                                                    this.state.spotCheckStatus === 1 ? '是,未通过':
-                                                        this.state.spotCheckStatus === 2 ? '是,通过': ''
+                                                this.state.spotCheckStatus === 0 ? '否' :
+                                                    this.state.spotCheckStatus === 1 ? '是,未通过' :
+                                                        this.state.spotCheckStatus === 2 ? '是,通过' : ''
                                             }
                                         </FormItem> : null}
-                                        <FormItem/>
+                                        <FormItem />
                                         {this.state.bpType === 5 ? <FormItem
                                             className="half-item"
                                             {...formItemLayout}
@@ -1001,11 +1044,11 @@ class projectOverview extends Component{
                                             {...formItemLayout}
                                             label={this.state.setUpStatus === 1 ? "立项时间" : ''}
                                         >
-                                            {this.state.setUpStatus === 1 ?this.state.setUpTime : null }
+                                            {this.state.setUpStatus === 1 ? this.state.setUpTime : null}
                                         </FormItem> : null}
                                         {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                                         {/*cSort: 3 科技项目  6: 会员*/}
-                                        {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
+                                        {(this.state.bpType === 5 || this.state.cSort === 3) && <FormItem
                                             className="half-item"
                                             {...formItemLayout}
                                             label="申报批次"
@@ -1019,9 +1062,9 @@ class projectOverview extends Component{
                                             {...formItemLayout}
                                             label="是否到款"
                                         >
-                                          <span>
-                                            {this.state.arrivalMoney ? '已到企业' : '未到企业'}
-                                          </span>
+                                            <span>
+                                                {this.state.arrivalMoney ? '已到企业' : '未到企业'}
+                                            </span>
                                         </FormItem>}
                                         <div className="clearfix">
                                             <FormItem
@@ -1056,7 +1099,7 @@ class projectOverview extends Component{
                                                 </Modal>
                                             </FormItem>
                                         </div>
-                            </div>}
+                                    </div>}
                         </div>
                         {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                             <FormItem
@@ -1125,11 +1168,11 @@ class projectOverview extends Component{
                     orderNo={this.state.orderNo}
                     visible={this.state.projectOperationVisible}
                     dataInfor={this.state.editFw}
-                    onCancel={()=>{
+                    onCancel={() => {
                         this.setState({
                             projectOperationVisible: false,
-                            editFw:{},
-                        },()=>{
+                            editFw: {},
+                        }, () => {
                             this.xiangmu(this.state.orderNo);
                         });
                     }}

+ 44 - 1
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -327,11 +327,54 @@ const Task = React.createClass({
           },
         },
         {
+          title: "总年限",
+          dataIndex: "yearSum",
+          key: "yearSum",
+          render: (text, record) => {
+            return (
+              <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+            );
+          }
+        },
+        {
+          title: "年限",
+          dataIndex: "serviceLife",
+          key: "serviceLife",
+          render: (text, record) => {
+            return (
+              !!text && JSON.parse(text).map(item =>
+                <div>{item}</div>
+              )
+            );
+          }
+        },
+        {
+          title: "本次派单",
+          dataIndex: "serviceYear",
+          key: "serviceYear",
+          render: (text, record) => {
+            return (
+              <div>{!text ? "" : text}</div>
+            );
+          }
+        },
+        {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
           render: (text) => {
-            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+            return (
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 100,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
+              </Tooltip>
+            )
           },
         },
       ],

+ 283 - 240
js/component/manageCenter/project/task/taskCount.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import {Button, Input, Spin, Table, message, DatePicker, Upload, Form, Modal, Tabs, Select, Tag, Tooltip} from 'antd';
+import { Button, Input, Spin, Table, message, DatePicker, Upload, Form, Modal, Tabs, Select, Tag, Tooltip } from 'antd';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import {
@@ -17,14 +17,14 @@ import {
 import ShowModalDiv from "@/showModal.jsx";
 import ResolutionDetail from "@/resolutionDetail";
 import OrderRiZi from "@/orderRiZi.jsx";
-import {ChooseList} from "../../order/orderNew/chooseList";
+import { ChooseList } from "../../order/orderNew/chooseList";
 import PatentSchedule from './patentSchedule';
 import DeclarationProgress from "../../../common/declarationProgress";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 
-const {TabPane} = Tabs
+const { TabPane } = Tabs
 
 const IntentionCustomer = Form.create()(
   React.createClass({
@@ -59,7 +59,7 @@ const IntentionCustomer = Form.create()(
             depId: this.state.departmenttList, //部门ID
             outsource: this.state.outsourceSearch
           },
-          success: function(data) {
+          success: function (data) {
             let theArr = [];
             if (data.error.length || data.data.list == "") {
               if (data.error && data.error.length) {
@@ -108,7 +108,7 @@ const IntentionCustomer = Form.create()(
             });
           }.bind(this)
         }).always(
-          function() {
+          function () {
             this.setState({
               loadingA: false
             });
@@ -132,7 +132,7 @@ const IntentionCustomer = Form.create()(
             depId: this.state.departmenttList, //部门ID
             outsource: this.state.outsourceSearch
           },
-          success: function(data) {
+          success: function (data) {
             let theArr = [];
             if (data.error.length || data.data.list == "") {
               if (data.error && data.error.length) {
@@ -158,7 +158,7 @@ const IntentionCustomer = Form.create()(
             });
           }.bind(this)
         }).always(
-          function() {
+          function () {
             this.setState({
               loadingA: false
             });
@@ -172,7 +172,7 @@ const IntentionCustomer = Form.create()(
         page: 1,
         releaseDate: [],
         selectedRowKeys: [],
-        timeRecordparse:{},
+        timeRecordparse: {},
         orgCodeUrl: [],
         declarationBatch: 1,
         dataInfor: {},
@@ -183,10 +183,10 @@ const IntentionCustomer = Form.create()(
           defaultPageSize: 10,
           showQuickJumper: true,
           pageSize: 10,
-          onChange: function(page) {
+          onChange: function (page) {
             this.loadData(page);
           }.bind(this),
-          showTotal: function(total) {
+          showTotal: function (total) {
             return "共" + total + "条数据";
           }
         },
@@ -219,14 +219,14 @@ const IntentionCustomer = Form.create()(
             key: "userName",
             render: text => {
               return (
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               )
             }
           },
@@ -339,9 +339,9 @@ const IntentionCustomer = Form.create()(
             key: "commodityName",
             render: (text, record) => {
               return (
-                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
               )
-          }
+            }
           },
           {
             title: "项目类别",
@@ -397,11 +397,54 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
+            title: "总年限",
+            dataIndex: "yearSum",
+            key: "yearSum",
+            render: (text, record) => {
+              return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+              );
+            }
+          },
+          {
+            title: "年限",
+            dataIndex: "serviceLife",
+            key: "serviceLife",
+            render: (text, record) => {
+              return (
+                !!text && JSON.parse(text).map(item =>
+                  <div>{item}</div>
+                )
+              );
+            }
+          },
+          {
+            title: "本次派单",
+            dataIndex: "serviceYear",
+            key: "serviceYear",
+            render: (text, record) => {
+              return (
+                <div>{!text ? "" : text}</div>
+              );
+            }
+          },
+          {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
             render: text => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 100,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             }
           }
         ],
@@ -462,7 +505,7 @@ const IntentionCustomer = Form.create()(
         crossDomain: false,
         url: globalConfig.context + "/api/admin/organization/selectSuperId",
         data: {},
-        success: function(data) {
+        success: function (data) {
           let thedata = data.data;
           let theArr = [];
           if (!thedata) {
@@ -470,7 +513,7 @@ const IntentionCustomer = Form.create()(
               message.warning(data.error[0].message);
             }
           } else {
-            thedata.map(function(item, index) {
+            thedata.map(function (item, index) {
               theArr.push({
                 key: index,
                 name: item.name,
@@ -483,7 +526,7 @@ const IntentionCustomer = Form.create()(
           });
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -530,7 +573,7 @@ const IntentionCustomer = Form.create()(
         data: {
           id: id
         },
-        success: function(data) {
+        success: function (data) {
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
               message.warning(data.error[0].message);
@@ -553,10 +596,10 @@ const IntentionCustomer = Form.create()(
               taskComment: thisdata.taskComment, //说明
               attachmentUrl: thisdata.attachmentUrl
                 ? splitUrl(
-                    thisdata.attachmentUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.attachmentUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
               salesmanName: thisdata.salesmanName, //订单负责人
               startDate: thisdata.startDate, //启动日期
@@ -586,7 +629,7 @@ const IntentionCustomer = Form.create()(
               splitSuper: thisdata.splitSuper,
               splitId: thisdata.splitId,
               declarationBatch: thisdata.declarationBatch,
-              bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+              bpType: thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
               cSort: thisdata.sort,
               specialComment: thisdata.specialComment,
               urgentDay: thisdata.urgentDay, //有无材料
@@ -595,16 +638,16 @@ const IntentionCustomer = Form.create()(
               setUpStatus: thisdata.setUpStatus,
               setUpTime: thisdata.setUpTime,
               highTechStatus: thisdata.highTechStatus,
-              acceptCount:thisdata.acceptCount,       //受理数
-              certificatesCount:thisdata.certificatesCount, //授权数
-              rejectCount:thisdata.rejectCount,       //驳回数
-              commodityQuantity:thisdata.commodityQuantity, //派单项目数
+              acceptCount: thisdata.acceptCount,       //受理数
+              certificatesCount: thisdata.certificatesCount, //授权数
+              rejectCount: thisdata.rejectCount,       //驳回数
+              commodityQuantity: thisdata.commodityQuantity, //派单项目数
               timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},//项目状态JSON
             });
           }
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -622,7 +665,7 @@ const IntentionCustomer = Form.create()(
         data: {
           orderNo: orderNos
         },
-        success: function(data) {
+        success: function (data) {
           let thisdata = data.data;
           let ProvinceCityArr = [];
           let ProvinceS = thisdata.locationProvince; //省
@@ -655,12 +698,12 @@ const IntentionCustomer = Form.create()(
               ProvinceCity: ProvinceCityArr,
               postalAddress: thisdata.postalAddress, //详细地址
               outsource: thisdata.outsource,
-              deleteSign:thisdata.deleteSign,
+              deleteSign: thisdata.deleteSign,
             });
           }
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -679,7 +722,7 @@ const IntentionCustomer = Form.create()(
         data: {
           tid: record.id
         },
-        success: function(data) {
+        success: function (data) {
           let theArr = [];
           let thisData = [];
           if (!thisData) {
@@ -706,7 +749,7 @@ const IntentionCustomer = Form.create()(
           }
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -726,7 +769,7 @@ const IntentionCustomer = Form.create()(
         data: {
           id: this.state.id
         },
-        success: function(data) {
+        success: function (data) {
           let theArr = [];
 
           if (data.error.length || data.data.list == "") {
@@ -751,7 +794,7 @@ const IntentionCustomer = Form.create()(
           });
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -775,7 +818,7 @@ const IntentionCustomer = Form.create()(
         data: {
           orderNo: orderNos
         },
-        success: function(data) {
+        success: function (data) {
           let theArr = [];
 
           if (data.error.length || data.data.list == "") {
@@ -794,7 +837,7 @@ const IntentionCustomer = Form.create()(
           });
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -896,7 +939,7 @@ const IntentionCustomer = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
-        dataInfor:record,
+        dataInfor: record,
         addState: 0
       });
     },
@@ -954,7 +997,7 @@ const IntentionCustomer = Form.create()(
         data: {
           flag: 0
         },
-        success: function(data) {
+        success: function (data) {
           let theArr = [];
           let thedata = data.data;
           if (!thedata) {
@@ -979,7 +1022,7 @@ const IntentionCustomer = Form.create()(
           });
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.loadData(this.state.ispage);
           this.setState({
             loading: false
@@ -999,7 +1042,7 @@ const IntentionCustomer = Form.create()(
         data: {
           orderNo: this.state.orderNo
         },
-        success: function(data) {
+        success: function (data) {
           let theArr = [];
           let thisData = data.data;
           if (!thisData.length) {
@@ -1023,7 +1066,7 @@ const IntentionCustomer = Form.create()(
           });
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -1060,7 +1103,7 @@ const IntentionCustomer = Form.create()(
         wrapperCol: { span: 14 }
       };
       const utils = {
-        getSatisfaction: function(num) {
+        getSatisfaction: function (num) {
           switch (num) {
             case 0:
               return "未收回";
@@ -1070,7 +1113,7 @@ const IntentionCustomer = Form.create()(
               return "其它";
           }
         },
-        getChargeback: function(num) {
+        getChargeback: function (num) {
           switch (num) {
             case 0:
               return "已完成";
@@ -1233,11 +1276,11 @@ const IntentionCustomer = Form.create()(
               <TabPane tab="更改表格显示数据" key="3">
                 <div style={{ marginLeft: 10 }}>
                   <ChooseList
-                      columns={this.state.columns}
-                      changeFn={this.changeList}
-                      changeList={this.state.changeList}
-                      top={55}
-                      margin={11}
+                    columns={this.state.columns}
+                    changeFn={this.changeList}
+                    changeList={this.state.changeList}
+                    top={55}
+                    margin={11}
                   />
                 </div>
               </TabPane>
@@ -1247,8 +1290,8 @@ const IntentionCustomer = Form.create()(
                 <Table
                   columns={
                     this.state.changeList
-                        ? this.state.changeList
-                        : this.state.columns
+                      ? this.state.changeList
+                      : this.state.columns
                   }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
@@ -1277,21 +1320,21 @@ const IntentionCustomer = Form.create()(
             >
               <Spin spinning={this.state.loading}>
                 <div className="clearfix">
-                  <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
-                    <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                  <div style={{ position: "absolute", top: '-52px', left: '81px', zIndex: 10000 }}>
+                    <OrderItemStatus deleteSign={this.state.deleteSign} />
                   </div>
                   <div className="clearfix">
                     <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="项目状态"
+                      className="half-item"
+                      {...formItemLayout}
+                      label="项目状态"
                     >
                       <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                       <Button
-                          type="primary"
-                          size="small"
-                          style={{ marginTop: '5px', position: 'absolute' }}
-                          onClick={this.caozuorizhi}
+                        type="primary"
+                        size="small"
+                        style={{ marginTop: '5px', position: 'absolute' }}
+                        onClick={this.caozuorizhi}
                       >
                         操作日志
                       </Button>
@@ -1348,9 +1391,9 @@ const IntentionCustomer = Form.create()(
                     </FormItem>
                     {
                       <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="(满意度)备注"
+                        className="half-item"
+                        {...formItemLayout}
+                        label="(满意度)备注"
                       >
                         <span>{this.state.retrieveContent}</span>
                       </FormItem>
@@ -1367,14 +1410,14 @@ const IntentionCustomer = Form.create()(
                     <div style={{
                       paddingLeft: '8%',
                     }}>
-                      <div style={{color:'#000',fontWeight:500}}>
+                      <div style={{ color: '#000', fontWeight: 500 }}>
                         特别说明
-                        <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
+                        <span style={{ color: '#58a3ff', }}>(针对项目的特殊情况说明)</span>
                       </div>
                       <div style={{
-                        display:'flex',
+                        display: 'flex',
                       }}>
-                        <span style={{paddingRight:'10px',whiteSpace:"nowrap"}}>备注:</span>
+                        <span style={{ paddingRight: '10px', whiteSpace: "nowrap" }}>备注:</span>
                         <span style={{
                           flex: 1,
                           wordBreak: 'break-all',
@@ -1397,44 +1440,44 @@ const IntentionCustomer = Form.create()(
                     {/*贯标需要显示*/}
                     {
                       this.state.isIso ?
-                          <div>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="认证费"
-                            >
-                                <span>
-                                  {
-                                    this.state.ifCertificationFee === 1 ? '包含' : '不包含'
-                                  }
-                                </span>
-                            </FormItem>
-                            {this.state.ifCertificationFee === 1 ?<FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="认证费(万元)"
-                            >
-                                <span>
-                                    {
-                                      this.state.certificationFee
-                                    }
-                                </span>
-                            </FormItem> : null}
-                            {this.state.ifCertificationFee === 1 ? <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label=""
-                            /> : null}
-                            {this.state.ifCertificationFee === 1 ? <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="付款公司名称"
-                            >
-                                                            <span>
-                                                                {this.state.certificationCorporate}
-                                                            </span>
-                            </FormItem>:null}
-                          </div> : null
+                        <div>
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="认证费"
+                          >
+                            <span>
+                              {
+                                this.state.ifCertificationFee === 1 ? '包含' : '不包含'
+                              }
+                            </span>
+                          </FormItem>
+                          {this.state.ifCertificationFee === 1 ? <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="认证费(万元)"
+                          >
+                            <span>
+                              {
+                                this.state.certificationFee
+                              }
+                            </span>
+                          </FormItem> : null}
+                          {this.state.ifCertificationFee === 1 ? <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label=""
+                          /> : null}
+                          {this.state.ifCertificationFee === 1 ? <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="付款公司名称"
+                          >
+                            <span>
+                              {this.state.certificationCorporate}
+                            </span>
+                          </FormItem> : null}
+                        </div> : null
                     }
                     <FormItem
                       className="half-item"
@@ -1507,9 +1550,9 @@ const IntentionCustomer = Form.create()(
                     >
                       <span>{this.state.userName}</span>
                       <EnterpriseNameChange
-                          type='journal'
-                          style={{ marginLeft: 10 }}
-                          enterpriseId={this.state.orderUid}/>
+                        type='journal'
+                        style={{ marginLeft: 10 }}
+                        enterpriseId={this.state.orderUid} />
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -1673,94 +1716,94 @@ const IntentionCustomer = Form.create()(
                   <div className="clearfix">
                     <h3 className="sub-title">项目申报进度</h3>
                     <DeclarationProgress
-                        timeRecordparse={this.state.timeRecordparse}
-                        startDate={this.state.startDate}
-                        taskDate={this.state.taskDate}
-                        list={[
-                          {id:4,name:'完成时间',value:this.state.endDate},
-                          {id:6,name:'受理时间',value:this.state.acceptDate},
-                          {id:8,name:'公示时间',value:this.state.publicityDate},
-                          {id:10,name:'发证时间',value:this.state.licenceDate},
-                          {id:15,name:'立项金额',value:this.state.setUpAmount}
-                        ]}/>
+                      timeRecordparse={this.state.timeRecordparse}
+                      startDate={this.state.startDate}
+                      taskDate={this.state.taskDate}
+                      list={[
+                        { id: 4, name: '完成时间', value: this.state.endDate },
+                        { id: 6, name: '受理时间', value: this.state.acceptDate },
+                        { id: 8, name: '公示时间', value: this.state.publicityDate },
+                        { id: 10, name: '发证时间', value: this.state.licenceDate },
+                        { id: 15, name: '立项金额', value: this.state.setUpAmount }
+                      ]} />
                     {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                     {
                       this.state.bpType === 1 || this.state.bpType === 6 ?
-                          <div>
-                            <FormItem
-                                labelCol={{ span: 3 }}
-                                wrapperCol={{ span: 16 }}
-                                label="是否高新企业"
-                            >
-                                <span>
-                                  {
-                                    this.state.highTechStatus === 1 ? '是':
-                                        this.state.highTechStatus === 0 ? '否' : ''
-                                  }
-                                </span>
-                            </FormItem>
-                            <FormItem/>
-                            <PatentSchedule
-                                readOnly
-                                bpType={this.state.bpType}
-                                taskId={this.state.id}
-                                acceptCount={this.state.acceptCount}
-                                certificatesCount={this.state.certificatesCount}
-                                rejectCount={this.state.rejectCount}
-                                commodityQuantity={this.state.commodityQuantity}
-                            />
-                          </div> :
-                          <div>
-                            {/*高新显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                            {this.state.bpType === 5 ? <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="是否抽查">
-                              {
-                                this.state.spotCheckStatus === 0 ? '否':
-                                    this.state.spotCheckStatus === 1 ? '是,未通过':
-                                        this.state.spotCheckStatus === 2 ? '是,通过': ''
-                              }
-                            </FormItem> : null}
-                            <FormItem/>
-                            {this.state.bpType === 5 ? <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="是否立项"
-                            >
+                        <div>
+                          <FormItem
+                            labelCol={{ span: 3 }}
+                            wrapperCol={{ span: 16 }}
+                            label="是否高新企业"
+                          >
+                            <span>
                               {
-                                this.state.setUpStatus === 1 ? '是' :
-                                    this.state.setUpStatus === 0 ? '否' : ''
+                                this.state.highTechStatus === 1 ? '是' :
+                                  this.state.highTechStatus === 0 ? '否' : ''
                               }
-                            </FormItem> : null}
-                            {this.state.bpType === 5 ? <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label={this.state.setUpStatus === 1 ? "立项时间" : ''}
-                            >
-                              {this.state.setUpStatus === 1 ?this.state.setUpTime : null }
-                            </FormItem> : null}
-                            {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                            {/*cSort: 3 科技项目  6: 会员*/}
-                            {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="申报批次"
-                            >
-                              <span>{this.state.declarationBatch}</span>
-                            </FormItem>}
-                            {/*只有科技项目才有是否到款*/}
-                            {/*cSort: 3 科技项目  6: 会员*/}
-                            {this.state.cSort === 3 && <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="是否到款"
-                            >
-                              <span>
-                                {this.state.arrivalMoney ? "已到企业" : "未到企业"}
-                              </span>
-                            </FormItem>}
-                          </div>}
+                            </span>
+                          </FormItem>
+                          <FormItem />
+                          <PatentSchedule
+                            readOnly
+                            bpType={this.state.bpType}
+                            taskId={this.state.id}
+                            acceptCount={this.state.acceptCount}
+                            certificatesCount={this.state.certificatesCount}
+                            rejectCount={this.state.rejectCount}
+                            commodityQuantity={this.state.commodityQuantity}
+                          />
+                        </div> :
+                        <div>
+                          {/*高新显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                          {this.state.bpType === 5 ? <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="是否抽查">
+                            {
+                              this.state.spotCheckStatus === 0 ? '否' :
+                                this.state.spotCheckStatus === 1 ? '是,未通过' :
+                                  this.state.spotCheckStatus === 2 ? '是,通过' : ''
+                            }
+                          </FormItem> : null}
+                          <FormItem />
+                          {this.state.bpType === 5 ? <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="是否立项"
+                          >
+                            {
+                              this.state.setUpStatus === 1 ? '是' :
+                                this.state.setUpStatus === 0 ? '否' : ''
+                            }
+                          </FormItem> : null}
+                          {this.state.bpType === 5 ? <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label={this.state.setUpStatus === 1 ? "立项时间" : ''}
+                          >
+                            {this.state.setUpStatus === 1 ? this.state.setUpTime : null}
+                          </FormItem> : null}
+                          {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                          {/*cSort: 3 科技项目  6: 会员*/}
+                          {(this.state.bpType === 5 || this.state.cSort === 3) && <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="申报批次"
+                          >
+                            <span>{this.state.declarationBatch}</span>
+                          </FormItem>}
+                          {/*只有科技项目才有是否到款*/}
+                          {/*cSort: 3 科技项目  6: 会员*/}
+                          {this.state.cSort === 3 && <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="是否到款"
+                          >
+                            <span>
+                              {this.state.arrivalMoney ? "已到企业" : "未到企业"}
+                            </span>
+                          </FormItem>}
+                        </div>}
                   </div>
                   {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                     <FormItem
@@ -1864,20 +1907,20 @@ const IntentionCustomer = Form.create()(
             className="admin-desc-content"
           >
             <div className="clearfix">
-              <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
-                <OrderItemStatus deleteSign={this.state.deleteSign}/>
+              <div style={{ position: "absolute", top: '-52px', left: '81px', zIndex: 10000 }}>
+                <OrderItemStatus deleteSign={this.state.deleteSign} />
               </div>
               <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目状态"
+                className="half-item"
+                {...formItemLayout}
+                label="项目状态"
               >
                 <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                 <Button
-                    type="primary"
-                    size="small"
-                    style={{ marginTop: '5px', position: 'absolute' }}
-                    onClick={this.caozuorizhi}
+                  type="primary"
+                  size="small"
+                  style={{ marginTop: '5px', position: 'absolute' }}
+                  onClick={this.caozuorizhi}
                 >
                   操作日志
                 </Button>
@@ -1932,9 +1975,9 @@ const IntentionCustomer = Form.create()(
               </FormItem>
               {
                 <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="(满意度)备注"
+                  className="half-item"
+                  {...formItemLayout}
+                  label="(满意度)备注"
                 >
                   <span>{this.state.retrieveContent}</span>
                 </FormItem>
@@ -1946,23 +1989,23 @@ const IntentionCustomer = Form.create()(
             {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
             {this.state.bpType === 2 ? <div className="clearfix">
               <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="加急天数"
+                className="half-item"
+                {...formItemLayout}
+                label="加急天数"
               >
                 {
                   this.state.urgentDay === 1 ? '是' :
-                      this.state.urgentDay === 0 ? '否' : ''
+                    this.state.urgentDay === 0 ? '否' : ''
                 }
               </FormItem>
               <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="有无材料"
+                className="half-item"
+                {...formItemLayout}
+                label="有无材料"
               >
                 {
-                  this.state.ifMaterial === 1 ? '是':
-                      this.state.ifMaterial === 0 ? '否': ''
+                  this.state.ifMaterial === 1 ? '是' :
+                    this.state.ifMaterial === 0 ? '否' : ''
                 }
               </FormItem>
             </div> : null}
@@ -1970,14 +2013,14 @@ const IntentionCustomer = Form.create()(
               <div style={{
                 paddingLeft: '8%',
               }}>
-                <div style={{color:'#000',fontWeight:500}}>
+                <div style={{ color: '#000', fontWeight: 500 }}>
                   特别说明
-                  <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
+                  <span style={{ color: '#58a3ff', }}>(针对项目的特殊情况说明)</span>
                 </div>
                 <div style={{
-                  display:'flex',
+                  display: 'flex',
                 }}>
-                  <span style={{paddingRight:'10px',whiteSpace:"nowrap"}}>备注:</span>
+                  <span style={{ paddingRight: '10px', whiteSpace: "nowrap" }}>备注:</span>
                   <span style={{
                     flex: 1,
                     wordBreak: 'break-all',
@@ -2046,9 +2089,9 @@ const IntentionCustomer = Form.create()(
               >
                 <span>{this.state.userName}</span>
                 <EnterpriseNameChange
-                    type='journal'
-                    style={{ marginLeft: 10 }}
-                    enterpriseId={this.state.orderUid}/>
+                  type='journal'
+                  style={{ marginLeft: 10 }}
+                  enterpriseId={this.state.orderUid} />
               </FormItem>
               <FormItem
                 className="half-item"
@@ -2195,19 +2238,19 @@ const IntentionCustomer = Form.create()(
             <div className="clearfix">
               <h3 className="sub-title">项目申报进度</h3>
               <DeclarationProgress
-                  timeRecordparse={this.state.timeRecordparse}
-                  startDate={this.state.startDate}
-                  taskDate={this.state.taskDate}
-                  list={[
-                    {id:4,name:'完成时间',value:this.state.endDate},
-                    {id:6,name:'受理时间',value:this.state.acceptDate},
-                    {id:8,name:'公示时间',value:this.state.publicityDate},
-                    {id:10,name:'发证时间',value:this.state.licenceDate},
-                    {id:15,name:'立项金额',value:this.state.setUpAmount}
-                  ]}/>
+                timeRecordparse={this.state.timeRecordparse}
+                startDate={this.state.startDate}
+                taskDate={this.state.taskDate}
+                list={[
+                  { id: 4, name: '完成时间', value: this.state.endDate },
+                  { id: 6, name: '受理时间', value: this.state.acceptDate },
+                  { id: 8, name: '公示时间', value: this.state.publicityDate },
+                  { id: 10, name: '发证时间', value: this.state.licenceDate },
+                  { id: 15, name: '立项金额', value: this.state.setUpAmount }
+                ]} />
               {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
               {/*cSort: 3 科技项目  6: 会员*/}
-              {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
+              {(this.state.bpType === 5 || this.state.cSort === 3) && <FormItem
                 className="half-item"
                 {...formItemLayout}
                 label="申报批次"
@@ -2264,9 +2307,9 @@ const IntentionCustomer = Form.create()(
             </div>
           </Modal>
           {this.state.addnextVisible && <ProjectDetailsReadOnly
-              infor={this.state.dataInfor}
-              visible={this.state.addnextVisible}
-              onCancel={this.nextCancel}
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
           />}
         </div>
       );

+ 44 - 1
js/component/manageCenter/project/task/taskQuery.jsx

@@ -314,11 +314,54 @@ const Task = React.createClass({
           },
         },
         {
+          title: "总年限",
+          dataIndex: "yearSum",
+          key: "yearSum",
+          render: (text, record) => {
+            return (
+              <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+            );
+          }
+        },
+        {
+          title: "年限",
+          dataIndex: "serviceLife",
+          key: "serviceLife",
+          render: (text, record) => {
+            return (
+              !!text && JSON.parse(text).map(item =>
+                <div>{item}</div>
+              )
+            );
+          }
+        },
+        {
+          title: "本次派单",
+          dataIndex: "serviceYear",
+          key: "serviceYear",
+          render: (text, record) => {
+            return (
+              <div>{!text ? "" : text}</div>
+            );
+          }
+        },
+        {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
           render: (text) => {
-            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+            return (
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 100,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
+              </Tooltip>
+            )
           },
         },
       ],

+ 45 - 1
js/component/project.jsx

@@ -10,6 +10,7 @@ import {
   Form,
   Upload,
   Tag,
+  Tooltip,
 } from 'antd'
 import {
   getProcessStatus,
@@ -109,11 +110,54 @@ const project = React.createClass({
           },
         },
         {
+          title: "总年限",
+          dataIndex: "yearSum",
+          key: "yearSum",
+          render: (text, record) => {
+            return (
+              <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+            );
+          }
+        },
+        {
+          title: "年限",
+          dataIndex: "serviceLife",
+          key: "serviceLife",
+          render: (text, record) => {
+            return (
+              !!text && JSON.parse(text).map(item =>
+                <div>{item}</div>
+              )
+            );
+          }
+        },
+        {
+          title: "本次派单",
+          dataIndex: "serviceYear",
+          key: "serviceYear",
+          render: (text, record) => {
+            return (
+              <div>{!text ? "" : text}</div>
+            );
+          }
+        },
+        {
           title: '项目说明',
           dataIndex: 'taskComment',
           key: 'taskComment',
           render: (text) => {
-            return text && text.length > 8 ? text.substr(0, 8) + '…' : text
+            return (
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 100,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
+              </Tooltip>
+            )
           },
         },
       ],