Bläddra i källkod

客户跟进汇总

HW 3 år sedan
förälder
incheckning
159a8b0f59
25 ändrade filer med 1161 tillägg och 211 borttagningar
  1. 140 0
      js/component/manageCenter/customer/NEW/crm/changeMainProducts.jsx
  2. 707 122
      js/component/manageCenter/customer/NEW/crm/crm.jsx
  3. 21 0
      js/component/manageCenter/customer/NEW/crm/customer.less
  4. 102 0
      js/component/manageCenter/customer/NEW/crm/mainBusinessLog.jsx
  5. 32 4
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx
  6. 31 7
      js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx
  7. 45 0
      js/component/manageCenter/customer/content.jsx
  8. 2 2
      js/component/manageCenter/customerService/administration/order.jsx
  9. 9 9
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  10. 9 9
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  11. 13 13
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  12. 9 9
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  13. 1 1
      js/component/manageCenter/index/content.jsx
  14. 8 8
      js/component/manageCenter/order/orderNew/approveds.jsx
  15. 1 1
      js/component/manageCenter/order/orderNew/arrearsList.jsx
  16. 2 2
      js/component/manageCenter/order/orderNew/billing.jsx
  17. 1 1
      js/component/manageCenter/order/orderNew/contractCwjl.js
  18. 1 1
      js/component/manageCenter/order/orderNew/contractCwzy.js
  19. 1 1
      js/component/manageCenter/order/orderNew/costAuditList/index.js
  20. 1 1
      js/component/manageCenter/order/orderNew/glCostAuditList/index.js
  21. 2 2
      js/component/manageCenter/order/orderNew/inquiry.jsx
  22. 1 1
      js/component/manageCenter/order/orderNew/press.jsx
  23. 20 15
      js/component/manageCenter/order/orderNew/pressList.jsx
  24. 1 1
      js/component/manageCenter/statistics/personnel/personnelAll.jsx
  25. 1 1
      package.json

+ 140 - 0
js/component/manageCenter/customer/NEW/crm/changeMainProducts.jsx

@@ -0,0 +1,140 @@
+import React,{Component} from "react";
+import {Button, Input, message, Modal, Spin, Tag, Tooltip} from "antd";
+import $ from "jquery/src/ajax";
+
+class ChangeMainProducts extends Component{
+    constructor(props) {
+        super(props);
+        this.state={
+            inputVisible:false,
+            businessScope:props.businessScope || [],
+            inputValue:'',
+            loading:false,
+        }
+        this.showInput = this.showInput.bind(this);
+        this.handleInputChange = this.handleInputChange.bind(this);
+        this.handleInputConfirm = this.handleInputConfirm.bind(this);
+        this.updateUserBusinessScope = this.updateUserBusinessScope.bind(this);
+        this.handleClose = this.handleClose.bind(this);
+    }
+
+    showInput(){
+        this.setState({ inputVisible: true });
+    }
+
+    handleInputChange(e){
+        this.setState({ inputValue: e.target.value });
+    }
+
+    handleInputConfirm(){
+        const state = this.state;
+        const inputValue = state.inputValue;
+        let businessScope = state.businessScope;
+        if(inputValue.length > 16){
+            message.warning('标签字数不能超过16个字符')
+            return;
+        }
+        let arr = inputValue.split(',');
+        for(let i of arr){
+            if (i && businessScope.indexOf(i) === -1) {
+                businessScope = [...businessScope, i];
+            }
+            this.setState({
+                businessScope,
+                inputVisible: false,
+                inputValue: '',
+            });
+        }
+    }
+
+    updateUserBusinessScope(){
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context +"/api/admin/customer/updateUserBusinessScope",
+            data: {
+                id:this.props.uid,
+                businessScope: this.state.businessScope.join(',')
+            },
+            success: function(data) {
+                if(data.error.length === 0){
+                    message.success('修改成功');
+                    this.props.onCancel();
+                }else{
+                 message.warning(data.error[0].message);
+                }
+            }.bind(this),
+        }).always(function() {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    }
+
+    handleClose(removedTag){
+        const businessScope = this.state.businessScope.filter(tag => tag !== removedTag);
+        this.setState({ businessScope });
+    }
+
+    render() {
+        return(
+            <Modal
+                maskClosable={false}
+                className="customeDetails"
+                footer=""
+                title="修改主营产品"
+                width="800px"
+                visible={this.props.visible}
+                onOk={this.props.onCancel}
+                onCancel={this.props.onCancel}
+            >
+                <div>
+                    <div>
+                        <Spin spinning={this.state.loading}>
+                            <div>
+                                <span style={{marginRight:'15px'}}>主营产品:</span>
+                                {this.state.businessScope.map((tag, index) => {
+                                    const isLongTag = tag.length > 20;
+                                    const tagElem = (
+                                        <Tag closable key={tag} afterClose={() => this.handleClose(tag)}>
+                                            {isLongTag ? `${tag.slice(0, 20)}...` : tag}
+                                        </Tag>
+                                    );
+                                    return isLongTag ? <Tooltip title={tag} key={tag}>{tagElem}</Tooltip> : tagElem;
+                                })}
+                                {this.state.inputVisible && (
+                                    <Input
+                                        type="text"
+                                        size="small"
+                                        style={{ width: 78 }}
+                                        value={this.state.inputValue}
+                                        onChange={this.handleInputChange}
+                                        onBlur={this.handleInputConfirm}
+                                        onPressEnter={this.handleInputConfirm}
+                                    />
+                                )}
+                                <Button
+                                    loading={this.state.loading}
+                                    style={{marginLeft:'15px'}}
+                                    size="small"
+                                    type="primary"
+                                    onClick={this.showInput}>
+                                    + 新增主营产品
+                                </Button>
+                            </div>
+                        </Spin>
+                    </div>
+                    <div style={{display:'flex',justifyContent:'center',marginTop:'20px'}}>
+                        <Button loading={this.state.loading} type="primary" onClick={this.updateUserBusinessScope}>提交</Button>
+                    </div>
+                </div>
+            </Modal>
+        )
+    }
+}
+
+export default ChangeMainProducts;

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 707 - 122
js/component/manageCenter/customer/NEW/crm/crm.jsx


+ 21 - 0
js/component/manageCenter/customer/NEW/crm/customer.less

@@ -3,6 +3,27 @@
     color: red;
     font-size: 14px;
 }
+.crmBusinessScope{
+    position: relative;
+    .content{
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        cursor: pointer;
+        .text{
+            padding: 5px;
+            max-width:250px;
+            overflow:hidden;
+            text-overflow: ellipsis;
+            white-space:nowrap;
+        }
+    }
+}
 .setSubmit{
     margin-left: 210px;
     margin-right: 40px;

+ 102 - 0
js/component/manageCenter/customer/NEW/crm/mainBusinessLog.jsx

@@ -0,0 +1,102 @@
+import React,{Component} from "react";
+import {message, Modal, Spin, Table, Tooltip} from "antd";
+import $ from "jquery/src/ajax";
+
+class MainBusinessLog extends Component{
+    constructor(props) {
+        super(props);
+        this.state={
+            loading: false,
+            dataSource:[],
+            columns:[
+                {
+                    title: '序号',
+                    dataIndex: 'id',
+                    key: 'id',
+                },
+                {
+                    title: '内容',
+                    dataIndex: 'remarks',
+                    key: 'remarks',
+                    width:500,
+                    render: text => {
+                        return (
+                            <Tooltip title={text}>
+                                <div style={{
+                                    maxWidth:'500px',
+                                    overflow:'hidden',
+                                    textOverflow: "ellipsis",
+                                    whiteSpace:'nowrap',
+                                }}>{text}</div>
+                            </Tooltip>
+                        )
+                    }
+                },
+                {
+                    title: '时间',
+                    dataIndex: 'createTimes',
+                    key: 'createTimes',
+                },
+            ],
+        }
+    }
+
+    loadData() {
+        this.setState({
+            loading: true,
+        });
+        $.ajax({
+            method: 'get',
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/customer/userDateLogList',
+            data:{
+                uid:this.props.uid
+            },
+            success: function(data) {
+                if(data.error.length === 0){
+                    this.setState({
+                        dataSource: data.data,
+                    });
+                }else{
+                    message.warning(data.error[0].message);
+                }
+            }.bind(this),
+        }).always(function() {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    }
+
+    componentDidMount() {
+        this.loadData();
+    }
+
+    render() {
+        return (
+            <Modal
+                maskClosable={false}
+                className="customeDetails"
+                footer=""
+                title="主营日志"
+                width="800px"
+                visible={this.props.visible}
+                onOk={this.props.onCancel}
+                onCancel={this.props.onCancel}
+            >
+                <div>
+                    <Spin spinning={this.state.loading}>
+                        <Table
+                            size="middle"
+                            columns={this.state.columns}
+                            dataSource={this.state.dataSource}
+                        />
+                    </Spin>
+                </div>
+            </Modal>
+        )
+    }
+}
+
+export default MainBusinessLog;

+ 32 - 4
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -559,8 +559,11 @@ const IntentionCustomer = Form.create()(
       });
     },
     //转交
-    changeAssigner() {
+    changeAssigner(infor) {
       if (this.state.theTypes) {
+        this.setState({
+          informationTransferVisible:false
+        })
         let changeIds  = '';
         let oldAid = '';
         for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
@@ -570,6 +573,7 @@ const IntentionCustomer = Form.create()(
             changeIds = this.state.selectedRows.length-1 === idx ? changeIds +rowItem.id : changeIds + rowItem.id + ',' ;
           }
         }
+        let loading = message.loading('加载中...')
         $.ajax({
           method: "get",
           dataType: "json",
@@ -579,9 +583,11 @@ const IntentionCustomer = Form.create()(
             uid: changeIds, //这一行数据的ID
             aid: this.state.theTypes, //指定转交人的ID
             oldAid: oldAid,
+            data:infor,
           },
         }).done(
           function (data) {
+            loading();
             if (!data.error.length) {
               message.success("转交成功!");
               this.setState({
@@ -655,7 +661,8 @@ const IntentionCustomer = Form.create()(
         zhuanjiaoVisible: false,
       });
     },
-    showConfirm(fn, record) {
+    showConfirm() {
+      let _this = this;
       Modal.confirm({
         title: "提示",
         content: (
@@ -671,7 +678,9 @@ const IntentionCustomer = Form.create()(
           </span>
         ),
         onOk() {
-          fn(record);
+          _this.setState({
+            informationTransferVisible:true
+          })
         },
         onCancel() {},
       });
@@ -909,7 +918,7 @@ const IntentionCustomer = Form.create()(
                   // onClick={this.changeAssigner}
                   onClick={(e) => {
                     e.stopPropagation();
-                    this.showConfirm(this.changeAssigner);
+                    this.showConfirm();
                   }}
                   disabled={!hasSelected}
                   style={{ marginRight: 10 }}
@@ -1048,6 +1057,25 @@ const IntentionCustomer = Form.create()(
           ) : (
             ""
           )}
+          {this.state.informationTransferVisible && <Modal
+              visible={this.state.informationTransferVisible}
+              title="提醒"
+              onCancel={()=>{
+                this.setState({
+                  informationTransferVisible:false
+                })
+              }}
+              footer={[
+                <Button key="1" size="large" type={"primary"} onClick={()=>{
+                  this.changeAssigner(1);
+                }}>需要</Button>,
+                <Button key="2" size="large" type={"danger"} onClick={()=>{
+                  this.changeAssigner(0);
+                }}>不需要</Button>,
+              ]}
+          >
+            请确定,是否将客户资料一并转交!选择“需要”,系统将全部客户资料一并转交!选择“不需要”,原客户资料保存您的客户资料中,请注意客户资料的更新维护,谢谢
+          </Modal>}
         </div>
       );
     },

+ 31 - 7
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -435,10 +435,11 @@ const IntentionCustomer = Form.create()(React.createClass({
 			auto: e,
 		});
 	},
-	showConfirm(fn, record) {
+	showConfirm() {
 		if(this.state.confirmLoading){
 			return false;
 		}
+		let _this = this;
 		Modal.confirm({
 			title: "提示",
 			content: (
@@ -454,16 +455,19 @@ const IntentionCustomer = Form.create()(React.createClass({
           </span>
 			),
 			onOk() {
-				fn(record);
+				_this.setState({
+					informationTransferVisible:true
+				})
 			},
 			onCancel() {},
 		});
 	},
 	//转交
-	changeAssigner() {
+	changeAssigner(infor) {
 		if (this.state.theTypes) {
 			this.setState({
-				confirmLoading: true
+				confirmLoading: true,
+				informationTransferVisible:false
 			})
 			const hide = message.loading('转交中...', 0);
 			let changeIds  = '';
@@ -484,10 +488,12 @@ const IntentionCustomer = Form.create()(React.createClass({
 					uid: changeIds, //这一行数据的ID
 					aid: this.state.theTypes, //指定转交人的ID
 					oldAid: window.adminData.uid,
-					operatorType:4
+					operatorType:4,
+					data:infor,
 				},
 			}).done(
 				function (data) {
+					hide();
 					if (!data.error.length) {
 						message.success("转交成功!");
 						this.setState({
@@ -504,7 +510,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 							Math.ceil((this.state.pagination.total - 1) / 10)
 						)
 					);
-					hide();
 					this.setState({
 						confirmLoading: false
 					})
@@ -681,7 +686,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 						type="primary"
 						onClick={(e) => {
 							e.stopPropagation();
-							this.showConfirm(this.changeAssigner);
+							this.showConfirm();
 						}}
 						disabled={!hasSelected}
 						style={{ marginRight: 10 }}
@@ -740,6 +745,25 @@ const IntentionCustomer = Form.create()(React.createClass({
           basicState={this.state.basicState}
           contactState={this.state.contactState}
         />
+		  {this.state.informationTransferVisible && <Modal
+			  visible={this.state.informationTransferVisible}
+			  title="提醒"
+			  onCancel={()=>{
+			  	this.setState({
+					informationTransferVisible:false
+				})
+			  }}
+			  footer={[
+				  <Button key="1" size="large" type={"primary"} onClick={()=>{
+					  this.changeAssigner(1);
+				  }}>需要</Button>,
+				  <Button key="2" size="large" type={"danger"} onClick={()=>{
+					  this.changeAssigner(0);
+				  }}>不需要</Button>,
+			  ]}
+		  >
+			  请确定,是否将客户资料一并转交!选择“需要”,系统将全部客户资料一并转交!选择“不需要”,原客户资料保存您的客户资料中,请注意客户资料的更新维护,谢谢
+		  </Modal>}
       </div>
     );
 	}

+ 45 - 0
js/component/manageCenter/customer/content.jsx

@@ -479,6 +479,51 @@ class Content extends Component {
                     });
                 });
                 break;
+            //客户资料维护(营销员)
+            case 'crmMaintain':
+                require.ensure([], () => {
+                    const Crm = require('./NEW/crm/crm').default;
+                    this.setState({
+                        component: <Crm
+                            isMaintain
+                            intentionState={0}
+                            shiroType={1}//0 咨询师 1营销员
+                            ApiUrl={'/api/admin/customer/listPrivateOrganizationCustomer'}
+                            detailApi={'/api/admin/customer/findOrganizationCustomerDetail'}
+                        />
+                    });
+                });
+                break;
+            //客户资料维护(咨询师)
+            case 'crmMaintainZXS':
+                require.ensure([], () => {
+                    const Crm = require('./NEW/crm/crm').default;
+                    this.setState({
+                        component: <Crm
+                            isMaintain
+                            intentionState={0}
+                            shiroType={0}//0 咨询师 1营销员
+                            ApiUrl={'/api/admin/customer/listPrivateOrganizationCustomer'}
+                            detailApi={'/api/admin/customer/findOrganizationCustomerDetail'}
+                        />
+                    });
+                });
+                break;
+            //客户资料维护(超级管理员以及客服查看)
+            case 'crmMaintainAdmin':
+                require.ensure([], () => {
+                    const Crm = require('./NEW/crm/crm').default;
+                    this.setState({
+                        component: <Crm
+                            isMaintain
+                            intentionState={0}
+                            shiroType={2}//0 咨询师 1营销员 2管理员
+                            ApiUrl={'/api/admin/customer/listPrivateOrganizationCustomer'}
+                            detailApi={'/api/admin/customer/findOrganizationCustomerDetail'}
+                        />
+                    });
+                });
+                break;
              //客户资料
             case 'crmCount':
                 require.ensure([], () => {

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

@@ -2018,7 +2018,7 @@ const Order = Form.create()(
                 url: globalConfig.context + "/api/admin/newOrder/dunOrderNewList",
                 data: {
                     orderNo: this.state.selectedRowKeys[0],
-                    pageSize: 9999,
+                    pageSize: 9999999,
                 },
                 success: function (data) {
                     let theArr = [];
@@ -2080,7 +2080,7 @@ const Order = Form.create()(
                 url: globalConfig.context + "/api/admin/newOrder/getOrderTask",
                 data: {
                     orderNo: this.state.selectedRowKeys[0],
-                    pageSize: 9999,
+                    pageSize: 9999999,
                 },
                 success: function (data) {
                     let theArr = [];

+ 9 - 9
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -2098,7 +2098,7 @@ const approvedOutsourcing = React.createClass({
         '/api/admin/orderInvoice/salesmanOrderInvoiceList',
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = []
@@ -2151,7 +2151,7 @@ const approvedOutsourcing = React.createClass({
       url: globalConfig.context + '/api/admin/financial/myBillList',
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
         whoType: 1,
       },
       success: function (data) {
@@ -2214,7 +2214,7 @@ const approvedOutsourcing = React.createClass({
   },
   exportAll() {
     const data = {
-      pageSize: 9999,
+      pageSize: 9999999,
       buyerName: this.state.nameSearch, //客户名称
       orderNo: this.state.orderNoSearch,
       startTime: this.state.releaseDate[0],
@@ -2249,7 +2249,7 @@ const approvedOutsourcing = React.createClass({
       dvisible: true,
       // loading: true
     })
-    this.loadData(1, 9999)
+    this.loadData(1, 9999999)
   },
   downImg() {
     let num = 0
@@ -2338,7 +2338,7 @@ const approvedOutsourcing = React.createClass({
       url: globalConfig.context + '/api/admin/orderProject/taskHoursList',
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = []
@@ -2413,7 +2413,7 @@ const approvedOutsourcing = React.createClass({
         ? this.state.selectedRowKeys[0]
         : undefined, //订单编号
       // specially: 1,
-      pageSize: 9999,
+      pageSize: 9999999,
       outsource: 1,
     }
     window.location.href =
@@ -2437,7 +2437,7 @@ const approvedOutsourcing = React.createClass({
         url: globalConfig.context + '/api/admin/newOrder/arrearsDunList',
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999,
+          pageSize: 9999999,
         },
         success: function (data) {
           let theArr = []
@@ -2478,7 +2478,7 @@ const approvedOutsourcing = React.createClass({
       url: globalConfig.context + '/api/admin/newOrder/dunOrderNewList',
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = []
@@ -2540,7 +2540,7 @@ const approvedOutsourcing = React.createClass({
       url: globalConfig.context + '/api/admin/newOrder/getOrderTask',
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = []

+ 9 - 9
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -2100,7 +2100,7 @@ const approvedOutsourcing = React.createClass({
         "/api/admin/orderInvoice/salesmanOrderInvoiceList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];
@@ -2153,7 +2153,7 @@ const approvedOutsourcing = React.createClass({
       url: globalConfig.context + "/api/admin/financial/myBillList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
         whoType: 1,
       },
       success: function (data) {
@@ -2216,7 +2216,7 @@ const approvedOutsourcing = React.createClass({
   },
   exportAll() {
     const data = {
-      pageSize: 9999,
+      pageSize: 9999999,
       buyerName: this.state.nameSearch, //客户名称
       orderNo: this.state.orderNoSearch,
       startTime: this.state.releaseDate[0],
@@ -2251,7 +2251,7 @@ const approvedOutsourcing = React.createClass({
       dvisible: true,
       // loading: true
     });
-    this.loadData(1, 9999);
+    this.loadData(1, 9999999);
   },
   downImg() {
     let num = 0;
@@ -2340,7 +2340,7 @@ const approvedOutsourcing = React.createClass({
       url: globalConfig.context + "/api/admin/orderProject/taskHoursList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];
@@ -2415,7 +2415,7 @@ const approvedOutsourcing = React.createClass({
         ? this.state.selectedRowKeys[0]
         : undefined, //订单编号
       // specially: 1,
-      pageSize: 9999,
+      pageSize: 9999999,
       outsource: 1,
     };
     window.location.href =
@@ -2434,7 +2434,7 @@ const approvedOutsourcing = React.createClass({
       url: globalConfig.context + "/api/admin/newOrder/dunOrderNewList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];
@@ -2496,7 +2496,7 @@ const approvedOutsourcing = React.createClass({
       url: globalConfig.context + "/api/admin/newOrder/getOrderTask",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];
@@ -2679,7 +2679,7 @@ const approvedOutsourcing = React.createClass({
         url: globalConfig.context + "/api/admin/newOrder/arrearsDunList",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999,
+          pageSize: 9999999,
         },
         success: function (data) {
           let theArr = [];

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

@@ -1347,7 +1347,7 @@ const ShouKuang = React.createClass({
         "/api/admin/orderInvoice/salesmanOrderInvoiceList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];
@@ -1395,7 +1395,7 @@ const ShouKuang = React.createClass({
       url: globalConfig.context + "/api/admin/financial/myBillList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
         whoType: 1,
       },
       success: function (data) {
@@ -1486,7 +1486,7 @@ const ShouKuang = React.createClass({
     this.setState({
       dvisible: true,
     });
-    this.loadData(1, 9999);
+    this.loadData(1, 9999999);
   },
   timeData() {
     this.setState({
@@ -1499,7 +1499,7 @@ const ShouKuang = React.createClass({
       url: globalConfig.context + "/api/admin/orderProject/taskHoursList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];
@@ -1552,7 +1552,7 @@ const ShouKuang = React.createClass({
   exportTime() {
     const data = {
       orderNo: this.state.selectedRowKeys[0],
-      pageSize: 9999,
+      pageSize: 9999999,
     };
     window.location.href =
       globalConfig.context +
@@ -1574,7 +1574,7 @@ const ShouKuang = React.createClass({
         ? this.state.selectedRowKeys[0]
         : undefined, //订单编号
       // specially: 1,
-      pageSize: 9999,
+      pageSize: 9999999,
     };
     window.location.href =
       globalConfig.context +
@@ -1592,7 +1592,7 @@ const ShouKuang = React.createClass({
       url: globalConfig.context + "/api/admin/newOrder/dunOrderNewList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];
@@ -1658,7 +1658,7 @@ const ShouKuang = React.createClass({
         url: globalConfig.context + "/api/admin/newOrder/arrearsDunList",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999,
+          pageSize: 9999999,
         },
         success: function (data) {
           let theArr = [];
@@ -1698,7 +1698,7 @@ const ShouKuang = React.createClass({
       url: globalConfig.context + "/api/admin/newOrder/getOrderTask",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];
@@ -2486,14 +2486,14 @@ const ShouKuang = React.createClass({
           }}
         >
           <Spin spinning={this.state.loading}>
-            <Project
+            {this.state.pvisible && <Project
               record={this.state.record}
               visible={this.state.pvisible}
               isAuditPaymentGLY={true}
               cancel={() => {
                 this.setState({ pvisible: false });
               }}
-            />
+            />}
             <div
               className="patent-table"
               style={
@@ -2646,14 +2646,14 @@ const ShouKuang = React.createClass({
           }}
         >
           <Spin spinning={this.state.loading}>
-            <Project
+            {this.state.pvisible && <Project
               record={this.state.record}
               visible={this.state.pvisible}
               isAuditPaymentGLY={true}
               cancel={() => {
                 this.setState({ pvisible: false });
               }}
-            />
+            />}
             <div
               className="patent-table"
               style={

+ 9 - 9
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -1436,7 +1436,7 @@ const ShouKuang = React.createClass({
         "/api/admin/orderInvoice/salesmanOrderInvoiceList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];
@@ -1484,7 +1484,7 @@ const ShouKuang = React.createClass({
       url: globalConfig.context + "/api/admin/financial/myBillList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
         whoType: 1,
       },
       success: function (data) {
@@ -1575,7 +1575,7 @@ const ShouKuang = React.createClass({
     this.setState({
       dvisible: true,
     });
-    this.loadData(1, 9999);
+    this.loadData(1, 9999999);
   },
   timeData() {
     this.setState({
@@ -1588,7 +1588,7 @@ const ShouKuang = React.createClass({
       url: globalConfig.context + "/api/admin/orderProject/taskHoursList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];
@@ -1641,7 +1641,7 @@ const ShouKuang = React.createClass({
   exportTime() {
     const data = {
       orderNo: this.state.selectedRowKeys[0],
-      pageSize: 9999,
+      pageSize: 9999999,
     };
     window.location.href =
       globalConfig.context +
@@ -1663,7 +1663,7 @@ const ShouKuang = React.createClass({
         ? this.state.selectedRowKeys[0]
         : undefined, //订单编号
       // specially: 1,
-      pageSize: 9999,
+      pageSize: 9999999,
     };
     window.location.href =
       globalConfig.context +
@@ -1681,7 +1681,7 @@ const ShouKuang = React.createClass({
       url: globalConfig.context + "/api/admin/newOrder/dunOrderNewList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];
@@ -1747,7 +1747,7 @@ const ShouKuang = React.createClass({
         url: globalConfig.context + "/api/admin/newOrder/arrearsDunList",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999,
+          pageSize: 9999999,
         },
         success: function (data) {
           let theArr = [];
@@ -1787,7 +1787,7 @@ const ShouKuang = React.createClass({
       url: globalConfig.context + "/api/admin/newOrder/getOrderTask",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       },
       success: function (data) {
         let theArr = [];

+ 1 - 1
js/component/manageCenter/index/content.jsx

@@ -37,7 +37,7 @@ const MessageModal = React.createClass({
                 defaultCurrent: 1,
                 defaultPageSize: 10,
                 showQuickJumper: true,
-                pageSize: 9999,
+                pageSize: 9999999,
                 onChange: function (page) {
                     this.loadUnread(page);
                 }.bind(this),

+ 8 - 8
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -1508,7 +1508,7 @@ const IntentionCustomer = Form.create()(
         url: globalConfig.context + "/api/admin/financial/myBillList",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999,
+          pageSize: 9999999,
           whoType: 1,
         },
         success: function (data) {
@@ -1609,7 +1609,7 @@ const IntentionCustomer = Form.create()(
         url: globalConfig.context + "/api/admin/orderProject/taskHoursList",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999,
+          pageSize: 9999999,
         },
         success: function (data) {
           let theArr = [];
@@ -1659,7 +1659,7 @@ const IntentionCustomer = Form.create()(
     exportTime() {
       const data = {
         orderNo: this.state.selectedRowKeys[0],
-        pageSize: 9999,
+        pageSize: 9999999,
       };
       window.location.href =
         globalConfig.context +
@@ -1681,7 +1681,7 @@ const IntentionCustomer = Form.create()(
           ? this.state.selectedRowKeys[0]
           : undefined, //订单编号
         // specially: 1,
-        pageSize: 9999,
+        pageSize: 9999999,
       };
       window.location.href =
         globalConfig.context +
@@ -1699,7 +1699,7 @@ const IntentionCustomer = Form.create()(
         url: globalConfig.context + "/api/admin/newOrder/dunOrderNewList",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999,
+          pageSize: 9999999,
         },
         success: function (data) {
           let theArr = [];
@@ -1761,7 +1761,7 @@ const IntentionCustomer = Form.create()(
         url: globalConfig.context + "/api/admin/newOrder/getOrderTask",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999,
+          pageSize: 9999999,
         },
         success: function (data) {
           let theArr = [];
@@ -1810,7 +1810,7 @@ const IntentionCustomer = Form.create()(
           "/api/admin/orderInvoice/salesmanOrderInvoiceList",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999,
+          pageSize: 9999999,
         },
         success: function (data) {
           let theArr = [];
@@ -1863,7 +1863,7 @@ const IntentionCustomer = Form.create()(
       this.setState({
         dvisible: true,
       });
-      this.loadData(1, 9999);
+      this.loadData(1, 9999999);
     },
     render() {
       const formItemLayout = {

+ 1 - 1
js/component/manageCenter/order/orderNew/arrearsList.jsx

@@ -260,7 +260,7 @@ const ArrearsList = Form.create()(
           : undefined,
         tEndTime: this.state.chufaDate[1] ? this.state.chufaDate[1] : undefined,
         depId: this.state.departmenttSearch,
-        pageSize: 9999,
+        pageSize: 9999999,
       };
       window.location.href =
         globalConfig.context +

+ 2 - 2
js/component/manageCenter/order/orderNew/billing.jsx

@@ -1624,7 +1624,7 @@ const MyService = Form.create()(
         url: globalConfig.context + "/api/admin/newOrder/dunOrderNewList",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999
+          pageSize: 9999999
         },
         success: function (data) {
           let theArr = [];
@@ -1686,7 +1686,7 @@ const MyService = Form.create()(
         url: globalConfig.context + "/api/admin/newOrder/getOrderTask",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999
+          pageSize: 9999999
         },
         success: function (data) {
           let theArr = [];

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

@@ -1184,7 +1184,7 @@ const contractChange = Form.create()(
         dvisible: true
         // loading: true
       });
-      this.state.pagination.pageSize = 9999;
+      this.state.pagination.pageSize = 9999999;
       this.setState({
         pagination: this.state.pagination
       });

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

@@ -1177,7 +1177,7 @@ const contractChange = Form.create()(
         dvisible: true
         // loading: true
       });
-      this.state.pagination.pageSize = 9999;
+      this.state.pagination.pageSize = 9999999;
       this.setState({
         pagination: this.state.pagination
       });

+ 1 - 1
js/component/manageCenter/order/orderNew/costAuditList/index.js

@@ -481,7 +481,7 @@ class CostAuditList extends Component{
                 delete data[key]
             }
         }
-        data.pageSize = 9999;
+        data.pageSize = 9999999;
         data.pageNo = 1;
         //专利经理审核导出
         if(this.props.isPatentManager){

+ 1 - 1
js/component/manageCenter/order/orderNew/glCostAuditList/index.js

@@ -298,7 +298,7 @@ class CostAuditList extends Component{
                 delete data[key]
             }
         }
-        data.pageSize = 9999;
+        data.pageSize = 9999999;
         data.pageNo = 1;
         window.location.href=(globalConfig.context+'/api/admin/company/exportPaymentList?'+$.param(data));
     }

+ 2 - 2
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -2023,7 +2023,7 @@ const IntentionCustomer = Form.create()(
         url: globalConfig.context + "/api/admin/newOrder/dunOrderNewList",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999,
+          pageSize: 9999999,
         },
         success: function (data) {
           let theArr = [];
@@ -2085,7 +2085,7 @@ const IntentionCustomer = Form.create()(
         url: globalConfig.context + "/api/admin/newOrder/getOrderTask",
         data: {
           orderNo: this.state.selectedRowKeys[0],
-          pageSize: 9999,
+          pageSize: 9999999,
         },
         success: function (data) {
           let theArr = [];

+ 1 - 1
js/component/manageCenter/order/orderNew/press.jsx

@@ -418,7 +418,7 @@ const IntentionCustomer = Form.create()(React.createClass({
             orderNo: this.state.orderNo?this.state.orderNo:undefined,//订单编号
             starTime: this.state.releaseDate[0]?this.state.releaseDate[0]:undefined,
             endTime: this.state.releaseDate[1]?this.state.releaseDate[1]:undefined,
-            pageSize: 9999,
+            pageSize: 9999999,
             newStatus: this.state.newStatus
         }
         window.location.href=(globalConfig.context+'/api/admin/newOrder/exportOrderDunData?'+$.param(data));

+ 20 - 15
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -48,21 +48,21 @@ const IntentionCustomer = Form.create()(React.createClass({
 							 id:thisdata.id,//ID
 							 contractNo: thisdata.contractNo,
 							 orderNo: thisdata.orderNo,//订单编号
-	             totalAmount:thisdata.totalAmount,//签单金额
-	             settlementAmount:thisdata.settlementAmount,//已收款
-	             accountsReceivable:thisdata.accountsReceivable,//应收款
-	             uncollectedAmount:thisdata.uncollectedAmount,//应收款
-	             orderStatus:thisdata.orderStatus,//订单状态
-	             projectStatus:thisdata.projectStatus,//项目状态
-	             liquidationStatus:thisdata.liquidationStatus,//结算状态
-	             signDate:thisdata.signDate,//签单时间
-	              userName:thisdata.userName,//客户名称
-	             salesmanName:thisdata.salesmanName,//营销员名称
-	             dunSubject:thisdata.dunSubject,//催收科目
-	             startDate:thisdata.startDate,//催收启动时间
+							 totalAmount:thisdata.totalAmount,//签单金额
+							 settlementAmount:thisdata.settlementAmount,//已收款
+							 accountsReceivable:thisdata.accountsReceivable,//应收款
+							 uncollectedAmount:thisdata.uncollectedAmount,//应收款
+							 appropriationRatio:thisdata.appropriationRatio,//拨款比例
+							 orderStatus:thisdata.orderStatus,//订单状态
+							 projectStatus:thisdata.projectStatus,//项目状态
+							 liquidationStatus:thisdata.liquidationStatus,//结算状态
+							 signDate:thisdata.signDate,//签单时间
+							  userName:thisdata.userName,//客户名称
+							 salesmanName:thisdata.salesmanName,//营销员名称
+							 dunSubject:thisdata.dunSubject,//催收科目
+							 startDate:thisdata.startDate,//催收启动时间
 							 depName:thisdata.depName,//部门名称
-							 contractNo:thisdata.contractNo,
-	             dunStatus: thisdata.dunStatus == 0 ? "未触发" : "已触发"
+	             			 dunStatus: thisdata.dunStatus == 0 ? "未触发" : "已触发"
 						});
 					};
 				    this.state.pagination.total = data.data.totalCount;
@@ -220,6 +220,11 @@ const IntentionCustomer = Form.create()(React.createClass({
           dataIndex: "uncollectedAmount",
           key: "uncollectedAmount"
         },
+	  	{
+		  title: "拨款比例",
+		  dataIndex: "appropriationRatio",
+		  key: "appropriationRatio"
+	  	},
         {
           title: "结算状态",
           dataIndex: "liquidationStatus",
@@ -422,7 +427,7 @@ const IntentionCustomer = Form.create()(React.createClass({
             endTime: this.state.releaseDate[1]?this.state.releaseDate[1]:undefined,
             depId: this.state.departmenttSearch ? this.state.departmenttSearch : undefined,//订单部门
             specially:1,
-            pageSize: 9999,
+            pageSize: 9999999,
             newStatus: this.state.newStatus
         }
         window.location.href=(globalConfig.context+'/api/admin/newOrder/exportOrderDunData?'+$.param(data));

+ 1 - 1
js/component/manageCenter/statistics/personnel/personnelAll.jsx

@@ -608,7 +608,7 @@ const PersonnelAll = React.createClass({
   },
   export() {
     const data = {
-      pageSize: 9999,
+      pageSize: 9999999,
       name: this.state.nameSearch ? this.state.nameSearch : undefined,
       status: this.state.statusSearch ? this.state.statusSearch : undefined,
       company: this.state.departmenttList

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.1.85",
+  "version": "1.1.86",
   "description": "",
   "main": "index.js",
   "scripts": {