mentoswzq 5 роки тому
батько
коміт
d9d40d4c86

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

@@ -548,12 +548,17 @@ const approvedOutsourcing = React.createClass({
         {
           title: "催收科目",
           dataIndex: "dunSubject",
-          key: "dunSubject",
+          key: "dunSubject"
           // render: text => {
           //   return getjiedian(text);
           // }
         },
         {
+          title: "催款状态",
+          dataIndex: "dunStatus",
+          key: "dunStatus"
+        },
+        {
           title: "催收启动时间",
           dataIndex: "startDate",
           key: "startDate"
@@ -1881,7 +1886,8 @@ const approvedOutsourcing = React.createClass({
               taskName: thisdata.taskName,
               hours: thisdata.hours,
               taskDistributionTime: thisdata.taskDistributionTime,
-              taskEndTime: thisdata.taskEndTime
+              taskEndTime: thisdata.taskEndTime,
+              dunStatus: thisdata.dunStatus == 0 ? "未触发" : "已触发"
             });
           }
         }
@@ -3196,6 +3202,7 @@ const approvedOutsourcing = React.createClass({
                 columns={this.state.cuiColumns}
                 dataSource={this.state.cuiDataList}
                 pagination={false}
+                scroll={{ x: "max-content", y: 0 }}
                 bordered
                 size="small"
               />

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

@@ -547,12 +547,17 @@ const approvedOutsourcing = React.createClass({
         {
           title: "催收科目",
           dataIndex: "dunSubject",
-          key: "dunSubject",
+          key: "dunSubject"
           // render: text => {
           //   return getjiedian(text);
           // }
         },
         {
+          title: "催款状态",
+          dataIndex: "dunStatus",
+          key: "dunStatus"
+        },
+        {
           title: "催收启动时间",
           dataIndex: "startDate",
           key: "startDate"
@@ -1880,7 +1885,8 @@ const approvedOutsourcing = React.createClass({
               taskName: thisdata.taskName,
               hours: thisdata.hours,
               taskDistributionTime: thisdata.taskDistributionTime,
-              taskEndTime: thisdata.taskEndTime
+              taskEndTime: thisdata.taskEndTime,
+              dunStatus: thisdata.dunStatus == 0 ? "未触发" : "已触发"
             });
           }
         }
@@ -3148,6 +3154,7 @@ const approvedOutsourcing = React.createClass({
               <Table
                 columns={this.state.cuiColumns}
                 dataSource={this.state.cuiDataList}
+                scroll={{ x: "max-content", y: 0 }}
                 pagination={false}
                 bordered
                 size="small"

+ 9 - 2
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -353,12 +353,17 @@ const ShouKuang = React.createClass({
         {
           title: "催收科目",
           dataIndex: "dunSubject",
-          key: "dunSubject",
+          key: "dunSubject"
           // render: text => {
           //   return getjiedian(text);
           // }
         },
         {
+          title: "催款状态",
+          dataIndex: "dunStatus",
+          key: "dunStatus"
+        },
+        {
           title: "催收启动时间",
           dataIndex: "startDate",
           key: "startDate"
@@ -1250,7 +1255,8 @@ const ShouKuang = React.createClass({
               taskName: thisdata.taskName,
               hours: thisdata.hours,
               taskDistributionTime: thisdata.taskDistributionTime,
-              taskEndTime: thisdata.taskEndTime
+              taskEndTime: thisdata.taskEndTime,
+              dunStatus: thisdata.dunStatus == 0 ? "未触发" : "已触发"
             });
           }
         }
@@ -2030,6 +2036,7 @@ const ShouKuang = React.createClass({
               <Table
                 columns={this.state.cuiColumns}
                 dataSource={this.state.cuiDataList}
+                scroll={{ x: "max-content", y: 0 }}
                 pagination={false}
                 bordered
                 size="small"

+ 16 - 4
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -367,12 +367,17 @@ const ShouKuang = React.createClass({
         {
           title: "催收科目",
           dataIndex: "dunSubject",
-          key: "dunSubject",
+          key: "dunSubject"
           // render: text => {
           //   return getjiedian(text);
           // }
         },
         {
+          title: "催款状态",
+          dataIndex: "dunStatus",
+          key: "dunStatus"
+        },
+        {
           title: "催收启动时间",
           dataIndex: "startDate",
           key: "startDate"
@@ -1231,7 +1236,6 @@ const ShouKuang = React.createClass({
       url: globalConfig.context + "/api/admin/newOrder/dunOrderNewList",
       data: {
         orderNo: this.state.selectedRowKeys[0],
-        newStatus: 1,
         pageSize: 9999
       },
       success: function(data) {
@@ -1266,7 +1270,8 @@ const ShouKuang = React.createClass({
               taskName: thisdata.taskName,
               hours: thisdata.hours,
               taskDistributionTime: thisdata.taskDistributionTime,
-              taskEndTime: thisdata.taskEndTime
+              taskEndTime: thisdata.taskEndTime,
+              dunStatus: thisdata.dunStatus == 0 ? "未触发" : "已触发"
             });
           }
         }
@@ -2101,6 +2106,7 @@ const ShouKuang = React.createClass({
               <Table
                 columns={this.state.cuiColumns}
                 dataSource={this.state.cuiDataList}
+                scroll={{ x: "max-content", y: 0 }}
                 pagination={false}
                 bordered
                 size="small"
@@ -2141,7 +2147,13 @@ const ShouKuang = React.createClass({
           }}
         >
           <Spin spinning={this.state.loading}>
-            <Project record={this.state.record} visible={this.state.pvisible} cancel={() => { this.setState({ pvisible: false }) }} />
+            <Project
+              record={this.state.record}
+              visible={this.state.pvisible}
+              cancel={() => {
+                this.setState({ pvisible: false });
+              }}
+            />
             <div
               className="patent-table"
               style={

+ 2 - 0
js/component/manageCenter/order/orderNew/addService.jsx

@@ -2923,6 +2923,8 @@ const NewService = Form.create()(
                                   columns={this.state.ContactsLists}
                                   dataSource={this.state.contactList}
                                   scroll={{ x: "max-content", y: 0 }}
+                                  bordered
+                                  size="small"
                                 />
                                 <Col
                                   span={24}

+ 15 - 11
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -551,12 +551,27 @@ class OrderDetail extends Component {
           </FormItem>
         </div>
         <div>
+          <span style={{ marginLeft: "50px", fontSize: "20px" }}>项目业务</span>
+        </div>
+        <div className="patent-table">
+          <Table
+            columns={this.state.columnsX}
+            pagination={false}
+            dataSource={this.props.dataSourceX}
+            onRowClick={this.tableRowClickX}
+            bordered
+            size="small"
+          />
+        </div>
+        <div>
           <span style={{ marginLeft: "50px", fontSize: "20px" }}>催款节点</span>
         </div>
         <div className="clearfix">
           <Form layout="horizontal" id="demand-form">
             <Table
               pagination={false}
+              bordered
+              size="small"
               // columns={this.state.ContactsLists}
               columns={
                 propsList.length
@@ -572,17 +587,6 @@ class OrderDetail extends Component {
             <Col span={24} offset={9} style={{ marginTop: "15px" }}></Col>
           </Form>
         </div>
-        <div>
-          <span style={{ marginLeft: "50px", fontSize: "20px" }}>项目业务</span>
-        </div>
-        <div className="patent-table">
-          <Table
-            columns={this.state.columnsX}
-            pagination={false}
-            dataSource={this.props.dataSourceX}
-            onRowClick={this.tableRowClickX}
-          />
-        </div>
         <Modal
           maskClosable={false}
           visible={this.state.visible}

+ 18 - 14
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -1107,6 +1107,22 @@ const IntentionCustomer = Form.create()(
                     </div>
                     <div>
                       <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                        项目业务
+                      </span>
+                    </div>
+                    <div className="patent-table">
+                      <Spin spinning={this.state.loading}>
+                        <Table
+                          columns={this.state.columnsX}
+                          dataSource={this.state.dataSourceX}
+                          pagination={this.state.paginations}
+                          bordered
+                          size="small"
+                        />
+                      </Spin>
+                    </div>
+                    <div>
+                      <span style={{ marginLeft: "50px", fontSize: "20px" }}>
                         催款节点
                       </span>
                     </div>
@@ -1115,6 +1131,8 @@ const IntentionCustomer = Form.create()(
                         <Form layout="horizontal" id="demand-form">
                           <Table
                             pagination={false}
+                            bordered
+                            size="small"
                             // columns={this.state.ContactsLists}
                             // dataSource={this.state.contactList}
                             columns={
@@ -1136,20 +1154,6 @@ const IntentionCustomer = Form.create()(
                         </Form>
                       </Spin>
                     </div>
-                    <div>
-                      <span style={{ marginLeft: "50px", fontSize: "20px" }}>
-                        项目业务
-                      </span>
-                    </div>
-                    <div className="patent-table">
-                      <Spin spinning={this.state.loading}>
-                        <Table
-                          columns={this.state.columnsX}
-                          dataSource={this.state.dataSourceX}
-                          pagination={this.state.paginations}
-                        />
-                      </Spin>
-                    </div>
                   </div>
                 </Spin>
               </Form>

+ 32 - 26
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -1081,68 +1081,72 @@ const checkOutsourcing = Form.create()(React.createClass({
                       </div>
                       <div>
                         <span style={{ marginLeft: "50px", fontSize: "20px" }}>
-                          催款节点
+                          项目业务
                         </span>
                         {this.state.processStatus == 0 ? (
                           <Button
                             type="primary"
-                            onClick={this.addcontact}
+                            onClick={this.addDetailed}
                             style={{
                               float: "right",
                               marginRight: "50px",
                               marginBottom: "15px"
                             }}
                           >
-                            添加催款节点
+                            添加项目明细
                           </Button>
                         ) : (
                           ""
                         )}
                       </div>
-                      <div className="clearfix">
+                      <div className="patent-table">
                         <Spin spinning={this.state.loading}>
-                          <Form layout="horizontal" id="demand-form">
-                            <Table
-                              pagination={false}
-                              columns={this.state.ContactsLists}
-                              dataSource={this.state.contactList}
-                            />
-                            <Col
-                              span={24}
-                              offset={9}
-                              style={{ marginTop: "15px" }}
-                            ></Col>
-                          </Form>
+                          <Table
+                            columns={this.state.columnsX}
+                            dataSource={this.state.dataSourceX}
+                            pagination={this.state.paginations}
+                            onRowClick={this.tableRowClickX}
+                            bordered
+                            size="small"
+                          />
                         </Spin>
                       </div>
                       <div>
                         <span style={{ marginLeft: "50px", fontSize: "20px" }}>
-                          项目业务
+                          催款节点
                         </span>
                         {this.state.processStatus == 0 ? (
                           <Button
                             type="primary"
-                            onClick={this.addDetailed}
+                            onClick={this.addcontact}
                             style={{
                               float: "right",
                               marginRight: "50px",
                               marginBottom: "15px"
                             }}
                           >
-                            添加项目明细
+                            添加催款节点
                           </Button>
                         ) : (
                           ""
                         )}
                       </div>
-                      <div className="patent-table">
+                      <div className="clearfix">
                         <Spin spinning={this.state.loading}>
-                          <Table
-                            columns={this.state.columnsX}
-                            dataSource={this.state.dataSourceX}
-                            pagination={this.state.paginations}
-                            onRowClick={this.tableRowClickX}
-                          />
+                          <Form layout="horizontal" id="demand-form">
+                            <Table
+                              pagination={false}
+                              columns={this.state.ContactsLists}
+                              dataSource={this.state.contactList}
+                              bordered
+                              size="small"
+                            />
+                            <Col
+                              span={24}
+                              offset={9}
+                              style={{ marginTop: "15px" }}
+                            ></Col>
+                          </Form>
                         </Spin>
                       </div>
                     </div>
@@ -1455,6 +1459,8 @@ const checkOutsourcing = Form.create()(React.createClass({
                   columns={this.state.columnsrizhi}
                   dataSource={this.state.dataSourcerizhi}
                   pagination={false}
+                  bordered
+                  size="small"
                 />
               </Spin>
             </div>

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

@@ -1428,6 +1428,40 @@ const IntentionCustomer = Form.create()(
                           <span
                             style={{ marginLeft: "50px", fontSize: "20px" }}
                           >
+                            项目业务
+                          </span>
+                          {this.state.processStatus == 0 ? (
+                            <Button
+                              type="primary"
+                              onClick={this.addDetailed}
+                              style={{
+                                float: "right",
+                                marginRight: "50px",
+                                marginBottom: "15px"
+                              }}
+                            >
+                              添加项目明细
+                            </Button>
+                          ) : (
+                            ""
+                          )}
+                        </div>
+                        <div className="patent-table">
+                          <Spin spinning={this.state.loading}>
+                            <Table
+                              columns={this.state.columnsX}
+                              dataSource={this.state.dataSourceX}
+                              pagination={this.state.paginations}
+                              onRowClick={this.tableRowClickX}
+                              bordered
+                              size="small"
+                            />
+                          </Spin>
+                        </div>
+                        <div>
+                          <span
+                            style={{ marginLeft: "50px", fontSize: "20px" }}
+                          >
                             催款节点
                           </span>
                           {this.state.processStatus == 0 ? (
@@ -1472,40 +1506,6 @@ const IntentionCustomer = Form.create()(
                             </Form>
                           </Spin>
                         </div>
-                        <div>
-                          <span
-                            style={{ marginLeft: "50px", fontSize: "20px" }}
-                          >
-                            项目业务
-                          </span>
-                          {this.state.processStatus == 0 ? (
-                            <Button
-                              type="primary"
-                              onClick={this.addDetailed}
-                              style={{
-                                float: "right",
-                                marginRight: "50px",
-                                marginBottom: "15px"
-                              }}
-                            >
-                              添加项目明细
-                            </Button>
-                          ) : (
-                            ""
-                          )}
-                        </div>
-                        <div className="patent-table">
-                          <Spin spinning={this.state.loading}>
-                            <Table
-                              columns={this.state.columnsX}
-                              dataSource={this.state.dataSourceX}
-                              pagination={this.state.paginations}
-                              onRowClick={this.tableRowClickX}
-                              bordered
-                              size="small"
-                            />
-                          </Spin>
-                        </div>
                         <div className="addSave" style={{ marginTop: "15px" }}>
                           <Button
                             type="primary"

+ 19 - 15
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -1091,6 +1091,23 @@ const IntentionCustomer = Form.create()(
                     </div>
                     <div>
                       <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                        项目业务
+                      </span>
+                    </div>
+                    <div className="patent-table">
+                      <Spin spinning={this.state.loading}>
+                        <Table
+                          columns={this.state.columnsX}
+                          dataSource={this.state.dataSourceX}
+                          pagination={this.state.paginations}
+                          onRowClick={this.tableRowClickX}
+                          bordered
+                          size="small"
+                        />
+                      </Spin>
+                    </div>
+                    <div>
+                      <span style={{ marginLeft: "50px", fontSize: "20px" }}>
                         催款节点
                       </span>
                     </div>
@@ -1099,6 +1116,8 @@ const IntentionCustomer = Form.create()(
                         <Form layout="horizontal" id="demand-form">
                           <Table
                             pagination={false}
+                            bordered
+                            size="small"
                             columns={
                               cuiDataList.length
                                 ? this.state.ContactsLists
@@ -1118,21 +1137,6 @@ const IntentionCustomer = Form.create()(
                         </Form>
                       </Spin>
                     </div>
-                    <div>
-                      <span style={{ marginLeft: "50px", fontSize: "20px" }}>
-                        项目业务
-                      </span>
-                    </div>
-                    <div className="patent-table">
-                      <Spin spinning={this.state.loading}>
-                        <Table
-                          columns={this.state.columnsX}
-                          dataSource={this.state.dataSourceX}
-                          pagination={this.state.paginations}
-                          onRowClick={this.tableRowClickX}
-                        />
-                      </Spin>
-                    </div>
                   </div>
                 </Spin>
               </Form>

+ 38 - 32
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -1615,6 +1615,40 @@ const outsourcingList = Form.create()(
                             <span>{this.state.financeMobile}</span>
                           </FormItem>
                         </div>
+                        <div>
+                          <span
+                            style={{ marginLeft: "50px", fontSize: "20px" }}
+                          >
+                            项目业务
+                          </span>
+                          {this.state.processStatus == 0 ? (
+                            <Button
+                              type="primary"
+                              onClick={this.addDetailed}
+                              style={{
+                                float: "right",
+                                marginRight: "50px",
+                                marginBottom: "15px"
+                              }}
+                            >
+                              添加项目明细
+                            </Button>
+                          ) : (
+                            ""
+                          )}
+                        </div>
+                        <div className="patent-table">
+                          <Spin spinning={this.state.loading}>
+                            <Table
+                              columns={this.state.columnsX}
+                              dataSource={this.state.dataSourceX}
+                              pagination={this.state.paginations}
+                              onRowClick={this.tableRowClickX}
+                              bordered
+                              size="small"
+                            />
+                          </Spin>
+                        </div>
                         <div
                           style={{
                             display: cuiDataList.length ? "block" : "none"
@@ -1654,6 +1688,8 @@ const outsourcingList = Form.create()(
                                 pagination={false}
                                 columns={this.state.ContactsLists}
                                 dataSource={this.state.contactList}
+                                bordered
+                                size="small"
                                 scroll={{ x: "max-content", y: 0 }}
                               />
                               <Col
@@ -1703,6 +1739,8 @@ const outsourcingList = Form.create()(
                                 pagination={false}
                                 columns={this.state.ContactsListsNew}
                                 dataSource={this.state.contactListNew}
+                                bordered
+                                size="small"
                                 scroll={{ x: "max-content", y: 0 }}
                               />
                               <Col
@@ -1713,38 +1751,6 @@ const outsourcingList = Form.create()(
                             </Form>
                           </Spin>
                         </div>
-                        <div>
-                          <span
-                            style={{ marginLeft: "50px", fontSize: "20px" }}
-                          >
-                            项目业务
-                          </span>
-                          {this.state.processStatus == 0 ? (
-                            <Button
-                              type="primary"
-                              onClick={this.addDetailed}
-                              style={{
-                                float: "right",
-                                marginRight: "50px",
-                                marginBottom: "15px"
-                              }}
-                            >
-                              添加项目明细
-                            </Button>
-                          ) : (
-                            ""
-                          )}
-                        </div>
-                        <div className="patent-table">
-                          <Spin spinning={this.state.loading}>
-                            <Table
-                              columns={this.state.columnsX}
-                              dataSource={this.state.dataSourceX}
-                              pagination={this.state.paginations}
-                              onRowClick={this.tableRowClickX}
-                            />
-                          </Spin>
-                        </div>
                         {this.state.refundStatus === 2 ? (
                           <div
                             className="addSave"

+ 160 - 154
js/component/manageCenter/order/orderNew/press.jsx

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

+ 9 - 4
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -58,8 +58,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                         dunSubject:thisdata.dunSubject,//催收科目
 	                         startDate:thisdata.startDate,//催收启动时间
 							 depName:thisdata.depName,//部门名称
-							 contractNo:thisdata.contractNo
-	                        
+							 contractNo:thisdata.contractNo,
+	                        dunStatus: thisdata.dunStatus == 0 ? "未触发" : "已触发"
 						});
 					};
 				    this.state.pagination.total = data.data.totalCount;
@@ -223,12 +223,17 @@ const IntentionCustomer = Form.create()(React.createClass({
         {
           title: "催收科目",
           dataIndex: "dunSubject",
-          key: "dunSubject",
+          key: "dunSubject"
           // render: text => {
           //   return getjiedian(text);
           // }
         },
         {
+          title: "催款状态",
+          dataIndex: "dunStatus",
+          key: "dunStatus"
+        },
+        {
           title: "催款启动日期",
           dataIndex: "startDate",
           key: "startDate"
@@ -673,7 +678,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                     dataSource={this.state.dataSources}
                     rowSelection={rowSelection}
                     pagination={this.state.paginations}
-                    onRowClick={this.tableRowClick}
+                    // onRowClick={this.tableRowClick}
                   />
                 </Spin>
               </div>

+ 35 - 27
js/component/manageCenter/order/orderNew/reject.jsx

@@ -2153,6 +2153,34 @@ const IntentionCustomer = Form.create()(
                         <span>{this.state.reason}</span>
                       </FormItem>
                     </div>
+                    <div>
+                      <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                        项目业务
+                      </span>
+                      <Button
+                        type="primary"
+                        onClick={this.addDetailed}
+                        style={{
+                          float: "right",
+                          marginRight: "50px",
+                          marginBottom: "15px"
+                        }}
+                      >
+                        添加项目明细
+                      </Button>
+                    </div>
+                    <div className="patent-table">
+                      <Spin spinning={this.state.loading}>
+                        <Table
+                          columns={this.state.columnsX}
+                          dataSource={this.state.dataSourceX}
+                          pagination={this.state.paginations}
+                          onRowClick={this.tableRowClickX}
+                          bordered
+                          size="small"
+                        />
+                      </Spin>
+                    </div>
                     <div
                       style={{ display: cuiDataList.length ? "block" : "none" }}
                     >
@@ -2187,6 +2215,8 @@ const IntentionCustomer = Form.create()(
                             pagination={false}
                             columns={this.state.ContactsLists}
                             dataSource={this.state.contactList}
+                            bordered
+                            size="small"
                             scroll={{ x: "max-content", y: 0 }}
                           />
                           <Col
@@ -2203,7 +2233,11 @@ const IntentionCustomer = Form.create()(
                       </span>
                       <Button
                         type="primary"
-                        disabled={cuiDataList.length || this.state.addFlag ? true : false}
+                        disabled={
+                          cuiDataList.length || this.state.addFlag
+                            ? true
+                            : false
+                        }
                         // onClick={this.addcontact}
                         onClick={e => {
                           this.setState({ addFlag: true });
@@ -2237,32 +2271,6 @@ const IntentionCustomer = Form.create()(
                         </Form>
                       </Spin>
                     </div>
-                    <div>
-                      <span style={{ marginLeft: "50px", fontSize: "20px" }}>
-                        项目业务
-                      </span>
-                      <Button
-                        type="primary"
-                        onClick={this.addDetailed}
-                        style={{
-                          float: "right",
-                          marginRight: "50px",
-                          marginBottom: "15px"
-                        }}
-                      >
-                        添加项目明细
-                      </Button>
-                    </div>
-                    <div className="patent-table">
-                      <Spin spinning={this.state.loading}>
-                        <Table
-                          columns={this.state.columnsX}
-                          dataSource={this.state.dataSourceX}
-                          pagination={this.state.paginations}
-                          onRowClick={this.tableRowClickX}
-                        />
-                      </Spin>
-                    </div>
                     <div className="addSave" style={{ marginTop: "15px" }}>
                       <Button
                         className="cancel"

+ 1 - 1
package.json

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