Browse Source

1.1.16(最终)

hujie123456 5 years ago
parent
commit
abc16d1ec5
30 changed files with 2560 additions and 2155 deletions
  1. 23 1
      js/component/dataDic.js
  2. 3 1
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  3. 3 1
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  4. 3 1
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  5. 237 128
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  6. 23 75
      js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx
  7. 198 124
      js/component/manageCenter/order/orderNew/addService.jsx
  8. 5 4
      js/component/manageCenter/order/orderNew/addorders.js
  9. 2 2
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  10. 63 11
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js
  11. 70 83
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js
  12. 54 17
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js
  13. 2 2
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js
  14. 4 4
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  15. 2 2
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  16. 17 5
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  17. 7 3
      js/component/manageCenter/order/orderNew/changeComponent/rizhi.js
  18. 4 0
      js/component/manageCenter/order/orderNew/changeComponent/table.less
  19. 14 15
      js/component/manageCenter/order/orderNew/contractCwzj.js
  20. 14 15
      js/component/manageCenter/order/orderNew/contractCwzy.js
  21. 12 11
      js/component/manageCenter/order/orderNew/contractJsjl.js
  22. 254 409
      js/component/manageCenter/order/orderNew/contractJsy.js
  23. 15 16
      js/component/manageCenter/order/orderNew/contractJszj.js
  24. 28 22
      js/component/manageCenter/order/orderNew/contractYxgly.js
  25. 15 12
      js/component/manageCenter/order/orderNew/contractYxy.js
  26. 5 1
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  27. 1450 1163
      js/component/manageCenter/project/project/projectAssignment.jsx
  28. 13 24
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  29. 5 1
      js/component/manageCenter/project/task/taskAssignment.jsx
  30. 15 2
      js/component/tools.js

+ 23 - 1
js/component/dataDic.js

@@ -2739,5 +2739,27 @@ module.exports = {
 		    value: "9",
 		    key: "财务专员(非退单)"
         }
-	],
+    ],
+    contractChangeStatus:[
+        {
+            value: "0",
+		    key: "草稿"
+        },
+        {
+            value: "1",
+		    key: "审核中"
+        },
+        {
+            value: "2",
+		    key: "通过"
+        },
+        {
+            value: "3",
+		    key: "驳回"
+        },
+        {
+            value: "4",
+		    key: "完成"
+        },
+    ]
 };

+ 3 - 1
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -1215,7 +1215,9 @@ const approvedOutsourcing = React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="订单留言"
                       >
-                        <span>{theData.orderRemarks}</span>
+                        <p style={{ width: 500, wordWrap: "break-word" }}>
+                          {this.state.orderRemarks}
+                        </p>
                       </FormItem>
                     </div>
                     <div className="clearfix">

+ 3 - 1
js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx

@@ -963,7 +963,9 @@ const outsourcingPaiDan = React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="订单留言"
                       >
-                        <span>{theData.orderRemarks}</span>
+                        <p style={{ width: 500, wordWrap: "break-word" }}>
+                          {this.state.orderRemarks}
+                        </p>
                       </FormItem>
                     </div>
                     <div className="clearfix">

+ 3 - 1
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -1119,7 +1119,9 @@ const outsourcingPaiDan = React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="订单留言"
                       >
-                        <span>{theData.orderRemarks}</span>
+                        <p style={{ width: 500, wordWrap: "break-word" }}>
+                          {this.state.orderRemarks}
+                        </p>
                       </FormItem>
                     </div>
                     <div className="clearfix">

+ 237 - 128
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -296,134 +296,243 @@ const OrderDetail = Form.create()(React.createClass({
         };
         const jsDate = this.state.jsDate || [];
         return (
-			<div className='login'>
-			<Form layout="horizontal" id="demand-form">
-				<Spin spinning={this.state.loading}>
-                    <div className="clearfix">
-						<FormItem className="half-item" {...formItemLayout} label="订单编号">
-							<span>{theData.orderNo}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="签单时间">
-							<span>{theData.signDate}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="客户名称">
-							<span>{theData.userName}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="流转状态">
-							<span>{getProcessStatus(theData.processStatus)}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="订单类型">
-							<span>{getNewOrderType(theData.orderType)}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="结算状态">
-							<span>{getLiquidationStatus(theData.liquidationStatus)}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="签单总金额(万元)">
-							<span>{theData.totalAmount}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="首付款(万元)">
-							<span>{theData.firstAmount}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="已收款(万元)">
-							<span>{theData.settlementAmount}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="是否特批">
-							<span>{getApproval(theData.approval)}</span>
-						</FormItem>
-                        {this.props.data.orderStatus=='6'&&<FormItem className="half-item" {...formItemLayout} label="已退(万元)">
-							<span>{this.props.data.refundAmount}</span>
-						</FormItem>}
-					</div>
-                    <div className="clearfix">
-                        <FormItem labelCol={{ span: 5 }} 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>{theData.contractNo}</span>
-						</FormItem> 
-						<FormItem className="half-item" {...formItemLayout} label="订单部门">
-							<span>{theData.depName}</span>
-						</FormItem>
-                    </div>
-                    <div className="clearfix">
-						<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 18 }} label="订单留言">
-							<span>{theData.orderRemarks}</span>
-						</FormItem>
-					</div>
-                    <div className="clearfix">
-						<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 18 }} label="收款节点">
-							{
-                                jsDate.map(item=>{
-                                    return <p>{getjiedian(item.dunSubject)} -- {item.money} 万元</p>
-                                })
-                            }
-						</FormItem>
-					</div>
-                    <div className="clearfix">
-						<FormItem className="half-item" {...formItemLayout} label="订单负责人">
-							<span>{theData.salesmanName}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="订单负责人电话">
-							<span>{theData.salesmanMobile}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="财务负责人">
-							<span>{theData.financeName}</span>
-						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="财务负责人电话">
-							<span>{theData.financeMobile}</span>
-						</FormItem>
-					</div>
-					<Modal  visible={this.state.avisible}
-							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.columnsX}
-							            dataSource={this.state.dataSourceX}
-										pagination={false}
-							            />
-							    </Spin>
-							</div>
-					</Modal>
-                    <div className="clearfix">
-                        <p style={{fontSize:18,marginLeft:20}}>项目业务</p>
-                        <div className="patent-table">
-                            <Spin spinning={this.state.loading}>
-                                <Table columns={this.state.columns}
-                                    dataSource={this.state.dataSource}
-                                    pagination={this.state.pagination}
-                                    onRowClick={this.tableRowClick} 
-                                    />
-                            </Spin>
-                        </div>    
-                    </div>
-				</Spin>
-			</Form>   
-		</div>
-        )
+          <div className="login">
+            <Form layout="horizontal" id="demand-form">
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="订单编号"
+                  >
+                    <span>{theData.orderNo}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="签单时间"
+                  >
+                    <span>{theData.signDate}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="客户名称"
+                  >
+                    <span>{theData.userName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="流转状态"
+                  >
+                    <span>{getProcessStatus(theData.processStatus)}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="订单类型"
+                  >
+                    <span>{getNewOrderType(theData.orderType)}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="结算状态"
+                  >
+                    <span>
+                      {getLiquidationStatus(theData.liquidationStatus)}
+                    </span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="签单总金额(万元)"
+                  >
+                    <span>{theData.totalAmount}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="首付款(万元)"
+                  >
+                    <span>{theData.firstAmount}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="已收款(万元)"
+                  >
+                    <span>{theData.settlementAmount}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="是否特批"
+                  >
+                    <span>{getApproval(theData.approval)}</span>
+                  </FormItem>
+                  {this.props.data.orderStatus == "6" && (
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="已退(万元)"
+                    >
+                      <span>{this.props.data.refundAmount}</span>
+                    </FormItem>
+                  )}
+                </div>
+                <div className="clearfix">
+                  <FormItem
+                    labelCol={{ span: 5 }}
+                    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>{theData.contractNo}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="订单部门"
+                  >
+                    <span>{theData.depName}</span>
+                  </FormItem>
+                </div>
+                <div className="clearfix">
+                  <FormItem
+                    labelCol={{ span: 5 }}
+                    wrapperCol={{ span: 18 }}
+                    label="订单留言"
+                  >
+                    <p style={{ width: 500, wordWrap: "break-word" }}>
+                      {this.state.orderRemarks}
+                    </p>
+                  </FormItem>
+                </div>
+                <div className="clearfix">
+                  <FormItem
+                    labelCol={{ span: 5 }}
+                    wrapperCol={{ span: 18 }}
+                    label="收款节点"
+                  >
+                    {jsDate.map(item => {
+                      return (
+                        <p>
+                          {getjiedian(item.dunSubject)} -- {item.money} 万元
+                        </p>
+                      );
+                    })}
+                  </FormItem>
+                </div>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="订单负责人"
+                  >
+                    <span>{theData.salesmanName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="订单负责人电话"
+                  >
+                    <span>{theData.salesmanMobile}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="财务负责人"
+                  >
+                    <span>{theData.financeName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="财务负责人电话"
+                  >
+                    <span>{theData.financeMobile}</span>
+                  </FormItem>
+                </div>
+                <Modal
+                  visible={this.state.avisible}
+                  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.columnsX}
+                        dataSource={this.state.dataSourceX}
+                        pagination={false}
+                      />
+                    </Spin>
+                  </div>
+                </Modal>
+                <div className="clearfix">
+                  <p style={{ fontSize: 18, marginLeft: 20 }}>项目业务</p>
+                  <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                      <Table
+                        columns={this.state.columns}
+                        dataSource={this.state.dataSource}
+                        pagination={this.state.pagination}
+                        onRowClick={this.tableRowClick}
+                      />
+                    </Spin>
+                  </div>
+                </div>
+              </Spin>
+            </Form>
+          </div>
+        );
     }
 }));
 export default OrderDetail;

+ 23 - 75
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx

@@ -1,64 +1,8 @@
 import React from 'react';
-import { Icon, Table, Modal, message, Spin, Input, Select, Button, Radio,Form ,Upload,Popconfirm,AutoComplete,DatePicker} from 'antd';
-import ajax from 'jquery/src/ajax/xhr.js';
+import { Table, Modal, message, Spin, Input, Select, Button, Radio,Form ,Upload,Popconfirm,AutoComplete,DatePicker} from 'antd';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
-import {orderType} from '../../../../dataDic.js';  
-import {splitUrl,getOrderType,getOrderStage,getProjectState,getOrderState,getTransactionProject,getChangeState,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel,beforeUploadFile} from '../../../../tools.js';
-const Option = AutoComplete.Option;
-//图片组件
-const PicturesWall = React.createClass({
-    getInitialState() {
-        return {
-            previewVisible: false,
-            previewImage: '',
-            fileList: [],
-        }
-    },
-    handleCancel() {
-        this.setState({ previewVisible: false })
-    },
-    handlePreview(file) {
-        this.setState({
-            previewImage: file.url || file.thumbUrl,
-            previewVisible: true,
-        });
-    },
-    handleChange(info) {
-        let fileList = info.fileList;
-        this.setState({ fileList });
-        this.props.fileList(fileList);
-    },
-    componentWillReceiveProps(nextProps) {
-        this.state.fileList = nextProps.pictureUrl; 
-    },
-    render() {
-        const { previewVisible, previewImage, fileList } = this.state;
-        const uploadButton = (
-            <div>
-                <Icon type="plus" />
-                <div className="ant-upload-text">点击上传</div>
-            </div>
-        );
-        return (
-            <div style={{display:"inline-block"}}>
-                <Upload
-                	beforeUpload={beforeUploadFile}
-                    action={globalConfig.context + "/api/admin/order/uploadOrderImg"}
-                    data={{ 'sign': '' }}
-                    listType="picture-card"
-                    fileList={fileList}
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {fileList.length >= 8 ? null : uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
-            </div>
-        );
-    }
-});
+import {splitUrl,getOrderType,getProjectState,getOrderState,getTransactionProject,getChangeState,getPaymentState,getOrderChannel,getApprovedState,getTransactionChannel,beforeUploadFile} from '../../../../tools.js';
 const NewService = Form.create()(React.createClass({
 	loadData(record) {
         this.state.data = [];
@@ -160,9 +104,9 @@ const NewService = Form.create()(React.createClass({
                     title: '操作',
                     dataIndex: 'ABC',
                     key: 'ABC',
-                    render: (text, record, index) => {
+                    render: (text, record) => {
 						return <div style={{display:this.props.datauser.active.applySign||this.state.changeStatus==1?'block':'none'}}>
-								<Popconfirm title="是否删除?" onConfirm={(e)=>{this.delectRow(record)}} okText="是" cancelText="否">
+								<Popconfirm title="是否删除?" onConfirm={()=>{this.delectRow(record)}} okText="是" cancelText="否">
 								    <Button onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>                 
 								</Popconfirm>
 							</div>
@@ -246,7 +190,7 @@ const NewService = Form.create()(React.createClass({
 	        	return false;
         	};
         }
-		this.props.form.validateFields((err, values) => {
+		this.props.form.validateFields((err) => {
 			if(!err) {
 				this.setState({
 					loading: true
@@ -325,13 +269,13 @@ const NewService = Form.create()(React.createClass({
             });
         }.bind(this));  
     },
-	handleOk(e) {
+	handleOk() {
 		this.setState({
 			visible: false,
 		});
 		this.props.closeDesc(false, true);
 	},
-	handleCancel(e) {
+	handleCancel() {
 		this.setState({
 			visible: false,
 		});
@@ -384,7 +328,7 @@ const NewService = Form.create()(React.createClass({
 			addnextVisible: false
 		})
 	},
-	tableRowClick(record, index) {
+	tableRowClick(record) {
         this.setState({
         	editFw:record,
         	addnextVisible:true,
@@ -444,7 +388,7 @@ const NewService = Form.create()(React.createClass({
     		signBillVisible:false
     	})
     },
-    signBillCancel(e) {
+    signBillCancel() {
 		this.setState({
 			signVisible:false,
 			signBillVisible: false,
@@ -484,7 +428,7 @@ const NewService = Form.create()(React.createClass({
         }.bind(this));  
 	},
 	//上级主管输入框失去焦点是判断客户是否存在
-	selectAuto(value,options){
+	selectAuto(value){
 		let kid=[];
 		let fwList=this.state.customerArr;
 		fwList.map(function(item){
@@ -925,7 +869,7 @@ const NewService = Form.create()(React.createClass({
 		const dataSources=this.state.customerArr || [];
         const options = this.state.states?dataSources.map((group,index) =>
 				      <Select.Option key={index} value={group.name}>{group.name}</Select.Option>
-				     ):dataSources.map((group,index) =>
+				     ):dataSources.map((group) =>
 				      <Select.Option key={group.id} value={group.bname}>{group.bname}</Select.Option>
 				     )
 		    
@@ -1100,7 +1044,11 @@ const NewService = Form.create()(React.createClass({
 													            labelCol={{ span: 4 }}
 													            wrapperCol={{ span: 16 }}
 													            label="订单留言" >
-												        		<span>{orderDetaiel.orderRemarks}</span>
+												        		<p
+                                  style={{ width: 500, wordWrap: "break-word" }}
+                                >
+                                  {this.state.orderRemarks}
+                                </p>
 													        </FormItem>
 												        </div>
 												        <div className='clearfix changeStatusTxt'>
@@ -1186,20 +1134,20 @@ const NewService = Form.create()(React.createClass({
 						               		<div className='addSave' style={{marginTop:'15px'}}>
 							                    {!this.props.userDetaile||orderDetaiel.deleteSign==0&&orderDetaiel.orderStatus==2||orderDetaiel.changeStatus==1?<Button className="setSave" type="primary" htmlType="submit">保存</Button>:''}
 				                                {this.props.userDetaile?<div className='operations'>
-						                            {this.props.datauser.active.confirmIntention&&<Popconfirm title={'请确认您是否受理来自【'+this.props.datauser.buyerName+'】发起的服务意向订单?'} onConfirm={(e)=>{this.admissibleOrderOK()}} onCancel={(e)=>{this.admissibleOrderCancel()}} okText="同意" cancelText="拒绝">
+						                            {this.props.datauser.active.confirmIntention&&<Popconfirm title={'请确认您是否受理来自【'+this.props.datauser.buyerName+'】发起的服务意向订单?'} onConfirm={()=>{this.admissibleOrderOK()}} onCancel={()=>{this.admissibleOrderCancel()}} okText="同意" cancelText="拒绝">
 													    <Button style={{marginRight:'15px',marginLeft:'200px'}} type="primary">受理意向</Button>                 
 													</Popconfirm>}
-													{this.props.datauser.active.applySign&&<Button style={{marginRight:'10px'}} onClick={(e) =>{this.signBitt()}} type="primary">签单</Button>}             
-													{this.props.datauser.active.applyForCancel&&<Popconfirm title={'请确认您是否取消客户【'+this.props.datauser.buyerName+'】的服务订单,订单取消将导致业务终止!'} onConfirm={(e)=>{this.cancelOrder()}} okText="确认" cancelText="取消">
+													{this.props.datauser.active.applySign&&<Button style={{marginRight:'10px'}} onClick={() =>{this.signBitt()}} type="primary">签单</Button>}             
+													{this.props.datauser.active.applyForCancel&&<Popconfirm title={'请确认您是否取消客户【'+this.props.datauser.buyerName+'】的服务订单,订单取消将导致业务终止!'} onConfirm={()=>{this.cancelOrder()}} okText="确认" cancelText="取消">
 													    <Button style={{marginRight:'10px'}} type="danger">取消订单</Button>                 
 													</Popconfirm>}
-													{this.props.datauser.active.applyRevoke&&<Popconfirm title={'请确认您是否作废客户【'+this.props.datauser.buyerName+'】的服务订单,订单作废将导致订单失效!'} onConfirm={(e)=>{this.scrapOrder()}} okText="确认" cancelText="取消">
+													{this.props.datauser.active.applyRevoke&&<Popconfirm title={'请确认您是否作废客户【'+this.props.datauser.buyerName+'】的服务订单,订单作废将导致订单失效!'} onConfirm={()=>{this.scrapOrder()}} okText="确认" cancelText="取消">
 													    <Button style={{marginRight:'10px',marginLeft:'200px'}} type="danger">作废</Button>                 
 													</Popconfirm>}
-													{this.props.datauser.active.applyLock&&<Popconfirm title={'请确认您是否锁定客户【'+this.props.datauser.buyerName+'】的服务订单,订单锁定将导致订单暂停!'} onConfirm={(e)=>{this.lockOrder()}} okText="确认" cancelText="取消">
+													{this.props.datauser.active.applyLock&&<Popconfirm title={'请确认您是否锁定客户【'+this.props.datauser.buyerName+'】的服务订单,订单锁定将导致订单暂停!'} onConfirm={()=>{this.lockOrder()}} okText="确认" cancelText="取消">
 													    <Button style={{marginRight:'10px',marginLeft:'200px'}} type="danger">锁定</Button>                 
 													</Popconfirm>}
-													{this.props.datauser.active.applyUnLock&&<Popconfirm title={'请确认您是否解锁客户【'+this.props.datauser.buyerName+'】的服务订单,订单解锁将导致订单正常!'} onConfirm={(e)=>{this.unlockOrder()}} okText="确认" cancelText="取消">
+													{this.props.datauser.active.applyUnLock&&<Popconfirm title={'请确认您是否解锁客户【'+this.props.datauser.buyerName+'】的服务订单,订单解锁将导致订单正常!'} onConfirm={()=>{this.unlockOrder()}} okText="确认" cancelText="取消">
 													    <Button style={{marginRight:'10px',marginLeft:'200px'}} type="primary">解锁</Button>                 
 													</Popconfirm>}	
 				                                </div>:''}
@@ -1512,7 +1460,7 @@ const NewService = Form.create()(React.createClass({
 													   		<FormItem className="half-item"
 													            {...formItemLayout}
 													            label="变更操作" >                             
-													               <Button onClick={(e)=>{this.modifyChange(item)}}>修改</Button>
+													               <Button onClick={()=>{this.modifyChange(item)}}>修改</Button>
 													               {/*<Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>*/}
 													   		</FormItem>
 													    </div>

+ 198 - 124
js/component/manageCenter/order/orderNew/addService.jsx

@@ -37,6 +37,7 @@ import {
   getProjectStatus
 } from "../../../tools.js";
 import PicturesWall from "./changeComponent/picturesWall.js";
+import { changeType, getChangeType } from "./changeComponent/changeDetailYxgly";
 
 const Option = AutoComplete.Option;
 
@@ -735,7 +736,8 @@ const NewService = Form.create()(
     },
     handleOk() {
       this.setState({
-        visible: false
+        visible: false,
+        mark: false
       });
       this.props.closeDesc(false, true);
     },
@@ -747,14 +749,16 @@ const NewService = Form.create()(
         return false;
       }
       this.setState({
-        visible: false
+        visible: false,
+        mark: false
       });
       this.props.closeDesc(false);
     },
     handleCancelclose() {
       this.setState(
         {
-          visible: false
+          visible: false,
+          mark: false
         },
         () => {
           this.setState({
@@ -884,6 +888,7 @@ const NewService = Form.create()(
             orderNo: this.props.datauser.orderNo
           },
           success: function(data) {
+            console.log(data.data);
             if (data.data) {
               let thisdata = data.data;
               console.log(this.state.userName);
@@ -1279,6 +1284,10 @@ const NewService = Form.create()(
 
     //变更申请
     changeApply() {
+      if (this.state.processStatus <= 4) {
+        message.warning("当前订单流程不能发起变更!");
+        return false;
+      }
       let theorgCodeUrl = [];
       if (this.state.voucherUrl.length) {
         let picArr = [];
@@ -1318,9 +1327,6 @@ const NewService = Form.create()(
           });
           if (!data.error.length) {
             message.success("变更成功!");
-            this.setState({
-              mark: true
-            });
             this.noCancel();
             this.handleCancelclose();
           } else {
@@ -1374,6 +1380,7 @@ const NewService = Form.create()(
         labelCol: { span: 8 },
         wrapperCol: { span: 14 }
       };
+      const contractData = this.state.contractData;
       const formItemList = [
         {
           label: "企业联系人",
@@ -1725,7 +1732,7 @@ const NewService = Form.create()(
                                 <span>
                                   {this.state.settlementAmount + "万元"}
                                 </span>
-                                {this.state.settlementAmount ? (
+                                {/* {this.state.settlementAmount ? (
                                   <Button
                                     type="primary"
                                     onClick={this.tuikuan}
@@ -1739,7 +1746,7 @@ const NewService = Form.create()(
                                   </Button>
                                 ) : (
                                   ""
-                                )}
+                                )} */}
                               </FormItem>
                             </div>
                           ) : (
@@ -1766,7 +1773,7 @@ const NewService = Form.create()(
                                 <span>
                                   {this.state.settlementAmount + "万元"}
                                 </span>
-                                {this.state.settlementAmount ? (
+                                {/* {this.state.settlementAmount ? (
                                   <Button
                                     type="primary"
                                     onClick={this.tuikuan}
@@ -1780,7 +1787,7 @@ const NewService = Form.create()(
                                   </Button>
                                 ) : (
                                   ""
-                                )}
+                                )} */}
                               </FormItem>
                             </div>
                           )}
@@ -1990,7 +1997,11 @@ const NewService = Form.create()(
                                 wrapperCol={{ span: 16 }}
                                 label="订单留言"
                               >
-                                <span>{this.state.orderRemarks}</span>
+                                <p
+                                  style={{ width: 500, wordWrap: "break-word" }}
+                                >
+                                  {this.state.orderRemarks}
+                                </p>
                               </FormItem>
                             )}
                           </div>
@@ -2135,7 +2146,7 @@ const NewService = Form.create()(
                         </div>
                       </TabPane>
                       <TabPane tab="合同变更记录" key="2">
-                        {!this.state.mark ? (
+                        {
                           <div>
                             <div className="clearfix">
                               <FormItem
@@ -2161,42 +2172,50 @@ const NewService = Form.create()(
                                 {...formItemLayout}
                                 label="申请变更部门"
                               >
-                                <Select
-                                  placeholder="请输入变更部门"
-                                  style={{ width: 240 }}
-                                  value={this.state.depNameChange}
-                                  onChange={e => {
-                                    this.setState({ depNameChange: e });
-                                  }}
-                                >
-                                  {departmentArr.map(function(item) {
-                                    return (
-                                      <Select.Option
-                                        key={item.id}
-                                        value={item.name}
-                                      >
-                                        {item.name}
-                                      </Select.Option>
-                                    );
-                                  })}
-                                </Select>
+                                {!this.state.mark ? (
+                                  <Select
+                                    placeholder="请输入变更部门"
+                                    style={{ width: 240 }}
+                                    value={this.state.depNameChange}
+                                    onChange={e => {
+                                      this.setState({ depNameChange: e });
+                                    }}
+                                  >
+                                    {departmentArr.map(function(item) {
+                                      return (
+                                        <Select.Option
+                                          key={item.id}
+                                          value={item.name}
+                                        >
+                                          {item.name}
+                                        </Select.Option>
+                                      );
+                                    })}
+                                  </Select>
+                                ) : (
+                                  <span>{contractData.depName}</span>
+                                )}
                               </FormItem>
                               <FormItem
                                 className="half-item"
                                 {...formItemLayout}
                                 label="申请人"
                               >
-                                <Input
-                                  placeholder="请输入申请人"
-                                  ref="signTotalAmount"
-                                  value={this.state.applicant}
-                                  onChange={e => {
-                                    this.setState({
-                                      applicant: e.target.value
-                                    });
-                                  }}
-                                  style={{ width: "240px" }}
-                                />
+                                {!this.state.mark ? (
+                                  <Input
+                                    placeholder="请输入申请人"
+                                    ref="signTotalAmount"
+                                    value={this.state.applicant}
+                                    onChange={e => {
+                                      this.setState({
+                                        applicant: e.target.value
+                                      });
+                                    }}
+                                    style={{ width: "240px" }}
+                                  />
+                                ) : (
+                                  <span>{contractData.applicant}</span>
+                                )}
                               </FormItem>
                             </div>
                             <div className="clearfix">
@@ -2205,23 +2224,29 @@ const NewService = Form.create()(
                                 wrapperCol={{ span: 18 }}
                                 label="变更类型"
                               >
-                                <Select
-                                  placeholder="选择合同变更类型"
-                                  style={{ width: 200 }}
-                                  onChange={e => {
-                                    this.setState({
-                                      typeChange: e
-                                    });
-                                  }}
-                                  value={this.state.typeChange}
-                                >
-                                  <Option value={0}>退单退款</Option>
-                                  <Option value={1}>项目及金额变更</Option>
-                                  <Option value={2}>仅项目变更</Option>
-                                  <Option value={3}>仅金额变更</Option>
-                                  <Option value={4}>重报</Option>
-                                  <Option value={5}>赠送</Option>
-                                </Select>
+                                {!this.state.mark ? (
+                                  <Select
+                                    placeholder="选择合同变更类型"
+                                    style={{ width: 200 }}
+                                    onChange={e => {
+                                      this.setState({
+                                        typeChange: e
+                                      });
+                                    }}
+                                    value={this.state.typeChange}
+                                  >
+                                    <Option value={0}>退单退款</Option>
+                                    <Option value={1}>项目及金额变更</Option>
+                                    <Option value={2}>仅项目变更</Option>
+                                    <Option value={3}>仅金额变更</Option>
+                                    <Option value={4}>重报</Option>
+                                    <Option value={5}>赠送</Option>
+                                  </Select>
+                                ) : (
+                                  <span>
+                                    {getChangeType(contractData.type)}
+                                  </span>
+                                )}
                               </FormItem>
                             </div>
                             <div className="clearfix">
@@ -2230,51 +2255,63 @@ const NewService = Form.create()(
                                 wrapperCol={{ span: 18 }}
                                 label="合同额(万元)"
                               >
-                                <Input
-                                  placeholder="请输入合同额"
-                                  ref="signTotalAmount"
-                                  value={this.state.totalAmountC}
-                                  onChange={e => {
-                                    this.setState({
-                                      totalAmountC: e.target.value
-                                    });
-                                  }}
-                                  style={{ width: "240px" }}
-                                />
+                                {!this.state.mark ? (
+                                  <Input
+                                    placeholder="请输入合同额"
+                                    ref="signTotalAmount"
+                                    value={this.state.totalAmountC}
+                                    onChange={e => {
+                                      this.setState({
+                                        totalAmountC: e.target.value
+                                      });
+                                    }}
+                                    style={{ width: "240px" }}
+                                  />
+                                ) : (
+                                  <span>{contractData.totalAmount}</span>
+                                )}
                               </FormItem>
                               <FormItem
                                 labelCol={{ span: 4 }}
                                 wrapperCol={{ span: 18 }}
                                 label="已收款(万元)"
                               >
-                                <Input
-                                  placeholder="请输入已收款"
-                                  ref="signTotalAmount"
-                                  value={this.state.settlementAmountC}
-                                  onChange={e => {
-                                    this.setState({
-                                      settlementAmountC: e.target.value
-                                    });
-                                  }}
-                                  style={{ width: "240px" }}
-                                />
+                                {!this.state.mark ? (
+                                  <Input
+                                    placeholder="请输入已收款"
+                                    ref="signTotalAmount"
+                                    value={this.state.settlementAmountC}
+                                    onChange={e => {
+                                      this.setState({
+                                        settlementAmountC: e.target.value
+                                      });
+                                    }}
+                                    style={{ width: "240px" }}
+                                  />
+                                ) : (
+                                  <span>{contractData.settlementAmount}</span>
+                                )}
                               </FormItem>
                               <FormItem
                                 labelCol={{ span: 4 }}
                                 wrapperCol={{ span: 18 }}
                                 label="申请退款(万元)"
                               >
-                                <Input
-                                  placeholder="请输入申请退款"
-                                  ref="signTotalAmount"
-                                  value={this.state.changeAmount}
-                                  onChange={e => {
-                                    this.setState({
-                                      changeAmount: e.target.value
-                                    });
-                                  }}
-                                  style={{ width: "240px" }}
-                                />
+                                {!this.state.mark ? (
+                                  <Input
+                                    placeholder="请输入申请退款"
+                                    ref="signTotalAmount"
+                                    value={this.state.changeAmount}
+                                    onChange={e => {
+                                      this.setState({
+                                        changeAmount: e.target.value
+                                      });
+                                    }}
+                                    style={{ width: "240px" }}
+                                  />
+                                ) : (
+                                  <span>{contractData.changeAmount}</span>
+                                )}
                               </FormItem>
                             </div>
                             <div className="clearfix">
@@ -2284,16 +2321,22 @@ const NewService = Form.create()(
                                 wrapperCol={{ span: 18 }}
                                 label="备注"
                               >
-                                <TextArea
-                                  rows={4}
-                                  placeholder="因企业政府补助费用与营销员签单承诺费用不一"
-                                  ref="signTotalAmount"
-                                  style={{ width: "95%" }}
-                                  value={this.state.remarksC}
-                                  onChange={e => {
-                                    this.setState({ remarksC: e.target.value });
-                                  }}
-                                />
+                                {!this.state.mark ? (
+                                  <TextArea
+                                    rows={4}
+                                    placeholder="因企业政府补助费用与营销员签单承诺费用不一"
+                                    ref="signTotalAmount"
+                                    style={{ width: "95%" }}
+                                    value={this.state.remarksC}
+                                    onChange={e => {
+                                      this.setState({
+                                        remarksC: e.target.value
+                                      });
+                                    }}
+                                  />
+                                ) : (
+                                  <span>{contractData.remarks}</span>
+                                )}
                               </FormItem>
                             </div>
                             <div className="clearfix">
@@ -2302,32 +2345,63 @@ const NewService = Form.create()(
                                 wrapperCol={{ span: 18 }}
                                 label="变更凭证"
                               >
-                                <PicturesWall
-                                  fileList={this.getVoucherUrl}
-                                  pictureUrl={this.state.voucherUrl}
-                                  url="/api/admin/orderChange/uploadFile"
-                                  sign="order_change_file"
-                                />
+                                {!this.state.mark ? (
+                                  <PicturesWall
+                                    fileList={this.getVoucherUrl}
+                                    pictureUrl={this.state.voucherUrl}
+                                    url="/api/admin/orderChange/uploadFile"
+                                    sign="order_change_file"
+                                  />
+                                ) : (
+                                  <div>
+                                    <Upload
+                                      className="demandDetailShow-upload"
+                                      listType="picture-card"
+                                      fileList={this.state.voucherUrl}
+                                      onPreview={file => {
+                                        this.setState({
+                                          previewImage:
+                                            file.url || file.thumbUrl,
+                                          previewVisible: true
+                                        });
+                                      }}
+                                    />
+                                    <Modal
+                                      maskClosable={false}
+                                      footer={null}
+                                      visible={this.state.previewVisible}
+                                      onCancel={() => {
+                                        this.setState({
+                                          previewVisible: false
+                                        });
+                                      }}
+                                    >
+                                      <img
+                                        alt=""
+                                        style={{ width: "100%" }}
+                                        src={this.state.previewImage || ""}
+                                      />
+                                    </Modal>
+                                  </div>
+                                )}
                                 <p>图片建议:要清晰。</p>
                               </FormItem>
                             </div>
-                            <div className="clearfix">
-                              <Button
-                                type="primary"
-                                style={{ float: "right", marginRight: 40 }}
-                                onClick={this.changeApply}
-                              >
-                                发起变更申请
-                              </Button>
-                            </div>
-                          </div>
-                        ) : (
-                          <div style={{ height: 600, display: "flex" }}>
-                            <p style={{ margin: "auto" }}>
-                              此单已发起合同变更,请到合同变更审核列表页面查看
-                            </p>
+                            {!this.state.mark ? (
+                              <div className="clearfix">
+                                <Button
+                                  type="primary"
+                                  style={{ float: "right", marginRight: 40 }}
+                                  onClick={this.changeApply}
+                                >
+                                  发起变更申请
+                                </Button>
+                              </div>
+                            ) : (
+                              ""
+                            )}
                           </div>
-                        )}
+                        }
                       </TabPane>
                     </Tabs>
                   )}

+ 5 - 4
js/component/manageCenter/order/orderNew/addorders.js

@@ -140,6 +140,7 @@ const Addorders = Form.create()(
         customerArr: [],
         mark: false,
         activeKey: "1",
+        buttonStatus: true,
         typeChange: 0,
         bussStats: false,
         checkedKeys: [],
@@ -1587,7 +1588,7 @@ const Addorders = Form.create()(
                     label="已收款项"
                   >
                     <span>{this.state.settlementAmount + "万元"}</span>
-                    {this.state.settlementAmount ? (
+                    {/* {this.state.settlementAmount ? (
                       <Button
                         type="primary"
                         onClick={this.tuikuan}
@@ -1601,7 +1602,7 @@ const Addorders = Form.create()(
                       </Button>
                     ) : (
                       ""
-                    )}
+                    )} */}
                   </FormItem>
                 </div>
               ) : (
@@ -1626,7 +1627,7 @@ const Addorders = Form.create()(
                     label="已收款项"
                   >
                     <span>{this.state.settlementAmount + "万元"}</span>
-                    {this.state.settlementAmount ? (
+                    {/* {this.state.settlementAmount ? (
                       <Button
                         type="primary"
                         onClick={this.tuikuan}
@@ -1640,7 +1641,7 @@ const Addorders = Form.create()(
                       </Button>
                     ) : (
                       ""
-                    )}
+                    )} */}
                   </FormItem>
                 </div>
               )}

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

@@ -181,7 +181,7 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: getProcessStatusNew(this.props.data.processState),
+        dataA: this.props.data.processStateText,
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
@@ -340,7 +340,7 @@ class ChangeDetail extends Component {
         {this.props.data.type === 0 && this.props.data.processState >= 4 ? (
           <div>
             <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
-              当前项目进度(咨询师填写)
+              当前项目进度(咨询师经理填写)
             </h3>
             {planData.map((item, index) => {
               return <Itemlist key={index} pageData={item} />;

+ 63 - 11
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -157,6 +157,15 @@ class ChangeDetail extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
+    this.setState({
+      paymentTimes: nextProps.data.paymentTimes,
+      paymentAmount: nextProps.data.paymentAmount,
+      invoiceTimes: nextProps.data.invoiceTimes,
+      invoiceAmount: nextProps.data.invoiceAmount,
+      cwCost: nextProps.data.cwCost,
+      refundableAmount: nextProps.data.refundableAmount,
+      cwRemarks: nextProps.data.cwRemarks
+    });
     if (!nextProps.reset) {
       this.reset();
     }
@@ -212,7 +221,7 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: getProcessStatusNew(this.props.data.processState),
+        dataA: this.props.data.processStateText,
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
@@ -371,7 +380,7 @@ class ChangeDetail extends Component {
         {this.props.data.type === 0 ? (
           <div>
             <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
-              当前项目进度(咨询师填写)
+              当前项目进度(咨询师经理填写)
             </h3>
             {planData.map((item, index) => {
               return <Itemlist key={index} pageData={item} />;
@@ -428,7 +437,7 @@ class ChangeDetail extends Component {
             })}
           </div>
         ) : (
-          <div>
+          <div style={{ marginBottom: 10 }}>
             <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
               当前财务状态(财务填写)
             </h3>
@@ -509,16 +518,59 @@ class ChangeDetail extends Component {
                   }}
                 />
               </Form.Item>
+              <Form.Item
+                className="half-item"
+                label="发生成本(万元)"
+                labelCol={{ span: 8 }}
+                wrapperCol={{ span: 14 }}
+              >
+                <Input
+                  style={{ width: 160 }}
+                  value={this.state.cwCost}
+                  placeholder="请输入发生成本"
+                  onChange={e => {
+                    this.setState({
+                      cwCost: e.target.value
+                    });
+                  }}
+                />
+              </Form.Item>
+              <Form.Item
+                className="half-item"
+                label="应退金额(万元)"
+                labelCol={{ span: 8 }}
+                wrapperCol={{ span: 14 }}
+              >
+                <Input
+                  style={{ width: 160 }}
+                  value={this.state.refundableAmount}
+                  placeholder="请输入应退金额"
+                  onChange={e => {
+                    this.setState({
+                      refundableAmount: e.target.value
+                    });
+                  }}
+                />
+              </Form.Item>
             </div>
-            {financeData.map((item, index) => {
-              return (
-                <ItemInput
-                  key={index}
-                  pageData={item}
-                  reset={this.props.reset}
+            <div>
+              <Form.Item
+                label="补充资料/备注"
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 14 }}
+              >
+                <Input.TextArea
+                  rows={4}
+                  value={this.state.cwRemarks}
+                  placeholder="请输入补充资料/备注"
+                  onChange={e => {
+                    this.setState({
+                      cwRemarks: e.target.value
+                    });
+                  }}
                 />
-              );
-            })}
+              </Form.Item>
+            </div>
           </div>
         )}
         {!(

+ 70 - 83
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -77,75 +77,11 @@ class Itemlist extends Component {
   }
 }
 
-class ItemInput extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      valueA: "",
-      valueB: ""
-    };
-    this.reset = this.reset.bind(this);
-  }
-
-  componentWillReceiveProps(nextProps) {
-    if (!nextProps.reset) {
-      this.reset();
-    }
-  }
-
-  reset() {
-    this.setState({
-      valueA: "",
-      valueB: ""
-    });
-  }
-
-  render() {
-    let pageData = this.props.pageData;
-    return (
-      <div className="clearfix">
-        <Form.Item
-          label={pageData.labelA}
-          {...pageData.formItemLayoutA}
-          className="half-item"
-        >
-          <Input
-            value={this.state.valueA}
-            placeholder={"请输入" + pageData.labelA}
-            style={{ width: 160 }}
-            onChange={e => {
-              this.setState({ valueA: e.target.value });
-              pageData.onChangeA(e.target.value);
-            }}
-          />
-        </Form.Item>
-        <Form.Item
-          label={pageData.labelB}
-          {...pageData.formItemLayoutB}
-          className="half-item"
-        >
-          {pageData.mark ? (
-            <Input
-              value={this.state.valueB}
-              placeholder={"请输入" + pageData.labelB}
-              style={{ width: 160 }}
-              onChange={e => {
-                this.setState({ valueB: e.target.value });
-                pageData.onChangeB(e.target.value);
-              }}
-            />
-          ) : (
-            ""
-          )}
-        </Form.Item>
-      </div>
-    );
-  }
-}
 
 class ChangeDetail extends Component {
   constructor(props) {
     super(props);
+    console.log(props);
     this.state = {
       previewVisible: false,
       buttonStatus: true,
@@ -155,6 +91,14 @@ class ChangeDetail extends Component {
     this.changeButtonStatus = this.changeButtonStatus.bind(this);
   }
 
+  componentWillReceiveProps(nextProps) {
+    this.setState({
+      projectState: nextProps.data.projectState,
+      zxsCost: nextProps.data.zxsCost,
+      zxsRemarks: nextProps.data.zxsRemarks
+    });
+  }
+
   getOrgCodeUrl(e) {
     this.setState({
       orgCodeUrl: e
@@ -189,7 +133,7 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: getProcessStatusNew(this.props.data.processState),
+        dataA: this.props.data.processStateText,
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
@@ -233,8 +177,7 @@ class ChangeDetail extends Component {
           this.setState({
             zxsCost: value
           });
-        },
-        mark: true
+        }
       },
       {
         labelA: "备注",
@@ -244,8 +187,7 @@ class ChangeDetail extends Component {
           this.setState({
             zxsRemarks: value
           });
-        },
-        mark: false
+        }
       }
     ];
     const financeData = [
@@ -347,26 +289,71 @@ class ChangeDetail extends Component {
         {this.props.data.processState >= 4 ? (
           <div>
             <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
-              当前项目进度(咨询师填写)
+              当前项目进度(咨询师经理填写)
             </h3>
             {planData.map((item, index) => {
               return <Itemlist key={index} pageData={item} />;
             })}
           </div>
         ) : (
-          <div>
-            <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
-              当前项目进度(咨询师填写)
-            </h3>
-            {planData.map((item, index) => {
-              return (
-                <ItemInput
-                  key={index}
-                  pageData={item}
-                  reset={this.props.reset}
+          <div style={{ marginBottom: 10 }}>
+            <div className="clearfix">
+              <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
+                当前项目进度(咨询师经理填写)
+              </h3>
+              <Form.Item
+                className="half-item"
+                label="项目进度"
+                labelCol={{ span: 8 }}
+                wrapperCol={{ span: 14 }}
+              >
+                <Input
+                  style={{ width: 160 }}
+                  value={this.state.projectState}
+                  placeholder="请输入项目进度"
+                  onChange={e => {
+                    this.setState({
+                      projectState: e.target.value
+                    });
+                  }}
                 />
-              );
-            })}
+              </Form.Item>
+              <Form.Item
+                className="half-item"
+                label="发生成本费用(万元)"
+                labelCol={{ span: 8 }}
+                wrapperCol={{ span: 14 }}
+              >
+                <Input
+                  style={{ width: 160 }}
+                  value={this.state.zxsCost}
+                  placeholder="请输入发生成本费用"
+                  onChange={e => {
+                    this.setState({
+                      zxsCost: e.target.value
+                    });
+                  }}
+                />
+              </Form.Item>
+            </div>
+            <div>
+              <Form.Item
+                label="备注"
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 14 }}
+              >
+                <Input.TextArea
+                  value={this.state.zxsRemarks}
+                  rows={4}
+                  placeholder="请输入备注"
+                  onChange={e => {
+                    this.setState({
+                      zxsRemarks: e.target.value
+                    });
+                  }}
+                />
+              </Form.Item>
+            </div>
           </div>
         )}
         {this.props.data.processState >= 5 ? (

+ 54 - 17
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -7,6 +7,47 @@ const formItemLayout = {
   labelCol: { span: 8 },
   wrapperCol: { span: 14 }
 };
+
+const changeType = [
+  {
+    value: "0",
+    key: "退单退款"
+  },
+  {
+    value: "1",
+    key: "项目及金额变更"
+  },
+  {
+    value: "2",
+    key: "仅项目变更"
+  },
+  {
+    value: "3",
+    key: "仅金额变更"
+  },
+  {
+    value: "4",
+    key: "重报"
+  },
+  {
+    value: "5",
+    key: "赠送"
+  }
+];
+
+const getChangeType = function(e) {
+  if (e || e == 0) {
+    let str = e.toString();
+    let theType = "";
+    changeType.map(function(item) {
+      if (item.value == str) {
+        theType = item.key;
+      }
+    });
+    return theType;
+  }
+};
+
 class Itemlist extends Component {
   constructor(props) {
     super(props);
@@ -71,26 +112,26 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.processState,
+        dataA: this.props.data.processStateText,
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.type
+        dataB: getChangeType(this.props.data.type)
       },
       {
         labelA: "合同额(万元)",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.totalAmount,
+        dataA: "***",
         labelB: "已收款(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.settlementAmount
+        dataB: "***"
       },
       {
         labelA: "欠款(万元)",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.arrears,
+        dataA: "***",
         labelB: "申请退款(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.changeAmount
+        dataB: "***"
       },
       {
         labelA: "备注",
@@ -105,7 +146,7 @@ class ChangeDetail extends Component {
         dataA: this.props.data.projectState,
         labelB: "发生成本费用(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.zxsCost
+        dataB: "***"
       },
       {
         labelA: "备注",
@@ -120,7 +161,7 @@ class ChangeDetail extends Component {
         dataA: this.props.data.paymentTimes,
         labelB: "收款金额(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.paymentAmount
+        dataB: "***"
       },
       {
         labelA: "开票时间",
@@ -128,15 +169,15 @@ class ChangeDetail extends Component {
         dataA: this.props.data.invoiceTimes,
         labelB: "已开票金额(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.invoiceAmount
+        dataB: "***"
       },
       {
         labelA: "发生成本(万元)",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.cwCost,
+        dataA: "***",
         labelB: "应退金额(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.refundableAmount
+        dataB: "***"
       },
       {
         labelA: "补充资料/备注",
@@ -211,9 +252,7 @@ class ChangeDetail extends Component {
         </Form.Item>
         {this.props.data.processState >= 3 ? (
           <div>
-            <h3
-              style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}
-            >
+            <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
               当前项目进度(咨询师填写)
             </h3>
             {planData.map((item, index) => {
@@ -225,9 +264,7 @@ class ChangeDetail extends Component {
         )}
         {this.props.data.processState >= 5 ? (
           <div>
-            <h3
-              style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}
-            >
+            <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
               当前财务状态(财务填写)
             </h3>
             {financeData.map((item, index) => {

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

@@ -166,7 +166,7 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: getProcessStatusNew(this.props.data.processState),
+        dataA: this.props.data.processStateText,
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
@@ -324,7 +324,7 @@ class ChangeDetail extends Component {
             <h3
               style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}
             >
-              当前项目进度(咨询师填写)
+              当前项目进度(咨询师经理填写)
             </h3>
             {planData.map((item, index) => {
               return <Itemlist key={index} pageData={item} />;

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

@@ -122,7 +122,7 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: getProcessStatusNew(this.props.data.processState),
+        dataA: this.props.data.processStateText,
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
@@ -260,10 +260,10 @@ class ChangeDetail extends Component {
           </Modal>
           <Rizhi changeId={this.props.data.id} />
         </Form.Item>
-        {(this.props.data.type === 0 && this.props.data.processState >= 2) ? (
+        {this.props.data.type === 0 && this.props.data.processState >= 2 ? (
           <div>
             <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
-              当前项目进度(咨询师填写)
+              当前项目进度(咨询师经理填写)
             </h3>
             {planData.map((item, index) => {
               return <Itemlist key={index} pageData={item} />;
@@ -327,4 +327,4 @@ class ChangeDetail extends Component {
   }
 }
 
-export { ChangeDetail };
+export { ChangeDetail, changeType, getChangeType };

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

@@ -113,7 +113,7 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: getProcessStatusNew(this.props.data.processState),
+        dataA: this.props.data.processStateText,
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
@@ -254,7 +254,7 @@ class ChangeDetail extends Component {
         {(this.props.data.type === 0 && this.props.data.processState >= 2) ? (
           <div>
             <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
-              当前项目进度(咨询师填写)
+              当前项目进度(咨询师经理填写)
             </h3>
             {planData.map((item, index) => {
               return <Itemlist key={index} pageData={item} />;

+ 17 - 5
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -28,7 +28,10 @@ class OrderDetail extends Component {
         {
           title: "金额(万)",
           dataIndex: "money",
-          key: "money"
+          key: "money",
+          render: text => {
+            return this.props.processState === 2 ? "***" : text;
+          }
         },
         {
           title: "催款状态",
@@ -58,7 +61,10 @@ class OrderDetail extends Component {
         {
           title: "金额(万元)",
           dataIndex: "commodityPrice",
-          key: "commodityPrice"
+          key: "commodityPrice",
+          render: text => {
+            return this.props.processState === 2 ? "***" : text;
+          }
         },
         {
           title: "负责人",
@@ -169,14 +175,18 @@ class OrderDetail extends Component {
           {...formItemLayout}
           label="签单金额(万元)"
         >
-          <span>{data.totalAmount}</span>
+          <span>
+            {this.props.processState === 2 ? "***" : data.totalAmount}
+          </span>
         </FormItem>
         <FormItem
           className="half-item"
           {...formItemLayout}
           label="首付金额(万元)"
         >
-          <span>{data.firstAmount}</span>
+          <span>
+            {this.props.processState === 2 ? "***" : data.firstAmount}
+          </span>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="特批立项">
           <span>{getApprovedState(data.approval)}</span>
@@ -186,7 +196,9 @@ class OrderDetail extends Component {
           {...formItemLayout}
           label="已收款项(万元)"
         >
-          <span>{data.settlementAmount}</span>
+          <span>
+            {this.props.processState === 2 ? "***" : data.settlementAmount}
+          </span>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="订单部门">
           <span>{data.depName}</span>

+ 7 - 3
js/component/manageCenter/order/orderNew/changeComponent/rizhi.js

@@ -1,6 +1,7 @@
 import React, { Component } from "react";
 import { Modal, Table, Button, message, Spin } from "antd";
 import $ from "jquery/src/ajax";
+import "./table.less";
 
 const status = [
   {
@@ -66,7 +67,10 @@ class Rizhi extends Component {
         {
           title: "备注",
           dataIndex: "remarks",
-          key: "remarks"
+          key: "remarks",
+          render: text => {
+            return <div style={{ width: 300 }}>{text}</div>;
+          }
         }
       ]
     };
@@ -126,12 +130,12 @@ class Rizhi extends Component {
             this.changeModal();
           }}
         >
-          查看订单日志
+          查看变更日志
         </Button>
         <Modal
           maskClosable={false}
           visible={this.state.visible}
-          title="订单日志"
+          title="变更日志"
           footer=""
           width={800}
           onCancel={() => {

+ 4 - 0
js/component/manageCenter/order/orderNew/changeComponent/table.less

@@ -0,0 +1,4 @@
+table tr span,
+table tr td {
+  white-space: normal;
+}

+ 14 - 15
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -63,7 +63,11 @@ const contractChange = Form.create()(
                 processState: thisdata.processState,
                 type: thisdata.type,
                 status: thisdata.status,
-                id: thisdata.id
+                id: thisdata.id,
+                processStateText:
+                  thisdata.status !== 4
+                    ? getProcessStatusNew(thisdata.processState) + "审核中"
+                    : getProcessStatusNew(thisdata.processState) + "已完成"
               });
             }
             this.state.pagination.total = data.data.totalCount;
@@ -178,12 +182,9 @@ const contractChange = Form.create()(
             key: "depName"
           },
           {
-            title: "项目状态",
-            dataIndex: "processState",
-            key: "processState",
-            render: text => {
-              return getProcessStatusNew(text);
-            }
+            title: "审核状态",
+            dataIndex: "processStateText",
+            key: "processStateText"
           }
         ],
         dataSource: [],
@@ -299,8 +300,8 @@ const contractChange = Form.create()(
           status: record.status,
           buttonStatus: true,
           orderStatus: record.orderStatus,
+          processStateText: record.processStateText,
           id: record.id,
-          arrears: record.arrears,
           orderNo: record.orderNo
         },
         () => {
@@ -349,9 +350,9 @@ const contractChange = Form.create()(
             let thisdata = data.data;
             console.log(this.state.userName);
             Object.assign(thisdata, {
+              processStateText: this.state.processStateText,
               userName: this.state.userName,
-              contractNo: this.state.contractNo,
-              arrears: this.state.arrears
+              contractNo: this.state.contractNo
             });
             this.setState({
               contractData: thisdata,
@@ -871,17 +872,15 @@ const contractChange = Form.create()(
     visitCancel() {
       this.setState(
         {
-          activeKey: "1",
-          sendOkA: false
+          activeKey: "1"
         },
         () => {
           this.setState({
-            visible: false,
-            sendOk: false
+            visible: false
           });
         }
       );
-      this.loadData();
+      this.loadData(this.state.pageNo);
     },
     visitOk() {
       this.setState({

+ 14 - 15
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -63,7 +63,11 @@ const contractChange = Form.create()(
                 processState: thisdata.processState,
                 type: thisdata.type,
                 status: thisdata.status,
-                id: thisdata.id
+                id: thisdata.id,
+                processStateText:
+                  thisdata.status !== 4
+                    ? getProcessStatusNew(thisdata.processState) + "审核中"
+                    : getProcessStatusNew(thisdata.processState) + "已完成"
               });
             }
             this.state.pagination.total = data.data.totalCount;
@@ -178,12 +182,9 @@ const contractChange = Form.create()(
             key: "depName"
           },
           {
-            title: "项目状态",
-            dataIndex: "processState",
-            key: "processState",
-            render: text => {
-              return getProcessStatusNew(text);
-            }
+            title: "审核状态",
+            dataIndex: "processStateText",
+            key: "processStateText"
           }
         ],
         dataSource: [],
@@ -299,8 +300,8 @@ const contractChange = Form.create()(
           status: record.status,
           buttonStatus: true,
           orderStatus: record.orderStatus,
+          processStateText: record.processStateText,
           id: record.id,
-          arrears: record.arrears,
           orderNo: record.orderNo
         },
         () => {
@@ -348,9 +349,9 @@ const contractChange = Form.create()(
           if (data.data) {
             let thisdata = data.data;
             Object.assign(thisdata, {
+              processStateText: this.state.processStateText,
               userName: this.state.userName,
-              contractNo: this.state.contractNo,
-              arrears: this.state.arrears
+              contractNo: this.state.contractNo
             });
             this.setState({
               contractData: thisdata,
@@ -870,17 +871,15 @@ const contractChange = Form.create()(
     visitCancel() {
       this.setState(
         {
-          activeKey: "1",
-          sendOkA: false
+          activeKey: "1"
         },
         () => {
           this.setState({
-            visible: false,
-            sendOk: false
+            visible: false
           });
         }
       );
-      this.loadData();
+      this.loadData(this.state.pageNo);
     },
     visitOk() {
       this.setState({

+ 12 - 11
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -63,7 +63,11 @@ const contractChange = Form.create()(
                 processState: thisdata.processState,
                 type: thisdata.type,
                 status: thisdata.status,
-                id: thisdata.id
+                id: thisdata.id,
+                processStateText:
+                  thisdata.status !== 4
+                    ? getProcessStatusNew(thisdata.processState) + "审核中"
+                    : getProcessStatusNew(thisdata.processState) + "已完成"
               });
             }
             this.state.pagination.total = data.data.totalCount;
@@ -178,12 +182,9 @@ const contractChange = Form.create()(
             key: "depName"
           },
           {
-            title: "项目状态",
-            dataIndex: "processState",
-            key: "processState",
-            render: text => {
-              return getProcessStatusNew(text);
-            }
+            title: "审核状态",
+            dataIndex: "processStateText",
+            key: "processStateText"
           }
         ],
         dataSource: [],
@@ -299,8 +300,8 @@ const contractChange = Form.create()(
           status: record.status,
           buttonStatus: true,
           orderStatus: record.orderStatus,
+          processStateText: record.processStateText,
           id: record.id,
-          arrears: record.arrears,
           orderNo: record.orderNo
         },
         () => {
@@ -349,9 +350,9 @@ const contractChange = Form.create()(
             let thisdata = data.data;
             console.log(this.state.userName);
             Object.assign(thisdata, {
+              processStateText: this.state.processStateText,
               userName: this.state.userName,
-              contractNo: this.state.contractNo,
-              arrears: this.state.arrears
+              contractNo: this.state.contractNo
             });
             this.setState({
               contractData: thisdata,
@@ -879,7 +880,7 @@ const contractChange = Form.create()(
           });
         }
       );
-      this.loadData();
+      this.loadData(this.state.pageNo);
     },
     visitOk() {
       this.setState({

+ 254 - 409
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -1,32 +1,19 @@
 import React from "react";
-import {
-  Button,
-  Input,
-  Spin,
-  Table,
-  message,
-  Upload,
-  Form,
-  Modal,
-  Tabs,
-  Col
-} from "antd";
+import { Button, Input, Spin, Table, message, Form, Modal, Tabs } from "antd";
 import $ from "jquery/src/ajax";
 import {
   getNewOrderStatus,
-  getApprovedState,
-  getProcessStatus,
+  getProcessStatusNew,
   splitUrl,
   getjiedian,
   getboutique,
   getCuikuan,
-  getProjectStatus,
-  getLiquidationStatus
+  getProjectStatus
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailJsy.js";
-import PicturesWall from "./changeComponent/picturesWall.js";
 import { SearchInput } from "./changeComponent/searchInput.js";
+import OrderDetail from "./changeComponent/orderDetail";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -48,7 +35,8 @@ const contractChange = Form.create()(
           startTime: this.state.searchData.releaseDate[0],
           endTime: this.state.searchData.releaseDate[1],
           salesmanName: this.state.searchData.salesmanNameSearch,
-          complete: this.state.searchData.completeSearch || 1
+          complete: this.state.searchData.completeSearch || 1,
+          depId: this.state.searchData.depIdSearch
         },
         success: function(data) {
           let theArr = [];
@@ -72,7 +60,14 @@ const contractChange = Form.create()(
                 arrears: thisdata.arrears,
                 salesmanName: thisdata.salesmanName,
                 depName: thisdata.depName,
-                processState: thisdata.processState
+                processState: thisdata.processState,
+                type: thisdata.type,
+                status: thisdata.status,
+                id: thisdata.id,
+                processStateText:
+                  thisdata.status !== 4
+                    ? getProcessStatusNew(thisdata.processState) + "审核中"
+                    : getProcessStatusNew(thisdata.processState) + "已完成"
               });
             }
             this.state.pagination.total = data.data.totalCount;
@@ -101,10 +96,13 @@ const contractChange = Form.create()(
         searchData: {
           releaseDate: []
         },
+        primaryOrderData: {}, //原订单数据
+        orderData: {}, //现订单数据
         pictureUrl: [],
         voucherUrl: [],
         attachmentUrl: [],
         contractData: {},
+        additionalOrderData: {},
         paginations: false,
         activeKey: "1",
         confirmLoading: false,
@@ -161,17 +159,26 @@ const contractChange = Form.create()(
           {
             title: "合同额(万元)",
             dataIndex: "totalAmount",
-            key: "totalAmount"
+            key: "totalAmount",
+            render: () => {
+              return "***";
+            }
           },
           {
             title: "已付额(万元)",
             dataIndex: "settlementAmount",
-            key: "settlementAmount"
+            key: "settlementAmount",
+            render: () => {
+              return "***";
+            }
           },
           {
             title: "欠款(万元)",
             dataIndex: "arrears",
-            key: "arrears"
+            key: "arrears",
+            render: () => {
+              return "***";
+            }
           },
           {
             title: "订单负责人",
@@ -184,12 +191,9 @@ const contractChange = Form.create()(
             key: "depName"
           },
           {
-            title: "项目状态",
-            dataIndex: "processState",
-            key: "processState",
-            render: text => {
-              return getProcessStatus(text);
-            }
+            title: "审核状态",
+            dataIndex: "processStateText",
+            key: "processStateText"
           }
         ],
         dataSource: [],
@@ -298,15 +302,23 @@ const contractChange = Form.create()(
     },
     //整行点击
     tableRowClick(record) {
-      this.setState({
-        visible: true,
-        orderStatus: record.orderStatus,
-        id: record.id,
-        arrears: record.arrears
-      });
-      this.xiangqing(record.orderNo);
-      this.xiangmu(record.orderNo);
-      this.jiedian(record.orderNo);
+      this.setState(
+        {
+          visible: true,
+          type: record.type,
+          status: record.status,
+          buttonStatus: true,
+          orderStatus: record.orderStatus,
+          processStateText: record.processStateText,
+          id: record.id,
+          orderNo: record.orderNo
+        },
+        () => {
+          this.xiangqing(record.orderNo);
+          this.xiangmu(record.orderNo);
+          this.jiedian(record.orderNo);
+        }
+      );
     },
     //点击打卡项目详情
     tableRowClickX(record) {
@@ -328,6 +340,48 @@ const contractChange = Form.create()(
         addnextVisible: false
       });
     },
+
+    // 合同变更详情
+    ChangeDetail(orderNo) {
+      let url = window.location.href.substring(7);
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + "/api/admin/orderChange/orderChangeDetails",
+        data: {
+          orderNo: orderNo
+        },
+        success: function(data) {
+          if (data.data) {
+            let thisdata = data.data;
+            console.log(this.state.userName);
+            Object.assign(thisdata, {
+              processStateText: this.state.processStateText,
+              userName: this.state.userName,
+              contractNo: this.state.contractNo
+            });
+            this.setState(
+              {
+                contractData: thisdata,
+                voucherUrl: thisdata.voucherUrl
+                  ? splitUrl(
+                      thisdata.voucherUrl,
+                      ",",
+                      globalConfig.avatarHost + "/upload",
+                      url
+                    )
+                  : []
+              },
+              () => {
+                console.log(this.state.contractData);
+              }
+            );
+          }
+        }.bind(this)
+      });
+    },
+
     //订单详情
     xiangqing(orderNos) {
       $.ajax({
@@ -346,44 +400,68 @@ const contractChange = Form.create()(
           } 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
+              userName: thisdata.userName,
+              primaryOrderNo: thisdata.primaryOrder,
+              additionalOrder: thisdata.additionalOrder,
+              contractNo: thisdata.contractNo,
+              // arrears: thisdata.arrears,
+              orderData: thisdata
             });
           }
         }.bind(this)
-      }).always(
-        function() {
-          this.setState({
-            loading: false
-          });
+      });
+    },
+
+    // 原订单数据
+    primaryOrder(primaryOrder) {
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + "/api/admin/newOrder/getOrderNewDetail",
+        data: {
+          orderNo: primaryOrder
+        },
+        success: function(data) {
+          if (data.error.length || data.data.list == "") {
+            if (data.error && data.error.length) {
+              message.warning(data.error[0].message);
+            }
+          } else {
+            let thisdata = data.data;
+            this.setState({
+              primaryOrderData: thisdata
+            });
+          }
         }.bind(this)
-      );
+      });
+    },
+
+    // 附加订单数据
+    additionalOrder(additionalOrder) {
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + "/api/admin/newOrder/getOrderNewDetail",
+        data: {
+          orderNo: additionalOrder
+        },
+        success: function(data) {
+          if (data.error.length || data.data.list == "") {
+            if (data.error && data.error.length) {
+              message.warning(data.error[0].message);
+            }
+          } else {
+            let thisdata = data.data;
+            this.setState({
+              additionalOrderData: thisdata
+            });
+          }
+        }.bind(this)
+      });
     },
+
     //项目列表
     xiangmu(orderNos) {
       $.ajax({
@@ -425,13 +503,7 @@ const contractChange = Form.create()(
             dataSourceX: theArr
           });
         }.bind(this)
-      }).always(
-        function() {
-          this.setState({
-            loading: false
-          });
-        }.bind(this)
-      );
+      });
     },
 
     search(obj) {
@@ -445,17 +517,14 @@ const contractChange = Form.create()(
       );
     },
 
-    rizhi() {
-      this.setState({
-        loading: true
-      });
+    rizhi(orderNo) {
       $.ajax({
         method: "get",
         dataType: "json",
         crossDomain: false,
         url: "/api/admin/newOrder/selectOrderLog",
         data: {
-          orderNo: this.state.orderNo
+          orderNo: orderNo
         },
         success: function(data) {
           let theArr = [];
@@ -479,20 +548,14 @@ const contractChange = Form.create()(
             dataSourcerizhi: theArr
           });
         }.bind(this)
-      }).always(
-        function() {
-          this.setState({
-            loading: false
-          });
-        }.bind(this)
-      );
+      });
     },
 
-    getOrderLog() {
+    getOrderLog(orderNo) {
       this.setState({
         rizhivisible: true
       });
-      this.rizhi();
+      this.rizhi(orderNo);
     },
     closeOrderLog() {
       this.setState({
@@ -534,13 +597,7 @@ const contractChange = Form.create()(
             });
           }
         }.bind(this)
-      }).always(
-        function() {
-          this.setState({
-            loading: false
-          });
-        }.bind(this)
-      );
+      });
     },
     //审核通过
     examOk() {
@@ -657,57 +714,58 @@ const contractChange = Form.create()(
     },
 
     callback(key) {
-      let url = window.location.href.substring(7);
       this.setState({
         activeKey: key
       });
-      if (this.state.pictureUrl.length) {
-        let picArr = [];
-        this.state.pictureUrl.map(function(item) {
-          if (
-            item.response &&
-            item.response.data &&
-            item.response.data.length
-          ) {
-            picArr.push(item.response.data);
-          }
-        });
+      if (key === "1") {
+        this.xiangmu(this.state.orderNo);
+        this.jiedian(this.state.orderNo);
       }
       if (key === "2") {
-       $.ajax({
-         method: "get",
-         dataType: "json",
-         crossDomain: false,
-         url:
-           globalConfig.context + "/api/admin/orderChange/orderChangeDetails",
-         data: {
-           orderNo: this.state.orderNo
-         },
-         success: function(data) {
-           if (data.data) {
-             let thisdata = data.data;
-             Object.assign(thisdata, {
-               userName: this.state.userName,
-               contractNo: this.state.contractNo,
-               arrears: this.state.arrears
-             });
-             this.setState({
-               contractData: thisdata,
-               voucherUrl: thisdata.voucherUrl
-                 ? splitUrl(
-                     thisdata.voucherUrl,
-                     ",",
-                     globalConfig.avatarHost + "/upload",
-                     url
-                   )
-                 : []
-             });
-           }
-         }.bind(this)
-       });
+        this.ChangeDetail(this.state.orderNo);
+      }
+      if (key === "3") {
+        this.primaryOrder(this.state.primaryOrderNo);
+        this.xiangmu(this.state.primaryOrderNo);
+        this.jiedian(this.state.primaryOrderNo);
+      }
+      if (key === "4") {
+        this.additionalOrder(this.state.additionalOrder);
+        this.xiangmu(this.state.additionalOrder);
+        this.jiedian(this.state.additionalOrder);
+        this.setState({
+          buttonStatusA: false
+        });
+      } else {
+        this.setState({
+          buttonStatusA: true
+        });
       }
     },
 
+    closeDesc(e, s) {
+      this.state.activeKey = "1";
+      this.state.userDetaile = false;
+      this.state.signBillVisible = false;
+      this.state.visible = e;
+      if (s) {
+        this.loadData(this.state.pageNo);
+      }
+    },
+
+    // 获取原订单编号
+    getPrimaryOrder(value) {
+      this.setState({
+        primaryOrder: value
+      });
+    },
+
+    getAdditionalOrder(value) {
+      this.setState({
+        additionalOrder: value
+      });
+    },
+
     getUrl(url) {
       let theorgCodeUrl = [];
       if (url.length) {
@@ -826,7 +884,8 @@ const contractChange = Form.create()(
     visitCancel() {
       this.setState(
         {
-          visible: false
+          visible: false,
+          activeKey: "1"
         },
         () => {
           this.setState({
@@ -834,7 +893,7 @@ const contractChange = Form.create()(
           });
         }
       );
-      this.loadData();
+      this.loadData(this.state.pageNo);
     },
     visitOk() {
       this.setState({
@@ -848,7 +907,6 @@ const contractChange = Form.create()(
       };
       const FormItem = Form.Item;
       const { TabPane } = Tabs;
-      const { TextArea } = Input;
       return (
         <div className="user-content">
           <div className="content-title">
@@ -869,6 +927,7 @@ const contractChange = Form.create()(
             <Modal
               className="customeDetails"
               footer=""
+              maskClosable={false}
               width="900px"
               visible={this.state.visible}
               onOk={this.visitOk}
@@ -883,271 +942,14 @@ const contractChange = Form.create()(
                     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>
-                          {this.state.processStatus == 0 ? (
-                            <Button
-                              type="primary"
-                              onClick={this.addcontact}
-                              style={{
-                                float: "right",
-                                marginRight: "50px",
-                                marginBottom: "15px"
-                              }}
-                            >
-                              添加催款节点
-                            </Button>
-                          ) : (
-                            ""
-                          )}
-                        </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>
-                          {this.state.processStatus == 0 ? (
-                            <Button
-                              type="primary"
-                              onClick={this.addDetailed}
-                              style={{
-                                float: "right",
-                                marginRight: "50px",
-                                marginBottom: "15px"
-                              }}
-                            >
-                              添加项目明细
-                            </Button>
-                          ) : (
-                            ""
-                          )}
-                        </div>
-                        <div className="patent-table">
-                          <Spin spinning={this.state.loading}>
-                            <Table
-                              columns={this.state.columnsX}
-                              dataSource={this.state.dataSourceX}
-                              pagination={this.state.paginations}
-                              onRowClick={this.tableRowClickX}
-                            />
-                          </Spin>
-                        </div>
-                      </div>
+                      <OrderDetail
+                        processState={this.props.processState}
+                        orderData={this.state.orderData}
+                        getOrderLog={this.getOrderLog}
+                        dataSourceX={this.state.dataSourceX}
+                        contactList={this.state.contactList}
+                        orderNo={this.state.orderNo}
+                      />
                     </Spin>
                   </Form>
                 </TabPane>
@@ -1156,8 +958,51 @@ const contractChange = Form.create()(
                     data={this.state.contractData}
                     pictureUrl={this.state.voucherUrl}
                     processState={this.props.processState}
+                    loadData={this.callback}
+                    reset={this.state.visible}
                   />
                 </TabPane>
+                {this.state.status === 4 ? (
+                  <TabPane tab="原订单" key="3">
+                    <Form
+                      layout="horizontal"
+                      onSubmit={this.handleSubmit}
+                      id="demand-form"
+                      style={{ paddingBottom: "40px" }}
+                    >
+                      <Spin spinning={this.state.loading}>
+                        <OrderDetail
+                          processState={this.props.processState}
+                          orderData={this.state.primaryOrderData}
+                          getOrderLog={this.getOrderLog}
+                          dataSourceX={this.state.dataSourceX}
+                          contactList={this.state.contactList}
+                          orderNo={this.state.primaryOrderNo}
+                        />
+                      </Spin>
+                    </Form>
+                  </TabPane>
+                ) : (
+                  ""
+                )}
+                {this.state.status === 4 ? (
+                  this.state.type === 4 || this.state.type === 5 ? (
+                    <TabPane tab="附加订单" key="4">
+                      <OrderDetail
+                        processState={this.props.processState}
+                        orderData={this.state.additionalOrderData}
+                        getOrderLog={this.getOrderLog}
+                        dataSourceX={this.state.dataSourceX}
+                        contactList={this.state.contactList}
+                        orderNo={this.state.additionalOrder}
+                      />
+                    </TabPane>
+                  ) : (
+                    ""
+                  )
+                ) : (
+                  ""
+                )}
               </Tabs>
             </Modal>
             <Modal

+ 15 - 16
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -63,7 +63,11 @@ const contractChange = Form.create()(
                 processState: thisdata.processState,
                 type: thisdata.type,
                 status: thisdata.status,
-                id: thisdata.id
+                id: thisdata.id,
+                processStateText:
+                  thisdata.status !== 4
+                    ? getProcessStatusNew(thisdata.processState) + "审核中"
+                    : getProcessStatusNew(thisdata.processState) + "已完成"
               });
             }
             this.state.pagination.total = data.data.totalCount;
@@ -98,7 +102,7 @@ const contractChange = Form.create()(
         voucherUrl: [],
         attachmentUrl: [],
         contractData: {},
-        additionalOrderData:{},
+        additionalOrderData: {},
         paginations: false,
         activeKey: "1",
         confirmLoading: false,
@@ -178,12 +182,9 @@ const contractChange = Form.create()(
             key: "depName"
           },
           {
-            title: "项目状态",
-            dataIndex: "processState",
-            key: "processState",
-            render: text => {
-              return getProcessStatusNew(text);
-            }
+            title: "审核状态",
+            dataIndex: "processStateText",
+            key: "processStateText"
           }
         ],
         dataSource: [],
@@ -299,8 +300,8 @@ const contractChange = Form.create()(
           status: record.status,
           buttonStatus: true,
           orderStatus: record.orderStatus,
+          processStateText: record.processStateText,
           id: record.id,
-          arrears: record.arrears,
           orderNo: record.orderNo
         },
         () => {
@@ -349,9 +350,9 @@ const contractChange = Form.create()(
             let thisdata = data.data;
             console.log(this.state.userName);
             Object.assign(thisdata, {
+              processStateText: this.state.processStateText,
               userName: this.state.userName,
-              contractNo: this.state.contractNo,
-              arrears: this.state.arrears
+              contractNo: this.state.contractNo
             });
             this.setState({
               contractData: thisdata,
@@ -871,17 +872,15 @@ const contractChange = Form.create()(
     visitCancel() {
       this.setState(
         {
-          activeKey: "1",
-          sendOkA: false
+          activeKey: "1"
         },
         () => {
           this.setState({
-            visible: false,
-            sendOk: false
+            visible: false
           });
         }
       );
-      this.loadData();
+      this.loadData(this.state.pageNo);
     },
     visitOk() {
       this.setState({

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

@@ -63,7 +63,11 @@ const contractChange = Form.create()(
                 processState: thisdata.processState,
                 type: thisdata.type,
                 status: thisdata.status,
-                id: thisdata.id
+                id: thisdata.id,
+                processStateText:
+                  thisdata.status !== 4
+                    ? getProcessStatusNew(thisdata.processState) + "审核中"
+                    : getProcessStatusNew(thisdata.processState) + "已完成"
               });
             }
             this.state.pagination.total = data.data.totalCount;
@@ -178,12 +182,9 @@ const contractChange = Form.create()(
             key: "depName"
           },
           {
-            title: "项目状态",
-            dataIndex: "processState",
-            key: "processState",
-            render: text => {
-              return getProcessStatusNew(text);
-            }
+            title: "审核状态",
+            dataIndex: "processStateText",
+            key: "processStateText"
           }
         ],
         dataSource: [],
@@ -299,6 +300,7 @@ const contractChange = Form.create()(
           status: record.status,
           buttonStatus: true,
           orderStatus: record.orderStatus,
+          processStateText: record.processStateText,
           id: record.id,
           orderNo: record.orderNo
         },
@@ -346,22 +348,26 @@ const contractChange = Form.create()(
             let thisdata = data.data;
             console.log(this.state.userName);
             Object.assign(thisdata, {
+              processStateText: this.state.processStateText,
               userName: this.state.userName,
-              contractNo: this.state.contractNo,
-            });
-            this.setState({
-              contractData: thisdata,
-              voucherUrl: thisdata.voucherUrl
-                ? splitUrl(
-                    thisdata.voucherUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload",
-                    url
-                  )
-                : []
-            },()=>{
-              console.log(this.state.contractData);
+              contractNo: this.state.contractNo
             });
+            this.setState(
+              {
+                contractData: thisdata,
+                voucherUrl: thisdata.voucherUrl
+                  ? splitUrl(
+                      thisdata.voucherUrl,
+                      ",",
+                      globalConfig.avatarHost + "/upload",
+                      url
+                    )
+                  : []
+              },
+              () => {
+                console.log(this.state.contractData);
+              }
+            );
           }
         }.bind(this)
       });
@@ -878,7 +884,7 @@ const contractChange = Form.create()(
           });
         }
       );
-      this.loadData();
+      this.loadData(this.state.page);
     },
     visitOk() {
       this.setState({

+ 15 - 12
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -8,7 +8,8 @@ import {
   getjiedian,
   getboutique,
   getCuikuan,
-  getProjectStatus
+  getProjectStatus,
+  getContractChangeStatus
 } from "@/tools.js";
 import "./customer.less";
 import { SearchInput } from "./changeComponent/searchInput.js";
@@ -65,7 +66,11 @@ const contractChange = Form.create()(
                 processState: thisdata.processState,
                 type: thisdata.type,
                 status: thisdata.status,
-                id: thisdata.id
+                id: thisdata.id,
+                processStateText:
+                  thisdata.status !== 4
+                    ? getProcessStatusNew(thisdata.processState) + "审核中"
+                    : getProcessStatusNew(thisdata.processState) + "已完成"
               });
             }
             this.state.pagination.total = data.data.totalCount;
@@ -98,6 +103,7 @@ const contractChange = Form.create()(
         orderData: {}, //现订单数据
         pictureUrl: [],
         voucherUrl: [],
+        buttonStatusA: true,
         attachmentUrl: [],
         contractData: {},
         paginations: false,
@@ -179,12 +185,9 @@ const contractChange = Form.create()(
             key: "depName"
           },
           {
-            title: "项目状态",
-            dataIndex: "processState",
-            key: "processState",
-            render: text => {
-              return getProcessStatusNew(text);
-            }
+            title: "审核状态",
+            dataIndex: "processStateText",
+            key: "processStateText"
           }
         ],
         dataSource: [],
@@ -301,7 +304,7 @@ const contractChange = Form.create()(
           buttonStatus: true,
           orderStatus: record.orderStatus,
           id: record.id,
-          arrears: record.arrears,
+          processStateText:record.processStateText,
           orderNo: record.orderNo
         },
         () => {
@@ -350,8 +353,8 @@ const contractChange = Form.create()(
             Object.assign(thisdata, {
               id: this.state.id,
               userName: this.state.userName,
-              contractNo: this.state.contractNo,
-              arrears: this.state.arrears
+              processStateText:this.state.processStateText,
+              contractNo: this.state.contractNo
             });
             this.setState({
               contractData: thisdata,
@@ -893,7 +896,7 @@ const contractChange = Form.create()(
           });
         }
       );
-      this.loadData(this.state.page);
+      this.loadData(this.state.pageNo);
     },
     visitOk() {
       this.setState({

+ 5 - 1
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -576,7 +576,11 @@ const OutsourceTaskAssignment = React.createClass({
 								            labelCol={{ span: 4 }}
 								            wrapperCol={{ span: 16 }}
 								            label="订单留言" >
-							        	 <span>{this.state.orderRemarks}</span>
+							        	 <p
+                                  style={{ width: 500, wordWrap: "break-word" }}
+                                >
+                                  {this.state.orderRemarks}
+                                </p>
 								        </FormItem>
 							        </div>
 							        <div className='clearfix'>

File diff suppressed because it is too large
+ 1450 - 1163
js/component/manageCenter/project/project/projectAssignment.jsx


+ 13 - 24
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -1,14 +1,12 @@
-import React,{Component} from 'react';
-import ajax from 'jquery/src/ajax/xhr.js';
+import React from 'react';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '../../order/userMangagement.less';
 import {boutique} from '../../../dataDic.js';
 import '@/manageCenter/financialManage/distribute/public.less';
-import { Icon, Button,Form, Input, Select, Spin, Table, Switch, message, DatePicker, Modal,Upload ,Col,AutoComplete,Tabs} from 'antd';
-import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
+import { Button,Form, Input, Select, Spin, Table, Switch, message, DatePicker, Modal,AutoComplete,Tabs} from 'antd';
 import Assign from '@/manageCenter/publicComponent/assign';
-import {getProcessStatus,getApproval,getLiquidationStatus,getApprovedState,splitUrl,getjiedian,getboutique,getRefundStatus} from '@/tools';
+import {getProcessStatus,getApproval,getLiquidationStatus,getApprovedState,splitUrl,getboutique} from '@/tools';
 
 const zxsglyOutSourcingPaiDan = React.createClass({
     loadData(pageNo) {
@@ -313,7 +311,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
     	this.departmentList();
         this.loadData();
     },
-    tableRowClick(record, index) {
+    tableRowClick(record) {
         this.state.RowData = record;
         this.setState({
             visible: true,
@@ -381,7 +379,6 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 				orderNo:orderNos
 			},
 			success: function(data) {
-				let theArr = [];
 				
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {
@@ -527,7 +524,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 	load(){
 		if(this.state.attachmentUrl.length !== 0){
 			let url = window.location.href.substring(7);
-			this.state.attachmentUrl.forEach((e,index)=>{
+			this.state.attachmentUrl.forEach((e)=>{
 				window.location.href="http://"+url.substring(0,url.indexOf("/"))+"/api/admin/outsourceOrg//downloadFile?path="+e.response.data
 			})
 		}else{
@@ -645,7 +642,6 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 				modKey:key,
 			})
 		}
-		let theorgCodeUrl = [];
 		if (this.state.pictureUrl.length) {
 		    let picArr = [];
 		    this.state.pictureUrl.map(function (item) {
@@ -653,7 +649,6 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 					picArr.push(item.response.data);
 				}
 		    });
-		    theorgCodeUrl = picArr.join(",");
 		};
 		if (key === '3') {
 			this.setState({
@@ -904,7 +899,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 		})
 	},
 	//点击打卡项目详情
-	tableRowClickX(record, index) {
+	tableRowClickX(record) {
         this.setState({
         	jid:record.id,//项目ID
         	kid:record.commodityId,//商品ID
@@ -923,7 +918,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
         });
     },
     //关闭详情
-	visitCancel(e){
+	visitCancel(){
 		this.setState({
 			visible:false
 		},()=>{
@@ -933,7 +928,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 		})
 		// this.reset();
 	},
-	visitOk(e){
+	visitOk(){
 		this.setState({
 			visible:false
 		})
@@ -987,15 +982,6 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 		}.bind(this));
 	},
     render() { 
-        const rowSelection = {
-            selectedRowKeys: this.state.selectedRowKeys,
-            onChange: (selectedRowKeys, selectedRows) => {
-                this.setState({
-                    selectedRows: selectedRows.slice(-1),
-                    selectedRowKeys: selectedRowKeys.slice(-1)
-                });
-            }
-        };
 		const { TabPane } = Tabs;
 		const formItemLayout = {
 			labelCol: { span: 8 },
@@ -1006,7 +992,6 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 				      <Select.Option key={index} value={group.bname}>{group.bname}</Select.Option>
 				     )
         const FormItem = Form.Item;
-        const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
         let departmentArr = this.state.departmentArr || [];
         return ( <div className="user-content">
@@ -1157,7 +1142,11 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 									            labelCol={{ span: 4 }}
 									            wrapperCol={{ span: 16 }}
 									            label="订单留言" >
-								        	 <span>{this.state.orderRemarks}</span>
+								        	 <p
+                                  style={{ width: 500, wordWrap: "break-word" }}
+                                >
+                                  {this.state.orderRemarks}
+                                </p>
 									        </FormItem>
 											
 											<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}

+ 5 - 1
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -575,7 +575,11 @@ const Task = React.createClass({
 								            labelCol={{ span: 4 }}
 								            wrapperCol={{ span: 16 }}
 								            label="订单留言" >
-							        	 <span>{this.state.orderRemarks}</span>
+							        	 <p
+                                  style={{ width: 500, wordWrap: "break-word" }}
+                                >
+                                  {this.state.orderRemarks}
+                                </p>
 								        </FormItem>
 							        </div>
 							        <div className='clearfix'>

+ 15 - 2
js/component/tools.js

@@ -84,7 +84,8 @@ import {
 	province,
 	invoiceStatus,
     approvalA,
-    processStatusNew
+    processStatusNew,
+    contractChangeStatus,
 } from './dataDic.js';
 
 import { provinceList} from './NewDicProvinceList.js';
@@ -1716,5 +1717,17 @@ module.exports = {
 	        });
 	        return theType;
 	    }
-	},
+    },
+    getContractChangeStatus:function(e){
+	    if (e||e==0) {
+	        let str=e.toString()
+	     let theType = '';
+	     contractChangeStatus.map(function (item) {
+	            if (item.value == str) {
+	                theType = item.key;
+	            };
+	        });
+	        return theType;
+	    }
+    }
 }