Browse Source

开单签单BUG修复

mentoswzq 5 years ago
parent
commit
b3b0f81575
32 changed files with 2717 additions and 1743 deletions
  1. 150 103
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  2. 166 20
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  3. 64 18
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  4. 64 18
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  5. 2 2
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  6. 28 20
      js/component/manageCenter/order/orderNew/addService.jsx
  7. 1 1
      js/component/manageCenter/order/orderNew/addorders.js
  8. 2 2
      js/component/manageCenter/order/orderNew/approveds.jsx
  9. 149 71
      js/component/manageCenter/order/orderNew/billing.jsx
  10. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  11. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js
  12. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js
  13. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js
  14. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js
  15. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  16. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  17. 2 2
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  18. 2 2
      js/component/manageCenter/order/orderNew/chargeback.jsx
  19. 184 154
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  20. 1 1
      js/component/manageCenter/order/orderNew/contractCwzj.js
  21. 1 1
      js/component/manageCenter/order/orderNew/contractCwzy.js
  22. 1 1
      js/component/manageCenter/order/orderNew/contractJsjl.js
  23. 1 1
      js/component/manageCenter/order/orderNew/contractJsy.js
  24. 1 1
      js/component/manageCenter/order/orderNew/contractJszj.js
  25. 1 1
      js/component/manageCenter/order/orderNew/contractYxgly.js
  26. 1 1
      js/component/manageCenter/order/orderNew/contractYxy.js
  27. 2 2
      js/component/manageCenter/order/orderNew/examine.jsx
  28. 2 2
      js/component/manageCenter/order/orderNew/inquiry.jsx
  29. 2 2
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  30. 28 28
      js/component/manageCenter/order/orderNew/pressList.jsx
  31. 2 2
      js/component/manageCenter/order/orderNew/reject.jsx
  32. 1853 1280
      js/component/manageCenter/project/task/myTaskCount.jsx

+ 150 - 103
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -567,106 +567,101 @@ const approvedOutsourcing = React.createClass({
         }
       ],
       ContactsListsNew: [
-          {
-            title: "项目名称",
-            dataIndex: "commodityName",
-            key: "commodityName",
-            render: text => {
-              return <span>{text}</span>;
-            }
-          },
-          {
-            title: "项目分类",
-            dataIndex: "projectType",
-            key: "projectType",
-            render: text => {
-              let arr = this.state.dataSource || [];
-              let str = "";
-              for (let i = 0; i < arr.length; i++) {
-                if (this.state.dataSource[i].sort == text) {
-                  str = this.state.dataSource[i].cname;
-                  return <span>{str}</span>;
-                }
+        {
+          title: "项目名称",
+          dataIndex: "commodityName",
+          key: "commodityName",
+          render: text => {
+            return <span>{text}</span>;
+          }
+        },
+        {
+          title: "项目分类",
+          dataIndex: "projectType",
+          key: "projectType",
+          render: text => {
+            let arr = this.state.dataSourceX || [];
+            let str = "";
+            for (let i = 0; i < arr.length; i++) {
+              if (this.state.dataSourceX[i].sort == text) {
+                str = this.state.dataSourceX[i].cname;
+                return <span>{str}</span>;
               }
             }
-          },
-          {
-            title: "催款科目",
-            dataIndex: "dunTypeName",
-            key: "dunTypeName",
-            render: text => {
+          }
+        },
+        {
+          title: "催款科目",
+          dataIndex: "dunTypeName",
+          key: "dunTypeName",
+          render: text => {
+            return <span>{text}</span>;
+          }
+        },
+        {
+          title: "时间",
+          dataIndex: "waitDay",
+          key: "waitDay",
+          render: (text, record) => {
+            if (record.dunTypeName) {
               return <span>{text}</span>;
             }
-          },
-          {
-            title: "时间",
-            dataIndex: "waitDay",
-            key: "waitDay",
-            render: (text, record) => {
-              if (record.dunTypeName) {
-                return <span>{text}</span>;
-              }
-            }
-          },
-          {
-            title: "金额(万)",
-            dataIndex: "money",
-            key: "money",
-            render: (text, record) => {
-              if (record.dunTypeName) {
-                return <span>{text}</span>;
-              }
-            }
-          },
-          {
-            title: "服务年限",
-            dataIndex: "startDate",
-            key: "startDate",
-            render: (text, record) => {
-              if (record.dunTypeName) {
-                return <span>{text}</span>;
-              }
-            }
-          },
-          {
-            title: "催款状态",
-            dataIndex: "status",
-            key: "status",
-            render: text => {
-              return <span>{text == 1 ? "已启动" : "未启动"}</span>;
-            }
           }
-        ],
-        ContactsLists: [
-          {
-            title: "催款科目",
-            dataIndex: "dunSubject",
-            key: "dunSubject",
-            render: text => {
-              return getjiedian(text);
+        },
+        {
+          title: "金额(万元)",
+          dataIndex: "money",
+          key: "money",
+          render: (text, record) => {
+            if (record.dunTypeName) {
+              return <span>{text}</span>;
             }
-          },
-          {
-            title: "金额(万)",
-            dataIndex: "money",
-            key: "money"
-          },
-          {
-            title: "催款状态",
-            dataIndex: "dunStatus",
-            key: "dunStatus",
-            render: text => {
-              return getCuikuan(text);
+          }
+        },
+        {
+          title: "服务年限",
+          dataIndex: "startDate",
+          key: "startDate",
+          render: (text, record) => {
+            if (record.dunTypeName) {
+              return <span>{text}</span>;
             }
           }
-        ],
-      timeColumns: [
+        },
         {
-          title: "序号",
-          dataIndex: "key",
-          key: "key"
+          title: "催款状态",
+          dataIndex: "status",
+          key: "status",
+          render: text => {
+            return <span>{text == 1 ? "已启动" : "未启动"}</span>;
+          }
+        }
+      ],
+      ContactsLists: [
+        {
+          title: "催款科目",
+          dataIndex: "dunSubject",
+          key: "dunSubject",
+          render: text => {
+            return getjiedian(text);
+          }
+        },
+        {
+          title: "金额(万元)",
+          dataIndex: "money",
+          key: "money"
         },
         {
+          title: "催款状态",
+          dataIndex: "dunStatus",
+          key: "dunStatus",
+          render: text => {
+            return getCuikuan(text);
+          }
+        }
+      ],
+      timeColumns: [
+        {
           title: "合同编号",
           dataIndex: "contractNo",
           key: "contractNo"
@@ -676,15 +671,25 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "orderNo",
           key: "orderNo"
         },
+
         {
           title: "客户名称",
           dataIndex: "userName",
-          key: "userName"
+          key: "userName",
+          render: text => {
+            return text && text.length > 9 ? text.substr(0, 9) + "..." : text;
+          }
         },
+
         {
-          title: "项目负责人",
-          dataIndex: "receiverName",
-          key: "receiverName"
+          title: "订单部门",
+          dataIndex: "depName",
+          key: "depName"
+        },
+        {
+          title: "订单负责人",
+          dataIndex: "salesmanName",
+          key: "salesmanName"
         },
         {
           title: "项目类别",
@@ -702,7 +707,22 @@ const approvedOutsourcing = React.createClass({
           key: "taskName"
         },
         {
-          title: "项目状态",
+          title: "项目负责人",
+          dataIndex: "receiverName",
+          key: "receiverName"
+        },
+        {
+          title: "项目价格(万元)",
+          dataIndex: "commodityPrice",
+          key: "commodityPrice"
+        },
+        {
+          title: "数量(个)",
+          dataIndex: "commodityQuantity",
+          key: "commodityQuantity"
+        },
+        {
+          title: "任务状态",
           dataIndex: "taskStatus",
           key: "taskStatus",
           render: text => {
@@ -710,11 +730,29 @@ const approvedOutsourcing = React.createClass({
           }
         },
         {
+          title: "项目状态",
+          dataIndex: "projectStatus",
+          key: "projectStatus",
+          render: text => {
+            return getProjectStatus(text);
+          }
+        },
+        {
           title: "工时",
           dataIndex: "hours",
           key: "hours"
         },
         {
+          title: "签单日期",
+          dataIndex: "signTime",
+          key: "signTime"
+        },
+        {
+          title: "派单日期",
+          dataIndex: "creteTime",
+          key: "creteTime"
+        },
+        {
           title: "分配时间",
           dataIndex: "taskDistributionTime",
           key: "taskDistributionTime"
@@ -1419,7 +1457,8 @@ const approvedOutsourcing = React.createClass({
               contactsMobile: thisdata.contactsMobile,
               cname: thisdata.cname,
               certificateNumber: thisdata.certificateNumber,
-              projectStatus: thisdata.projectStatus
+              projectStatus: thisdata.projectStatus,
+              sort: thisdata.cSort
             });
           }
         }
@@ -1880,15 +1919,22 @@ const approvedOutsourcing = React.createClass({
             let thisdata = data.data.list[i];
             theArr.push({
               key: i + 1,
-              orderNo: thisdata.orderNo,
+              id: thisdata.id, //ID
+              orderNo: thisdata.orderNo, //订单编号
+              taskName: thisdata.taskName, //任务名称
+              userName: thisdata.userName, //客户名称
+              cname: thisdata.cname, //项目品类
+              taskStatus: thisdata.taskStatus, //任务状态
+              receiverName: thisdata.receiverName, //负责人
+              hours: thisdata.hours, //任务工时
+              depName: thisdata.depName, //派单公司
               contractNo: thisdata.contractNo,
-              userName: thisdata.userName,
-              receiverName: thisdata.receiverName,
-              taskStatus: thisdata.taskStatus,
-              cname: thisdata.cname,
-              id: thisdata.id,
-              taskName: thisdata.taskName,
-              hours: thisdata.hours,
+              signTime: thisdata.signTime,
+              creteTime: thisdata.creteTime,
+              projectStatus: thisdata.projectStatus,
+              commodityPrice: thisdata.commodityPrice, //价格
+              commodityQuantity: thisdata.commodityQuantity, //数量
+              salesmanName: thisdata.salesmanName, //订单负责人
               taskDistributionTime: thisdata.taskDistributionTime,
               taskEndTime: thisdata.taskEndTime
             });
@@ -3372,6 +3418,7 @@ const approvedOutsourcing = React.createClass({
               <Table
                 columns={this.state.timeColumns}
                 dataSource={this.state.timeDataList}
+                scroll={{ x: "max-content", y: 0 }}
                 pagination={false}
                 bordered
                 size="small"

+ 166 - 20
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -13,7 +13,8 @@ import {
   DatePicker,
   Modal,
   Upload,
-  Tabs
+  Tabs,
+  Col
 } from "antd";
 import Receivable from "./receivable";
 import Assign from "@/manageCenter/publicComponent/assign";
@@ -32,6 +33,8 @@ import {
   getTransactionProject,
   getTaskStatus,
   getNewOrderStatus,
+  getInvoiceStatus,
+  getCuikuan
 } from "@/tools";
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 const FormItem = Form.Item;
@@ -391,6 +394,100 @@ const approvedOutsourcing = React.createClass({
         //   }
         // }
       ],
+      ContactsListsNew: [
+        {
+          title: "项目名称",
+          dataIndex: "commodityName",
+          key: "commodityName",
+          render: text => {
+            return <span>{text}</span>;
+          }
+        },
+        {
+          title: "项目分类",
+          dataIndex: "projectType",
+          key: "projectType",
+          render: text => {
+            let arr = this.state.dataSourceX || [];
+            let str = "";
+            for (let i = 0; i < arr.length; i++) {
+              if (this.state.dataSourceX[i].sort == text) {
+                str = this.state.dataSourceX[i].cname;
+                return <span>{str}</span>;
+              }
+            }
+          }
+        },
+        {
+          title: "催款科目",
+          dataIndex: "dunTypeName",
+          key: "dunTypeName",
+          render: text => {
+            return <span>{text}</span>;
+          }
+        },
+        {
+          title: "时间",
+          dataIndex: "waitDay",
+          key: "waitDay",
+          render: (text, record) => {
+            if (record.dunTypeName) {
+              return <span>{text}</span>;
+            }
+          }
+        },
+        {
+          title: "金额(万元)",
+          dataIndex: "money",
+          key: "money",
+          render: (text, record) => {
+            if (record.dunTypeName) {
+              return <span>{text}</span>;
+            }
+          }
+        },
+        {
+          title: "服务年限",
+          dataIndex: "startDate",
+          key: "startDate",
+          render: (text, record) => {
+            if (record.dunTypeName) {
+              return <span>{text}</span>;
+            }
+          }
+        },
+        {
+          title: "催款状态",
+          dataIndex: "status",
+          key: "status",
+          render: text => {
+            return <span>{text == 1 ? "已启动" : "未启动"}</span>;
+          }
+        }
+      ],
+      ContactsLists: [
+        {
+          title: "催款科目",
+          dataIndex: "dunSubject",
+          key: "dunSubject",
+          render: text => {
+            return getjiedian(text);
+          }
+        },
+        {
+          title: "金额(万元)",
+          dataIndex: "money",
+          key: "money"
+        },
+        {
+          title: "催款状态",
+          dataIndex: "dunStatus",
+          key: "dunStatus",
+          render: text => {
+            return getCuikuan(text);
+          }
+        }
+      ],
       proColumns: [
         {
           title: "序号",
@@ -565,11 +662,6 @@ const approvedOutsourcing = React.createClass({
       ],
       timeColumns: [
         {
-          title: "序号",
-          dataIndex: "key",
-          key: "key"
-        },
-        {
           title: "合同编号",
           dataIndex: "contractNo",
           key: "contractNo"
@@ -579,15 +671,25 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "orderNo",
           key: "orderNo"
         },
+
         {
           title: "客户名称",
           dataIndex: "userName",
-          key: "userName"
+          key: "userName",
+          render: text => {
+            return text && text.length > 9 ? text.substr(0, 9) + "..." : text;
+          }
         },
+
         {
-          title: "项目负责人",
-          dataIndex: "receiverName",
-          key: "receiverName"
+          title: "订单部门",
+          dataIndex: "depName",
+          key: "depName"
+        },
+        {
+          title: "订单负责人",
+          dataIndex: "salesmanName",
+          key: "salesmanName"
         },
         {
           title: "项目类别",
@@ -605,7 +707,22 @@ const approvedOutsourcing = React.createClass({
           key: "taskName"
         },
         {
-          title: "项目状态",
+          title: "项目负责人",
+          dataIndex: "receiverName",
+          key: "receiverName"
+        },
+        {
+          title: "项目价格(万元)",
+          dataIndex: "commodityPrice",
+          key: "commodityPrice"
+        },
+        {
+          title: "数量(个)",
+          dataIndex: "commodityQuantity",
+          key: "commodityQuantity"
+        },
+        {
+          title: "任务状态",
           dataIndex: "taskStatus",
           key: "taskStatus",
           render: text => {
@@ -613,11 +730,29 @@ const approvedOutsourcing = React.createClass({
           }
         },
         {
+          title: "项目状态",
+          dataIndex: "projectStatus",
+          key: "projectStatus",
+          render: text => {
+            return getProjectStatus(text);
+          }
+        },
+        {
           title: "工时",
           dataIndex: "hours",
           key: "hours"
         },
         {
+          title: "签单日期",
+          dataIndex: "signTime",
+          key: "signTime"
+        },
+        {
+          title: "派单日期",
+          dataIndex: "creteTime",
+          key: "creteTime"
+        },
+        {
           title: "分配时间",
           dataIndex: "taskDistributionTime",
           key: "taskDistributionTime"
@@ -1144,6 +1279,8 @@ const approvedOutsourcing = React.createClass({
     this.jdDate(record.orderNo);
     this.loadXmu(record);
     this.loadModal(record);
+     this.jiedian(record.orderNo);
+     this.jiedianNew(record.orderNo);
   },
   //详情
   callBack(key) {
@@ -1320,7 +1457,8 @@ const approvedOutsourcing = React.createClass({
               contactsMobile: thisdata.contactsMobile,
               cname: thisdata.cname,
               certificateNumber: thisdata.certificateNumber,
-              projectStatus: thisdata.projectStatus
+              projectStatus: thisdata.projectStatus,
+              sort: thisdata.cSort
             });
           }
         }
@@ -1781,15 +1919,22 @@ const approvedOutsourcing = React.createClass({
             let thisdata = data.data.list[i];
             theArr.push({
               key: i + 1,
-              orderNo: thisdata.orderNo,
+              id: thisdata.id, //ID
+              orderNo: thisdata.orderNo, //订单编号
+              taskName: thisdata.taskName, //任务名称
+              userName: thisdata.userName, //客户名称
+              cname: thisdata.cname, //项目品类
+              taskStatus: thisdata.taskStatus, //任务状态
+              receiverName: thisdata.receiverName, //负责人
+              hours: thisdata.hours, //任务工时
+              depName: thisdata.depName, //派单公司
               contractNo: thisdata.contractNo,
-              userName: thisdata.userName,
-              receiverName: thisdata.receiverName,
-              taskStatus: thisdata.taskStatus,
-              cname: thisdata.cname,
-              id: thisdata.id,
-              taskName: thisdata.taskName,
-              hours: thisdata.hours,
+              signTime: thisdata.signTime,
+              creteTime: thisdata.creteTime,
+              projectStatus: thisdata.projectStatus,
+              commodityPrice: thisdata.commodityPrice, //价格
+              commodityQuantity: thisdata.commodityQuantity, //数量
+              salesmanName: thisdata.salesmanName, //订单负责人
               taskDistributionTime: thisdata.taskDistributionTime,
               taskEndTime: thisdata.taskEndTime
             });
@@ -3223,6 +3368,7 @@ const approvedOutsourcing = React.createClass({
               <Table
                 columns={this.state.timeColumns}
                 dataSource={this.state.timeDataList}
+                scroll={{ x: "max-content", y: 0 }}
                 pagination={false}
                 bordered
                 size="small"

+ 64 - 18
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -371,11 +371,6 @@ const ShouKuang = React.createClass({
       ],
       timeColumns: [
         {
-          title: "序号",
-          dataIndex: "key",
-          key: "key"
-        },
-        {
           title: "合同编号",
           dataIndex: "contractNo",
           key: "contractNo"
@@ -385,15 +380,25 @@ const ShouKuang = React.createClass({
           dataIndex: "orderNo",
           key: "orderNo"
         },
+
         {
           title: "客户名称",
           dataIndex: "userName",
-          key: "userName"
+          key: "userName",
+          render: text => {
+            return text && text.length > 9 ? text.substr(0, 9) + "..." : text;
+          }
         },
+
         {
-          title: "项目负责人",
-          dataIndex: "receiverName",
-          key: "receiverName"
+          title: "订单部门",
+          dataIndex: "depName",
+          key: "depName"
+        },
+        {
+          title: "订单负责人",
+          dataIndex: "salesmanName",
+          key: "salesmanName"
         },
         {
           title: "项目类别",
@@ -411,7 +416,22 @@ const ShouKuang = React.createClass({
           key: "taskName"
         },
         {
-          title: "项目状态",
+          title: "项目负责人",
+          dataIndex: "receiverName",
+          key: "receiverName"
+        },
+        {
+          title: "项目价格(万元)",
+          dataIndex: "commodityPrice",
+          key: "commodityPrice"
+        },
+        {
+          title: "数量(个)",
+          dataIndex: "commodityQuantity",
+          key: "commodityQuantity"
+        },
+        {
+          title: "任务状态",
           dataIndex: "taskStatus",
           key: "taskStatus",
           render: text => {
@@ -419,11 +439,29 @@ const ShouKuang = React.createClass({
           }
         },
         {
+          title: "项目状态",
+          dataIndex: "projectStatus",
+          key: "projectStatus",
+          render: text => {
+            return getProjectStatus(text);
+          }
+        },
+        {
           title: "工时",
           dataIndex: "hours",
           key: "hours"
         },
         {
+          title: "签单日期",
+          dataIndex: "signTime",
+          key: "signTime"
+        },
+        {
+          title: "派单日期",
+          dataIndex: "creteTime",
+          key: "creteTime"
+        },
+        {
           title: "分配时间",
           dataIndex: "taskDistributionTime",
           key: "taskDistributionTime"
@@ -1152,15 +1190,22 @@ const ShouKuang = React.createClass({
             let thisdata = data.data.list[i];
             theArr.push({
               key: i + 1,
-              orderNo: thisdata.orderNo,
+              id: thisdata.id, //ID
+              orderNo: thisdata.orderNo, //订单编号
+              taskName: thisdata.taskName, //任务名称
+              userName: thisdata.userName, //客户名称
+              cname: thisdata.cname, //项目品类
+              taskStatus: thisdata.taskStatus, //任务状态
+              receiverName: thisdata.receiverName, //负责人
+              hours: thisdata.hours, //任务工时
+              depName: thisdata.depName, //派单公司
               contractNo: thisdata.contractNo,
-              userName: thisdata.userName,
-              receiverName: thisdata.receiverName,
-              taskStatus: thisdata.taskStatus,
-              cname: thisdata.cname,
-              id: thisdata.id,
-              taskName: thisdata.taskName,
-              hours: thisdata.hours,
+              signTime: thisdata.signTime,
+              creteTime: thisdata.creteTime,
+              projectStatus: thisdata.projectStatus,
+              commodityPrice: thisdata.commodityPrice, //价格
+              commodityQuantity: thisdata.commodityQuantity, //数量
+              salesmanName: thisdata.salesmanName, //订单负责人
               taskDistributionTime: thisdata.taskDistributionTime,
               taskEndTime: thisdata.taskEndTime
             });
@@ -1978,6 +2023,7 @@ const ShouKuang = React.createClass({
               <Table
                 columns={this.state.timeColumns}
                 dataSource={this.state.timeDataList}
+                scroll={{ x: "max-content", y: 0 }}
                 pagination={false}
                 bordered
                 size="small"

+ 64 - 18
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -385,11 +385,6 @@ const ShouKuang = React.createClass({
       ],
       timeColumns: [
         {
-          title: "序号",
-          dataIndex: "key",
-          key: "key"
-        },
-        {
           title: "合同编号",
           dataIndex: "contractNo",
           key: "contractNo"
@@ -399,15 +394,25 @@ const ShouKuang = React.createClass({
           dataIndex: "orderNo",
           key: "orderNo"
         },
+
         {
           title: "客户名称",
           dataIndex: "userName",
-          key: "userName"
+          key: "userName",
+          render: text => {
+            return text && text.length > 9 ? text.substr(0, 9) + "..." : text;
+          }
         },
+
         {
-          title: "项目负责人",
-          dataIndex: "receiverName",
-          key: "receiverName"
+          title: "订单部门",
+          dataIndex: "depName",
+          key: "depName"
+        },
+        {
+          title: "订单负责人",
+          dataIndex: "salesmanName",
+          key: "salesmanName"
         },
         {
           title: "项目类别",
@@ -425,7 +430,22 @@ const ShouKuang = React.createClass({
           key: "taskName"
         },
         {
-          title: "项目状态",
+          title: "项目负责人",
+          dataIndex: "receiverName",
+          key: "receiverName"
+        },
+        {
+          title: "项目价格(万元)",
+          dataIndex: "commodityPrice",
+          key: "commodityPrice"
+        },
+        {
+          title: "数量(个)",
+          dataIndex: "commodityQuantity",
+          key: "commodityQuantity"
+        },
+        {
+          title: "任务状态",
           dataIndex: "taskStatus",
           key: "taskStatus",
           render: text => {
@@ -433,11 +453,29 @@ const ShouKuang = React.createClass({
           }
         },
         {
+          title: "项目状态",
+          dataIndex: "projectStatus",
+          key: "projectStatus",
+          render: text => {
+            return getProjectStatus(text);
+          }
+        },
+        {
           title: "工时",
           dataIndex: "hours",
           key: "hours"
         },
         {
+          title: "签单日期",
+          dataIndex: "signTime",
+          key: "signTime"
+        },
+        {
+          title: "派单日期",
+          dataIndex: "creteTime",
+          key: "creteTime"
+        },
+        {
           title: "分配时间",
           dataIndex: "taskDistributionTime",
           key: "taskDistributionTime"
@@ -1167,15 +1205,22 @@ const ShouKuang = React.createClass({
             let thisdata = data.data.list[i];
             theArr.push({
               key: i + 1,
-              orderNo: thisdata.orderNo,
+              id: thisdata.id, //ID
+              orderNo: thisdata.orderNo, //订单编号
+              taskName: thisdata.taskName, //任务名称
+              userName: thisdata.userName, //客户名称
+              cname: thisdata.cname, //项目品类
+              taskStatus: thisdata.taskStatus, //任务状态
+              receiverName: thisdata.receiverName, //负责人
+              hours: thisdata.hours, //任务工时
+              depName: thisdata.depName, //派单公司
               contractNo: thisdata.contractNo,
-              userName: thisdata.userName,
-              receiverName: thisdata.receiverName,
-              taskStatus: thisdata.taskStatus,
-              cname: thisdata.cname,
-              id: thisdata.id,
-              taskName: thisdata.taskName,
-              hours: thisdata.hours,
+              signTime: thisdata.signTime,
+              creteTime: thisdata.creteTime,
+              projectStatus: thisdata.projectStatus,
+              commodityPrice: thisdata.commodityPrice, //价格
+              commodityQuantity: thisdata.commodityQuantity, //数量
+              salesmanName: thisdata.salesmanName, //订单负责人
               taskDistributionTime: thisdata.taskDistributionTime,
               taskEndTime: thisdata.taskEndTime
             });
@@ -2048,6 +2093,7 @@ const ShouKuang = React.createClass({
               <Table
                 columns={this.state.timeColumns}
                 dataSource={this.state.timeDataList}
+                scroll={{ x: "max-content", y: 0 }}
                 pagination={false}
                 bordered
                 size="small"

+ 2 - 2
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -211,7 +211,7 @@ const OrderDetail = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money",
             render: (text, record) => {
@@ -249,7 +249,7 @@ const OrderDetail = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

+ 28 - 20
js/component/manageCenter/order/orderNew/addService.jsx

@@ -234,10 +234,14 @@ const NewService = Form.create()(
               return (
                 <div>
                   {this.state.processStatus == 0 ? (
-                    <Button onClick={e => {
-                      e.stopPropagation()
-                      this.showConfirm(this.delectRow,record)
-                    }}>删除</Button>
+                    <Button
+                      onClick={e => {
+                        e.stopPropagation();
+                        this.showConfirm(this.delectRow, record);
+                      }}
+                    >
+                      删除
+                    </Button>
                   ) : (
                     ""
                   )}
@@ -293,7 +297,7 @@ const NewService = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money",
             render: (text, record) => {
@@ -389,7 +393,7 @@ const NewService = Form.create()(
                         record.isSave = true;
                         record.sort = item.sort;
                         console.log(record);
-                        
+
                         cuiJieDian.forEach(item => {
                           if (item.value == record.sort) {
                             record.arr = item.children;
@@ -475,23 +479,23 @@ const NewService = Form.create()(
                     placeholder="请选择分类"
                     onChange={e => {
                       record.dunType = e;
-                      if(e != 1) {
+                      if (e != 1) {
                         this.setState({
                           timeFlag: true
-                        })
-                      }else {
+                        });
+                      } else {
                         this.setState({
                           timeFlag: false
-                        })
+                        });
                       }
-                      if(e == 1 && record.sort == 6) {
+                      if (e == 1 && record.sort == 6) {
                         this.setState({
                           yearFlag: true
-                        })
-                      }else if(e != 1 && record.sort == 6) {
+                        });
+                      } else if (e != 1 && record.sort == 6) {
                         this.setState({
                           yearFlag: false
-                        })
+                        });
                       }
                       console.log(e);
                     }}
@@ -524,9 +528,9 @@ const NewService = Form.create()(
             key: "waitDay",
             render: (text, record) => {
               if (record.dunTypeName) {
-                if(!text) {
-                  var str = ""
-                }else {
+                if (!text) {
+                  var str = "";
+                } else {
                   var str = text + "天";
                 }
                 return <span>{str}</span>;
@@ -535,7 +539,11 @@ const NewService = Form.create()(
                 <Select
                   placeholder="请选择时间"
                   style={{ width: "150px" }}
-                  disabled={this.state.approval != 0 && !this.state.timeFlag ? false : true}
+                  disabled={
+                    this.state.approval != 0 && !this.state.timeFlag
+                      ? false
+                      : true
+                  }
                   onChange={e => {
                     console.log("ee", e);
                     record.waitDay = e;
@@ -551,7 +559,7 @@ const NewService = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money",
             render: (text, record) => {
@@ -664,7 +672,7 @@ const NewService = Form.create()(
                         this.contactSaveNew(record);
                         this.setState({
                           addFlag: false
-                        })
+                        });
                       }}
                     >
                       保存

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

@@ -296,7 +296,7 @@ const Addorders = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money",
             render: (text, record) => {

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

@@ -347,7 +347,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money",
             render: (text, record) => {
@@ -385,7 +385,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

+ 149 - 71
js/component/manageCenter/order/orderNew/billing.jsx

@@ -160,6 +160,31 @@ const MyService = Form.create()(
     },
     getInitialState() {
       return {
+        kaiData: {
+            remarks: "",
+            type: undefined,
+            orgCodeUrl: "",
+            invoiceType: undefined,
+            unitName: "",
+            taxNumber: "",
+            unitName: "",
+            amount: "",
+            banks: "",
+            content: "",
+            unitAddress: "",
+            invoiceRemarks: "",
+            unitMobile: "",
+            post: undefined,
+            addressee: "",
+            addresseeMobile: "",
+            addresseeProvince: "",
+            addresseeCity: "",
+            addresseeArea: "",
+            recipientAddress: "",
+            ordapproval: undefined,
+            alreadyAmount: "0",
+            ProvinceCity: []
+        },
         changeList: undefined,
         datauser: {},
         orgCodeUrl: [],
@@ -570,7 +595,7 @@ const MyService = Form.create()(
                   ) : (
                     getInvoiceStatus(text, record)
                   )}
-                  {record.status === 3 ? (
+                  {record.status  ? (
                     <Button
                       type="primary"
                       onClick={e => {
@@ -884,31 +909,31 @@ const MyService = Form.create()(
       );
     },
     areset() {
-      this.setState({
-        remarks: "",
-        type: undefined,
-        orgCodeUrl: "",
-        invoiceType: undefined,
-        unitName: "",
-        taxNumber: "",
-        unitName: "",
-        amount: "",
-        banks: "",
-        content: "",
-        unitAddress: "",
-        invoiceRemarks: "",
-        unitMobile: "",
-        post: undefined,
-        addressee: "",
-        addresseeMobile: "",
-        addresseeProvince: "",
-        addresseeCity: "",
-        addresseeArea: "",
-        recipientAddress: "",
-        ordapproval: undefined,
-        alreadyAmount: "",
-        ProvinceCity: []
-      });
+      // this.setState({
+      //   remarks: "",
+      //   type: undefined,
+      //   orgCodeUrl: "",
+      //   invoiceType: undefined,
+      //   unitName: "",
+      //   taxNumber: "",
+      //   unitName: "",
+      //   amount: "",
+      //   banks: "",
+      //   content: "",
+      //   unitAddress: "",
+      //   invoiceRemarks: "",
+      //   unitMobile: "",
+      //   post: undefined,
+      //   addressee: "",
+      //   addresseeMobile: "",
+      //   addresseeProvince: "",
+      //   addresseeCity: "",
+      //   addresseeArea: "",
+      //   recipientAddress: "",
+      //   ordapproval: undefined,
+      //   alreadyAmount: "",
+      //   ProvinceCity: []
+      // });
     },
 
     recompose(record) {
@@ -981,6 +1006,40 @@ const MyService = Form.create()(
         unitName: this.state.dataSource[index].userName,
         post: 1
       });
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + "/api/admin/orderInvoice/getInvoiceDetails",
+        data: {
+          orderNo: record.orderNo
+        },
+        success: data => {
+          if(data.error.length) {
+            message.warning(data.error[0].message)
+          }else if(data.data){
+            console.log("success",data);
+            let res = data.data
+            this.setState({
+              kaiData: res
+            })
+            // for (var key in res) {
+            //   // let str = "'" + key + "'"
+            //   // var obj = {
+            //   //   key: res[str]
+            //   // };
+            // //  console.log(key, res[str]);
+            //  this.setState({
+            //    key: 111
+            //  })
+            // }
+            // // Object.assign(this.state, obj);
+            // window.setTimeout(() => {
+            //   console.log(this.state);
+            // }, 100);
+          }
+        }
+      });
     },
     visitCancels() {
       this.setState({
@@ -1839,9 +1898,10 @@ const MyService = Form.create()(
                         {
                           <Input
                             placeholder="填写申请发票原因"
-                            value={this.state.remarks}
+                            value={this.state.kaiData.remarks}
                             onChange={e => {
-                              this.setState({ remarks: e.target.value });
+                              this.state.kaiData.remarks = e.target.value;
+                              this.setState({ kaiData: this.state.kaiData });
                             }}
                             style={{ width: "240px" }}
                           />
@@ -1855,9 +1915,10 @@ const MyService = Form.create()(
                         label="省内/外:"
                       >
                         <RadioGroup
-                          value={this.state.type}
+                          value={this.state.kaiData.type}
                           onChange={e => {
-                            this.setState({ type: e.target.value });
+                            this.state.kaiData.type = e;
+                            this.setState({ kaiData: this.state.kaiData });
                           }}
                         >
                           <Radio value={0}>省内</Radio>
@@ -1880,9 +1941,10 @@ const MyService = Form.create()(
                         label="特批:"
                       >
                         <RadioGroup
-                          value={this.state.ordapproval}
+                          value={this.state.kaiData.approval}
                           onChange={e => {
-                            this.setState({ ordapproval: e.target.value });
+                            this.state.kaiData.approval = e;
+                            this.setState({ kaiData: this.state.kaiData });
                           }}
                         >
                           <Radio value={0}>否</Radio>
@@ -1925,9 +1987,10 @@ const MyService = Form.create()(
                         <RadioGroup
                           style={{ width: "160%" }}
                           onChange={e => {
-                            this.setState({ invoiceType: e.target.value });
+                            this.state.kaiData.invoiceType = e;
+                            this.setState({ kaiData: this.state.kaiData });
                           }}
-                          value={this.state.invoiceType}
+                          value={this.state.kaiData.invoiceType}
                         >
                           <Radio value={0}>增值税专用发票</Radio>
                           <Radio value={1}>增值税普通发票</Radio>
@@ -1949,9 +2012,10 @@ const MyService = Form.create()(
                         {
                           <Input
                             placeholder="请输入单位名称"
-                            value={this.state.unitName}
+                            value={this.state.kaiData.unitName}
                             onChange={e => {
-                              this.setState({ unitName: e.target.value });
+                              this.state.kaiData.unitName = e.target.value;
+                              this.setState({ kaiData: this.state.kaiData });
                             }}
                             style={{ width: "240px" }}
                           />
@@ -1980,9 +2044,10 @@ const MyService = Form.create()(
                         {
                           <Input
                             placeholder="请输入税号"
-                            value={this.state.taxNumber}
+                            value={this.state.kaiData.taxNumber}
                             onChange={e => {
-                              this.setState({ taxNumber: e.target.value });
+                              this.state.kaiData.taxNumber = e.target.value;
+                              this.setState({ kaiData: this.state.kaiData });
                             }}
                             style={{ width: "240px" }}
                           />
@@ -2001,9 +2066,10 @@ const MyService = Form.create()(
                         {
                           <Input
                             placeholder="请输入开票金额"
-                            value={this.state.amount}
+                            value={this.state.kaiData.amount}
                             onChange={e => {
-                              this.setState({ amount: e.target.value });
+                              this.state.kaiData.amount = e.target.value;
+                              this.setState({ kaiData: this.state.kaiData });
                             }}
                             style={{ width: "240px" }}
                           />
@@ -2033,9 +2099,10 @@ const MyService = Form.create()(
                         {
                           <Input
                             placeholder="请输入开户行及银行账号"
-                            value={this.state.banks}
+                            value={this.state.kaiData.banks}
                             onChange={e => {
-                              this.setState({ banks: e.target.value });
+                              this.state.kaiData.banks = e.target.value;
+                              this.setState({ kaiData: this.state.kaiData });
                             }}
                             style={{ width: "240px" }}
                           />
@@ -2054,9 +2121,10 @@ const MyService = Form.create()(
                         {
                           <Input
                             placeholder="请输入开票内容及说明"
-                            value={this.state.content}
+                            value={this.state.kaiData.content}
                             onChange={e => {
-                              this.setState({ content: e.target.value });
+                              this.state.kaiData.content = e.target.value;
+                              this.setState({ kaiData: this.state.kaiData });
                             }}
                             style={{ width: "240px" }}
                           />
@@ -2075,9 +2143,10 @@ const MyService = Form.create()(
                         {
                           <Input
                             placeholder="请输入单位地址"
-                            value={this.state.unitAddress}
+                            value={this.state.kaiData.unitAddress}
                             onChange={e => {
-                              this.setState({ unitAddress: e.target.value });
+                              this.state.kaiData.unitAddress = e.target.value;
+                              this.setState({ kaiData: this.state.kaiData });
                             }}
                             style={{ width: "240px" }}
                           />
@@ -2091,11 +2160,11 @@ const MyService = Form.create()(
                         {
                           <Input
                             placeholder="请备注开票公司名称"
-                            value={this.state.invoiceRemarks}
+                            value={this.state.kaiData.invoiceRemarks}
                             onChange={e => {
-                              this.setState({
-                                invoiceRemarks: e.target.value
-                              });
+                              this.state.kaiData.invoiceRemarks =
+                                e.target.value;
+                              this.setState({ kaiData: this.state.kaiData });
                             }}
                             style={{ width: "240px" }}
                           />
@@ -2125,9 +2194,10 @@ const MyService = Form.create()(
                         {
                           <Input
                             placeholder="请输入单位电话"
-                            value={this.state.unitMobile}
+                            value={this.state.kaiData.unitMobile}
                             onChange={e => {
-                              this.setState({ unitMobile: e.target.value });
+                              this.state.kaiData.unitMobile = e.target.value;
+                              this.setState({ kaiData: this.state.kaiData });
                             }}
                             style={{ width: "240px" }}
                           />
@@ -2147,7 +2217,11 @@ const MyService = Form.create()(
                       >
                         <PicturesWall
                           fileList={this.getOrgCodeUrl}
-                          pictureUrl={this.state.orgCodeUrl}
+                          pictureUrl={
+                            this.state.kaiData.voucherUrl
+                              ? this.state.kaiData.voucherUrl
+                              : this.state.orgCodeUrl
+                          }
                         />
                         <span
                           style={{
@@ -2176,9 +2250,10 @@ const MyService = Form.create()(
                         label="发票是否邮寄:"
                       >
                         <RadioGroup
-                          value={this.state.post}
+                          value={this.state.kaiData.post}
                           onChange={e => {
-                            this.setState({ post: e.target.value });
+                            this.state.kaiData.post = e.target.value;
+                            this.setState({ kaiData: this.state.kaiData });
                           }}
                         >
                           <Radio value={0}>是</Radio>
@@ -2196,9 +2271,10 @@ const MyService = Form.create()(
                           {
                             <Input
                               placeholder="请输入收信人姓名"
-                              value={this.state.addressee}
+                              value={this.state.kaiData.addressee}
                               onChange={e => {
-                                this.setState({ addressee: e.target.value });
+                                this.state.kaiData.addressee = e.target.value;
+                                this.setState({ kaiData: this.state.kaiData });
                               }}
                               style={{ width: "240px" }}
                             />
@@ -2212,11 +2288,11 @@ const MyService = Form.create()(
                           {
                             <Input
                               placeholder="请输入电话"
-                              value={this.state.addresseeMobile}
+                              value={this.state.kaiData.addresseeMobile}
                               onChange={e => {
-                                this.setState({
-                                  addresseeMobile: e.target.value
-                                });
+                                this.state.kaiData.addresseeMobile =
+                                  e.target.value;
+                                this.setState({ kaiData: this.state.kaiData });
                               }}
                               style={{ width: "240px" }}
                             />
@@ -2226,7 +2302,7 @@ const MyService = Form.create()(
                     ) : (
                       ""
                     )}
-                    {this.state.post === 0 ? (
+                    {this.state.kaiData.post === 0 ? (
                       <div className="clearfix">
                         <FormItem
                           className="half-item"
@@ -2235,11 +2311,12 @@ const MyService = Form.create()(
                         >
                           <Cascader
                             options={areaSelect()}
-                            value={this.state.ProvinceCity}
+                            value={this.state.kaiData.ProvinceCity}
                             placeholder="选择城市"
                             style={{ width: "95%" }}
                             onChange={e => {
-                              this.setState({ ProvinceCity: e });
+                              this.state.kaiData.ProvinceCity = e.target.value;
+                              this.setState({ kaiData: this.state.kaiData });
                             }}
                           />
                         </FormItem>
@@ -2247,7 +2324,7 @@ const MyService = Form.create()(
                     ) : (
                       ""
                     )}
-                    {this.state.post === 0 ? (
+                    {this.state.kaiData.post === 0 ? (
                       <div className="clearfix">
                         <FormItem
                           className="half-item"
@@ -2257,11 +2334,11 @@ const MyService = Form.create()(
                           {
                             <Input
                               placeholder="请输入详细地址"
-                              value={this.state.recipientAddress}
+                              value={this.state.kaiData.recipientAddress}
                               onChange={e => {
-                                this.setState({
-                                  recipientAddress: e.target.value
-                                });
+                                this.state.kaiData.recipientAddress =
+                                  e.target.value;
+                                this.setState({ kaiData: this.state.kaiData });
                               }}
                               style={{ width: "240px" }}
                             />
@@ -2283,9 +2360,10 @@ const MyService = Form.create()(
                     >
                       {
                         <Input
-                          value={this.state.alreadyAmount}
+                          value={this.state.kaiData.alreadyAmount}
                           onChange={e => {
-                            this.setState({ alreadyAmount: e.target.value });
+                            this.state.kaiData.alreadyAmount = e.target.value;
+                            this.setState({ kaiData: this.state.kaiData });
                           }}
                           style={{ width: "40px" }}
                         />

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -96,7 +96,7 @@ class ChangeDetail extends Component {
       contactList: [],
       ContactsLists: [
         {
-          title: "金额(万)",
+          title: "金额(万)",
           dataIndex: "amount",
           key: "amount",
           render: (text, record) => {

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -190,7 +190,7 @@ class ChangeDetail extends Component {
       contactList: this.props.contactList,
       ContactsLists: [
         {
-          title: "金额(万)",
+          title: "金额(万)",
           dataIndex: "amount",
           key: "amount",
           render: (text, record) => {

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -107,7 +107,7 @@ class ChangeDetail extends Component {
       contactList: this.props.contactList,
       ContactsLists: [
         {
-          title: "金额(万)",
+          title: "金额(万)",
           dataIndex: "amount",
           key: "amount",
           render: (text, record) => {

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -110,7 +110,7 @@ class ChangeDetail extends Component {
       contactList: this.props.contactList,
       ContactsLists: [
         {
-          title: "金额(万)",
+          title: "金额(万)",
           dataIndex: "amount",
           key: "amount",
           render: (text, record) => {

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -107,7 +107,7 @@ class ChangeDetail extends Component {
       contactList: this.props.contactList,
       ContactsLists: [
         {
-          title: "金额(万)",
+          title: "金额(万)",
           dataIndex: "amount",
           key: "amount",
           render: (text, record) => {

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js

@@ -109,7 +109,7 @@ class ChangeDetail extends Component {
       contactList: this.props.contactList,
       ContactsLists: [
         {
-          title: "金额(万)",
+          title: "金额(万)",
           dataIndex: "amount",
           key: "amount",
           render: (text, record) => {

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -105,7 +105,7 @@ class ChangeDetail extends Component {
       contactList: this.props.contactList,
       ContactsLists: [
         {
-          title: "金额(万)",
+          title: "金额(万)",
           dataIndex: "amount",
           key: "amount",
           render: (text, record) => {

+ 2 - 2
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -60,7 +60,7 @@ class OrderDetail extends Component {
           }
         },
         {
-          title: "金额(万)",
+          title: "金额(万)",
           dataIndex: "money",
           key: "money",
           render: (text, record) => {
@@ -98,7 +98,7 @@ class OrderDetail extends Component {
           }
         },
         {
-          title: "金额(万)",
+          title: "金额(万)",
           dataIndex: "money",
           key: "money",
           render: text => {

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

@@ -294,7 +294,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money",
             render: (text, record) => {
@@ -332,7 +332,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

+ 184 - 154
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -73,160 +73,190 @@ const checkOutsourcing = Form.create()(React.createClass({
 	},
 	getInitialState() {
 		return {
-			page:1,
-			releaseDate: [],
-			selectedRowKeys: [],
-			pictureUrl:[],
-			attachmentUrl:[],
-			paginations:false,
-			activeKey: "1",
-			confirmLoading: false,
-			aloading: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: 'contractNo',
-                    key: 'contractNo'
-                },{
-                    title: '创建时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime'
-                },{
-                    title: '签单时间',
-                    dataIndex: 'signTime',
-                    key: 'signTime',
-                }, {
-                    title: '客户名称',
-                    dataIndex: 'userName',
-                    key: 'userName',
-                }, {
-                    title: '订单部门',
-                    dataIndex: 'depName',
-                    key: 'depName',
-                },{
-                    title: '签单金额(万元)',
-                    dataIndex: 'totalAmount',
-                    key: 'totalAmount'
-                },{
-                    title: '结算状态',
-                    dataIndex: 'liquidationStatus',
-                    key: 'liquidationStatus',
-                    render:text=>{return getLiquidationStatus(text)}
-                }, {
-                    title: '外包审核',
-                    dataIndex: 'refundStatus',
-                    key: 'refundStatus',
-                    render:text=>{return getRefundStatus(text)}
-                }, {
-                    title: '营销负责人',
-                    dataIndex: 'adminName',
-                    key: 'adminName',
-                }, {
-                    title: '财务负责人',
-                    dataIndex: 'financeName',
-                    key: 'financeName'
-                }
-			],
-			data: [],
-			dataSource: [],
-			columnsX: [
-				{
-                    title: '业务项目名称',
-                    dataIndex: 'commodityName',
-                    key: 'commodityName'
-                }, {
-                    title: '项目类别',
-                    dataIndex: 'cname',
-                    key: 'cname',
-                    
-                },{
-                    title: '项目数量',
-                    dataIndex: 'commodityQuantity',
-                    key: 'commodityQuantity'
-                }, {
-                    title: '金额(万元)',
-                    dataIndex: 'commodityPrice',
-                    key: 'commodityPrice'
-                }, {
-                    title: '负责人',
-                    dataIndex: 'contacts',
-                    key: 'contacts'
-                }, {
-                    title: '负责人电话',
-                    dataIndex: 'contactsMobile',
-                    key: 'contactsMobile'
-                }, {
-                	title:'项目状态',
-                	dataIndex:'projectStatus',
-                	key: 'projectStatus',
-                	render:text=>{return getProjectStatus(text)}
-                	
-                }, {
-                    title: '主要项目',
-                    dataIndex: 'main',
-                    key: 'main',
-                    render:(text)=>{
-                    	return (text?'是':'否')
-                    }
-                }, {
-                    title: '项目说明',
-                    dataIndex: 'taskComment',
-                    key: 'taskComment',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'…':text)
-					}
-                }
-			],
-			columnsrizhi:[
-				{
-					title:'流程',
-					dataIndex: 'processName',
-					key: 'processName'
-				},
-				{
-					title:'操作人',
-					dataIndex: 'adminName',
-					key: 'adminName'
-				},{
-					title:'时间',
-					dataIndex: 'createDate',
-					key: 'createDate'
-				}
-			],
-			dataSourceX: [],
-			ContactsLists: [{
-					title: '催款科目',
-					dataIndex: 'dunSubject',
-					key: 'dunSubject',
-					render: text=>{return getjiedian(text)}
-				},{
-					title: '金额(万)',
-					dataIndex: 'money',
-					key: 'money',
-				}, {
-					title: '催款状态',
-					dataIndex: 'dunStatus',
-					key: 'dunStatus',
-					render:text=>{return getCuikuan(text)}
-				},
-			],
-		}
+      page: 1,
+      releaseDate: [],
+      selectedRowKeys: [],
+      pictureUrl: [],
+      attachmentUrl: [],
+      paginations: false,
+      activeKey: "1",
+      confirmLoading: false,
+      aloading: 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: "contractNo",
+          key: "contractNo"
+        },
+        {
+          title: "创建时间",
+          dataIndex: "createTime",
+          key: "createTime"
+        },
+        {
+          title: "签单时间",
+          dataIndex: "signTime",
+          key: "signTime"
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName"
+        },
+        {
+          title: "订单部门",
+          dataIndex: "depName",
+          key: "depName"
+        },
+        {
+          title: "签单金额(万元)",
+          dataIndex: "totalAmount",
+          key: "totalAmount"
+        },
+        {
+          title: "结算状态",
+          dataIndex: "liquidationStatus",
+          key: "liquidationStatus",
+          render: text => {
+            return getLiquidationStatus(text);
+          }
+        },
+        {
+          title: "外包审核",
+          dataIndex: "refundStatus",
+          key: "refundStatus",
+          render: text => {
+            return getRefundStatus(text);
+          }
+        },
+        {
+          title: "营销负责人",
+          dataIndex: "adminName",
+          key: "adminName"
+        },
+        {
+          title: "财务负责人",
+          dataIndex: "financeName",
+          key: "financeName"
+        }
+      ],
+      data: [],
+      dataSource: [],
+      columnsX: [
+        {
+          title: "业务项目名称",
+          dataIndex: "commodityName",
+          key: "commodityName"
+        },
+        {
+          title: "项目类别",
+          dataIndex: "cname",
+          key: "cname"
+        },
+        {
+          title: "项目数量",
+          dataIndex: "commodityQuantity",
+          key: "commodityQuantity"
+        },
+        {
+          title: "金额(万元)",
+          dataIndex: "commodityPrice",
+          key: "commodityPrice"
+        },
+        {
+          title: "负责人",
+          dataIndex: "contacts",
+          key: "contacts"
+        },
+        {
+          title: "负责人电话",
+          dataIndex: "contactsMobile",
+          key: "contactsMobile"
+        },
+        {
+          title: "项目状态",
+          dataIndex: "projectStatus",
+          key: "projectStatus",
+          render: text => {
+            return getProjectStatus(text);
+          }
+        },
+        {
+          title: "主要项目",
+          dataIndex: "main",
+          key: "main",
+          render: text => {
+            return text ? "是" : "否";
+          }
+        },
+        {
+          title: "项目说明",
+          dataIndex: "taskComment",
+          key: "taskComment",
+          render: text => {
+            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+          }
+        }
+      ],
+      columnsrizhi: [
+        {
+          title: "流程",
+          dataIndex: "processName",
+          key: "processName"
+        },
+        {
+          title: "操作人",
+          dataIndex: "adminName",
+          key: "adminName"
+        },
+        {
+          title: "时间",
+          dataIndex: "createDate",
+          key: "createDate"
+        }
+      ],
+      dataSourceX: [],
+      ContactsLists: [
+        {
+          title: "催款科目",
+          dataIndex: "dunSubject",
+          key: "dunSubject",
+          render: text => {
+            return getjiedian(text);
+          }
+        },
+        {
+          title: "金额(万元)",
+          dataIndex: "money",
+          key: "money"
+        },
+        {
+          title: "催款状态",
+          dataIndex: "dunStatus",
+          key: "dunStatus",
+          render: text => {
+            return getCuikuan(text);
+          }
+        }
+      ]
+    };
 	},
 	//页面加载函数
 	componentWillMount() {

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

@@ -303,7 +303,7 @@ const contractChange = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

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

@@ -309,7 +309,7 @@ const contractChange = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

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

@@ -299,7 +299,7 @@ const contractChange = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

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

@@ -296,7 +296,7 @@ const contractChange = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

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

@@ -298,7 +298,7 @@ const contractChange = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

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

@@ -293,7 +293,7 @@ const contractChange = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

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

@@ -305,7 +305,7 @@ const contractChange = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

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

@@ -378,7 +378,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money",
             render: (text, record) => {
@@ -416,7 +416,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

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

@@ -287,7 +287,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money",
             render: (text, record) => {
@@ -325,7 +325,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

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

@@ -361,7 +361,7 @@ const outsourcingList = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money",
             render: (text, record) => {
@@ -624,7 +624,7 @@ const outsourcingList = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money"
           },

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

@@ -45,21 +45,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,//应收款
+	             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;
@@ -198,29 +198,24 @@ const IntentionCustomer = Form.create()(React.createClass({
           key: "totalAmount"
         },
         {
-          title: "结算状态",
-          dataIndex: "liquidationStatus",
-          key: "liquidationStatus",
-          render: text => {
-            return getLiquidationStatus(text);
-          }
-        },
-        {
-          title: "应收款(万)",
-          dataIndex: "accountsReceivable",
-          key: "accountsReceivable"
-        },
-        {
-          title: "已收款(万)",
+          title: "已收款(万元)",
           dataIndex: "settlementAmount",
           key: "settlementAmount"
         },
         {
-          title: "未收款(万)",
+          title: "未收款(万元)",
           dataIndex: "uncollectedAmount",
           key: "uncollectedAmount"
         },
         {
+          title: "结算状态",
+          dataIndex: "liquidationStatus",
+          key: "liquidationStatus",
+          render: text => {
+            return getLiquidationStatus(text);
+          }
+        },
+        {
           title: "催收科目",
           dataIndex: "dunSubject",
           key: "dunSubject"
@@ -229,6 +224,11 @@ const IntentionCustomer = Form.create()(React.createClass({
           // }
         },
         {
+          title: "应收款(万元)",
+          dataIndex: "accountsReceivable",
+          key: "accountsReceivable"
+        },
+        {
           title: "催款状态",
           dataIndex: "dunStatus",
           key: "dunStatus"

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

@@ -507,7 +507,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money",
             render: (text, record) => {
@@ -657,7 +657,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "金额(万)",
+            title: "金额(万)",
             dataIndex: "money",
             key: "money",
             render: (text, record) => {

File diff suppressed because it is too large
+ 1853 - 1280
js/component/manageCenter/project/task/myTaskCount.jsx