dev01 3 年之前
父節點
當前提交
ae051d9257

+ 3 - 468
js/component/manageCenter/channelList/channelunit/publist.jsx

@@ -69,11 +69,6 @@ class ChannelUnit extends Component {
           dataIndex: "createTime",
           key: "createTime",
         },
-        // {
-        //   title: "跟进人",
-        //   dataIndex: "aName",
-        //   key: "aName",
-        // },
         {
           title: "操作",
           dataIndex: "op",
@@ -116,18 +111,12 @@ class ChannelUnit extends Component {
       areaList: [],
       searchInfor: {}, // 查询条件
       mvisible: "", //控制弹窗变量
-      customerArr: [], //查询到的转交人列表
-      rowdata: {}, //双击行数据
-      categoryArr: [],
-      visitModuls: false,
     };
-    this.tabelContentRef = null;
-    this.autoCompleteSearchRef = {};
+
   }
 
   componentWillMount() {
     this.loadData();
-    this.category();
   }
   /*单个领取*/
   receive(e) {
@@ -248,70 +237,10 @@ class ChannelUnit extends Component {
       }.bind(this)
     );
   }
-  //值改变时请求客户名称
-  httpChange(e) {
-    if (e.length >= 1) {
-      this.supervisor(e);
-    }
-    this.setState({
-      auto: e,
-    });
-  }
-  // 指定转交人自动补全
-  supervisor(e) {
-    $.ajax({
-      method: "get",
-      dataType: "json",
-      crossDomain: false,
-      url: globalConfig.context + "/api/admin/customer/listAdminByName",
-      data: {
-        adminName: e,
-      },
-      success: function (data) {
-        let thedata = data.data;
-        if (!thedata) {
-          if (data.error && data.error.length) {
-            message.warning(data.error[0].message);
-          }
-          thedata = {};
-        }
-        this.setState({
-          customerArr: thedata,
-        });
-      }.bind(this),
-    }).always(
-      function () {
-        this.setState({
-          loading: false,
-        });
-      }.bind(this)
-    );
-  }
-  // 失去焦点
-  blurChange(e) {
-    let theType = "";
-    let contactLists = this.state.customerArr || [];
-    if (e) {
-      contactLists.map(function (item) {
-        if (item.name == e.toString()) {
-          theType = item.id;
-        }
-      });
-    }
-    this.setState({
-      theTypes: theType,
-    });
-  }
   // 选择行
   onSelectChange(selectedRowKeys) {
     this.setState({ selectedRowKeys });
   }
-  //
-  addClick() {
-    this.setState({
-      mvisible: "add",
-    });
-  }
   // 关闭弹窗
   closeDesc() {
     this.setState({
@@ -319,271 +248,6 @@ class ChannelUnit extends Component {
     });
     this.loadData();
   }
-  // 转交提示
-  showConfirm() {
-    const { dataSource, selectedRowKeys } = this.state;
-    if (!this.state.theTypes) {
-      message.warning("请输入转交人姓名");
-      return;
-    }
-    let _this = this;
-    Modal.confirm({
-      title: "提示",
-      content: (
-        <span style={{ color: "red" }}>
-          确定要转交以下渠道吗?
-          {/* {this.state.selectedRowKeys.map((value, index) => (
-            <div key={index} style={{ marginTop: "5px", color: "#000" }}>
-              {value.name}
-            </div>
-          ))} */}
-          <div style={{ marginTop: "5px", color: "#000" }}>
-            {dataSource[selectedRowKeys[0]].name}
-          </div>
-        </span>
-      ),
-      onOk() {
-        _this.setState({
-          informationTransferVisible: true,
-        });
-      },
-      onCancel() { },
-    });
-  }
-  //转交
-  changeAssigner(infor) {
-    const { dataSource, selectedRowKeys } = this.state;
-    if (this.state.theTypes) {
-      this.setState({
-        informationTransferVisible: false,
-      });
-      let changeIds = dataSource[selectedRowKeys[0]].id;
-      let oldAid = dataSource[selectedRowKeys[0]].aid;
-      let loading = message.loading("加载中...");
-      $.ajax({
-        method: "get",
-        dataType: "json",
-        crossDomain: false,
-        url: globalConfig.context + "/api/admin/customer/transferToOther",
-        data: {
-          uid: changeIds, //这一行数据的ID
-          aid: this.state.theTypes, //指定转交人的ID
-          oldAid: oldAid, //原跟进人ID
-          data: infor, // 资料是否一并转交 0否 1是
-        },
-      }).done(
-        function (data) {
-          loading();
-          if (!data.error.length) {
-            message.success("转交成功!");
-            this.setState({
-              auto: "",
-              loading: false,
-              selectedRowKeys: [],
-            });
-          } else {
-            message.warning(data.error[0].message);
-          }
-          this.loadData(
-            Math.min(
-              this.state.ispage == undefined ? 1 : this.state.ispage,
-              Math.ceil((this.state.pagination.total - 1) / 10)
-            )
-          );
-        }.bind(this)
-      );
-    } else {
-      message.warning("请输入转交人姓名");
-    }
-  }
-  // 移出渠道
-  remove() {
-    const { dataSource, selectedRowKeys, ispage } = this.state;
-    const _this = this
-    Modal.confirm({
-      title: "您确定将以下渠道移至公共渠道吗??",
-      content: (
-        <span style={{ color: "red" }}>
-          移除后,以下客户将被别人领取!
-          <div style={{ marginTop: "5px", color: "#000" }}>
-            {dataSource[selectedRowKeys[0]].name}
-          </div>
-        </span>
-      ),
-      onOk() {
-        let deletedIds = dataSource[selectedRowKeys[0]].id;
-        $.ajax({
-          method: "get",
-          dataType: "json",
-          crossDomain: false,
-          url: globalConfig.context + "/api/admin/customer/pushReleaseUser",
-          data: {
-            id: deletedIds,
-          },
-          success: function (data) {
-            let thedata = data.data;
-            if (!thedata) {
-              if (data.error && data.error.length) {
-                message.warning(data.error[0].message);
-              }
-              thedata = {};
-            } else {
-              message.success("移除成功");
-            }
-            _this.loadData(
-              dataSource.length === 1
-                ? ispage === 1
-                  ? 1
-                  : ispage - 1
-                : ispage
-            )
-          }.bind(this),
-        }).always(
-          function () {
-            _this.setState({
-              loading: false,
-            });
-          }.bind(this)
-        );
-      },
-      onCancel() { },
-    });
-  }
-  selectAuto(value, options) {
-    this.setState({
-      auto: value,
-    });
-  }
-  // 跟进人查询
-  followUp(e) {
-    const { searchInfor } = this.state;
-    this.setState({
-      searchInfor: Object.assign(searchInfor, {
-        aname: e,
-      }),
-    });
-    $.ajax({
-      method: "get",
-      dataType: "json",
-      crossDomain: false,
-      url: globalConfig.context + "/api/admin/customer/listAdminByName",
-      data: {
-        adminName: e,
-      },
-      success: function (data) {
-        let thedata = data.data;
-        if (!thedata) {
-          if (data.error && data.error.length) {
-            message.warning(data.error[0].message);
-          }
-          thedata = {};
-        }
-        this.setState({
-          fjlist: thedata,
-        });
-      }.bind(this),
-    }).always(
-      function () {
-        this.setState({
-          loading: false,
-        });
-      }.bind(this)
-    );
-  }
-  // 选中跟进人
-  selectF(value) {
-    const { searchInfor, fjlist } = this.state;
-    const newdataSources = JSON.stringify(fjlist) == "{}" ? [] : fjlist;
-    this.setState({
-      searchInfor: Object.assign(searchInfor, {
-        aid: newdataSources.find((item) => item.name == value).id,
-      }),
-    });
-  }
-  //品类数据获取
-  category() {
-    $.ajax({
-      method: "get",
-      dataType: "json",
-      crossDomain: false,
-      url: globalConfig.context + "/api/admin/Varieties/getSuperList",
-      data: {},
-      success: function (data) {
-        let thedata = data.data;
-        let theArr = [];
-        if (!thedata) {
-          if (data.error && data.error.length) {
-            message.warning(data.error[0].message);
-          }
-          thedata = {};
-        } else {
-          thedata.map(function (item, index) {
-            theArr.push({
-              value: item.id,
-              key: item.cname,
-            });
-          });
-        }
-        this.setState({
-          categoryArr: theArr,
-        });
-      }.bind(this),
-    });
-  }
-  //查看跟进记录列表
-  loadVisit(pageNo) {
-    this.setState({
-      loading: true,
-    });
-    $.ajax({
-      method: "get",
-      dataType: "json",
-      crossDomain: false,
-      url: globalConfig.context + "/api/admin/customer/listFollowHistory",
-      data: {
-        pageNo: pageNo || 1,
-        pageSize: this.state.paginations.pageSize,
-        uid: this.props.data.id, //名称1
-      },
-      success: function (data) {
-        let theArr = [];
-        if (data.error.length || data.data.list == "") {
-          if (data.error && data.error.length) {
-            message.warning(data.error[0].message);
-          }
-        } else {
-          for (let i = 0; i < data.data.list.length; i++) {
-            let thisdata = data.data.list[i];
-            theArr.push(thisdata);
-          }
-          this.state.paginations.current = data.data.pageNo;
-          this.state.paginations.total = data.data.totalCount;
-          this.setState({
-            ispage: data.data.pageNo,
-          });
-        }
-        if (data.data.list && !data.data.list.length) {
-          this.state.paginations.current = 0;
-          this.state.paginations.total = 0;
-        }
-        this.setState({
-          visitArrList: theArr,
-          paginations: this.state.paginations,
-        });
-      }.bind(this),
-    }).always(
-      function () {
-        this.setState({
-          loading: false,
-        });
-      }.bind(this)
-    );
-  }
-  close(e, s) {
-    this.setState({
-      visitModuls: false,
-    });
-  }
 
   render() {
     const {
@@ -596,26 +260,15 @@ class ChannelUnit extends Component {
       channeOb,
       dataSource,
     } = this.state;
+
     const rowSelection = {
       selectedRowKeys,
       onChange: this.onSelectChange.bind(this),
       hideDefaultSelections: true,
       type: "radio",
     };
+
     const hasSelected = this.state.selectedRowKeys.length > 0;
-    const dataSources = this.state.customerArr || [];
-    const options = dataSources.map((group) => (
-      <Select.Option key={group.id} value={group.name}>
-        {group.name}
-      </Select.Option>
-    ));
-    const newdataSources =
-      JSON.stringify(this.state.fjlist) == "{}" ? [] : this.state.fjlist;
-    const newoptions = newdataSources.map((group) => (
-      <Select.Option key={group.id} value={group.name}>
-        {group.name}
-      </Select.Option>
-    ));
     return (
       <div className="user-content">
         <div className="content-title" style={{ marginBottom: 10 }}>
@@ -710,22 +363,6 @@ class ChannelUnit extends Component {
                     ))}
                   </Select>
                 </FormItem>
-                {/* <FormItem>
-                  <AutoComplete
-                    className="certain-category-search"
-                    dropdownClassName="certain-category-search-dropdown"
-                    dropdownMatchSelectWidth={false}
-                    style={{ width: "120px" }}
-                    dataSource={newoptions}
-                    placeholder="跟进人"
-                    value={searchInfor.aname || undefined}
-                    onChange={this.followUp.bind(this)}
-                    filterOption={true}
-                    onSelect={this.selectF.bind(this)}
-                  >
-                    <Input />
-                  </AutoComplete>
-                </FormItem> */}
                 <FormItem>
                   <Select
                     placeholder={"渠道类型"}
@@ -789,30 +426,6 @@ class ChannelUnit extends Component {
               }}
             >
               <div style={{ flex: 1 }}>
-                {/* <AutoComplete
-                  className="certain-category-search"
-                  dropdownClassName="certain-category-search-dropdown"
-                  dropdownMatchSelectWidth={false}
-                  style={{ width: "120px" }}
-                  dataSource={options}
-                  placeholder="输入转交人姓名"
-                  value={this.state.auto}
-                  onChange={this.httpChange.bind(this)}
-                  filterOption={true}
-                  onBlur={this.blurChange.bind(this)}
-                  onSelect={this.selectAuto.bind(this)}
-                  disabled={!hasSelected}
-                >
-                  <Input />
-                </AutoComplete>
-                <Button
-                  type="primary"
-                  onClick={this.showConfirm.bind(this)}
-                  style={{ marginLeft: 10 }}
-                  disabled={!hasSelected}
-                >
-                  转交
-                </Button> */}
                 <Button
                   type="primary"
                   onClick={() => {
@@ -825,14 +438,6 @@ class ChannelUnit extends Component {
                 >
                   渠道日志
                 </Button>
-                {/* <Button
-                  type="primary"
-                  onClick={this.remove.bind(this)}
-                  style={{ marginLeft: "10px" }}
-                  disabled={!hasSelected}
-                >
-                  移出渠道
-                </Button> */}
                 <Button
                   type="primary"
                   onClick={() => {
@@ -846,13 +451,6 @@ class ChannelUnit extends Component {
                   更改日志
                 </Button>
               </div>
-              {/* <Button
-                type="primary"
-                onClick={this.addClick.bind(this)}
-                style={{ marginLeft: "10px" }}
-              >
-                新增渠道
-              </Button> */}
             </div>
           </TabPane>
           <TabPane tab="更改表格显示数据" key="3">
@@ -872,61 +470,13 @@ class ChannelUnit extends Component {
             <Table
               bordered
               size="middle"
-              // scroll={this.state.scroll}
               columns={changeList ? changeList : columns}
-              onRowDoubleClick={(e) => {
-                this.setState({
-                  mvisible: "detail",
-                  rowdata: e,
-                });
-              }}
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
               rowSelection={rowSelection}
             />
           </Spin>
         </div>
-        {this.state.informationTransferVisible && (
-          <Modal
-            visible={this.state.informationTransferVisible}
-            title="提醒"
-            onCancel={() => {
-              this.setState({
-                informationTransferVisible: false,
-              });
-            }}
-            footer={[
-              <Button
-                key="1"
-                size="large"
-                type={"primary"}
-                onClick={() => {
-                  this.changeAssigner(1);
-                }}
-              >
-                需要
-              </Button>,
-              <Button
-                key="2"
-                size="large"
-                type={"danger"}
-                onClick={() => {
-                  this.changeAssigner(0);
-                }}
-              >
-                不需要
-              </Button>,
-            ]}
-          >
-            请确定,是否将客户资料一并转交!选择“需要”,系统将全部客户资料一并转交!选择“不需要”,原客户资料保存您的客户资料中,请注意客户资料的更新维护,谢谢
-          </Modal>
-        )}
-        {this.state.mvisible == "add" && (
-          <AddChannel
-            showDesc={this.state.mvisible}
-            closeDesc={this.closeDesc.bind(this)}
-          />
-        )}
         {this.state.mvisible == "channellog" && (
           <ChannelLog
             cancel={this.closeDesc.bind(this)}
@@ -941,21 +491,6 @@ class ChannelUnit extends Component {
             id={dataSource[selectedRowKeys[0]].id}
           />
         )}
-        {this.state.mvisible == "detail" && (
-          <ChannelDetail
-            cancel={this.closeDesc.bind(this)}
-            visible={this.state.mvisible}
-            IntentionData={this.state.rowdata}
-            categoryArr={this.state.categoryArr}
-          />
-        )}
-        <FollowDetail
-          categoryArr={this.state.categoryArr}
-          followData={this.state.followData}
-          visitModul={this.state.visitModuls}
-          closeDesc={this.close.bind(this)}
-          loadData={this.loadVisit.bind(this)}
-        />
       </div>
     );
   }

+ 2 - 3
js/component/manageCenter/customer/NEW/crm/patentPayment.jsx

@@ -26,7 +26,6 @@ import {
 	getcityArr,
 	ShowModal,
 	getMessageReminderStart,
-	onReplace,
 } from "@/tools.js";
 import './customer.less';
 import ShowModalDiv from "@/showModal.jsx";
@@ -261,13 +260,13 @@ const PatentPayment = Form.create()(React.createClass({
 				width: 100,
 				render: (text, record) => {
 					return (
-						<Tooltip title={record.uid ? onReplace(text) : onReplace(record.applicant)}>
+						<Tooltip title={record.uid ? text : record.applicant}>
 							<div style={{
 								maxWidth: '100px',
 								overflow: 'hidden',
 								textOverflow: "ellipsis",
 								whiteSpace: 'nowrap',
-							}}>{record.uid ? onReplace(text) : onReplace(record.applicant)}</div>
+							}}>{record.uid ? text : record.applicant}</div>
 						</Tooltip>
 					)
 				}

+ 1 - 1
js/component/manageCenter/customer/NEW/signCustomer/followDetail/addContact.jsx

@@ -61,7 +61,7 @@ const AddContact = React.createClass({
                 fixedTel:this.state.fixedTelModal,
                 major: this.state.major,
 				wechat: this.state.newwechat,
-				depatrment: this.state.newdepatrment,
+				department: this.state.newdepatrment,
 				position: this.state.newposition,
 				sex: this.state.newsex,
 				qq: this.state.newqq

+ 119 - 115
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -165,8 +165,8 @@ class ItemInput extends Component {
               }}
             />
           ) : (
-              ""
-            )}
+            ""
+          )}
         </Form.Item>
       </div>
     );
@@ -180,7 +180,7 @@ class ChangeDetail extends Component {
       rotateDeg: 0,
       rotateDeg1: 0,
       previewVisible: false,
-      uploadVisible:false,
+      uploadVisible: false,
       buttonStatus: true,
       changeType: 2,
       dataSource: [],
@@ -239,7 +239,7 @@ class ChangeDetail extends Component {
                   style={{ display: !this.props.refundStatus ? "block" : "none" }}
                   type="danger">
                   删除
-              </Button>
+                </Button>
               </Popconfirm>
             )
           }
@@ -341,8 +341,8 @@ class ChangeDetail extends Component {
                     保存
                   </Button>
                 ) : (
-                    ""
-                  )}
+                  ""
+                )}
               </div>
             );
           }
@@ -1146,7 +1146,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4
+                  this.props.data.status == 4
                   ? "block"
                   : "none",
             }}
@@ -1192,8 +1192,8 @@ class ChangeDetail extends Component {
             labelCol={{ span: 4 }}
             wrapperCol={{ span: 18 }}
           >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-              <ImgList domId={this.props.domId ? this.props.domId : 'hetongbiangenjilu'} fileList={orgCodeUrl} ItemWidth={'96px'}/>
+            <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+              <ImgList domId={this.props.domId ? this.props.domId : 'hetongbiangenjilu'} fileList={orgCodeUrl} ItemWidth={'96px'} />
             </div>
             <Modal
               maskClosable={false}
@@ -1348,10 +1348,10 @@ class ChangeDetail extends Component {
           ) : (
             ""
           )} */}
-        {/* 当前财务状态2 */}
-        {this.props.data.processState != 5 ? (
+          {/* 当前财务状态2 */}
+          {this.props.data.processState != 5 ? (
             <div>
-              <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10,marginTop:'10px' }}>
+              <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10, marginTop: '10px' }}>
                 当前财务状态(财务填写)
               </h3>
               {/* <div className="clearfix">
@@ -1545,7 +1545,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
+                  (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
             }}
@@ -1566,7 +1566,7 @@ class ChangeDetail extends Component {
                 display:
                   (this.props.data.processState == 7 ||
                     this.props.data.processState == 8) &&
-                  this.props.data.status == 4 ||this.props.data.status == 6
+                    this.props.data.status == 4 || this.props.data.status == 6
                     ? "none"
                     : "block",
               }}
@@ -1585,7 +1585,7 @@ class ChangeDetail extends Component {
             />
           </div>
 
-            {/* 应收 回收 */}
+          {/* 应收 回收 */}
           <ul
             style={{
               margin: "10px 0 0 20px",
@@ -1593,7 +1593,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                (this.props.data.status == 4 || this.props.data.status == 2)
+                  (this.props.data.status == 4 || this.props.data.status == 2)
                   ? "inline-block"
                   : "none",
             }}
@@ -1613,15 +1613,15 @@ class ChangeDetail extends Component {
           </ul>
           {/* 审核查看附件4 */}
           <div style={{
-              position: "relative",
-              display:
-                (this.props.data.processState == 7 ||
-                  this.props.data.processState == 8) &&
-                  this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6 
-                    ? "block"
-                    : "none",
-              marginTop: 10,
-            }}
+            position: "relative",
+            display:
+              (this.props.data.processState == 7 ||
+                this.props.data.processState == 8) &&
+                this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
+                ? "block"
+                : "none",
+            marginTop: 10,
+          }}
           >
             <hr
               style={{
@@ -1632,7 +1632,7 @@ class ChangeDetail extends Component {
                 border: "none",
               }}
             />
-          <h3
+            <h3
               style={{
                 marginLeft: 20,
                 fontWeight: 800,
@@ -1648,68 +1648,68 @@ class ChangeDetail extends Component {
               </span>
             </h3>
             <div>
-            <Form.Item
-            label="变更附件"
-            labelCol={{ span: 4 }}
-            wrapperCol={{ span: 18 }}
-          >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-             { attachment.length > 0  ? <ImgList domId={this.props.domId+1 ? this.props.domId+1 : 'hetongbiangenjilu112'} fileList={attachment} ItemWidth={'96px'}/> :'无附件'}
-            </div>
-            <Modal
-              maskClosable={false}
-              footer={null}
-              width={"50%"}
-              visible={this.state.uploadVisible}
-              onCancel={() => {
-                this.setState({ uploadVisible: false, rotateDeg1: 0 }, () => {
-                  // this.reset();
-                });
-              }}
-            >
-              <img
-                alt=""
-                style={{
-                  width: "100%",
-                  transform: `rotate(${this.state.rotateDeg1}deg)`,
-                }}
-                src={this.state.previewImage1 || ""}
-              />
-              <Button
-                onClick={this.rotate1}
-                style={{
-                  position: "relative",
-                  left: "50%",
-                  transform: "translateX(-50%)",
-                }}
-              >
-                旋转
-              </Button>
-              <Button
-                onClick={this.upImg1}
-                style={{
-                  position: "absolute",
-                  left: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
+              <Form.Item
+                label="变更附件"
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
               >
-                上一张
-              </Button>
-              <Button
-                onClick={this.downImg1}
-                style={{
-                  position: "absolute",
-                  right: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
-              >
-                下一张
-              </Button>
-            </Modal>
-            {/* <Rizhi changeId={this.props.id} /> */}
-          </Form.Item>
+                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                  {attachment.length > 0 ? <ImgList domId={this.props.domId + 1 ? this.props.domId + 1 : 'hetongbiangenjilu112'} fileList={attachment} ItemWidth={'96px'} /> : '无附件'}
+                </div>
+                <Modal
+                  maskClosable={false}
+                  footer={null}
+                  width={"50%"}
+                  visible={this.state.uploadVisible}
+                  onCancel={() => {
+                    this.setState({ uploadVisible: false, rotateDeg1: 0 }, () => {
+                      // this.reset();
+                    });
+                  }}
+                >
+                  <img
+                    alt=""
+                    style={{
+                      width: "100%",
+                      transform: `rotate(${this.state.rotateDeg1}deg)`,
+                    }}
+                    src={this.state.previewImage1 || ""}
+                  />
+                  <Button
+                    onClick={this.rotate1}
+                    style={{
+                      position: "relative",
+                      left: "50%",
+                      transform: "translateX(-50%)",
+                    }}
+                  >
+                    旋转
+                  </Button>
+                  <Button
+                    onClick={this.upImg1}
+                    style={{
+                      position: "absolute",
+                      left: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    上一张
+                  </Button>
+                  <Button
+                    onClick={this.downImg1}
+                    style={{
+                      position: "absolute",
+                      right: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    下一张
+                  </Button>
+                </Modal>
+                {/* <Rizhi changeId={this.props.id} /> */}
+              </Form.Item>
             </div>
 
           </div>
@@ -1720,8 +1720,8 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4 &&
-                !this.props.data.refundStatus
+                  this.props.data.status == 4 &&
+                  !this.props.data.refundStatus
                   ? "block"
                   : "none",
               marginTop: 10,
@@ -1792,8 +1792,8 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4 &&
-                this.props.data.refundStatus
+                  this.props.data.status == 4 &&
+                  this.props.data.refundStatus
                   ? "block"
                   : "none",
             }}
@@ -1917,29 +1917,33 @@ class ChangeDetail extends Component {
           ""
         )}
 
-        <Button
-          type="primary"
-          shape="round"
-          size="large"
-          style={{
-            position: "absolute",
-            left: "50%",
-            bottom: "0",
-            transform: "translateX(-50%)",
-            display:
-              (this.props.data.processState == 7 ||
-                this.props.data.processState == 8) &&
-              this.props.data.status == 2
-                ? "block"
-                : "none",
-          }}
+        <Popconfirm
+          title="确定完成退票?"
+          onConfirm={this.finish}
+          okText="确定"
+          cancelText="取消">
+          <Button
+            type="primary"
+            shape="round"
+            size="large"
+            style={{
+              position: "absolute",
+              left: "50%",
+              bottom: "0",
+              transform: "translateX(-50%)",
+              display:
+                (this.props.data.processState == 7 ||
+                  this.props.data.processState == 8) &&
+                  this.props.data.status == 2
+                  ? "block"
+                  : "none",
+            }}
           // onClick={this.finish}
-        >
-          <Popconfirm title="确定完成退票?" onConfirm={this.finish}  okText="确定" cancelText="取消">
-          完成退票
-  </Popconfirm>
-          
-        </Button>
+          >
+            完成退票
+          </Button>
+        </Popconfirm>
+
         <ReactToPrint
           trigger={() => (
             <Button
@@ -1953,7 +1957,7 @@ class ChangeDetail extends Component {
                 display:
                   (this.props.data.processState == 7 ||
                     this.props.data.processState == 8) &&
-                  this.props.data.status == 4
+                    this.props.data.status == 4
                     ? "block"
                     : "block",
               }}
@@ -1976,7 +1980,7 @@ class ChangeDetail extends Component {
           <Form
             layout="horizontal"
             onSubmit={this.nextSubmit}
-            // id="demand-form"
+          // id="demand-form"
           >
             <Spin spinning={this.state.loading}>
               <div className="clearfix">

+ 139 - 134
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { Form, Tooltip, Modal, Button, message, Table, Input,Popconfirm} from "antd";
+import { Form, Tooltip, Modal, Button, message, Table, Input, Popconfirm } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew, changeColor } from "@/tools.js";
@@ -70,9 +70,9 @@ class Itemlist extends Component {
     return (
       <div className="clearfix" style={{ height: "30px", overflow: "hidden" }}>
         {pageData.labelA === '当前进度' || pageData.labelA === '变更原因' ? <Form.Item
-            label={pageData.labelA}
-            {...pageData.formItemLayoutA}
-            className="half-item"
+          label={pageData.labelA}
+          {...pageData.formItemLayoutA}
+          className="half-item"
         >
           <Tooltip placement="topLeft" title={pageData.dataA}>
             <div style={{
@@ -91,10 +91,10 @@ class Itemlist extends Component {
           <div>
             {pageData.dataA}
             {pageData.labelA === '客户名称' ?
-                <EnterpriseNameChange
-                    type='journal'
-                    style={{ marginLeft: 10 }}
-                    enterpriseId={this.props.orderUid}/> : null
+              <EnterpriseNameChange
+                type='journal'
+                style={{ marginLeft: 10 }}
+                enterpriseId={this.props.orderUid} /> : null
             }
           </div>
         </Form.Item>}
@@ -294,7 +294,7 @@ class ChangeDetail extends Component {
   }
 
   OrderChange() {
-    if(!this.state.refundUrl) {
+    if (!this.state.refundUrl) {
       message.info("请上传凭证")
       return
     }
@@ -308,7 +308,7 @@ class ChangeDetail extends Component {
         orderNo: this.props.data.orderNo,
         type: this.props.data.type,
         id: this.props.data.id,
-        attachmentUrl:this.state.refundUrl,
+        attachmentUrl: this.state.refundUrl,
       },
       success: data => {
         if (data.data) {
@@ -470,7 +470,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4
+                  this.props.data.status == 4
                   ? "block"
                   : "none",
             }}
@@ -521,17 +521,17 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid}/>;
+            return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} />;
           })}
           <Form.Item
             label="变更凭证"
             labelCol={{ span: 4 }}
             wrapperCol={{ span: 18 }}
           >
-            {orgCodeUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-              <ImgList domId={this.props.domId ? this.props.domId+'1' : 'changeDetailYxy1'} fileList={orgCodeUrl} ItemWidth={'96px'}/>
-            </div> : <div/>}
-            <div style={{marginLeft: '-60px'}}>
+            {orgCodeUrl ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+              <ImgList domId={this.props.domId ? this.props.domId + '1' : 'changeDetailYxy1'} fileList={orgCodeUrl} ItemWidth={'96px'} />
+            </div> : <div />}
+            <div style={{ marginLeft: '-60px' }}>
               <Rizhi changeId={this.props.id} />
             </div>
           </Form.Item>
@@ -570,6 +570,8 @@ class ChangeDetail extends Component {
                 item.status = "驳回";
               } else if (item.status == 4) {
                 item.status = "完成";
+              } else if (item.status == 5) {
+                item.status = "撤销";
               }
               return (
                 <li
@@ -649,14 +651,14 @@ class ChangeDetail extends Component {
           <div
             style={{
               display: this.props.data.processState > 5 ? "block" : "none",
-              marginTop:'10px'
+              marginTop: '10px'
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
               当前财务状态(财务填写)
             </h3>
             {financeData.map((item, index) => {
-              return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid}/>;
+              return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} />;
             })}
           </div>
           {/* 回收退票3 */}
@@ -665,10 +667,10 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
+                  (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
-                  marginTop:'10px'
+              marginTop: '10px'
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -683,17 +685,17 @@ class ChangeDetail extends Component {
               dataSource={this.state.contactList}
             />
           </div>
-             {/* 完成审核,上传附件 */}
-             <div style={{
-              position: "relative",
-              display:
-                (this.props.data.processState == 7 ||
-                  this.props.data.processState == 8) &&
-                  this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 
-                    ? "block"
-                    : "none",
-              marginTop: 10,
-            }}
+          {/* 完成审核,上传附件 */}
+          <div style={{
+            position: "relative",
+            display:
+              (this.props.data.processState == 7 ||
+                this.props.data.processState == 8) &&
+                this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3
+                ? "block"
+                : "none",
+            marginTop: 10,
+          }}
           >
             <hr
               style={{
@@ -704,7 +706,7 @@ class ChangeDetail extends Component {
                 border: "none",
               }}
             />
-          <h3
+            <h3
               style={{
                 marginLeft: 20,
                 fontWeight: 800,
@@ -720,86 +722,86 @@ class ChangeDetail extends Component {
               </span>
             </h3>
             <div>
-            <Form.Item
-            label="变更附件"
-            labelCol={{ span: 4 }}
-            wrapperCol={{ span: 18 }}
-          >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-             { attachment.length > 0  ? <ImgList domId={this.props.domId+2 ? this.props.domId+2 : 'hetongbiangenjiluyxy1'} fileList={attachment} ItemWidth={'96px'}/> :'无附件'}
-            </div>
-            <Modal
-              maskClosable={false}
-              footer={null}
-              width={"50%"}
-              visible={this.state.uploadVisible}
-              onCancel={() => {
-                this.setState({ uploadVisible: false, rotateDeg: 0 }, () => {
-                  // this.reset();
-                });
-              }}
-            >
-              <img
-                alt=""
-                style={{
-                  width: "100%",
-                  transform: `rotate(${this.state.rotateDeg}deg)`,
-                }}
-                src={this.state.previewImage || ""}
-              />
-              <Button
-                onClick={this.rotate}
-                style={{
-                  position: "relative",
-                  left: "50%",
-                  transform: "translateX(-50%)",
-                }}
-              >
-                旋转
-              </Button>
-              <Button
-                onClick={this.upImg}
-                style={{
-                  position: "absolute",
-                  left: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
-              >
-                上一张
-              </Button>
-              <Button
-                onClick={this.downImg}
-                style={{
-                  position: "absolute",
-                  right: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
+              <Form.Item
+                label="变更附件"
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
               >
-                下一张
-              </Button>
-            </Modal>
-            {/* <Rizhi changeId={this.props.id} /> */}
-          </Form.Item>
-            </div>
+                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                  {attachment.length > 0 ? <ImgList domId={this.props.domId + 2 ? this.props.domId + 2 : 'hetongbiangenjiluyxy1'} fileList={attachment} ItemWidth={'96px'} /> : '无附件'}
+                </div>
+                <Modal
+                  maskClosable={false}
+                  footer={null}
+                  width={"50%"}
+                  visible={this.state.uploadVisible}
+                  onCancel={() => {
+                    this.setState({ uploadVisible: false, rotateDeg: 0 }, () => {
+                      // this.reset();
+                    });
+                  }}
+                >
+                  <img
+                    alt=""
+                    style={{
+                      width: "100%",
+                      transform: `rotate(${this.state.rotateDeg}deg)`,
+                    }}
+                    src={this.state.previewImage || ""}
+                  />
+                  <Button
+                    onClick={this.rotate}
+                    style={{
+                      position: "relative",
+                      left: "50%",
+                      transform: "translateX(-50%)",
+                    }}
+                  >
+                    旋转
+                  </Button>
+                  <Button
+                    onClick={this.upImg}
+                    style={{
+                      position: "absolute",
+                      left: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    上一张
+                  </Button>
+                  <Button
+                    onClick={this.downImg}
+                    style={{
+                      position: "absolute",
+                      right: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    下一张
+                  </Button>
+                </Modal>
+                {/* <Rizhi changeId={this.props.id} /> */}
+              </Form.Item>
             </div>
-          
+          </div>
+
 
-            {/* <div>
+          {/* <div>
               营销员变更
             </div> */}
-            {/* 完成审核,上传附件 */}
+          {/* 完成审核,上传附件 */}
           <div style={{
-              position: "relative",
-              display:
-                (this.props.data.processState == 7 ||
-                  this.props.data.processState == 8) &&
-                  this.props.data.status == 6
-                  ? "block"
-                  : "none",
-              marginTop: 10,
-            }}
+            position: "relative",
+            display:
+              (this.props.data.processState == 7 ||
+                this.props.data.processState == 8) &&
+                this.props.data.status == 6
+                ? "block"
+                : "none",
+            marginTop: 10,
+          }}
           >
             <hr
               style={{
@@ -810,7 +812,7 @@ class ChangeDetail extends Component {
                 border: "none",
               }}
             />
-          <h3
+            <h3
               style={{
                 marginLeft: 20,
                 fontWeight: 800,
@@ -826,10 +828,10 @@ class ChangeDetail extends Component {
               </span>
             </h3>
             <div>
-            <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
+              <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
                 变更附件:
               </h3>
-              <div style={{ marginLeft: 20,display:'inline-block' }}>
+              <div style={{ marginLeft: 20, display: 'inline-block' }}>
                 <PicturesWall
                   fileList={this.getVoucherUrl}
                   pictureUrl={this.state.voucherUrl}
@@ -839,27 +841,30 @@ class ChangeDetail extends Component {
               </div>
             </div>
           </div>
-            <div style={{display:' flex',justifyContent: 'center'}}>
-            <Button
-          type="primary"
-          shape="round"
-          size="large"
-          style={{
-            display:
-              (this.props.data.processState == 7 ||
-                this.props.data.processState == 8) &&
-              this.props.data.status == 6
-                ? "block"
-                : "none",
-          }}
-          // onClick={this.OrderChange}
-        >
-           <Popconfirm title="确定提交附件,完成订单?" onConfirm={this.OrderChange}  okText="确定" cancelText="取消">
-           提交附件,完成订单
-  </Popconfirm>
-          
-        </Button>
-            </div>
+          <div style={{ display: ' flex', justifyContent: 'center' }}>
+            <Popconfirm
+              title="确定提交附件,完成订单?"
+              onConfirm={this.OrderChange}
+              okText="确定"
+              cancelText="取消">
+              <Button
+                type="primary"
+                shape="round"
+                size="large"
+                style={{
+                  display:
+                    (this.props.data.processState == 7 ||
+                      this.props.data.processState == 8) &&
+                      this.props.data.status == 6
+                      ? "block"
+                      : "none",
+                }}
+              // onClick={this.OrderChange}
+              >
+                提交附件,完成订单
+              </Button>
+            </Popconfirm>
+          </div>
           {/* <ul>
             <span>备注</span>
             {this.state.dataSource.map((item, index) => (
@@ -899,8 +904,8 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4 &&
-                this.props.data.refundStatus
+                  this.props.data.status == 4 &&
+                  this.props.data.refundStatus
                   ? "block"
                   : "none",
             }}
@@ -909,7 +914,7 @@ class ChangeDetail extends Component {
           </div>
         </div>
         {this.props.processState === this.props.data.processState &&
-        this.props.data.status != 5 ? (
+          this.props.data.status != 5 ? (
           <div
             className="clearfix"
             style={{ display: "flex", justifyContent: "space-around" }}
@@ -942,7 +947,7 @@ class ChangeDetail extends Component {
                 display:
                   (this.props.data.processState == 7 ||
                     this.props.data.processState == 8) &&
-                  this.props.data.status == 4
+                    this.props.data.status == 4
                     ? "block"
                     : "block",
               }}

+ 9 - 1
js/component/manageCenter/order/orderNew/changeComponent/rizhi.js

@@ -20,7 +20,15 @@ const status = [
   {
     value: "3",
     key: "驳回"
-  }
+  },
+  {
+    value: "4",
+    key: "完成"
+  },
+  {
+    value: "5",
+    key: "撤销"
+  },
 ];
 
 const getStatus = function(e) {