hujie123456 преди 5 години
родител
ревизия
6808ad145e

+ 16 - 16
js/component/manageCenter/order/orderNew/changeComponent/agreeButton.js

@@ -19,20 +19,20 @@ 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)
-    // console.log("222222",this.props);
+  // 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)
+  //   // console.log("222222",this.props);
     
-  }
+  // }
     
   // 理由请求
   sendRequest(data, backData) {
@@ -76,9 +76,9 @@ class ReasonInput extends Component {
       }.bind(this)
     }).done(
       function() {
-        if (this.props.loadData) {
-          this.props.loadData("2");
-        }
+        // if (this.props.loadData) {
+        //   this.props.loadData("2");
+        // }
       }.bind(this)
     );
   }

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

@@ -663,10 +663,10 @@ class ChangeDetail extends Component {
                       backData={this.props.data}
                       processState={this.props.processState}
                       visible={this.changeButtonStatus}
-                      ajaxData={this.state}
                       loadData={this.props.loadData}
-                      rejectState={this.state.rejectState}
                       reason={this.state.reason}
+                      ajaxData={this.state}
+                      rejectState={this.state.rejectState}
                       onCancel={this.props.onCancel}
                     />
                   );

+ 10 - 3
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -321,6 +321,8 @@ const contractChange = Form.create()(
           this.jiedian(record.orderNo);
         }
       );
+      // console.log("row",this.state.activeKey);
+      
     },
     //点击打卡项目详情
     tableRowClickX(record) {
@@ -791,6 +793,8 @@ const contractChange = Form.create()(
       this.setState({
         activeKey: key
       });
+      // console.log("change",this.state.activeKey);
+      
       if (key === "1") {
         this.xiangmu(this.state.orderNo);
         this.jiedian(this.state.orderNo);
@@ -959,7 +963,8 @@ const contractChange = Form.create()(
     visitCancel() {
       this.setState(
         {
-          visible: false
+          visible: false,
+          activeKey: "1"
         },
         () => {
           this.setState({
@@ -967,7 +972,9 @@ const contractChange = Form.create()(
           });
         }
       );
-      this.loadData(this.state.pageNo);
+      this.loadData(this.state.page);
+      // console.log("table",this.state.activeKey);
+      
     },
     visitOk() {
       this.setState({
@@ -1033,7 +1040,7 @@ const contractChange = Form.create()(
                     data={this.state.contractData}
                     pictureUrl={this.state.voucherUrl}
                     processState={this.props.processState}
-                    loadData={this.callback}
+                    // loadData={this.callback}
                     reset={this.state.visible}
                     dataSource={this.state.dataProps}
                     proceedsData={this.state.proceedsData}

+ 0 - 1
js/component/manageCenter/order/orderNew/examine.jsx

@@ -506,7 +506,6 @@ const IntentionCustomer = Form.create()(
     },
 
     rizhi() {
-      console.log(this.state.orderNo);
       this.setState({
         loading: true
       });