Przeglądaj źródła

增加备注以及驳回

hujie123456 5 lat temu
rodzic
commit
5e024fa889

+ 0 - 290
js/component/manageCenter/order/orderNew/billtest.js

@@ -1,290 +0,0 @@
-import React, { Component } from "react";
-import $ from "jquery/src/ajax";
-import {
-  Form,
-  Radio,
-  Icon,
-  Button,
-  Input,
-  Spin,
-  Table,
-  message,
-  DatePicker,
-  Modal,
-  Upload,
-  Popconfirm,
-  Cascader,
-  Tabs
-} from "antd";
-import NewService from "./addService.jsx";
-import moment from "moment";
-import "../userMangagement.less";
-import {
-  projectProgress,
-  specially,
-  province,
-  invoiceStatus,
-  approval,
-  approvalA
-} from "../../../dataDic.js";
-import { areaSelect, getProvince } from "@/NewDicProvinceList";
-import {
-  getApprovedState,
-  getprovince,
-  getProcessStatus,
-  getLiquidationStatus,
-  getNewOrderStatus,
-  beforeUploadFile,
-  getProvinceA,
-  getInvoiceStatus,
-  splitUrl
-} from "../../../tools.js";
-
-class PicturesWall extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      previewVisible: false,
-      previewImage: "",
-      fileList: this.props.pictureUrl
-    };
-  }
-
-  getDefaultProps = () => {
-    return {
-      changeClick: this.modifyChange
-    };
-  };
-
-  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/orderInvoice/uploadOrderInvoiceFile"
-          }
-          data={{ sign: "order_invoice_file" }}
-          listType="picture-card"
-          fileList={fileList}
-          onPreview={this.handlePreview}
-          onChange={this.handleChange}
-        >
-          {fileList.length >= 18 ? null : uploadButton}
-        </Upload>
-        <Modal
-          maskClosable={false}
-          visible={previewVisible}
-          footer={null}
-          onCancel={this.handleCancel}
-        >
-          <img alt="example" style={{ width: "100%" }} src={previewImage} />
-        </Modal>
-      </div>
-    );
-  }
-}
-
-class MyService extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-          loading: false,
-          search: {},
-          dataSource: [],
-          pagination: {
-            defaultCurrent: 1,
-            defaultPageSize: 10,
-            showQuickJumper: true,
-            pageSize: 10,
-            onChange: function(page) {
-              this.loadData(page);
-            }.bind(this),
-            showTotal: function(total) {
-              return "共" + total + "条数据";
-            }
-          },
-          columns: [
-            {
-              title: "订单编号",
-              dataIndex: "orderNo",
-              key: "orderNo",
-              fixed: "left"
-            },
-            {
-              title: "客户名称",
-              dataIndex: "userName",
-              key: "userName",
-              render: text => {
-                return text && text.length > 9
-                  ? text.substr(0, 9) + "..."
-                  : text;
-              }
-            },
-            {
-              title: "下单时间",
-              dataIndex: "createDate",
-              key: "createTime"
-            },
-            {
-              title: "合同签订时间",
-              dataIndex: "signDate",
-              key: "signDate"
-            },
-            {
-              title: "流程状态",
-              dataIndex: "processStatus",
-              key: "processStatus",
-              render: text => {
-                return getProcessStatus(text);
-              }
-            },
-            {
-              title: "签单金额(万元)",
-              dataIndex: "totalAmount",
-              key: "totalAmount"
-            },
-            {
-              title: "结算状态",
-              dataIndex: "liquidationStatus",
-              key: "liquidationStatus",
-              render: text => {
-                return getLiquidationStatus(text);
-              }
-            },
-            {
-              title: "是否特批",
-              dataIndex: "approval",
-              key: "approval",
-              render: text => {
-                return getApprovedState(text);
-              }
-            },
-            {
-              title: "订单状态",
-              dataIndex: "orderStatus",
-              key: "orderStatus",
-              render: text => {
-                return getNewOrderStatus(text);
-              }
-            },
-            {
-              title: "财务负责人",
-              dataIndex: "financeName",
-              key: "financeName"
-            },
-            {
-              title: "操作",
-              dataIndex: "abc",
-              key: "abc",
-              render: (text, record, index) => {
-                return (
-                  <div>
-                    {
-                      <Button
-                        type="primary"
-                        style={{
-                          marginRight: "10px",
-                          color: "#ffffff",
-                          border: "none",
-                          marginTop: "5px",
-                          background: "red"
-                        }}
-                        onClick={e => {
-                          e.stopPropagation(),
-                            this.visit(record, index);
-                        }}
-                      >
-                        开票
-                      </Button>
-                    }
-                    {
-                      <Button
-                        type="primary"
-                        onClick={e => {
-                          e.stopPropagation(),
-                            this.inRecord(record, index);
-                        }}
-                        style={{
-                          border: "none",
-                          background: "orangered",
-                          marginRight: "10px"
-                        }}
-                      >
-                        开票记录
-                      </Button>
-                    }
-                    {record.liquidationStatus == 2 ? (
-                      <Popconfirm
-                        title="是否结项?"
-                        onConfirm={e => {
-                          this.delectRow(record);
-                        }}
-                        okText="是"
-                        cancelText="否"
-                      >
-                        <Button
-                          type="primary"
-                          style={{
-                            marginRight: "10px",
-                            color: "#ffffff",
-                            border: "none"
-                          }}
-                          onClick={e => {
-                            e.stopPropagation();
-                          }}
-                        >
-                          结项
-                        </Button>
-                      </Popconfirm>
-                    ) : (
-                      ""
-                    )}
-                  </div>
-                );
-              }
-            }
-          ]
-        };
-    }
-
-    render() {
-        return (
-          <div className="user-content">
-            <div className="content-title">
-              <span style={{ fontSize: "16px" }}>开单与签单</span>
-
-            </div>
-          </div>
-        );
-    }
-}

+ 35 - 8
js/component/manageCenter/order/orderNew/changeComponent/agreeButton.js

@@ -7,7 +7,7 @@ class ReasonInput extends Component {
     super(props);
     this.state = {
       visible: false,
-      reason: ""
+      reason: this.props.reason
     };
     this.reset = this.reset.bind(this);
     this.judge = this.judge.bind(this);
@@ -16,6 +16,19 @@ class ReasonInput extends Component {
     this.inputAjax = this.inputAjax.bind(this);
   }
 
+  componentWillMount() {
+    let reason = this.props.reason
+    this.setState({
+      reason
+    })
+    //     const data = this.props.data;
+    //     const backData = this.props.backData;
+    //     const ajaxData = this.props.ajaxData;
+    //     Object.assign(backData, ajaxData);
+    // // this.sendRequest()
+    // this.onOk(data,backData)
+  }
+    
   // 理由请求
   sendRequest(data, backData) {
     $.ajax({
@@ -25,10 +38,11 @@ class ReasonInput extends Component {
       url: globalConfig.context + "/api/admin/orderChange/orderChangeAudit",
       data: {
         orderNo: backData.orderNo,
-        remarks: this.state.reason,
+        remarks: this.props.reason,
         status: data.status,
         processState: this.props.processState,
-        changeType: 0
+        // 驳回位置
+        rejectState: this.props.rejectState
       },
       success: function(data) {
         if (data.error.length || data.data.list == "") {
@@ -37,8 +51,9 @@ class ReasonInput extends Component {
           }
         } else {
           message.success("操作成功!");
-          this.props.visible();
+          // this.props.visible();
           this.changeModal();
+          window.location.reload()
         }
       }.bind(this)
     }).done(
@@ -75,7 +90,7 @@ class ReasonInput extends Component {
 
   reset() {
     this.setState({
-      reason: ""
+      reason: this.props.reason
     });
   }
 
@@ -88,17 +103,27 @@ class ReasonInput extends Component {
         this.reset();
       }
     );
+
+    const data = this.props.data;
+    const backData = this.props.backData;
+    const ajaxData = this.props.ajaxData;
+    Object.assign(backData, ajaxData);
+    // this.sendRequest()
+    this.onOk(data,backData)
+    // this.setState({reason: this.props.reason})
+    // console.log(this.props,this.state)
+
   }
 
   judge() {
-    if (!this.state.reason) {
+    if (!this.props.reason) {
       message.error("理由不能为空!");
       return false;
     }
   }
 
   onOk(data, backData) {
-    if (!this.state.reason) {
+    if (!this.props.reason) {
       message.error("理由不能为空!");
       return false;
     }
@@ -135,7 +160,7 @@ class ReasonInput extends Component {
         <Modal
           maskClosable={false}
           title={data.title}
-          visible={visible}
+          visible={false}
           onCancel={() => {
             this.changeModal();
           }}
@@ -149,6 +174,8 @@ class ReasonInput extends Component {
               placeholder={data.placeholder}
               value={this.state.reason}
               onChange={e => {
+                console.log(this.props);
+                
                 this.setState({
                   reason: e.target.value
                 });

+ 81 - 2
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -14,7 +14,8 @@ class ChangeApply extends Component {
     super(props);
     this.state = {
       data: {},
-      voucherUrl: []
+      voucherUrl: [],
+      dataSource: []
     };
     this.departmentList = this.departmentList.bind(this);
     this.changeApply = this.changeApply.bind(this);
@@ -59,6 +60,37 @@ class ChangeApply extends Component {
     );
   }
 
+  // componentDidMount() {
+  //   window.setTimeout(() => {
+  //     this.loadDataChange();
+  //   }, 10);
+  // }
+
+  // loadDataChange() {
+  //   console.log(this.props);
+
+  //   $.ajax({
+  //     method: "get",
+  //     dataType: "json",
+  //     crossDomain: false,
+  //     url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
+  //     data: {
+  //       changeId: this.props.data.id
+  //     },
+  //     success: function(data) {
+  //       if (data.error.length || data.data.list == "") {
+  //         if (data.error && data.error.length) {
+  //           message.warning(data.error[0].message);
+  //         }
+  //       } else {
+  //         this.setState({
+  //           dataSource: data.data
+  //         });
+  //       }
+  //     }.bind(this)
+  //   });
+  // }
+
   departmentList() {
     $.ajax({
       method: "get",
@@ -244,7 +276,7 @@ class ChangeApply extends Component {
             style={{ height: "auto" }}
             labelCol={{ span: 4 }}
             wrapperCol={{ span: 18 }}
-            label="备注"
+            label="变更原因"
           >
             <TextArea
               rows={4}
@@ -260,6 +292,30 @@ class ChangeApply extends Component {
             />
           </FormItem>
         </div>
+
+        {/* 备注 */}
+        <div className="clearfix">
+          <FormItem
+            style={{ height: "auto" }}
+            labelCol={{ span: 4 }}
+            wrapperCol={{ span: 18 }}
+            label="备注"
+          >
+            <TextArea
+              rows={4}
+              placeholder="请输入备注信息"
+              ref="signTotalAmount"
+              style={{ width: "95%" }}
+              value={data.startRemarks}
+              onChange={e => {
+                let data = this.state.data;
+                data.startRemarks = e.target.value;
+                this.setState({ data });
+              }}
+            />
+          </FormItem>
+        </div>
+
         <div className="clearfix">
           <FormItem
             labelCol={{ span: 4 }}
@@ -276,6 +332,29 @@ class ChangeApply extends Component {
             <p>图片建议:要清晰。</p>
           </FormItem>
         </div>
+
+        {/* <ul
+          style={{
+            width: "868px",
+            overflow: "hidden",
+            paddingLeft: "90px",
+            marginBottom: "20px"
+          }}
+        >
+          {this.state.dataSource.map((item, index) => (
+            <li
+              key={index}
+              style={{
+                width: "100%",
+                height: "auto",
+                wordBreak: "break-all",
+                color: "black",
+                marginBottom: "10px"
+              }}
+            >{`${item.aname}: ${item.remarks}`}</li>
+          ))}
+        </ul> */}
+
         <div className="clearfix">
           <Button
             type="primary"

+ 189 - 22
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -1,9 +1,12 @@
 import React, { Component } from "react";
-import { Form, Upload, Modal, Button } from "antd";
+import { Form, Upload, Modal, Button, message, Input, Select } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew } from "@/tools.js";
+import $ from "jquery/src/ajax";
 // import ReactToPrint from "react-to-print";
+const FormItem = Form.Item;
+const { TextArea } = Input;
 
 const formItemLayout = {
   labelCol: { span: 8 },
@@ -83,10 +86,14 @@ class ChangeDetail extends Component {
     super(props);
     this.state = {
       previewVisible: false,
-      buttonStatus: true
+      buttonStatus: true,
+      dataSource: [],
+      reason: "",
+      rejectState: 0
     };
     this.getOrgCodeUrl = this.getOrgCodeUrl.bind(this);
     this.changeButtonStatus = this.changeButtonStatus.bind(this);
+    this.loadDataChange = this.loadDataChange.bind(this);
   }
 
   getOrgCodeUrl(e) {
@@ -95,6 +102,37 @@ class ChangeDetail extends Component {
     });
   }
 
+  loadDataChange() {
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
+      data: {
+        changeId: this.props.data.id
+      },
+      success: function(data) {
+        if (data.error.length || data.data.list == "") {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.setState({
+            dataSource: data.data
+          });
+        }
+      }.bind(this)
+    });
+  }
+
+  componentDidMount() {
+    window.setTimeout(() => {
+      this.loadDataChange();
+    }, 10);
+    console.log(this.props.processState);
+    
+  }
+
   //同意拒绝按钮的有无
   changeButtonStatus() {
     this.setState({
@@ -152,7 +190,7 @@ class ChangeDetail extends Component {
         dataB: this.props.data.changeAmount
       },
       {
-        labelA: "备注",
+        labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks
       }
@@ -295,7 +333,32 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.data.id} />
           </Form.Item>
-          {this.props.data.type === 0 && this.props.data.processState >= 4 ? (
+
+          {/* <h2 style={{ textAlign: "center", marginBottom: 0 }}>变更日志</h2> */}
+          <ul
+            style={{
+              width: "868px",
+              overflow: "hidden",
+              paddingLeft: "90px",
+              marginBottom: "20px"
+            }}
+          >
+            {/* <span>操作人:</span> */}
+            {this.state.dataSource.map((item, index) => (
+              <li
+                key={index}
+                style={{
+                  width: "100%",
+                  height: "auto",
+                  wordBreak: "break-all",
+                  color: "black",
+                  marginBottom: "10px"
+                }}
+              >{`${item.aname}: ${item.remarks}`}</li>
+            ))}
+          </ul>
+
+          {/* {this.props.data.type === 0 && this.props.data.processState >= 4 ? (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
                 当前项目进度(咨询师经理填写)
@@ -306,8 +369,8 @@ class ChangeDetail extends Component {
             </div>
           ) : (
             ""
-          )}
-          {this.props.data.type === 0 ? (
+          )} */}
+          {/* {this.props.data.type === 0 ? (
             this.props.data.processState >= 5 ? (
               <div>
                 <h3
@@ -333,26 +396,130 @@ class ChangeDetail extends Component {
             </div>
           ) : (
             ""
-          )}
+          )} */}
         </div>
         {this.props.data.status !== 4 ? (
           this.state.buttonStatus ? (
-            <div
-              className="clearfix"
-              style={{ display: "flex", justifyContent: "space-around" }}
-            >
-              {buttonData.map((item, index) => {
-                return (
-                  <AgreeButton
-                    data={item}
-                    key={index}
-                    backData={this.props.data}
-                    processState={this.props.processState}
-                    visible={this.changeButtonStatus}
-                    loadData={this.props.loadData}
+            <div>
+              <div className="clearfix">
+                <FormItem
+                  style={{ height: "auto" }}
+                  labelCol={{ span: 4 }}
+                  wrapperCol={{ span: 18 }}
+                  label="备注"
+                >
+                  <TextArea
+                    rows={4}
+                    placeholder="请输入备注信息"
+                    style={{ width: "95%" }}
+                    value={this.state.reason}
+                    onChange={e => {
+                      let reason = e.target.value;
+                      this.setState({ reason });
+                    }}
                   />
-                );
-              })}
+                </FormItem>
+              </div>
+
+              <div
+                className="clearfix"
+                style={{ display: "flex", justifyContent: "space-around" }}
+              >
+                {buttonData.map((item, index) => {
+                  return (
+                    <AgreeButton
+                      data={item}
+                      key={index}
+                      backData={this.props.data}
+                      processState={this.props.processState}
+                      visible={this.changeButtonStatus}
+                      loadData={this.props.loadData}
+                      reason={this.state.reason}
+                      rejectState={this.state.rejectState}
+                    />
+                  );
+                })}
+              </div>
+
+              <Select
+                defaultValue="0"
+                style={{
+                  width: 120,
+                  float: "left",
+                  position: "relative",
+                  bottom: "28px",
+                  right: "-600px"
+                }}
+                onChange={val => {
+                  this.setState({ rejectState: val });
+                  console.log(val, this.state.rejectState);
+                }}
+              >
+                <Option
+                  value="0"
+                  style={{
+                    display: this.props.processState >= 1 ? "block" : "none"
+                  }}
+                >
+                  营销员
+                </Option>
+                <Option
+                  value="1"
+                  style={{
+                    display: this.props.processState >= 2 ? "block" : "none"
+                  }}
+                >
+                  营销管理员
+                </Option>
+                <Option
+                  value="2"
+                  style={{
+                    display: this.props.processState >= 3 ? "block" : "none"
+                  }}
+                >
+                  技术员
+                </Option>
+                <Option
+                  value="3"
+                  style={{
+                    display: this.props.processState >= 4 ? "block" : "none"
+                  }}
+                >
+                  技术经理
+                </Option>
+                <Option
+                  value="4"
+                  style={{
+                    display: this.props.processState >= 5 ? "block" : "none"
+                  }}
+                >
+                  技术总监
+                </Option>
+                <Option
+                  value="5"
+                  style={{
+                    display: this.props.processState >= 6 ? "block" : "none"
+                  }}
+                >
+                  财务专员(退单)
+                </Option>
+                <Option
+                  value="6"
+                  style={{
+                    display: this.props.processState >= 7 ? "block" : "none"
+                  }}
+                >
+                  财务总监
+                </Option>
+                <Option
+                  value="7"
+                  style={{
+                    display: this.props.processState >= 8 ? "block" : "none"
+                  }}
+                >
+                  总裁
+                </Option>
+              </Select>
             </div>
           ) : (
             ""

+ 145 - 10
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -1,9 +1,10 @@
 import React, { Component } from "react";
-import { Form, Upload, Modal, Input, DatePicker, Button } from "antd";
+import { Form, Upload, Modal, Input, DatePicker, Button, message, Select } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import moment from "moment";
 import { getProcessStatusNew } from "@/tools.js";
+import $ from "jquery/src/ajax";
 // import ReactToPrint from "react-to-print";
 
 const formItemLayout = {
@@ -150,7 +151,9 @@ class ChangeDetail extends Component {
     this.state = {
       previewVisible: false,
       buttonStatus: true,
-      changeType: 2
+      changeType: 2,
+      dataSource: [],
+      reason: ""
     };
     this.getOrgCodeUrl = this.getOrgCodeUrl.bind(this);
     this.changeButtonStatus = this.changeButtonStatus.bind(this);
@@ -190,6 +193,37 @@ class ChangeDetail extends Component {
     });
   }
 
+  loadData() {
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      async: false,
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
+      data: {
+        changeId: this.props.data.id
+      },
+      success: function(data) {
+        if (data.error.length || data.data.list == "") {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.setState({
+            dataSource: data.data
+          });
+        }
+      }.bind(this)
+    });
+  }
+
+  componentDidMount() {
+    // this.loadData();
+    window.setTimeout(() => {
+      this.loadData();
+    }, 10);
+  }
+
   //同意拒绝按钮的有无
   changeButtonStatus() {
     this.setState({
@@ -247,7 +281,7 @@ class ChangeDetail extends Component {
         dataB: this.props.data.changeAmount
       },
       {
-        labelA: "备注",
+        labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks
       }
@@ -303,12 +337,12 @@ class ChangeDetail extends Component {
         mark: true
       },
       {
-        labelA: "补充资料/备注",
+        labelA: "备注",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.cwRemarks,
         onChangeA: value => {
           this.setState({
-            cwRemarks: value
+            reason: value
           });
         },
         mark: false
@@ -391,7 +425,26 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.data.id} />
           </Form.Item>
-          {this.props.data.type === 0 ? (
+
+          <ul
+            style={{ width: "868px", overflow: "hidden", paddingLeft: "90px" }}
+          >
+            {/* <span>操作人:</span> */}
+            {this.state.dataSource.map((item, index) => (
+              <li
+                key={index}
+                style={{
+                  width: "100%",
+                  height: "auto",
+                  wordBreak: "break-all",
+                  color: "black",
+                  marginBottom: "10px"
+                }}
+              >{`${item.aname}: ${item.remarks}`}</li>
+            ))}
+          </ul>
+
+          {/* {this.props.data.type === 0 ? (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
                 当前项目进度(咨询师经理填写)
@@ -402,7 +455,7 @@ class ChangeDetail extends Component {
             </div>
           ) : (
             ""
-          )}
+          )} */}
           {(this.props.data.processState > 5 &&
             this.props.data.processState <= 8) ||
           (this.props.data.processState === 9 &&
@@ -570,17 +623,17 @@ class ChangeDetail extends Component {
               </div>
               <div>
                 <Form.Item
-                  label="补充资料/备注"
+                  label="备注"
                   labelCol={{ span: 4 }}
                   wrapperCol={{ span: 14 }}
                 >
                   <Input.TextArea
                     rows={4}
-                    value={this.state.cwRemarks}
+                    value={this.state.reason}
                     placeholder="请输入补充资料/备注"
                     onChange={e => {
                       this.setState({
-                        cwRemarks: e.target.value
+                        reason: e.target.value
                       });
                     }}
                   />
@@ -609,9 +662,91 @@ class ChangeDetail extends Component {
                     visible={this.changeButtonStatus}
                     ajaxData={this.state}
                     loadData={this.props.loadData}
+                    rejectState={this.state.rejectState}
+                    reason={this.state.reason}
                   />
                 );
               })}
+
+              <Select
+                defaultValue="0"
+                style={{
+                  width: 120,
+                  float: "left",
+                  position: "relative",
+                  bottom: "28px",
+                  right: "-600px"
+                }}
+                onChange={val => {
+                  this.setState({ rejectState: val });
+                  console.log(val, this.state.rejectState);
+                }}
+              >
+                <Option
+                  value="0"
+                  style={{
+                    display: this.props.processState >= 1 ? "block" : "none"
+                  }}
+                >
+                  营销员
+                </Option>
+                <Option
+                  value="1"
+                  style={{
+                    display: this.props.processState >= 2 ? "block" : "none"
+                  }}
+                >
+                  营销管理员
+                </Option>
+                <Option
+                  value="2"
+                  style={{
+                    display: this.props.processState >= 3 ? "block" : "none"
+                  }}
+                >
+                  技术员
+                </Option>
+                <Option
+                  value="3"
+                  style={{
+                    display: this.props.processState >= 4 ? "block" : "none"
+                  }}
+                >
+                  技术经理
+                </Option>
+                <Option
+                  value="4"
+                  style={{
+                    display: this.props.processState >= 5 ? "block" : "none"
+                  }}
+                >
+                  技术总监
+                </Option>
+                <Option
+                  value="5"
+                  style={{
+                    display: this.props.processState >= 6 ? "block" : "none"
+                  }}
+                >
+                  财务专员(退单)
+                </Option>
+                <Option
+                  value="6"
+                  style={{
+                    display: this.props.processState >= 7 ? "block" : "none"
+                  }}
+                >
+                  财务总监
+                </Option>
+                <Option
+                  value="7"
+                  style={{
+                    display: this.props.processState >= 8 ? "block" : "none"
+                  }}
+                >
+                  总裁
+                </Option>
+              </Select>
             </div>
           ) : (
             ""

+ 170 - 25
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -1,8 +1,9 @@
 import React, { Component } from "react";
-import { Form, Upload, Modal, Input, Button } from "antd";
+import { Form, Upload, Modal, Input, Button, message, Select } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew } from "@/tools.js";
+import $ from "jquery/src/ajax";
 // import ReactToPrint from "react-to-print";
 
 const formItemLayout = {
@@ -84,7 +85,10 @@ class ChangeDetail extends Component {
     this.state = {
       previewVisible: false,
       buttonStatus: true,
-      changeType: 1
+      changeType: 1,
+      dataSource: [],
+      reason: "",
+      rejectState: 0
     };
     this.getOrgCodeUrl = this.getOrgCodeUrl.bind(this);
     this.changeButtonStatus = this.changeButtonStatus.bind(this);
@@ -111,6 +115,37 @@ class ChangeDetail extends Component {
     });
   }
 
+  loadData() {
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      async: false,
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
+      data: {
+        changeId: this.props.data.id
+      },
+      success: function(data) {
+        if (data.error.length || data.data.list == "") {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.setState({
+            dataSource: data.data
+          });
+        }
+      }.bind(this)
+    });
+  }
+
+  componentDidMount() {
+    // this.loadData();
+    window.setTimeout(() => {
+      this.loadData();
+    }, 10);
+  }
+
   render() {
     const pageData = [
       {
@@ -157,7 +192,7 @@ class ChangeDetail extends Component {
         dataB: this.props.data.changeAmount
       },
       {
-        labelA: "备注",
+        labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks
       }
@@ -298,7 +333,28 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.data.id} />
           </Form.Item>
-          {this.props.data.processState >= 4 ? (
+
+          <ul
+            style={{ width: "868px", overflow: "hidden", paddingLeft: "90px" }}
+          >
+            {/* <span>操作人:</span> */}
+            {this.state.dataSource.map((item, index) => (
+              <li
+                key={index}
+                style={{
+                  width: "100%",
+                  height: "auto",
+                  wordBreak: "break-all",
+                  color: "black",
+                  marginBottom: "10px"
+                }}
+              >{`${item.aname}: ${item.remarks}`}</li>
+            ))}
+          </ul>
+
+          {/* 
+          
+            (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
                 当前项目进度(咨询师经理填写)
@@ -307,6 +363,12 @@ class ChangeDetail extends Component {
                 return <Itemlist key={index} pageData={item} />;
               })}
             </div>
+          )
+          
+          
+          */}
+          {/* {this.props.data.processState >= 4 ? (
+            ""
           ) : (
             <div style={{ marginBottom: 10 }}>
               <div className="clearfix">
@@ -350,27 +412,28 @@ class ChangeDetail extends Component {
                   />
                 </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 ? (
+          )} */}
+
+          <div>
+            <Form.Item
+              label="备注"
+              labelCol={{ span: 4 }}
+              wrapperCol={{ span: 14 }}
+            >
+              <Input.TextArea
+                value={this.state.reason}
+                rows={4}
+                placeholder="请输入备注"
+                onChange={e => {
+                  let reason = e.target.value;
+                  this.setState({ reason });
+                }}
+              />
+            </Form.Item>
+          </div>
+
+          {/* {this.props.data.processState >= 5 ? (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
                 当前财务状态(财务填写)
@@ -381,7 +444,7 @@ class ChangeDetail extends Component {
             </div>
           ) : (
             ""
-          )}
+          )} */}
         </div>
         {this.props.processState === this.props.data.processState ? (
           this.state.buttonStatus ? (
@@ -399,9 +462,91 @@ class ChangeDetail extends Component {
                     visible={this.changeButtonStatus}
                     ajaxData={this.state}
                     loadData={this.props.loadData}
+                    rejectState={this.state.rejectState}
+                    reason={this.state.reason}
                   />
                 );
               })}
+
+              <Select
+                defaultValue="0"
+                style={{
+                  width: 120,
+                  float: "left",
+                  position: "relative",
+                  bottom: "28px",
+                  right: "-600px"
+                }}
+                onChange={val => {
+                  this.setState({ rejectState: val });
+                  console.log(val, this.state.rejectState);
+                }}
+              >
+                <Option
+                  value="0"
+                  style={{
+                    display: this.props.processState >= 1 ? "block" : "none"
+                  }}
+                >
+                  营销员
+                </Option>
+                <Option
+                  value="1"
+                  style={{
+                    display: this.props.processState >= 2 ? "block" : "none"
+                  }}
+                >
+                  营销管理员
+                </Option>
+                <Option
+                  value="2"
+                  style={{
+                    display: this.props.processState >= 3 ? "block" : "none"
+                  }}
+                >
+                  技术员
+                </Option>
+                <Option
+                  value="3"
+                  style={{
+                    display: this.props.processState >= 4 ? "block" : "none"
+                  }}
+                >
+                  技术经理
+                </Option>
+                <Option
+                  value="4"
+                  style={{
+                    display: this.props.processState >= 5 ? "block" : "none"
+                  }}
+                >
+                  技术总监
+                </Option>
+                <Option
+                  value="5"
+                  style={{
+                    display: this.props.processState >= 6 ? "block" : "none"
+                  }}
+                >
+                  财务专员(退单)
+                </Option>
+                <Option
+                  value="6"
+                  style={{
+                    display: this.props.processState >= 7 ? "block" : "none"
+                  }}
+                >
+                  财务总监
+                </Option>
+                <Option
+                  value="7"
+                  style={{
+                    display: this.props.processState >= 8 ? "block" : "none"
+                  }}
+                >
+                  总裁
+                </Option>
+              </Select>
             </div>
           ) : (
             ""

+ 182 - 19
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -1,9 +1,13 @@
 import React, { Component } from "react";
-import { Form, Upload, Modal, Button } from "antd";
+import { Form, Upload, Modal, Button, message, Select, Input } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew } from "@/tools.js";
+import $ from "jquery/src/ajax";
 // import ReactToPrint from "react-to-print";
+const FormItem = Form.Item;
+const { TextArea } = Input;
+
 
 const formItemLayout = {
   labelCol: { span: 8 },
@@ -82,7 +86,9 @@ class ChangeDetail extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      previewVisible: false
+      previewVisible: false,
+      dataSource: [],
+      reason: ""
     };
     this.getOrgCodeUrl = this.getOrgCodeUrl.bind(this);
   }
@@ -93,6 +99,37 @@ class ChangeDetail extends Component {
     });
   }
 
+  loadData() {
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      async: false,
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
+      data: {
+        changeId: this.props.data.id
+      },
+      success: function(data) {
+        if (data.error.length || data.data.list == "") {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.setState({
+            dataSource: data.data
+          });
+        }
+      }.bind(this)
+    });
+  }
+
+  componentDidMount() {
+    // this.loadData();
+    window.setTimeout(() => {
+      this.loadData()
+    },10)
+  }
+
   render() {
     const pageData = [
       {
@@ -139,7 +176,7 @@ class ChangeDetail extends Component {
         dataB: "***"
       },
       {
-        labelA: "备注",
+        labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks
       }
@@ -265,7 +302,27 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.data.id} />
           </Form.Item>
-          {this.props.data.processState >= 3 ? (
+
+          {/* <h2 style={{ textAlign: "center", marginBottom: 0 }}>变更日志</h2> */}
+          <ul
+            style={{ width: "868px", overflow: "hidden", paddingLeft: "90px" }}
+          >
+            {/* <span>操作人:</span> */}
+            {this.state.dataSource.map((item, index) => (
+              <li
+                key={index}
+                style={{
+                  width: "100%",
+                  height: "auto",
+                  wordBreak: "break-all",
+                  color: "black",
+                  marginBottom: "10px"
+                }}
+              >{`${item.aname}: ${item.remarks}`}</li>
+            ))}
+          </ul>
+
+          {/* {this.props.data.processState >= 3 ? (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
                 当前项目进度(咨询师填写)
@@ -276,7 +333,7 @@ class ChangeDetail extends Component {
             </div>
           ) : (
             ""
-          )}
+          )} */}
           {this.props.data.processState >= 5 ? (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
@@ -291,21 +348,127 @@ class ChangeDetail extends Component {
           )}
         </div>
         {this.props.processState === this.props.data.processState ? (
-          <div
-            className="clearfix"
-            style={{ display: "flex", justifyContent: "space-around" }}
-          >
-            {buttonData.map((item, index) => {
-              return (
-                <AgreeButton
-                  data={item}
-                  key={index}
-                  backData={this.props.data}
-                  processState={this.props.processState}
-                  visible={this.changeButtonStatus}
+          <div>
+            <div className="clearfix">
+              <FormItem
+                style={{ height: "auto" }}
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
+                label="备注"
+              >
+                <TextArea
+                  rows={4}
+                  placeholder="请输入备注信息"
+                  ref="signTotalAmount"
+                  style={{ width: "95%" }}
+                  value={this.state.reason}
+                  onChange={e => {
+                    let reason = e.target.value;
+                    this.setState({ reason });
+                  }}
                 />
-              );
-            })}
+              </FormItem>
+            </div>
+
+            <div
+              className="clearfix"
+              style={{ display: "flex", justifyContent: "space-around" }}
+            >
+              {buttonData.map((item, index) => {
+                return (
+                  <AgreeButton
+                    data={item}
+                    key={index}
+                    backData={this.props.data}
+                    processState={this.props.processState}
+                    visible={this.changeButtonStatus}
+                    loadData={this.props.loadData}
+                    reason={this.state.reason}
+                    rejectState={this.state.rejectState}
+                  />
+                );
+              })}
+            </div>
+
+            <Select
+              defaultValue="0"
+              style={{
+                width: 120,
+                float: "left",
+                position: "relative",
+                bottom: "28px",
+                right: "-600px"
+              }}
+              onChange={val => {
+                this.setState({ rejectState: val });
+                console.log(val, this.state.rejectState);
+              }}
+            >
+              <Option
+                value="0"
+                style={{
+                  display: this.props.processState >= 1 ? "block" : "none"
+                }}
+              >
+                营销员
+              </Option>
+              <Option
+                value="1"
+                style={{
+                  display: this.props.processState >= 2 ? "block" : "none"
+                }}
+              >
+                营销管理员
+              </Option>
+              <Option
+                value="2"
+                style={{
+                  display: this.props.processState >= 3 ? "block" : "none"
+                }}
+              >
+                技术员
+              </Option>
+              <Option
+                value="3"
+                style={{
+                  display: this.props.processState >= 4 ? "block" : "none"
+                }}
+              >
+                技术经理
+              </Option>
+              <Option
+                value="4"
+                style={{
+                  display: this.props.processState >= 5 ? "block" : "none"
+                }}
+              >
+                技术总监
+              </Option>
+              <Option
+                value="5"
+                style={{
+                  display: this.props.processState >= 6 ? "block" : "none"
+                }}
+              >
+                财务专员(退单)
+              </Option>
+              <Option
+                value="6"
+                style={{
+                  display: this.props.processState >= 7 ? "block" : "none"
+                }}
+              >
+                财务总监
+              </Option>
+              <Option
+                value="7"
+                style={{
+                  display: this.props.processState >= 8 ? "block" : "none"
+                }}
+              >
+                总裁
+              </Option>
+            </Select>
           </div>
         ) : (
           ""

+ 160 - 7
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -1,8 +1,9 @@
 import React, { Component } from "react";
-import { Form, Upload, Modal, Input, Button } from "antd";
+import { Form, Upload, Modal, Input, Button, message, Select } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew } from "@/tools.js";
+import $ from "jquery/src/ajax";
 // import ReactToPrint from "react-to-print";
 
 const formItemLayout = {
@@ -84,7 +85,9 @@ class ChangeDetail extends Component {
     super(props);
     this.state = {
       previewVisible: false,
-      buttonStatus: true
+      buttonStatus: true,
+      dataSource: [],
+      reason: ""
     };
     this.getOrgCodeUrl = this.getOrgCodeUrl.bind(this);
     this.changeButtonStatus = this.changeButtonStatus.bind(this);
@@ -103,6 +106,36 @@ class ChangeDetail extends Component {
     });
   }
 
+  loadDataChange() {
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      async: false,
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
+      data: {
+        changeId: this.props.data.id
+      },
+      success: function(data) {
+        if (data.error.length || data.data.list == "") {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.setState({
+            dataSource: data.data
+          });
+        }
+      }.bind(this)
+    });
+  }
+
+  componentDidMount() {
+    window.setTimeout(() => {
+      this.loadDataChange();
+    }, 10);
+  }
+
   render() {
     const pageData = [
       {
@@ -149,7 +182,7 @@ class ChangeDetail extends Component {
         dataB: this.props.data.changeAmount
       },
       {
-        labelA: "备注",
+        labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks
       }
@@ -290,7 +323,26 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.data.id} />
           </Form.Item>
-          {this.props.data.processState >= 4 ? (
+
+          <ul
+            style={{ width: "868px", overflow: "hidden", paddingLeft: "90px" }}
+          >
+            {/* <span>操作人:</span> */}
+            {this.state.dataSource.map((item, index) => (
+              <li
+                key={index}
+                style={{
+                  width: "100%",
+                  height: "auto",
+                  wordBreak: "break-all",
+                  color: "black",
+                  marginBottom: "10px"
+                }}
+              >{`${item.aname}: ${item.remarks}`}</li>
+            ))}
+          </ul>
+
+          {/* {this.props.data.processState >= 4 ? (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
                 当前项目进度(咨询师经理填写)
@@ -301,8 +353,8 @@ class ChangeDetail extends Component {
             </div>
           ) : (
             ""
-          )}
-          {this.props.data.processState >= 5 ? (
+          )} */}
+          {/* {this.props.data.processState >= 5 ? (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
                 当前财务状态(财务填写)
@@ -313,7 +365,25 @@ class ChangeDetail extends Component {
             </div>
           ) : (
             ""
-          )}
+          )} */}
+
+          <div>
+            <Form.Item
+              label="备注"
+              labelCol={{ span: 4 }}
+              wrapperCol={{ span: 14 }}
+            >
+              <Input.TextArea
+                value={this.state.reason}
+                rows={4}
+                placeholder="请输入备注"
+                onChange={e => {
+                  let reason = e.target.value;
+                  this.setState({ reason });
+                }}
+              />
+            </Form.Item>
+          </div>
         </div>
         {this.props.processState === this.props.data.processState ? (
           this.state.buttonStatus ? (
@@ -330,9 +400,92 @@ class ChangeDetail extends Component {
                     processState={this.props.processState}
                     visible={this.changeButtonStatus}
                     loadData={this.props.loadData}
+                    ajaxData={this.state}
+                    rejectState={this.state.rejectState}
+                    reason={this.state.reason}
                   />
                 );
               })}
+
+              <Select
+                defaultValue="0"
+                style={{
+                  width: 120,
+                  float: "left",
+                  position: "relative",
+                  bottom: "28px",
+                  right: "-600px"
+                }}
+                onChange={val => {
+                  this.setState({ rejectState: val });
+                  console.log(val, this.state.rejectState);
+                }}
+              >
+                <Option
+                  value="0"
+                  style={{
+                    display: this.props.processState >= 1 ? "block" : "none"
+                  }}
+                >
+                  营销员
+                </Option>
+                <Option
+                  value="1"
+                  style={{
+                    display: this.props.processState >= 2 ? "block" : "none"
+                  }}
+                >
+                  营销管理员
+                </Option>
+                <Option
+                  value="2"
+                  style={{
+                    display: this.props.processState >= 3 ? "block" : "none"
+                  }}
+                >
+                  技术员
+                </Option>
+                <Option
+                  value="3"
+                  style={{
+                    display: this.props.processState >= 4 ? "block" : "none"
+                  }}
+                >
+                  技术经理
+                </Option>
+                <Option
+                  value="4"
+                  style={{
+                    display: this.props.processState >= 5 ? "block" : "none"
+                  }}
+                >
+                  技术总监
+                </Option>
+                <Option
+                  value="5"
+                  style={{
+                    display: this.props.processState >= 6 ? "block" : "none"
+                  }}
+                >
+                  财务专员(退单)
+                </Option>
+                <Option
+                  value="6"
+                  style={{
+                    display: this.props.processState >= 7 ? "block" : "none"
+                  }}
+                >
+                  财务总监
+                </Option>
+                <Option
+                  value="7"
+                  style={{
+                    display: this.props.processState >= 8 ? "block" : "none"
+                  }}
+                >
+                  总裁
+                </Option>
+              </Select>
             </div>
           ) : (
             ""

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

@@ -1,9 +1,12 @@
 import React, { Component } from "react";
-import { Form, Upload, Modal, Button } from "antd";
+import { Form, Upload, Modal, Button, message, Input } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew } from "../../../../tools.js";
+import $ from "jquery/src/ajax";
 // import ReactToPrint from "react-to-print";
+const FormItem = Form.Item;
+const { TextArea } = Input;
 
 const formItemLayout = {
   labelCol: { span: 8 },
@@ -83,10 +86,51 @@ class ChangeDetail extends Component {
     super(props);
     this.state = {
       previewVisible: false,
-      buttonStatus: true
+      buttonStatus: true,
+      dataSource: [],
+      reason: ""
     };
     this.getOrgCodeUrl = this.getOrgCodeUrl.bind(this);
     this.changeButtonStatus = this.changeButtonStatus.bind(this);
+    this.loadDataChange = this.loadDataChange.bind(this);
+  }
+  // componentWillUpdate() {
+  //   this.loadDataChange();
+  //   console.log(this.props);
+  // }
+  // componentDidUpdate() {
+  //     this.loadDataChange();
+  //   console.log(this.props);
+  // }
+  componentDidMount() {
+    window.setTimeout(() => {
+      this.loadDataChange();
+    },10)
+  }
+
+  loadDataChange() {
+    console.log(this.props);
+    
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
+      data: {
+        changeId: this.props.data.id
+      },
+      success: function(data) {
+        if (data.error.length || data.data.list == "") {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.setState({
+            dataSource: data.data
+          });
+        }
+      }.bind(this)
+    });
   }
 
   getOrgCodeUrl(e) {
@@ -148,7 +192,7 @@ class ChangeDetail extends Component {
         dataB: this.props.data.changeAmount
       },
       {
-        labelA: "备注",
+        labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks
       }
@@ -163,7 +207,7 @@ class ChangeDetail extends Component {
         dataB: this.props.data.zxsCost
       },
       {
-        labelA: "备注",
+        labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.zxsRemarks
       }
@@ -274,6 +318,31 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.data.id} />
           </Form.Item>
+
+          {/* <h2 style={{ textAlign: "center", marginBottom: 0 }}>变更日志</h2> */}
+          <ul
+            style={{
+              width: "868px",
+              overflow: "hidden",
+              paddingLeft: "90px",
+              marginBottom: "20px"
+            }}
+          >
+            {/* <span>操作人:</span> */}
+            {this.state.dataSource.map((item, index) => (
+              <li
+                key={index}
+                style={{
+                  width: "100%",
+                  height: "auto",
+                  wordBreak: "break-all",
+                  color: "black",
+                  marginBottom: "10px"
+                }}
+              >{`${item.aname}: ${item.remarks}`}</li>
+            ))}
+          </ul>
+
           {this.props.data.type === 0 && this.props.data.processState >= 2 ? (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
@@ -314,8 +383,33 @@ class ChangeDetail extends Component {
             ""
           )}
         </div>
+
+        
+
         {this.props.processState === this.props.data.processState ? (
           this.state.buttonStatus ? (
+            <div>
+        <div className="clearfix">
+          <FormItem
+            style={{ height: "auto" }}
+            labelCol={{ span: 4 }}
+            wrapperCol={{ span: 18 }}
+            label="备注"
+          >
+            <TextArea
+              rows={4}
+              placeholder="请输入备注信息"
+              ref="signTotalAmount"
+              style={{ width: "95%" }}
+              value={this.state.reason}
+              onChange={e => {
+                let reason = e.target.value;
+                this.setState({ reason });
+              }}
+            />
+          </FormItem>
+        </div>
+
             <div
               className="clearfix"
               style={{ display: "flex", justifyContent: "space-around" }}
@@ -329,10 +423,12 @@ class ChangeDetail extends Component {
                     processState={this.props.processState}
                     visible={this.changeButtonStatus}
                     loadData={this.props.loadData}
+                    reason={this.state.reason}
                   />
                 );
               })}
             </div>
+            </div>
           ) : (
             ""
           )

+ 66 - 11
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -1,8 +1,9 @@
 import React, { Component } from "react";
-import { Form, Upload, Modal, Button } from "antd";
+import { Form, Upload, Modal, Button, message } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew } from "@/tools.js";
+import $ from "jquery/src/ajax";
 // import ReactToPrint from "react-to-print";
 
 const formItemLayout = {
@@ -58,7 +59,7 @@ class Itemlist extends Component {
   render() {
     let pageData = this.props.pageData;
     return (
-      <div className="clearfix">
+      <div className="clearfix" style={{ height: "30px", overflow: "hidden"}}>
         <Form.Item
           label={pageData.labelA}
           {...pageData.formItemLayoutA}
@@ -82,7 +83,8 @@ class ChangeDetail extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      previewVisible: false
+      previewVisible: false,
+      dataSource: []
     };
     this.getOrgCodeUrl = this.getOrgCodeUrl.bind(this);
   }
@@ -93,7 +95,42 @@ class ChangeDetail extends Component {
     });
   }
 
+  loadData() {
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      async: false,
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
+      data: {
+        changeId: this.props.data.id
+      },
+      success: function(data) {
+        if (data.error.length || data.data.list == "") {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.setState({
+            dataSource: data.data
+          });
+        }
+      }.bind(this)
+    });
+  }
+
+  componentDidMount() {
+    this.loadData()
+  }
+
   render() {
+    // const loadData = [
+    //   {
+    //     labelA: "",
+    //     formItemLayoutA: formItemLayout,
+    //     dataA
+    //   }
+    // ];
     const pageData = [
       {
         labelA: "客户名称",
@@ -139,7 +176,7 @@ class ChangeDetail extends Component {
         dataB: this.props.data.changeAmount
       },
       {
-        labelA: "备注",
+        labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks
       }
@@ -222,14 +259,12 @@ class ChangeDetail extends Component {
       <div className="clearfix">
         <div
           className="clearfix"
-          style={{ marginTop: 20 }}
+          style={{ marginTop: 0 }}
           ref={e => {
             this.refs = e;
           }}
         >
-          <h2 style={{ textAlign: "center", marginBottom: 10 }}>
-            合同变更记录
-          </h2>
+          <h2 style={{ textAlign: "center", marginBottom: 0 }}>合同变更记录</h2>
           {pageData.map((item, index) => {
             return <Itemlist key={index} pageData={item} />;
           })}
@@ -265,7 +300,7 @@ 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 }}>
                 当前项目进度(咨询师经理填写)
@@ -276,10 +311,30 @@ class ChangeDetail extends Component {
             </div>
           ) : (
             ""
-          )}
+          )} */}
+          {/* <h2 style={{ textAlign: "center", marginBottom: 0 }}>变更日志</h2> */}
+          <ul
+            style={{ width: "868px", overflow: "hidden", paddingLeft: "90px" }}
+          >
+            {/* <span>操作人:</span> */}
+            {this.state.dataSource.map((item, index) => (
+              <li
+                key={index}
+                style={{ width: "100%", height: "auto", wordBreak: "break-all", color: "black", marginBottom: "10px"}}
+              >{`${item.aname}: ${item.remarks}`}</li>
+            ))}
+          </ul>
+
+          {/* <ul>
+            <span>备注</span>
+            {this.state.dataSource.map((item, index) => (
+              <li key={index}>{item.remarks}</li>
+            ))}
+          </ul> */}
+
           {this.props.data.type === 0 ? (
             this.props.data.processState >= 5 ? (
-              <div>
+              <div style={{ marginTop: "20px" }}>
                 <h3
                   style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}
                 >

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

@@ -132,6 +132,9 @@ class Rizhi extends Component {
         >
           查看变更日志
         </Button>
+        {/* <div>
+          {this.state.dataSource.map((item) =>  <div>{item.aname}</div> )}
+        </div> */}
         <Modal
           maskClosable={false}
           visible={this.state.visible}

+ 2 - 0
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -683,6 +683,7 @@ const contractChange = Form.create()(
               reason: ""
             });
             this.reset();
+            // window.location.reload()
           }
         }.bind(this)
       }).always(
@@ -852,6 +853,7 @@ const contractChange = Form.create()(
       this.state.releaseDate[1] = undefined;
       this.state.approval = undefined;
       this.loadData(1);
+      // window.location.reload();
     },
     outReset() {
       this.setState({