mentoswzq 5 years ago
parent
commit
af6d7fe01a

File diff suppressed because it is too large
+ 442 - 267
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx


File diff suppressed because it is too large
+ 340 - 168
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx


+ 256 - 84
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -336,7 +336,106 @@ const ShouKuang = React.createClass({
           key: "outsourcePrice",
         },
       ],
-
+      qianColumns: [
+        {
+          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: "orderArrears",
+          key: "orderArrears",
+        },
+        {
+          title: "催收科目",
+          dataIndex: "type",
+          key: "type",
+          render: text => {
+            return "按时触发应收欠款"
+          }
+        },
+        {
+          title: "催款状态",
+          dataIndex: "dunStatus",
+          key: "dunStatus",
+          render: (text) => {
+            if (text == 0) {
+              return "未启动";
+            } else if (text == 1) {
+              return "催款中";
+            } else if (text == 2) {
+              return "已完成";
+            } else if (text == 3) {
+              return "已停止";
+            }
+          },
+        },
+        {
+          title: "催收启动时间",
+          dataIndex: "startDate",
+          key: "startDate",
+        },
+      ],
       cuiColumns: [
         {
           title: "序号",
@@ -1518,6 +1617,47 @@ const ShouKuang = React.createClass({
       }.bind(this)
     );
   },
+  cuiTabChange(index) {
+    if(index == 2) {
+      this.setState({
+        loading: true
+      })
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + "/api/admin/newOrder/arrearsDunList",
+        data: {
+          orderNo: this.state.selectedRowKeys[0],
+          pageSize: 9999,
+        },
+        success: function (data) {
+          let theArr = [];
+          if (data.error.length || 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];
+              let obj = thisdata;
+              obj.key = i;
+              theArr.push(obj);
+            }
+          }
+          this.setState({
+            qianDataList: theArr,
+          });
+        }.bind(this),
+      }).always(
+        function () {
+          this.setState({
+            loading: false,
+          });
+        }.bind(this)
+      );
+    }
+  },
   proData() {
     this.setState({
       loading: true
@@ -1692,14 +1832,14 @@ const ShouKuang = React.createClass({
               <Input
                 placeholder="订单编号"
                 value={this.state.orderNoSearch}
-                onChange={e => {
+                onChange={(e) => {
                   this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
                 placeholder="客户名称"
                 value={this.state.nameSearch}
-                onChange={e => {
+                onChange={(e) => {
                   this.setState({ nameSearch: e.target.value });
                 }}
               />
@@ -1707,11 +1847,11 @@ const ShouKuang = React.createClass({
                 placeholder="订单部门"
                 style={{ width: 120, marginRight: 10 }}
                 value={this.state.departmenttList}
-                onChange={e => {
+                onChange={(e) => {
                   this.setState({ departmenttList: e });
                 }}
               >
-                {departmentArr.map(function(item) {
+                {departmentArr.map(function (item) {
                   return (
                     <Select.Option key={item.id}>{item.name}</Select.Option>
                   );
@@ -1720,15 +1860,15 @@ const ShouKuang = React.createClass({
               <Input
                 placeholder="合同编号"
                 value={this.state.contractNoSearch}
-                onChange={e => {
+                onChange={(e) => {
                   this.setState({
-                    contractNoSearch: e.target.value
+                    contractNoSearch: e.target.value,
                   });
                 }}
               />
               <Select
                 placeholder="流程状态"
-                onChange={e => {
+                onChange={(e) => {
                   this.setState({ processStatusSearch: e });
                 }}
                 style={{ width: 120, marginRight: 5 }}
@@ -1740,7 +1880,7 @@ const ShouKuang = React.createClass({
               </Select>
               <Select
                 placeholder="结算状态"
-                onChange={e => {
+                onChange={(e) => {
                   this.setState({ liquidationStatus: e });
                 }}
                 style={{ width: 120, marginRight: 5 }}
@@ -1754,9 +1894,9 @@ const ShouKuang = React.createClass({
                 style={{ width: 120 }}
                 placeholder="签单金额"
                 value={this.state.amountStatus}
-                onChange={e => {
+                onChange={(e) => {
                   this.setState({
-                    amountStatus: e
+                    amountStatus: e,
                   });
                 }}
               >
@@ -1774,7 +1914,7 @@ const ShouKuang = React.createClass({
                     : null,
                   this.state.releaseDate[1]
                     ? moment(this.state.releaseDate[1])
-                    : null
+                    : null,
                 ]}
                 onChange={(data, dataString) => {
                   this.setState({ releaseDate: dataString });
@@ -1788,7 +1928,7 @@ const ShouKuang = React.createClass({
                     : null,
                   this.state.shouKuanDate[1]
                     ? moment(this.state.shouKuanDate[1])
-                    : null
+                    : null,
                 ]}
                 onChange={(data, dataString) => {
                   this.setState({ shouKuanDate: dataString });
@@ -1821,7 +1961,7 @@ const ShouKuang = React.createClass({
               onClick={() => {
                 this.inRecordData();
                 this.setState({
-                  bvisible: true
+                  bvisible: true,
                 });
               }}
             >
@@ -1834,7 +1974,7 @@ const ShouKuang = React.createClass({
               onClick={() => {
                 this.waterData();
                 this.setState({
-                  cvisible: true
+                  cvisible: true,
                 });
               }}
             >
@@ -1847,7 +1987,7 @@ const ShouKuang = React.createClass({
               onClick={() => {
                 this.timeData();
                 this.setState({
-                  timeVisible: true
+                  timeVisible: true,
                 });
               }}
             >
@@ -1860,7 +2000,7 @@ const ShouKuang = React.createClass({
               onClick={() => {
                 this.cuiData();
                 this.setState({
-                  cuiVisible: true
+                  cuiVisible: true,
                 });
               }}
             >
@@ -1873,7 +2013,7 @@ const ShouKuang = React.createClass({
               onClick={() => {
                 this.proData();
                 this.setState({
-                  proVisible: true
+                  proVisible: true,
                 });
               }}
             >
@@ -1937,7 +2077,7 @@ const ShouKuang = React.createClass({
               onClick={() => {
                 this.inRecordData();
                 this.setState({
-                  bvisible: true
+                  bvisible: true,
                 });
               }}
             >
@@ -1950,7 +2090,7 @@ const ShouKuang = React.createClass({
               onClick={() => {
                 this.waterData();
                 this.setState({
-                  cvisible: true
+                  cvisible: true,
                 });
               }}
             >
@@ -1963,7 +2103,7 @@ const ShouKuang = React.createClass({
               onClick={() => {
                 this.timeData();
                 this.setState({
-                  timeVisible: true
+                  timeVisible: true,
                 });
               }}
             >
@@ -1976,7 +2116,7 @@ const ShouKuang = React.createClass({
               onClick={() => {
                 this.cuiData();
                 this.setState({
-                  cuiVisible: true
+                  cuiVisible: true,
                 });
               }}
             >
@@ -1989,7 +2129,7 @@ const ShouKuang = React.createClass({
               onClick={() => {
                 this.proData();
                 this.setState({
-                  proVisible: true
+                  proVisible: true,
                 });
               }}
             >
@@ -2092,7 +2232,7 @@ const ShouKuang = React.createClass({
                   rows={4}
                   placeholder="请输入驳回原因"
                   value={this.state.content}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({ content: e.target.value });
                   }}
                 />
@@ -2129,7 +2269,7 @@ const ShouKuang = React.createClass({
           <Spin spinning={this.state.loading}>
             <div
               className="patent-table"
-              ref={e => {
+              ref={(e) => {
                 this.refs.kaiPiao = e;
               }}
             >
@@ -2158,7 +2298,7 @@ const ShouKuang = React.createClass({
                       // marginTop: 10,
                       position: "absolute",
                       top: -54,
-                      right: 30
+                      right: 30,
                     }}
                   >
                     打印
@@ -2180,7 +2320,7 @@ const ShouKuang = React.createClass({
           <Spin spinning={this.state.loading}>
             <div
               className="patent-table"
-              ref={e => {
+              ref={(e) => {
                 this.refs.shouKuan = e;
               }}
             >
@@ -2209,7 +2349,7 @@ const ShouKuang = React.createClass({
                       float: "right",
                       position: "absolute",
                       top: -54,
-                      right: 30
+                      right: 30,
                     }}
                   >
                     打印
@@ -2230,7 +2370,7 @@ const ShouKuang = React.createClass({
           onCancel={() => {
             this.loadData();
             this.setState({
-              dvisible: false
+              dvisible: false,
             });
           }}
         >
@@ -2242,9 +2382,9 @@ const ShouKuang = React.createClass({
                 // position: "relative",
                 // left: "50%",
                 // transform: "translate(-50%)",
-                padding: "25px 0 30px 30px"
+                padding: "25px 0 30px 30px",
               }}
-              ref={e => {
+              ref={(e) => {
                 this.refs.all = e;
               }}
             >
@@ -2267,7 +2407,7 @@ const ShouKuang = React.createClass({
                   marginTop: 10,
                   position: "absolute",
                   top: 0,
-                  right: 30
+                  right: 30,
                 }}
               >
                 打印
@@ -2286,7 +2426,7 @@ const ShouKuang = React.createClass({
           onCancel={() => {
             this.loadData();
             this.setState({
-              timeVisible: false
+              timeVisible: false,
             });
           }}
         >
@@ -2309,7 +2449,7 @@ const ShouKuang = React.createClass({
                   // padding: "25px 0 30px 30px"
                 }
               }
-              ref={e => {
+              ref={(e) => {
                 this.refs.all = e;
               }}
             >
@@ -2334,7 +2474,7 @@ const ShouKuang = React.createClass({
                   marginTop: 10,
                   position: "absolute",
                   top: 0,
-                  right: 30
+                  right: 30,
                 }}
               >
                 打印
@@ -2353,54 +2493,86 @@ const ShouKuang = React.createClass({
           onCancel={() => {
             this.loadData();
             this.setState({
-              cuiVisible: false
+              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}
-                scroll={{ x: "max-content", y: 0 }}
-                pagination={false}
-                bordered
-                size="small"
-              />
-            </div>
-          </Spin>
+          <Tabs defaultActiveKey="1" onChange={this.cuiTabChange}>
+            <TabPane tab="催款节点" key="1">
+              <Spin spinning={this.state.loading}>
+                <div
+                  className="patent-table"
+                  ref={(e) => {
+                    this.refs.all = e;
+                  }}
+                >
+                  <Table
+                    columns={this.state.cuiColumns}
+                    dataSource={this.state.cuiDataList}
+                    scroll={{ x: "max-content", y: 0 }}
+                    pagination={false}
+                    bordered
+                    size="small"
+                  />
+                </div>
 
-          <ReactToPrint
-            trigger={() => (
-              <Button
-                type="primary"
-                style={{
-                  float: "right",
-                  marginTop: 10,
-                  position: "absolute",
-                  top: 0,
-                  right: 30
-                }}
-              >
-                打印
-              </Button>
-            )}
-            content={() => this.refs.all}
-          />
+                <ReactToPrint
+                  trigger={() => (
+                    <Button
+                      type="primary"
+                      style={{
+                        float: "right",
+                        marginTop: 10,
+                        position: "absolute",
+                        top: "-60px",
+                        right: 30,
+                      }}
+                    >
+                      打印
+                    </Button>
+                  )}
+                  content={() => this.refs.all}
+                />
+              </Spin>
+            </TabPane>
+            <TabPane tab="欠款催收记录" key="2">
+              <Spin spinning={this.state.loading}>
+                <div
+                  className="patent-table"
+                  ref={(e) => {
+                    this.refs.all = e;
+                  }}
+                >
+                  <Table
+                    columns={this.state.qianColumns}
+                    dataSource={this.state.qianDataList}
+                    scroll={{ x: "max-content", y: 0 }}
+                    pagination={false}
+                    bordered
+                    size="small"
+                  />
+                </div>
+
+                <ReactToPrint
+                  trigger={() => (
+                    <Button
+                      type="primary"
+                      style={{
+                        float: "right",
+                        marginTop: 10,
+                        position: "absolute",
+                        top: "-60px",
+                        right: 30,
+                      }}
+                    >
+                      打印
+                    </Button>
+                  )}
+                  content={() => this.refs.all}
+                />
+              </Spin>
+            </TabPane>
+          </Tabs>
         </Modal>
         <Modal
           visible={this.state.proVisible}
@@ -2412,7 +2584,7 @@ const ShouKuang = React.createClass({
           onCancel={() => {
             this.loadData();
             this.setState({
-              proVisible: false
+              proVisible: false,
             });
           }}
         >
@@ -2435,7 +2607,7 @@ const ShouKuang = React.createClass({
                   // padding: "25px 0 30px 30px"
                 }
               }
-              ref={e => {
+              ref={(e) => {
                 this.refs.all = e;
               }}
             >
@@ -2463,7 +2635,7 @@ const ShouKuang = React.createClass({
                   marginTop: 10,
                   position: "absolute",
                   top: 0,
-                  right: 30
+                  right: 30,
                 }}
               >
                 打印
@@ -2482,7 +2654,7 @@ const ShouKuang = React.createClass({
               this.loadData();
               this.setState({
                 checkVisible: false,
-                checkData: ""
+                checkData: "",
               });
             }}
           >
@@ -2490,7 +2662,7 @@ const ShouKuang = React.createClass({
               value={this.state.checkData}
               onChange={(e, recard) => {
                 this.setState({
-                  checkData: e.target.value
+                  checkData: e.target.value,
                 });
               }}
               placeholder="请填写审核内容"

+ 40 - 36
js/component/manageCenter/order/content.jsx

@@ -38,7 +38,7 @@ class Content extends Component {
           const MyService = require("./myOrder/servicesOrder/myService")
             .default;
           this.setState({
-            component: <MyService />
+            component: <MyService />,
           });
         });
         break;
@@ -47,7 +47,7 @@ class Content extends Component {
         require.ensure([], () => {
           const PressList = require("./orderNew/pressList").default;
           this.setState({
-            component: <PressList />
+            component: <PressList />,
           });
         });
         break;
@@ -56,7 +56,7 @@ class Content extends Component {
         require.ensure([], () => {
           const Billing = require("./orderNew/billing").default;
           this.setState({
-            component: <Billing />
+            component: <Billing />,
           });
         });
         break;
@@ -65,27 +65,25 @@ class Content extends Component {
         require.ensure([], () => {
           const Examine = require("./orderNew/examine").default;
           this.setState({
-            component: <Examine />
+            component: <Examine />,
           });
         });
         break;
       //外包审核列表
       case "outsourcingList":
         require.ensure([], () => {
-          const OutsourcingList = require("./orderNew/outsourcingList")
-            .default;
+          const OutsourcingList = require("./orderNew/outsourcingList").default;
           this.setState({
-            component: <OutsourcingList />
+            component: <OutsourcingList />,
           });
         });
         break;
       //外包项目审核列表
       case "outsourcingPro":
         require.ensure([], () => {
-          const OutsourcingPro = require("./orderNew/OutsourcingPro")
-            .default;
+          const OutsourcingPro = require("./orderNew/OutsourcingPro").default;
           this.setState({
-            component: <OutsourcingPro />
+            component: <OutsourcingPro />,
           });
         });
         break;
@@ -95,7 +93,7 @@ class Content extends Component {
           const CheckOutsourcing = require("./orderNew/checkOutsourcing")
             .default;
           this.setState({
-            component: <CheckOutsourcing />
+            component: <CheckOutsourcing />,
           });
         });
         break;
@@ -104,17 +102,16 @@ class Content extends Component {
         require.ensure([], () => {
           const Reject = require("./orderNew/reject").default;
           this.setState({
-            component: <Reject />
+            component: <Reject />,
           });
         });
         break;
       //退单管理新
       case "chargeback":
         require.ensure([], () => {
-          const Chargeback = require("./orderNew/chargeback")
-            .default;
+          const Chargeback = require("./orderNew/chargeback").default;
           this.setState({
-            component: <Chargeback />
+            component: <Chargeback />,
           });
         });
         break;
@@ -123,7 +120,7 @@ class Content extends Component {
         require.ensure([], () => {
           const Approveds = require("./orderNew/approveds").default;
           this.setState({
-            component: <Approveds />
+            component: <Approveds />,
           });
         });
         break;
@@ -133,7 +130,7 @@ class Content extends Component {
           const ContractChangeYxy = require("./orderNew/contractChangeYxy")
             .default;
           this.setState({
-            component: <ContractChangeYxy />
+            component: <ContractChangeYxy />,
           });
         });
         break;
@@ -143,7 +140,7 @@ class Content extends Component {
           const ContractChangeYxgly = require("./orderNew/contractChangeYxgly")
             .default;
           this.setState({
-            component: <ContractChangeYxgly />
+            component: <ContractChangeYxgly />,
           });
         });
         break;
@@ -153,7 +150,7 @@ class Content extends Component {
           const ContractChangeZc = require("./orderNew/contractChangeZc")
             .default;
           this.setState({
-            component: <ContractChangeZc />
+            component: <ContractChangeZc />,
           });
         });
         break;
@@ -163,7 +160,7 @@ class Content extends Component {
           const ContractChangeDsz = require("./orderNew/contractChangeDsz")
             .default;
           this.setState({
-            component: <ContractChangeDsz />
+            component: <ContractChangeDsz />,
           });
         });
         break;
@@ -172,7 +169,7 @@ class Content extends Component {
         require.ensure([], () => {
           const Inquiry = require("./orderNew/inquiry").default;
           this.setState({
-            component: <Inquiry />
+            component: <Inquiry />,
           });
         });
         break;
@@ -181,7 +178,15 @@ class Content extends Component {
         require.ensure([], () => {
           const Press = require("./orderNew/press").default;
           this.setState({
-            component: <Press />
+            component: <Press />,
+          });
+        });
+        break;
+      case "arrearsList":
+        require.ensure([], () => {
+          const ArrearsList = require("./orderNew/arrearsList").default;
+          this.setState({
+            component: <ArrearsList />,
           });
         });
         break;
@@ -190,7 +195,7 @@ class Content extends Component {
           const OrderStatistics = require("./orderStatistics/orderStatistics")
             .default;
           this.setState({
-            component: <OrderStatistics />
+            component: <OrderStatistics />,
           });
         });
         break;
@@ -199,7 +204,7 @@ class Content extends Component {
           const ServiceManage = require("./departmentOrder/servicesOrder/serviceManage")
             .default;
           this.setState({
-            component: <ServiceManage />
+            component: <ServiceManage />,
           });
         });
         break;
@@ -208,7 +213,7 @@ class Content extends Component {
           const PublicOrder = require("./orderManagement/publicOrder/publicOrder")
             .default;
           this.setState({
-            component: <PublicOrder />
+            component: <PublicOrder />,
           });
         });
         break;
@@ -217,7 +222,7 @@ class Content extends Component {
           const ApproveOrder = require("./orderManagement/approveOrder/approveOrder")
             .default;
           this.setState({
-            component: <ApproveOrder />
+            component: <ApproveOrder />,
           });
         });
         break;
@@ -226,7 +231,7 @@ class Content extends Component {
           const MySettlement = require("./settlementOrder/mySettlement/mySettlement")
             .default;
           this.setState({
-            component: <MySettlement />
+            component: <MySettlement />,
           });
         });
         break;
@@ -235,16 +240,15 @@ class Content extends Component {
           const SettlementManage = require("./settlementOrder/settlementManage/settlementManagement")
             .default;
           this.setState({
-            component: <SettlementManage />
+            component: <SettlementManage />,
           });
         });
         break;
       case "myBill":
         require.ensure([], () => {
-          const MyBill = require("./flowSettlement/myBill/myBill.jsx")
-            .default;
+          const MyBill = require("./flowSettlement/myBill/myBill.jsx").default;
           this.setState({
-            component: <MyBill />
+            component: <MyBill />,
           });
         });
         break;
@@ -253,7 +257,7 @@ class Content extends Component {
           const MyBill = require("./flowSettlement/billManage/myBill.jsx")
             .default;
           this.setState({
-            component: <MyBill />
+            component: <MyBill />,
           });
         });
         break;
@@ -262,7 +266,7 @@ class Content extends Component {
           const MyBill = require("./flowSettlement/billQuery/myBill.jsx")
             .default;
           this.setState({
-            component: <MyBill />
+            component: <MyBill />,
           });
         });
         break;
@@ -271,7 +275,7 @@ class Content extends Component {
           const MyBill = require("./flowSettlement/billManagement/myBill.jsx")
             .default;
           this.setState({
-            component: <MyBill />
+            component: <MyBill />,
           });
         });
         break;
@@ -280,7 +284,7 @@ class Content extends Component {
         require.ensure([], () => {
           const MyBill = require("./bonus/yxBonus.jsx").default;
           this.setState({
-            component: <MyBill />
+            component: <MyBill />,
           });
         });
         break;
@@ -289,7 +293,7 @@ class Content extends Component {
         require.ensure([], () => {
           const Module = require("../module").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
     };

+ 196 - 38
js/component/manageCenter/order/orderNew/addService.jsx

@@ -22,6 +22,8 @@ import "../billing.less";
 import moment from "moment";
 import Picture from "@/manageCenter/publicComponent/picture";
 import ResolutionDetail from "@/resolutionDetail";
+import quxiao from "../../../../../image/quxiao.png";
+import tongguo from "../../../../../image/tongguo.png";
 
 import OrderRiZi from "@/orderRiZi.jsx";
 import {
@@ -159,6 +161,7 @@ const NewService = Form.create()(
         startRemarks: "",
         remarksC: "",
         loading: false,
+        logData: [],
         visible: false,
         cuiDataSource: [],
         status: 4,
@@ -2291,7 +2294,9 @@ const NewService = Form.create()(
                   remarksC: thisdata.remarks,
                   startRemarks: thisdata.zxsRemarks,
                   isCaoGao: true,
+                  arrears: thisdata.arrears,
                   changeFlag: true,
+                  createTimes: thisdata.createTimes,
                   voucherUrl: thisdata.voucherUrl
                     ? splitUrl(
                         thisdata.voucherUrl,
@@ -2301,7 +2306,7 @@ const NewService = Form.create()(
                       )
                     : [],
                   processState: thisdata.processState,
-                  status: thisdata.status
+                  status: thisdata.status,
                 });
                 this.proList();
                 this.cuiList();
@@ -2390,6 +2395,9 @@ const NewService = Form.create()(
           id: id || this.state.changeId
         },
         success: function(data) {
+          this.setState({
+            cuiDataSource: data.data,
+          });
           if (data.data && data.data.length) {
             if (id) {
               this.setState({
@@ -2449,6 +2457,37 @@ const NewService = Form.create()(
       });
     },
 
+    logList(id) {
+      this.setState({
+        loading: true
+      })
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        async: false,
+        crossDomain: false,
+        url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
+        data: {
+          changeId: id
+        },
+        success: function (data) {
+          if (data.error.length || data.data.list == "") {
+            if (data.error && data.error.length) {
+              message.warning(data.error[0].message);
+              this.setState({
+                loading: false,
+              });
+            }
+          } else {
+            this.setState({
+              logData: data.data,
+              loading: false
+            });
+          }
+        }.bind(this)
+      });
+    },
+    
     getOrgCodeUrl(e) {
       this.setState({ orgCodeUrl: e });
     },
@@ -3065,6 +3104,8 @@ const NewService = Form.create()(
               startRemarks: thisdata.zxsRemarks,
               processState: thisdata.processState,
               status: thisdata.status,
+              arrears: thisdata.arrears,
+              createTimes: thisdata.createTimes,
               voucherUrl: thisdata.voucherUrl
                 ? splitUrl(
                     thisdata.voucherUrl,
@@ -3072,10 +3113,11 @@ const NewService = Form.create()(
                     globalConfig.avatarHost + "/upload",
                     url
                   )
-                : []
+                : [],
             };
             this.proList(thisdata.id);
             this.cuiList(thisdata.id);
+            this.logList(thisdata.id)
             this.setState({
               //判断是否有合同变更记录
               isJilu: true,
@@ -3240,7 +3282,8 @@ const NewService = Form.create()(
           data: {
             id: index.id,
             type: 3,
-            tid: index.tid
+            tid: index.tid,
+            did: index.did
           }
         }).done(
           function(data) {
@@ -3588,22 +3631,25 @@ const NewService = Form.create()(
                     )}
                   </span>
                 );
-              }
+              },
             },
             {
               title: "业务项目名称",
               dataIndex: "commodityName",
-              key: "commodityName"
+              key: "commodityName",
+              render: (text, record) => {
+                return text + "-" + record.id;
+              },
             },
             {
               title: "项目类别",
               dataIndex: "cname",
-              key: "cname"
+              key: "cname",
             },
             {
               title: "项目数量",
               dataIndex: "commodityQuantity",
-              key: "commodityQuantity"
+              key: "commodityQuantity",
             },
             {
               title: "金额(万元)",
@@ -3615,28 +3661,28 @@ const NewService = Form.create()(
                 } else {
                   return text;
                 }
-              }
+              },
             },
             {
               title: "主要项目",
               dataIndex: "main",
               key: "main",
-              render: text => {
+              render: (text) => {
                 return text ? "是" : "否";
-              }
+              },
             },
             {
               title: "项目负责人",
               dataIndex: "receiverName",
-              key: "receiverName"
+              key: "receiverName",
             },
             {
               title: "项目说明",
               dataIndex: "taskComment",
               key: "taskComment",
-              render: text => {
+              render: (text) => {
                 return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
-              }
+              },
             },
             {
               title: "操作",
@@ -3646,21 +3692,21 @@ const NewService = Form.create()(
                 return (
                   <div>
                     <Button
-                      onClick={e => {
+                      onClick={(e) => {
                         e.stopPropagation();
                         this.showConfirm(this.changeDeletePro, record);
                       }}
                       disabled={this.state.listFlag}
                       style={{
-                        display: this.state.displayList ? "none" : "block"
+                        display: this.state.displayList ? "none" : "block",
                       }}
                     >
                       删除
                     </Button>
                   </div>
                 );
-              }
-            }
+              },
+            },
           ];
           return (
             <Table
@@ -4883,6 +4929,7 @@ const NewService = Form.create()(
                                 >
                                   重置
                                 </Button>
+                                {/* <Button type="danger" >取消本次变更</Button> */}
                               </FormItem>
                             </div>
                             <div className="clearfix">
@@ -5188,6 +5235,42 @@ const NewService = Form.create()(
                       {this.state.isJilu ? (
                         <TabPane tab={"最近变更记录"} key="3">
                           <div>
+                            <div
+                              style={{
+                                borderRadius: "50%",
+                                width: 300,
+                                height: 300,
+                                position: "absolute",
+                                top: 230,
+                                left: 525,
+                                transform: "rotate(-5deg)",
+                                zIndex: 1,
+                                display:
+                                  this.state.detailChange.status == 4
+                                    ? "block"
+                                    : "none",
+                              }}
+                            >
+                              <img src={tongguo} style={{ width: "100%" }} />
+                            </div>
+                            <div
+                              style={{
+                                borderRadius: "50%",
+                                width: 300,
+                                height: 300,
+                                position: "absolute",
+                                top: 284,
+                                left: 586,
+                                transform: "rotate(-5deg)",
+                                zIndex: 1,
+                                display:
+                                  this.state.detailChange.status == 5
+                                    ? "block"
+                                    : "none",
+                              }}
+                            >
+                              <img src={quxiao} style={{ width: "63%" }} />
+                            </div>
                             <div className="clearfix">
                               <FormItem
                                 className="half-item"
@@ -5196,45 +5279,66 @@ const NewService = Form.create()(
                               >
                                 <span>{this.state.userName}</span>
                               </FormItem>
+                              {/*  */}
                               <FormItem
                                 className="half-item"
                                 {...formItemLayout}
-                                label="当前进度"
+                                label="合同编号"
                               >
-                                <span>
-                                  {getProcessStatusNew(
-                                    this.state.detailChange.processState,
-                                    this.state.detailChange.status
-                                  )}
-                                </span>
+                                <span>{this.state.contractNo}</span>
                               </FormItem>
                             </div>
                             <div className="clearfix">
                               <FormItem
                                 className="half-item"
                                 {...formItemLayout}
-                                label="合同编号"
+                                label="时间"
                               >
-                                <span>{this.state.contractNo}</span>
+                                <span>
+                                  {this.state.detailChange.createTimes}
+                                </span>
+                              </FormItem>
+                              <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="申请人"
+                              >
+                                <span>{this.state.salesmanName}</span>
                               </FormItem>
                             </div>
                             <div className="clearfix">
                               <FormItem
                                 className="half-item"
                                 {...formItemLayout}
+                                label="当前进度"
+                              >
+                                <span>
+                                  {getProcessStatusNew(
+                                    this.state.detailChange.processState,
+                                    this.state.detailChange.status
+                                  )}
+                                </span>
+                              </FormItem>
+                              {/* <FormItem
+                                className="half-item"
+                                {...formItemLayout}
                                 label="申请变更部门"
                               >
                                 <span>{this.state.depName}</span>
-                              </FormItem>
+                              </FormItem> */}
                               <FormItem
-                                className="half-item"
                                 {...formItemLayout}
-                                label="申请人"
+                                className="half-item"
+                                label="变更类型"
                               >
-                                <span>{this.state.salesmanName}</span>
+                                <span>
+                                  {getChangeType(
+                                    this.state.detailChange.typeChange
+                                  )}
+                                </span>
                               </FormItem>
                             </div>
-                            <div className="clearfix">
+                            {/* <div className="clearfix">
                               <FormItem
                                 labelCol={{ span: 4 }}
                                 wrapperCol={{ span: 18 }}
@@ -5246,11 +5350,11 @@ const NewService = Form.create()(
                                   )}
                                 </span>
                               </FormItem>
-                            </div>
+                            </div> */}
                             <div className="clearfix">
                               <FormItem
-                                labelCol={{ span: 4 }}
-                                wrapperCol={{ span: 18 }}
+                                {...formItemLayout}
+                                className="half-item"
                                 label="合同额(万元)"
                               >
                                 <span>
@@ -5258,17 +5362,26 @@ const NewService = Form.create()(
                                 </span>
                               </FormItem>
                               <FormItem
-                                labelCol={{ span: 4 }}
-                                wrapperCol={{ span: 18 }}
+                                {...formItemLayout}
+                                className="half-item"
                                 label="已收款(万元)"
                               >
                                 <span>
                                   {this.state.detailChange.settlementAmount}
                                 </span>
                               </FormItem>
+                            </div>
+                            <div className="clearfix">
                               <FormItem
-                                labelCol={{ span: 4 }}
-                                wrapperCol={{ span: 18 }}
+                                {...formItemLayout}
+                                className="half-item"
+                                label="欠款(万元)"
+                              >
+                                <span>{this.state.detailChange.arrears}</span>
+                              </FormItem>
+                              <FormItem
+                                {...formItemLayout}
+                                className="half-item"
                                 label="申请退款(万元)"
                               >
                                 <span>
@@ -5406,6 +5519,51 @@ const NewService = Form.create()(
                                 </div>
                               </FormItem>
                             </div>
+                            <ul
+                              style={{
+                                width: "868px",
+                                overflow: "hidden",
+                                paddingLeft: "90px",
+                                paddingTop: "10px",
+                                position: "relative",
+                                bottom: "20px",
+                                fontSize: "12px",
+                                color: "rgba(0, 0, 0, 0.65)",
+                              }}
+                            >
+                              {/* <span>操作人:</span> */}
+                              {this.state.logData.map((item, index) => {
+                                if (item.status == 0) {
+                                  item.status = "发起";
+                                } else if (item.status == 1) {
+                                  item.status = "审核中";
+                                } else if (item.status == 2) {
+                                  item.status = "通过";
+                                } else if (item.status == 3) {
+                                  item.status = "驳回";
+                                } else if (item.status == 4) {
+                                  item.status = "完成";
+                                }
+                                return (
+                                  <li
+                                    key={index}
+                                    style={{
+                                      width: "100%",
+                                      height: "auto",
+                                      wordBreak: "break-all",
+                                      marginBottom: "10px",
+                                    }}
+                                  >
+                                    {item.aname +
+                                      ":" +
+                                      "(" +
+                                      item.status +
+                                      ")" +
+                                      item.remarks}
+                                  </li>
+                                );
+                              })}
+                            </ul>
                           </div>
                         </TabPane>
                       ) : (

+ 426 - 0
js/component/manageCenter/order/orderNew/arrearsList.jsx

@@ -0,0 +1,426 @@
+import React from "react";
+import {
+  Button,
+  Input,
+  Select,
+  Spin,
+  Table,
+  message,
+  DatePicker,
+  Form,
+  Modal,
+  Tabs,
+} from "antd";
+import $ from "jquery/src/ajax";
+import moment from "moment";
+import {
+  getLiquidationStatus,
+  getjiedian,
+  getNewOrderStatus,
+  getProjectStatus,
+} from "@/tools.js";
+import "./customer.less";
+
+const ArrearsList = Form.create()(
+  React.createClass({
+    loadData(pageNo) {
+      this.setState({
+        visitModul: false,
+        loading: true,
+        ispage: pageNo,
+        modalVisible: false,
+      });
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + "/api/admin/newOrder/arrearsDunList",
+        data: {
+          pageNo: pageNo || 1,
+          pageSize: this.state.pagination.pageSize,
+          name: this.state.customerName, //名称
+          orderNo: this.state.orderNo, //订单编号
+          depId: this.state.departmenttSearch, //订单部门
+          starTime: this.state.releaseDate[0], //开始时间
+          endTime: this.state.releaseDate[1], //结束时间
+          adminName: this.state.adminName,
+        },
+        success: function (data) {
+          let theArr = [];
+          if (data.error.length || 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];
+              let obj = thisdata;
+              obj.key = i + 1;
+              theArr.push(obj);
+            }
+            this.state.pagination.total = data.data.totalCount;
+          }
+          if (data.data && data.data.list && !data.data.list.length) {
+            this.state.pagination.total = 0;
+          }
+          this.setState({
+            dataSource: theArr,
+            pageNo: pageNo,
+            pagination: this.state.pagination,
+            selectedRowKeys: [],
+          });
+        }.bind(this),
+      }).always(
+        function () {
+          this.setState({
+            loading: false,
+          });
+        }.bind(this)
+      );
+    },
+    getInitialState() {
+      return {
+        releaseDate: [],
+        pagination: {
+          defaultCurrent: 1,
+          defaultPageSize: 10,
+          showQuickJumper: true,
+          pageSize: 10,
+          onChange: function (page) {
+            this.loadData(page);
+          }.bind(this),
+          showTotal: function (total) {
+            return "共" + total + "条数据";
+          },
+        },
+        columns: [
+          {
+            title: "序号",
+            dataIndex: "key",
+            key: "key",
+          },
+          {
+            title: "合同编号",
+            dataIndex: "contractNo",
+            key: "contractNo",
+          },
+          {
+            title: "订单编号",
+            dataIndex: "orderNo",
+            key: "orderNo",
+          },
+          {
+            title: "客户名称",
+            dataIndex: "userName",
+            key: "userName",
+            render: (text) => {
+              return text && text.length > 9 ? text.substr(0, 9) + "..." : text;
+            },
+          },
+          {
+            title: "订单负责人",
+            dataIndex: "salesmanName",
+            key: "salesmanName",
+          },
+          {
+            title: "订单部门",
+            dataIndex: "depName",
+            key: "depName",
+          },
+          {
+            title: "订单状态",
+            dataIndex: "orderStatus",
+            key: "orderStatus",
+            render: (text) => {
+              return getNewOrderStatus(text);
+            },
+          },
+          {
+            title: "项目状态",
+            dataIndex: "projectStatus",
+            key: "projectStatus",
+            render: (text) => {
+              return getProjectStatus(text);
+            },
+          },
+          {
+            title: "签单金额(万元)",
+            dataIndex: "totalAmount",
+            key: "totalAmount",
+          },
+          {
+            title: "已收款(万元)",
+            dataIndex: "settlementAmount",
+            key: "settlementAmount",
+          },
+          {
+            title: "应收款(万元)",
+            dataIndex: "orderReceivables",
+            key: "orderReceivables",
+          },
+          {
+            title: "欠款(万元)",
+            dataIndex: "orderArrears",
+            key: "orderArrears",
+          },
+          {
+            title: "结算状态",
+            dataIndex: "liquidationStatus",
+            key: "liquidationStatus",
+            render: (text) => {
+              return getLiquidationStatus(text);
+            },
+          },
+          //   {
+          //     title: "催收科目",
+          //     dataIndex: "dunSubject",
+          //     key: "dunSubject",
+          //     //   render: text => {
+          //     //     return getjiedian(text);
+          //     //   }
+          //   },
+          {
+            title: "催款状态",
+            dataIndex: "dunStatus",
+            key: "dunStatus",
+            render: (text) => {
+              if (text == 0) {
+                return "未启动";
+              } else if (text == 1) {
+                return "催款中";
+              } else if (text == 2) {
+                return "已完成";
+              } else if (text == 3) {
+                return "已停止";
+              }
+            },
+          },
+          {
+            title: "催款启动日期",
+            dataIndex: "startDate",
+            key: "startDate",
+          },
+          {
+            title: "签单时间",
+            dataIndex: "signDate",
+            key: "signDate",
+          },
+        ],
+        dataSource: [],
+      };
+    },
+
+    //页面加载函数
+    componentWillMount() {
+      this.departmentList();
+      this.loadData();
+    },
+    //搜索
+    search() {
+      this.setState({
+        //signBillVisible:false
+      });
+      this.loadData();
+    },
+    //导出
+    exportExec() {
+      var data = {
+        name: this.state.customerName ? this.state.customerName : undefined, //客户名称
+        adminName: this.state.adminName ? this.state.adminName : undefined, //订单负责人
+        orderNo: this.state.orderNo ? this.state.orderNo : undefined, //订单编号
+        starTime: this.state.releaseDate[0]
+          ? this.state.releaseDate[0]
+          : undefined,
+        endTime: this.state.releaseDate[1]
+          ? this.state.releaseDate[1]
+          : undefined,
+        depId: this.state.departmenttSearch,
+        pageSize: 9999,
+      };
+      window.location.href =
+        globalConfig.context +
+        "/api/admin/newOrder/exportArrearsDunListData?" +
+        $.param(data);
+    },
+    //重置
+    reset() {
+      this.state.orderNo = "";
+      this.state.customerName = "";
+      this.state.adminName = "";
+      this.state.departmenttSearch = undefined;
+      this.state.releaseDate[0] = undefined;
+      this.state.releaseDate[1] = undefined;
+      this.loadData();
+    },
+    //部门
+    departmentList() {
+      this.setState({
+        loading: true,
+      });
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + "/api/admin/organization/selectSuperId",
+        data: {},
+        success: function (data) {
+          let thedata = data.data;
+          let theArr = [];
+          if (!thedata) {
+            if (data.error && data.error.length) {
+              message.warning(data.error[0].message);
+            }
+            thedata = {};
+          } else {
+            thedata.map(function (item, index) {
+              theArr.push({
+                key: index,
+                name: item.name,
+                id: item.id,
+              });
+            });
+          }
+          this.setState({
+            departmentArr: theArr,
+          });
+        }.bind(this),
+      }).always(
+        function () {
+          this.setState({
+            loading: false,
+          });
+        }.bind(this)
+      );
+    },
+    render() {
+      const formItemLayout = {
+        labelCol: { span: 8 },
+        wrapperCol: { span: 14 },
+      };
+      const FormItem = Form.Item;
+      const { RangePicker } = DatePicker;
+      const rowSelection = {
+        selectedRowKeys: this.state.selectedRowKeys,
+        onChange: (selectedRowKeys, selectedRows) => {
+          this.setState({
+            modalVisible: false,
+            selectedRows: selectedRows.slice(-1),
+            selectedRowKeys: selectedRowKeys.slice(-1),
+          });
+        },
+        onSelect: (recordt) => {
+          this.setState({
+            modalVisible: false,
+            recordt: recordt.id,
+          });
+        },
+      };
+      let departmentArr = this.state.departmentArr || [];
+      const { TabPane } = Tabs;
+      return (
+        <div className="user-content">
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>欠款催收列表</span>
+          </div>
+          <div className="user-search">
+            <Tabs
+              defaultActiveKey="1"
+              onChange={this.callback}
+              className="test"
+            >
+              <TabPane tab="搜索" key="1">
+                <Input
+                  placeholder="客户名称"
+                  style={{
+                    width: "150px",
+                    marginBottom: "10px",
+                    marginLeft: 10,
+                    marginRight: 10,
+                  }}
+                  value={this.state.customerName}
+                  onChange={(e) => {
+                    this.setState({ customerName: e.target.value });
+                  }}
+                />
+                <Input
+                  placeholder="订单编号"
+                  style={{ width: "150px", marginRight: 10 }}
+                  value={this.state.orderNo}
+                  onChange={(e) => {
+                    this.setState({ orderNo: e.target.value });
+                  }}
+                />
+                <Input
+                  placeholder="营销员名称"
+                  style={{ width: "150px", marginBottom: "10px", marginRight: 10 }}
+                  value={this.state.adminName}
+                  onChange={(e) => {
+                    this.setState({ adminName: e.target.value });
+                  }}
+                />
+                <Select
+                  placeholder="选择部门"
+                  style={{ width: 150, marginRight: "10px" }}
+                  value={this.state.departmenttSearch}
+                  onChange={(e) => {
+                    this.setState({ departmenttSearch: e });
+                  }}
+                >
+                  {departmentArr.map(function (item) {
+                    return (
+                      <Select.Option key={item.id}>{item.name}</Select.Option>
+                    );
+                  })}
+                </Select>
+                <span style={{ marginRight: "10px" }}>下单时间 :</span>
+                <RangePicker
+                  value={[
+                    this.state.releaseDate[0]
+                      ? moment(this.state.releaseDate[0])
+                      : null,
+                    this.state.releaseDate[1]
+                      ? moment(this.state.releaseDate[1])
+                      : null,
+                  ]}
+                  onChange={(data, dataString) => {
+                    this.setState({ releaseDate: dataString });
+                  }}
+                />
+                <Button
+                  type="primary"
+                  onClick={this.search}
+                  style={{ marginLeft: "10px", marginRight: 10 }}
+                >
+                  搜索
+                </Button>
+                <Button onClick={this.reset}>重置</Button>
+              </TabPane>
+              <TabPane tab="导出催款列表" key="2">
+                <Button
+                  type="primary"
+                  onClick={this.exportExec}
+                  style={{ marginBottom: 10, marginTop: 10, marginLeft: 10 }}
+                >
+                  导出催款列表
+                </Button>
+              </TabPane>
+            </Tabs>
+            <div className="patent-table">
+              <Spin spinning={this.state.loading}>
+                <Table
+                  columns={this.state.columns}
+                  dataSource={this.state.dataSource}
+                  pagination={this.state.pagination}
+                  scroll={{ x: "max-content", y: 0 }}
+                  bordered
+                  size="small"
+                />
+              </Spin>
+            </div>
+          </div>
+        </div>
+      );
+    },
+  })
+);
+export default ArrearsList;

+ 74 - 15
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -577,6 +577,7 @@ class ChangeApply extends Component {
     this.proList = this.proList.bind(this);
     this.cuiList = this.cuiList.bind(this);
     this.showConfirm = this.showConfirm.bind(this);
+    this.showConfirmChange = this.showConfirmChange.bind(this);
     this.changeAddPro = this.changeAddPro.bind(this);
     this.changeProSubmit = this.changeProSubmit.bind(this);
     this.changeDeletePro = this.changeDeletePro.bind(this);
@@ -595,6 +596,7 @@ class ChangeApply extends Component {
     this.httpChange = this.httpChange.bind(this);
     this.showRes = this.showRes.bind(this);
     this.resCancel = this.resCancel.bind(this);
+    this.deleteChange = this.deleteChange.bind(this);
   }
 
   componentDidMount() {
@@ -626,6 +628,20 @@ class ChangeApply extends Component {
       onCancel() { }
     });
   }
+  showConfirmChange(fn, record) {
+    confirm({
+      title: "确定取消本次变更吗?",
+      content: (
+        <span style={{ color: "red" }}>
+          取消后本次变更将作废!!!
+        </span>
+      ),
+      onOk() {
+        fn();
+      },
+      onCancel() { }
+    });
+  }
 
   //服务值改变时请求客户名称
   httpChange(e) {
@@ -831,6 +847,9 @@ class ChangeApply extends Component {
         id: id || this.state.data.id
       },
       success: function (data) {
+        this.setState({
+          cuiDataSource: data.data
+        });
         if (data.data && data.data.length) {
           if (id) {
             this.setState({
@@ -1067,7 +1086,8 @@ class ChangeApply extends Component {
         data: {
           id: index.id,
           type: 3,
-          tid: index.tid
+          tid: index.tid,
+          did: index.did
         }
       }).done(
         function (data) {
@@ -1478,6 +1498,32 @@ class ChangeApply extends Component {
   // componentWillMount() {
   //   this.departmentList();
   // }
+  deleteChange() {
+    this.setState({
+      loading: true,
+    });
+    $.ajax({
+      url: globalConfig.context + "/api/admin/orderChange/cancelOrderChange",
+      method: "post",
+      data: {
+        id: this.state.data.id,
+        status: this.state.data.status,
+        processState: this.state.data.processState,
+      },
+    }).done(
+      function (data) {
+        this.setState({
+          loading: false,
+        });
+        if (!data.error.length) {
+          message.success("取消成功!");
+          this.props.onCancel()
+        } else {
+          message.warning(data.error[0].message);
+        }
+      }.bind(this)
+    );
+  }
 
   render() {
     const expandedRowRender = e => {
@@ -1542,22 +1588,25 @@ class ChangeApply extends Component {
                   )}
                 </span>
               );
-            }
+            },
           },
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return text + "-" + record.id;
+            },
           },
           {
             title: "项目类别",
             dataIndex: "cname",
-            key: "cname"
+            key: "cname",
           },
           {
             title: "项目数量",
             dataIndex: "commodityQuantity",
-            key: "commodityQuantity"
+            key: "commodityQuantity",
           },
           {
             title: "金额(万元)",
@@ -1569,28 +1618,28 @@ class ChangeApply extends Component {
               } else {
                 return text;
               }
-            }
+            },
           },
           {
             title: "主要项目",
             dataIndex: "main",
             key: "main",
-            render: text => {
+            render: (text) => {
               return text ? "是" : "否";
-            }
+            },
           },
           {
             title: "项目负责人",
             dataIndex: "receiverName",
-            key: "receiverName"
+            key: "receiverName",
           },
           {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: text => {
+            render: (text) => {
               return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
-            }
+            },
           },
           {
             title: "操作",
@@ -1600,21 +1649,21 @@ class ChangeApply extends Component {
               return (
                 <div>
                   <Button
-                    onClick={e => {
+                    onClick={(e) => {
                       e.stopPropagation();
                       this.showConfirm(this.changeDeletePro, record);
                     }}
                     disabled={this.state.listFlag}
                     style={{
-                      display: this.state.displayList ? "none" : "block"
+                      display: this.state.displayList ? "none" : "block",
                     }}
                   >
                     删除
                   </Button>
                 </div>
               );
-            }
-          }
+            },
+          },
         ];
         return (
           <Table
@@ -1806,6 +1855,16 @@ class ChangeApply extends Component {
               >
                 重置
               </Button>
+                <Button
+                  type="danger"
+                  style={{ float: "right" }}
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    this.showConfirmChange(this.deleteChange);
+                  }}
+                >
+                  取消本次变更
+                </Button>
             </FormItem>
           </div>
           <div className="clearfix">

+ 112 - 91
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js

@@ -21,6 +21,7 @@ import { shenghePeo, changeColor } from "@/tools.js";
 import $ from "jquery/src/ajax";
 import ReactToPrint from "react-to-print";
 import tongguo from "../../../../../../image/tongguo.png";
+import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import Refund from "./refund.js"
 import "./xButton.less"
@@ -1073,7 +1074,7 @@ class ChangeDetail extends Component {
       <div className="clearfix changeDetail">
         <div
           className="clearfix"
-          ref={e => {
+          ref={(e) => {
             this.refs = e;
           }}
         >
@@ -1090,9 +1091,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4
+                this.props.data.status == 4
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             {/* <span
@@ -1109,6 +1110,21 @@ class ChangeDetail extends Component {
             </span> */}
             <img src={tongguo} style={{ width: "100%" }} />
           </div>
+          <div
+            style={{
+              borderRadius: "50%",
+              width: 300,
+              height: 300,
+              position: "absolute",
+              top: 284,
+              left: 586,
+              transform: "rotate(-5deg)",
+              zIndex: 1,
+              display: this.props.data.status == 5 ? "block" : "none",
+            }}
+          >
+            <img src={quxiao} style={{ width: "63%" }} />
+          </div>
 
           <h2 style={{ textAlign: "center", marginBottom: 10, marginTop: 20 }}>
             合同变更记录
@@ -1125,10 +1141,10 @@ class ChangeDetail extends Component {
               className="demandDetailShow-upload"
               listType="picture-card"
               fileList={orgCodeUrl}
-              onPreview={file => {
+              onPreview={(file) => {
                 this.setState({
                   previewImage: file.url || file.thumbUrl,
-                  previewVisible: true
+                  previewVisible: true,
                 });
               }}
             />
@@ -1146,7 +1162,7 @@ class ChangeDetail extends Component {
                 alt=""
                 style={{
                   width: "100%",
-                  transform: `rotate(${this.state.rotateDeg}deg)`
+                  transform: `rotate(${this.state.rotateDeg}deg)`,
                 }}
                 src={this.state.previewImage || ""}
               />
@@ -1155,7 +1171,7 @@ class ChangeDetail extends Component {
                 style={{
                   position: "relative",
                   left: "50%",
-                  transform: "translateX(-50%)"
+                  transform: "translateX(-50%)",
                 }}
               >
                 旋转
@@ -1166,7 +1182,7 @@ class ChangeDetail extends Component {
                   position: "absolute",
                   left: -81,
                   top: "50%",
-                  transform: "translateY(-50%)"
+                  transform: "translateY(-50%)",
                 }}
               >
                 上一张
@@ -1177,7 +1193,7 @@ class ChangeDetail extends Component {
                   position: "absolute",
                   right: -81,
                   top: "50%",
-                  transform: "translateY(-50%)"
+                  transform: "translateY(-50%)",
                 }}
               >
                 下一张
@@ -1195,7 +1211,7 @@ class ChangeDetail extends Component {
               position: "relative",
               bottom: "20px",
               fontSize: "12px",
-              color: "rgba(0, 0, 0, 0.65)"
+              color: "rgba(0, 0, 0, 0.65)",
             }}
           >
             {/* <span>操作人:</span> */}
@@ -1218,7 +1234,7 @@ class ChangeDetail extends Component {
                     width: "100%",
                     height: "auto",
                     wordBreak: "break-all",
-                    marginBottom: "10px"
+                    marginBottom: "10px",
                   }}
                 >
                   {item.aname + ":" + "(" + item.status + ")" + item.remarks}
@@ -1284,18 +1300,16 @@ class ChangeDetail extends Component {
             ""
           )} */}
 
-
-
-
           {(this.props.data.processState > 5 &&
             this.props.data.processState <= 8) ||
-            (this.props.data.processState === 9 &&
-              this.props.data.status === 4) || 1 == 1 ? (
-              <div>
-                <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
-                  当前财务状态(财务填写)
+          (this.props.data.processState === 9 &&
+            this.props.data.status === 4) ||
+          1 == 1 ? (
+            <div>
+              <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
+                当前财务状态(财务填写)
               </h3>
-                {/* <div className="clearfix">
+              {/* <div className="clearfix">
                 <Form.Item
                   className="half-item"
                   label="收款时间"
@@ -1331,17 +1345,17 @@ class ChangeDetail extends Component {
                   <span>{this.props.data.invoiceAmount}</span>
                 </Form.Item>
               </div> */}
-                {financeData.map((item, index) => {
-                  return <Itemlist key={index} pageData={item} />;
-                })}
-              </div>
-            ) : (
-              <div style={{ marginBottom: 10 }}>
-                <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
-                  当前财务状态(财务填写)
+              {financeData.map((item, index) => {
+                return <Itemlist key={index} pageData={item} />;
+              })}
+            </div>
+          ) : (
+            <div style={{ marginBottom: 10 }}>
+              <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
+                当前财务状态(财务填写)
               </h3>
-                <div className="clearfix">
-                  {/* <Form.Item
+              <div className="clearfix">
+                {/* <Form.Item
                   className="half-item"
                   label="收款时间"
                   labelCol={{ span: 8 }}
@@ -1417,42 +1431,42 @@ class ChangeDetail extends Component {
                     }}
                   />
                 </Form.Item> */}
-                  <Form.Item
-                    className="half-item"
-                    label="发生成本(万元)"
-                    labelCol={{ span: 8 }}
-                    wrapperCol={{ span: 14 }}
-                  >
-                    <Input
-                      style={{ width: 160 }}
-                      value={this.state.cwCost}
-                      placeholder="请输入发生成本"
-                      onChange={e => {
-                        this.setState({
-                          cwCost: e.target.value
-                        });
-                      }}
-                    />
-                  </Form.Item>
-                  <Form.Item
-                    className="half-item"
-                    label="应退金额(万元)"
-                    labelCol={{ span: 8 }}
-                    wrapperCol={{ span: 14 }}
-                  >
-                    <Input
-                      style={{ width: 160 }}
-                      value={this.state.refundableAmount}
-                      placeholder="请输入应退金额"
-                      onChange={e => {
-                        this.setState({
-                          refundableAmount: e.target.value
-                        });
-                      }}
-                    />
-                  </Form.Item>
-                </div>
-                {/* <div
+                <Form.Item
+                  className="half-item"
+                  label="发生成本(万元)"
+                  labelCol={{ span: 8 }}
+                  wrapperCol={{ span: 14 }}
+                >
+                  <Input
+                    style={{ width: 160 }}
+                    value={this.state.cwCost}
+                    placeholder="请输入发生成本"
+                    onChange={(e) => {
+                      this.setState({
+                        cwCost: e.target.value,
+                      });
+                    }}
+                  />
+                </Form.Item>
+                <Form.Item
+                  className="half-item"
+                  label="应退金额(万元)"
+                  labelCol={{ span: 8 }}
+                  wrapperCol={{ span: 14 }}
+                >
+                  <Input
+                    style={{ width: 160 }}
+                    value={this.state.refundableAmount}
+                    placeholder="请输入应退金额"
+                    onChange={(e) => {
+                      this.setState({
+                        refundableAmount: e.target.value,
+                      });
+                    }}
+                  />
+                </Form.Item>
+              </div>
+              {/* <div
                   style={{
                     marginTop: "10px",
                     display:
@@ -1479,8 +1493,8 @@ class ChangeDetail extends Component {
                     />
                   </Form.Item>
                 </div> */}
-              </div>
-            )}
+            </div>
+          )}
           <ul
             style={{
               margin: "10px 0 0 20px",
@@ -1488,9 +1502,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  (this.props.data.status == 4 || this.props.data.status == 2)
+                (this.props.data.status == 4 || this.props.data.status == 2)
                   ? "inline-block"
-                  : "none"
+                  : "none",
             }}
           >
             <li>
@@ -1551,11 +1565,17 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4 && this.props.data.refundStatus
+                this.props.data.status == 4 &&
+                this.props.data.refundStatus
                   ? "block"
-                  : "none"
-            }}>
-            <Refund data={this.props.data} id={this.props.id} dataSource={this.state.refundDataSource} />
+                  : "none",
+            }}
+          >
+            <Refund
+              data={this.props.data}
+              id={this.props.id}
+              dataSource={this.state.refundDataSource}
+            />
           </div>
         </div>
         {/* {!(
@@ -1708,9 +1728,9 @@ class ChangeDetail extends Component {
                 display:
                   (this.props.data.processState == 7 ||
                     this.props.data.processState == 8) &&
-                    this.props.data.status == 4
+                  this.props.data.status == 4
                     ? "block"
-                    : "block"
+                    : "block",
               }}
             >
               打印
@@ -1731,7 +1751,7 @@ class ChangeDetail extends Component {
           <Form
             layout="horizontal"
             onSubmit={this.nextSubmit}
-          // id="demand-form"
+            // id="demand-form"
           >
             <Spin spinning={this.state.loading}>
               <div className="clearfix">
@@ -1744,11 +1764,12 @@ class ChangeDetail extends Component {
                     style={{ width: "155px" }}
                     placeholder="请输入退款金额"
                     value={this.state.refundMoney}
-                    onChange={e => {
+                    onChange={(e) => {
                       this.setState({
-                        refundMoney: e.target.value
-                      })
-                    }} />
+                        refundMoney: e.target.value,
+                      });
+                    }}
+                  />
                 </FormItem>
 
                 <FormItem
@@ -1763,11 +1784,12 @@ class ChangeDetail extends Component {
                         : null
                     }
                     onChange={(date, dateString) => {
-                      console.log(date, dateString)
+                      console.log(date, dateString);
                       this.setState({
-                        refundDate: dateString
-                      })
-                    }} />
+                        refundDate: dateString,
+                      });
+                    }}
+                  />
                 </FormItem>
 
                 <FormItem
@@ -1781,10 +1803,10 @@ class ChangeDetail extends Component {
                     placeholder="请输入备注信息"
                     style={{ width: "95%" }}
                     value={this.state.refundRemarks}
-                    onChange={e => {
+                    onChange={(e) => {
                       this.setState({
-                        refundRemarks: e.target.value
-                      })
+                        refundRemarks: e.target.value,
+                      });
                     }}
                   />
                 </FormItem>
@@ -1799,7 +1821,7 @@ class ChangeDetail extends Component {
                     onClick={this.sumitRefund}
                   >
                     保存
-                      </Button>
+                  </Button>
                   <Button
                     className="submitSave"
                     type="ghost"
@@ -1807,10 +1829,9 @@ class ChangeDetail extends Component {
                     onClick={this.refundCancel}
                   >
                     取消
-                      </Button>
+                  </Button>
                 </FormItem>
               </div>
-
             </Spin>
           </Form>
         </Modal>

+ 46 - 29
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -6,6 +6,7 @@ import { getProcessStatusNew, changeColor } from "@/tools.js";
 import { shenghePeo } from "@/tools.js";
 import $ from "jquery/src/ajax";
 import "../../../../../../css/changeDetail.less"
+import quxiao from "../../../../../../image/quxiao.png";
 import tongguo from "../../../../../../image/tongguo.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import "./xButton.less";
@@ -488,7 +489,7 @@ class ChangeDetail extends Component {
       <div className="clearfix changeDetail">
         <div
           className="clearfix"
-          ref={e => {
+          ref={(e) => {
             this.refs = e;
           }}
         >
@@ -507,7 +508,7 @@ class ChangeDetail extends Component {
                   this.props.data.processState == 8) &&
                 this.props.data.status == 4
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             {/* <span
@@ -524,6 +525,21 @@ class ChangeDetail extends Component {
             </span> */}
             <img src={tongguo} style={{ width: "100%" }} />
           </div>
+          <div
+            style={{
+              borderRadius: "50%",
+              width: 300,
+              height: 300,
+              position: "absolute",
+              top: 284,
+              left: 586,
+              transform: "rotate(-5deg)",
+              zIndex: 1,
+              display: this.props.data.status == 5 ? "block" : "none",
+            }}
+          >
+            <img src={quxiao} style={{ width: "63%" }} />
+          </div>
 
           <h2 style={{ textAlign: "center", marginBottom: 10, marginTop: 20 }}>
             合同变更记录
@@ -540,10 +556,10 @@ class ChangeDetail extends Component {
               className="demandDetailShow-upload"
               listType="picture-card"
               fileList={orgCodeUrl}
-              onPreview={file => {
+              onPreview={(file) => {
                 this.setState({
                   previewImage: file.url || file.thumbUrl,
-                  previewVisible: true
+                  previewVisible: true,
                 });
               }}
             />
@@ -559,7 +575,7 @@ class ChangeDetail extends Component {
                 alt=""
                 style={{
                   width: "100%",
-                  transform: `rotate(${this.state.rotateDeg}deg)`
+                  transform: `rotate(${this.state.rotateDeg}deg)`,
                 }}
                 src={this.state.previewImage || ""}
               />
@@ -568,7 +584,7 @@ class ChangeDetail extends Component {
                 style={{
                   position: "relative",
                   left: "50%",
-                  transform: "translateX(-50%)"
+                  transform: "translateX(-50%)",
                 }}
               >
                 旋转
@@ -579,7 +595,7 @@ class ChangeDetail extends Component {
                   position: "absolute",
                   left: -81,
                   top: "50%",
-                  transform: "translateY(-50%)"
+                  transform: "translateY(-50%)",
                 }}
               >
                 上一张
@@ -590,7 +606,7 @@ class ChangeDetail extends Component {
                   position: "absolute",
                   right: -81,
                   top: "50%",
-                  transform: "translateY(-50%)"
+                  transform: "translateY(-50%)",
                 }}
               >
                 下一张
@@ -607,7 +623,7 @@ class ChangeDetail extends Component {
               paddingLeft: "90px",
               paddingTop: "10px",
               position: "relative",
-              bottom: "20px"
+              bottom: "20px",
             }}
           >
             {/* <span>操作人:</span> */}
@@ -630,7 +646,7 @@ class ChangeDetail extends Component {
                     width: "100%",
                     height: "auto",
                     wordBreak: "break-all",
-                    marginBottom: "10px"
+                    marginBottom: "10px",
                   }}
                 >
                   {item.aname + ":" + "(" + item.status + ")" + item.remarks}
@@ -692,7 +708,7 @@ class ChangeDetail extends Component {
                   this.props.data.processState == 7) &&
                 (this.props.data.status == 2 || this.props.data.status == 4)
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -708,7 +724,7 @@ class ChangeDetail extends Component {
                 marginBottom: "15px",
                 position: "relative",
                 zIndex: "999",
-                display: "none"
+                display: "none",
               }}
             >
               添加回收退票
@@ -776,7 +792,7 @@ class ChangeDetail extends Component {
                     style={{
                       marginLeft: 10,
                       fontWeight: 800,
-                      marginBottom: 10
+                      marginBottom: 10,
                     }}
                   >
                     当前财务状态(财务填写)
@@ -791,10 +807,11 @@ class ChangeDetail extends Component {
                 style={{
                   marginTop: "10px",
                   display:
-                    this.props.data.status == 1 || this.props.data.status == 3 &&
-                    this.props.processState != this.props.data.processState
+                    this.props.data.status == 1 ||
+                    (this.props.data.status == 3 &&
+                      this.props.processState != this.props.data.processState)
                       ? "none"
-                      : "block"
+                      : "block",
                 }}
               >
                 <Form.Item
@@ -806,9 +823,9 @@ class ChangeDetail extends Component {
                     rows={4}
                     value={this.state.reason}
                     placeholder="请输入补充资料/备注"
-                    onChange={e => {
+                    onChange={(e) => {
                       this.setState({
-                        reason: e.target.value
+                        reason: e.target.value,
                       });
                     }}
                   />
@@ -844,16 +861,16 @@ class ChangeDetail extends Component {
                 float: "left",
                 position: "relative",
                 bottom: "28px",
-                right: "-600px"
+                right: "-600px",
               }}
-              onChange={val => {
+              onChange={(val) => {
                 this.setState({ rejectState: val });
               }}
             >
               <Option
                 value="0"
                 style={{
-                  display: this.props.processState >= 1 ? "block" : "none"
+                  display: this.props.processState >= 1 ? "block" : "none",
                 }}
               >
                 营销员
@@ -861,7 +878,7 @@ class ChangeDetail extends Component {
               <Option
                 value="1"
                 style={{
-                  display: this.props.processState >= 2 ? "block" : "none"
+                  display: this.props.processState >= 2 ? "block" : "none",
                 }}
               >
                 营销管理员
@@ -869,7 +886,7 @@ class ChangeDetail extends Component {
               <Option
                 value="2"
                 style={{
-                  display: this.props.processState >= 3 ? "block" : "none"
+                  display: this.props.processState >= 3 ? "block" : "none",
                 }}
               >
                 咨询师
@@ -877,7 +894,7 @@ class ChangeDetail extends Component {
               <Option
                 value="3"
                 style={{
-                  display: this.props.processState >= 4 ? "block" : "none"
+                  display: this.props.processState >= 4 ? "block" : "none",
                 }}
               >
                 咨询师经理
@@ -885,7 +902,7 @@ class ChangeDetail extends Component {
               <Option
                 value="4"
                 style={{
-                  display: this.props.processState >= 5 ? "block" : "none"
+                  display: this.props.processState >= 5 ? "block" : "none",
                 }}
               >
                 咨询师总监
@@ -893,7 +910,7 @@ class ChangeDetail extends Component {
               <Option
                 value="5"
                 style={{
-                  display: this.props.processState >= 6 ? "block" : "none"
+                  display: this.props.processState >= 6 ? "block" : "none",
                 }}
               >
                 财务专员(退单)
@@ -901,7 +918,7 @@ class ChangeDetail extends Component {
               <Option
                 value="6"
                 style={{
-                  display: this.props.processState >= 7 ? "block" : "none"
+                  display: this.props.processState >= 7 ? "block" : "none",
                 }}
               >
                 财务总监
@@ -909,7 +926,7 @@ class ChangeDetail extends Component {
               <Option
                 value="7"
                 style={{
-                  display: this.props.processState >= 8 ? "block" : "none"
+                  display: this.props.processState >= 8 ? "block" : "none",
                 }}
               >
                 总裁
@@ -934,7 +951,7 @@ class ChangeDetail extends Component {
               this.props.data.status == 4 &&
               this.props.data.refundStatus
                 ? "block"
-                : "none"
+                : "none",
           }}
         >
           <Refund data={this.props.data} id={this.props.id} />

+ 278 - 224
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -21,6 +21,7 @@ import { shenghePeo, changeColor } from "@/tools.js";
 import $ from "jquery/src/ajax";
 import ReactToPrint from "react-to-print";
 import tongguo from "../../../../../../image/tongguo.png";
+import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import Refund from "./refund.js"
 import "./xButton.less"
@@ -1085,7 +1086,7 @@ class ChangeDetail extends Component {
       <div className="clearfix changeDetail">
         <div
           className="clearfix"
-          ref={e => {
+          ref={(e) => {
             this.refs = e;
           }}
         >
@@ -1102,9 +1103,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4
+                this.props.data.status == 4
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             {/* <span
@@ -1121,6 +1122,21 @@ class ChangeDetail extends Component {
             </span> */}
             <img src={tongguo} style={{ width: "100%" }} />
           </div>
+          <div
+            style={{
+              borderRadius: "50%",
+              width: 300,
+              height: 300,
+              position: "absolute",
+              top: 284,
+              left: 586,
+              transform: "rotate(-5deg)",
+              zIndex: 1,
+              display: this.props.data.status == 5 ? "block" : "none",
+            }}
+          >
+            <img src={quxiao} style={{ width: "63%" }} />
+          </div>
 
           <h2 style={{ textAlign: "center", marginBottom: 10, marginTop: 20 }}>
             合同变更记录
@@ -1137,10 +1153,10 @@ class ChangeDetail extends Component {
               className="demandDetailShow-upload"
               listType="picture-card"
               fileList={orgCodeUrl}
-              onPreview={file => {
+              onPreview={(file) => {
                 this.setState({
                   previewImage: file.url || file.thumbUrl,
-                  previewVisible: true
+                  previewVisible: true,
                 });
               }}
             />
@@ -1158,7 +1174,7 @@ class ChangeDetail extends Component {
                 alt=""
                 style={{
                   width: "100%",
-                  transform: `rotate(${this.state.rotateDeg}deg)`
+                  transform: `rotate(${this.state.rotateDeg}deg)`,
                 }}
                 src={this.state.previewImage || ""}
               />
@@ -1167,7 +1183,7 @@ class ChangeDetail extends Component {
                 style={{
                   position: "relative",
                   left: "50%",
-                  transform: "translateX(-50%)"
+                  transform: "translateX(-50%)",
                 }}
               >
                 旋转
@@ -1178,7 +1194,7 @@ class ChangeDetail extends Component {
                   position: "absolute",
                   left: -81,
                   top: "50%",
-                  transform: "translateY(-50%)"
+                  transform: "translateY(-50%)",
                 }}
               >
                 上一张
@@ -1189,7 +1205,7 @@ class ChangeDetail extends Component {
                   position: "absolute",
                   right: -81,
                   top: "50%",
-                  transform: "translateY(-50%)"
+                  transform: "translateY(-50%)",
                 }}
               >
                 下一张
@@ -1207,7 +1223,7 @@ class ChangeDetail extends Component {
               position: "relative",
               bottom: "20px",
               fontSize: "12px",
-              color: "rgba(0, 0, 0, 0.65)"
+              color: "rgba(0, 0, 0, 0.65)",
             }}
           >
             {/* <span>操作人:</span> */}
@@ -1230,7 +1246,7 @@ class ChangeDetail extends Component {
                     width: "100%",
                     height: "auto",
                     wordBreak: "break-all",
-                    marginBottom: "10px"
+                    marginBottom: "10px",
                   }}
                 >
                   {item.aname + ":" + "(" + item.status + ")" + item.remarks}
@@ -1301,9 +1317,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                  (this.props.data.status == 2 || this.props.data.status == 4)
+                (this.props.data.status == 2 || this.props.data.status == 4)
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -1322,9 +1338,9 @@ class ChangeDetail extends Component {
                 display:
                   (this.props.data.processState == 7 ||
                     this.props.data.processState == 8) &&
-                    this.props.data.status == 4
+                  this.props.data.status == 4
                     ? "none"
-                    : "block"
+                    : "block",
               }}
             >
               添加回收退票
@@ -1339,16 +1355,14 @@ class ChangeDetail extends Component {
               dataSource={this.state.contactList}
               size="small"
             />
-
           </div>
 
-
-          {this.props.data.processState != 5   ? (
-              <div>
-                <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
-                  当前财务状态(财务填写)
+          {this.props.data.processState != 5 ? (
+            <div>
+              <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
+                当前财务状态(财务填写)
               </h3>
-                {/* <div className="clearfix">
+              {/* <div className="clearfix">
                 <Form.Item
                   className="half-item"
                   label="收款时间"
@@ -1384,17 +1398,17 @@ class ChangeDetail extends Component {
                   <span>{this.props.data.invoiceAmount}</span>
                 </Form.Item>
               </div> */}
-                {financeData.map((item, index) => {
-                  return <Itemlist key={index} pageData={item} />;
-                })}
-              </div>
-            ) : (
-              <div style={{ marginBottom: 10 }}>
-                <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
-                  当前财务状态(财务填写)
+              {financeData.map((item, index) => {
+                return <Itemlist key={index} pageData={item} />;
+              })}
+            </div>
+          ) : (
+            <div style={{ marginBottom: 10 }}>
+              <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
+                当前财务状态(财务填写)
               </h3>
-                <div className="clearfix">
-                  {/* <Form.Item
+              <div className="clearfix">
+                {/* <Form.Item
                   className="half-item"
                   label="收款时间"
                   labelCol={{ span: 8 }}
@@ -1470,70 +1484,70 @@ class ChangeDetail extends Component {
                     }}
                   />
                 </Form.Item> */}
-                  <Form.Item
-                    className="half-item"
-                    label="发生成本(万元)"
-                    labelCol={{ span: 8 }}
-                    wrapperCol={{ span: 14 }}
-                  >
-                    <Input
-                      style={{ width: 160 }}
-                      value={this.state.cwCost}
-                      placeholder="请输入发生成本"
-                      onChange={e => {
-                        this.setState({
-                          cwCost: e.target.value
-                        });
-                      }}
-                    />
-                  </Form.Item>
-                  <Form.Item
-                    className="half-item"
-                    label="应退金额(万元)"
-                    labelCol={{ span: 8 }}
-                    wrapperCol={{ span: 14 }}
-                  >
-                    <Input
-                      style={{ width: 160 }}
-                      value={this.state.refundableAmount}
-                      placeholder="请输入应退金额"
-                      onChange={e => {
-                        this.setState({
-                          refundableAmount: e.target.value
-                        });
-                      }}
-                    />
-                  </Form.Item>
-                </div>
-                <div
-                  style={{
-                    marginTop: "10px",
-                    display:
-                      this.props.data.processState == 5 &&
-                        this.props.data.status == 1
-                        ? "block"
-                        : "none"
-                  }}
+                <Form.Item
+                  className="half-item"
+                  label="发生成本(万元)"
+                  labelCol={{ span: 8 }}
+                  wrapperCol={{ span: 14 }}
                 >
-                  <Form.Item
-                    label="备注"
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 14 }}
-                  >
-                    <Input.TextArea
-                      rows={4}
-                      value={this.state.reason}
-                      placeholder="请输入补充资料/备注"
-                      onChange={e => {
-                        this.setState({
-                          reason: e.target.value
-                        });
-                      }}
-                    />
-                  </Form.Item>
-                </div>
+                  <Input
+                    style={{ width: 160 }}
+                    value={this.state.cwCost}
+                    placeholder="请输入发生成本"
+                    onChange={(e) => {
+                      this.setState({
+                        cwCost: e.target.value,
+                      });
+                    }}
+                  />
+                </Form.Item>
+                <Form.Item
+                  className="half-item"
+                  label="应退金额(万元)"
+                  labelCol={{ span: 8 }}
+                  wrapperCol={{ span: 14 }}
+                >
+                  <Input
+                    style={{ width: 160 }}
+                    value={this.state.refundableAmount}
+                    placeholder="请输入应退金额"
+                    onChange={(e) => {
+                      this.setState({
+                        refundableAmount: e.target.value,
+                      });
+                    }}
+                  />
+                </Form.Item>
               </div>
-            )}
+              <div
+                style={{
+                  marginTop: "10px",
+                  display:
+                    this.props.data.processState == 5 &&
+                    this.props.data.status == 1
+                      ? "block"
+                      : "none",
+                }}
+              >
+                <Form.Item
+                  label="备注"
+                  labelCol={{ span: 4 }}
+                  wrapperCol={{ span: 14 }}
+                >
+                  <Input.TextArea
+                    rows={4}
+                    value={this.state.reason}
+                    placeholder="请输入补充资料/备注"
+                    onChange={(e) => {
+                      this.setState({
+                        reason: e.target.value,
+                      });
+                    }}
+                  />
+                </Form.Item>
+              </div>
+            </div>
+          )}
           <ul
             style={{
               margin: "10px 0 0 20px",
@@ -1541,9 +1555,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  (this.props.data.status == 4 || this.props.data.status == 2)
+                (this.props.data.status == 4 || this.props.data.status == 2)
                   ? "inline-block"
-                  : "none"
+                  : "none",
             }}
           >
             <li>
@@ -1565,17 +1579,40 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4 && !this.props.data.refundStatus
+                this.props.data.status == 4 &&
+                !this.props.data.refundStatus
                   ? "block"
                   : "none",
-              marginTop: 10
+              marginTop: 10,
             }}
           >
-            <hr style={{ marginTop: 12, marginBottom: 10, backgroundColor: "black", height: 1, border: "none" }} />
-            <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10, display: "inline-block" }}>
-              执行退款 <span style={{ fontSize: 12, fontWeight: "normal", color: "red" }}>(注:执行退款,系统将从已收款金额中直接减款)</span>
+            <hr
+              style={{
+                marginTop: 12,
+                marginBottom: 10,
+                backgroundColor: "black",
+                height: 1,
+                border: "none",
+              }}
+            />
+            <h3
+              style={{
+                marginLeft: 20,
+                fontWeight: 800,
+                marginBottom: 10,
+                display: "inline-block",
+              }}
+            >
+              执行退款{" "}
+              <span
+                style={{ fontSize: 12, fontWeight: "normal", color: "red" }}
+              >
+                (注:执行退款,系统将从已收款金额中直接减款)
+              </span>
             </h3>
-            <Button onClick={this.addRefund} style={{ float: "right" }}>添加执行退款</Button>
+            <Button onClick={this.addRefund} style={{ float: "right" }}>
+              添加执行退款
+            </Button>
             <Table
               pagination={false}
               bordered
@@ -1587,7 +1624,7 @@ class ChangeDetail extends Component {
             <div className="clearfix">
               <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
                 上传退款凭证
-            </h3>
+              </h3>
               <div style={{ marginLeft: 20 }}>
                 <PicturesWall
                   fileList={this.getVoucherUrl}
@@ -1597,131 +1634,147 @@ class ChangeDetail extends Component {
                 />
               </div>
             </div>
-            <Button type="primary" onClick={this.refundExecute} style={{ position: "relative", left: "50%", transform: "translateX(-50%)" }}>确定执行退款</Button>
+            <Button
+              type="primary"
+              onClick={this.refundExecute}
+              style={{
+                position: "relative",
+                left: "50%",
+                transform: "translateX(-50%)",
+              }}
+            >
+              确定执行退款
+            </Button>
           </div>
           <div
             style={{
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4 && this.props.data.refundStatus
+                this.props.data.status == 4 &&
+                this.props.data.refundStatus
                   ? "block"
-                  : "none"
-            }}>
-            <Refund data={this.props.data} id={this.props.id} dataSource={this.state.refundDataSource} />
+                  : "none",
+            }}
+          >
+            <Refund
+              data={this.props.data}
+              id={this.props.id}
+              dataSource={this.state.refundDataSource}
+            />
           </div>
         </div>
-        { this.props.data.processState == 5 ? (
-            this.state.buttonStatus ? (
-              <div>
-                <div
-                  className="clearfix"
-                  style={{ display: "flex", justifyContent: "space-around" }}
-                >
-                  {buttonData.map((item, index) => {
-                    return (
-                      <AgreeButton
-                        data={item}
-                        key={index}
-                        backData={this.props.data}
-                        processState={this.props.processState}
-                        visible={this.changeButtonStatus}
-                        ajaxData={this.state}
-                        loadData={this.props.loadData}
-                        rejectState={this.state.rejectState}
-                        reason={this.state.reason}
-                        onCancel={this.props.onCancel}
-                      />
-                    );
-                  })}
-                </div>
+        {this.props.data.processState == 5 ? (
+          this.state.buttonStatus ? (
+            <div>
+              <div
+                className="clearfix"
+                style={{ display: "flex", justifyContent: "space-around" }}
+              >
+                {buttonData.map((item, index) => {
+                  return (
+                    <AgreeButton
+                      data={item}
+                      key={index}
+                      backData={this.props.data}
+                      processState={this.props.processState}
+                      visible={this.changeButtonStatus}
+                      ajaxData={this.state}
+                      loadData={this.props.loadData}
+                      rejectState={this.state.rejectState}
+                      reason={this.state.reason}
+                      onCancel={this.props.onCancel}
+                    />
+                  );
+                })}
+              </div>
 
-                <Select
-                  defaultValue="0"
+              <Select
+                defaultValue="0"
+                style={{
+                  width: 120,
+                  float: "left",
+                  position: "relative",
+                  bottom: "28px",
+                  right: "-600px",
+                }}
+                onChange={(val) => {
+                  this.setState({ rejectState: val });
+                  // console.log(val, this.state.rejectState);
+                }}
+              >
+                <Option
+                  value="0"
                   style={{
-                    width: 120,
-                    float: "left",
-                    position: "relative",
-                    bottom: "28px",
-                    right: "-600px"
-                  }}
-                  onChange={val => {
-                    this.setState({ rejectState: val });
-                    // console.log(val, this.state.rejectState);
+                    display: this.props.processState >= 1 ? "block" : "none",
                   }}
                 >
-                  <Option
-                    value="0"
-                    style={{
-                      display: this.props.processState >= 1 ? "block" : "none"
-                    }}
-                  >
-                    营销员
+                  营销员
                 </Option>
-                  <Option
-                    value="1"
-                    style={{
-                      display: this.props.processState >= 2 ? "block" : "none"
-                    }}
-                  >
-                    营销管理员
+                <Option
+                  value="1"
+                  style={{
+                    display: this.props.processState >= 2 ? "block" : "none",
+                  }}
+                >
+                  营销管理员
                 </Option>
-                  <Option
-                    value="2"
-                    style={{
-                      display: this.props.processState >= 3 ? "block" : "none"
-                    }}
-                  >
-                    咨询师
+                <Option
+                  value="2"
+                  style={{
+                    display: this.props.processState >= 3 ? "block" : "none",
+                  }}
+                >
+                  咨询师
                 </Option>
-                  <Option
-                    value="3"
-                    style={{
-                      display: this.props.processState >= 4 ? "block" : "none"
-                    }}
-                  >
-                    咨询师经理
+                <Option
+                  value="3"
+                  style={{
+                    display: this.props.processState >= 4 ? "block" : "none",
+                  }}
+                >
+                  咨询师经理
                 </Option>
-                  <Option
-                    value="4"
-                    style={{
-                      display: this.props.processState >= 5 ? "block" : "none"
-                    }}
-                  >
-                    咨询师总监
+                <Option
+                  value="4"
+                  style={{
+                    display: this.props.processState >= 5 ? "block" : "none",
+                  }}
+                >
+                  咨询师总监
                 </Option>
-                  <Option
-                    value="5"
-                    style={{
-                      display: this.props.processState >= 6 ? "block" : "none"
-                    }}
-                  >
-                    财务专员(退单)
+                <Option
+                  value="5"
+                  style={{
+                    display: this.props.processState >= 6 ? "block" : "none",
+                  }}
+                >
+                  财务专员(退单)
                 </Option>
-                  <Option
-                    value="6"
-                    style={{
-                      display: this.props.processState >= 7 ? "block" : "none"
-                    }}
-                  >
-                    财务总监
+                <Option
+                  value="6"
+                  style={{
+                    display: this.props.processState >= 7 ? "block" : "none",
+                  }}
+                >
+                  财务总监
                 </Option>
-                  <Option
-                    value="7"
-                    style={{
-                      display: this.props.processState >= 8 ? "block" : "none"
-                    }}
-                  >
-                    总裁
+                <Option
+                  value="7"
+                  style={{
+                    display: this.props.processState >= 8 ? "block" : "none",
+                  }}
+                >
+                  总裁
                 </Option>
-                </Select>
-              </div>
-            ) : (
-                ""
-              )
+              </Select>
+            </div>
           ) : (
             ""
-          )}
+          )
+        ) : (
+          ""
+        )}
 
         <Button
           type="primary"
@@ -1735,9 +1788,9 @@ class ChangeDetail extends Component {
             display:
               (this.props.data.processState == 7 ||
                 this.props.data.processState == 8) &&
-                this.props.data.status == 2
+              this.props.data.status == 2
                 ? "block"
-                : "none"
+                : "none",
           }}
           onClick={this.finish}
         >
@@ -1757,9 +1810,9 @@ class ChangeDetail extends Component {
                 display:
                   (this.props.data.processState == 7 ||
                     this.props.data.processState == 8) &&
-                    this.props.data.status == 4
+                  this.props.data.status == 4
                     ? "block"
-                    : "block"
+                    : "block",
               }}
             >
               打印
@@ -1780,7 +1833,7 @@ class ChangeDetail extends Component {
           <Form
             layout="horizontal"
             onSubmit={this.nextSubmit}
-          // id="demand-form"
+            // id="demand-form"
           >
             <Spin spinning={this.state.loading}>
               <div className="clearfix">
@@ -1793,11 +1846,12 @@ class ChangeDetail extends Component {
                     style={{ width: "155px" }}
                     placeholder="请输入退款金额"
                     value={this.state.refundMoney}
-                    onChange={e => {
+                    onChange={(e) => {
                       this.setState({
-                        refundMoney: e.target.value
-                      })
-                    }} />
+                        refundMoney: e.target.value,
+                      });
+                    }}
+                  />
                 </FormItem>
 
                 <FormItem
@@ -1812,11 +1866,12 @@ class ChangeDetail extends Component {
                         : null
                     }
                     onChange={(date, dateString) => {
-                      console.log(date, dateString)
+                      console.log(date, dateString);
                       this.setState({
-                        refundDate: dateString
-                      })
-                    }} />
+                        refundDate: dateString,
+                      });
+                    }}
+                  />
                 </FormItem>
 
                 <FormItem
@@ -1830,10 +1885,10 @@ class ChangeDetail extends Component {
                     placeholder="请输入备注信息"
                     style={{ width: "95%" }}
                     value={this.state.refundRemarks}
-                    onChange={e => {
+                    onChange={(e) => {
                       this.setState({
-                        refundRemarks: e.target.value
-                      })
+                        refundRemarks: e.target.value,
+                      });
                     }}
                   />
                 </FormItem>
@@ -1848,7 +1903,7 @@ class ChangeDetail extends Component {
                     onClick={this.sumitRefund}
                   >
                     保存
-                      </Button>
+                  </Button>
                   <Button
                     className="submitSave"
                     type="ghost"
@@ -1856,10 +1911,9 @@ class ChangeDetail extends Component {
                     onClick={this.refundCancel}
                   >
                     取消
-                      </Button>
+                  </Button>
                 </FormItem>
               </div>
-
             </Spin>
           </Form>
         </Modal>

+ 47 - 30
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -6,6 +6,7 @@ import { getProcessStatusNew, changeColor } from "@/tools.js";
 import { shenghePeo } from "@/tools.js";
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
+import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import "./xButton.less";
 import Refund from "./refund.js"
@@ -364,7 +365,7 @@ class ChangeDetail extends Component {
       <div className="clearfix changeDetail">
         <div
           className="clearfix"
-          ref={e => {
+          ref={(e) => {
             this.refs = e;
           }}
         >
@@ -381,9 +382,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4
+                this.props.data.status == 4
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             {/* <span
@@ -400,6 +401,21 @@ class ChangeDetail extends Component {
             </span> */}
             <img src={tongguo} style={{ width: "100%" }} />
           </div>
+          <div
+            style={{
+              borderRadius: "50%",
+              width: 300,
+              height: 300,
+              position: "absolute",
+              top: 284,
+              left: 586,
+              transform: "rotate(-5deg)",
+              zIndex: 1,
+              display: this.props.data.status == 5 ? "block" : "none",
+            }}
+          >
+            <img src={quxiao} style={{ width: "63%" }} />
+          </div>
 
           <h2 style={{ textAlign: "center", marginBottom: 10 }}>
             合同变更记录
@@ -416,10 +432,10 @@ class ChangeDetail extends Component {
               className="demandDetailShow-upload"
               listType="picture-card"
               fileList={orgCodeUrl}
-              onPreview={file => {
+              onPreview={(file) => {
                 this.setState({
                   previewImage: file.url || file.thumbUrl,
-                  previewVisible: true
+                  previewVisible: true,
                 });
               }}
             />
@@ -446,7 +462,7 @@ class ChangeDetail extends Component {
               overflow: "hidden",
               paddingLeft: "90px",
               position: "relative",
-              bottom: "0px"
+              bottom: "0px",
             }}
           >
             {/* <span>操作人:</span> */}
@@ -469,7 +485,7 @@ class ChangeDetail extends Component {
                     width: "100%",
                     height: "auto",
                     wordBreak: "break-all",
-                    marginBottom: "10px"
+                    marginBottom: "10px",
                   }}
                 >
                   {item.aname + ":" + "(" + item.status + ")" + item.remarks}
@@ -542,9 +558,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                  (this.props.data.status == 2 || this.props.data.status == 4)
+                (this.props.data.status == 2 || this.props.data.status == 4)
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -557,12 +573,11 @@ class ChangeDetail extends Component {
               columns={this.state.ContactsLists}
               dataSource={this.state.contactList}
             />
-
           </div>
 
           <div
             style={{
-              display: this.props.data.processState > 5 ? "block" : "none"
+              display: this.props.data.processState > 5 ? "block" : "none",
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -653,10 +668,12 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4 && this.props.data.refundStatus
+                this.props.data.status == 4 &&
+                this.props.data.refundStatus
                   ? "block"
-                  : "none"
-            }}>
+                  : "none",
+            }}
+          >
             <Refund data={this.props.data} id={this.props.id} />
           </div>
         </div>
@@ -664,7 +681,7 @@ class ChangeDetail extends Component {
           1 ? (
             <div
               style={{
-                display: this.props.data.isExamine == 0 ? "block" : "none"
+                display: this.props.data.isExamine == 0 ? "block" : "none",
               }}
             >
               <div style={{ marginBottom: "10px" }}>
@@ -677,7 +694,7 @@ class ChangeDetail extends Component {
                     value={this.state.reason}
                     rows={4}
                     placeholder="请输入备注"
-                    onChange={e => {
+                    onChange={(e) => {
                       let reason = e.target.value;
                       this.setState({ reason });
                     }}
@@ -714,16 +731,16 @@ class ChangeDetail extends Component {
                   float: "left",
                   position: "relative",
                   bottom: "28px",
-                  right: "-600px"
+                  right: "-600px",
                 }}
-                onChange={val => {
+                onChange={(val) => {
                   this.setState({ rejectState: val });
                 }}
               >
                 <Option
                   value="0"
                   style={{
-                    display: this.props.processState >= 1 ? "block" : "none"
+                    display: this.props.processState >= 1 ? "block" : "none",
                   }}
                 >
                   营销员
@@ -731,7 +748,7 @@ class ChangeDetail extends Component {
                 <Option
                   value="1"
                   style={{
-                    display: this.props.processState >= 2 ? "block" : "none"
+                    display: this.props.processState >= 2 ? "block" : "none",
                   }}
                 >
                   营销管理员
@@ -739,7 +756,7 @@ class ChangeDetail extends Component {
                 <Option
                   value="2"
                   style={{
-                    display: this.props.processState >= 3 ? "block" : "none"
+                    display: this.props.processState >= 3 ? "block" : "none",
                   }}
                 >
                   咨询师
@@ -747,7 +764,7 @@ class ChangeDetail extends Component {
                 <Option
                   value="3"
                   style={{
-                    display: this.props.processState >= 4 ? "block" : "none"
+                    display: this.props.processState >= 4 ? "block" : "none",
                   }}
                 >
                   咨询师经理
@@ -755,7 +772,7 @@ class ChangeDetail extends Component {
                 <Option
                   value="4"
                   style={{
-                    display: this.props.processState >= 5 ? "block" : "none"
+                    display: this.props.processState >= 5 ? "block" : "none",
                   }}
                 >
                   咨询师总监
@@ -763,7 +780,7 @@ class ChangeDetail extends Component {
                 <Option
                   value="5"
                   style={{
-                    display: this.props.processState >= 6 ? "block" : "none"
+                    display: this.props.processState >= 6 ? "block" : "none",
                   }}
                 >
                   财务专员(退单)
@@ -771,7 +788,7 @@ class ChangeDetail extends Component {
                 <Option
                   value="6"
                   style={{
-                    display: this.props.processState >= 7 ? "block" : "none"
+                    display: this.props.processState >= 7 ? "block" : "none",
                   }}
                 >
                   财务总监
@@ -779,7 +796,7 @@ class ChangeDetail extends Component {
                 <Option
                   value="7"
                   style={{
-                    display: this.props.processState >= 8 ? "block" : "none"
+                    display: this.props.processState >= 8 ? "block" : "none",
                   }}
                 >
                   总裁
@@ -787,11 +804,11 @@ class ChangeDetail extends Component {
               </Select>
             </div>
           ) : (
-              ""
-            )
-        ) : (
             ""
-          )}
+          )
+        ) : (
+          ""
+        )}
         {/* <ReactToPrint
           trigger={() => (
             <div className="clearfix">

+ 42 - 25
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -6,6 +6,7 @@ import { getProcessStatusNew, changeColor } from "@/tools.js";
 import { shenghePeo } from "@/tools.js"
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
+import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import "./xButton.less";
 // import ReactToPrint from "react-to-print";
@@ -340,7 +341,7 @@ class ChangeDetail extends Component {
       <div className="clearfix changeDetail">
         <div
           className="clearfix"
-          ref={e => {
+          ref={(e) => {
             this.refs = e;
           }}
         >
@@ -357,9 +358,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4
+                this.props.data.status == 4
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             {/* <span
@@ -376,6 +377,21 @@ class ChangeDetail extends Component {
             </span> */}
             <img src={tongguo} style={{ width: "100%" }} />
           </div>
+          <div
+            style={{
+              borderRadius: "50%",
+              width: 300,
+              height: 300,
+              position: "absolute",
+              top: 284,
+              left: 586,
+              transform: "rotate(-5deg)",
+              zIndex: 1,
+              display: this.props.data.status == 5 ? "block" : "none",
+            }}
+          >
+            <img src={quxiao} style={{ width: "63%" }} />
+          </div>
 
           <h2 style={{ textAlign: "center", marginBottom: 10 }}>
             合同变更记录
@@ -392,10 +408,10 @@ class ChangeDetail extends Component {
               className="demandDetailShow-upload"
               listType="picture-card"
               fileList={orgCodeUrl}
-              onPreview={file => {
+              onPreview={(file) => {
                 this.setState({
                   previewImage: file.url || file.thumbUrl,
-                  previewVisible: true
+                  previewVisible: true,
                 });
               }}
             />
@@ -431,7 +447,7 @@ class ChangeDetail extends Component {
               overflow: "hidden",
               paddingLeft: "90px",
               position: "relative",
-              bottom: "0px"
+              bottom: "0px",
             }}
           >
             {/* <span>操作人:</span> */}
@@ -454,7 +470,7 @@ class ChangeDetail extends Component {
                     width: "100%",
                     height: "auto",
                     wordBreak: "break-all",
-                    marginBottom: "10px"
+                    marginBottom: "10px",
                   }}
                 >
                   {item.aname + ":" + "(" + item.status + ")" + item.remarks}
@@ -494,18 +510,19 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4 && this.props.data.refundStatus
+                this.props.data.status == 4 &&
+                this.props.data.refundStatus
                   ? "block"
-                  : "none"
-            }}>
-
+                  : "none",
+            }}
+          >
             <Refund data={this.props.data} id={this.props.id} />
           </div>
         </div>
         {this.props.processState === this.props.data.processState ? (
           <div
             style={{
-              display: this.props.data.isExamine == 0 ? "block" : "none"
+              display: this.props.data.isExamine == 0 ? "block" : "none",
             }}
           >
             <div className="clearfix" style={{ marginBottom: "10px" }}>
@@ -520,7 +537,7 @@ class ChangeDetail extends Component {
                   placeholder="请输入备注信息"
                   style={{ width: "95%" }}
                   value={this.state.reason}
-                  onChange={e => {
+                  onChange={(e) => {
                     let reason = e.target.value;
                     this.setState({ reason });
                   }}
@@ -557,16 +574,16 @@ class ChangeDetail extends Component {
                 float: "left",
                 position: "relative",
                 bottom: "28px",
-                right: "-600px"
+                right: "-600px",
               }}
-              onChange={val => {
+              onChange={(val) => {
                 this.setState({ rejectState: val });
               }}
             >
               <Option
                 value="0"
                 style={{
-                  display: this.props.processState >= 1 ? "block" : "none"
+                  display: this.props.processState >= 1 ? "block" : "none",
                 }}
               >
                 营销员
@@ -574,7 +591,7 @@ class ChangeDetail extends Component {
               <Option
                 value="1"
                 style={{
-                  display: this.props.processState >= 2 ? "block" : "none"
+                  display: this.props.processState >= 2 ? "block" : "none",
                 }}
               >
                 营销管理员
@@ -582,7 +599,7 @@ class ChangeDetail extends Component {
               <Option
                 value="2"
                 style={{
-                  display: this.props.processState >= 3 ? "block" : "none"
+                  display: this.props.processState >= 3 ? "block" : "none",
                 }}
               >
                 咨询师
@@ -590,7 +607,7 @@ class ChangeDetail extends Component {
               <Option
                 value="3"
                 style={{
-                  display: this.props.processState >= 4 ? "block" : "none"
+                  display: this.props.processState >= 4 ? "block" : "none",
                 }}
               >
                 咨询师经理
@@ -598,7 +615,7 @@ class ChangeDetail extends Component {
               <Option
                 value="4"
                 style={{
-                  display: this.props.processState >= 5 ? "block" : "none"
+                  display: this.props.processState >= 5 ? "block" : "none",
                 }}
               >
                 咨询师总监
@@ -606,7 +623,7 @@ class ChangeDetail extends Component {
               <Option
                 value="5"
                 style={{
-                  display: this.props.processState >= 6 ? "block" : "none"
+                  display: this.props.processState >= 6 ? "block" : "none",
                 }}
               >
                 财务专员(退单)
@@ -614,7 +631,7 @@ class ChangeDetail extends Component {
               <Option
                 value="6"
                 style={{
-                  display: this.props.processState >= 7 ? "block" : "none"
+                  display: this.props.processState >= 7 ? "block" : "none",
                 }}
               >
                 财务总监
@@ -622,7 +639,7 @@ class ChangeDetail extends Component {
               <Option
                 value="7"
                 style={{
-                  display: this.props.processState >= 8 ? "block" : "none"
+                  display: this.props.processState >= 8 ? "block" : "none",
                 }}
               >
                 总裁
@@ -630,8 +647,8 @@ class ChangeDetail extends Component {
             </Select>
           </div>
         ) : (
-            ""
-          )}
+          ""
+        )}
         {/* <ReactToPrint
           trigger={() => (
             <div className="clearfix">

+ 146 - 129
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -6,6 +6,7 @@ import { getProcessStatusNew, changeColor } from "@/tools.js";
 import { shenghePeo } from "@/tools.js";
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
+import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import "./xButton.less";
 import Refund from "./refund.js"
@@ -353,7 +354,7 @@ class ChangeDetail extends Component {
       <div className="clearfix changeDetail">
         <div
           className="clearfix"
-          ref={e => {
+          ref={(e) => {
             this.refs = e;
           }}
         >
@@ -370,9 +371,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4
+                this.props.data.status == 4
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             {/* <span
@@ -389,6 +390,21 @@ class ChangeDetail extends Component {
             </span> */}
             <img src={tongguo} style={{ width: "100%" }} />
           </div>
+          <div
+            style={{
+              borderRadius: "50%",
+              width: 300,
+              height: 300,
+              position: "absolute",
+              top: 284,
+              left: 586,
+              transform: "rotate(-5deg)",
+              zIndex: 1,
+              display: this.props.data.status == 5 ? "block" : "none",
+            }}
+          >
+            <img src={quxiao} style={{ width: "63%" }} />
+          </div>
 
           <h2 style={{ textAlign: "center", marginBottom: 10 }}>
             合同变更记录
@@ -405,10 +421,10 @@ class ChangeDetail extends Component {
               className="demandDetailShow-upload"
               listType="picture-card"
               fileList={orgCodeUrl}
-              onPreview={file => {
+              onPreview={(file) => {
                 this.setState({
                   previewImage: file.url || file.thumbUrl,
-                  previewVisible: true
+                  previewVisible: true,
                 });
               }}
             />
@@ -435,7 +451,7 @@ class ChangeDetail extends Component {
               overflow: "hidden",
               paddingLeft: "90px",
               position: "relative",
-              bottom: "0px"
+              bottom: "0px",
             }}
           >
             {/* <span>操作人:</span> */}
@@ -458,7 +474,7 @@ class ChangeDetail extends Component {
                     width: "100%",
                     height: "auto",
                     wordBreak: "break-all",
-                    marginBottom: "10px"
+                    marginBottom: "10px",
                   }}
                 >
                   {item.aname + ":" + "(" + item.status + ")" + item.remarks}
@@ -531,9 +547,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                  (this.props.data.status == 2 || this.props.data.status == 4)
+                (this.props.data.status == 2 || this.props.data.status == 4)
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -546,12 +562,11 @@ class ChangeDetail extends Component {
               columns={this.state.ContactsLists}
               dataSource={this.state.contactList}
             />
-
           </div>
 
           <div
             style={{
-              display: this.props.data.processState > 5 ? "block" : "none"
+              display: this.props.data.processState > 5 ? "block" : "none",
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -591,141 +606,143 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4 && this.props.data.refundStatus
+                this.props.data.status == 4 &&
+                this.props.data.refundStatus
                   ? "block"
-                  : "none"
-            }}>
+                  : "none",
+            }}
+          >
             <Refund data={this.props.data} id={this.props.id} />
           </div>
         </div>
         {this.props.data.processState === 4 &&
-          (this.props.data.status == 1 || this.props.data.status == 3) ? (
-            // this.state.buttonStatus ? (
-            <div>
-              <div style={{ marginBottom: 10 }}>
-                <Form.Item
-                  label="备注"
-                  labelCol={{ span: 4 }}
-                  wrapperCol={{ span: 14 }}
-                >
-                  <Input.TextArea
-                    value={this.state.reason}
-                    rows={4}
-                    placeholder="请输入备注"
-                    onChange={e => {
-                      let reason = e.target.value;
-                      this.setState({ reason });
-                    }}
-                  />
-                </Form.Item>
-              </div>
-
-              <div
-                className="clearfix"
-                style={{ display: "flex", justifyContent: "space-around" }}
+        (this.props.data.status == 1 || this.props.data.status == 3) ? (
+          // this.state.buttonStatus ? (
+          <div>
+            <div style={{ marginBottom: 10 }}>
+              <Form.Item
+                label="备注"
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 14 }}
               >
-                {buttonData.map((item, index) => {
-                  return (
-                    <AgreeButton
-                      data={item}
-                      key={index}
-                      backData={this.props.data}
-                      processState={this.props.processState}
-                      visible={this.changeButtonStatus}
-                      loadData={this.props.loadData}
-                      ajaxData={this.state}
-                      rejectState={this.state.rejectState}
-                      reason={this.state.reason}
-                      onCancel={this.props.onCancel}
-                    />
-                  );
-                })}
-              </div>
-              <Select
-                defaultValue="0"
+                <Input.TextArea
+                  value={this.state.reason}
+                  rows={4}
+                  placeholder="请输入备注"
+                  onChange={(e) => {
+                    let reason = e.target.value;
+                    this.setState({ reason });
+                  }}
+                />
+              </Form.Item>
+            </div>
+
+            <div
+              className="clearfix"
+              style={{ display: "flex", justifyContent: "space-around" }}
+            >
+              {buttonData.map((item, index) => {
+                return (
+                  <AgreeButton
+                    data={item}
+                    key={index}
+                    backData={this.props.data}
+                    processState={this.props.processState}
+                    visible={this.changeButtonStatus}
+                    loadData={this.props.loadData}
+                    ajaxData={this.state}
+                    rejectState={this.state.rejectState}
+                    reason={this.state.reason}
+                    onCancel={this.props.onCancel}
+                  />
+                );
+              })}
+            </div>
+            <Select
+              defaultValue="0"
+              style={{
+                width: 120,
+                float: "left",
+                position: "relative",
+                bottom: "28px",
+                right: "-600px",
+              }}
+              onChange={(val) => {
+                this.setState({ rejectState: val });
+              }}
+            >
+              <Option
+                value="0"
                 style={{
-                  width: 120,
-                  float: "left",
-                  position: "relative",
-                  bottom: "28px",
-                  right: "-600px"
-                }}
-                onChange={val => {
-                  this.setState({ rejectState: val });
+                  display: this.props.processState >= 1 ? "block" : "none",
                 }}
               >
-                <Option
-                  value="0"
-                  style={{
-                    display: this.props.processState >= 1 ? "block" : "none"
-                  }}
-                >
-                  营销员
+                营销员
               </Option>
-                <Option
-                  value="1"
-                  style={{
-                    display: this.props.processState >= 2 ? "block" : "none"
-                  }}
-                >
-                  营销管理员
+              <Option
+                value="1"
+                style={{
+                  display: this.props.processState >= 2 ? "block" : "none",
+                }}
+              >
+                营销管理员
               </Option>
-                <Option
-                  value="2"
-                  style={{
-                    display: this.props.processState >= 3 ? "block" : "none"
-                  }}
-                >
-                  咨询师
+              <Option
+                value="2"
+                style={{
+                  display: this.props.processState >= 3 ? "block" : "none",
+                }}
+              >
+                咨询师
               </Option>
-                <Option
-                  value="3"
-                  style={{
-                    display: this.props.processState >= 4 ? "block" : "none"
-                  }}
-                >
-                  咨询师经理
+              <Option
+                value="3"
+                style={{
+                  display: this.props.processState >= 4 ? "block" : "none",
+                }}
+              >
+                咨询师经理
               </Option>
-                <Option
-                  value="4"
-                  style={{
-                    display: this.props.processState >= 5 ? "block" : "none"
-                  }}
-                >
-                  咨询师总监
+              <Option
+                value="4"
+                style={{
+                  display: this.props.processState >= 5 ? "block" : "none",
+                }}
+              >
+                咨询师总监
               </Option>
-                <Option
-                  value="5"
-                  style={{
-                    display: this.props.processState >= 6 ? "block" : "none"
-                  }}
-                >
-                  财务专员(退单)
+              <Option
+                value="5"
+                style={{
+                  display: this.props.processState >= 6 ? "block" : "none",
+                }}
+              >
+                财务专员(退单)
               </Option>
-                <Option
-                  value="6"
-                  style={{
-                    display: this.props.processState >= 7 ? "block" : "none"
-                  }}
-                >
-                  财务总监
+              <Option
+                value="6"
+                style={{
+                  display: this.props.processState >= 7 ? "block" : "none",
+                }}
+              >
+                财务总监
               </Option>
-                <Option
-                  value="7"
-                  style={{
-                    display: this.props.processState >= 8 ? "block" : "none"
-                  }}
-                >
-                  总裁
+              <Option
+                value="7"
+                style={{
+                  display: this.props.processState >= 8 ? "block" : "none",
+                }}
+              >
+                总裁
               </Option>
-              </Select>
-            </div>
-          ) : (
-            // ) : (
-            //   ""
-            // )
-            ""
-          )}
+            </Select>
+          </div>
+        ) : (
+          // ) : (
+          //   ""
+          // )
+          ""
+        )}
         {/* <ReactToPrint
           trigger={() => (
             <div className="clearfix">

+ 36 - 19
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js

@@ -6,6 +6,7 @@ import { getProcessStatusNew } from "../../../../tools.js";
 import { shenghePeo, changeColor } from "@/tools.js";
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
+import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 // import ReactToPrint from "react-to-print";
 const FormItem = Form.Item;
@@ -347,7 +348,7 @@ class ChangeDetail extends Component {
       <div className="clearfix changeDetail">
         <div
           className="clearfix"
-          ref={e => {
+          ref={(e) => {
             this.refs = e;
           }}
         >
@@ -364,9 +365,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4
+                this.props.data.status == 4
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             {/* <span
@@ -383,6 +384,21 @@ class ChangeDetail extends Component {
             </span> */}
             <img src={tongguo} style={{ width: "100%" }} />
           </div>
+          <div
+            style={{
+              borderRadius: "50%",
+              width: 300,
+              height: 300,
+              position: "absolute",
+              top: 284,
+              left: 586,
+              transform: "rotate(-5deg)",
+              zIndex: 1,
+              display: this.props.data.status == 5 ? "block" : "none",
+            }}
+          >
+            <img src={quxiao} style={{ width: "63%" }} />
+          </div>
 
           <h2 style={{ textAlign: "center", marginBottom: 10, marginTop: 20 }}>
             合同变更记录
@@ -399,10 +415,10 @@ class ChangeDetail extends Component {
               className="demandDetailShow-upload"
               listType="picture-card"
               fileList={orgCodeUrl}
-              onPreview={file => {
+              onPreview={(file) => {
                 this.setState({
                   previewImage: file.url || file.thumbUrl,
-                  previewVisible: true
+                  previewVisible: true,
                 });
               }}
             />
@@ -430,7 +446,7 @@ class ChangeDetail extends Component {
               overflow: "hidden",
               paddingLeft: "90px",
               position: "relative",
-              bottom: "20px"
+              bottom: "20px",
             }}
           >
             {/* <span>操作人:</span> */}
@@ -453,7 +469,7 @@ class ChangeDetail extends Component {
                     width: "100%",
                     height: "auto",
                     wordBreak: "break-all",
-                    marginBottom: "10px"
+                    marginBottom: "10px",
                   }}
                 >
                   {item.aname + ":" + "(" + item.status + ")" + item.remarks}
@@ -511,9 +527,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                  (this.props.data.status == 2 || this.props.data.status == 4)
+                (this.props.data.status == 2 || this.props.data.status == 4)
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -526,12 +542,11 @@ class ChangeDetail extends Component {
               columns={this.state.ContactsLists}
               dataSource={this.state.contactList}
             />
-
           </div>
 
           <div
             style={{
-              display: this.props.data.processState > 5 ? "block" : "none"
+              display: this.props.data.processState > 5 ? "block" : "none",
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -585,10 +600,12 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4 && this.props.data.refundStatus
+                this.props.data.status == 4 &&
+                this.props.data.refundStatus
                   ? "block"
-                  : "none"
-            }}>
+                  : "none",
+            }}
+          >
             <Refund data={this.props.data} id={this.props.id} />
           </div>
         </div>
@@ -608,7 +625,7 @@ class ChangeDetail extends Component {
                     placeholder="请输入备注信息"
                     style={{ width: "95%" }}
                     value={this.state.reason}
-                    onChange={e => {
+                    onChange={(e) => {
                       let reason = e.target.value;
                       this.setState({ reason });
                     }}
@@ -639,11 +656,11 @@ class ChangeDetail extends Component {
               </div>
             </div>
           ) : (
-              ""
-            )
-        ) : (
             ""
-          )}
+          )
+        ) : (
+          ""
+        )}
         {/* <ReactToPrint
           trigger={() => (
             <div className="clearfix">

+ 13 - 10
js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx

@@ -371,22 +371,25 @@ const ProAndCuiList = React.createClass({
                   )}
                 </span>
               );
-            }
+            },
           },
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return text + "-" + record.id;
+            },
           },
           {
             title: "项目类别",
             dataIndex: "cname",
-            key: "cname"
+            key: "cname",
           },
           {
             title: "项目数量",
             dataIndex: "commodityQuantity",
-            key: "commodityQuantity"
+            key: "commodityQuantity",
           },
           {
             title: "金额(万元)",
@@ -398,28 +401,28 @@ const ProAndCuiList = React.createClass({
               } else {
                 return text;
               }
-            }
+            },
           },
           {
             title: "主要项目",
             dataIndex: "main",
             key: "main",
-            render: text => {
+            render: (text) => {
               return text ? "是" : "否";
-            }
+            },
           },
           {
             title: "项目负责人",
             dataIndex: "receiverName",
-            key: "receiverName"
+            key: "receiverName",
           },
           {
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            render: text => {
+            render: (text) => {
               return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
-            }
+            },
           },
         ];
         return (

+ 88 - 85
js/component/manageCenter/order/orderNew/press.jsx

@@ -40,7 +40,7 @@ const IntentionCustomer = Form.create()(React.createClass({
           for (let i = 0; i < data.data.list.length; i++) {
             let thisdata = data.data.list[i];
             theArr.push({
-              key: i,
+              key: i + 1,
               id: thisdata.id, //ID
               orderNo: thisdata.orderNo, //订单编号
               totalAmount: thisdata.totalAmount, //签单金额
@@ -486,90 +486,93 @@ const IntentionCustomer = Form.create()(React.createClass({
     const { TabPane } = Tabs;
 		return (
       <div className="user-content">
-        <div className="content-title">
-          <span>催款节点统计</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>催款节点统计</span>
         </div>
         <div className="user-search">
-        <Tabs
-          defaultActiveKey="1"
-          onChange={this.callback}
-          className="test">
-           <TabPane tab="搜索" key="1">
-          <Input
-            placeholder="客户名称"
-            style={{ width: "150px", marginBottom: "10px" ,marginLeft: 10}}
-            value={this.state.customerName}
-            onChange={e => {
-              this.setState({ customerName: e.target.value });
-            }}
-          />
-          <Input
-            placeholder="营销员名称"
-            style={{ width: "150px", marginBottom: "10px" }}
-            value={this.state.adminName}
-            onChange={e => {
-              this.setState({ adminName: e.target.value });
-            }}
-          />
-          <Input
-            placeholder="订单编号"
-            style={{ width: "150px" }}
-            value={this.state.orderNo}
-            onChange={e => {
-              this.setState({ orderNo: e.target.value });
-            }}
-          />
-          <Select
-            placeholder="选择部门"
-            style={{ width: 150, marginRight: "10px" }}
-            value={this.state.departmenttSearch}
-            onChange={e => {
-              this.setState({ departmenttSearch: e });
-            }}
-          >
-            {departmentArr.map(function(item) {
-              return <Select.Option key={item.id}>{item.name}</Select.Option>;
-            })}
-          </Select>
-          <Select
-            placeholder="选择催款节点类型"
-            style={{ width: 150, marginRight: "10px" }}
-            value={this.state.newStatus == 0 ? "旧催款节点" : "新催款节点"}
-            onChange={e => {
-              this.setState({ newStatus: e });
-            }}
-          >
-            <Select.Option key={0}>{"旧催款节点"}</Select.Option>
-            <Select.Option key={1}>{"新催款节点"}</Select.Option>
-          </Select>
-          <span style={{ marginRight: "10px" }}>下单时间 :</span>
-          <RangePicker
-            value={[
-              this.state.releaseDate[0]
-                ? moment(this.state.releaseDate[0])
-                : null,
-              this.state.releaseDate[1]
-                ? moment(this.state.releaseDate[1])
-                : null
-            ]}
-            onChange={(data, dataString) => {
-              this.setState({ releaseDate: dataString });
-            }}
-          />
-          <Button
-            type="primary"
-            onClick={this.search}
-            style={{ marginLeft: "10px" }}
-          >
-            搜索
-          </Button>
-          <Button onClick={this.reset}>重置</Button>
-          </TabPane>
-          <TabPane tab="导出催款列表" key="2">
-          <Button type="primary" onClick={this.exportExec} style={{marginBottom: 10,marginTop: 10,marginLeft: 10}}>
-            导出催款列表
-          </Button>
-          </TabPane>
+          <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
+            <TabPane tab="搜索" key="1">
+              <Input
+                placeholder="客户名称"
+                style={{ width: "150px", marginBottom: "10px", marginLeft: 10 }}
+                value={this.state.customerName}
+                onChange={(e) => {
+                  this.setState({ customerName: e.target.value });
+                }}
+              />
+              <Input
+                placeholder="营销员名称"
+                style={{ width: "150px", marginBottom: "10px" }}
+                value={this.state.adminName}
+                onChange={(e) => {
+                  this.setState({ adminName: e.target.value });
+                }}
+              />
+              <Input
+                placeholder="订单编号"
+                style={{ width: "150px" }}
+                value={this.state.orderNo}
+                onChange={(e) => {
+                  this.setState({ orderNo: e.target.value });
+                }}
+              />
+              <Select
+                placeholder="选择部门"
+                style={{ width: 150, marginRight: "10px" }}
+                value={this.state.departmenttSearch}
+                onChange={(e) => {
+                  this.setState({ departmenttSearch: e });
+                }}
+              >
+                {departmentArr.map(function (item) {
+                  return (
+                    <Select.Option key={item.id}>{item.name}</Select.Option>
+                  );
+                })}
+              </Select>
+              <Select
+                placeholder="选择催款节点类型"
+                style={{ width: 150, marginRight: "10px" }}
+                value={this.state.newStatus == 0 ? "旧催款节点" : "新催款节点"}
+                onChange={(e) => {
+                  this.setState({ newStatus: e });
+                }}
+              >
+                <Select.Option key={0}>{"旧催款节点"}</Select.Option>
+                <Select.Option key={1}>{"新催款节点"}</Select.Option>
+              </Select>
+              <span style={{ marginRight: "10px" }}>下单时间 :</span>
+              <RangePicker
+                value={[
+                  this.state.releaseDate[0]
+                    ? moment(this.state.releaseDate[0])
+                    : null,
+                  this.state.releaseDate[1]
+                    ? moment(this.state.releaseDate[1])
+                    : null,
+                ]}
+                onChange={(data, dataString) => {
+                  this.setState({ releaseDate: dataString });
+                }}
+              />
+              <Button
+                type="primary"
+                onClick={this.search}
+                style={{ marginLeft: "10px" }}
+              >
+                搜索
+              </Button>
+              <Button onClick={this.reset}>重置</Button>
+            </TabPane>
+            <TabPane tab="导出催款列表" key="2">
+              <Button
+                type="primary"
+                onClick={this.exportExec}
+                style={{ marginBottom: 10, marginTop: 10, marginLeft: 10 }}
+              >
+                导出催款列表
+              </Button>
+            </TabPane>
           </Tabs>
           <div className="patent-table">
             <Spin spinning={this.state.loading}>
@@ -611,7 +614,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                         style={{
                           marginTop: "2px",
                           width: "240px",
-                          height: "32px"
+                          height: "32px",
                         }}
                         showTime
                         format="YYYY-MM-DD"
@@ -636,7 +639,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                         placeholder="请输入催款情况"
                         rows={4}
                         value={this.state.remarks}
-                        onChange={e => {
+                        onChange={(e) => {
                           this.setState({ remarks: e.target.value });
                         }}
                       />