hujie123456 5 years ago
parent
commit
bf6e702867

+ 5 - 0
css/base.less

@@ -514,3 +514,8 @@ body {
 .chooseList>.ant-checkbox-wrapper {
   width: 80%;
 }
+#demand-form .half-item {
+    float: left;
+    width: 50%;
+    margin-bottom: 0px !important;
+}

+ 61 - 17
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -353,15 +353,17 @@ const approvedOutsourcing = React.createClass({
                   </Button>
                 )}
                 {
-                  <Button
-                    type="primary"
-                    style={{ marginLeft: "5px" }}
-                    onClick={e => {
-                      e.stopPropagation(), this.evaluateY(recard, "财务专员");
-                    }}
-                  >
-                    转交
-                  </Button>
+                  // <Button
+                  //   type="primary"
+                  //   style={{ marginLeft: "5px" }}
+                  //   onClick={e => {
+                  //     e.stopPropagation(), this.evaluateY(recard, "财务专员");
+                  //     console.log(recard);
+                      
+                  //   }}
+                  // >
+                  //   转交
+                  // </Button>
                 }
               </div>
             );
@@ -1384,7 +1386,6 @@ const approvedOutsourcing = React.createClass({
       selectedRowKeys,
       onChange: this.onSelectChange,
       hideDefaultSelections: true,
-      type: "radio"
     };
     const jsDate = this.state.jsDate || [];
     return (
@@ -1523,7 +1524,7 @@ const approvedOutsourcing = React.createClass({
             </Button>
             <Button
               type="primary"
-              disabled={!this.state.selectedRowKeys.length}
+              disabled={this.state.selectedRowKeys.length != 1}
               style={{ margin: "0px 0px 10px 10px" }}
               onClick={this.exportKaip}
             >
@@ -1531,7 +1532,7 @@ const approvedOutsourcing = React.createClass({
             </Button>
             <Button
               type="primary"
-              disabled={!this.state.selectedRowKeys.length}
+              disabled={this.state.selectedRowKeys.length != 1}
               style={{ margin: "0px 0px 10px 10px" }}
               onClick={this.exportWater}
             >
@@ -1566,6 +1567,19 @@ const approvedOutsourcing = React.createClass({
               详情收款流水
             </Button>
           </TabPane>
+          <TabPane tab="批量操作" key="6">
+            <Button
+              type="primary"
+              disabled={this.state.selectedRowKeys.length == 0}
+              style={{ margin: "0px 0px 10px 10px" }}
+              onClick={e => {
+                e.stopPropagation(),
+                  this.evaluateY(this.state.selectedRowKeys, "财务专员");
+              }}
+            >
+              转交
+            </Button>
+          </TabPane>
         </Tabs>
 
         <div className="patent-table">
@@ -1591,9 +1605,7 @@ const approvedOutsourcing = React.createClass({
           >
             {
               <span style={{ marginRight: 10 }}>
-                {`收款金额总计(万元):${
-                  this.state.hui ? this.state.hui : "0"
-                }`}
+                {`收款金额总计(万元):${this.state.hui ? this.state.hui : "0"}`}
               </span>
             }
             {
@@ -1802,14 +1814,46 @@ const approvedOutsourcing = React.createClass({
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
-                        label="财务负责人"
+                        label="当前财务负责人"
+                      >
+                        <span>{theData.nowFinance}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="当前财务负责人电话"
+                      >
+                        <span>{theData.nowFinanceMobile}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        style={{ opacity: ".5" }}
+                        label="原订单负责人"
+                      >
+                        <span>{theData.oldSalesmanName}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        style={{ opacity: ".5" }}
+                        label="原订单负责人电话"
+                      >
+                        <span>{theData.oldSalesmanMobile}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        style={{ opacity: ".5" }}
+                        label="实际财务操作人"
                       >
                         <span>{theData.financeName}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
-                        label="财务负责人电话"
+                        style={{ opacity: ".5" }}
+                        label="实际财务操作人电话"
                       >
                         <span>{theData.financeMobile}</span>
                       </FormItem>

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

@@ -1096,9 +1096,11 @@ const ShouKuang = React.createClass({
           <TabPane tab="批量操作" key="6">
             <Button
               type="primary"
-              style={{ marginLeft: "5px" }}
+              disabled={this.state.selectedRowKeys.length == 0}
+              style={{ margin: "0px 0px 10px 10px" }}
               onClick={e => {
-                e.stopPropagation(), this.evaluateY(this.state.selectedRowKeys, "财务专员");
+                e.stopPropagation(),
+                  this.evaluateY(this.state.selectedRowKeys, "财务专员");
               }}
             >
               转交

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

@@ -485,14 +485,46 @@ const OrderDetail = Form.create()(React.createClass({
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="财务负责人"
+                    label="当前财务负责人"
+                  >
+                    <span>{theData.nowFinance}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="当前财务负责人电话"
+                  >
+                    <span>{theData.nowFinanceMobile}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="原订单负责人"
+                  >
+                    <span>{theData.oldSalesmanName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="原订单负责人电话"
+                  >
+                    <span>{theData.oldSalesmanMobile}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="实际财务操作人"
                   >
                     <span>{theData.financeName}</span>
                   </FormItem>
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="财务负责人电话"
+                    style={{ opacity: ".5" }}
+                    label="实际财务操作人电话"
                   >
                     <span>{theData.financeMobile}</span>
                   </FormItem>

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

@@ -605,8 +605,12 @@ const NewService = Form.create()(
             userName: thisData.userName, //客户名称
             salesmanName: thisData.salesmanName, //营销员名称
             salesmanMobile: thisData.salesmanMobile, //营销员电话
+            oldSalesmanName: thisData.oldSalesmanName, //营销员名称
+            oldSalesmanMobile: thisData.oldSalesmanMobile, //营销员电话
             financeName: thisData.financeName, //财务名称
             financeMobile: thisData.financeMobile, //财务电话
+            nowFinanceMobile: thisData.nowFinanceMobile,
+            nowFinance: thisData.nowFinance,
             contractNo: thisData.contractNo, //合同编号
             approval:
               thisData.approval == 0
@@ -2052,14 +2056,50 @@ const NewService = Form.create()(
                             <FormItem
                               className="half-item"
                               {...formItemLayout}
-                              label="财务负责人"
+                              label="当前财务负责人"
+                            >
+                              <span>{this.state.nowFinance}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="当前财务负责人电话"
+                            >
+                              <span>{this.state.nowFinanceMobile}</span>
+                            </FormItem>
+                          </div>
+                          <div className="clearfix">
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              style={{ opacity: ".5" }}
+                              label="原订单负责人"
+                            >
+                              <span>{this.state.oldSalesmanName}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              style={{ opacity: ".5" }}
+                              label="原订单负责人电话"
+                            >
+                              <span>{this.state.oldSalesmanMobile}</span>
+                            </FormItem>
+                          </div>
+                          <div className="clearfix">
+                            <FormItem
+                              className="half-item"
+                              style={{ opacity: ".5" }}
+                              {...formItemLayout}
+                              label="实际财务操作人"
                             >
                               <span>{this.state.financeName}</span>
                             </FormItem>
                             <FormItem
                               className="half-item"
                               {...formItemLayout}
-                              label="财务负责人电话"
+                              style={{ opacity: ".5" }}
+                              label="实际财务操作人电话"
                             >
                               <span>{this.state.financeMobile}</span>
                             </FormItem>

File diff suppressed because it is too large
+ 489 - 460
js/component/manageCenter/order/orderNew/addorders.js


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

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { Form, Upload, Modal, Button, Table, Col } from "antd";
+import { Form, Upload, Modal, Button, Table, Col, message } from "antd";
 import {
   splitUrl,
   getProcessStatus,
@@ -106,14 +106,16 @@ class OrderDetail extends Component {
     };
     this.tableRowClickX = this.tableRowClickX.bind(this);
     this.nextCancel = this.nextCancel.bind(this);
-    this.rotate = this.rotate.bind(this)
+    this.rotate = this.rotate.bind(this);
+    this.downImg = this.downImg.bind(this);
+    this.upImg = this.upImg.bind(this);
   }
 
   rotate() {
-    let rotateDeg = this.state.rotateDeg + 90 
+    let rotateDeg = this.state.rotateDeg + 90;
     this.setState({
       rotateDeg
-    })
+    });
   }
 
   //项目详情关闭
@@ -137,6 +139,40 @@ class OrderDetail extends Component {
       addState: 0
     });
   }
+  downImg() {
+    console.log(this.props.pictureUrl);
+    
+    let num = 0;
+    for (let i = 0; i < this.props.pictureUrl.length; i++) {
+      if (this.props.pictureUrl[i].url == this.state.previewImage) {
+        num = i;
+      }
+    }
+    if (num == this.props.pictureUrl.length - 1) {
+      return message.warning("已经是最后一张了哦");
+    }
+    this.state.previewImage = this.props.pictureUrl[num + 1].url;
+    this.setState({
+      previewImage: this.state.previewImage,
+      rotateDeg: 0
+    });
+  }
+  upImg() {
+    let num = 0;
+    for (let i = 0; i < this.props.pictureUrl.length; i++) {
+      if (this.props.pictureUrl[i].url == this.state.previewImage) {
+        num = i;
+      }
+    }
+    if (num == 0) {
+      return message.warning("已经是第一张了哦");
+    }
+    this.state.previewImage = this.props.pictureUrl[num - 1].url;
+    this.setState({
+      previewImage: this.state.previewImage,
+      rotateDeg: 0
+    });
+  }
 
   render() {
     const formItemLayout = {
@@ -259,18 +295,24 @@ class OrderDetail extends Component {
               footer={null}
               visible={this.state.previewVisible}
               onCancel={() => {
-                this.state.rotateDeg = 0
-                this.setState({ previewVisible: false, rotateDeg: this.state.rotateDeg });
+                this.state.rotateDeg = 0;
+                this.setState({
+                  previewVisible: false,
+                  rotateDeg: this.state.rotateDeg
+                });
               }}
             >
               <img
                 alt=""
-                style={{ width: "100%", transform: `rotate(${this.state.rotateDeg}deg)` }}
-                className="rotate"
+                style={{
+                  width: "100%",
+                  transform: `rotate(${this.state.rotateDeg}deg)`
+                }}
                 src={this.state.previewImage || ""}
-                // src={img}
               />
               <Button onClick={this.rotate}>旋转</Button>
+              <Button onClick={this.upImg}>上一张</Button>
+              <Button onClick={this.downImg}>下一张</Button>
             </Modal>
             <Button
               style={{
@@ -306,14 +348,50 @@ class OrderDetail extends Component {
           <FormItem
             className="half-item"
             {...formItemLayout}
-            label="财务负责人"
+            label="当前财务负责人"
+          >
+            <span>{data.nowFinance}</span>
+          </FormItem>
+          <FormItem
+            className="half-item"
+            {...formItemLayout}
+            label="当前财务负责人电话"
+          >
+            <span>{data.nowFinanceMobile}</span>
+          </FormItem>
+        </div>
+        <div className="clearfix">
+          <FormItem
+            className="half-item"
+            {...formItemLayout}
+            style={{ opacity: ".5" }}
+            label="原订单负责人"
+          >
+            <span>{data.oldSalesmanName}</span>
+          </FormItem>
+          <FormItem
+            className="half-item"
+            {...formItemLayout}
+            style={{ opacity: ".5" }}
+            label="原订单负责人电话"
+          >
+            <span>{data.oldSalesmanMobile}</span>
+          </FormItem>
+        </div>
+        <div className="clearfix">
+          <FormItem
+            className="half-item"
+            style={{ opacity: ".5" }}
+            {...formItemLayout}
+            label="实际财务操作人"
           >
             <span>{data.financeName}</span>
           </FormItem>
           <FormItem
             className="half-item"
             {...formItemLayout}
-            label="财务负责人电话"
+            style={{ opacity: ".5" }}
+            label="实际财务操作人电话"
           >
             <span>{data.financeMobile}</span>
           </FormItem>

+ 563 - 338
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -407,30 +407,40 @@ const IntentionCustomer = Form.create()(React.createClass({
 				} else {
 					let thisdata=data.data;
 					this.setState({
-						 id:thisdata.id,
-						 kehuId:thisdata.buyerId,
-						 orderNo: thisdata.orderNo,//订单编号
-						 contractNo: thisdata.contractNo,//合同编号
-						 userName:thisdata.userName,//客户名称
-						 signDate:thisdata.signDate,//签单时间
-						 processStatus:thisdata.processStatus,//流程状态
-	                     liquidationStatus:thisdata.liquidationStatus,//结算状态
-	                     contacts:thisdata.contacts,//企业联系人
-	                     contactMobile:thisdata.contactMobile,//联系人电话
-	                     legalPerson:thisdata.legalPerson,//法人
-	                     legalPersonTel:thisdata.legalPersonTel,//法人电话
-	                     firstAmount:thisdata.firstAmount,//签单金额
-	                     totalAmount:thisdata.totalAmount,//首付金额
-	                     settlementAmount:thisdata.settlementAmount,//已收款项
-	                     orderRemarks:thisdata.orderRemarks,//订单留言
-	                     orgCodeUrl: thisdata.contractPictureUrl ? splitUrl(thisdata.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],//图片地址
-	                     salesmanName:thisdata.salesmanName,//营销员名称
-	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
-	                     financeName:thisdata.financeName,//财务名称
-	                     financeMobile:thisdata.financeMobile,//财务电话
-	                     approval:thisdata.approval.toString(),//特批状态
-	                     //approval:thisdata.approval==0?thisdata.approval.toString():thisdata.approval,//特批状态
-					})
+            id: thisdata.id,
+            kehuId: thisdata.buyerId,
+            orderNo: thisdata.orderNo, //订单编号
+            contractNo: thisdata.contractNo, //合同编号
+            userName: thisdata.userName, //客户名称
+            signDate: thisdata.signDate, //签单时间
+            processStatus: thisdata.processStatus, //流程状态
+            liquidationStatus: thisdata.liquidationStatus, //结算状态
+            contacts: thisdata.contacts, //企业联系人
+            contactMobile: thisdata.contactMobile, //联系人电话
+            legalPerson: thisdata.legalPerson, //法人
+            legalPersonTel: thisdata.legalPersonTel, //法人电话
+            firstAmount: thisdata.firstAmount, //签单金额
+            totalAmount: thisdata.totalAmount, //首付金额
+            settlementAmount: thisdata.settlementAmount, //已收款项
+            orderRemarks: thisdata.orderRemarks, //订单留言
+            orgCodeUrl: thisdata.contractPictureUrl
+              ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
+              : [], //图片地址
+            salesmanName: thisdata.salesmanName, //营销员名称
+            salesmanMobile: thisdata.salesmanMobile, //营销员电话
+            oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+            oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
+            financeName: thisdata.financeName, //财务名称
+            financeMobile: thisdata.financeMobile, //财务电话
+            nowFinance: thisdata.nowFinance, //财务名称
+            nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
+            approval: thisdata.approval.toString() //特批状态
+            //approval:thisdata.approval==0?thisdata.approval.toString():thisdata.approval,//特批状态
+          });
 				};
 				
 			}.bind(this),
@@ -589,322 +599,537 @@ const IntentionCustomer = Form.create()(React.createClass({
 				})
 			},
 		};
-		return(
-			<div className="user-content">
-				<div className="content-title">                  
-                    <span>退单管理</span>
+		return (
+      <div className="user-content">
+        <div className="content-title">
+          <span>退单管理</span>
+        </div>
+        <div className="user-search">
+          <Input
+            placeholder="客户名称"
+            style={{ width: "150px", marginBottom: "10px" }}
+            value={this.state.customerName}
+            onChange={e => {
+              this.setState({ customerName: e.target.value });
+            }}
+          />
+          <Input
+            placeholder="订单编号"
+            style={{ width: "150px" }}
+            value={this.state.orderNo}
+            onChange={e => {
+              this.setState({ orderNo: e.target.value });
+            }}
+          />
+          <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>
+          <div className="patent-table">
+            <Spin spinning={this.state.loading}>
+              <Table
+                columns={this.state.columns}
+                dataSource={this.state.dataSource}
+                rowSelection={rowSelection}
+                pagination={this.state.pagination}
+                onRowClick={this.tableRowClick}
+              />
+            </Spin>
+          </div>
+          <Modal
+            className="customeDetails"
+            footer=""
+            title="订单详情"
+            width="900px"
+            visible={this.state.visible}
+            onOk={this.visitOk}
+            onCancel={this.visitCancel}
+          >
+            <Form
+              layout="horizontal"
+              onSubmit={this.handleSubmit}
+              id="demand-form"
+              style={{ paddingBottom: "40px" }}
+            >
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="订单编号"
+                  >
+                    <span>{this.state.orderNo}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="合同编号"
+                  >
+                    <span>{this.state.contractNo}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="客户名称"
+                  >
+                    <span>{this.state.userName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="合同签订时间"
+                  >
+                    <span>{this.state.signDate}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="流程状态"
+                  >
+                    <span>{getProcessStatus(this.state.processStatus)}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="结算状态"
+                  >
+                    <span>
+                      {getLiquidationStatus(this.state.liquidationStatus)}
+                    </span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="企业联系人"
+                  >
+                    <span>{this.state.contacts}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="联系人电话"
+                  >
+                    <span>{this.state.contactMobile}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="企业法人"
+                  >
+                    <span>{this.state.legalPerson}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="法人电话"
+                  >
+                    <span>{this.state.legalPersonTel}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="签单金额(万元)"
+                  >
+                    <span>{this.state.firstAmount}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="首付金额(万元)"
+                  >
+                    <span>{this.state.totalAmount}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="特批立项"
+                  >
+                    <span>{getApprovedState(this.state.approval)}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="已收款项(万元)"
+                  >
+                    <span>{this.state.settlementAmount}</span>
+                  </FormItem>
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 16 }}
+                      label="订单留言"
+                    >
+                      <span>{this.state.orderRemarks}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 18 }}
+                      label="合同扫描件"
+                    >
+                      <Upload
+                        className="demandDetailShow-upload"
+                        listType="picture-card"
+                        fileList={this.state.orgCodeUrl}
+                        onPreview={file => {
+                          this.setState({
+                            previewImage: file.url || file.thumbUrl,
+                            previewVisible: true
+                          });
+                        }}
+                      ></Upload>
+                      <Modal
+                        maskClosable={false}
+                        footer={null}
+                        visible={this.state.previewVisible}
+                        onCancel={() => {
+                          this.setState({ previewVisible: false });
+                        }}
+                      >
+                        <img
+                          alt=""
+                          style={{ width: "100%" }}
+                          src={this.state.previewImage || ""}
+                        />
+                      </Modal>
+                      <Button
+                        style={{
+                          float: "right",
+                          marginRight: "140px",
+                          marginTop: "20px"
+                        }}
+                        onClick={this.getOrderLog}
+                      >
+                        查看订单 日志
+                      </Button>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="订单负责人"
+                    >
+                      <span>{this.state.salesmanName}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="订单负责人电话"
+                    >
+                      <span>{this.state.salesmanMobile}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="当前财务负责人"
+                    >
+                      <span>{this.state.nowFinance}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="当前财务负责人电话"
+                    >
+                      <span>{this.state.nowFinanceMobile}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      style={{ opacity: ".5" }}
+                      label="原订单负责人"
+                    >
+                      <span>{this.state.oldSalesmanName}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      style={{ opacity: ".5" }}
+                      label="原订单负责人电话"
+                    >
+                      <span>{this.state.oldSalesmanMobile}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      style={{ opacity: ".5" }}
+                      {...formItemLayout}
+                      label="实际财务操作人"
+                    >
+                      <span>{this.state.financeName}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      style={{ opacity: ".5" }}
+                      label="实际财务操作人电话"
+                    >
+                      <span>{this.state.financeMobile}</span>
+                    </FormItem>
+                  </div>
+                  <div>
+                    <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                      催款节点
+                    </span>
+                  </div>
+                  <div className="clearfix">
+                    <Spin spinning={this.state.loading}>
+                      <Form layout="horizontal" id="demand-form">
+                        <Table
+                          pagination={false}
+                          columns={this.state.ContactsLists}
+                          dataSource={this.state.contactList}
+                        />
+                        <Col
+                          span={24}
+                          offset={9}
+                          style={{ marginTop: "15px" }}
+                        ></Col>
+                      </Form>
+                    </Spin>
+                  </div>
+                  <div>
+                    <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                      项目业务
+                    </span>
+                  </div>
+                  <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                      <Table
+                        columns={this.state.columnsX}
+                        dataSource={this.state.dataSourceX}
+                        pagination={this.state.paginations}
+                      />
+                    </Spin>
+                  </div>
+                </div>
+              </Spin>
+            </Form>
+          </Modal>
+          <Modal
+            maskClosable={false}
+            visible={this.state.addnextVisible}
+            onOk={this.nextCancel}
+            onCancel={this.nextCancel}
+            width="800px"
+            title={this.state.refundStatus == 2 ? "修改退单申请" : "退单详情"}
+            footer=""
+            className="admin-desc-content"
+          >
+            <Form layout="horizontal" id="demand-form">
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="退单编号"
+                  >
+                    <span>{this.state.id}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="退单日期"
+                  >
+                    <span>{this.state.createDate}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="订单编号"
+                  >
+                    <span>{this.state.orderNo}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="订单状态"
+                  >
+                    <span>{getNewOrderStatus(this.state.orderStatus)}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="退单状态"
+                  >
+                    <span>{getRefundStatus(this.state.refundStatus)}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="退款状态"
+                  >
+                    <span>
+                      {getLiquidationStatus(this.state.liquidationStatus)}
+                    </span>
+                  </FormItem>
+                  <div className="clearfix">
+                    {this.state.refundStatus == 2 ? (
+                      <FormItem
+                        labelCol={{ span: 4 }}
+                        wrapperCol={{ span: 16 }}
+                        label="终止合同"
+                      >
+                        <Picture
+                          fileList={e => {
+                            this.setState({ contractUrl: e });
+                          }}
+                          pictureUrl={this.state.contractUrl}
+                          visible={this.props.visible}
+                          data={{
+                            sign: "order_refund_file",
+                            url: "/api/admin/newOrder/uploadRefundOrderFile",
+                            number: 8
+                          }}
+                        />
+                      </FormItem>
+                    ) : (
+                      <FormItem
+                        labelCol={{ span: 4 }}
+                        wrapperCol={{ span: 18 }}
+                        label="合同扫描件"
+                      >
+                        <Upload
+                          className="demandDetailShow-upload"
+                          listType="picture-card"
+                          fileList={this.state.orgCodeUrl}
+                          onPreview={file => {
+                            this.setState({
+                              previewImage: file.url || file.thumbUrl,
+                              previewVisible: true
+                            });
+                          }}
+                        ></Upload>
+                        <Modal
+                          maskClosable={false}
+                          footer={null}
+                          visible={this.state.previewVisible}
+                          onCancel={() => {
+                            this.setState({ previewVisible: false });
+                          }}
+                        >
+                          <img
+                            alt=""
+                            style={{ width: "100%" }}
+                            src={this.state.previewImage || ""}
+                          />
+                        </Modal>
+                      </FormItem>
+                    )}
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 16 }}
+                      label="退单申请表"
+                    >
+                      <Upload
+                        className="demandDetailShow-upload"
+                        listType="picture-card"
+                        fileList={this.state.orgCodeUrl}
+                        onPreview={file => {
+                          this.setState({
+                            previewImage: file.url || file.thumbUrl,
+                            previewVisible: true
+                          });
+                        }}
+                      ></Upload>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 16 }}
+                      label="退单理由"
+                    >
+                      {this.state.refundStatus == 2 ? (
+                        <Input
+                          type="textarea"
+                          placeholder="请输入退单理由"
+                          rows={4}
+                          value={this.state.reason}
+                          onChange={e => {
+                            this.setState({ reason: e.target.value });
+                          }}
+                        />
+                      ) : (
+                        <span>{this.state.reason}</span>
+                      )}
+                    </FormItem>
+                  </div>
+                  {this.state.refundStatus == 2 ? (
+                    <FormItem
+                      wrapperCol={{ span: 12, offset: 4 }}
+                      className="half-middle"
+                    >
+                      <Button
+                        className="submitSave"
+                        type="primary"
+                        onClick={this.tuidanOk}
+                      >
+                        重新退单
+                      </Button>
+                      <Button
+                        className="submitSave"
+                        type="ghost"
+                        onClick={this.nextCancel}
+                      >
+                        取消
+                      </Button>
+                    </FormItem>
+                  ) : (
+                    ""
+                  )}
                 </div>
-               	<div className="user-search">                    
-                   <Input placeholder="客户名称" style={{width:'150px',marginBottom:'10px'}}
-	                        value={this.state.customerName}
-	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
-                    <Input placeholder="订单编号" style={{width:'150px'}}
-                        value={this.state.orderNo}
-                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
-                    <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> 
-                   	<div className="patent-table">
-	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
-	                            dataSource={this.state.dataSource}    
-	                            rowSelection={rowSelection}
-	                            pagination={this.state.pagination} 
-	                            onRowClick={this.tableRowClick}
-	                           />
-	                    </Spin>
-               		 </div> 
-               		<Modal	
-				      className="customeDetails"
-				      footer=''
-			          title="订单详情"
-			          width='900px'
-			          visible={this.state.visible}
-			          onOk={this.visitOk}
-					  onCancel={this.visitCancel}							          							          
-			        >	
-				        <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
-				            <Spin spinning={this.state.loading}>
-				                <div className="clearfix">
-				                	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="订单编号" >
-			                            <span>{this.state.orderNo}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同编号" >  
-			                            <span>{this.state.contractNo}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="客户名称" >  
-			                            <span>{this.state.userName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同签订时间" >   
-			                            <span>{this.state.signDate}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="流程状态" >  
-			                            <span>{getProcessStatus(this.state.processStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="结算状态" >  
-			                            <span>{getLiquidationStatus(this.state.liquidationStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业联系人" >                             
-		                                <span>{this.state.contacts}</span>
-				                    </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="联系人电话" >                             
-		                                <span>{this.state.contactMobile}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业法人" >                             
-		                                <span>{this.state.legalPerson}</span>
-		                            </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="法人电话" >  
-			                             <span>{this.state.legalPersonTel}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单金额(万元)" >                             
-		                                 <span>{this.state.firstAmount}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="首付金额(万元)" >                             
-		                                <span>{this.state.totalAmount}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="特批立项" >  
-			                            <span>{getApprovedState(this.state.approval)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="已收款项(万元)" >  
-			                            <span>{this.state.settlementAmount}</span>
-		                    		</FormItem>
-				                     <div className='clearfix'>
-							        	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="订单留言" >
-							        	 <span>{this.state.orderRemarks}</span>
-								        </FormItem>
-							        </div>
-				                    <div className='clearfix'>
-							            <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="合同扫描件">
-				                            <Upload className="demandDetailShow-upload"
-				                                listType="picture-card"
-				                                fileList={this.state.orgCodeUrl}                               
-				                                onPreview={(file) => {
-				                                    this.setState({
-				                                        previewImage: file.url || file.thumbUrl,
-				                                        previewVisible: true,
-				                                    });
-				                                }} >
-				                            </Upload>
-				                            <Modal maskClosable={false} footer={null}
-				                                visible={this.state.previewVisible}
-				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
-				                            </Modal>
-											<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
-																										onClick={this.getOrderLog}
-																	>查看订单							日志</Button>
-				                        </FormItem>
-							        </div>
-							        <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >  
-				                            <span>{this.state.salesmanName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人电话" >  
-                            				<span>{this.state.salesmanMobile}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >  
-				                            <span>{this.state.financeName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人电话" >  
-                            				<span>{this.state.financeMobile}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div>
-					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>催款节点</span>
-					                </div>
-					                <div className="clearfix">
-					    			  <Spin spinning={this.state.loading}>
-					    			        <Form layout="horizontal" id="demand-form"  >
-										      	<Table 
-								            	 pagination={false}
-								            	 columns={this.state.ContactsLists} 
-								            	 dataSource={this.state.contactList}
-								            	 />
-						            	        <Col span={24} offset={9} style={{marginTop:'15px'}}>
-									                 
-									            </Col>
-							            	</Form> 
-									   </Spin> 
-									</div>
-						            <div>
-					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
-					                </div>
-					                <div className="patent-table">
-					                    <Spin spinning={this.state.loading}>
-					                        <Table columns={this.state.columnsX}
-					                            dataSource={this.state.dataSourceX}
-					                            pagination={this.state.paginations}
-					                            />
-					                    </Spin>
-						            </div>
-				                </div>
-				            </Spin>
-				        </Form>
-			        </Modal>
-			         <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='800px'
-                        title={this.state.refundStatus==2?'修改退单申请':'退单详情'}                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal"  id="demand-form">
-			                <Spin spinning={this.state.loading}>
-			                        
-				                    <div className='clearfix'>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="退单编号" >
-				                    			<span>{this.state.id}</span>
-				                    	</FormItem>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="退单日期" >
-				                    			<span>{this.state.createDate}</span>
-				                    	</FormItem>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="订单编号" >
-				                    			<span>{this.state.orderNo}</span>
-				                    	</FormItem>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="订单状态" >
-				                    			<span>{getNewOrderStatus(this.state.orderStatus)}</span>
-				                    	</FormItem>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="退单状态" >
-				                    			<span>{getRefundStatus(this.state.refundStatus)}</span>
-				                    	</FormItem>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="退款状态" >
-				                    			<span>{getLiquidationStatus(this.state.liquidationStatus)}</span>
-				                    	</FormItem>
-				                    	<div className='clearfix'>
-				                			{this.state.refundStatus==2?<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 16 }} label="终止合同">
-										        <Picture
-									              fileList={(e)=>{this.setState({contractUrl:e})}}
-									              pictureUrl={this.state.contractUrl}
-									              visible={this.props.visible}
-									              data={{'sign':'order_refund_file',url:'/api/admin/newOrder/uploadRefundOrderFile',number:8}}
-									           />
-										    </FormItem>:
-										    <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="合同扫描件">
-					                            <Upload className="demandDetailShow-upload"
-					                                listType="picture-card"
-					                                fileList={this.state.orgCodeUrl}                               
-					                                onPreview={(file) => {
-					                                    this.setState({
-					                                        previewImage: file.url || file.thumbUrl,
-					                                        previewVisible: true,
-					                                    });
-					                                }} >
-					                            </Upload>
-					                            <Modal maskClosable={false} footer={null}
-					                                visible={this.state.previewVisible}
-					                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-					                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
-					                            </Modal>
-					                        </FormItem>}
-										</div>
-										<div className='clearfix'>
-				                			<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 16 }} label="退单申请表">
-										        <Upload className="demandDetailShow-upload"
-										            listType="picture-card"
-										            fileList={this.state.orgCodeUrl}                               
-										            onPreview={(file) => {
-										                this.setState({
-										                    previewImage: file.url || file.thumbUrl,
-										                    previewVisible: true,
-										                });
-										            }} >
-										        </Upload>
-										    </FormItem>
-										</div>	
-					                   <div className='clearfix'>
-					                    	<FormItem
-									            labelCol={{ span: 4 }}
-									            wrapperCol={{ span: 16 }}
-									            label="退单理由" >
-					                    		{this.state.refundStatus==2?
-									                <Input type="textarea" placeholder="请输入退单理由" rows={4}  value={this.state.reason} 
-										    				onChange={(e)=>{this.setState({reason:e.target.value})}}/>:<span>{this.state.reason}</span>	}
-									        </FormItem>
-					                    </div>
-					                    {this.state.refundStatus==2?
-				                    	<FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-					                        <Button className="submitSave" type="primary" onClick={this.tuidanOk}>重新退单</Button>  
-					                        <Button className="submitSave" type="ghost" onClick={this.nextCancel}>取消</Button>
-					                    </FormItem>:''}
-				                    </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-					<Modal  visible={this.state.rizhivisible}
-							className="admin-desc-content"
-							width='800px'
-							maskClosable={false}
-							title='订单日志'
-							footer={null}
-							onCancel={this.closeOrderLog}>
-							<div className="patent-table">
-							    <Spin spinning={this.state.loading}>
-							        <Table columns={this.state.columnsrizhi}
-							            dataSource={this.state.dataSourcerizhi}
-										pagination={false}
-							            />
-							    </Spin>
-							</div>
-					</Modal>
-               	</div>  
+              </Spin>
+            </Form>
+          </Modal>
+          <Modal
+            visible={this.state.rizhivisible}
+            className="admin-desc-content"
+            width="800px"
+            maskClosable={false}
+            title="订单日志"
+            footer={null}
+            onCancel={this.closeOrderLog}
+          >
+            <div className="patent-table">
+              <Spin spinning={this.state.loading}>
+                <Table
+                  columns={this.state.columnsrizhi}
+                  dataSource={this.state.dataSourcerizhi}
+                  pagination={false}
+                />
+              </Spin>
             </div>
-			);
+          </Modal>
+        </div>
+      </div>
+    );
 	}
 }));
 export default IntentionCustomer;

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

@@ -378,6 +378,8 @@ const contractChange = Form.create()(
                   )
                 : []
             });
+            console.log("url", this.state.voucherUrl);
+            
           }
         }.bind(this)
       });
@@ -455,8 +457,16 @@ const contractChange = Form.create()(
               additionalOrder: thisdata.additionalOrder,
               contractNo: thisdata.contractNo,
               // arrears: thisdata.arrears,
-              orderData: thisdata
+              orderData: thisdata,
+              contractPictureUrl: thisdata.contractPictureUrl
+                ? splitUrl(
+                    thisdata.contractPictureUrl,
+                    ",",
+                    globalConfig.avatarHost + "/upload",
+                  )
+                : []
             });
+            // console.log(thisdata.contractPictureUrl);
           }
         }.bind(this)
       });
@@ -1076,6 +1086,7 @@ const contractChange = Form.create()(
                         dataSourceX={this.state.dataSourceX}
                         contactList={this.state.contactList}
                         orderNo={this.state.orderNo}
+                        pictureUrl={this.state.contractPictureUrl}
                       />
                     </Spin>
                   </Form>

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

@@ -433,8 +433,12 @@ const IntentionCustomer = Form.create()(
                 : [], //图片地址
               salesmanName: thisdata.salesmanName, //营销员名称
               salesmanMobile: thisdata.salesmanMobile, //营销员电话
+              oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+              oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
               financeName: thisdata.financeName, //财务名称
               financeMobile: thisdata.financeMobile, //财务电话
+              nowFinance: thisdata.nowFinance, //财务名称
+              nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               depName: thisdata.depName
             });
           }
@@ -1208,14 +1212,50 @@ const IntentionCustomer = Form.create()(
                           <FormItem
                             className="half-item"
                             {...formItemLayout}
-                            label="财务负责人"
+                            label="当前财务负责人"
+                          >
+                            <span>{this.state.nowFinance}</span>
+                          </FormItem>
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="当前财务负责人电话"
+                          >
+                            <span>{this.state.nowFinanceMobile}</span>
+                          </FormItem>
+                        </div>
+                        <div className="clearfix">
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            style={{ opacity: ".5" }}
+                            label="原订单负责人"
+                          >
+                            <span>{this.state.oldSalesmanName}</span>
+                          </FormItem>
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            style={{ opacity: ".5" }}
+                            label="原订单负责人电话"
+                          >
+                            <span>{this.state.oldSalesmanMobile}</span>
+                          </FormItem>
+                        </div>
+                        <div className="clearfix">
+                          <FormItem
+                            className="half-item"
+                            style={{ opacity: ".5" }}
+                            {...formItemLayout}
+                            label="实际财务操作人"
                           >
                             <span>{this.state.financeName}</span>
                           </FormItem>
                           <FormItem
                             className="half-item"
                             {...formItemLayout}
-                            label="财务负责人电话"
+                            style={{ opacity: ".5" }}
+                            label="实际财务操作人电话"
                           >
                             <span>{this.state.financeMobile}</span>
                           </FormItem>

+ 496 - 307
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -275,28 +275,38 @@ const IntentionCustomer = Form.create()(React.createClass({
 				} else {
 					let thisdata=data.data;
 					this.setState({
-						 orderNo: thisdata.orderNo,//订单编号
-						 contractNo: thisdata.contractNo,//合同编号
-						 userName:thisdata.userName,//客户名称
-						 signDate:thisdata.signDate,//签单时间
-						 processStatus:thisdata.processStatus,//流程状态
-	                     liquidationStatus:thisdata.liquidationStatus,//结算状态
-	                     contacts:thisdata.contacts,//企业联系人
-	                     contactMobile:thisdata.contactMobile,//联系人电话
-	                     legalPerson:thisdata.legalPerson,//法人
-	                     legalPersonTel:thisdata.legalPersonTel,//法人电话
-	                     firstAmount:thisdata.firstAmount,//签单金额
-	                     totalAmount:thisdata.totalAmount,//首付金额
-	                     approval:thisdata.approval,//特批状态
-	                     settlementAmount:thisdata.settlementAmount,//已收款项
-	                     orderRemarks:thisdata.orderRemarks,//订单留言
-	                     orgCodeUrl: thisdata.contractPictureUrl ? splitUrl(thisdata.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],//图片地址
-	                     salesmanName:thisdata.salesmanName,//营销员名称
-	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
-	                     financeName:thisdata.financeName,//财务名称
-	                     financeMobile:thisdata.financeMobile,//财务电话
-						 depName:thisdata.depName
-					})
+            orderNo: thisdata.orderNo, //订单编号
+            contractNo: thisdata.contractNo, //合同编号
+            userName: thisdata.userName, //客户名称
+            signDate: thisdata.signDate, //签单时间
+            processStatus: thisdata.processStatus, //流程状态
+            liquidationStatus: thisdata.liquidationStatus, //结算状态
+            contacts: thisdata.contacts, //企业联系人
+            contactMobile: thisdata.contactMobile, //联系人电话
+            legalPerson: thisdata.legalPerson, //法人
+            legalPersonTel: thisdata.legalPersonTel, //法人电话
+            firstAmount: thisdata.firstAmount, //签单金额
+            totalAmount: thisdata.totalAmount, //首付金额
+            approval: thisdata.approval, //特批状态
+            settlementAmount: thisdata.settlementAmount, //已收款项
+            orderRemarks: thisdata.orderRemarks, //订单留言
+            orgCodeUrl: thisdata.contractPictureUrl
+              ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
+              : [], //图片地址
+            salesmanName: thisdata.salesmanName, //营销员名称
+            salesmanMobile: thisdata.salesmanMobile, //营销员电话
+            oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+            oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
+            financeName: thisdata.financeName, //财务名称
+            financeMobile: thisdata.financeMobile, //财务电话
+            nowFinance: thisdata.nowFinance, //财务名称
+            nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
+            depName: thisdata.depName
+          });
 				};
 				
 			}.bind(this),
@@ -588,293 +598,472 @@ const IntentionCustomer = Form.create()(React.createClass({
 				})
 			},
 		};
-		return(
-			<div className="user-content">
-				<div className="content-title">                  
-                    <span>部门订单</span>
+		return (
+      <div className="user-content">
+        <div className="content-title">
+          <span>部门订单</span>
+        </div>
+        <div className="user-search">
+          <Input
+            placeholder="客户名称"
+            style={{ width: "150px", marginBottom: "10px" }}
+            value={this.state.customerName}
+            onChange={e => {
+              this.setState({ customerName: e.target.value });
+            }}
+          />
+          <Input
+            placeholder="订单编号"
+            style={{ width: "150px" }}
+            value={this.state.orderNo}
+            onChange={e => {
+              this.setState({ orderNo: e.target.value });
+            }}
+          />
+          <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>
+          <div className="patent-table">
+            <Spin spinning={this.state.loading}>
+              <Table
+                columns={this.state.columns}
+                dataSource={this.state.dataSource}
+                rowSelection={rowSelection}
+                pagination={this.state.pagination}
+                onRowClick={this.tableRowClick}
+              />
+            </Spin>
+          </div>
+          <Modal
+            className="customeDetails"
+            footer=""
+            title="订单详情"
+            width="900px"
+            visible={this.state.visible}
+            onOk={this.visitOk}
+            onCancel={this.visitCancel}
+          >
+            <Form
+              layout="horizontal"
+              onSubmit={this.handleSubmit}
+              id="demand-form"
+              style={{ paddingBottom: "40px" }}
+            >
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="订单编号"
+                  >
+                    <span>{this.state.orderNo}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="合同编号"
+                  >
+                    <span>{this.state.contractNo}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="客户名称"
+                  >
+                    <span>{this.state.userName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="合同签订时间"
+                  >
+                    <span>{this.state.signDate}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="流程状态"
+                  >
+                    <span>{getProcessStatus(this.state.processStatus)}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="结算状态"
+                  >
+                    <span>
+                      {getLiquidationStatus(this.state.liquidationStatus)}
+                    </span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="企业联系人"
+                  >
+                    <span>{this.state.contacts}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="联系人电话"
+                  >
+                    <span>{this.state.contactMobile}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="企业法人"
+                  >
+                    <span>{this.state.legalPerson}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="法人电话"
+                  >
+                    <span>{this.state.legalPersonTel}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="签单金额(万元)"
+                  >
+                    <span>{this.state.totalAmount}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="首付金额(万元)"
+                  >
+                    <span>{this.state.firstAmount}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="特批立项"
+                  >
+                    <span>{getApprovedState(this.state.approval)}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="已收款项(万元)"
+                  >
+                    <span>{this.state.settlementAmount}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="订单部门"
+                  >
+                    <span>{this.state.depName}</span>
+                  </FormItem>
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 16 }}
+                      label="订单留言"
+                    >
+                      <span>{this.state.orderRemarks}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 18 }}
+                      label="合同扫描件"
+                    >
+                      <Upload
+                        className="demandDetailShow-upload"
+                        listType="picture-card"
+                        fileList={this.state.orgCodeUrl}
+                        onPreview={file => {
+                          this.setState({
+                            previewImage: file.url || file.thumbUrl,
+                            previewVisible: true
+                          });
+                        }}
+                      ></Upload>
+                      <Modal
+                        maskClosable={false}
+                        footer={null}
+                        visible={this.state.previewVisible}
+                        onCancel={() => {
+                          this.setState({ previewVisible: false });
+                        }}
+                      >
+                        <img
+                          alt=""
+                          style={{ width: "100%" }}
+                          src={this.state.previewImage || ""}
+                        />
+                      </Modal>
+                      <Button
+                        style={{
+                          float: "right",
+                          marginRight: "140px",
+                          marginTop: "20px"
+                        }}
+                        onClick={this.getOrderLog}
+                      >
+                        查看订单 日志
+                      </Button>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="订单负责人"
+                    >
+                      <span>{this.state.salesmanName}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="订单负责人电话"
+                    >
+                      <span>{this.state.salesmanMobile}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="当前财务负责人"
+                    >
+                      <span>{this.state.nowFinance}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="当前财务负责人电话"
+                    >
+                      <span>{this.state.nowFinanceMobile}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      style={{ opacity: ".5" }}
+                      label="原订单负责人"
+                    >
+                      <span>{this.state.oldSalesmanName}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      style={{ opacity: ".5" }}
+                      label="原订单负责人电话"
+                    >
+                      <span>{this.state.oldSalesmanMobile}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      style={{ opacity: ".5" }}
+                      {...formItemLayout}
+                      label="实际财务操作人"
+                    >
+                      <span>{this.state.financeName}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      style={{ opacity: ".5" }}
+                      label="实际财务操作人电话"
+                    >
+                      <span>{this.state.financeMobile}</span>
+                    </FormItem>
+                  </div>
+                  <div>
+                    <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                      催款节点
+                    </span>
+                  </div>
+                  <div className="clearfix">
+                    <Spin spinning={this.state.loading}>
+                      <Form layout="horizontal" id="demand-form">
+                        <Table
+                          pagination={false}
+                          columns={this.state.ContactsLists}
+                          dataSource={this.state.contactList}
+                        />
+                        <Col
+                          span={24}
+                          offset={9}
+                          style={{ marginTop: "15px" }}
+                        ></Col>
+                      </Form>
+                    </Spin>
+                  </div>
+                  <div>
+                    <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                      项目业务
+                    </span>
+                  </div>
+                  <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                      <Table
+                        columns={this.state.columnsX}
+                        dataSource={this.state.dataSourceX}
+                        pagination={this.state.paginations}
+                        onRowClick={this.tableRowClickX}
+                      />
+                    </Spin>
+                  </div>
+                </div>
+              </Spin>
+            </Form>
+          </Modal>
+          <Modal
+            maskClosable={false}
+            visible={this.state.addnextVisible}
+            onOk={this.nextCancel}
+            onCancel={this.nextCancel}
+            width="800px"
+            title={"项目任务详情"}
+            footer=""
+            className="admin-desc-content"
+          >
+            <Form layout="horizontal" id="demand-form">
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="项目名称"
+                  >
+                    <span>{this.state.commodityName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="项目数量"
+                  >
+                    <span>{this.state.commodityQuantity}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="金额(万元)"
+                  >
+                    <span>{this.state.commodityPrice}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="主要项目"
+                  >
+                    <span>{getboutique(this.state.main)}</span>
+                  </FormItem>
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 16 }}
+                      label="服务说明"
+                    >
+                      <span>{this.state.taskComment}</span>
+                    </FormItem>
+                  </div>
+                </div>
+              </Spin>
+            </Form>
+          </Modal>
+          <Modal
+            maskClosable={false}
+            visible={this.state.noVisible}
+            onOk={this.noCancel}
+            onCancel={this.noCancel}
+            width="400px"
+            title={"拒绝理由"}
+            footer=""
+            className="admin-desc-content"
+          >
+            <Form layout="horizontal" id="demand-form">
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <FormItem
+                    labelCol={{ span: 4 }}
+                    wrapperCol={{ span: 16 }}
+                    label="拒绝理由"
+                  >
+                    <Input
+                      type="textarea"
+                      placeholder="请输入拒绝理由"
+                      rows={4}
+                      value={this.state.reason}
+                      onChange={e => {
+                        this.setState({ reason: e.target.value });
+                      }}
+                    />
+                  </FormItem>
+                </div>
+                <div className="clearfix">
+                  <Button
+                    className="cancel"
+                    type="primary"
+                    onClick={this.examOks}
+                    style={{ marginLeft: "50px" }}
+                    htmlType="submit"
+                  >
+                    确定
+                  </Button>
+                  <Button
+                    className="cancel"
+                    type="ghost"
+                    onClick={this.noCancel}
+                    style={{ marginLeft: "50px" }}
+                  >
+                    取消
+                  </Button>
                 </div>
-               	<div className="user-search">                    
-                   <Input placeholder="客户名称" style={{width:'150px',marginBottom:'10px'}}
-	                        value={this.state.customerName}
-	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
-                    <Input placeholder="订单编号" style={{width:'150px'}}
-                        value={this.state.orderNo}
-                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
-                    <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> 
-                   	<div className="patent-table">
-	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
-	                            dataSource={this.state.dataSource}    
-	                            rowSelection={rowSelection}
-	                            pagination={this.state.pagination} 
-	                            onRowClick={this.tableRowClick}
-	                           />
-	                    </Spin>
-               		 </div> 
-               		<Modal	
-				      className="customeDetails"
-				      footer=''
-			          title="订单详情"
-			          width='900px'
-			          visible={this.state.visible}
-			          onOk={this.visitOk}
-					  onCancel={this.visitCancel}							          							          
-			        >	
-				        <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
-				            <Spin spinning={this.state.loading}>
-				                <div className="clearfix">
-				                	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="订单编号" >
-			                            <span>{this.state.orderNo}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同编号" >  
-			                            <span>{this.state.contractNo}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="客户名称" >  
-			                            <span>{this.state.userName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同签订时间" >   
-			                            <span>{this.state.signDate}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="流程状态" >  
-			                            <span>{getProcessStatus(this.state.processStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="结算状态" >  
-			                            <span>{getLiquidationStatus(this.state.liquidationStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业联系人" >                             
-		                                <span>{this.state.contacts}</span>
-				                    </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="联系人电话" >                             
-		                                <span>{this.state.contactMobile}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业法人" >                             
-		                                <span>{this.state.legalPerson}</span>
-		                            </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="法人电话" >  
-			                             <span>{this.state.legalPersonTel}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单金额(万元)" >                             
-		                                 <span>{this.state.totalAmount}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="首付金额(万元)" >                             
-		                                <span>{this.state.firstAmount}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="特批立项" >  
-			                            <span>{getApprovedState(this.state.approval)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="已收款项(万元)" >  
-			                            <span>{this.state.settlementAmount}</span>
-		                    		</FormItem>
-									<FormItem className="half-item"
-									    {...formItemLayout}
-									    label="订单部门" >  
-									    <span>{this.state.depName}</span>
-									</FormItem>
-				                    <div className='clearfix'>
-							        	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="订单留言" >
-							        	 <span>{this.state.orderRemarks}</span>
-								        </FormItem>
-							        </div>
-				                    <div className='clearfix'>
-							            <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="合同扫描件">
-				                            <Upload className="demandDetailShow-upload"
-				                                listType="picture-card"
-				                                fileList={this.state.orgCodeUrl}                               
-				                                onPreview={(file) => {
-				                                    this.setState({
-				                                        previewImage: file.url || file.thumbUrl,
-				                                        previewVisible: true,
-				                                    });
-				                                }} >
-				                            </Upload>
-				                            <Modal maskClosable={false} footer={null}
-				                                visible={this.state.previewVisible}
-				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
-				                            </Modal>
-											<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
-																										onClick={this.getOrderLog}
-																	>查看订单							日志</Button>
-				                        </FormItem>
-							        </div>
-							        <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >  
-				                            <span>{this.state.salesmanName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人电话" >  
-                            				<span>{this.state.salesmanMobile}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >  
-				                            <span>{this.state.financeName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人电话" >  
-                            				<span>{this.state.financeMobile}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div>
-					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>催款节点</span>
-					                </div>
-					                <div className="clearfix">
-					    			  <Spin spinning={this.state.loading}>
-					    			        <Form layout="horizontal" id="demand-form"  >
-										      	<Table 
-								            	 pagination={false}
-								            	 columns={this.state.ContactsLists} 
-								            	 dataSource={this.state.contactList}
-								            	 />
-						            	        <Col span={24} offset={9} style={{marginTop:'15px'}}>
-									                 
-									            </Col>
-							            	</Form> 
-									   </Spin> 
-									</div>
-						            <div>
-					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
-					                </div>
-					                <div className="patent-table">
-					                    <Spin spinning={this.state.loading}>
-					                        <Table columns={this.state.columnsX}
-					                            dataSource={this.state.dataSourceX}
-					                            pagination={this.state.paginations}
-					                            onRowClick={this.tableRowClickX} 
-					                            />
-					                    </Spin>
-						            </div>
-				                </div>
-				            </Spin>
-				        </Form>
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='800px'
-                        title={'项目任务详情'}                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal"  id="demand-form">
-			                <Spin spinning={this.state.loading}>
-				                    <div className='clearfix'>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="项目名称" >
-				                    			<span>{this.state.commodityName}</span>
-				                    	</FormItem>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="项目数量" >
-				                    			<span>{this.state.commodityQuantity}</span>
-				                    	</FormItem>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="金额(万元)" >
-				                    			<span>{this.state.commodityPrice}</span>
-				                    	</FormItem>
-					                    <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="主要项目" >  
-				                            <span>{getboutique(this.state.main)}</span>
-			                    		</FormItem>
-					                    <div className='clearfix'>
-					                    	<FormItem 
-					                            labelCol={{ span: 4 }}
-									            wrapperCol={{ span: 16 }}
-					                            label="服务说明" >
-				                    			<span>{this.state.taskComment}</span>
-					                    	</FormItem>
-				                    	</div>
-				                    </div>	
-			                </Spin>
-			            </Form >
-			        </Modal>
-			         <Modal maskClosable={false} visible={this.state.noVisible}
-                        onOk={this.noCancel} onCancel={this.noCancel}
-                        width='400px'
-                        title={'拒绝理由'}                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal"  id="demand-form">
-			                <Spin spinning={this.state.loading}>
-				                    <div className='clearfix'>
-				                    	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="拒绝理由" >
-								                <Input type="textarea" placeholder="请输入拒绝理由" rows={4}  value={this.state.reason} 
-									    				onChange={(e)=>{this.setState({reason:e.target.value})}}/>	
-								        </FormItem>
-				                    </div>	
-				                     <div className='clearfix'>
-						                   <Button className="cancel" type="primary" onClick={this.examOks} style={{marginLeft:"50px"}} htmlType="submit">确定</Button>
-			                               <Button className="cancel" type="ghost" onClick={this.noCancel} style={{marginLeft:"50px"}}>取消</Button>
-	                            	</div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-					<Modal  visible={this.state.rizhivisible}
-							className="admin-desc-content"
-							width='800px'
-							maskClosable={false}
-							title='订单日志'
-							footer={null}
-							onCancel={this.closeOrderLog}>
-							<div className="patent-table">
-							    <Spin spinning={this.state.loading}>
-							        <Table columns={this.state.columnsrizhi}
-							            dataSource={this.state.dataSourcerizhi}
-										pagination={false}
-							            />
-							    </Spin>
-							</div>
-					</Modal>
-               	</div>  
+              </Spin>
+            </Form>
+          </Modal>
+          <Modal
+            visible={this.state.rizhivisible}
+            className="admin-desc-content"
+            width="800px"
+            maskClosable={false}
+            title="订单日志"
+            footer={null}
+            onCancel={this.closeOrderLog}
+          >
+            <div className="patent-table">
+              <Spin spinning={this.state.loading}>
+                <Table
+                  columns={this.state.columnsrizhi}
+                  dataSource={this.state.dataSourcerizhi}
+                  pagination={false}
+                />
+              </Spin>
             </div>
-			);
+          </Modal>
+        </div>
+      </div>
+    );
 	}
 }));
 export default IntentionCustomer;

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

@@ -430,8 +430,12 @@ const outsourcingList = Form.create()(
                 : [], //图片地址
               salesmanName: thisdata.salesmanName, //营销员名称
               salesmanMobile: thisdata.salesmanMobile, //营销员电话
+              oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+              oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
               financeName: thisdata.financeName, //财务名称
               financeMobile: thisdata.financeMobile, //财务电话
+              nowFinance: thisdata.nowFinance, //财务名称
+              nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               depName: thisdata.depName
             });
           }
@@ -1208,14 +1212,50 @@ const outsourcingList = Form.create()(
                           <FormItem
                             className="half-item"
                             {...formItemLayout}
-                            label="财务负责人"
+                            label="当前财务负责人"
+                          >
+                            <span>{this.state.nowFinance}</span>
+                          </FormItem>
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="当前财务负责人电话"
+                          >
+                            <span>{this.state.nowFinanceMobile}</span>
+                          </FormItem>
+                        </div>
+                        <div className="clearfix">
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            style={{ opacity: ".5" }}
+                            label="原订单负责人"
+                          >
+                            <span>{this.state.oldSalesmanName}</span>
+                          </FormItem>
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            style={{ opacity: ".5" }}
+                            label="原订单负责人电话"
+                          >
+                            <span>{this.state.oldSalesmanMobile}</span>
+                          </FormItem>
+                        </div>
+                        <div className="clearfix">
+                          <FormItem
+                            className="half-item"
+                            style={{ opacity: ".5" }}
+                            {...formItemLayout}
+                            label="实际财务操作人"
                           >
                             <span>{this.state.financeName}</span>
                           </FormItem>
                           <FormItem
                             className="half-item"
                             {...formItemLayout}
-                            label="财务负责人电话"
+                            style={{ opacity: ".5" }}
+                            label="实际财务操作人电话"
                           >
                             <span>{this.state.financeMobile}</span>
                           </FormItem>

File diff suppressed because it is too large
+ 794 - 425
js/component/manageCenter/order/orderNew/reject.jsx


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

@@ -751,8 +751,12 @@ const MyTaskOutsource = React.createClass({
             orderRemarks: thisdata.orderRemarks, //订单留言
             salesmanName: thisdata.salesmanName, //营销员名称
             salesmanMobile: thisdata.salesmanMobile, //营销员电话
+            oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+            oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
             financeName: thisdata.financeName, //财务名称
             financeMobile: thisdata.financeMobile, //财务电话
+            nowFinance: thisdata.nowFinance, //财务名称
+            nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
             depName: thisdata.depName, //订单部门
             ProvinceCity: ProvinceCityArr[0] === null ? [] : ProvinceCityArr,
             postalAddress: thisdata.postalAddress //详细地址
@@ -1654,14 +1658,46 @@ const MyTaskOutsource = React.createClass({
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
-                        label="财务负责人"
+                        label="当前财务负责人"
+                      >
+                        <span>{this.state.nowFinance}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="当前财务负责人电话"
+                      >
+                        <span>{this.state.nowFinanceMobile}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        style={{ opacity: ".5" }}
+                        label="原负责人"
+                      >
+                        <span>{this.state.oldSalesmanName}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        style={{ opacity: ".5" }}
+                        label="原负责人电话"
+                      >
+                        <span>{this.state.oldSalesmanMobile}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        style={{ opacity: ".5" }}
+                        label="实际财务操作人"
                       >
                         <span>{this.state.financeName}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
-                        label="财务负责人电话"
+                        style={{ opacity: ".5" }}
+                        label="实际财务操作人电话"
                       >
                         <span>{this.state.financeMobile}</span>
                       </FormItem>

+ 47 - 18
js/component/manageCenter/project/task/taskQuery.jsx

@@ -363,22 +363,26 @@ const Task = React.createClass({
 					};
 				} else {
 					this.setState({
-						 processStatus:thisdata.processStatus,//流程状态
-	                     liquidationStatus:thisdata.liquidationStatus,//结算状态
-	                     approval:thisdata.approval,//特批状态
-	                     orderRemarks:thisdata.orderRemarks,//订单留言
-	                     salesmanName:thisdata.salesmanName,//营销员名称
-	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
-	                     financeName:thisdata.financeName,//财务名称
-	                     financeMobile:thisdata.financeMobile,//财务电话
-	                     depName:thisdata.depName,//订单部门
-						 locationProvince:thisdata.locationProvince,
-						 locationCity:thisdata.locationCity,
-						 locationArea:thisdata.locationArea,
-						 ProvinceCity:ProvinceCityArr,
-						 postalAddress:thisdata.postalAddress,//详细地址
-						 outsource:thisdata.outsource,
-					})
+						processStatus: thisdata.processStatus, //流程状态
+						liquidationStatus: thisdata.liquidationStatus, //结算状态
+						approval: thisdata.approval, //特批状态
+						orderRemarks: thisdata.orderRemarks, //订单留言
+						salesmanName: thisdata.salesmanName, //营销员名称
+						salesmanMobile: thisdata.salesmanMobile, //营销员电话
+						oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+						oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
+						financeName: thisdata.financeName, //财务名称
+						financeMobile: thisdata.financeMobile, //财务电话
+						nowFinance: thisdata.nowFinance, //财务名称
+						nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
+						depName: thisdata.depName, //订单部门
+						locationProvince: thisdata.locationProvince,
+						locationCity: thisdata.locationCity,
+						locationArea: thisdata.locationArea,
+						ProvinceCity: ProvinceCityArr,
+						postalAddress: thisdata.postalAddress, //详细地址
+						outsource: thisdata.outsource
+          			});
 				};
 			}.bind(this),
 		}).always(function() {
@@ -885,14 +889,39 @@ const Task = React.createClass({
 									</FormItem>
 									<FormItem className="half-item"
 										{...formItemLayout}
-										label="财务负责人">
+										label="当前财务负责人">
+										<span>{this.state.nowFinance}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="当前财务负责人电话">
+										<span>{this.state.nowFinanceMobile}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										style={{ opacity: ".5" }}
+										label="原负责人">
+										<span>{this.state.oldSalesmanName}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										style={{ opacity: ".5" }}
+										label="原负责人电话">
+										<span>{this.state.oldSalesmanMobile}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										style={{ opacity: ".5" }}
+										label="实际财务操作人">
 										<span>{this.state.financeName}</span>
 									</FormItem>
 									<FormItem className="half-item"
 										{...formItemLayout}
-										label="财务负责人电话">
+										style={{ opacity: ".5" }}
+										label="实际财务操作人电话">
 										<span>{this.state.financeMobile}</span>
 									</FormItem>
+									
 								</div>
                 					<div className="clearfix">
                 						<h3 className='sub-title'>申报系统账户信息</h3>

+ 7 - 3
js/component/manageCenter/publicComponent/assign.jsx

@@ -94,7 +94,7 @@ const Assign=React.createClass({
                     key: 'abc',
                     width:100,
                     render:(text,record,index)=>{
-                        if(record.length){
+                        if(this.props.data.length){
                             return (
                                 <Popconfirm title={'您确认将所选订单分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect1(record)}} okText="确认" cancelText="取消">
                                     <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
@@ -217,6 +217,10 @@ const Assign=React.createClass({
         }.bind(this));
     },
     confirmSelect1(record){
+        console.log(record);
+        let orderNo = this.props.data.join(",")
+        console.log(orderNo,record.id,this.props.selApi);
+        
     	this.setState({
             loading: true
         });
@@ -237,8 +241,8 @@ const Assign=React.createClass({
           //
           // 			}
           data: {
-            orderNo: this.state.orderNo,
-            financeId: this.state.contact ? record.id : record.contactId
+            orderNo,
+            financeId: record.id,
           }
         }).done(
           function(data) {