Преглед изворни кода

客户转交(资料和订单)

dev01 пре 3 година
родитељ
комит
9cb3abfc46
68 измењених фајлова са 9968 додато и 9686 уклоњено
  1. 8 6
      js/component/common/enterpriseNameChange/index.jsx
  2. 8 6
      js/component/common/enterpriseNameChange/inforChange.jsx
  3. 9 3
      js/component/common/orderDetail/gxczx.jsx
  4. 6 6
      js/component/manageCenter/channelList/channelunit/changelog.jsx
  5. 1 0
      js/component/manageCenter/channelList/channelunit/index.jsx
  6. 3043 3035
      js/component/manageCenter/customer/NEW/crm/crm.jsx
  7. 8 6
      js/component/manageCenter/customer/NEW/crm/crmAll.jsx
  8. 8 6
      js/component/manageCenter/customer/NEW/crm/patentPayment.jsx
  9. 8 6
      js/component/manageCenter/customer/NEW/intentionCustomer/channel.jsx
  10. 8 6
      js/component/manageCenter/customer/NEW/intentionCustomer/duplicateData.jsx
  11. 43 10
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx
  12. 112 110
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/business.jsx
  13. 8 6
      js/component/manageCenter/customer/NEW/intentionCustomer/statisticalDetails.jsx
  14. 395 393
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visit.jsx
  15. 786 755
      js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx
  16. 570 568
      js/component/manageCenter/customer/managementFollow/customerFollow/index.jsx
  17. 8 6
      js/component/manageCenter/customer/managementFollow/followUpSummary/index.jsx
  18. 682 680
      js/component/manageCenter/customer/operationalData/interviewStatistics/detailedList.jsx
  19. 321 318
      js/component/manageCenter/customer/operationalData/receivablesStatistics/detailedList.jsx
  20. 403 401
      js/component/manageCenter/customer/operationalData/reexamine/detailedList.jsx
  21. 381 379
      js/component/manageCenter/customer/operationalData/signatureStatistics/detailedList.jsx
  22. 577 575
      js/component/manageCenter/customerService/administration/followUp.jsx
  23. 18 18
      js/component/manageCenter/customerService/administration/order.jsx
  24. 8 6
      js/component/manageCenter/financialManage/bonus/yxBonus.jsx
  25. 48 36
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  26. 56 42
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  27. 8 6
      js/component/manageCenter/financialManage/distribute/huiKuan.jsx
  28. 36 36
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  29. 48 36
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  30. 8 6
      js/component/manageCenter/financialManage/distribute/tuiDan.jsx
  31. 16 12
      js/component/manageCenter/operate/personnel/personnelAll.jsx
  32. 8 6
      js/component/manageCenter/order/bonus/yxBonus.jsx
  33. 32 24
      js/component/manageCenter/order/orderNew/approveds.jsx
  34. 8 6
      js/component/manageCenter/order/orderNew/arrearsList.jsx
  35. 8 6
      js/component/manageCenter/order/orderNew/chargeback.jsx
  36. 8 6
      js/component/manageCenter/order/orderNew/contractCwjl.js
  37. 8 6
      js/component/manageCenter/order/orderNew/contractCwzj.js
  38. 8 6
      js/component/manageCenter/order/orderNew/contractCwzy.js
  39. 8 6
      js/component/manageCenter/order/orderNew/contractJsjl.js
  40. 8 6
      js/component/manageCenter/order/orderNew/contractJsy.js
  41. 8 6
      js/component/manageCenter/order/orderNew/contractJszj.js
  42. 8 6
      js/component/manageCenter/order/orderNew/contractYxgly.js
  43. 8 6
      js/component/manageCenter/order/orderNew/contractYxjl.js
  44. 8 6
      js/component/manageCenter/order/orderNew/contractYxy.js
  45. 8 6
      js/component/manageCenter/order/orderNew/examine.jsx
  46. 8 6
      js/component/manageCenter/order/orderNew/examinejl.jsx
  47. 8 6
      js/component/manageCenter/order/orderNew/glCostAuditList/index.js
  48. 16 12
      js/component/manageCenter/order/orderNew/inquiry.jsx
  49. 8 6
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  50. 8 6
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  51. 8 6
      js/component/manageCenter/order/orderNew/press.jsx
  52. 6 6
      js/component/manageCenter/order/orderNew/pressList.jsx
  53. 8 6
      js/component/manageCenter/order/orderNew/reject.jsx
  54. 16 12
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  55. 16 12
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  56. 1566 1564
      js/component/manageCenter/project/summary/projectDetails.jsx
  57. 8 6
      js/component/manageCenter/project/task/businessManagement/index.jsx
  58. 8 6
      js/component/manageCenter/project/task/myTaskCount.jsx
  59. 8 6
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  60. 407 405
      js/component/manageCenter/project/task/payApplyReject/index.jsx
  61. 16 12
      js/component/manageCenter/project/task/taskAssignment.jsx
  62. 8 6
      js/component/manageCenter/project/task/taskCount.jsx
  63. 8 6
      js/component/manageCenter/project/task/taskQuery.jsx
  64. 6 6
      js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx
  65. 6 6
      js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageNew.jsx
  66. 33 2
      package-lock.json
  67. 2 1
      package.json
  68. 15 1
      yarn.lock

+ 8 - 6
js/component/common/enterpriseNameChange/index.jsx

@@ -25,12 +25,14 @@ class EnterpriseNameChange extends Component {
                     render: (text) => {
                         return (
                             <Tooltip title={text}>
-                                <div style={{
-                                    maxWidth: '150px',
-                                    overflow: 'hidden',
-                                    textOverflow: "ellipsis",
-                                    whiteSpace: 'nowrap',
-                                }}>{text}</div>
+                                <div 
+                                // style={{
+                                //     maxWidth: '150px',
+                                //     overflow: 'hidden',
+                                //     textOverflow: "ellipsis",
+                                //     whiteSpace: 'nowrap',
+                                // }}
+                                >{text}</div>
                             </Tooltip>
                         )
                     }

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

@@ -23,12 +23,14 @@ class InforChange extends Component {
                     render: (text) => {
                         return (
                             <Tooltip title={text}>
-                                <div style={{
-                                    maxWidth: '150px',
-                                    overflow: 'hidden',
-                                    textOverflow: "ellipsis",
-                                    whiteSpace: 'nowrap',
-                                }}>{text}</div>
+                                <div 
+                                // style={{
+                                //     maxWidth: '150px',
+                                //     overflow: 'hidden',
+                                //     textOverflow: "ellipsis",
+                                //     whiteSpace: 'nowrap',
+                                // }}
+                                >{text}</div>
                             </Tooltip>
                         )
                     }

+ 9 - 3
js/component/common/orderDetail/gxczx.jsx

@@ -54,9 +54,15 @@ class Gxczx extends Component {
               addDeductionText: addDeductionServices == 0
                 ? addDeductionOther
                 : addDeductionList.find(v => { return v.value == addDeductionServices }).label,
-              zscq: knowledgeServices == null ? null : (knowledgeServices != 1 ? -1 : 1),
-              sjfw: auditServices == null ? null : (auditServices != 1 ? -1 : 1),
-              jjkc: addDeductionServices == null ? null : (addDeductionServices != 1 ? -1 : 1),
+              zscq: knowledgeServices == null
+                ? null
+                : (knowledgeServices != 1 ? -1 : 1),
+              sjfw: auditServices == null
+                ? null
+                : (auditServices != 1 ? -1 : 1),
+              jjkc: addDeductionServices == null
+                ? null
+                : (addDeductionServices != 1 ? -1 : 1),
             }, () => {
               num++
             })

+ 6 - 6
js/component/manageCenter/channelList/channelunit/changelog.jsx

@@ -31,12 +31,12 @@ const ChangeLog = React.createClass({
             return (
               <Tooltip title={text}>
                 <div
-                  style={{
-                    maxWidth: "150px",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                  }}
+                  // style={{
+                  //   maxWidth: "150px",
+                  //   overflow: "hidden",
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: "nowrap",
+                  // }}
                 >
                   {text}
                 </div>

+ 1 - 0
js/component/manageCenter/channelList/channelunit/index.jsx

@@ -371,6 +371,7 @@ class ChannelUnit extends Component {
           uid: changeIds, //这一行数据的ID
           aid: this.state.theTypes, //指定转交人的ID
           oldAid: oldAid, //原跟进人ID
+          operatorType: 5,
           data: infor, // 资料是否一并转交 0否 1是
         },
       }).done(

Разлика између датотеке није приказан због своје велике величине
+ 3043 - 3035
js/component/manageCenter/customer/NEW/crm/crm.jsx


+ 8 - 6
js/component/manageCenter/customer/NEW/crm/crmAll.jsx

@@ -369,12 +369,14 @@ const IntentionCustomer = Form.create()(React.createClass({
 				render: text => {
 					return (
 						<Tooltip title={onReplace(text)}>
-							<div style={{
-								maxWidth: '100px',
-								overflow: 'hidden',
-								textOverflow: "ellipsis",
-								whiteSpace: 'nowrap',
-							}}>{onReplace(text)}</div>
+							<div 
+              // style={{
+							// 	maxWidth: '100px',
+							// 	overflow: 'hidden',
+							// 	textOverflow: "ellipsis",
+							// 	whiteSpace: 'nowrap',
+							// }}
+              >{onReplace(text)}</div>
 						</Tooltip>
 					)
 				}

+ 8 - 6
js/component/manageCenter/customer/NEW/crm/patentPayment.jsx

@@ -263,12 +263,14 @@ const PatentPayment = Form.create()(React.createClass({
 				render: (text, record) => {
 					return (
 						<Tooltip title={record.uid ? text : record.applicant}>
-							<div style={{
-								maxWidth: '100px',
-								overflow: 'hidden',
-								textOverflow: "ellipsis",
-								whiteSpace: 'nowrap',
-							}}>{record.uid ? text : record.applicant}</div>
+							<div 
+              // style={{
+							// 	maxWidth: '100px',
+							// 	overflow: 'hidden',
+							// 	textOverflow: "ellipsis",
+							// 	whiteSpace: 'nowrap',
+							// }}
+              >{record.uid ? text : record.applicant}</div>
 						</Tooltip>
 					)
 				}

+ 8 - 6
js/component/manageCenter/customer/NEW/intentionCustomer/channel.jsx

@@ -68,12 +68,14 @@ class Channel extends Component{
                                     回收
                                 </div> : null}
                                 <Tooltip title={text}>
-                                    <div style={{
-                                        maxWidth:'150px',
-                                        overflow:'hidden',
-                                        textOverflow: "ellipsis",
-                                        whiteSpace:'nowrap',
-                                    }}>{text}</div>
+                                    <div 
+                                    // style={{
+                                    //     maxWidth:'150px',
+                                    //     overflow:'hidden',
+                                    //     textOverflow: "ellipsis",
+                                    //     whiteSpace:'nowrap',
+                                    // }}
+                                    >{text}</div>
                                  </Tooltip>
 				            </span>
                         )

+ 8 - 6
js/component/manageCenter/customer/NEW/intentionCustomer/duplicateData.jsx

@@ -17,12 +17,14 @@ class DuplicateData extends Component{
                     render:(text)=>{
                         return (
                             <Tooltip title={text}>
-                                <div style={{
-                                    maxWidth:'150px',
-                                    overflow:'hidden',
-                                    textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
-                                }}>{text}</div>
+                                <div 
+                                // style={{
+                                //     maxWidth:'150px',
+                                //     overflow:'hidden',
+                                //     textOverflow: "ellipsis",
+                                //     whiteSpace:'nowrap',
+                                // }}
+                                >{text}</div>
                             </Tooltip>
                         )
                     }

+ 43 - 10
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -15,6 +15,7 @@ import {
   Tabs,
   Modal,
   Tag,
+  Checkbox,
 } from "antd";
 import $ from "jquery/src/ajax";
 import moment from "moment";
@@ -200,13 +201,13 @@ const IntentionCustomer = Form.create()(
                       document.execCommand("copy");
                       message.success("复制成功");
                     }}
-                    style={{
-                      maxWidth: "150px",
-                      overflow: "hidden",
-                      textOverflow: "ellipsis",
-                      whiteSpace: "nowrap",
-                      cursor: "pointer",
-                    }}
+                  // style={{
+                  //   maxWidth: "150px",
+                  //   overflow: "hidden",
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: "nowrap",
+                  //   cursor: "pointer",
+                  // }}
                   >
                     {text}
                   </div>
@@ -378,6 +379,7 @@ const IntentionCustomer = Form.create()(
         dataSource: [],
         visitArrList: [],
         searchTime: [,],
+        selList: [],
       };
     },
 
@@ -646,6 +648,19 @@ const IntentionCustomer = Form.create()(
     },
     //转交
     changeAssigner(infor) {
+
+      let type = infor
+      if (infor == 1) {
+        if (this.state.selList.length == 0) {
+          message.warn("请勾选您需要转交的信息!")
+          return
+        } else if (this.state.selList.length == 2) {
+          type = 3
+        } else {
+          type = this.state.selList[0]
+        }
+      }
+
       if (this.state.theTypes) {
         this.setState({
           informationTransferVisible: false,
@@ -672,18 +687,26 @@ const IntentionCustomer = Form.create()(
             uid: changeIds, //这一行数据的ID
             aid: this.state.theTypes, //指定转交人的ID
             oldAid: oldAid,
-            data: infor,
+            operatorType: 3,
+            data: type,
           },
         }).done(
           function (data) {
             loading();
+            this.setState({
+              selList: [],
+            })
             if (!data.error.length) {
-              message.success("转交成功!");
               this.setState({
                 auto: "",
                 loading: false,
                 selectedRowKeys: [],
               });
+              if (data.data.length == 0) {
+                message.success("转交成功!");
+              } else {
+                data.data.forEach(function (e) { message.warning(e) })
+              }
             } else {
               message.warning(data.error[0].message);
             }
@@ -1174,6 +1197,7 @@ const IntentionCustomer = Form.create()(
               onCancel={() => {
                 this.setState({
                   informationTransferVisible: false,
+                  selList: [],
                 });
               }}
               footer={[
@@ -1199,7 +1223,16 @@ const IntentionCustomer = Form.create()(
                 </Button>,
               ]}
             >
-              请确定,是否将客户资料一并转交!选择“需要”,系统将全部客户资料一并转交!选择“不需要”,原客户资料保存您的客户资料中,请注意客户资料的更新维护,谢谢
+              <div style={{ padding: "0px 40px 20px" }}>
+                请确定,是否一并转交以下信息,如单个资料无法转交成功,则去掉对应“勾选”项,转交单一信息!
+              </div>
+              <div style={{ width: "50%", margin: "0 auto" }}>
+                <Checkbox.Group onChange={e => { this.setState({ selList: e }); }}>
+                  <Checkbox value={1}>1.需要转交该客户资料</Checkbox>
+                  <br />
+                  <Checkbox value={2}>2.需要转交该客户名下的订单</Checkbox>
+                </Checkbox.Group>
+              </div>
             </Modal>
           )}
           <textarea id="copyText" style={{ opacity: 0 }} />

+ 112 - 110
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/business.jsx

@@ -1,13 +1,13 @@
 import React from 'react';
-import {Form, Button, Spin, message, Table, Popconfirm, Tooltip} from 'antd';
+import { Form, Button, Spin, message, Table, Popconfirm, Tooltip } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import {getfllowSituation,getcustomerStatue} from '@/tools.js';
+import { getfllowSituation, getcustomerStatue } from '@/tools.js';
 import BusinessDetail from './businessDetail.jsx';
 
 const Business = React.createClass({
-	getInitialState(){
-		return {
+  getInitialState() {
+    return {
       loading: false,
       dataBusiness: [],
       followData: {},
@@ -28,18 +28,20 @@ const Business = React.createClass({
           title: "客户名称",
           dataIndex: "identifyName",
           key: "identifyName",
-		  render:(text)=>{
-			return (
-				<Tooltip title={text}>
-					<div style={{
-						maxWidth:'150px',
-						overflow:'hidden',
-						textOverflow: "ellipsis",
-						whiteSpace:'nowrap',
-					}}>{text}</div>
-				</Tooltip>
-			)
-		  }
+          render: (text) => {
+            return (
+              <Tooltip title={text}>
+                <div
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                >{text}</div>
+              </Tooltip>
+            )
+          }
         },
         {
           title: "业务名",
@@ -66,7 +68,7 @@ const Business = React.createClass({
           render: (text) => {
             return getcustomerStatue(text);
           },
-        },{
+        }, {
           title: "意向时间",
           dataIndex: "createTime",
           key: "createTime",
@@ -89,99 +91,99 @@ const Business = React.createClass({
         },
       ],
     };
-	},
-	businessIntentionDetails(record){
-		this.setState({
-			followData: record,
-			businessModul:true
-		})
-	},
-	//业务意向
-	BusinessList(pageNo) {
-		this.setState({
-			loading: true
-		});
-		$.ajax({
-			method: "post",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/customer/listBusiness',
-			data: {
-				pageNo: pageNo || 1,
-				pageSize: this.state.paginationt.pageSize,
-				uid: this.props.data.id
-			},
-			success: function(data) {
-				let theArr = [];
-				if(data.error.length || data.data.list == "") {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-				} else {
-					for(let i = 0; i < data.data.list.length; i++) {
-						let thisdata = data.data.list[i];
-						theArr.push({
-							key: i,
-							businessId: thisdata.businessId,
-							businessProjectId:thisdata.businessProjectId,
-							businessName: thisdata.businessName,
-							identifyName: thisdata.identifyName,
-							followSituation: thisdata.followSituation,
-							customerStatus: thisdata.customerStatus,
-							adminName: thisdata.adminName,
-							createTime: thisdata.createTime
-						});
-					};
-					this.state.paginationt.current = data.data.pageNo;
-					this.state.paginationt.total = data.data.totalCount;
-				};
-				if(data.data.list&&!data.data.list.length){
-					this.state.paginationt.current=0;
-					this.state.paginationt.total=0;
-				}
-				this.setState({
-					dataBusiness: theArr,
-					paginationt: this.state.paginationt||[]
-				});
-			}.bind(this),
-		}).always(function() {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
-	componentWillMount(){
-		this.BusinessList();
-	},
-	detailsModal(){
-		this.props.closeDetail(false, false)
-	},
-	componentWillReceiveProps(nextProps) {
-		if(nextProps.data.id&&nextProps.businessState){
-			this.BusinessList();
-		}
-		this.setState({
-			businessModul:false
-		})
-	},
-	render(){
-		return(
-			<div className="clearfix">
-			    <Spin spinning={this.state.loading}>
-			      <Table
-	            	 pagination={this.state.paginationt}
-	            	 columns={this.state.businessIntentionList}
-	            	 dataSource={this.state.dataBusiness}
-	            	 />
-			    </Spin>
-			    <BusinessDetail
-			    	ids={this.props.data.id}
-			    	data={this.state.followData}
-			    	businessModul={this.state.businessModul}
-			    />
-			</div>
-		)
-	}
+  },
+  businessIntentionDetails(record) {
+    this.setState({
+      followData: record,
+      businessModul: true
+    })
+  },
+  //业务意向
+  BusinessList(pageNo) {
+    this.setState({
+      loading: true
+    });
+    $.ajax({
+      method: "post",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + '/api/admin/customer/listBusiness',
+      data: {
+        pageNo: pageNo || 1,
+        pageSize: this.state.paginationt.pageSize,
+        uid: this.props.data.id
+      },
+      success: function (data) {
+        let theArr = [];
+        if (data.error.length || data.data.list == "") {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          };
+        } else {
+          for (let i = 0; i < data.data.list.length; i++) {
+            let thisdata = data.data.list[i];
+            theArr.push({
+              key: i,
+              businessId: thisdata.businessId,
+              businessProjectId: thisdata.businessProjectId,
+              businessName: thisdata.businessName,
+              identifyName: thisdata.identifyName,
+              followSituation: thisdata.followSituation,
+              customerStatus: thisdata.customerStatus,
+              adminName: thisdata.adminName,
+              createTime: thisdata.createTime
+            });
+          };
+          this.state.paginationt.current = data.data.pageNo;
+          this.state.paginationt.total = data.data.totalCount;
+        };
+        if (data.data.list && !data.data.list.length) {
+          this.state.paginationt.current = 0;
+          this.state.paginationt.total = 0;
+        }
+        this.setState({
+          dataBusiness: theArr,
+          paginationt: this.state.paginationt || []
+        });
+      }.bind(this),
+    }).always(function () {
+      this.setState({
+        loading: false
+      });
+    }.bind(this));
+  },
+  componentWillMount() {
+    this.BusinessList();
+  },
+  detailsModal() {
+    this.props.closeDetail(false, false)
+  },
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.data.id && nextProps.businessState) {
+      this.BusinessList();
+    }
+    this.setState({
+      businessModul: false
+    })
+  },
+  render() {
+    return (
+      <div className="clearfix">
+        <Spin spinning={this.state.loading}>
+          <Table
+            pagination={this.state.paginationt}
+            columns={this.state.businessIntentionList}
+            dataSource={this.state.dataBusiness}
+          />
+        </Spin>
+        <BusinessDetail
+          ids={this.props.data.id}
+          data={this.state.followData}
+          businessModul={this.state.businessModul}
+        />
+      </div>
+    )
+  }
 })
 
 export default Business;

+ 8 - 6
js/component/manageCenter/customer/NEW/intentionCustomer/statisticalDetails.jsx

@@ -23,12 +23,14 @@ class StatisticalDetails extends Component{
                     render: (text,record) => {
                         return (
                             <Tooltip title={text}>
-                              <div style={{
-                                  maxWidth:'250px',
-                                  overflow:'hidden',
-                                  textOverflow: "ellipsis",
-                                  whiteSpace:'nowrap',
-                              }}>
+                              <div 
+                              // style={{
+                              //     maxWidth:'250px',
+                              //     overflow:'hidden',
+                              //     textOverflow: "ellipsis",
+                              //     whiteSpace:'nowrap',
+                              // }}
+                              >
                                   {record.recovery === 1 ? <div style={{
                                       background:'#ef7207',
                                       color:'#FFF',

+ 395 - 393
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visit.jsx

@@ -8,398 +8,400 @@ import VisitDetail from './visitDetail.jsx';
 import PublicSupplement from "../../../../../../publicSupplement";
 
 const Visit = React.createClass({
-	getInitialState() {
-		return {
-			visitArrList: [],
-			loading: false,
-			visitModul: false,
-			visitModuls: false,
-			paginations: {
-				defaultCurrent: 1,
-				defaultPageSize: 10,
-				showQuickJumper: true,
-				pageSize: 10,
-				onChange: function (page) {
-					this.loadVisit(page);
-				}.bind(this),
-				showTotal: function (total) {
-					return "共" + total + "条数据";
-				},
-			},
-			visitsList: [
-				{
-					title: "客户名称",
-					dataIndex: "nickname",
-					key: "nickname",
-					width: 150,
-					render: (text) => {
-						return (
-							<Tooltip title={text}>
-								<div style={{
-									maxWidth: '150px',
-									overflow: 'hidden',
-									textOverflow: "ellipsis",
-									whiteSpace: 'nowrap',
-								}}>{text}</div>
-							</Tooltip>
-						)
-					},
-				},
-				{
-					title: "跟进方式",
-					dataIndex: "contactType",
-					key: "contactType",
-					width: 100,
-					render: (text) => {
-						return getContactType(text);
-					},
-				},
-				{
-					title: "联系人",
-					dataIndex: "contacts",
-					key: "contacts",
-					width: 150,
-					render: (text, record) => {
-						return (
-							<div>
-								{record.readOnly ? <span>***</span> : <span>{text}</span>}
-							</div>
-						);
-					},
-				},
-				{
-					title: "联系电话",
-					dataIndex: "contactMobile",
-					key: "contactMobile",
-					width: 120,
-					render: (text, record) => {
-						return (
-							<div>
-								{record.readOnly ? <span>***</span> : <span>{text}</span>}
-							</div>
-						);
-					},
-				},
-				{
-					title: "跟进人",
-					dataIndex: "adminName",
-					key: "adminName",
-					width: 120
-				},
-				//   {
-				//     title: "跟进说明",
-				//     dataIndex: "result",
-				//     key: "result",
-				// width: 300,
-				// render: (text, record) => {
-				// 	return (
-				// 		<div style={{wordBreak:"break-all"}}>
-				// 			<div>{text}</div>
-				// 			{
-				// 				getContactType(record.contactType) === '公出打卡' && <div style={{
-				// 					paddingTop: '15px',
-				// 					wordBreak: "break-all",
-				// 					display: "flex",
-				// 					alignItems: 'flex-end'
-				// 				}}>
-				// 					补充说明:
-				// 					{record.supplement}
-				// 					<div style={{paddingLeft: '10px'}}>
-				// 						<PublicSupplement infor={record} onCancel={() => {
-				// 							this.loadVisit(this.state.ispage);
-				// 						}}/>
-				// 					</div>
-				// 				</div>
-				// 			}
-				// 		</div>
-				// 	)
-				// }
-				//   },
-				{
-					title: "跟进时间",
-					dataIndex: "followTime",
-					key: "followTime",
-					width: 125
-				},
-				{
-					title: "公出目标",
-					dataIndex: "result",
-					key: "result",
-					width: 200,
-					// render: (text, record) => {
-					// 	return (
-					// 		<div style={{wordBreak:"break-all"}}>
-					// 			<div>{text}</div>
-					// 			{
-					// 				getContactType(record.contactType) === '公出打卡' && <div style={{
-					// 					paddingTop: '15px',
-					// 					wordBreak: "break-all",
-					// 					display: "flex",
-					// 					alignItems: 'flex-end'
-					// 				}}>
-					// 					{/* 补充说明:
-					// 					{record.supplement} */}
-					// 					<div style={{paddingLeft: '10px'}}>
-					// 						<PublicSupplement infor={record} onCancel={() => {
-					// 							this.loadVisit(this.state.ispage);
-					// 						}}/>
-					// 					</div>
-					// 				</div>
-					// 			}
-					// 		</div>
-					// 	)
-					// }
-				},
-				{
-					title: "公出计划",
-					dataIndex: "plan",
-					key: "plan",
-					width: 200,
-					render: (text) => {
-						return (
-							<div
-							// style={{
-							//   width: 50,
-							//   overflow: "hidden",
-							//   textOverflow: "ellipsis",
-							//   whiteSpace: "nowrap",
-							// }}
-							// title={text}
-							>
-								{text}
-							</div>
-						);
-					},
-				},
-				{
-					title: "预计效果",
-					dataIndex: "expectedEffect",
-					key: "expectedEffect",
-					width: 200,
-					render: (text) => {
-						return (
-							<div
-							// style={{
-							//   width: 50,
-							//   overflow: "hidden",
-							//   textOverflow: "ellipsis",
-							//   whiteSpace: "nowrap",
-							// }}
-							// title={text}
-							>
-								{text}
-							</div>
-						);
-					},
-				},
-				{
-					title: "本次公出目标总结",
-					dataIndex: "supplement",
-					key: "supplement",
-					width: 200,
-					render: (text, record) => {
-						return (
-							<div style={{ wordBreak: "break-all" }}>
-								{
-									getContactType(record.contactType) === '公出打卡' && <div style={{
-										// paddingTop: '15px',
-										wordBreak: "break-all",
-									}}>
-										{text}
-										<div>
-											<PublicSupplement closeModel={this.closeModel} infor={record} onCancel={() => {
-												this.loadVisit(this.state.ispage);
-											}} />
-										</div>
-									</div>
-								}
-							</div>
-						);
-					},
-				},
-				{
-					title: "下一次公出计划",
-					dataIndex: "nextPlan",
-					key: "nextPlan",
-					width: 200,
-					render: (text) => {
-						return (
-							<div
-							// style={{
-							//   width: 70,
-							//   overflow: "hidden",
-							//   textOverflow: "ellipsis",
-							//   whiteSpace: "nowrap",
-							// }}
-							// title={text}
-							>
-								{text}
-							</div>
-						);
-					},
-				},
-			],
-		};
-	},
-	//拜访记录删除
-	visitDelet(e) {
-		this.setState({
-			visitModul: false,
-			loading: true
-		});
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + "/api/admin/customer/deleteFollow",
-			data: {
-				followId: e.followId, //删除的ID
-			}
-		}).done(function (data) {
-			if (!data.error.length) {
-				message.success('删除成功!');
-				this.setState({
-					loading: false,
-				});
-			} else {
-				message.warning(data.error[0].message);
-			};
-			this.loadVisit();
-		}.bind(this));
-	},
-	//查看跟进记录列表
-	loadVisit(pageNo) {
-		this.setState({
-			loading: true
-		});
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/customer/listFollowHistory',
-			data: {
-				pageNo: pageNo || 1,
-				pageSize: this.state.paginations.pageSize,
-				uid: this.props.data.id, //名称1
-			},
-			success: function (data) {
-				let theArr = [];
-				if (data.error.length || data.data.list == "") {
-					if (data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-				} else {
-					for (let i = 0; i < data.data.list.length; i++) {
-						let thisdata = data.data.list[i];
-						theArr.push(thisdata);
-					};
-					this.state.paginations.current = data.data.pageNo;
-					this.state.paginations.total = data.data.totalCount;
-				};
-				if (data.data.list && !data.data.list.length) {
-					this.state.paginations.current = 0;
-					this.state.paginations.total = 0;
-				};
-				this.setState({
-					visitArrList: theArr,
-					paginations: this.state.paginations
-				});
-			}.bind(this),
-		}).always(function () {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
-	componentWillMount() {
-		this.loadVisit();
-	},
-	detailsModal() {
-		this.props.closeDetail(false, false)
-	},
-	closeModel() {
-		this.setState({
-			visitModul: false
-		})
-	},
-	//点击整行
-	VisitRowClick(record) {
-		this.setState({
-			followData: record,
-			visitModul: true,
-		})
-	},
-	//进入新增拜访记录
-	visit() {
-		let obj = {
-			id: this.props.data.id
-		}
-		this.setState({
-			followData: obj,
-			visitModuls: true,
-		})
-	},
-	closeDesc(e, s) {
-		this.state.visitModul = e
-		this.state.visitModuls = e
-		if (s) {
-			this.loadVisit()
-		}
-	},
-	componentWillReceiveProps(nextProps) {
-		if (nextProps.data.id && nextProps.visitState) {
-			this.loadVisit()
-		}
-		this.setState({
-			visitModul: false
-		})
-	},
-	render() {
-		return (
-			<div className="clearfix">
-				<Alert message="注:面谈公出补充,沟通完后记录今天交流的情况。计划下一次什么时候再面谈?该如何面谈?该如何跟进?" banner />
-				<Button
-					onClick={(e) => {
-						e.stopPropagation()
-						if (!this.props.data.orgCode) {
-							message.warning(`请先完善"企业统一社会信用代码"`)
-							return
-						}
-						this.visit();
-					}}
-					type="primary"
-					style={{ marginTop: '10px', float: 'right' }}
-				>
-					客户跟进
-				</Button>
-				<Spin spinning={this.state.loading}>
-					<Table
-						size="middle"
-						style={{ marginTop: '60px' }}
-						pagination={this.state.paginations}
-						columns={this.state.visitsList}
-						dataSource={this.state.visitArrList}
-						scroll={{ x: '120%', y: 440 }}
-						onRowClick={this.VisitRowClick}
-					/>
-				</Spin>
-				<VisitDetail
-					categoryArr={this.props.categoryArr}
-					followData={this.state.followData}
-					visitModul={this.state.visitModul}
-					closeDesc={this.closeDesc}
-					mid={this.props.data.id}
-				/>
-				<FollowDetail
-					categoryArr={this.props.categoryArr}
-					followData={this.state.followData}
-					isFlag={true}
-					visitModul={this.state.visitModuls}
-					closeDesc={this.closeDesc}
-					loadData={this.props.loadData}
-				/>
-			</div>
-		)
-	}
+  getInitialState() {
+    return {
+      visitArrList: [],
+      loading: false,
+      visitModul: false,
+      visitModuls: false,
+      paginations: {
+        defaultCurrent: 1,
+        defaultPageSize: 10,
+        showQuickJumper: true,
+        pageSize: 10,
+        onChange: function (page) {
+          this.loadVisit(page);
+        }.bind(this),
+        showTotal: function (total) {
+          return "共" + total + "条数据";
+        },
+      },
+      visitsList: [
+        {
+          title: "客户名称",
+          dataIndex: "nickname",
+          key: "nickname",
+          width: 150,
+          render: (text) => {
+            return (
+              <Tooltip title={text}>
+                <div
+                // style={{
+                // 	maxWidth: '150px',
+                // 	overflow: 'hidden',
+                // 	textOverflow: "ellipsis",
+                // 	whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
+              </Tooltip>
+            )
+          },
+        },
+        {
+          title: "跟进方式",
+          dataIndex: "contactType",
+          key: "contactType",
+          width: 100,
+          render: (text) => {
+            return getContactType(text);
+          },
+        },
+        {
+          title: "联系人",
+          dataIndex: "contacts",
+          key: "contacts",
+          width: 150,
+          render: (text, record) => {
+            return (
+              <div>
+                {record.readOnly ? <span>***</span> : <span>{text}</span>}
+              </div>
+            );
+          },
+        },
+        {
+          title: "联系电话",
+          dataIndex: "contactMobile",
+          key: "contactMobile",
+          width: 120,
+          render: (text, record) => {
+            return (
+              <div>
+                {record.readOnly ? <span>***</span> : <span>{text}</span>}
+              </div>
+            );
+          },
+        },
+        {
+          title: "跟进人",
+          dataIndex: "adminName",
+          key: "adminName",
+          width: 120
+        },
+        //   {
+        //     title: "跟进说明",
+        //     dataIndex: "result",
+        //     key: "result",
+        // width: 300,
+        // render: (text, record) => {
+        // 	return (
+        // 		<div style={{wordBreak:"break-all"}}>
+        // 			<div>{text}</div>
+        // 			{
+        // 				getContactType(record.contactType) === '公出打卡' && <div style={{
+        // 					paddingTop: '15px',
+        // 					wordBreak: "break-all",
+        // 					display: "flex",
+        // 					alignItems: 'flex-end'
+        // 				}}>
+        // 					补充说明:
+        // 					{record.supplement}
+        // 					<div style={{paddingLeft: '10px'}}>
+        // 						<PublicSupplement infor={record} onCancel={() => {
+        // 							this.loadVisit(this.state.ispage);
+        // 						}}/>
+        // 					</div>
+        // 				</div>
+        // 			}
+        // 		</div>
+        // 	)
+        // }
+        //   },
+        {
+          title: "跟进时间",
+          dataIndex: "followTime",
+          key: "followTime",
+          width: 125
+        },
+        {
+          title: "公出目标",
+          dataIndex: "result",
+          key: "result",
+          width: 200,
+          // render: (text, record) => {
+          // 	return (
+          // 		<div style={{wordBreak:"break-all"}}>
+          // 			<div>{text}</div>
+          // 			{
+          // 				getContactType(record.contactType) === '公出打卡' && <div style={{
+          // 					paddingTop: '15px',
+          // 					wordBreak: "break-all",
+          // 					display: "flex",
+          // 					alignItems: 'flex-end'
+          // 				}}>
+          // 					{/* 补充说明:
+          // 					{record.supplement} */}
+          // 					<div style={{paddingLeft: '10px'}}>
+          // 						<PublicSupplement infor={record} onCancel={() => {
+          // 							this.loadVisit(this.state.ispage);
+          // 						}}/>
+          // 					</div>
+          // 				</div>
+          // 			}
+          // 		</div>
+          // 	)
+          // }
+        },
+        {
+          title: "公出计划",
+          dataIndex: "plan",
+          key: "plan",
+          width: 200,
+          render: (text) => {
+            return (
+              <div
+              // style={{
+              //   width: 50,
+              //   overflow: "hidden",
+              //   textOverflow: "ellipsis",
+              //   whiteSpace: "nowrap",
+              // }}
+              // title={text}
+              >
+                {text}
+              </div>
+            );
+          },
+        },
+        {
+          title: "预计效果",
+          dataIndex: "expectedEffect",
+          key: "expectedEffect",
+          width: 200,
+          render: (text) => {
+            return (
+              <div
+              // style={{
+              //   width: 50,
+              //   overflow: "hidden",
+              //   textOverflow: "ellipsis",
+              //   whiteSpace: "nowrap",
+              // }}
+              // title={text}
+              >
+                {text}
+              </div>
+            );
+          },
+        },
+        {
+          title: "本次公出目标总结",
+          dataIndex: "supplement",
+          key: "supplement",
+          width: 200,
+          render: (text, record) => {
+            return (
+              <div style={{ wordBreak: "break-all" }}>
+                {
+                  getContactType(record.contactType) === '公出打卡' && <div style={{
+                    // paddingTop: '15px',
+                    wordBreak: "break-all",
+                  }}>
+                    {text}
+                    <div>
+                      <PublicSupplement closeModel={this.closeModel} infor={record} onCancel={() => {
+                        this.loadVisit(this.state.ispage);
+                      }} />
+                    </div>
+                  </div>
+                }
+              </div>
+            );
+          },
+        },
+        {
+          title: "下一次公出计划",
+          dataIndex: "nextPlan",
+          key: "nextPlan",
+          width: 200,
+          render: (text) => {
+            return (
+              <div
+              // style={{
+              //   width: 70,
+              //   overflow: "hidden",
+              //   textOverflow: "ellipsis",
+              //   whiteSpace: "nowrap",
+              // }}
+              // title={text}
+              >
+                {text}
+              </div>
+            );
+          },
+        },
+      ],
+    };
+  },
+  //拜访记录删除
+  visitDelet(e) {
+    this.setState({
+      visitModul: false,
+      loading: true
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/customer/deleteFollow",
+      data: {
+        followId: e.followId, //删除的ID
+      }
+    }).done(function (data) {
+      if (!data.error.length) {
+        message.success('删除成功!');
+        this.setState({
+          loading: false,
+        });
+      } else {
+        message.warning(data.error[0].message);
+      };
+      this.loadVisit();
+    }.bind(this));
+  },
+  //查看跟进记录列表
+  loadVisit(pageNo) {
+    this.setState({
+      loading: true
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + '/api/admin/customer/listFollowHistory',
+      data: {
+        pageNo: pageNo || 1,
+        pageSize: this.state.paginations.pageSize,
+        uid: this.props.data.id, //名称1
+      },
+      success: function (data) {
+        let theArr = [];
+        if (data.error.length || data.data.list == "") {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          };
+        } else {
+          for (let i = 0; i < data.data.list.length; i++) {
+            let thisdata = data.data.list[i];
+            theArr.push(thisdata);
+          };
+          this.state.paginations.current = data.data.pageNo;
+          this.state.paginations.total = data.data.totalCount;
+        };
+        if (data.data.list && !data.data.list.length) {
+          this.state.paginations.current = 0;
+          this.state.paginations.total = 0;
+        };
+        this.setState({
+          visitArrList: theArr,
+          paginations: this.state.paginations
+        });
+      }.bind(this),
+    }).always(function () {
+      this.setState({
+        loading: false
+      });
+    }.bind(this));
+  },
+  componentWillMount() {
+    this.loadVisit();
+  },
+  detailsModal() {
+    this.props.closeDetail(false, false)
+  },
+  closeModel() {
+    this.setState({
+      visitModul: false
+    })
+  },
+  //点击整行
+  VisitRowClick(record) {
+    this.setState({
+      followData: record,
+      visitModul: true,
+    })
+  },
+  //进入新增拜访记录
+  visit() {
+    let obj = {
+      id: this.props.data.id
+    }
+    this.setState({
+      followData: obj,
+      visitModuls: true,
+    })
+  },
+  closeDesc(e, s) {
+    this.state.visitModul = e
+    this.state.visitModuls = e
+    if (s) {
+      this.loadVisit()
+    }
+  },
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.data.id && nextProps.visitState) {
+      this.loadVisit()
+    }
+    this.setState({
+      visitModul: false
+    })
+  },
+  render() {
+    return (
+      <div className="clearfix">
+        <Alert message="注:面谈公出补充,沟通完后记录今天交流的情况。计划下一次什么时候再面谈?该如何面谈?该如何跟进?" banner />
+        <Button
+          onClick={(e) => {
+            e.stopPropagation()
+            if (!this.props.data.orgCode) {
+              message.warning(`请先完善"企业统一社会信用代码"`)
+              return
+            }
+            this.visit();
+          }}
+          type="primary"
+          style={{ marginTop: '10px', float: 'right' }}
+        >
+          客户跟进
+        </Button>
+        <Spin spinning={this.state.loading}>
+          <Table
+            size="middle"
+            style={{ marginTop: '60px' }}
+            pagination={this.state.paginations}
+            columns={this.state.visitsList}
+            dataSource={this.state.visitArrList}
+            scroll={{ x: '120%', y: 440 }}
+            onRowClick={this.VisitRowClick}
+          />
+        </Spin>
+        <VisitDetail
+          categoryArr={this.props.categoryArr}
+          followData={this.state.followData}
+          visitModul={this.state.visitModul}
+          closeDesc={this.closeDesc}
+          mid={this.props.data.id}
+        />
+        <FollowDetail
+          categoryArr={this.props.categoryArr}
+          followData={this.state.followData}
+          isFlag={true}
+          visitModul={this.state.visitModuls}
+          closeDesc={this.closeDesc}
+          loadData={this.props.loadData}
+        />
+      </div>
+    )
+  }
 })
 export default Visit;

Разлика између датотеке није приказан због своје велике величине
+ 786 - 755
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx


Разлика између датотеке није приказан због своје велике величине
+ 570 - 568
js/component/manageCenter/customer/managementFollow/customerFollow/index.jsx


+ 8 - 6
js/component/manageCenter/customer/managementFollow/followUpSummary/index.jsx

@@ -37,12 +37,14 @@ class FollowUpSummary extends Component {
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }

Разлика између датотеке није приказан због своје велике величине
+ 682 - 680
js/component/manageCenter/customer/operationalData/interviewStatistics/detailedList.jsx


+ 321 - 318
js/component/manageCenter/customer/operationalData/receivablesStatistics/detailedList.jsx

@@ -1,336 +1,339 @@
-import React,{ Component } from 'react';
+import React, { Component } from 'react';
 import {
-    Modal,
-    Tooltip,
+  Modal,
+  Tooltip,
 } from "antd";
 import './index.less';
 import TabelContent from "../../../../common/tabelContent";
 import {
-    getLiquidationStatus,
-    getNewOrderStatus,
-    getProjectName
+  getLiquidationStatus,
+  getNewOrderStatus,
+  getProjectName
 } from "../../../../tools";
 
-class DetailedList extends Component{
-    constructor(props) {
-        super(props);
-        this.state= {
-            columns: [
-                {
-                    title: "编号",
-                    dataIndex: "key",
-                    key: "key",
-                    width: 120,
-                },
-                {
-                    title: "催收部门",
-                    dataIndex: "depName",
-                    key: "depName",
-                    width: 320,
-                },
-                {
-                    title: "催款人",
-                    dataIndex: "aName",
-                    key: "aName",
-                    width: 220,
-                },
-                {
-                    title: "签单额(万元)",
-                    dataIndex: "totalAmount",
-                    key: "totalAmount",
-                    className: 'projectTable',
-                    width: 150,
-                    onCellClick: (record, event) => {
-                        event.stopPropagation();
-                        this.setState({
-                            visible1: true,
-                            aid: record.aid
-                        })
-                    },
-                },
-                {
-                    title: "应收款(万元)",
-                    dataIndex: "money",
-                    key: "money",
-                    className: 'projectTable',
-                    width: 150,
-                    onCellClick: (record, event) => {
-                        event.stopPropagation();
-                        this.setState({
-                            visible1: true,
-                            aid: record.aid
-                        })
-                    },
-                },
-            ],
-            columns1: [
-                {
-                    title: "序号",
-                    dataIndex: "key",
-                    key: "key"
-                },
-                {
-                    title: "合同编号",
-                    dataIndex: "contractNo",
-                    key: "contractNo"
-                },
-                {
-                    title: "订单编号",
-                    dataIndex: "orderNo",
-                    key: "orderNo"
-                },
-                {
-                    title: "客户名称",
-                    dataIndex: "userName",
-                    key: "userName",
-                    render: text => {
-                        return (
-                            <Tooltip title={text}>
-                                <div style={{
-                                    maxWidth:'150px',
-                                    overflow:'hidden',
-                                    textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
-                                }}>{text}</div>
-                            </Tooltip>
-                        )
-                    }
-                },
-                {
-                    title: "订单负责人",
-                    dataIndex: "salesmanName",
-                    key: "salesmanName"
-                },
-                {
-                    title: "订单部门",
-                    dataIndex: "depName",
-                    key: "depName"
-                },
-                {
-                    title: "订单状态",
-                    dataIndex: "orderStatus",
-                    key: "orderStatus",
-                    render: text => {
-                        return getNewOrderStatus(text);
-                    }
-                },
-                {
-                    title: "项目状态",
-                    dataIndex: "projectStatus",
-                    key: "projectStatus",
-                    render: text => {
-                        return getProjectName(text);
-                    }
-                },
-                {
-                    title: "签单金额(万元)",
-                    dataIndex: "totalAmount",
-                    key: "totalAmount"
-                },
-                {
-                    title: "已收款(万元)",
-                    dataIndex: "settlementAmount",
-                    key: "settlementAmount"
-                },
-                {
-                    title: "未收款(万元)",
-                    dataIndex: "uncollectedAmount",
-                    key: "uncollectedAmount"
-                },
-                {
-                    title: "结算状态",
-                    dataIndex: "liquidationStatus",
-                    key: "liquidationStatus",
-                    render: text => {
-                        return getLiquidationStatus(text);
-                    }
-                },
-                {
-                    title: "催收科目",
-                    dataIndex: "dunSubject",
-                    key: "dunSubject"
-                },
-                {
-                    title: "应收款(万元)",
-                    dataIndex: "accountsReceivable",
-                    key: "accountsReceivable"
-                },
-                {
-                    title: "催款状态",
-                    dataIndex: "dunStatus",
-                    key: "dunStatus"
-                },
-                {
-                    title: "催款启动日期",
-                    dataIndex: "startDate",
-                    key: "startDate"
-                },
-                {
-                    title: "签单时间",
-                    dataIndex: "signDate",
-                    key: "signDate"
-                }
-            ],
-            searchList:[
-            {
-                type:'newDepartmentSelect',
-                dataKey:'deps',
-                placeholder:'请选择部门'
-            },
-            {
-                type:'autoComplete',
-                dataKey:'aid',
-                api:'/api/admin/customer/listAdminByName',
-                search:'adminName',
-                placeholder:'请输入催款人'
-            },
+class DetailedList extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      columns: [
+        {
+          title: "编号",
+          dataIndex: "key",
+          key: "key",
+          width: 120,
+        },
+        {
+          title: "催收部门",
+          dataIndex: "depName",
+          key: "depName",
+          width: 320,
+        },
+        {
+          title: "催款人",
+          dataIndex: "aName",
+          key: "aName",
+          width: 220,
+        },
+        {
+          title: "签单额(万元)",
+          dataIndex: "totalAmount",
+          key: "totalAmount",
+          className: 'projectTable',
+          width: 150,
+          onCellClick: (record, event) => {
+            event.stopPropagation();
+            this.setState({
+              visible1: true,
+              aid: record.aid
+            })
+          },
+        },
+        {
+          title: "应收款(万元)",
+          dataIndex: "money",
+          key: "money",
+          className: 'projectTable',
+          width: 150,
+          onCellClick: (record, event) => {
+            event.stopPropagation();
+            this.setState({
+              visible1: true,
+              aid: record.aid
+            })
+          },
+        },
+      ],
+      columns1: [
+        {
+          title: "序号",
+          dataIndex: "key",
+          key: "key"
+        },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo"
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo"
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName",
+          render: text => {
+            return (
+              <Tooltip title={text}>
+                <div
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                >{text}</div>
+              </Tooltip>
+            )
+          }
+        },
+        {
+          title: "订单负责人",
+          dataIndex: "salesmanName",
+          key: "salesmanName"
+        },
+        {
+          title: "订单部门",
+          dataIndex: "depName",
+          key: "depName"
+        },
+        {
+          title: "订单状态",
+          dataIndex: "orderStatus",
+          key: "orderStatus",
+          render: text => {
+            return getNewOrderStatus(text);
+          }
+        },
+        {
+          title: "项目状态",
+          dataIndex: "projectStatus",
+          key: "projectStatus",
+          render: text => {
+            return getProjectName(text);
+          }
+        },
+        {
+          title: "签单金额(万元)",
+          dataIndex: "totalAmount",
+          key: "totalAmount"
+        },
+        {
+          title: "已收款(万元)",
+          dataIndex: "settlementAmount",
+          key: "settlementAmount"
+        },
+        {
+          title: "未收款(万元)",
+          dataIndex: "uncollectedAmount",
+          key: "uncollectedAmount"
+        },
+        {
+          title: "结算状态",
+          dataIndex: "liquidationStatus",
+          key: "liquidationStatus",
+          render: text => {
+            return getLiquidationStatus(text);
+          }
+        },
+        {
+          title: "催收科目",
+          dataIndex: "dunSubject",
+          key: "dunSubject"
+        },
+        {
+          title: "应收款(万元)",
+          dataIndex: "accountsReceivable",
+          key: "accountsReceivable"
+        },
+        {
+          title: "催款状态",
+          dataIndex: "dunStatus",
+          key: "dunStatus"
+        },
+        {
+          title: "催款启动日期",
+          dataIndex: "startDate",
+          key: "startDate"
+        },
+        {
+          title: "签单时间",
+          dataIndex: "signDate",
+          key: "signDate"
+        }
+      ],
+      searchList: [
+        {
+          type: 'newDepartmentSelect',
+          dataKey: 'deps',
+          placeholder: '请选择部门'
+        },
+        {
+          type: 'autoComplete',
+          dataKey: 'aid',
+          api: '/api/admin/customer/listAdminByName',
+          search: 'adminName',
+          placeholder: '请输入催款人'
+        },
+        {
+          type: 'select',
+          dataKey: 'sort',
+          placeholder: '请选择排序',
+          selectList: [
             {
-                type:'select',
-                dataKey:'sort',
-                placeholder:'请选择排序',
-                selectList:[
-                    {
-                        value:'0',
-                        label:'按改签单额排序'
-                    },
-                    {
-                        value:'1',
-                        label:'按应收款排序'
-                    },
-                ]
+              value: '0',
+              label: '按改签单额排序'
             },
             {
-                type:'times',
-                title:'催收时间',
-                dataKey:['startDate','endDate'],
+              value: '1',
+              label: '按应收款排序'
             },
-        ],
-            searchList1:[
-                {
-                    type:'text',
-                    dataKey:'name',
-                    placeholder:'请输入客户名称',
-                },
-                {
-                    type:'text',
-                    dataKey:'adminName',
-                    placeholder:'请输入营销员名称'
-                },
-                {
-                    type:'text',
-                    dataKey:'orderNo',
-                    placeholder:'请输入订单编号'
-                },
-                {
-                    type:'text',
-                    dataKey:'contractNo',
-                    placeholder:'请输入合同编号'
-                },
-                {
-                    type:'newDepartmentSelect',
-                    dataKey:'deps',
-                    placeholder:'请选择订单部门'
-                },
-                {
-                    type:'times',
-                    title:'下单时间',
-                    dataKey:['starTime','endTime'],
-                },
-            ],
-            searchConfig:{},
-        }
+          ]
+        },
+        {
+          type: 'times',
+          title: '催收时间',
+          dataKey: ['startDate', 'endDate'],
+        },
+      ],
+      searchList1: [
+        {
+          type: 'text',
+          dataKey: 'name',
+          placeholder: '请输入客户名称',
+        },
+        {
+          type: 'text',
+          dataKey: 'adminName',
+          placeholder: '请输入营销员名称'
+        },
+        {
+          type: 'text',
+          dataKey: 'orderNo',
+          placeholder: '请输入订单编号'
+        },
+        {
+          type: 'text',
+          dataKey: 'contractNo',
+          placeholder: '请输入合同编号'
+        },
+        {
+          type: 'newDepartmentSelect',
+          dataKey: 'deps',
+          placeholder: '请选择订单部门'
+        },
+        {
+          type: 'times',
+          title: '下单时间',
+          dataKey: ['starTime', 'endTime'],
+        },
+      ],
+      searchConfig: {},
     }
+  }
 
-    render() {
-        return (
-            <div>
-                <Modal
-                    maskClosable={false}
-                    visible={this.props.visible}
-                    onOk={this.props.onCancel}
-                    onCancel={this.props.onCancel}
-                    width='1200px'
-                    title={<span>
-                        {this.props.recordInfor.provinceName + '应收款详细'}
-                        <span style={{fontSize:'10px',color:'#0f2be5',marginLeft:'10px'}}>应收款:达到收款节点未收到的款</span>
-                    </span>}
-                    footer=''
-                    className="admin-desc-content">
-                    <div className="user-content">
-                        <TabelContent
-                            scroll={{ x: 0, y: 500}}
-                            searchList={this.state.searchList}
-                            columns={this.state.columns}
-                            searchConfig={this.props.searchConfig}
-                            searchOperation={(value)=>{
-                                for(let i of Object.keys(value)){
-                                    if(i === 'sort' || i === 'pageNo' || i === 'pageSize'){
-                                        delete value[i]
-                                    }
+  render() {
+    return (
+      <div>
+        <Modal
+          maskClosable={false}
+          visible={this.props.visible}
+          onOk={this.props.onCancel}
+          onCancel={this.props.onCancel}
+          width='1200px'
+          title={<span>
+            {this.props.recordInfor.provinceName + '应收款详细'}
+            <span style={{ fontSize: '10px', color: '#0f2be5', marginLeft: '10px' }}>应收款:达到收款节点未收到的款</span>
+          </span>}
+          footer=''
+          className="admin-desc-content">
+          <div className="user-content">
+            <TabelContent
+              scroll={{ x: 0, y: 500 }}
+              searchList={this.state.searchList}
+              columns={this.state.columns}
+              searchConfig={this.props.searchConfig}
+              searchOperation={(value) => {
+                for (let i of Object.keys(value)) {
+                  if (i === 'sort' || i === 'pageNo' || i === 'pageSize') {
+                    delete value[i]
+                  }
 
-                                }
-                                this.setState({searchConfig:value})}
-                            }
-                            tabelApi={'/api/admin/newOrderDun/selectOrderDun'}
-                            exportApi={'/api/admin/newOrderDun/selectOrderDunExprot'}
-                            query={{
-                                province:this.props.recordInfor.province,
-                            }}
-                            dataProcessing={(data)=>{
-                                let theArr = [];
-                                for (let i = 0; i < data.data.length; i++) {
-                                    let thisdata = data.data[i];
-                                    thisdata.key=i + 1;
-                                    theArr.push(thisdata);
-                                }
-                                return theArr;
-                            }}
-                        />
-                    </div>
-                    {this.state.visible1 && <Modal
-                        maskClosable={false}
-                        visible={this.state.visible1}
-                        onOk={()=>{
-                            this.setState({
-                                visible1:false
-                            })
-                        }}
-                        onCancel={()=>{
-                            this.setState({
-                                visible1:false
-                            })
-                        }}
-                        width='1600px'
-                        title='欠款催收列表'
-                        footer=''
-                        className="admin-desc-content">
-                        <div className="user-content">
-                            <TabelContent
-                                searchList={this.state.searchList1}
-                                columns={this.state.columns1}
-                                tabelApi={'/api/admin/newOrder/dunOrderNewList'}
-                                searchConfig={JSON.parse(JSON.stringify(this.state.searchConfig))}
-                                query={{
-                                    specially:1,
-                                    newStatus:1,
-                                    aid:this.state.aid
-                                }}
-                                dataProcessing={(data)=>{
-                                    let theArr = [];
-                                    for (let i = 0; i < data.data.list.length; i++) {
-                                        let thisdata = data.data.list[i];
-                                        thisdata.key=(data.data.pageNo - 1) * data.data.pageSize + i + 1;
-                                        theArr.push(thisdata);
-                                    }
-                                    return theArr;
-                                }}
-                            />
-                        </div>
-                    </Modal>}
-                </Modal>
+                }
+                this.setState({ searchConfig: value })
+              }
+              }
+              tabelApi={'/api/admin/newOrderDun/selectOrderDun'}
+              exportApi={'/api/admin/newOrderDun/selectOrderDunExprot'}
+              query={{
+                province: this.props.recordInfor.province,
+              }}
+              dataProcessing={(data) => {
+                let theArr = [];
+                for (let i = 0; i < data.data.length; i++) {
+                  let thisdata = data.data[i];
+                  thisdata.key = i + 1;
+                  theArr.push(thisdata);
+                }
+                return theArr;
+              }}
+            />
+          </div>
+          {this.state.visible1 && <Modal
+            maskClosable={false}
+            visible={this.state.visible1}
+            onOk={() => {
+              this.setState({
+                visible1: false
+              })
+            }}
+            onCancel={() => {
+              this.setState({
+                visible1: false
+              })
+            }}
+            width='1600px'
+            title='欠款催收列表'
+            footer=''
+            className="admin-desc-content">
+            <div className="user-content">
+              <TabelContent
+                searchList={this.state.searchList1}
+                columns={this.state.columns1}
+                tabelApi={'/api/admin/newOrder/dunOrderNewList'}
+                searchConfig={JSON.parse(JSON.stringify(this.state.searchConfig))}
+                query={{
+                  specially: 1,
+                  newStatus: 1,
+                  aid: this.state.aid
+                }}
+                dataProcessing={(data) => {
+                  let theArr = [];
+                  for (let i = 0; i < data.data.list.length; i++) {
+                    let thisdata = data.data.list[i];
+                    thisdata.key = (data.data.pageNo - 1) * data.data.pageSize + i + 1;
+                    theArr.push(thisdata);
+                  }
+                  return theArr;
+                }}
+              />
             </div>
-        )
-    }
+          </Modal>}
+        </Modal>
+      </div>
+    )
+  }
 }
 
 export default DetailedList;

+ 403 - 401
js/component/manageCenter/customer/operationalData/reexamine/detailedList.jsx

@@ -1,419 +1,421 @@
 import React, { Component } from 'react';
 import {
-    Modal,
-    Tooltip,
+  Modal,
+  Tooltip,
 } from "antd";
 import './index.less';
 import TabelContent from "../../../../common/tabelContent";
 import {
-    getApprovedState,
-    getLiquidationStatus,
-    getNewOrderStatus,
-    getProcessStatus,
+  getApprovedState,
+  getLiquidationStatus,
+  getNewOrderStatus,
+  getProcessStatus,
 } from "../../../../tools";
 
 import Details from './details';
 
 class DetailedList extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            columns: [
-                {
-                    title: "编号",
-                    dataIndex: "key",
-                    key: "key",
-                    width: 120,
-                },
-                {
-                    title: "省份",
-                    dataIndex: "provinceName",
-                    key: "provinceName",
-                    width: 120,
-                },
-                {
-                    title: "跟进人",
-                    dataIndex: "name",
-                    key: "name",
-                    width: 320,
-                },
-                {
-                    title: "高新总数",
-                    dataIndex: "quantity",
-                    key: "quantity",
-                    width: 120,
-                    className: 'projectTable',
-                    onCellClick: (record, event) => {
-                        event.stopPropagation();
-                        this.setState({
-                            visible1: true,
-                            aid: record.aid
-                        })
-                    }
-                },
-                {
-                    title: "已通过高新数",
-                    dataIndex: "pass",
-                    key: "pass",
-                    width: 120,
-                    className: 'projectTable',
-                    onCellClick: (record, event) => {
-                        event.stopPropagation();
-                        this.setState({
-                            visible1: true,
-                            aid: record.aid
-                        })
-                    }
-                },
-                {
-                    title: "已签回",
-                    dataIndex: "signBacks",
-                    key: "signBacks",
-                    width: 120,
-                    className: 'projectTable',
-                    onCellClick: (record, event) => {
-                        event.stopPropagation();
-                        this.setState({
-                            visible1: true,
-                            aid: record.aid
-                        })
-                    }
-                },
-                {
-                    title: "未通过高新数",
-                    dataIndex: "notPass",
-                    key: "notPass",
-                    width: 120,
-                    className: 'projectTable',
-                    onCellClick: (record, event) => {
-                        event.stopPropagation();
-                        this.setState({
-                            visible1: true,
-                            aid: record.aid
-                        })
-                    }
-                },
-            ],
-            columns1: [
-                {
-                    title: "合同编号",
-                    dataIndex: "contractNo",
-                    key: "contractNo",
-                },
-                {
-                    title: "订单编号",
-                    dataIndex: "orderNo",
-                    key: "orderNo",
-                },
-                {
-                    title: "客户名称",
-                    dataIndex: "userName",
-                    key: "userName",
-                    render: text => {
-                        return (
-                            <Tooltip title={text}>
-                                <div style={{
-                                    maxWidth: '150px',
-                                    overflow: 'hidden',
-                                    textOverflow: "ellipsis",
-                                    whiteSpace: 'nowrap',
-                                }}>{text}</div>
-                            </Tooltip>
-                        )
-                    }
-                },
-                {
-                    title: "订单部门",
-                    dataIndex: "depName",
-                    key: "depName",
-                },
-                {
-                    title: "下单时间",
-                    dataIndex: "createDate",
-                    key: "createTime",
-                },
-                {
-                    title: "合同签订时间",
-                    dataIndex: "signDate",
-                    key: "signDate",
-                },
-                {
-                    title: "流程状态",
-                    dataIndex: "processStatus",
-                    key: "processStatus",
-                    render: (text, record) => {
-                        return getProcessStatus(text, record.examineName, record.approval);
-                    },
-                },
-                {
-                    title: "签单金额(万元)",
-                    dataIndex: "totalAmount",
-                    key: "totalAmount",
-                },
-                {
-                    title: "开票金额(万元)",
-                    dataIndex: "invoiceAmount",
-                    key: "invoiceAmount",
-                },
-                {
-                    title: "已收款(万元)",
-                    dataIndex: "settlementAmount",
-                    key: "settlementAmount",
-                },
-                {
-                    title: "结算状态",
-                    dataIndex: "liquidationStatus",
-                    key: "liquidationStatus",
-                    render: (text) => {
-                        return getLiquidationStatus(text);
-                    },
-                },
-                {
-                    title: "是否特批",
-                    dataIndex: "approval",
-                    key: "approval",
-                    render: (text) => {
-                        return getApprovedState(text);
-                    },
-                },
-                {
-                    title: "订单状态",
-                    dataIndex: "orderStatus",
-                    key: "orderStatus",
-                    render: (text) => {
-                        return getNewOrderStatus(text);
-                    },
-                },
-                {
-                    title: "财务负责人",
-                    dataIndex: "financeName",
-                    key: "financeName",
-                },
-            ],
-            searchList: [
-                {
-                    type: 'newDepartmentSelect',
-                    dataKey: 'deps',
-                    placeholder: '请选择部门'
-                },
-                {
-                    type: 'autoComplete',
-                    dataTitle: 'aName',
-                    dataKey: 'aid',
-                    api: '/api/admin/customer/listAdminByName',
-                    search: 'adminName',
-                    placeholder: '请输入跟进人'
-                },
-                {
-                    type: 'select',
-                    dataKey: 'sort',
-                    placeholder: '请选择排序',
-                    selectList: [
-                        {
-                            value: '0',
-                            label: '按总金额排序'
-                        },
-                        {
-                            value: '1',
-                            label: '按数量排序'
-                        },
-                    ]
-                },
-                {
-                    type: 'times',
-                    title: '时间',
-                    dataKey: ['startDate', 'endDate'],
-                },
-            ],
-            searchList1: [
-                {
-                    type: 'text',
-                    placeholder: '请输入订单编号',
-                    dataKey: 'orderNo',
-                },
-                {
-                    type: 'text',
-                    placeholder: '请输入客户名称',
-                    dataKey: 'name',
-                },
-                {
-                    type: 'text',
-                    placeholder: '请输入合同编号',
-                    dataKey: 'contractNo',
-                },
-                {
-                    type: 'select',
-                    dataKey: 'liquidationStatus',
-                    placeholder: '请选择结算状态',
-                    selectList: [
-                        {
-                            value: '0',
-                            label: '首付待付请'
-                        },
-                        {
-                            value: '1',
-                            label: '尾款待付清'
-                        },
-                        {
-                            value: '2',
-                            label: '已付清'
-                        },
-                    ]
-                },
-                {
-                    type: 'select',
-                    dataKey: 'approval',
-                    placeholder: '请选择特批状态',
-                    selectList: [
-                        {
-                            value: '0',
-                            label: '非特批'
-                        },
-                        {
-                            value: '1',
-                            label: '特批'
-                        },
-                    ]
-                },
-                {
-                    type: 'select',
-                    dataKey: 'amountStatus',
-                    placeholder: '请选择签单金额',
-                    selectList: [
-                        {
-                            value: '0',
-                            label: '10万元以下'
-                        },
-                        {
-                            value: '1',
-                            label: '10~20万元'
-                        },
-                        {
-                            value: '2',
-                            label: '20~30万元'
-                        },
-                        {
-                            value: '3',
-                            label: '30~40万元'
-                        },
-                        {
-                            value: '4',
-                            label: '40万元以上'
-                        },
-                    ]
-                },
-            ],
-            searchConfig: {},
-        }
+  constructor(props) {
+    super(props);
+    this.state = {
+      columns: [
+        {
+          title: "编号",
+          dataIndex: "key",
+          key: "key",
+          width: 120,
+        },
+        {
+          title: "省份",
+          dataIndex: "provinceName",
+          key: "provinceName",
+          width: 120,
+        },
+        {
+          title: "跟进人",
+          dataIndex: "name",
+          key: "name",
+          width: 320,
+        },
+        {
+          title: "高新总数",
+          dataIndex: "quantity",
+          key: "quantity",
+          width: 120,
+          className: 'projectTable',
+          onCellClick: (record, event) => {
+            event.stopPropagation();
+            this.setState({
+              visible1: true,
+              aid: record.aid
+            })
+          }
+        },
+        {
+          title: "已通过高新数",
+          dataIndex: "pass",
+          key: "pass",
+          width: 120,
+          className: 'projectTable',
+          onCellClick: (record, event) => {
+            event.stopPropagation();
+            this.setState({
+              visible1: true,
+              aid: record.aid
+            })
+          }
+        },
+        {
+          title: "已签回",
+          dataIndex: "signBacks",
+          key: "signBacks",
+          width: 120,
+          className: 'projectTable',
+          onCellClick: (record, event) => {
+            event.stopPropagation();
+            this.setState({
+              visible1: true,
+              aid: record.aid
+            })
+          }
+        },
+        {
+          title: "未通过高新数",
+          dataIndex: "notPass",
+          key: "notPass",
+          width: 120,
+          className: 'projectTable',
+          onCellClick: (record, event) => {
+            event.stopPropagation();
+            this.setState({
+              visible1: true,
+              aid: record.aid
+            })
+          }
+        },
+      ],
+      columns1: [
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo",
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo",
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName",
+          render: text => {
+            return (
+              <Tooltip title={text}>
+                <div
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                >{text}</div>
+              </Tooltip>
+            )
+          }
+        },
+        {
+          title: "订单部门",
+          dataIndex: "depName",
+          key: "depName",
+        },
+        {
+          title: "下单时间",
+          dataIndex: "createDate",
+          key: "createTime",
+        },
+        {
+          title: "合同签订时间",
+          dataIndex: "signDate",
+          key: "signDate",
+        },
+        {
+          title: "流程状态",
+          dataIndex: "processStatus",
+          key: "processStatus",
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
+        },
+        {
+          title: "签单金额(万元)",
+          dataIndex: "totalAmount",
+          key: "totalAmount",
+        },
+        {
+          title: "开票金额(万元)",
+          dataIndex: "invoiceAmount",
+          key: "invoiceAmount",
+        },
+        {
+          title: "已收款(万元)",
+          dataIndex: "settlementAmount",
+          key: "settlementAmount",
+        },
+        {
+          title: "结算状态",
+          dataIndex: "liquidationStatus",
+          key: "liquidationStatus",
+          render: (text) => {
+            return getLiquidationStatus(text);
+          },
+        },
+        {
+          title: "是否特批",
+          dataIndex: "approval",
+          key: "approval",
+          render: (text) => {
+            return getApprovedState(text);
+          },
+        },
+        {
+          title: "订单状态",
+          dataIndex: "orderStatus",
+          key: "orderStatus",
+          render: (text) => {
+            return getNewOrderStatus(text);
+          },
+        },
+        {
+          title: "财务负责人",
+          dataIndex: "financeName",
+          key: "financeName",
+        },
+      ],
+      searchList: [
+        {
+          type: 'newDepartmentSelect',
+          dataKey: 'deps',
+          placeholder: '请选择部门'
+        },
+        {
+          type: 'autoComplete',
+          dataTitle: 'aName',
+          dataKey: 'aid',
+          api: '/api/admin/customer/listAdminByName',
+          search: 'adminName',
+          placeholder: '请输入跟进人'
+        },
+        {
+          type: 'select',
+          dataKey: 'sort',
+          placeholder: '请选择排序',
+          selectList: [
+            {
+              value: '0',
+              label: '按总金额排序'
+            },
+            {
+              value: '1',
+              label: '按数量排序'
+            },
+          ]
+        },
+        {
+          type: 'times',
+          title: '时间',
+          dataKey: ['startDate', 'endDate'],
+        },
+      ],
+      searchList1: [
+        {
+          type: 'text',
+          placeholder: '请输入订单编号',
+          dataKey: 'orderNo',
+        },
+        {
+          type: 'text',
+          placeholder: '请输入客户名称',
+          dataKey: 'name',
+        },
+        {
+          type: 'text',
+          placeholder: '请输入合同编号',
+          dataKey: 'contractNo',
+        },
+        {
+          type: 'select',
+          dataKey: 'liquidationStatus',
+          placeholder: '请选择结算状态',
+          selectList: [
+            {
+              value: '0',
+              label: '首付待付请'
+            },
+            {
+              value: '1',
+              label: '尾款待付清'
+            },
+            {
+              value: '2',
+              label: '已付清'
+            },
+          ]
+        },
+        {
+          type: 'select',
+          dataKey: 'approval',
+          placeholder: '请选择特批状态',
+          selectList: [
+            {
+              value: '0',
+              label: '非特批'
+            },
+            {
+              value: '1',
+              label: '特批'
+            },
+          ]
+        },
+        {
+          type: 'select',
+          dataKey: 'amountStatus',
+          placeholder: '请选择签单金额',
+          selectList: [
+            {
+              value: '0',
+              label: '10万元以下'
+            },
+            {
+              value: '1',
+              label: '10~20万元'
+            },
+            {
+              value: '2',
+              label: '20~30万元'
+            },
+            {
+              value: '3',
+              label: '30~40万元'
+            },
+            {
+              value: '4',
+              label: '40万元以上'
+            },
+          ]
+        },
+      ],
+      searchConfig: {},
     }
+  }
 
-    render() {
-        return (
-            <div>
-                <Modal
-                    maskClosable={false}
-                    visible={this.props.visible}
-                    onOk={this.props.onCancel}
-                    onCancel={this.props.onCancel}
-                    width='1200px'
-                    title={this.props.recordInfor.provinceName + '需复审详细'}
-                    footer=''
-                    className="admin-desc-content">
-                    <div className="user-content">
-                        <TabelContent
-                            scroll={{ x: 0, y: 500 }}
-                            searchList={this.state.searchList}
-                            columns={this.state.columns}
-                            searchConfig={this.props.searchConfig}
-                            onRowClick={() => { }}
-                            searchOperation={(value) => {
-                                for (let i of Object.keys(value)) {
-                                    if (i === 'sort' || i === 'pageNo' || i === 'pageSize') {
-                                        delete value[i]
-                                    }
+  render() {
+    return (
+      <div>
+        <Modal
+          maskClosable={false}
+          visible={this.props.visible}
+          onOk={this.props.onCancel}
+          onCancel={this.props.onCancel}
+          width='1200px'
+          title={this.props.recordInfor.provinceName + '需复审详细'}
+          footer=''
+          className="admin-desc-content">
+          <div className="user-content">
+            <TabelContent
+              scroll={{ x: 0, y: 500 }}
+              searchList={this.state.searchList}
+              columns={this.state.columns}
+              searchConfig={this.props.searchConfig}
+              onRowClick={() => { }}
+              searchOperation={(value) => {
+                for (let i of Object.keys(value)) {
+                  if (i === 'sort' || i === 'pageNo' || i === 'pageSize') {
+                    delete value[i]
+                  }
 
-                                }
-                                this.setState({ searchConfig: value })
-                            }
-                            }
-                            tabelApi={'/api/admin/orderProject/highNewRetrialList'}
-                            exportApi={'/api/admin/orderProject/highNewRetrialList/export'}
-                            query={{
-                                province: this.props.recordInfor.province,
-                            }}
-                            dataProcessing={(data) => {
-                                let theArr = [];
-                                for (let i = 0; i < data.data.length; i++) {
-                                    let thisdata = data.data[i];
-                                    thisdata.key = i + 1;
-                                    theArr.push(thisdata);
-                                }
-                                return theArr;
-                            }}
-                        />
-                    </div>
-                    {this.state.visible1 && <Modal
-                        maskClosable={false}
-                        visible={this.state.visible1}
-                        onOk={() => {
-                            this.setState({
-                                visible1: false,
-                                aid: '',
-                            })
-                        }}
-                        onCancel={() => {
-                            this.setState({
-                                visible1: false,
-                                aid: '',
-                            })
-                        }}
-                        width='1600px'
-                        title='客户订单列表'
-                        footer=''
-                        className="admin-desc-content">
-                        <div className="user-content">
-                            <TabelContent
-                                scroll={{ x: 1200 }}
-                                searchConfig={JSON.parse(JSON.stringify(this.state.searchConfig))}
-                                searchList={this.state.searchList1}
-                                columns={this.state.columns1}
-                                tabelApi={'/api/admin/newOrder/orderNewList'}
-                                query={{
-                                    aid: this.state.aid,
-                                    specially: 9,
-                                }}
-                                onRowClick={(obj) => {
-                                    this.setState({
-                                        detailsVisible: true,
-                                        orderNo: obj.orderNo
-                                    })
-                                }}
-                                dataProcessing={(data) => {
-                                    let theArr = [];
-                                    for (let i = 0; i < data.data.list.length; i++) {
-                                        let thisdata = data.data.list[i];
-                                        thisdata.key = (data.data.pageNo - 1) * data.data.pageSize + i + 1;
-                                        theArr.push(thisdata);
-                                    }
-                                    return theArr;
-                                }}
-                            />
-                        </div>
-                    </Modal>}
-                </Modal>
-                {this.state.detailsVisible && <Details
-                    orderNo={this.state.orderNo}
-                    visible={this.state.detailsVisible}
-                    onCancel={() => {
-                        this.setState({
-                            detailsVisible: false,
-                            orderNo: ''
-                        })
-                    }}
-                />}
+                }
+                this.setState({ searchConfig: value })
+              }
+              }
+              tabelApi={'/api/admin/orderProject/highNewRetrialList'}
+              exportApi={'/api/admin/orderProject/highNewRetrialList/export'}
+              query={{
+                province: this.props.recordInfor.province,
+              }}
+              dataProcessing={(data) => {
+                let theArr = [];
+                for (let i = 0; i < data.data.length; i++) {
+                  let thisdata = data.data[i];
+                  thisdata.key = i + 1;
+                  theArr.push(thisdata);
+                }
+                return theArr;
+              }}
+            />
+          </div>
+          {this.state.visible1 && <Modal
+            maskClosable={false}
+            visible={this.state.visible1}
+            onOk={() => {
+              this.setState({
+                visible1: false,
+                aid: '',
+              })
+            }}
+            onCancel={() => {
+              this.setState({
+                visible1: false,
+                aid: '',
+              })
+            }}
+            width='1600px'
+            title='客户订单列表'
+            footer=''
+            className="admin-desc-content">
+            <div className="user-content">
+              <TabelContent
+                scroll={{ x: 1200 }}
+                searchConfig={JSON.parse(JSON.stringify(this.state.searchConfig))}
+                searchList={this.state.searchList1}
+                columns={this.state.columns1}
+                tabelApi={'/api/admin/newOrder/orderNewList'}
+                query={{
+                  aid: this.state.aid,
+                  specially: 9,
+                }}
+                onRowClick={(obj) => {
+                  this.setState({
+                    detailsVisible: true,
+                    orderNo: obj.orderNo
+                  })
+                }}
+                dataProcessing={(data) => {
+                  let theArr = [];
+                  for (let i = 0; i < data.data.list.length; i++) {
+                    let thisdata = data.data.list[i];
+                    thisdata.key = (data.data.pageNo - 1) * data.data.pageSize + i + 1;
+                    theArr.push(thisdata);
+                  }
+                  return theArr;
+                }}
+              />
             </div>
-        )
-    }
+          </Modal>}
+        </Modal>
+        {this.state.detailsVisible && <Details
+          orderNo={this.state.orderNo}
+          visible={this.state.detailsVisible}
+          onCancel={() => {
+            this.setState({
+              detailsVisible: false,
+              orderNo: ''
+            })
+          }}
+        />}
+      </div>
+    )
+  }
 }
 
 export default DetailedList;

+ 381 - 379
js/component/manageCenter/customer/operationalData/signatureStatistics/detailedList.jsx

@@ -1,394 +1,396 @@
 import React, { Component } from 'react';
 import {
-    Modal,
-    Tooltip,
+  Modal,
+  Tooltip,
 } from "antd";
 import './index.less';
 import TabelContent from "../../../../common/tabelContent";
 import { getApprovedState, getLiquidationStatus, getNewOrderStatus, getProcessStatus } from "../../../../tools";
 
 class DetailedList extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            columns: [
-                {
-                    title: "编号",
-                    dataIndex: "key",
-                    key: "key",
-                    width: 120,
-                },
-                {
-                    title: "订单部门",
-                    dataIndex: "depName",
-                    key: "depName",
-                    width: 320,
-                },
-                {
-                    title: "签单人",
-                    dataIndex: "name",
-                    key: "name",
-                    width: 220,
-                },
-                {
-                    title: "总单量(个)",
-                    dataIndex: "quantity",
-                    key: "quantity",
-                    className: 'projectTable',
-                    width: 150,
-                    onCellClick: (record, event) => {
-                        event.stopPropagation();
-                        this.setState({
-                            visible1: true,
-                            aid: record.aid
-                        })
-                    },
-                },
-                {
-                    title: "总签单额(万元)",
-                    dataIndex: "total",
-                    key: "total",
-                    className: 'projectTable',
-                    width: 150,
-                    onCellClick: (record, event) => {
-                        event.stopPropagation();
-                        this.setState({
-                            visible1: true,
-                            aid: record.aid
-                        })
-                    },
-                },
-            ],
-            columns1: [
-                {
-                    title: "合同编号",
-                    dataIndex: "contractNo",
-                    key: "contractNo",
-                },
-                {
-                    title: "订单编号",
-                    dataIndex: "orderNo",
-                    key: "orderNo",
-                },
-                {
-                    title: "客户名称",
-                    dataIndex: "userName",
-                    key: "userName",
-                    render: text => {
-                        return (
-                            <Tooltip title={text}>
-                                <div style={{
-                                    maxWidth: '150px',
-                                    overflow: 'hidden',
-                                    textOverflow: "ellipsis",
-                                    whiteSpace: 'nowrap',
-                                }}>{text}</div>
-                            </Tooltip>
-                        )
-                    }
-                },
-                {
-                    title: "订单部门",
-                    dataIndex: "depName",
-                    key: "depName",
-                },
-                {
-                    title: "下单时间",
-                    dataIndex: "createDate",
-                    key: "createTime",
-                },
-                {
-                    title: "合同签订时间",
-                    dataIndex: "signDate",
-                    key: "signDate",
-                },
-                {
-                    title: "流程状态",
-                    dataIndex: "processStatus",
-                    key: "processStatus",
-                    render: (text, record) => {
-                        return getProcessStatus(text, record.examineName, record.approval);
-                    },
-                },
-                {
-                    title: "签单金额(万元)",
-                    dataIndex: "totalAmount",
-                    key: "totalAmount",
-                },
-                {
-                    title: "开票金额(万元)",
-                    dataIndex: "invoiceAmount",
-                    key: "invoiceAmount",
-                },
-                {
-                    title: "已收款(万元)",
-                    dataIndex: "settlementAmount",
-                    key: "settlementAmount",
-                },
-                {
-                    title: "结算状态",
-                    dataIndex: "liquidationStatus",
-                    key: "liquidationStatus",
-                    render: (text) => {
-                        return getLiquidationStatus(text);
-                    },
-                },
-                {
-                    title: "是否特批",
-                    dataIndex: "approval",
-                    key: "approval",
-                    render: (text) => {
-                        return getApprovedState(text);
-                    },
-                },
-                {
-                    title: "订单状态",
-                    dataIndex: "orderStatus",
-                    key: "orderStatus",
-                    render: (text) => {
-                        return getNewOrderStatus(text);
-                    },
-                },
-                {
-                    title: "财务负责人",
-                    dataIndex: "financeName",
-                    key: "financeName",
-                },
-            ],
-            searchList: [
-                {
-                    type: 'newDepartmentSelect',
-                    dataKey: 'deps',
-                    placeholder: '请选择部门'
-                },
-                {
-                    type: 'times',
-                    title: '下单时间',
-                    dataKey: ['startCreate', 'endCreate'],
-                },
-                {
-                    type: 'times',
-                    title: '合同时间',
-                    dataKey: ['startSign', 'endSign'],
-                },
-                {
-                    type: 'select',
-                    dataKey: 'sort',
-                    placeholder: '请选择排序',
-                    selectList: [
-                        {
-                            value: '0',
-                            label: '按总金额排序'
-                        },
-                        {
-                            value: '1',
-                            label: '按数量排序'
-                        },
-                    ]
-                },
-            ],
-            searchList1: [
-                {
-                    type: 'text',
-                    dataKey: 'orderNo',
-                    placeholder: '请输入订单编号'
-                },
-                {
-                    type: 'text',
-                    dataKey: 'name',
-                    placeholder: '请输入客户名称'
-                },
-                {
-                    type: 'departmentSelect',
-                    dataKey: 'depId',
-                    placeholder: '请选择部门'
-                },
-                {
-                    type: 'text',
-                    dataKey: 'contractNo',
-                    placeholder: '请输入合同编号'
-                },
-                {
-                    type: 'select',
-                    dataKey: 'liquidationStatus',
-                    placeholder: '请选择结算状态',
-                    selectList: [
-                        {
-                            value: '0',
-                            label: '首付待付请'
-                        },
-                        {
-                            value: '1',
-                            label: '尾款待付清'
-                        },
-                        {
-                            value: '2',
-                            label: '已付清'
-                        }
-                    ]
-                },
-                {
-                    type: 'select',
-                    dataKey: 'approval',
-                    placeholder: '请选择特批状态',
-                    selectList: [
-                        {
-                            value: '0',
-                            label: '非特批'
-                        },
-                        {
-                            value: '1',
-                            label: '特批'
-                        }
-                    ]
-                },
-                {
-                    type: 'select',
-                    dataKey: 'amountStatus',
-                    placeholder: '请选择签单金额',
-                    selectList: [
-                        {
-                            value: '0',
-                            label: '10万元以下'
-                        },
-                        {
-                            value: '1',
-                            label: '10~20万元'
-                        },
-                        {
-                            value: '2',
-                            label: '20~30万元'
-                        },
-                        {
-                            value: '3',
-                            label: '30~40万元'
-                        },
-                        {
-                            value: '4',
-                            label: '40万元以上'
-                        },
-                    ]
-                },
-                {
-                    type: 'times',
-                    title: '下单时间',
-                    dataKey: ['starTime', 'endTime'],
-                },
-                {
-                    type: 'times',
-                    title: '合同时间',
-                    dataKey: ['contractStart', 'contractEnd'],
-                },
-            ],
-            searchConfig: {},
-        }
+  constructor(props) {
+    super(props);
+    this.state = {
+      columns: [
+        {
+          title: "编号",
+          dataIndex: "key",
+          key: "key",
+          width: 120,
+        },
+        {
+          title: "订单部门",
+          dataIndex: "depName",
+          key: "depName",
+          width: 320,
+        },
+        {
+          title: "签单人",
+          dataIndex: "name",
+          key: "name",
+          width: 220,
+        },
+        {
+          title: "总单量(个)",
+          dataIndex: "quantity",
+          key: "quantity",
+          className: 'projectTable',
+          width: 150,
+          onCellClick: (record, event) => {
+            event.stopPropagation();
+            this.setState({
+              visible1: true,
+              aid: record.aid
+            })
+          },
+        },
+        {
+          title: "总签单额(万元)",
+          dataIndex: "total",
+          key: "total",
+          className: 'projectTable',
+          width: 150,
+          onCellClick: (record, event) => {
+            event.stopPropagation();
+            this.setState({
+              visible1: true,
+              aid: record.aid
+            })
+          },
+        },
+      ],
+      columns1: [
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo",
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo",
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName",
+          render: text => {
+            return (
+              <Tooltip title={text}>
+                <div
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                >{text}</div>
+              </Tooltip>
+            )
+          }
+        },
+        {
+          title: "订单部门",
+          dataIndex: "depName",
+          key: "depName",
+        },
+        {
+          title: "下单时间",
+          dataIndex: "createDate",
+          key: "createTime",
+        },
+        {
+          title: "合同签订时间",
+          dataIndex: "signDate",
+          key: "signDate",
+        },
+        {
+          title: "流程状态",
+          dataIndex: "processStatus",
+          key: "processStatus",
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
+        },
+        {
+          title: "签单金额(万元)",
+          dataIndex: "totalAmount",
+          key: "totalAmount",
+        },
+        {
+          title: "开票金额(万元)",
+          dataIndex: "invoiceAmount",
+          key: "invoiceAmount",
+        },
+        {
+          title: "已收款(万元)",
+          dataIndex: "settlementAmount",
+          key: "settlementAmount",
+        },
+        {
+          title: "结算状态",
+          dataIndex: "liquidationStatus",
+          key: "liquidationStatus",
+          render: (text) => {
+            return getLiquidationStatus(text);
+          },
+        },
+        {
+          title: "是否特批",
+          dataIndex: "approval",
+          key: "approval",
+          render: (text) => {
+            return getApprovedState(text);
+          },
+        },
+        {
+          title: "订单状态",
+          dataIndex: "orderStatus",
+          key: "orderStatus",
+          render: (text) => {
+            return getNewOrderStatus(text);
+          },
+        },
+        {
+          title: "财务负责人",
+          dataIndex: "financeName",
+          key: "financeName",
+        },
+      ],
+      searchList: [
+        {
+          type: 'newDepartmentSelect',
+          dataKey: 'deps',
+          placeholder: '请选择部门'
+        },
+        {
+          type: 'times',
+          title: '下单时间',
+          dataKey: ['startCreate', 'endCreate'],
+        },
+        {
+          type: 'times',
+          title: '合同时间',
+          dataKey: ['startSign', 'endSign'],
+        },
+        {
+          type: 'select',
+          dataKey: 'sort',
+          placeholder: '请选择排序',
+          selectList: [
+            {
+              value: '0',
+              label: '按总金额排序'
+            },
+            {
+              value: '1',
+              label: '按数量排序'
+            },
+          ]
+        },
+      ],
+      searchList1: [
+        {
+          type: 'text',
+          dataKey: 'orderNo',
+          placeholder: '请输入订单编号'
+        },
+        {
+          type: 'text',
+          dataKey: 'name',
+          placeholder: '请输入客户名称'
+        },
+        {
+          type: 'departmentSelect',
+          dataKey: 'depId',
+          placeholder: '请选择部门'
+        },
+        {
+          type: 'text',
+          dataKey: 'contractNo',
+          placeholder: '请输入合同编号'
+        },
+        {
+          type: 'select',
+          dataKey: 'liquidationStatus',
+          placeholder: '请选择结算状态',
+          selectList: [
+            {
+              value: '0',
+              label: '首付待付请'
+            },
+            {
+              value: '1',
+              label: '尾款待付清'
+            },
+            {
+              value: '2',
+              label: '已付清'
+            }
+          ]
+        },
+        {
+          type: 'select',
+          dataKey: 'approval',
+          placeholder: '请选择特批状态',
+          selectList: [
+            {
+              value: '0',
+              label: '非特批'
+            },
+            {
+              value: '1',
+              label: '特批'
+            }
+          ]
+        },
+        {
+          type: 'select',
+          dataKey: 'amountStatus',
+          placeholder: '请选择签单金额',
+          selectList: [
+            {
+              value: '0',
+              label: '10万元以下'
+            },
+            {
+              value: '1',
+              label: '10~20万元'
+            },
+            {
+              value: '2',
+              label: '20~30万元'
+            },
+            {
+              value: '3',
+              label: '30~40万元'
+            },
+            {
+              value: '4',
+              label: '40万元以上'
+            },
+          ]
+        },
+        {
+          type: 'times',
+          title: '下单时间',
+          dataKey: ['starTime', 'endTime'],
+        },
+        {
+          type: 'times',
+          title: '合同时间',
+          dataKey: ['contractStart', 'contractEnd'],
+        },
+      ],
+      searchConfig: {},
     }
+  }
 
-    // componentWillMount() {
-    //     if(this.props.searchConfig['orderNo']){
-    //         this.state.searchList[0]['searchValue'] = this.props.searchConfig['orderNoTitle'];
-    //         console.log(this.state.searchList)
-    //         this.setState({
-    //             searchList:this.state.searchList
-    //         })
-    //     }
-    // }
+  // componentWillMount() {
+  //     if(this.props.searchConfig['orderNo']){
+  //         this.state.searchList[0]['searchValue'] = this.props.searchConfig['orderNoTitle'];
+  //         console.log(this.state.searchList)
+  //         this.setState({
+  //             searchList:this.state.searchList
+  //         })
+  //     }
+  // }
 
-    render() {
-        return (
-            <div>
-                <Modal
-                    maskClosable={false}
-                    visible={this.props.visible}
-                    onOk={this.props.onCancel}
-                    onCancel={this.props.onCancel}
-                    width='1200px'
-                    title={this.props.recordInfor.province + '签单统计表'}
-                    footer=''
-                    className="admin-desc-content">
-                    <div className="user-content">
-                        <TabelContent
-                            scroll={{ x: 0, y: 500 }}
-                            searchList={this.state.searchList}
-                            columns={this.state.columns}
-                            tabelApi={'/api/admin/newOrder/provinceStatisticsList'}
-                            searchConfig={this.props.searchConfig}
-                            searchOperation={(value) => {
-                                for (let i of Object.keys(value)) {
-                                    if (i === 'sort' || i === 'pageNo' || i === 'pageSize') {
-                                        delete value[i]
-                                    }
-                                    if (i === 'startSign') {
-                                        value['contractStart'] = value['startSign']
-                                    }
-                                    if (i === 'endSign') {
-                                        value['contractEnd'] = value['endSign']
-                                    }
-                                }
-                                this.setState({ searchConfig: value })
-                            }
-                            }
-                            exportApi={'/api/admin/newOrder/provinceStatisticsListExprot'}
-                            query={{
-                                province: this.props.recordInfor.id,
-                            }}
-                            dataProcessing={(data) => {
-                                let theArr = [];
-                                for (let i = 0; i < data.data.length; i++) {
-                                    let thisdata = data.data[i];
-                                    // thisdata.key=(data.data.pageNo - 1) * data.data.pageSize + i + 1;
-                                    thisdata.key = i + 1;
-                                    theArr.push(thisdata);
-                                }
-                                return theArr;
-                            }}
-                        />
-                    </div>
-                    {this.state.visible1 && <Modal
-                        maskClosable={false}
-                        visible={this.state.visible1}
-                        onOk={() => {
-                            this.setState({
-                                visible1: false
-                            })
-                        }}
-                        onCancel={() => {
-                            // console.log(this.state.searchConfig,'this.state.searchConfig')
-                            this.setState({
-                                visible1: false
-                            })
-                        }}
-                        width='1600px'
-                        title='个人订单'
-                        footer=''
-                        className="admin-desc-content">
-                        <div className="user-content">
-                            <TabelContent
-                                searchList={this.state.searchList1}
-                                columns={this.state.columns1}
-                                searchConfig={JSON.parse(JSON.stringify(this.state.searchConfig))}
-                                tabelApi={'/api/admin/newOrder/orderNewList'}
-                                exportApi={false}
-                                query={{
-                                    specially: 7,
-                                    aid: this.state.aid
-                                }}
-                                dataProcessing={(data) => {
-                                    let theArr = [];
-                                    for (let i = 0; i < data.data.list.length; i++) {
-                                        let thisdata = data.data.list[i];
-                                        thisdata.key = (data.data.pageNo - 1) * data.data.pageSize + i + 1;
-                                        theArr.push(thisdata);
-                                    }
-                                    return theArr;
-                                }}
-                            />
-                        </div>
-                    </Modal>}
-                </Modal>
+  render() {
+    return (
+      <div>
+        <Modal
+          maskClosable={false}
+          visible={this.props.visible}
+          onOk={this.props.onCancel}
+          onCancel={this.props.onCancel}
+          width='1200px'
+          title={this.props.recordInfor.province + '签单统计表'}
+          footer=''
+          className="admin-desc-content">
+          <div className="user-content">
+            <TabelContent
+              scroll={{ x: 0, y: 500 }}
+              searchList={this.state.searchList}
+              columns={this.state.columns}
+              tabelApi={'/api/admin/newOrder/provinceStatisticsList'}
+              searchConfig={this.props.searchConfig}
+              searchOperation={(value) => {
+                for (let i of Object.keys(value)) {
+                  if (i === 'sort' || i === 'pageNo' || i === 'pageSize') {
+                    delete value[i]
+                  }
+                  if (i === 'startSign') {
+                    value['contractStart'] = value['startSign']
+                  }
+                  if (i === 'endSign') {
+                    value['contractEnd'] = value['endSign']
+                  }
+                }
+                this.setState({ searchConfig: value })
+              }
+              }
+              exportApi={'/api/admin/newOrder/provinceStatisticsListExprot'}
+              query={{
+                province: this.props.recordInfor.id,
+              }}
+              dataProcessing={(data) => {
+                let theArr = [];
+                for (let i = 0; i < data.data.length; i++) {
+                  let thisdata = data.data[i];
+                  // thisdata.key=(data.data.pageNo - 1) * data.data.pageSize + i + 1;
+                  thisdata.key = i + 1;
+                  theArr.push(thisdata);
+                }
+                return theArr;
+              }}
+            />
+          </div>
+          {this.state.visible1 && <Modal
+            maskClosable={false}
+            visible={this.state.visible1}
+            onOk={() => {
+              this.setState({
+                visible1: false
+              })
+            }}
+            onCancel={() => {
+              // console.log(this.state.searchConfig,'this.state.searchConfig')
+              this.setState({
+                visible1: false
+              })
+            }}
+            width='1600px'
+            title='个人订单'
+            footer=''
+            className="admin-desc-content">
+            <div className="user-content">
+              <TabelContent
+                searchList={this.state.searchList1}
+                columns={this.state.columns1}
+                searchConfig={JSON.parse(JSON.stringify(this.state.searchConfig))}
+                tabelApi={'/api/admin/newOrder/orderNewList'}
+                exportApi={false}
+                query={{
+                  specially: 7,
+                  aid: this.state.aid
+                }}
+                dataProcessing={(data) => {
+                  let theArr = [];
+                  for (let i = 0; i < data.data.list.length; i++) {
+                    let thisdata = data.data.list[i];
+                    thisdata.key = (data.data.pageNo - 1) * data.data.pageSize + i + 1;
+                    theArr.push(thisdata);
+                  }
+                  return theArr;
+                }}
+              />
             </div>
-        )
-    }
+          </Modal>}
+        </Modal>
+      </div>
+    )
+  }
 }
 
 export default DetailedList;

Разлика између датотеке није приказан због своје велике величине
+ 577 - 575
js/component/manageCenter/customerService/administration/followUp.jsx


+ 18 - 18
js/component/manageCenter/customerService/administration/order.jsx

@@ -503,12 +503,12 @@ const Order = Form.create()(
               return (
                 <Tooltip title={text}>
                   <div
-                    style={{
-                      maxWidth: "150px",
-                      overflow: "hidden",
-                      textOverflow: "ellipsis",
-                      whiteSpace: "nowrap",
-                    }}
+                    // style={{
+                    //   maxWidth: "150px",
+                    //   overflow: "hidden",
+                    //   textOverflow: "ellipsis",
+                    //   whiteSpace: "nowrap",
+                    // }}
                   >
                     {text}
                   </div>
@@ -613,12 +613,12 @@ const Order = Form.create()(
               return (
                 <Tooltip title={text}>
                   <div
-                    style={{
-                      maxWidth: "150px",
-                      overflow: "hidden",
-                      textOverflow: "ellipsis",
-                      whiteSpace: "nowrap",
-                    }}
+                    // style={{
+                    //   maxWidth: "150px",
+                    //   overflow: "hidden",
+                    //   textOverflow: "ellipsis",
+                    //   whiteSpace: "nowrap",
+                    // }}
                   >
                     {text}
                   </div>
@@ -735,12 +735,12 @@ const Order = Form.create()(
               return (
                 <Tooltip title={text}>
                   <div
-                    style={{
-                      maxWidth: "150px",
-                      overflow: "hidden",
-                      textOverflow: "ellipsis",
-                      whiteSpace: "nowrap",
-                    }}
+                    // style={{
+                    //   maxWidth: "150px",
+                    //   overflow: "hidden",
+                    //   textOverflow: "ellipsis",
+                    //   whiteSpace: "nowrap",
+                    // }}
                   >
                     {text}
                   </div>

+ 8 - 6
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -155,12 +155,14 @@ const YxBonus = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                >{text}</div>
               </Tooltip>
             )
           }

+ 48 - 36
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -213,12 +213,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '100px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '100px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -552,12 +554,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '100px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '100px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -668,12 +672,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '100px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '100px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -781,12 +787,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '100px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '100px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -996,12 +1004,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '100px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '100px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -1396,12 +1406,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '100px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                  // style={{
+                  //   maxWidth: '100px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                >{text}</div>
               </Tooltip>
             )
           }

+ 56 - 42
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -248,12 +248,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -697,12 +699,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -812,12 +816,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -920,12 +926,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -1039,12 +1047,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -1339,12 +1349,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -1536,12 +1548,14 @@ const approvedOutsourcing = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                >{text}</div>
               </Tooltip>
             )
           }

+ 8 - 6
js/component/manageCenter/financialManage/distribute/huiKuan.jsx

@@ -238,12 +238,14 @@ const HuiKuan = React.createClass({
           render: (text) => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                >{text}</div>
               </Tooltip>
             )
           },

+ 36 - 36
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -431,12 +431,12 @@ const ShouKuang = React.createClass({
             return (
               <Tooltip title={text}>
                 <div
-                  style={{
-                    maxWidth: "150px",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                  }}
+                  // style={{
+                  //   maxWidth: "150px",
+                  //   overflow: "hidden",
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: "nowrap",
+                  // }}
                 >
                   {text}
                 </div>
@@ -562,12 +562,12 @@ const ShouKuang = React.createClass({
             return (
               <Tooltip title={text}>
                 <div
-                  style={{
-                    maxWidth: "150px",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                  }}
+                  // style={{
+                  //   maxWidth: "150px",
+                  //   overflow: "hidden",
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: "nowrap",
+                  // }}
                 >
                   {text}
                 </div>
@@ -678,12 +678,12 @@ const ShouKuang = React.createClass({
             return (
               <Tooltip title={text}>
                 <div
-                  style={{
-                    maxWidth: "150px",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                  }}
+                  // style={{
+                  //   maxWidth: "150px",
+                  //   overflow: "hidden",
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: "nowrap",
+                  // }}
                 >
                   {text}
                 </div>
@@ -790,12 +790,12 @@ const ShouKuang = React.createClass({
             return (
               <Tooltip title={text}>
                 <div
-                  style={{
-                    maxWidth: "150px",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                  }}
+                  // style={{
+                  //   maxWidth: "150px",
+                  //   overflow: "hidden",
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: "nowrap",
+                  // }}
                 >
                   {text}
                 </div>
@@ -912,12 +912,12 @@ const ShouKuang = React.createClass({
             return (
               <Tooltip title={text}>
                 <div
-                  style={{
-                    maxWidth: "150px",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                  }}
+                  // style={{
+                  //   maxWidth: "150px",
+                  //   overflow: "hidden",
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: "nowrap",
+                  // }}
                 >
                   {text}
                 </div>
@@ -1084,12 +1084,12 @@ const ShouKuang = React.createClass({
             return (
               <Tooltip title={text}>
                 <div
-                  style={{
-                    maxWidth: "150px",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                  }}
+                  // style={{
+                  //   maxWidth: "150px",
+                  //   overflow: "hidden",
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: "nowrap",
+                  // }}
                 >
                   {text}
                 </div>

+ 48 - 36
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -446,12 +446,14 @@ const ShouKuang = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -573,12 +575,14 @@ const ShouKuang = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -685,12 +689,14 @@ const ShouKuang = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -794,12 +800,14 @@ const ShouKuang = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -914,12 +922,14 @@ const ShouKuang = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div 
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -1093,12 +1103,14 @@ const ShouKuang = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div 
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }

+ 8 - 6
js/component/manageCenter/financialManage/distribute/tuiDan.jsx

@@ -174,12 +174,14 @@ const TuiDan = React.createClass({
           render: (text) => {
             return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth:'150px',
+                  //   overflow:'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace:'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
             )
           },

+ 16 - 12
js/component/manageCenter/operate/personnel/personnelAll.jsx

@@ -158,12 +158,14 @@ const PersonnelAll = React.createClass({
           render: (text) => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div 
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           },
@@ -716,12 +718,14 @@ const PersonnelAll = React.createClass({
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

+ 8 - 6
js/component/manageCenter/order/bonus/yxBonus.jsx

@@ -141,12 +141,14 @@ const YxBonus = React.createClass({
           render: text => {
             return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'100px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth:'100px',
+                  //   overflow:'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace:'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
             )
           }

+ 32 - 24
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -269,12 +269,14 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }
@@ -628,12 +630,14 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }
@@ -757,12 +761,14 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }
@@ -863,12 +869,14 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

+ 8 - 6
js/component/manageCenter/order/orderNew/arrearsList.jsx

@@ -130,12 +130,14 @@ const ArrearsList = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

+ 8 - 6
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -130,12 +130,14 @@ const IntentionCustomer = Form.create()(
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               );
             },

+ 8 - 6
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -165,12 +165,14 @@ const contractChange = Form.create()(
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

+ 8 - 6
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -162,12 +162,14 @@ const contractChange = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

+ 8 - 6
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -165,12 +165,14 @@ const contractChange = Form.create()(
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

+ 8 - 6
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -162,12 +162,14 @@ const contractChange = Form.create()(
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

+ 8 - 6
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -159,12 +159,14 @@ const contractChange = Form.create()(
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

+ 8 - 6
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -161,12 +161,14 @@ const contractChange = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

+ 8 - 6
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -157,12 +157,14 @@ const contractChange = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

+ 8 - 6
js/component/manageCenter/order/orderNew/contractYxjl.js

@@ -157,12 +157,14 @@ const contractChange = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

+ 8 - 6
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -165,12 +165,14 @@ const contractChange = Form.create()(
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

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

@@ -294,12 +294,14 @@ const IntentionCustomer = Form.create()(
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

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

@@ -297,12 +297,14 @@ const IntentionCustomer = Form.create()(
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

+ 8 - 6
js/component/manageCenter/order/orderNew/glCostAuditList/index.js

@@ -69,12 +69,14 @@ class CostAuditList extends Component {
           render: (text) => {
             return (
               <Tooltip placement="bottom" title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div 
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           },

+ 16 - 12
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -516,12 +516,14 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }
@@ -622,12 +624,14 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

+ 8 - 6
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -534,12 +534,14 @@ const outsourcingList = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

+ 8 - 6
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -236,12 +236,14 @@ const outsourcingPro = Form.create()(
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

+ 8 - 6
js/component/manageCenter/order/orderNew/press.jsx

@@ -170,12 +170,14 @@ const IntentionCustomer = Form.create()(React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div 
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }

+ 6 - 6
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -263,12 +263,12 @@ const IntentionCustomer = Form.create()(
               return (
                 <Tooltip title={text}>
                   <div
-                    style={{
-                      maxWidth: "150px",
-                      overflow: "hidden",
-                      textOverflow: "ellipsis",
-                      whiteSpace: "nowrap",
-                    }}
+                    // style={{
+                    //   maxWidth: "150px",
+                    //   overflow: "hidden",
+                    //   textOverflow: "ellipsis",
+                    //   whiteSpace: "nowrap",
+                    // }}
                   >
                     {text}
                   </div>

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

@@ -161,12 +161,14 @@ const IntentionCustomer = Form.create()(
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div 
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

+ 16 - 12
js/component/manageCenter/personnel/personnel/personnelAll.jsx

@@ -166,12 +166,14 @@ const PersonnelAll = React.createClass({
           render: (text) => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           },
@@ -720,12 +722,14 @@ const PersonnelAll = React.createClass({
             render: (text) => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div
+                    // style={{
+                    //   maxWidth: '150px',
+                    //   overflow: 'hidden',
+                    //   textOverflow: "ellipsis",
+                    //   whiteSpace: 'nowrap',
+                    // }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

+ 16 - 12
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -166,12 +166,14 @@ const OutsourceTaskAssignment = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -906,12 +908,14 @@ const OutsourceTaskAssignment = React.createClass({
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div
+                    // style={{
+                    //   maxWidth: '150px',
+                    //   overflow: 'hidden',
+                    //   textOverflow: "ellipsis",
+                    //   whiteSpace: 'nowrap',
+                    // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

Разлика између датотеке није приказан због своје велике величине
+ 1566 - 1564
js/component/manageCenter/project/summary/projectDetails.jsx


+ 8 - 6
js/component/manageCenter/project/task/businessManagement/index.jsx

@@ -72,12 +72,14 @@ class BusinessManagement extends Component {
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '100px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '100px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }

+ 8 - 6
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -259,12 +259,14 @@ const MyTaskCount = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

+ 8 - 6
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -383,12 +383,14 @@ const MyTaskOutsource = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }

+ 407 - 405
js/component/manageCenter/project/task/payApplyReject/index.jsx

@@ -1,430 +1,432 @@
-import React,{Component} from 'react';
+import React, { Component } from 'react';
 import $ from "jquery/src/ajax";
 import {
-    Spin,
-    Table,
-    message,
-    Tooltip, Tabs, Button,Modal
+  Spin,
+  Table,
+  message,
+  Tooltip, Tabs, Button, Modal
 } from "antd";
-import {ShowModal,getProjectStatus} from "@/tools";
+import { ShowModal, getProjectStatus } from "@/tools";
 import FilterColumn from './filterColumn';
 import DetailsModal from './detailsModal/index';
 import OrderPaymentModal from './component/orderPaymentModal';
 import './index.less';
 import CheckProject from "../../../components/checkProject";
 import PayRecord from "../../../components/checkProject/payRecord";
-import {ChooseList} from "../../../order/orderNew/chooseList";
-import {getProjectName} from "../../../../tools";
+import { ChooseList } from "../../../order/orderNew/chooseList";
+import { getProjectName } from "../../../../tools";
 
 const { TabPane } = Tabs;
 
-class PayApplyReject extends Component{
-    constructor(props) {
-        super(props);
-        this.state={
-            loading: true,
-            columns: [
-                {
-                    title: "支付编号",
-                    dataIndex: "key",
-                    key: "key",
-                },
-                {
-                    title: "项目编号",
-                    dataIndex: "tid",
-                    key: "tid",
-                },
-                {
-                    title: "项目名称",
-                    dataIndex: "pname",
-                    key: "pname",
-                },
-                {
-                    title: "项目状态",
-                    dataIndex: "projectStatus",
-                    key: "projectStatus",
-                    render: (text) => {
-                        return getProjectName(text);
-                    },
-                },
-                {
-                    title: "分类名称",
-                    dataIndex: "cname",
-                    key: "cname",
-                },
-                {
-                    title: "合同编号",
-                    dataIndex: "contractNo",
-                    key: "contractNo",
-                },
-                {
-                    title: "订单编号",
-                    dataIndex: "orderNo",
-                    key: "orderNo",
-                },
-                {
-                    title: "客户名称",
-                    dataIndex: "userName",
-                    key: "userName",
-                    width: 150,
-                    render: (text) => {
-                        return (
-                            <Tooltip title={text}>
-                                <div style={{
-                                    maxWidth:'150px',
-                                    overflow:'hidden',
-                                    textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
-                                }}>{text}</div>
-                            </Tooltip>
-                        )
-                    },
-                },
-                {
-                    title: "部门名称",
-                    dataIndex: "depName",
-                    key: "depName",
-                    render: (text) => {
-                        return (
-                            <Tooltip placement="bottom" title={text && text.length > 9 ? text : ''}>
-                                {text && text.length > 9 ? text.substr(0, 9) + "..." : text}
-                            </Tooltip>
-                        )
-                    },
-                },
-                // {
-                //     title: "实际总付款",
-                //     dataIndex: "costAmount",
-                //     key: "costAmount",
-                // },
-                {
-                    title: "付款类型",
-                    dataIndex: "chooseType",
-                    key: "chooseType",
-                    render: (text) => {
-                        return text == 0 ? '第三方成本' :
-                            text == 1 ? '催款节点' :'官费';
-                    },
-                },
-                {
-                    title: "本次申请金额",
-                    dataIndex: "applicationAmount",
-                    key: "applicationAmount",
-                    render: (text) => {
-                        return isNaN(parseFloat(text)) ? text : parseFloat(text);
-                    }
-                },
-                {
-                    title: "已支付",
-                    dataIndex: "paymentAmount",
-                    key: "paymentAmount",
-                    render: (text) => {
-                        return isNaN(parseFloat(text)) ? text : parseFloat(text);
-                    },
-                },
-                {
-                    title: "供应商",
-                    dataIndex: "companyName",
-                    key: "companyName",
-                },
-                {
-                    title: "申请人",
-                    dataIndex: "aname",
-                    key: "aname",
-                },
-                {
-                    title: "财务名称",
-                    dataIndex: "financeName",
-                    key: "financeName",
-                },
-                {
-                    title: "状态",
-                    dataIndex: "status",
-                    key: "status",
-                    render: (text) => {
-                        return text === 0 ? '审核' :
-                            text === 1 ? '待支付' :
-                                text === 2 ? '驳回' :
-                                    text === 3 ? '已支付' :
-                                        text === 4 ? '已取消' : '';
-                    },
-                },
-                {
-                    title: "创建时间",
-                    dataIndex: "createTime",
-                    key: "createTime",
-                },
-                {
-                    title: '操作',
-                    dataIndex: 'action',
-                    key: 'action',
-                    render: (text, record) => {
-                        return (
-                            <div style={{
-                                display:'flex',
-                                alignItems:'center',
-                            }}>
-                                <Button type="primary" size="small" onClick={(e) => {
-                                    e.stopPropagation();
-                                    this.setState({
-                                        payRecordVisible: true,
-                                        orderPaymentsId: record.id,
-                                        tid: record.tid,
-                                        projectType: record.projectType,
-                                    })
-                                }}>
-                                    {
-                                        record.status === 0 ? '待审核' :
-                                            record.status === 1 ? '待支付' :
-                                                record.status === 2 ? '查看详情' : '查看详情'
-                                    }
-                                </Button>
-                                <Button
-                                    type="primary"
-                                    style={{
-                                        marginLeft: "10px",
-                                        background: "orangered",
-                                        border: "none"
-                                    }}
-                                    size="small"
-                                    onClick={(e) => {
-                                        e.stopPropagation();
-                                        this.setState({
-                                            paymentVisible: true,
-                                            tid: record.tid,
-                                            projectType: record.projectType,
-                                        })
-                                    }}>
-                                    付款记录
-                                </Button>
-                            </div>
-                        )
-                    }
-                }
-            ],
-            dataSource: [],
-            selectedRowKeys: [],
-            pagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.loadData(page,this.state.searchInfor);
-                }.bind(this),
-                showTotal: function (total) {
-                    return "共" + total + "条数据";
-                },
-            },
-            page: 1,
-            selectInfor: {},
-            visible: false,
-            paymentVisible: false,
-            tid: 0,
-            projectType: 0,
-            payRecordVisible: false,
-            orderPaymentsId: 0,
+class PayApplyReject extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: true,
+      columns: [
+        {
+          title: "支付编号",
+          dataIndex: "key",
+          key: "key",
+        },
+        {
+          title: "项目编号",
+          dataIndex: "tid",
+          key: "tid",
+        },
+        {
+          title: "项目名称",
+          dataIndex: "pname",
+          key: "pname",
+        },
+        {
+          title: "项目状态",
+          dataIndex: "projectStatus",
+          key: "projectStatus",
+          render: (text) => {
+            return getProjectName(text);
+          },
+        },
+        {
+          title: "分类名称",
+          dataIndex: "cname",
+          key: "cname",
+        },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo",
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo",
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName",
+          width: 150,
+          render: (text) => {
+            return (
+              <Tooltip title={text}>
+                <div
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                >{text}</div>
+              </Tooltip>
+            )
+          },
+        },
+        {
+          title: "部门名称",
+          dataIndex: "depName",
+          key: "depName",
+          render: (text) => {
+            return (
+              <Tooltip placement="bottom" title={text && text.length > 9 ? text : ''}>
+                {text && text.length > 9 ? text.substr(0, 9) + "..." : text}
+              </Tooltip>
+            )
+          },
+        },
+        // {
+        //     title: "实际总付款",
+        //     dataIndex: "costAmount",
+        //     key: "costAmount",
+        // },
+        {
+          title: "付款类型",
+          dataIndex: "chooseType",
+          key: "chooseType",
+          render: (text) => {
+            return text == 0 ? '第三方成本' :
+              text == 1 ? '催款节点' : '官费';
+          },
+        },
+        {
+          title: "本次申请金额",
+          dataIndex: "applicationAmount",
+          key: "applicationAmount",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
+        },
+        {
+          title: "已支付",
+          dataIndex: "paymentAmount",
+          key: "paymentAmount",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          },
+        },
+        {
+          title: "供应商",
+          dataIndex: "companyName",
+          key: "companyName",
+        },
+        {
+          title: "申请人",
+          dataIndex: "aname",
+          key: "aname",
+        },
+        {
+          title: "财务名称",
+          dataIndex: "financeName",
+          key: "financeName",
+        },
+        {
+          title: "状态",
+          dataIndex: "status",
+          key: "status",
+          render: (text) => {
+            return text === 0 ? '审核' :
+              text === 1 ? '待支付' :
+                text === 2 ? '驳回' :
+                  text === 3 ? '已支付' :
+                    text === 4 ? '已取消' : '';
+          },
+        },
+        {
+          title: "创建时间",
+          dataIndex: "createTime",
+          key: "createTime",
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          key: 'action',
+          render: (text, record) => {
+            return (
+              <div style={{
+                display: 'flex',
+                alignItems: 'center',
+              }}>
+                <Button type="primary" size="small" onClick={(e) => {
+                  e.stopPropagation();
+                  this.setState({
+                    payRecordVisible: true,
+                    orderPaymentsId: record.id,
+                    tid: record.tid,
+                    projectType: record.projectType,
+                  })
+                }}>
+                  {
+                    record.status === 0 ? '待审核' :
+                      record.status === 1 ? '待支付' :
+                        record.status === 2 ? '查看详情' : '查看详情'
+                  }
+                </Button>
+                <Button
+                  type="primary"
+                  style={{
+                    marginLeft: "10px",
+                    background: "orangered",
+                    border: "none"
+                  }}
+                  size="small"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    this.setState({
+                      paymentVisible: true,
+                      tid: record.tid,
+                      projectType: record.projectType,
+                    })
+                  }}>
+                  付款记录
+                </Button>
+              </div>
+            )
+          }
         }
-        this.changeList = this.changeList.bind(this);
+      ],
+      dataSource: [],
+      selectedRowKeys: [],
+      pagination: {
+        defaultCurrent: 1,
+        defaultPageSize: 10,
+        showQuickJumper: true,
+        pageSize: 10,
+        onChange: function (page) {
+          this.loadData(page, this.state.searchInfor);
+        }.bind(this),
+        showTotal: function (total) {
+          return "共" + total + "条数据";
+        },
+      },
+      page: 1,
+      selectInfor: {},
+      visible: false,
+      paymentVisible: false,
+      tid: 0,
+      projectType: 0,
+      payRecordVisible: false,
+      orderPaymentsId: 0,
     }
+    this.changeList = this.changeList.bind(this);
+  }
 
-    componentDidMount() {
-        this.loadData()
-    }
+  componentDidMount() {
+    this.loadData()
+  }
 
-    loadData(pageNo,data={}) {
-        this.setState({
-            loading: true,
-        });
-        data.pageNo = pageNo || 1;
-        data.pageSize = this.state.pagination.pageSize;
-        data.status = 2;   //驳回状态
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/company/selectPaymentList",
-            data: data,
-            success: function (data) {
-                ShowModal(this);
-                let theArr = [];
-                if (data.error.length || data.data.list == "") {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    }
-                } else {
-                    this.setState({
-                        page: data.data.pageNo
-                    });
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
-                        let obj = thisdata;
-                        obj.key = thisdata.id;
-                        theArr.push(obj);
-                    }
-                    this.state.pagination.total = data.data.totalCount;
-                }
-                if (data.data && data.data.list && !data.data.list.length) {
-                    this.state.pagination.total = 0;
-                }
-                this.setState({
-                    dataSource: theArr,
-                    pageNo: pageNo,
-                    pagination: this.state.pagination,
-                });
-            }.bind(this),
-        }).always(
-            function () {
-                this.setState({
-                    loading: false,
-                });
-            }.bind(this)
-        );
-    }
-
-    tableRowClick(record){
+  loadData(pageNo, data = {}) {
+    this.setState({
+      loading: true,
+    });
+    data.pageNo = pageNo || 1;
+    data.pageSize = this.state.pagination.pageSize;
+    data.status = 2;   //驳回状态
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/company/selectPaymentList",
+      data: data,
+      success: function (data) {
+        ShowModal(this);
+        let theArr = [];
+        if (data.error.length || data.data.list == "") {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.setState({
+            page: data.data.pageNo
+          });
+          for (let i = 0; i < data.data.list.length; i++) {
+            let thisdata = data.data.list[i];
+            let obj = thisdata;
+            obj.key = thisdata.id;
+            theArr.push(obj);
+          }
+          this.state.pagination.total = data.data.totalCount;
+        }
+        if (data.data && data.data.list && !data.data.list.length) {
+          this.state.pagination.total = 0;
+        }
         this.setState({
-            visible: true,
-            selectInfor: record,
-        })
-    }
-
-    changeList(arr) {
-        const newArr = [];
-        this.state.columns.forEach(item => {
-            arr.forEach(val => {
-                if (val === item.title) {
-                    newArr.push(item);
-                }
-            });
+          dataSource: theArr,
+          pageNo: pageNo,
+          pagination: this.state.pagination,
         });
+      }.bind(this),
+    }).always(
+      function () {
         this.setState({
-            changeList: newArr
+          loading: false,
         });
-    }
+      }.bind(this)
+    );
+  }
+
+  tableRowClick(record) {
+    this.setState({
+      visible: true,
+      selectInfor: record,
+    })
+  }
+
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  }
 
-    render() {
-        return (
-            <div className="user-content">
-                <div className="content-title" style={{ marginBottom: 10 }}>
-                    <span style={{ fontWeight: 900, fontSize: 16 }}>付款驳回列表</span>
-                </div>
-                <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
-                    <TabPane tab="搜索" key="1">
-                        <div style={{paddingTop:'10px'}}>
-                            <FilterColumn
-                                {...this.props}
-                                onSearch={(data)=>{
-                                    this.setState({
-                                        searchInfor: data
-                                    });
-                                    this.loadData(1,data);
-                                }}
-                                onResetSearch={()=>{
-                                    this.setState({
-                                        searchInfor: {}
-                                    });
-                                    this.loadData();
-                                }}
-                            />
-                        </div>
-                    </TabPane>
-                    <TabPane tab="更改表格显示数据" key="2">
-                        <div style={{ marginLeft: 10 }}>
-                            <ChooseList
-                                columns={this.state.columns}
-                                changeFn={this.changeList}
-                                changeList={this.state.changeList}
-                                top={55}
-                                margin={11}
-                            />
-                        </div>
-                    </TabPane>
-                </Tabs>
-                <div className="patent-table">
-                    <Spin spinning={this.state.loading}>
-                        <Table
-                            columns={
-                                this.state.changeList
-                                    ? this.state.changeList
-                                    : this.state.columns
-                            }
-                            dataSource={this.state.dataSource}
-                            pagination={this.state.pagination}
-                            onRowClick={(record)=>{
-                                this.tableRowClick(record)
-                            }}
-                            style={{
-                                cursor: 'pointer',
-                            }}
-                            scroll={{ x: "max-content", y: 0 }}
-                            bordered
-                            size="small"
-                        />
-                    </Spin>
-                </div>
-                {
-                    this.state.visible ?
-                        <DetailsModal
-                            tid={this.state.selectInfor.tid}
-                            orderNo={this.state.selectInfor.orderNo}
-                            projectType={this.state.selectInfor.projectType}
-                            projectStatus={this.state.selectInfor.projectStatus}
-                            taskName={this.state.selectInfor.pname}
-                            taskID={this.state.selectInfor.tid}
-                            visible={this.state.visible}
-                            refreshList={()=>{
-                                this.loadData(this.state.page,this.state.searchInfor);
-                            }}
-                            visitCancel={()=>{
-                                this.setState({
-                                    visible: false
-                                })
-                                this.loadData(this.state.page,this.state.searchInfor);
-                            }}/> : <div/>
-                }
-                {this.state.paymentVisible ?
-                    <OrderPaymentModal
-                        tid={this.state.tid}
-                        visible={this.state.paymentVisible}
-                        projectType={this.state.projectType}
-                        onCancer={()=>{
-                            this.setState({
-                                paymentVisible: false,
-                                tid: 0,
-                                projectType: 0,
-                            });
-                            this.loadData(this.state.page,this.state.searchInfor);
-                        }}
-                        onSuccess={()=>{
-                            this.setState({
-                                paymentVisible: false,
-                                tid: 0,
-                                projectType: 0,
-                            });
-                            this.loadData(this.state.page,this.state.searchInfor);
-                        }}/> :
-                    <div/>
-                }
-                {this.state.payRecordVisible ? <PayRecord
-                    {...this.props}
-                    payId={this.state.orderPaymentsId}
-                    visible={this.state.payRecordVisible}
-                    tid={this.state.tid}
-                    projectType={this.state.projectType}
-                    changeVisible={()=>{
-                        this.loadData(this.state.page,this.state.searchInfor);
-                        this.setState({
-                            payRecordVisible: false,
-                            orderPaymentsId: 0,
-                            tid: 0,
-                            projectType: 0,
-                        })
-                    }}
-                /> : <div/>}
+  render() {
+    return (
+      <div className="user-content">
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>付款驳回列表</span>
+        </div>
+        <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
+          <TabPane tab="搜索" key="1">
+            <div style={{ paddingTop: '10px' }}>
+              <FilterColumn
+                {...this.props}
+                onSearch={(data) => {
+                  this.setState({
+                    searchInfor: data
+                  });
+                  this.loadData(1, data);
+                }}
+                onResetSearch={() => {
+                  this.setState({
+                    searchInfor: {}
+                  });
+                  this.loadData();
+                }}
+              />
             </div>
-        );
-    }
+          </TabPane>
+          <TabPane tab="更改表格显示数据" key="2">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                columns={this.state.columns}
+                changeFn={this.changeList}
+                changeList={this.state.changeList}
+                top={55}
+                margin={11}
+              />
+            </div>
+          </TabPane>
+        </Tabs>
+        <div className="patent-table">
+          <Spin spinning={this.state.loading}>
+            <Table
+              columns={
+                this.state.changeList
+                  ? this.state.changeList
+                  : this.state.columns
+              }
+              dataSource={this.state.dataSource}
+              pagination={this.state.pagination}
+              onRowClick={(record) => {
+                this.tableRowClick(record)
+              }}
+              style={{
+                cursor: 'pointer',
+              }}
+              scroll={{ x: "max-content", y: 0 }}
+              bordered
+              size="small"
+            />
+          </Spin>
+        </div>
+        {
+          this.state.visible ?
+            <DetailsModal
+              tid={this.state.selectInfor.tid}
+              orderNo={this.state.selectInfor.orderNo}
+              projectType={this.state.selectInfor.projectType}
+              projectStatus={this.state.selectInfor.projectStatus}
+              taskName={this.state.selectInfor.pname}
+              taskID={this.state.selectInfor.tid}
+              visible={this.state.visible}
+              refreshList={() => {
+                this.loadData(this.state.page, this.state.searchInfor);
+              }}
+              visitCancel={() => {
+                this.setState({
+                  visible: false
+                })
+                this.loadData(this.state.page, this.state.searchInfor);
+              }} /> : <div />
+        }
+        {this.state.paymentVisible ?
+          <OrderPaymentModal
+            tid={this.state.tid}
+            visible={this.state.paymentVisible}
+            projectType={this.state.projectType}
+            onCancer={() => {
+              this.setState({
+                paymentVisible: false,
+                tid: 0,
+                projectType: 0,
+              });
+              this.loadData(this.state.page, this.state.searchInfor);
+            }}
+            onSuccess={() => {
+              this.setState({
+                paymentVisible: false,
+                tid: 0,
+                projectType: 0,
+              });
+              this.loadData(this.state.page, this.state.searchInfor);
+            }} /> :
+          <div />
+        }
+        {this.state.payRecordVisible ? <PayRecord
+          {...this.props}
+          payId={this.state.orderPaymentsId}
+          visible={this.state.payRecordVisible}
+          tid={this.state.tid}
+          projectType={this.state.projectType}
+          changeVisible={() => {
+            this.loadData(this.state.page, this.state.searchInfor);
+            this.setState({
+              payRecordVisible: false,
+              orderPaymentsId: 0,
+              tid: 0,
+              projectType: 0,
+            })
+          }}
+        /> : <div />}
+      </div>
+    );
+  }
 }
 
 export default PayApplyReject

+ 16 - 12
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -164,12 +164,14 @@ const Task = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }
@@ -913,12 +915,14 @@ const Task = React.createClass({
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

+ 8 - 6
js/component/manageCenter/project/task/taskCount.jsx

@@ -224,12 +224,14 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div
+                  // style={{
+                  //   maxWidth: '150px',
+                  //   overflow: 'hidden',
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: 'nowrap',
+                  // }}
+                  >{text}</div>
                 </Tooltip>
               )
             }

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

@@ -198,12 +198,14 @@ const Task = React.createClass({
           render: text => {
             return (
               <Tooltip title={text}>
-                <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
-                }}>{text}</div>
+                <div
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
+                >{text}</div>
               </Tooltip>
             )
           }

+ 6 - 6
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx

@@ -129,9 +129,9 @@ const ProjectOrder=Form.create()(React.createClass({
                     title: '客户名称',
                     dataIndex: 'buyerName',
                     key: 'buyerName',
-                    render:(text)=>{
-                    	return text&&text.length>=6?text.substr(0,5)+'...':text
-                    }
+                    // render:(text)=>{
+                    // 	return text&&text.length>=6?text.substr(0,5)+'...':text
+                    // }
                 },{
                     title: '项目状态',
                     dataIndex: 'projectStatus',
@@ -208,9 +208,9 @@ const ProjectOrder=Form.create()(React.createClass({
                     title: '客户名称',
                     dataIndex: 'buyerName',
                     key: 'buyerName',
-                    render:(text)=>{
-                    	return text&&text.length>=6?text.substr(0,5)+'...':text
-                    }
+                    // render:(text)=>{
+                    // 	return text&&text.length>=6?text.substr(0,5)+'...':text
+                    // }
                 },{
                     title: '客户类型',
                     dataIndex: 'buyerType',

+ 6 - 6
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageNew.jsx

@@ -129,9 +129,9 @@ const ProjectOrderNew = Form.create()(React.createClass({
 					title: '客户名称',
 					dataIndex: 'buyerName',
 					key: 'buyerName',
-					render: (text) => {
-						return text && text.length >= 6 ? text.substr(0, 5) + '...' : text
-					}
+					// render: (text) => {
+					// 	return text && text.length >= 6 ? text.substr(0, 5) + '...' : text
+					// }
 				}, {
 					title: '项目状态',
 					dataIndex: 'projectStatus',
@@ -208,9 +208,9 @@ const ProjectOrderNew = Form.create()(React.createClass({
 					title: '客户名称',
 					dataIndex: 'buyerName',
 					key: 'buyerName',
-					render: (text) => {
-						return text && text.length >= 6 ? text.substr(0, 5) + '...' : text
-					}
+					// render: (text) => {
+					// 	return text && text.length >= 6 ? text.substr(0, 5) + '...' : text
+					// }
 				}, {
 					title: '客户类型',
 					dataIndex: 'buyerType',

+ 33 - 2
package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "afanti",
-  "version": "1.2.40",
+  "version": "1.2.61",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "afanti",
-      "version": "1.2.40",
+      "version": "1.2.61",
       "license": "ISC",
       "dependencies": {
         "antd": "^2.7.4",
@@ -18,6 +18,7 @@
         "jquery": "^3.1.1",
         "pdf": "^0.1.0",
         "prop-types": "^15.5.10",
+        "quill-image-resize-module": "^3.0.0",
         "react": "^15.4.1",
         "react-dom": "^15.4.1",
         "react-pdf": "^1.8.3",
@@ -7469,6 +7470,16 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/quill-image-resize-module": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/quill-image-resize-module/-/quill-image-resize-module-3.0.0.tgz",
+      "integrity": "sha512-1TZBnUxU/WIx5dPyVjQ9yN7C6mLZSp04HyWBEMqT320DIq4MW4JgzlOPDZX5ZpBM3bU6sacU4kTLUc8VgYQZYw==",
+      "dependencies": {
+        "lodash": "^4.17.4",
+        "quill": "^1.2.2",
+        "raw-loader": "^0.5.1"
+      }
+    },
     "node_modules/randomatic": {
       "version": "1.1.7",
       "resolved": "http://registry.npm.taobao.org/randomatic/download/randomatic-1.1.7.tgz",
@@ -7555,6 +7566,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/raw-loader": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+      "integrity": "sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q=="
+    },
     "node_modules/rc-align": {
       "version": "2.3.4",
       "resolved": "http://registry.npm.taobao.org/rc-align/download/rc-align-2.3.4.tgz",
@@ -17599,6 +17615,16 @@
         "fast-diff": "1.1.1"
       }
     },
+    "quill-image-resize-module": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/quill-image-resize-module/-/quill-image-resize-module-3.0.0.tgz",
+      "integrity": "sha512-1TZBnUxU/WIx5dPyVjQ9yN7C6mLZSp04HyWBEMqT320DIq4MW4JgzlOPDZX5ZpBM3bU6sacU4kTLUc8VgYQZYw==",
+      "requires": {
+        "lodash": "^4.17.4",
+        "quill": "^1.2.2",
+        "raw-loader": "^0.5.1"
+      }
+    },
     "randomatic": {
       "version": "1.1.7",
       "resolved": "http://registry.npm.taobao.org/randomatic/download/randomatic-1.1.7.tgz",
@@ -17670,6 +17696,11 @@
         }
       }
     },
+    "raw-loader": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+      "integrity": "sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q=="
+    },
     "rc-align": {
       "version": "2.3.4",
       "resolved": "http://registry.npm.taobao.org/rc-align/download/rc-align-2.3.4.tgz",

+ 2 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.2.61",
+  "version": "1.2.62",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -56,6 +56,7 @@
     "jquery": "^3.1.1",
     "pdf": "^0.1.0",
     "prop-types": "^15.5.10",
+    "quill-image-resize-module": "^3.0.0",
     "react": "^15.4.1",
     "react-dom": "^15.4.1",
     "react-pdf": "^1.8.3",

+ 15 - 1
yarn.lock

@@ -5011,7 +5011,16 @@ quill-delta@3.5.0:
     extend "^3.0.0"
     fast-diff "1.1.1"
 
-quill@^1.2.6:
+quill-image-resize-module@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/quill-image-resize-module/-/quill-image-resize-module-3.0.0.tgz#0fd93746a837336d95b2f536140416a623c71771"
+  integrity sha512-1TZBnUxU/WIx5dPyVjQ9yN7C6mLZSp04HyWBEMqT320DIq4MW4JgzlOPDZX5ZpBM3bU6sacU4kTLUc8VgYQZYw==
+  dependencies:
+    lodash "^4.17.4"
+    quill "^1.2.2"
+    raw-loader "^0.5.1"
+
+quill@^1.2.2, quill@^1.2.6:
   version "1.3.1"
   resolved "http://registry.npm.taobao.org/quill/download/quill-1.3.1.tgz"
   integrity sha1-a2CetyisoS7M+0Ztn+xkewZR64k=
@@ -5053,6 +5062,11 @@ raw-body@2.3.2:
     iconv-lite "0.4.19"
     unpipe "1.0.0"
 
+raw-loader@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz"
+  integrity sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q==
+
 rc-align@2.x:
   version "2.3.4"
   resolved "http://registry.npm.taobao.org/rc-align/download/rc-align-2.3.4.tgz"