hujie123456 5 years ago
parent
commit
753d0afb22

File diff suppressed because it is too large
+ 3319 - 2754
js/component/dataDic.js


+ 342 - 31
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -28,7 +28,8 @@ import {
   splitUrl,
   getprovince,
   getRefundStatus,
-  getTransactionProject
+  getTransactionProject,
+  getTaskStatus
 } from "@/tools";
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 const FormItem = Form.Item;
@@ -75,8 +76,6 @@ const approvedOutsourcing = React.createClass({
   loadData(pageNo, pageSize) {
     this.state.data = [];
     this.setState({
-      selectedRowKeys: [],
-      selectedRowKey: [],
       page: pageNo,
       loading: true
     });
@@ -132,7 +131,10 @@ const approvedOutsourcing = React.createClass({
               invoiceAmount: thisdata.invoiceAmount,
               finalReceivables: thisdata.finalReceivables,
               finalReceivablesTime: thisdata.finalReceivablesTime,
-              signTotalAmount: thisdata.signTotalAmount
+              signTotalAmount: thisdata.signTotalAmount,
+              outsourceAmount: thisdata.outsourceAmount,
+              financeName: thisdata.financeName,
+              outsourceAmount: thisdata.outsourceAmount
             });
           }
         }
@@ -228,12 +230,24 @@ const approvedOutsourcing = React.createClass({
           className: "title-table"
         },
         {
+          title: "财务负责人",
+          dataIndex: "financeName",
+          key: "financeName",
+          className: "title-table"
+        },
+        {
           title: "外包公司",
           dataIndex: "outsourceName",
           key: "outsourceName",
           className: "title-table"
         },
         {
+          title: "外包成本",
+          dataIndex: "outsourceAmount",
+          key: "outsourceAmount",
+          className: "title-table"
+        },
+        {
           title: "签单日期",
           dataIndex: "signTime",
           key: "signTime",
@@ -374,6 +388,158 @@ const approvedOutsourcing = React.createClass({
           }
         }
       ],
+      timeColumns: [
+        {
+          title: "序号",
+          dataIndex: "key",
+          key: "key"
+        },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo"
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo"
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName"
+        },
+        {
+          title: "项目负责人",
+          dataIndex: "receiverName",
+          key: "receiverName"
+        },
+        {
+          title: "项目类别",
+          dataIndex: "cname",
+          key: "cname"
+        },
+        {
+          title: "项目编号",
+          dataIndex: "id",
+          key: "id"
+        },
+        {
+          title: "项目名称",
+          dataIndex: "taskName",
+          key: "taskName"
+        },
+        {
+          title: "项目状态",
+          dataIndex: "taskStatus",
+          key: "taskStatus",
+          render: text => {
+            return getTaskStatus(text);
+          }
+        },
+        {
+          title: "工时",
+          dataIndex: "hours",
+          key: "hours"
+        },
+        {
+          title: "分配时间",
+          dataIndex: "taskDistributionTime",
+          key: "taskDistributionTime"
+        },
+        {
+          title: "完成时间",
+          dataIndex: "taskEndTime",
+          key: "taskEndTime"
+        }
+      ],
+      printColumns: [
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo"
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo"
+          // fixed: "left"
+        },
+        {
+          title: "客户名称",
+          dataIndex: "buyerName",
+          key: "buyerName"
+        },
+        {
+          title: "订单部门",
+          dataIndex: "departmentName",
+          key: "departmentName"
+        },
+        {
+          title: "订单负责人",
+          dataIndex: "sellerName",
+          key: "sellerName"
+        },
+        {
+          title: "签单日期",
+          dataIndex: "signTime",
+          key: "signTime"
+        },
+        {
+          title: "下单日期",
+          dataIndex: "createTime",
+          key: "createTime"
+        },
+        {
+          title: "签单金额(万元)",
+          dataIndex: "signTotalAmount",
+          key: "signTotalAmount"
+        },
+        {
+          title: "开票金额(万元)",
+          dataIndex: "invoiceAmount",
+          key: "invoiceAmount"
+        },
+        {
+          title: "已收款(万元)",
+          dataIndex: "actuallyTotalAmount",
+          key: "actuallyTotalAmount"
+        },
+        {
+          title: "最近收款(万元)",
+          dataIndex: "finalReceivables",
+          key: "finalReceivables"
+        },
+        {
+          title: "最近收款时间",
+          dataIndex: "finalReceivablesTime",
+          key: "finalReceivablesTime"
+        },
+        {
+          title: "结算状态",
+          dataIndex: "liquidationStatus",
+          key: "liquidationStatus",
+          render: text => {
+            return getLiquidationStatus(text);
+          }
+        },
+        {
+          title: "流程状态",
+          dataIndex: "processStatus",
+          key: "processStatus",
+          render: text => {
+            return getProcessStatus(text);
+          }
+        },
+        {
+          title: "特批状态",
+          dataIndex: "approval",
+          key: "approval",
+          render: text => {
+            return getApproval(text);
+          }
+        }
+      ],
       columnsX: [
         {
           title: "业务项目名称",
@@ -1152,6 +1318,8 @@ const approvedOutsourcing = React.createClass({
     this.state.departmenttList = undefined;
     this.state.processStatus = [];
     this.state.contractNoSearch = "";
+    this.state.liquidationStatus = []
+    this.state.contractNo = ""
     this.loadData();
   },
   boHuiCo() {
@@ -1233,7 +1401,8 @@ const approvedOutsourcing = React.createClass({
         globalConfig.context +
         "/api/admin/orderInvoice/salesmanOrderInvoiceList",
       data: {
-        orderNo: this.state.selectedRowKeys[0]
+        orderNo: this.state.selectedRowKeys[0],
+        pageSize: 9999
       },
       success: function(data) {
         let theArr = [];
@@ -1285,7 +1454,8 @@ const approvedOutsourcing = React.createClass({
       crossDomain: false,
       url: globalConfig.context + "/api/admin/financial/myBillList",
       data: {
-        orderNo: this.state.selectedRowKeys[0]
+        orderNo: this.state.selectedRowKeys[0],
+        pageSize: 9999,
       },
       success: function(data) {
         let theArr = [];
@@ -1335,9 +1505,24 @@ const approvedOutsourcing = React.createClass({
     });
   },
   exportAll() {
+    const data = {
+      pageSize: 9999,
+      buyerName: this.state.nameSearch, //客户名称
+      orderNo: this.state.orderNoSearch,
+      startTime: this.state.releaseDate[0],
+      endTime: this.state.releaseDate[1],
+      startFinalReceivablesTime: this.state.shouKuanDate[0],
+      endFinalReceivablesTime: this.state.shouKuanDate[1],
+      departmentId: this.state.departmenttList,
+      processStatus: this.state.processStatusSearch,
+      contractNo: this.state.contractNoSearch,
+      outsource: 1,
+      liquidationStatus: this.state.liquidationStatus
+    };
     window.location.href =
       globalConfig.context +
-      "/api/admin/receivables/exportReceivables?outsource=1";
+      "/api/admin/receivables/exportReceivables?" +
+      $.param(data);
   },
   exportKaip() {
     window.location.href =
@@ -1356,25 +1541,7 @@ const approvedOutsourcing = React.createClass({
       dvisible: true
       // loading: true
     });
-
     this.loadData(1, 9999);
-    this.state.pagination.pageSize = 9999;
-    this.setState({
-      pagination: this.state.pagination
-    });
-    window.setTimeout(() => {
-      document.querySelectorAll(
-        ".ant-pagination.ant-table-pagination.mini"
-      )[0].style.display = "none";
-      // let tr = document.querySelectorAll(".patent-table tr");
-      // for(let i = 0; i < tr.length; i++) {
-      //   tr[i].style.fontSize = "6px"
-      // }
-      // let td = document.querySelectorAll(".patent-table tr td");
-      // for (let i = 0; i < td.length; i++) {
-      //   td[i].style.padding = "0 0 0 0";
-      // }
-    }, 100);
   },
   downImg() {
     let num = 0;
@@ -1414,6 +1581,56 @@ const approvedOutsourcing = React.createClass({
       rotateDeg
     });
   },
+  timeData() {
+    this.setState({
+      loading: true
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderProject/taskHoursList",
+      data: {
+        orderNo: this.state.selectedRowKeys[0],
+        pageSize: 9999
+      },
+      success: function(data) {
+        let theArr = [];
+        if (!data.data || !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 + 1,
+              orderNo: thisdata.orderNo,
+              contractNo: thisdata.contractNo,
+              userName: thisdata.userName,
+              receiverName: thisdata.receiverName,
+              taskStatus: thisdata.taskStatus,
+              cname: thisdata.cname,
+              id: thisdata.id,
+              taskName: thisdata.taskName,
+              hours: thisdata.hours,
+              taskDistributionTime: thisdata.taskDistributionTime,
+              taskEndTime: thisdata.taskEndTime
+            });
+          }
+        }
+        this.setState({
+          timeDataList: theArr
+        });
+      }.bind(this)
+    }).always(
+      function() {
+        this.setState({
+          loading: false
+        });
+      }.bind(this)
+    );
+  },
   render() {
     const { TextArea } = Input;
     const { RangePicker } = DatePicker;
@@ -1428,7 +1645,8 @@ const approvedOutsourcing = React.createClass({
     const rowSelection = {
       selectedRowKeys,
       onChange: this.onSelectChange,
-      hideDefaultSelections: true
+      hideDefaultSelections: true,
+      type: "radio"
     };
     const jsDate = this.state.jsDate || [];
     return (
@@ -1583,6 +1801,45 @@ const approvedOutsourcing = React.createClass({
             >
               打印收款流水
             </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={() => {
+                this.timeData();
+                this.setState({
+                  timeVisible: true
+                });
+              }}
+            >
+              打印工时信息
+            </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={() => {
+                this.waterData();
+                this.setState({
+                  cuiVisible: true
+                });
+              }}
+            >
+              打印催款信息
+            </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={() => {
+                this.waterData();
+                this.setState({
+                  proVisible: true
+                });
+              }}
+            >
+              打印项目信息
+            </Button>
           </TabPane>
           <TabPane tab="导出Excel" key="4">
             <Button
@@ -2345,10 +2602,6 @@ const approvedOutsourcing = React.createClass({
           className="admin-desc-content"
           width="1300px"
           onCancel={() => {
-            this.state.pagination.pageSize = 10;
-            this.setState({
-              pagination: this.state.pagination
-            });
             this.loadData();
             this.setState({
               dvisible: false
@@ -2372,7 +2625,65 @@ const approvedOutsourcing = React.createClass({
               <Table
                 columns={this.state.printColumns}
                 dataSource={this.state.dataSource}
-                pagination={this.state.pagination}
+                pagination={false}
+                bordered
+                size="small"
+              />
+            </div>
+          </Spin>
+
+          <ReactToPrint
+            trigger={() => (
+              <Button
+                type="primary"
+                style={{
+                  float: "right",
+                  marginTop: 10,
+                  position: "absolute",
+                  top: 0,
+                  right: 30
+                }}
+              >
+                打印
+              </Button>
+            )}
+            content={() => this.refs.all}
+          />
+        </Modal>
+        <Modal
+          visible={this.state.timeVisible}
+          footer=""
+          title="工时详情"
+          className="admin-desc-content"
+          width="1300px"
+          pagination={false}
+          onCancel={() => {
+            this.loadData();
+            this.setState({
+              timeVisible: false
+            });
+          }}
+        >
+          <Spin spinning={this.state.loading}>
+            <div
+              className="patent-table"
+              style={
+                {
+                  // width: 900,
+                  // position: "relative",
+                  // left: "50%",
+                  // transform: "translate(-50%)",
+                  // padding: "25px 0 30px 30px"
+                }
+              }
+              ref={e => {
+                this.refs.all = e;
+              }}
+            >
+              <Table
+                columns={this.state.timeColumns}
+                dataSource={this.state.timeDataList}
+                pagination={false}
                 bordered
                 size="small"
               />

+ 229 - 28
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -26,6 +26,7 @@ import {
   getApproval,
   getInvoiceStatus,
   getTransactionProject,
+  getTaskStatus
 } from "@/tools";
 import { ChooseList } from "../../order/orderNew/chooseList"
 const FormItem = Form.Item;
@@ -74,8 +75,8 @@ const ShouKuang = React.createClass({
     this.state.data = [];
     this.state.pagination.pageSize = 10
     this.setState({
-      selectedRowKeys: [],
-      selectedRowKey: [],
+      // selectedRowKeys: [],
+      // selectedRowKey: [],
       page: pageNo,
       loading: true,
       pagination: this.state.pagination
@@ -130,7 +131,8 @@ const ShouKuang = React.createClass({
               invoiceAmount: thisdata.invoiceAmount,
               finalReceivables: thisdata.finalReceivables,
               finalReceivablesTime: thisdata.finalReceivablesTime,
-              signTotalAmount: thisdata.signTotalAmount
+              signTotalAmount: thisdata.signTotalAmount,
+              financeName: thisdata.financeName
             });
           }
         }
@@ -190,6 +192,71 @@ const ShouKuang = React.createClass({
       },
       // 子组件改变的表格title数组
       changeList: undefined,
+      timeColumns: [
+        {
+          title: "序号",
+          dataIndex: "key",
+          key: "key"
+        },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo"
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo"
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName"
+        },
+        {
+          title: "项目负责人",
+          dataIndex: "receiverName",
+          key: "receiverName"
+        },
+        {
+          title: "项目类别",
+          dataIndex: "cname",
+          key: "cname"
+        },
+        {
+          title: "项目编号",
+          dataIndex: "id",
+          key: "id"
+        },
+        {
+          title: "项目名称",
+          dataIndex: "taskName",
+          key: "taskName"
+        },
+        {
+          title: "项目状态",
+          dataIndex: "taskStatus",
+          key: "taskStatus",
+          render: text => {
+            return getTaskStatus(text);
+          }
+        },
+        {
+          title: "工时",
+          dataIndex: "hours",
+          key: "hours"
+        },
+        {
+          title: "分配时间",
+          dataIndex: "taskDistributionTime",
+          key: "taskDistributionTime"
+        },
+        {
+          title: "完成时间",
+          dataIndex: "taskEndTime",
+          key: "taskEndTime"
+        }
+      ],
       printColumns: [
         {
           title: "合同编号",
@@ -310,6 +377,12 @@ const ShouKuang = React.createClass({
           className: "title-table"
         },
         {
+          title: "财务负责人",
+          dataIndex: "financeName",
+          key: "financeName",
+          className: "title-table"
+        },
+        {
           title: "签单日期",
           dataIndex: "signTime",
           key: "signTime",
@@ -448,7 +521,6 @@ const ShouKuang = React.createClass({
                   //   onClick={e => {
                   //     e.stopPropagation(), this.evaluateY(recard, "财务专员");
                   //     console.log(recard);
-                      
                   //   }}
                   // >
                   //   转交
@@ -746,7 +818,8 @@ const ShouKuang = React.createClass({
         globalConfig.context +
         "/api/admin/orderInvoice/salesmanOrderInvoiceList",
       data: {
-        orderNo: this.state.selectedRowKeys[0]
+        orderNo: this.state.selectedRowKeys[0],
+        pageSize: 9999
       },
       success: function(data) {
         let theArr = [];
@@ -793,7 +866,8 @@ const ShouKuang = React.createClass({
       crossDomain: false,
       url: globalConfig.context + "/api/admin/financial/myBillList",
       data: {
-        orderNo: this.state.selectedRowKeys[0]
+        orderNo: this.state.selectedRowKeys[0],
+        pageSize: 9999
       },
       success: function(data) {
         let theArr = [];
@@ -826,7 +900,7 @@ const ShouKuang = React.createClass({
         }
         this.setState({
           waterData: theArr,
-          waterSum: waterSum.toFixed(4)
+          waterSum: (Math.round(waterSum* 10000) / 10000).toFixed(4)
         });
       }.bind(this)
     }).always(
@@ -863,29 +937,58 @@ const ShouKuang = React.createClass({
   printAll() {
     this.setState({
       dvisible: true,
-      // loading: true
     });
- 
-
- 
-    
     this.loadData(1,9999)
-    this.state.pagination.pageSize = 9999
+  },
+  timeData() {
     this.setState({
-      pagination: this.state.pagination
+      loading: true
     });
-    window.setTimeout(()=> {
-      document.querySelectorAll(".ant-pagination.ant-table-pagination.mini")[0].style.display="none"
-      // let tr = document.querySelectorAll(".patent-table tr");
-      // for(let i = 0; i < tr.length; i++) {
-      //   tr[i].style.fontSize = "6px"
-      // }
-      // let td = document.querySelectorAll(".patent-table tr td");
-      // for (let i = 0; i < td.length; i++) {
-      //   td[i].style.padding = "0 0 0 0";
-      // }
-    },100)
-  
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderProject/taskHoursList",
+      data: {
+        orderNo: this.state.selectedRowKeys[0],
+        pageSize: 9999
+      },
+      success: function(data) {
+        let theArr = [];
+        if (!data.data || !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 + 1,
+              orderNo: thisdata.orderNo,
+              contractNo: thisdata.contractNo,
+              userName: thisdata.userName,
+              receiverName: thisdata.receiverName,
+              taskStatus: thisdata.taskStatus,
+              cname: thisdata.cname,
+              id: thisdata.id,
+              taskName: thisdata.taskName,
+              hours: thisdata.hours,
+              taskDistributionTime: thisdata.taskDistributionTime,
+              taskEndTime: thisdata.taskEndTime,
+            });
+          }
+        }
+        this.setState({
+          timeDataList: theArr
+        });
+      }.bind(this)
+    }).always(
+      function() {
+        this.setState({
+          loading: false
+        });
+      }.bind(this)
+    );
   },
   render() {
     const formItemLayout = {
@@ -898,7 +1001,8 @@ const ShouKuang = React.createClass({
     const rowSelection = {
       selectedRowKeys,
       onChange: this.onSelectChange,
-      hideDefaultSelections: true
+      hideDefaultSelections: true,
+      type: "radio"
     };
     return (
       <div className="user-content">
@@ -1053,6 +1157,45 @@ const ShouKuang = React.createClass({
             >
               打印收款流水
             </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={() => {
+                this.timeData();
+                this.setState({
+                  timeVisible: true
+                });
+              }}
+            >
+              打印工时信息
+            </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={() => {
+                this.waterData();
+                this.setState({
+                  cuiVisible: true
+                });
+              }}
+            >
+              打印催款信息
+            </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={() => {
+                this.waterData();
+                this.setState({
+                  proVisible: true
+                });
+              }}
+            >
+              打印项目信息
+            </Button>
           </TabPane>
           <TabPane tab="导出Excel" key="4">
             <Button
@@ -1359,7 +1502,65 @@ const ShouKuang = React.createClass({
               <Table
                 columns={this.state.printColumns}
                 dataSource={this.state.dataSource}
-                pagination={this.state.pagination}
+                pagination={false}
+                bordered
+                size="small"
+              />
+            </div>
+          </Spin>
+
+          <ReactToPrint
+            trigger={() => (
+              <Button
+                type="primary"
+                style={{
+                  float: "right",
+                  marginTop: 10,
+                  position: "absolute",
+                  top: 0,
+                  right: 30
+                }}
+              >
+                打印
+              </Button>
+            )}
+            content={() => this.refs.all}
+          />
+        </Modal>
+        <Modal
+          visible={this.state.timeVisible}
+          footer=""
+          title="工时详情"
+          className="admin-desc-content"
+          width="1300px"
+          pagination={false}
+          onCancel={() => {
+            this.loadData();
+            this.setState({
+              timeVisible: false
+            });
+          }}
+        >
+          <Spin spinning={this.state.loading}>
+            <div
+              className="patent-table"
+              style={
+                {
+                  // width: 900,
+                  // position: "relative",
+                  // left: "50%",
+                  // transform: "translate(-50%)",
+                  // padding: "25px 0 30px 30px"
+                }
+              }
+              ref={e => {
+                this.refs.all = e;
+              }}
+            >
+              <Table
+                columns={this.state.timeColumns}
+                dataSource={this.state.timeDataList}
+                pagination={false}
                 bordered
                 size="small"
               />

+ 142 - 177
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -10,6 +10,7 @@ import {
   getCuikuan,
   getProjectStatus,
   ShowModal,
+  getType
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailCwzy.js";
@@ -18,6 +19,7 @@ import OrderDetail from "./changeComponent/orderDetail";
 import { ChooseList } from "./chooseList.jsx";
 import ShowModalDiv from "@/showModal.jsx";
 const { RangePicker } = DatePicker;
+import ReactToPrint from "react-to-print";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -101,6 +103,7 @@ const contractChange = Form.create()(
     },
     getInitialState() {
       return {
+        dvisible: false,
         page: 1,
         searchData: {
           releaseDate: []
@@ -147,16 +150,16 @@ const contractChange = Form.create()(
             key: "orderNo"
           },
           {
-            title: "提交时间",
-            dataIndex: "createTimes",
-            key: "createTimes"
-          },
-          {
             title: "客户名称",
             dataIndex: "nickname",
             key: "nickname"
           },
           {
+            title: "订单部门",
+            dataIndex: "depName",
+            key: "depName"
+          },
+          {
             title: "订单类型",
             dataIndex: "orderType",
             key: "orderType",
@@ -198,14 +201,22 @@ const contractChange = Form.create()(
             key: "salesmanName"
           },
           {
-            title: "订单部门",
-            dataIndex: "depName",
-            key: "depName"
+            title: "变更类型",
+            dataIndex: "type",
+            key: "type",
+            render: text => {
+              return getType(text);
+            }
           },
           {
             title: "审核状态",
             dataIndex: "processStateText",
             key: "processStateText"
+          },
+          {
+            title: "提交时间",
+            dataIndex: "createTimes",
+            key: "createTimes"
           }
         ],
         dataSource: [],
@@ -1074,6 +1085,68 @@ const contractChange = Form.create()(
         changeList: newArr
       });
     },
+    printAll() {
+      this.setState({
+        dvisible: true
+        // loading: true
+      });
+      this.state.pagination.pageSize = 9999;
+      this.setState({
+        pagination: this.state.pagination
+      }); 
+      this.loadData();
+    },
+    exportAll() {
+      window.location.href =
+        globalConfig.context +
+        "/api/admin/orderChange/exportMyChange?" +
+        `orderNo=${
+          this.state.searchData.orderNoSearch
+            ? this.state.searchData.orderNoSearch
+            : ""
+        }&processState=${
+          this.props.processState ? this.props.processState : ""
+        }&userName=${
+          this.state.searchData.userNameSearch
+            ? this.state.searchData.userNameSearch
+            : ""
+        }&contractNo=${
+          this.state.searchData.contractNoSearch
+            ? this.state.searchData.contractNoSearch
+            : ""
+        }
+        &timeType=${
+          this.state.searchData.timeTypeSearch
+            ? this.state.searchData.timeTypeSearch
+            : ""
+        }
+        &startTime=${
+          this.state.searchData.releaseDate[0]
+            ? this.state.searchData.releaseDate[0]
+            : ""
+        }
+        &endTime=${
+          this.state.searchData.releaseDate[1]
+            ? this.state.searchData.releaseDate[1]
+            : ""
+        }
+        &salesmanName=${
+          this.state.searchData.salesmanNameSearch
+            ? this.state.searchData.salesmanNameSearch
+            : ""
+        }
+        &complete=${this.state.searchData.completeSearch || 1}
+        &depId=${
+          this.state.searchData.depIdSearch
+            ? this.state.searchData.depIdSearch
+            : ""
+        }
+        &type=${
+          this.state.searchData.changeSearch
+            ? this.state.searchData.changeSearch
+            : ""
+        }`;
+    },
     render() {
       const formItemLayout = {
         labelCol: { span: 8 },
@@ -1119,106 +1192,8 @@ const contractChange = Form.create()(
                 <div style={{ marginLeft: 10 }}>
                   <SearchInput search={this.search} />
                 </div>
-                {/* <div className="user-search" style={{ marginLeft: 10 }}>
-                  <Input
-                    placeholder="订单编号"
-                    value={this.state.orderNoSearch}
-                    onChange={e => {
-                      this.setState({ orderNoSearch: e.target.value });
-                    }}
-                  />
-                  <Input
-                    placeholder="客户名称"
-                    value={this.state.nameSearch}
-                    onChange={e => {
-                      this.setState({ nameSearch: e.target.value });
-                    }}
-                  />
-                  <Select
-                    placeholder="订单部门"
-                    style={{ width: 150, marginRight: 10 }}
-                    value={this.state.departmenttList}
-                    onChange={e => {
-                      this.setState({ departmenttList: e });
-                    }}
-                  >
-                    {departmentArr.map(function(item) {
-                      return (
-                        <Select.Option key={item.id}>{item.name}</Select.Option>
-                      );
-                    })}
-                  </Select>
-                  <Input
-                    placeholder="合同编号"
-                    value={this.state.contractNoSearch}
-                    onChange={e => {
-                      this.setState({
-                        contractNoSearch: e.target.value
-                      });
-                    }}
-                  />
-                  <Select
-                    placeholder="流程状态"
-                    onChange={e => {
-                      this.setState({ processStatusSearch: e });
-                    }}
-                    style={{ width: 160, marginRight: 5 }}
-                    value={this.state.processStatusSearch}
-                  >
-                    <Option value="3">未分配</Option>
-                    <Option value="4">已分配</Option>
-                  </Select>
-                  <Select
-                    placeholder="结算状态"
-                    onChange={e => {
-                      this.setState({ liquidationStatus: e });
-                    }}
-                    style={{ width: 160, marginRight: 5 }}
-                    value={this.state.liquidationStatus}
-                  >
-                    <Option value="0">首付待付清</Option>
-                    <Option value="1">尾款待付清</Option>
-                    <Option value="2">已付清</Option>
-                  </Select>
-                  <span style={{}}>下单日期:</span>
-                  <RangePicker
-                    value={[
-                      this.state.releaseDate[0]
-                        ? moment(this.state.releaseDate[0])
-                        : null,
-                      this.state.releaseDate[1]
-                        ? moment(this.state.releaseDate[1])
-                        : null
-                    ]}
-                    onChange={(data, dataString) => {
-                      this.setState({ releaseDate: dataString });
-                    }}
-                  />
-                  <span style={{}}>最近收款:</span>
-                  <RangePicker
-                    value={[
-                      this.state.shouKuanDate[0]
-                        ? moment(this.state.shouKuanDate[0])
-                        : null,
-                      this.state.shouKuanDate[1]
-                        ? moment(this.state.shouKuanDate[1])
-                        : null
-                    ]}
-                    onChange={(data, dataString) => {
-                      this.setState({ shouKuanDate: dataString });
-                    }}
-                  />
-                  <Button
-                    type="primary"
-                    onClick={this.loadData}
-                    style={{ marginLeft: 10 }}
-                  >
-                    搜索
-                  </Button>
-                  <Button onClick={this.reset}>重置</Button>
-                </div> */}
               </TabPane>
-              {/* <TabPane tab="打印" key="3">
+              <TabPane tab="打印" key="3">
                 <Button
                   type="primary"
                   style={{ margin: "11px 0px 10px 10px" }}
@@ -1227,32 +1202,6 @@ const contractChange = Form.create()(
                 >
                   打印所有列表信息
                 </Button>
-                <Button
-                  type="primary"
-                  disabled={this.state.selectedRowKeys.length != 1}
-                  style={{ margin: "11px 0px 10px 10px" }}
-                  onClick={() => {
-                    this.inRecordData();
-                    this.setState({
-                      bvisible: true
-                    });
-                  }}
-                >
-                  打印开票详情
-                </Button>
-                <Button
-                  type="primary"
-                  disabled={this.state.selectedRowKeys.length != 1}
-                  style={{ margin: "11px 0px 10px 10px" }}
-                  onClick={() => {
-                    this.waterData();
-                    this.setState({
-                      cvisible: true
-                    });
-                  }}
-                >
-                  打印收款流水
-                </Button>
               </TabPane>
               <TabPane tab="导出Excel" key="4">
                 <Button
@@ -1262,51 +1211,7 @@ const contractChange = Form.create()(
                 >
                   导出当前列表
                 </Button>
-                <Button
-                  type="primary"
-                  disabled={this.state.selectedRowKeys.length != 1}
-                  style={{ margin: "11px 0px 10px 10px" }}
-                  onClick={this.exportKaip}
-                >
-                  导出所选开票详情
-                </Button>
-                <Button
-                  type="primary"
-                  disabled={this.state.selectedRowKeys.length != 1}
-                  style={{ margin: "11px 0px 10px 10px" }}
-                  onClick={this.exportWater}
-                >
-                  导出所选收款详情流水
-                </Button>
               </TabPane>
-              <TabPane tab="查看" key="5">
-                <Button
-                  type="primary"
-                  disabled={this.state.selectedRowKeys.length != 1}
-                  style={{ margin: "11px 0px 10px 10px" }}
-                  onClick={() => {
-                    this.inRecordData();
-                    this.setState({
-                      bvisible: true
-                    });
-                  }}
-                >
-                  查看开票详情
-                </Button>
-                <Button
-                  type="primary"
-                  disabled={this.state.selectedRowKeys.length != 1}
-                  style={{ margin: "11px 0px 10px 10px" }}
-                  onClick={() => {
-                    this.waterData();
-                    this.setState({
-                      cvisible: true
-                    });
-                  }}
-                >
-                  详情收款流水
-                </Button>
-              </TabPane> */}
               {/* <TabPane tab="批量操作" key="6">
             <Button
               type="primary"
@@ -1331,6 +1236,7 @@ const contractChange = Form.create()(
                       ? this.state.columns
                       : this.state.changeList
                   }
+                  scroll={{ x: "max-content", y: 0 }}
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}
@@ -1555,6 +1461,65 @@ const contractChange = Form.create()(
                 </Spin>
               </div>
             </Modal>
+            <Modal
+              visible={this.state.dvisible}
+              footer=""
+              title="所有列表信息"
+              className="admin-desc-content"
+              width="1300px"
+              onCancel={() => {
+                this.setState({
+                  dvisible: false
+                });
+                this.state.pagination.pageSize = 10;
+                this.setState({
+                  pagination: this.state.pagination
+                });
+                this.loadData();
+              }}
+            >
+              <Spin spinning={this.state.loading}>
+                <div
+                  className="patent-table"
+                  style={{
+                    // width: 900,
+                    // position: "relative",
+                    // left: "50%",
+                    // transform: "translate(-50%)",
+                    padding: "25px 30px 30px 30px"
+                  }}
+                  ref={e => {
+                    this.refs.all = e;
+                  }}
+                >
+                  <Table
+                    columns={this.state.columns}
+                    dataSource={this.state.dataSource}
+                    pagination={false}
+                    bordered
+                    size="small"
+                  />
+                </div>
+              </Spin>
+
+              <ReactToPrint
+                trigger={() => (
+                  <Button
+                    type="primary"
+                    style={{
+                      float: "right",
+                      marginTop: 10,
+                      position: "absolute",
+                      top: 0,
+                      right: 30
+                    }}
+                  >
+                    打印
+                  </Button>
+                )}
+                content={() => this.refs.all}
+              />
+            </Modal>
           </div>
         </div>
       );

+ 159 - 120
js/component/manageCenter/order/orderNew/press.jsx

@@ -54,7 +54,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                         salesmanName:thisdata.salesmanName,//营销员名称
 	                         dunSubject:thisdata.dunSubject,//催收科目
 	                         startDate:thisdata.startDate,//催收启动时间
-	                         depName:thisdata.depName,//部门名称
+							 depName:thisdata.depName,//部门名称
+							 contractNo: thisdata.contractNo
 	                        
 						});
 					};
@@ -119,124 +120,161 @@ const IntentionCustomer = Form.create()(React.createClass({
 	},
 	getInitialState() {
 		return {
-			page:1,
-			releaseDate: [],
-			selectedRowKeys: [],
-			orgCodeUrl:[],
-			departmentArr: [],
-			paginations:false,
-			pagination: {
-				defaultCurrent: 1,
-				defaultPageSize: 10,
-				showQuickJumper: true,
-				pageSize: 10,
-				onChange: function(page) {
-					this.loadData(page);
-				}.bind(this),
-				showTotal: function(total) {
-					return '共' + total + '条数据';
-				}
-			},
-			columns: [
-				{
-                    title: '订单编号',
-                    dataIndex: 'orderNo',
-                    key: 'orderNo',
-					fixed:'left'
-                }, {
-                    title: '签单时间',
-                    dataIndex: 'signDate',
-                    key: 'signDate'
-                },{
-                    title: '客户名称',
-                    dataIndex: 'userName',
-                    key: 'userName',
-                    render:(text)=>{
-                    	return (text&&text.length>9?text.substr(0,9)+'...':text)
-                    }
-                },{
-                    title: '订单状态',
-                    dataIndex: 'orderStatus',
-                    key: 'orderStatus',
-                    render:text=>{return getNewOrderStatus(text)}
-                }, {
-                    title: '签单金额(万元)',
-                    dataIndex: 'totalAmount',
-                    key: 'totalAmount'
-                },{
-                    title: '项目状态',
-                    dataIndex: 'projectStatus',
-                    key: 'projectStatus',
-                    render:text=>{return getProjectStatus(text)}
-                },{
-                    title: '结算状态',
-                    dataIndex: 'liquidationStatus',
-                    key: 'liquidationStatus',
-                    render:text=>{return getLiquidationStatus(text)}
-                }, {
-                    title: '应收款(万)',
-                    dataIndex: 'accountsReceivable',
-                    key: 'accountsReceivable'
-                }, {
-                    title: '已收款(万)',
-                    dataIndex: 'settlementAmount',
-                    key: 'settlementAmount'
-                }, {
-                    title: '未收款(万)',
-                    dataIndex: 'uncollectedAmount',
-                    key: 'uncollectedAmount'
-                },{
-                    title: '订单负责人',
-                    dataIndex: 'salesmanName',
-                    key: 'salesmanName'
-                },{
-                    title: '订单部门',
-                    dataIndex: 'depName',
-                    key: 'depName',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'…':text)
-					}
-                },{
-                    title: '催收科目',
-                    dataIndex: 'dunSubject',
-                    key: 'dunSubject',
-                    render: text=>{return getjiedian(text)}
-                },{
-                    title: '催款启动日期',
-                    dataIndex: 'startDate',
-                    key: 'startDate'
-                }, {
-					title: '催收操作',
-					dataIndex: 'abc',
-					key: 'abc',
-					render: (text, record) => {
-						return <div>
-                            <Button onClick={(e) =>{ e.stopPropagation(), this.visit(record)}} type="primary">添加催款记录</Button>                            							    
-                        </div>
-					}
-				}
-			],
-			data: [],
-			dataSource: [],
-			columnsX: [
-				{
-                    title: '催款人',
-                    dataIndex: 'dumBy',
-                    key: 'dumBy'
-                }, {
-                    title: '催款时间',
-                    dataIndex: 'dumTime',
-                    key: 'dumTime',
-                    
-                },{
-                    title: '催款情况',
-                    dataIndex: 'remarks',
-                    key: 'remarks'
-                }
-			],
-			dataSources: [],
-			
-		}
+      page: 1,
+      releaseDate: [],
+      selectedRowKeys: [],
+      orgCodeUrl: [],
+      departmentArr: [],
+      paginations: false,
+      pagination: {
+        defaultCurrent: 1,
+        defaultPageSize: 10,
+        showQuickJumper: true,
+        pageSize: 10,
+        onChange: function(page) {
+          this.loadData(page);
+        }.bind(this),
+        showTotal: function(total) {
+          return "共" + total + "条数据";
+        }
+      },
+      columns: [
+        {
+          title: "序号",
+          dataIndex: "key",
+          key: "key"
+        },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo"
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo"
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName",
+          render: text => {
+            return text && text.length > 9 ? text.substr(0, 9) + "..." : text;
+          }
+        },
+        {
+          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 getProjectStatus(text);
+          }
+        },
+        {
+          title: "签单金额(万元)",
+          dataIndex: "totalAmount",
+          key: "totalAmount"
+        },
+        {
+          title: "结算状态",
+          dataIndex: "liquidationStatus",
+          key: "liquidationStatus",
+          render: text => {
+            return getLiquidationStatus(text);
+          }
+        },
+        {
+          title: "应收款(万)",
+          dataIndex: "accountsReceivable",
+          key: "accountsReceivable"
+        },
+        {
+          title: "已收款(万)",
+          dataIndex: "settlementAmount",
+          key: "settlementAmount"
+        },
+        {
+          title: "未收款(万)",
+          dataIndex: "uncollectedAmount",
+          key: "uncollectedAmount"
+        },
+        {
+          title: "催收科目",
+          dataIndex: "dunSubject",
+          key: "dunSubject",
+          render: text => {
+            return getjiedian(text);
+          }
+        },
+        {
+          title: "催款启动日期",
+          dataIndex: "startDate",
+          key: "startDate"
+        },
+        {
+          title: "签单时间",
+          dataIndex: "signDate",
+          key: "signDate"
+        }
+        // {
+        //   title: "催收操作",
+        //   dataIndex: "abc",
+        //   key: "abc",
+        //   render: (text, record) => {
+        //     return (
+        //       <div>
+        //         <Button
+        //           onClick={e => {
+        //             e.stopPropagation(), this.visit(record);
+        //           }}
+        //           type="primary"
+        //         >
+        //           添加催款记录
+        //         </Button>
+        //       </div>
+        //     );
+        //   }
+        // }
+      ],
+      data: [],
+      dataSource: [],
+      columnsX: [
+        {
+          title: "催款人",
+          dataIndex: "dumBy",
+          key: "dumBy"
+        },
+        {
+          title: "催款时间",
+          dataIndex: "dumTime",
+          key: "dumTime"
+        },
+        {
+          title: "催款情况",
+          dataIndex: "remarks",
+          key: "remarks"
+        }
+      ],
+      dataSources: []
+    };
 	},
 	
 	//页面加载函数
@@ -473,7 +511,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                            dataSource={this.state.dataSource}  
 								scroll={{ x: 1500, y: 0 }}
 	                            pagination={this.state.pagination} 
-	                            onRowClick={this.tableRowClick}
+								onRowClick={this.tableRowClick}
+								bordered
 	                           />
 	                    </Spin>
                		 </div> 

+ 164 - 120
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -40,8 +40,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 					for(let i = 0; i < data.data.list.length; i++) {
 						let thisdata = data.data.list[i];
 						theArr.push({
-							 key: i,
+							 key: i + 1,
 							 id:thisdata.id,//ID
+							 contractNo: thisdata.contractNo,
 							 orderNo: thisdata.orderNo,//订单编号
 	                         totalAmount:thisdata.totalAmount,//签单金额
 	                         settlementAmount:thisdata.settlementAmount,//已收款
@@ -55,7 +56,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                         salesmanName:thisdata.salesmanName,//营销员名称
 	                         dunSubject:thisdata.dunSubject,//催收科目
 	                         startDate:thisdata.startDate,//催收启动时间
-	                         depName:thisdata.depName,//部门名称
+							 depName:thisdata.depName,//部门名称
+							 contractNo:thisdata.contractNo
 	                        
 						});
 					};
@@ -120,120 +122,161 @@ const IntentionCustomer = Form.create()(React.createClass({
 	},
 	getInitialState() {
 		return {
-			page:1,
-			releaseDate: [],
-			selectedRowKeys: [],
-			orgCodeUrl:[],
-			departmentArr: [],
-			paginations:false,
-			pagination: {
-				defaultCurrent: 1,
-				defaultPageSize: 10,
-				showQuickJumper: true,
-				pageSize: 10,
-				onChange: function(page) {
-					this.loadData(page);
-				}.bind(this),
-				showTotal: function(total) {
-					return '共' + total + '条数据';
-				}
-			},
-			columns: [
-				{
-                    title: '订单编号',
-                    dataIndex: 'orderNo',
-                    key: 'orderNo'
-                }, {
-                    title: '签单时间',
-                    dataIndex: 'signDate',
-                    key: 'signDate'
-                },{
-                    title: '客户名称',
-                    dataIndex: 'userName',
-                    key: 'userName',
-                    render:(text)=>{
-                    	return (text&&text.length>9?text.substr(0,9)+'...':text)
-                    }
-                },{
-                    title: '订单状态',
-                    dataIndex: 'orderStatus',
-                    key: 'orderStatus',
-                    render:text=>{return getNewOrderStatus(text)}
-                }, {
-                    title: '签单金额(万元)',
-                    dataIndex: 'totalAmount',
-                    key: 'totalAmount'
-                },{
-                    title: '项目状态',
-                    dataIndex: 'projectStatus',
-                    key: 'projectStatus',
-                    render:text=>{return getProjectStatus(text)}
-                },{
-                    title: '结算状态',
-                    dataIndex: 'liquidationStatus',
-                    key: 'liquidationStatus',
-                    render:text=>{return getLiquidationStatus(text)}
-                }, {
-                    title: '应收款(万)',
-                    dataIndex: 'accountsReceivable',
-                    key: 'accountsReceivable'
-                }, {
-                    title: '已收款(万)',
-                    dataIndex: 'settlementAmount',
-                    key: 'settlementAmount'
-                }, {
-                    title: '未收款(万)',
-                    dataIndex: 'uncollectedAmount',
-                    key: 'uncollectedAmount'
-                },{
-                    title: '订单负责人',
-                    dataIndex: 'salesmanName',
-                    key: 'salesmanName'
-                },{
-                    title: '订单部门',
-                    dataIndex: 'depName',
-                    key: 'depName'
-                },{
-                    title: '催收科目',
-                    dataIndex: 'dunSubject',
-                    key: 'dunSubject',
-                    render: text=>{return getjiedian(text)}
-                },{
-                    title: '催款启动日期',
-                    dataIndex: 'startDate',
-                    key: 'startDate'
-                }, {
-					title: '催收操作',
-					dataIndex: 'abc',
-					key: 'abc',
-					render: (text, record) => {
-						return <div>
-                            <Button onClick={(e) =>{ e.stopPropagation(), this.visit(record)}} type="primary">添加催款记录</Button>                            							    
-                        </div>
-					}
-				}
-			],
-			data: [],
-			dataSource: [],
-			columnsX: [
-				{
-                    title: '催款人',
-                    dataIndex: 'dumBy',
-                    key: 'dumBy'
-                }, {
-                    title: '催款时间',
-                    dataIndex: 'dumTime',
-                    key: 'dumTime',
-                    
-                },{
-                    title: '催款情况',
-                    dataIndex: 'remarks',
-                    key: 'remarks'
-                }
-			],
-			dataSources: [],
-			
-		}
+      page: 1,
+      releaseDate: [],
+      selectedRowKeys: [],
+      orgCodeUrl: [],
+      departmentArr: [],
+      paginations: false,
+      pagination: {
+        defaultCurrent: 1,
+        defaultPageSize: 10,
+        showQuickJumper: true,
+        pageSize: 10,
+        onChange: function(page) {
+          this.loadData(page);
+        }.bind(this),
+        showTotal: function(total) {
+          return "共" + total + "条数据";
+        }
+      },
+      columns: [
+        {
+          title: "序号",
+          dataIndex: "key",
+          key: "key"
+        },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo"
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo"
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName",
+          render: text => {
+            return text && text.length > 9 ? text.substr(0, 9) + "..." : text;
+          }
+        },
+        {
+          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 getProjectStatus(text);
+          }
+        },
+        {
+          title: "签单金额(万元)",
+          dataIndex: "totalAmount",
+          key: "totalAmount"
+        },
+        {
+          title: "结算状态",
+          dataIndex: "liquidationStatus",
+          key: "liquidationStatus",
+          render: text => {
+            return getLiquidationStatus(text);
+          }
+        },
+        {
+          title: "应收款(万)",
+          dataIndex: "accountsReceivable",
+          key: "accountsReceivable"
+        },
+        {
+          title: "已收款(万)",
+          dataIndex: "settlementAmount",
+          key: "settlementAmount"
+        },
+        {
+          title: "未收款(万)",
+          dataIndex: "uncollectedAmount",
+          key: "uncollectedAmount"
+        },
+        {
+          title: "催收科目",
+          dataIndex: "dunSubject",
+          key: "dunSubject",
+          render: text => {
+            return getjiedian(text);
+          }
+        },
+        {
+          title: "催款启动日期",
+          dataIndex: "startDate",
+          key: "startDate"
+        },
+        {
+          title: "签单时间",
+          dataIndex: "signDate",
+          key: "signDate"
+        },
+        {
+          title: "催收操作",
+          dataIndex: "abc",
+          key: "abc",
+          render: (text, record) => {
+            return (
+              <div>
+                <Button
+                  onClick={e => {
+                    e.stopPropagation(), this.visit(record);
+                  }}
+                  type="primary"
+                >
+                  添加催款记录
+                </Button>
+              </div>
+            );
+          }
+        }
+      ],
+      data: [],
+      dataSource: [],
+      columnsX: [
+        {
+          title: "催款人",
+          dataIndex: "dumBy",
+          key: "dumBy"
+        },
+        {
+          title: "催款时间",
+          dataIndex: "dumTime",
+          key: "dumTime"
+        },
+        {
+          title: "催款情况",
+          dataIndex: "remarks",
+          key: "remarks"
+        }
+      ],
+      dataSources: []
+    };
 	},
 	
 	//页面加载函数
@@ -357,7 +400,8 @@ const IntentionCustomer = Form.create()(React.createClass({
             adminName:this.state.adminName?this.state.adminName:undefined,//订单负责人
             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,
+			endTime: this.state.releaseDate[1]?this.state.releaseDate[1]:undefined,
+			pageSize: 9999
         }
         window.location.href=(globalConfig.context+'/api/admin/newOrder/exportOrderDunData?'+$.param(data));
     },
@@ -467,10 +511,10 @@ const IntentionCustomer = Form.create()(React.createClass({
                    	<div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
 	                        <Table columns={this.state.columns}
-	                            dataSource={this.state.dataSource}    
-	                            rowSelection={rowSelection}
+	                            dataSource={this.state.dataSource}
 	                            pagination={this.state.pagination} 
-	                            onRowClick={this.tableRowClick}
+								onRowClick={this.tableRowClick}
+								bordered
 	                           />
 	                    </Spin>
                		 </div> 

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

@@ -159,8 +159,8 @@ const Task = React.createClass({
         },
         {
           title: "工作时间",
-          dataIndex: "createTimes",
-          key: "createTimes"
+          dataIndex: "taskDays",
+          key: "taskDays"
         },
         // {
         //   title: "项目负责人",
@@ -2190,7 +2190,7 @@ const Task = React.createClass({
                   className="cancel"
                   type="primary"
                   onClick={this.tianjiaOk}
-                  style={{ marginLeft: "100px", marginTop: "10px" }}
+                  style={{ marginLeft: "100px" }}
                   htmlType="submit"
                 >
                   确定

+ 7 - 0
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -23,6 +23,7 @@ const MyTaskCount = Form.create()(React.createClass({
 				pageSize: this.state.pagination.pageSize,
 				name: this.state.customerName,//名称
 				taskId: this.state.idSearch,//订单编号
+				orderNo: this.state.orderNoSearch,
 				starTime: this.state.releaseDate[0],//开始时间
 				endTime: this.state.releaseDate[1],//结束时间
 				type: 1,
@@ -531,6 +532,7 @@ const MyTaskCount = Form.create()(React.createClass({
     	this.state.customerName='';
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
+		this.state.orderNoSearch = ''
         this.loadData(this.state.page);       
     },
     resets(){
@@ -662,6 +664,11 @@ const MyTaskCount = Form.create()(React.createClass({
                     <Input placeholder="任务编号" style={{width:'150px'}}
                         value={this.state.idSearch}
                         onChange={(e) => { this.setState({ idSearch: e.target.value }); }} />
+						<Input placeholder="订单编号" style={{width:'150px'}}
+                        value={this.state.orderNoSearch}
+                        onChange={(e) => { this.setState({
+                                             orderNoSearch: e.target.value
+                                           }); }} />
                     <span style={{marginRight:"10px"}}>合同签订时间 :</span>
                     <RangePicker
                         value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,

+ 2 - 2
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -167,8 +167,8 @@ const MyTaskOutsource = React.createClass({
         },
         {
           title: "工作时间",
-          dataIndex: "createTimes",
-          key: "createTimes"
+          dataIndex: "taskDays",
+          key: "taskDays"
         },
         // {
         //   title: "项目负责人",

+ 114 - 88
js/component/tools.js

@@ -2,91 +2,108 @@ import { message,Select  } from 'antd';
 import React from 'react';
 import $ from 'jquery/src/ajax';
 import {
-    patentTypeList,
-    patentStateList,
-    patentFieldList,
-    technicalSourceList,
-    catagoryList,
-    intellectualGetList,
-    conversionFormList,
-    annualReportStateList,
-    cognizanceStateList,
-    technologyStateList,
-    copyrightStateList,
-    auditStatusList,
-    scaleList,
-    companyType,
-    industryList,
-    contractTypeList,
-    contractStateList,
-    demandTypeList,
-    achievementCategoryList,
-    techAuditStatusList,
-    auditStatusLists,
-    maturityList,
-    transferModeList,
-    innovationList,
-    orderStatusList,
-    activityForm,
-    activityType,
-    boutique,
-    hot,
-    statuslist,
-    customerTyp,
-    cityArr,
-    customerStatus,
-    intentionalService,
-    newFollow,
-    sex,
-    tag,
-    contactType,
-    contact,
-    Whether,
-    Certification,
-    currentMember,
-    lvl,
-    industry,
-    socialAttribute,
-    station,
-    post,
-    patternOrganization,
-    conditionOrganization,
-    categoryState,
-    auditStatusL,
-    gameState,
-    messageType,
-    designated,
-    featured,
-    actives,
-    intentProgress,
-    transactionProgress,
-    contractProgress,
-    projectProgress,
-    orderType, orderStage, orderState,paymentState, orderChannel, approvedState, lock,paymentMethod,transactionChannel,projectState,transactionProject,
-    client,
-    stick,
-    taskStatus,
-    publishStatus,
-    changeState,
-    distributeState,
-    customerSource,
-    slcRedit,
-    dataGrade,
-    level,
-    xiangmoState,
-    newOrderStatus,refundStatus,approval,projectStatus,processStatus,liquidationStatus,newOrderType
-    ,jsyPaymentType,
-    customerType,
-    orderTypes,
-    bonusState,
-    jiedian,
-    cuikuan,
-	province,
-	invoiceStatus,
-    approvalA,
-    processStatusNew,
-    contractChangeStatus,
-} from './dataDic.js';
+  patentTypeList,
+  patentStateList,
+  patentFieldList,
+  technicalSourceList,
+  catagoryList,
+  intellectualGetList,
+  conversionFormList,
+  annualReportStateList,
+  cognizanceStateList,
+  technologyStateList,
+  copyrightStateList,
+  auditStatusList,
+  scaleList,
+  companyType,
+  industryList,
+  contractTypeList,
+  contractStateList,
+  demandTypeList,
+  achievementCategoryList,
+  techAuditStatusList,
+  auditStatusLists,
+  maturityList,
+  transferModeList,
+  innovationList,
+  orderStatusList,
+  activityForm,
+  activityType,
+  boutique,
+  hot,
+  statuslist,
+  customerTyp,
+  cityArr,
+  customerStatus,
+  intentionalService,
+  newFollow,
+  sex,
+  tag,
+  contactType,
+  contact,
+  Whether,
+  Certification,
+  currentMember,
+  lvl,
+  industry,
+  socialAttribute,
+  station,
+  post,
+  patternOrganization,
+  conditionOrganization,
+  categoryState,
+  auditStatusL,
+  gameState,
+  messageType,
+  designated,
+  featured,
+  actives,
+  intentProgress,
+  transactionProgress,
+  contractProgress,
+  projectProgress,
+  orderType,
+  orderStage,
+  orderState,
+  paymentState,
+  orderChannel,
+  approvedState,
+  lock,
+  paymentMethod,
+  transactionChannel,
+  projectState,
+  transactionProject,
+  client,
+  stick,
+  taskStatus,
+  publishStatus,
+  changeState,
+  distributeState,
+  customerSource,
+  slcRedit,
+  dataGrade,
+  level,
+  xiangmoState,
+  newOrderStatus,
+  refundStatus,
+  approval,
+  projectStatus,
+  processStatus,
+  liquidationStatus,
+  newOrderType,
+  jsyPaymentType,
+  customerType,
+  orderTypes,
+  bonusState,
+  jiedian,
+  cuikuan,
+  province,
+  invoiceStatus,
+  approvalA,
+  processStatusNew,
+  contractChangeStatus,
+  typeList
+} from "./dataDic.js";
 
 import { provinceList} from './NewDicProvinceList.js';
 import ShowModal from './showModal.jsx';
@@ -1931,7 +1948,16 @@ module.exports = {
     })
     // return flag
   },
-  // getType() {
-
-  // }
+  getType(e) {
+     if (e || e == 0) {
+       let str = e.toString();
+       let theType = "";
+       typeList.map(function(item) {
+         if (item.value == str) {
+           theType = item.key;
+         }
+       });
+       return theType;
+     }
+  }
 };

+ 2 - 2
webpack.config.js

@@ -304,7 +304,7 @@ module.exports = (function () {
     }
 
     //let staticHost = 'http://afts.hnzhiming.com';
-    let staticHost = 'http://192.168.1.222';
+    let staticHost = "http://192.168.3.254";
     switch (argv.env.deploy) {
         case 'test':
             staticHost = "http://static.jishutao.com";
@@ -343,7 +343,7 @@ module.exports = (function () {
         // }
         devServer: {
             disableHostCheck: true,
-            host: '192.168.1.222',
+            host: '192.168.3.254',
             port: 80,
             allowedHosts: ['127.0.0.1','192.168.0.20','192.168.0.99'],
             headers: {