mentoswzq 5 years ago
parent
commit
36cac2ea43

+ 75 - 4
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -325,7 +325,7 @@ const approvedOutsourcing = React.createClass({
           render: (text, recard) => {
             return (
               <div>
-                {recard.liquidationStatus < 2 &&
+                {/* {recard.liquidationStatus < 2 &&
                 (recard.approval === 1 || recard.approval === 2) ? (
                   <Button
                     style={{ background: "rgb(192,192,192)" }}
@@ -344,7 +344,7 @@ const approvedOutsourcing = React.createClass({
                   >
                     收款
                   </Button>
-                )}
+                )} */}
                 {recard.processStatus < 4 ? (
                   <Button
                     type="primary"
@@ -460,6 +460,16 @@ const approvedOutsourcing = React.createClass({
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment"
+        },
+        {
+          title: "外包(内部)公司",
+          dataIndex: "outsourceName",
+          key: "outsourceName"
+        },
+        {
+          title: "外包(内部)价格",
+          dataIndex: "outsourcePrice",
+          key: "outsourcePrice"
         }
       ],
       cuiColumns: [
@@ -535,7 +545,10 @@ const approvedOutsourcing = React.createClass({
         {
           title: "催收科目",
           dataIndex: "dunSubject",
-          key: "dunSubject"
+          key: "dunSubject",
+          render: text => {
+            return getjiedian(text);
+          }
         },
         {
           title: "催收启动时间",
@@ -1796,6 +1809,15 @@ const approvedOutsourcing = React.createClass({
       "/api/admin/orderProject/exportMyTaskList?" +
       $.param(data);
   },
+  exportPro() {
+    const data = {
+      orderNo: this.state.selectedRowKeys[0],
+    };
+    window.location.href =
+      globalConfig.context +
+      "/api/admin/newOrder/exportOrderTaskData?" +
+      $.param(data);
+  },
   exportCui() {
     var data = {
       orderNo: this.state.selectedRowKeys[0]
@@ -1921,7 +1943,9 @@ const approvedOutsourcing = React.createClass({
               commodityQuantity: thisdata.commodityQuantity,
               commodityPrice: thisdata.commodityPrice,
               certificateNumber: thisdata.certificateNumber,
-              taskComment: thisdata.taskComment
+              taskComment: thisdata.taskComment,
+              outsourceName: thisdata.outsourceName,
+              outsourcePrice: thisdata.outsourcePrice
             });
           }
         }
@@ -2187,6 +2211,14 @@ const approvedOutsourcing = React.createClass({
             >
               导出催款信息
             </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={this.exportPro}
+            >
+              导出项目详情
+            </Button>
           </TabPane>
           <TabPane tab="查看" key="5">
             <Button
@@ -2215,6 +2247,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.cuiData();
+                this.setState({
+                  cuiVisible: true
+                });
+              }}
+            >
+              催款信息
+            </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={() => {
+                this.proData();
+                this.setState({
+                  proVisible: true
+                });
+              }}
+            >
+              项目信息
+            </Button>
           </TabPane>
           {/* <TabPane tab="批量操作" key="6">
             <Button

File diff suppressed because it is too large
+ 855 - 38
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx


+ 24 - 4
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -25,7 +25,7 @@ import {
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 import ShowModalDiv from "@/showModal.jsx";
 const FormItem = Form.Item;
-
+import OrderDesc from "../../financialManage/orderDetail/orderDesc";
 const inSpecial = React.createClass({
   departmentList() {
     this.setState({
@@ -103,7 +103,7 @@ const inSpecial = React.createClass({
               id: thisdata.id,
               status: thisdata.status,
               unitName: thisdata.unitName,
-              orderno: thisdata.orderno,
+              orderNo: thisdata.orderno,
               name: thisdata.name,
               processStatus: thisdata.processStatus,
               projectStatus: thisdata.projectStatus,
@@ -229,7 +229,7 @@ const inSpecial = React.createClass({
         {
           title: "编号",
           dataIndex: "id",
-          key: "id",
+          key: "id"
           // fixed: "left"
         },
         {
@@ -542,7 +542,7 @@ const inSpecial = React.createClass({
     this.setState(
       {
         bvisible: true,
-        orderNo2: record.orderno
+        orderNo2: record.orderNo
       },
       () => {
         this.inRecordData();
@@ -587,6 +587,20 @@ const inSpecial = React.createClass({
       changeList: newArr
     });
   },
+  tableRowClick(record) {
+    console.log(record);
+    
+    this.state.RowData = record;
+    this.setState({
+      showDesc: true
+    });
+  },
+  closeDesc(e, s) {
+    this.state.showDesc = e;
+    if (s) {
+      this.loadData(this.state.page);
+    }
+  },
   render() {
     const formItemLayout = {
       labelCol: { span: 8 },
@@ -681,6 +695,7 @@ const inSpecial = React.createClass({
                   : this.state.changeList
               }
               scroll={{ x: 1500, y: 0 }}
+              onRowClick={this.tableRowClick}
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
               bordered
@@ -1018,6 +1033,11 @@ const inSpecial = React.createClass({
             </div>
           </Spin>
         </Modal>
+        <OrderDesc
+          data={this.state.RowData}
+          showDesc={this.state.showDesc}
+          closeDesc={this.closeDesc.bind(this)}
+        />
       </div>
     );
   }

+ 23 - 2
js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx

@@ -24,6 +24,7 @@ import {
 } from "@/tools";
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 import ShowModalDiv from "@/showModal.jsx";
+import OrderDesc from "../orderDetail/orderDesc";
 const FormItem = Form.Item;
 
 const invoiceApplyList = React.createClass({
@@ -100,7 +101,7 @@ const invoiceApplyList = React.createClass({
               id: thisdata.id,
               status: thisdata.status,
               unitName: thisdata.unitName,
-              orderno: thisdata.orderno,
+              orderNo: thisdata.orderno,
               name: thisdata.name,
               processStatus: thisdata.processStatus,
               projectStatus: thisdata.projectStatus,
@@ -535,7 +536,7 @@ const invoiceApplyList = React.createClass({
     this.setState(
       {
         bvisible: true,
-        orderNo2: record.orderno
+        orderNo2: record.orderNo
       },
       () => {
         this.inRecordData();
@@ -578,6 +579,20 @@ const invoiceApplyList = React.createClass({
       changeList: newArr
     });
   },
+  tableRowClick(record) {
+    console.log(record);
+    
+    this.state.RowData = record;
+    this.setState({
+      showDesc: true
+    });
+  },
+  closeDesc(e, s) {
+    this.state.showDesc = e;
+    if (s) {
+      this.loadData(this.state.page);
+    }
+  },
   render() {
     const formItemLayout = {
       labelCol: { span: 8 },
@@ -641,6 +656,7 @@ const invoiceApplyList = React.createClass({
                   : this.state.changeList
               }
               scroll={{ x: 1500, y: 0 }}
+              onRowClick={this.tableRowClick}
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
               bordered
@@ -988,6 +1004,11 @@ const invoiceApplyList = React.createClass({
             </div>
           </Spin>
         </Modal>
+        <OrderDesc
+          data={this.state.RowData}
+          showDesc={this.state.showDesc}
+          closeDesc={this.closeDesc.bind(this)}
+        />
       </div>
     );
   }

+ 21 - 4
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -23,7 +23,7 @@ import {
 } from "@/tools";
 
 const FormItem = Form.Item;
-
+import OrderDesc from "../orderDetail/orderDesc";
 const invoiceApplyListWai = React.createClass({
   departmentList() {
     this.setState({
@@ -97,7 +97,7 @@ const invoiceApplyListWai = React.createClass({
               id: thisdata.id,
               status: thisdata.status,
               unitName: thisdata.unitName,
-              orderno: thisdata.orderno,
+              orderNo: thisdata.orderno,
               name: thisdata.name,
               projectStatus: thisdata.projectStatus,
               processStatus: thisdata.processStatus,
@@ -131,7 +131,18 @@ const invoiceApplyListWai = React.createClass({
       }.bind(this)
     );
   },
-
+  tableRowClick(record) {
+    this.state.RowData = record;
+    this.setState({
+      showDesc: true
+    });
+  },
+  closeDesc(e, s) {
+    this.state.showDesc = e;
+    if (s) {
+      this.loadData(this.state.page);
+    }
+  },
   invoiceData() {
     this.setState({
       loading: true
@@ -531,7 +542,7 @@ const invoiceApplyListWai = React.createClass({
     this.setState(
       {
         bvisible: true,
-        orderNo2: record.orderno
+        orderNo2: record.orderNo
       },
       () => {
         this.inRecordData();
@@ -613,6 +624,7 @@ const invoiceApplyListWai = React.createClass({
             <Table
               columns={this.state.columns}
               scroll={{ x: 1500, y: 0 }}
+              onRowClick={this.tableRowClick}
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
             />
@@ -959,6 +971,11 @@ const invoiceApplyListWai = React.createClass({
             </div>
           </Spin>
         </Modal>
+        <OrderDesc
+          data={this.state.RowData}
+          showDesc={this.state.showDesc}
+          closeDesc={this.closeDesc.bind(this)}
+        />
       </div>
     );
   }

+ 22 - 3
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -13,6 +13,7 @@ import {
 } from "@/tools";
 
 const FormItem = Form.Item;
+import OrderDesc from "../orderDetail/orderDesc";
 
 const outSpecial = React.createClass({
   departmentList() {
@@ -87,7 +88,7 @@ const outSpecial = React.createClass({
               id: thisdata.id,
               status: thisdata.status,
               unitName: thisdata.unitName,
-              orderno: thisdata.orderno,
+              orderNo: thisdata.orderno,
               name: thisdata.name,
               projectStatus: thisdata.projectStatus,
               processStatus: thisdata.processStatus,
@@ -521,7 +522,7 @@ const outSpecial = React.createClass({
     this.setState(
       {
         bvisible: true,
-        orderNo2: record.orderno
+        orderNo2: record.orderNo
       },
       () => {
         this.inRecordData();
@@ -548,7 +549,7 @@ const outSpecial = React.createClass({
   //   window.setTimeout(() => {
   //      console.log("321", this.state);
   //   },100)
-    
+
   // },
   reset() {
     this.state.nameSearch = "";
@@ -558,6 +559,18 @@ const outSpecial = React.createClass({
     this.state.departmenttList = [];
     this.loadData();
   },
+  tableRowClick(record) {
+    this.state.RowData = record;
+    this.setState({
+      showDesc: true
+    });
+  },
+  closeDesc(e, s) {
+    this.state.showDesc = e;
+    if (s) {
+      this.loadData(this.state.page);
+    }
+  },
   render() {
     const formItemLayout = {
       labelCol: { span: 8 },
@@ -607,6 +620,7 @@ const outSpecial = React.createClass({
             <Table
               columns={this.state.columns}
               scroll={{ x: 1500, y: 0 }}
+              onRowClick={this.tableRowClick}
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
             />
@@ -942,6 +956,11 @@ const outSpecial = React.createClass({
             </div>
           </Spin>
         </Modal>
+        <OrderDesc
+          data={this.state.RowData}
+          showDesc={this.state.showDesc}
+          closeDesc={this.closeDesc.bind(this)}
+        />
       </div>
     );
   }

+ 748 - 33
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -25,13 +25,17 @@ import {
   getProcessStatus,
   getApproval,
   getInvoiceStatus,
-  getTransactionProject
+  getTransactionProject,
+  getTaskStatus,
+  getNewOrderStatus,
+  getProjectStatus,
+  getjiedian
 } from "@/tools";
 import { ChooseList } from "../../order/orderNew/chooseList";
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
 
-const ShouKuangAll = React.createClass({
+const ShouKuang = React.createClass({
   departmentList() {
     this.setState({
       loading: true
@@ -74,8 +78,8 @@ const ShouKuangAll = 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 +134,8 @@ const ShouKuangAll = React.createClass({
               invoiceAmount: thisdata.invoiceAmount,
               finalReceivables: thisdata.finalReceivables,
               finalReceivablesTime: thisdata.finalReceivablesTime,
-              signTotalAmount: thisdata.signTotalAmount
+              signTotalAmount: thisdata.signTotalAmount,
+              financeName: thisdata.financeName
             });
           }
         }
@@ -171,7 +176,7 @@ const ShouKuangAll = React.createClass({
       assignDataX: [],
       assignDataY: [],
       totalPage: 0,
-    //   processStatusSearch: "3",
+      processStatusSearch: "3",
       boHuivisible: false,
       selectedRowKeys: [],
       selectedRows: [],
@@ -190,6 +195,239 @@ const ShouKuangAll = React.createClass({
       },
       // 子组件改变的表格title数组
       changeList: undefined,
+      proColumns: [
+        {
+          title: "序号",
+          dataIndex: "key",
+          key: "key"
+        },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo"
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo"
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName"
+        },
+        {
+          title: "订单负责人",
+          dataIndex: "salesmanName",
+          key: "salesmanName"
+        },
+        {
+          title: "是否主项目",
+          dataIndex: "main",
+          key: "main",
+          render: text => {
+            return text == 0 ? "否" : "是";
+          }
+        },
+        {
+          title: "项目类别",
+          dataIndex: "cname",
+          key: "cname"
+        },
+        {
+          title: "项目名称",
+          dataIndex: "commodityName",
+          key: "commodityName"
+        },
+        {
+          title: "项目数量",
+          dataIndex: "commodityQuantity",
+          key: "commodityQuantity"
+        },
+        {
+          title: "服务市价",
+          dataIndex: "commodityPrice",
+          key: "commodityPrice"
+        },
+        {
+          title: "证书编号",
+          dataIndex: "certificateNumber",
+          key: "certificateNumber"
+        },
+        {
+          title: "项目状态",
+          dataIndex: "projectStatus",
+          key: "projectStatus",
+          render: text => {
+            return getProjectStatus(text);
+          }
+        },
+        {
+          title: "项目说明",
+          dataIndex: "taskComment",
+          key: "taskComment"
+        },
+        {
+          title: "外包(内部)公司",
+          dataIndex: "outsourceName",
+          key: "outsourceName"
+        },
+        {
+          title: "外包(内部)价格",
+          dataIndex: "outsourcePrice",
+          key: "outsourcePrice"
+        }
+      ],
+
+      cuiColumns: [
+        {
+          title: "序号",
+          dataIndex: "key",
+          key: "key"
+        },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo"
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo"
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName"
+        },
+        {
+          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: "settlementAmount",
+          key: "settlementAmount"
+        },
+        {
+          title: "应收款",
+          dataIndex: "accountsReceivable",
+          key: "accountsReceivable"
+        },
+        {
+          title: "催收科目",
+          dataIndex: "dunSubject",
+          key: "dunSubject",
+          render: text => {
+            return getjiedian(text);
+          }
+        },
+        {
+          title: "催收启动时间",
+          dataIndex: "startDate",
+          key: "startDate"
+        }
+      ],
+      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 +548,12 @@ const ShouKuangAll = React.createClass({
           className: "title-table"
         },
         {
+          title: "财务负责人",
+          dataIndex: "financeName",
+          key: "financeName",
+          className: "title-table"
+        },
+        {
           title: "签单日期",
           dataIndex: "signTime",
           key: "signTime",
@@ -377,7 +621,7 @@ const ShouKuangAll = React.createClass({
           render: text => {
             return getApproval(text);
           }
-        },
+        }
 
         //                 {
         //                     title: '订单状态',
@@ -660,8 +904,8 @@ const ShouKuangAll = React.createClass({
     this.state.departmenttList = undefined;
     this.state.processStatus = [];
     this.state.contractNoSearch = "";
-    this.state.processStatusSearch = [];
     this.state.liquidationStatus = [];
+    this.state.contractNo = "";
     this.loadData();
   },
   //驳回
@@ -747,7 +991,8 @@ const ShouKuangAll = 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 = [];
@@ -794,7 +1039,8 @@ const ShouKuangAll = 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 = [];
@@ -827,7 +1073,7 @@ const ShouKuangAll = React.createClass({
         }
         this.setState({
           waterData: theArr,
-          waterSum: waterSum.toFixed(4)
+          waterSum: (Math.round(waterSum * 10000) / 10000).toFixed(4)
         });
       }.bind(this)
     }).always(
@@ -872,27 +1118,219 @@ const ShouKuangAll = 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)
+    );
+  },
+  exportTime() {
+    const data = {
+      orderNo: this.state.selectedRowKeys[0],
+      pageSize: 9999
+    };
+    window.location.href =
+      globalConfig.context +
+      "/api/admin/orderProject/exportMyTaskList?" +
+      $.param(data);
+  },
+  exportPro() {
+    const data = {
+      orderNo: this.state.selectedRowKeys[0]
+    };
+    window.location.href =
+      globalConfig.context +
+      "/api/admin/newOrder/exportOrderTaskData?" +
+      $.param(data);
+  },
+  exportCui() {
+    var data = {
+      orderNo: this.state.selectedRowKeys[0]
+        ? this.state.selectedRowKeys[0]
+        : undefined, //订单编号
+      // specially: 1,
+      pageSize: 9999
+    };
+    window.location.href =
+      globalConfig.context +
+      "/api/admin/newOrder/exportOrderDunData?" +
+      $.param(data);
+  },
+  cuiData() {
+    this.setState({
+      loading: true
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/newOrder/dunOrderNewList",
+      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,
+              buyerName: thisdata.buyerName,
+              departmentName: thisdata.departmentName,
+              salesmanName: thisdata.salesmanName,
+              depName: thisdata.depName,
+              orderStatus: thisdata.orderStatus,
+              projectStatus: thisdata.projectStatus,
+              totalAmount: thisdata.totalAmount,
+              liquidationStatus: thisdata.liquidationStatus,
+              settlementAmount: thisdata.settlementAmount,
+              accountsReceivable: thisdata.accountsReceivable,
+              dunSubject: thisdata.dunSubject,
+              startDate: thisdata.startDate,
+              taskStatus: thisdata.taskStatus,
+              cname: thisdata.cname,
+              id: thisdata.id,
+              taskName: thisdata.taskName,
+              hours: thisdata.hours,
+              taskDistributionTime: thisdata.taskDistributionTime,
+              taskEndTime: thisdata.taskEndTime
+            });
+          }
+        }
+        this.setState({
+          cuiDataList: theArr
+        });
+      }.bind(this)
+    }).always(
+      function() {
+        this.setState({
+          loading: false
+        });
+      }.bind(this)
+    );
+  },
+  proData() {
+    this.setState({
+      loading: true
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/newOrder/getOrderTask",
+      data: {
+        orderNo: this.state.selectedRowKeys[0],
+        pageSize: 9999
+      },
+      success: function(data) {
+        let theArr = [];
+        if (!data.data) {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          for (let i = 0; i < data.data.length; i++) {
+            let thisdata = data.data[i];
+            theArr.push({
+              key: i + 1,
+              orderNo: thisdata.orderNo,
+              contractNo: thisdata.contractNo,
+              userName: thisdata.userName,
+              buyerName: thisdata.buyerName,
+              departmentName: thisdata.departmentName,
+              salesmanName: thisdata.salesmanName,
+              depName: thisdata.depName,
+              orderStatus: thisdata.orderStatus,
+              projectStatus: thisdata.projectStatus,
+              commodityName: thisdata.commodityName,
+              totalAmount: thisdata.totalAmount,
+              liquidationStatus: thisdata.liquidationStatus,
+              settlementAmount: thisdata.settlementAmount,
+              accountsReceivable: thisdata.accountsReceivable,
+              dunSubject: thisdata.dunSubject,
+              startDate: thisdata.startDate,
+              taskStatus: thisdata.taskStatus,
+              cname: thisdata.cname,
+              id: thisdata.id,
+              taskName: thisdata.taskName,
+              hours: thisdata.hours,
+              taskDistributionTime: thisdata.taskDistributionTime,
+              taskEndTime: thisdata.taskEndTime,
+              commodityQuantity: thisdata.commodityQuantity,
+              commodityPrice: thisdata.commodityPrice,
+              certificateNumber: thisdata.certificateNumber,
+              taskComment: thisdata.taskComment,
+              outsourceName: thisdata.outsourceName,
+              outsourcePrice: thisdata.outsourcePrice
+            });
+          }
+        }
+        this.setState({
+          proDataList: theArr
+        });
+      }.bind(this)
+    }).always(
+      function() {
+        this.setState({
+          loading: false
+        });
+      }.bind(this)
+    );
   },
   render() {
     const formItemLayout = {
@@ -905,7 +1343,8 @@ const ShouKuangAll = React.createClass({
     const rowSelection = {
       selectedRowKeys,
       onChange: this.onSelectChange,
-      hideDefaultSelections: true
+      hideDefaultSelections: true,
+      type: "radio"
     };
     return (
       <div className="user-content">
@@ -1025,7 +1464,7 @@ const ShouKuangAll = React.createClass({
               <Button onClick={this.reset}>重置</Button>
             </div>
           </TabPane>
-          {/* <TabPane tab="打印" key="3">
+          <TabPane tab="打印" key="3">
             <Button
               type="primary"
               style={{ margin: "11px 0px 10px 10px" }}
@@ -1060,6 +1499,45 @@ const ShouKuangAll = 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.cuiData();
+                this.setState({
+                  cuiVisible: true
+                });
+              }}
+            >
+              打印催款信息
+            </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={() => {
+                this.proData();
+                this.setState({
+                  proVisible: true
+                });
+              }}
+            >
+              打印项目信息
+            </Button>
           </TabPane>
           <TabPane tab="导出Excel" key="4">
             <Button
@@ -1085,7 +1563,31 @@ const ShouKuangAll = React.createClass({
             >
               导出所选收款详情流水
             </Button>
-          </TabPane> */}
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={this.exportTime}
+            >
+              导出所选工时信息
+            </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={this.exportCui}
+            >
+              导出催款信息
+            </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={this.exportPro}
+            >
+              导出项目详情
+            </Button>
+          </TabPane>
           <TabPane tab="查看" key="5">
             <Button
               type="primary"
@@ -1113,6 +1615,45 @@ const ShouKuangAll = 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.cuiData();
+                this.setState({
+                  cuiVisible: true
+                });
+              }}
+            >
+              催款信息
+            </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={() => {
+                this.proData();
+                this.setState({
+                  proVisible: true
+                });
+              }}
+            >
+              项目信息
+            </Button>
           </TabPane>
           {/* <TabPane tab="批量操作" key="6">
             <Button
@@ -1366,7 +1907,181 @@ const ShouKuangAll = 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"
+              />
+            </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.cuiVisible}
+          footer=""
+          title="催款详情"
+          className="admin-desc-content"
+          width="1300px"
+          pagination={false}
+          onCancel={() => {
+            this.loadData();
+            this.setState({
+              cuiVisible: 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.cuiColumns}
+                dataSource={this.state.cuiDataList}
+                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.proVisible}
+          footer=""
+          title="项目详情"
+          className="admin-desc-content"
+          width="1300px"
+          pagination={false}
+          onCancel={() => {
+            this.loadData();
+            this.setState({
+              proVisible: 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.proColumns}
+                dataSource={this.state.proDataList}
+                pagination={false}
                 bordered
                 size="small"
               />
@@ -1396,4 +2111,4 @@ const ShouKuangAll = React.createClass({
   }
 });
 
-export default ShouKuangAll;
+export default ShouKuang;

+ 134 - 8
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -14,7 +14,7 @@ import {
   DatePicker,
   Modal,
   Tabs,
-  Col
+  Col,
 } from "antd";
 import OrderDesc from "../orderDetail/orderDesc";
 import Receivable from "./receivable";
@@ -29,10 +29,12 @@ import {
   getTaskStatus,
   getNewOrderStatus,
   getProjectStatus,
+  getjiedian
 } from "@/tools";
 import { ChooseList } from "../../order/orderNew/chooseList"
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
+const { TextArea } = Input;
 
 const ShouKuang = React.createClass({
   departmentList() {
@@ -265,6 +267,16 @@ const ShouKuang = React.createClass({
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment"
+        },
+        {
+          title: "外包(内部)公司",
+          dataIndex: "outsourceName",
+          key: "outsourceName"
+        },
+        {
+          title: "外包(内部)价格",
+          dataIndex: "outsourcePrice",
+          key: "outsourcePrice"
         }
       ],
 
@@ -341,7 +353,10 @@ const ShouKuang = React.createClass({
         {
           title: "催收科目",
           dataIndex: "dunSubject",
-          key: "dunSubject"
+          key: "dunSubject",
+          render: text => {
+            return getjiedian(text);
+          }
         },
         {
           title: "催收启动时间",
@@ -624,7 +639,7 @@ const ShouKuang = React.createClass({
           render: (text, recard) => {
             return (
               <div>
-                {recard.liquidationStatus < 2 &&
+                {/* {recard.liquidationStatus < 2 &&
                 (recard.approval === 1 || recard.approval === 2) ? (
                   <Button
                     style={{ background: "rgb(192,192,192)" }}
@@ -643,12 +658,13 @@ const ShouKuang = React.createClass({
                   >
                     收款
                   </Button>
-                )}
+                )} */}
                 {recard.processStatus < 4 ? (
                   <Button
                     type="primary"
                     onClick={e => {
-                      e.stopPropagation(), this.evaluateZ(recard);
+                      // e.stopPropagation(), this.evaluateZ(recard);
+                      e.stopPropagation(), this.checkRemark(recard);
                     }}
                     style={{ marginLeft: "5px" }}
                   >
@@ -1170,11 +1186,10 @@ const ShouKuang = React.createClass({
   exportPro() {
     const data = {
       orderNo: this.state.selectedRowKeys[0],
-      pageSize: 9999
     };
     window.location.href =
       globalConfig.context +
-      "/api/admin/orderProject/exportOrderTaskData?" +
+      "/api/admin/newOrder/exportOrderTaskData?" +
       $.param(data);
   },
   exportCui() {
@@ -1301,7 +1316,9 @@ const ShouKuang = React.createClass({
               commodityQuantity: thisdata.commodityQuantity,
               commodityPrice: thisdata.commodityPrice,
               certificateNumber: thisdata.certificateNumber,
-              taskComment: thisdata.taskComment
+              taskComment: thisdata.taskComment,
+              outsourceName: thisdata.outsourceName,
+              outsourcePrice: thisdata.outsourcePrice
             });
           }
         }
@@ -1317,6 +1334,51 @@ const ShouKuang = React.createClass({
       }.bind(this)
     );
   },
+  checkRemark(record) {
+    this.setState({
+      checkVisible: true,
+      checkOrderNo: record.orderNo
+    });
+  },
+  checkOk() {
+    if(this.state.checkData.trim() == "") {
+      message.warning("请填写审核内容")
+      return
+    }
+    this.setState({
+      loading: true
+    });
+    $.ajax({
+      method: "post",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/financial/financeApproval",
+      data: {
+        orderNo: this.state.checkOrderNo,
+        remarks: this.state.checkData
+      },
+      success: function(data) {
+        let theArr = [];
+        if (!data.data) {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        }else {
+          message.success("通过成功!")
+          this.loadData()
+          this.setState({
+            checkVisible: false
+          })
+        }
+      }.bind(this)
+    }).always(
+      function() {
+        this.setState({
+          loading: false
+        });
+      }.bind(this)
+    );
+  },
   render() {
     const formItemLayout = {
       labelCol: { span: 8 },
@@ -1600,6 +1662,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.cuiData();
+                this.setState({
+                  cuiVisible: true
+                });
+              }}
+            >
+              催款信息
+            </Button>
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length != 1}
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={() => {
+                this.proData();
+                this.setState({
+                  proVisible: true
+                });
+              }}
+            >
+              项目信息
+            </Button>
           </TabPane>
           {/* <TabPane tab="批量操作" key="6">
             <Button
@@ -2052,6 +2153,31 @@ const ShouKuang = React.createClass({
             content={() => this.refs.all}
           />
         </Modal>
+        <Spin spinning={this.state.loading}>
+          <Modal
+            title="审核订单"
+            visible={this.state.checkVisible}
+            onOk={this.checkOk}
+            okText={"通过"}
+            onCancel={() => {
+              this.loadData();
+              this.setState({
+                checkVisible: false,
+                checkRemark: ""
+              });
+            }}
+          >
+            <TextArea
+              onChange={(e, recard) => {
+                this.setState({
+                  checkData: e.target.value
+                });
+                console.log(e.target.value);
+              }}
+              placeholder="请填写审核内容"
+            />
+          </Modal>
+        </Spin>
       </div>
     );
   }

+ 24 - 9
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -9,7 +9,8 @@ import {
   getboutique,
   getCuikuan,
   getProjectStatus,
-  ShowModal
+  ShowModal,
+  getType
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailCwzj.js";
@@ -68,6 +69,7 @@ const contractChange = Form.create()(
                 type: thisdata.type,
                 status: thisdata.status,
                 id: thisdata.id,
+                contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
                   thisdata.processState,
                   thisdata.status
@@ -132,21 +134,26 @@ const contractChange = Form.create()(
         },
         columns: [
           {
+            title: "合同编号",
+            dataIndex: "contractNo",
+            key: "contractNo"
+          },
+          {
             title: "订单编号",
             dataIndex: "orderNo",
             key: "orderNo"
           },
           {
-            title: "提交时间",
-            dataIndex: "createTimes",
-            key: "createTimes"
-          },
-          {
             title: "客户名称",
             dataIndex: "nickname",
             key: "nickname"
           },
           {
+            title: "订单部门",
+            dataIndex: "depName",
+            key: "depName"
+          },
+          {
             title: "订单类型",
             dataIndex: "orderType",
             key: "orderType",
@@ -188,14 +195,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: [],

+ 24 - 9
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -9,7 +9,8 @@ import {
   getboutique,
   getCuikuan,
   getProjectStatus,
-  ShowModal
+  ShowModal,
+  getType
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailJsjl.js";
@@ -67,6 +68,7 @@ const contractChange = Form.create()(
                 type: thisdata.type,
                 status: thisdata.status,
                 id: thisdata.id,
+                contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
                   thisdata.processState,
                   thisdata.status
@@ -130,21 +132,26 @@ const contractChange = Form.create()(
         },
         columns: [
           {
+            title: "合同编号",
+            dataIndex: "contractNo",
+            key: "contractNo"
+          },
+          {
             title: "订单编号",
             dataIndex: "orderNo",
             key: "orderNo"
           },
           {
-            title: "提交时间",
-            dataIndex: "createTimes",
-            key: "createTimes"
-          },
-          {
             title: "客户名称",
             dataIndex: "nickname",
             key: "nickname"
           },
           {
+            title: "订单部门",
+            dataIndex: "depName",
+            key: "depName"
+          },
+          {
             title: "订单类型",
             dataIndex: "orderType",
             key: "orderType",
@@ -186,14 +193,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: [],

+ 28 - 22
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -9,7 +9,8 @@ import {
   getboutique,
   getCuikuan,
   getProjectStatus,
-  ShowModal
+  ShowModal,
+  getType
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailJsy.js";
@@ -67,6 +68,7 @@ const contractChange = Form.create()(
                 type: thisdata.type,
                 status: thisdata.status,
                 id: thisdata.id,
+                contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
                   thisdata.processState,
                   thisdata.status
@@ -119,7 +121,7 @@ const contractChange = Form.create()(
             this.loadData(page);
             this.setState({
               page
-            })
+            });
           }.bind(this),
           showTotal: function(total) {
             return "共" + total + "条数据";
@@ -127,21 +129,26 @@ const contractChange = Form.create()(
         },
         columns: [
           {
+            title: "合同编号",
+            dataIndex: "contractNo",
+            key: "contractNo"
+          },
+          {
             title: "订单编号",
             dataIndex: "orderNo",
             key: "orderNo"
           },
           {
-            title: "提交时间",
-            dataIndex: "createTimes",
-            key: "createTimes"
-          },
-          {
             title: "客户名称",
             dataIndex: "nickname",
             key: "nickname"
           },
           {
+            title: "订单部门",
+            dataIndex: "depName",
+            key: "depName"
+          },
+          {
             title: "订单类型",
             dataIndex: "orderType",
             key: "orderType",
@@ -165,26 +172,17 @@ const contractChange = Form.create()(
           {
             title: "合同额(万元)",
             dataIndex: "totalAmount",
-            key: "totalAmount",
-            render: () => {
-              return "***";
-            }
+            key: "totalAmount"
           },
           {
             title: "已付额(万元)",
             dataIndex: "settlementAmount",
-            key: "settlementAmount",
-            render: () => {
-              return "***";
-            }
+            key: "settlementAmount"
           },
           {
             title: "欠款(万元)",
             dataIndex: "arrears",
-            key: "arrears",
-            render: () => {
-              return "***";
-            }
+            key: "arrears"
           },
           {
             title: "订单负责人",
@@ -192,14 +190,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: [],

+ 24 - 9
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -9,7 +9,8 @@ import {
   getboutique,
   getCuikuan,
   getProjectStatus,
-  ShowModal
+  ShowModal,
+  getType
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailJszj.js";
@@ -66,6 +67,7 @@ const contractChange = Form.create()(
                 type: thisdata.type,
                 status: thisdata.status,
                 id: thisdata.id,
+                contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
                   thisdata.processState,
                   thisdata.status
@@ -129,21 +131,26 @@ const contractChange = Form.create()(
         },
         columns: [
           {
+            title: "合同编号",
+            dataIndex: "contractNo",
+            key: "contractNo"
+          },
+          {
             title: "订单编号",
             dataIndex: "orderNo",
             key: "orderNo"
           },
           {
-            title: "提交时间",
-            dataIndex: "createTimes",
-            key: "createTimes"
-          },
-          {
             title: "客户名称",
             dataIndex: "nickname",
             key: "nickname"
           },
           {
+            title: "订单部门",
+            dataIndex: "depName",
+            key: "depName"
+          },
+          {
             title: "订单类型",
             dataIndex: "orderType",
             key: "orderType",
@@ -185,14 +192,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: [],

+ 24 - 9
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -9,7 +9,8 @@ import {
   getboutique,
   getCuikuan,
   getProjectStatus,
-  ShowModal
+  ShowModal,
+  getType
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailYxgly.js";
@@ -66,6 +67,7 @@ const contractChange = Form.create()(
                 type: thisdata.type,
                 status: thisdata.status,
                 id: thisdata.id,
+                contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
                   thisdata.processState,
                   thisdata.status
@@ -124,21 +126,26 @@ const contractChange = Form.create()(
         },
         columns: [
           {
+            title: "合同编号",
+            dataIndex: "contractNo",
+            key: "contractNo"
+          },
+          {
             title: "订单编号",
             dataIndex: "orderNo",
             key: "orderNo"
           },
           {
-            title: "提交时间",
-            dataIndex: "createTimes",
-            key: "createTimes"
-          },
-          {
             title: "客户名称",
             dataIndex: "nickname",
             key: "nickname"
           },
           {
+            title: "订单部门",
+            dataIndex: "depName",
+            key: "depName"
+          },
+          {
             title: "订单类型",
             dataIndex: "orderType",
             key: "orderType",
@@ -180,14 +187,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: [],

+ 34 - 19
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -10,7 +10,8 @@ import {
   getCuikuan,
   getProjectStatus,
   getContractChangeStatus,
-  ShowModal
+  ShowModal,
+  getType
 } from "@/tools.js";
 import "./customer.less";
 import { SearchInput } from "./changeComponent/searchInput.js";
@@ -71,6 +72,7 @@ const contractChange = Form.create()(
                 type: thisdata.type,
                 status: thisdata.status,
                 id: thisdata.id,
+                contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
                   thisdata.processState,
                   thisdata.status
@@ -133,21 +135,26 @@ const contractChange = Form.create()(
           }
         },
         columns: [
-            {
-              title: "订单编号",
-              dataIndex: "orderNo",
-              key: "orderNo"
-            },
-            {
-              title: "提交时间",
-              dataIndex: "createTimes",
-              key: "createTimes"
-            },
-            {
-              title: "客户名称",
-              dataIndex: "nickname",
-              key: "nickname"
-            },
+          {
+            title: "合同编号",
+            dataIndex: "contractNo",
+            key: "contractNo"
+          },
+          {
+            title: "订单编号",
+            dataIndex: "orderNo",
+            key: "orderNo"
+          },
+          {
+            title: "客户名称",
+            dataIndex: "nickname",
+            key: "nickname"
+          },
+          {
+            title: "订单部门",
+            dataIndex: "depName",
+            key: "depName"
+          },
           {
             title: "订单类型",
             dataIndex: "orderType",
@@ -190,14 +197,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: [],