权利人信息修改保存2

android/app/app.iml

@@ -129,7 +129,7 @@
     <orderEntry type="library" exported="" name="play-services-iid-10.0.1" level="project" />
     <orderEntry type="library" exported="" name="soloader-0.1.0" level="project" />
     <orderEntry type="library" exported="" name="javax.inject-1" level="project" />
-    <orderEntry type="library" exported="" name="react-native-0.49.3" level="project" />
+    <orderEntry type="library" exported="" name="react-native-0.49.5" level="project" />
     <orderEntry type="library" exported="" name="play-services-basement-10.0.1" level="project" />
     <orderEntry type="library" exported="" name="AraBMApiDev" level="project" />
     <orderEntry type="library" exported="" name="okhttp-3.6.0" level="project" />

package.json

@@ -8,7 +8,7 @@
     "babel-preset-flow": "^6.23.0",
     "babel-preset-react-native-stage-0": "^1.0.1",
     "css-loader": "^0.28.7",
-    "eslint": "^4.8.0",
+    "eslint": "^4.10.0",
     "eslint-config-airbnb": "^16.0.0",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
@@ -38,12 +38,12 @@
     "fastjson_ref_resolver": "0.0.3",
     "lodash": "^4.17.4",
     "moment": "^2.19.1",
-    "rc-form": "^1.4.8",
+    "rc-form": "^1.5.0",
     "react": "^16.0.0-beta.5",
-    "react-native": "^0.49.3",
+    "react-native": "^0.49.5",
     "react-native-device-info": "^0.12.1",
-    "react-navigation": "^1.0.0-beta.14",
+    "react-navigation": "^1.0.0-beta.16",
     "react-redux": "^5.0.6",
-    "redux-persist": "^4.10.1"
+    "redux-persist": "^4.10.2"
   }
 }

src/models/houseinfo/ObligeeInfo.js

 /**
  * Created by zhouhuan on 2017/10/30.
  */
+import { Toast } from 'antd-mobile';
 import { NavigationActions } from 'react-navigation';
 import { getData } from '../../utils/DataTemplate';
 import { datasourceApi } from '../../services/datasource';
@@ -12,6 +13,7 @@ export default {
     detailData: {},
     isDetail: false,
     editable: false,
+    disabled: true,
   },
   effects: {
     *getObligeeInfo({ payload }, { put, call, select }) {
@@ -39,10 +41,10 @@ export default {
       console.log(result);
       yield put({ type: 'getDSRDetail', payload: { ...result[0] } });
       yield put({ type: 'setDetail', payload: true });
+      yield put({ type: 'setEdit', payload: false });
     },
     *updateDSRDetail({ payload }, { call, put }) {
       console.log('update');
-      console.log(payload);
       const coordinate = {
         containerType: 'module',
         containerName: 'query-DSRInfo',
@@ -50,29 +52,14 @@ export default {
       };
       const api = datasourceApi(coordinate);
       yield call(api.update, payload.id, payload.singularData);
+      Toast.success('修改成功!', 1);
       yield put(NavigationActions.navigate({
         routeName: 'ObligeeInfo',
       }));
-      yield put({ type: 'setEdit', payload: false });
-    },
-    *onSBack({ payload }, { put, call }) {
-      console.log(payload);
-      const coordinate = {
-        containerType: 'module',
-        containerName: 'query-DSRInfo',
-        datasourceName: 'QueryDSRInfoDetails',
-      };
-      const result = yield call(getData, coordinate, { params: { pID: payload } });
-      console.log(result);
-      yield put({ type: 'getDSRDetail', payload: { ...result[0] } });
-      yield put(NavigationActions.navigate({
-        routeName: 'ObligeeInfo',
-      }));
-      yield put({ type: 'setDetail', payload: true });
-      yield put({ type: 'setEdit', payload: false });
+      yield put({ type: 'setDisabled', payload: true });
+      yield put({ type: 'setDetail', payload: false });
     },
     *onEBack({ payload }, { put, call }) {
-      console.log(payload);
       const coordinate = {
         containerType: 'module',
         containerName: 'query-DSRInfo',
@@ -84,8 +71,13 @@ export default {
       yield put(NavigationActions.navigate({
         routeName: 'ObligeeInfo',
       }));
+      yield put({ type: 'setDisabled', payload: true });
       yield put({ type: 'setDetail', payload: false });
     },
+    *setStatus({ payload }, { put }) {
+      yield put({ type: 'setDisabled', payload: false });
+      yield put({ type: 'setEdit', payload });
+    },
   },
   reducers: {
     getDSRDetail(state, { payload }) {
@@ -112,6 +104,12 @@ export default {
         editable: payload,
       };
     },
+    setDisabled(state, { payload }) {
+      return {
+        ...state,
+        disabled: payload,
+      };
+    },
   },
 };
 

src/routes/main/houseinfo/ObligeeInfo.js

@@ -19,13 +19,10 @@ class ObligeeInfo extends React.Component {
     this.props.dispatch(createAction('obligeeInfo/getObligeeDetail')(ID));
   };
   onEdit =() => {
-    console.log('detail');
-    this.props.dispatch(createAction('obligeeInfo/setEdit')(true));
+    this.props.dispatch(createAction('obligeeInfo/setStatus')(true));
   };
   onSubmit = () => {
-    console.log('submit');
     this.props.form.validateFields({ force: true }, (error, value) => {
-      console.log(value);
       if (!error) {
         this.props.dispatch(createAction('obligeeInfo/updateDSRDetail')({ id: this.props.obligeeInfo.sourceData.id, singularData: value }));
       } else {
@@ -34,26 +31,13 @@ class ObligeeInfo extends React.Component {
     });
   }
   onEditBack = () => {
-    console.log('onEditBack');
     const { houseID } = this.props.ListHouse;
-    console.log(houseID);
     this.props.dispatch(createAction('obligeeInfo/onEBack')(houseID));
   }
-  onSaveBack = () => {
-    console.log('onSaveBack');
-    const { houseID } = this.props.ListHouse;
-    this.props.dispatch(createAction('obligeeInfo/onSBack')(houseID));
-  }
   render() {
-    const { sourceData, isDetail, detailData, editable } = this.props.obligeeInfo;
+    const { sourceData, isDetail, detailData, editable, disabled } = this.props.obligeeInfo;
     console.log(this.props.obligeeInfo);
     const { getFieldProps } = this.props.form;
-    let btnView
-    if (editable === false) {
-      btnView = (<View style={{ flexDirection: 'row' }}><Button type="primary" onClick={this.onEdit}>编辑</Button><Button onClick={this.onEditBack}>返回</Button></View>);
-    } else {
-      btnView = (<View style={{ flexDirection: 'row' }}><Button type="primary" onClick={this.onSubmit}>保存</Button><Button onClick={this.onSaveBack}>返回</Button></View>);
-    }
     if (isDetail === false) {
       return (
         <ScrollView >
@@ -170,7 +154,11 @@ class ObligeeInfo extends React.Component {
               是否原村民
             </InputItem>
             <List.Item>
-              {btnView}
+              <View style={{ flexDirection: 'row' }}>
+                <Button style={{ marginRight: 8 }} type="primary" onClick={this.onEdit}>编辑</Button>
+                <Button style={{ marginRight: 8 }} onClick={this.onSubmit} disabled={disabled}>保存</Button>
+                <Button onClick={this.onEditBack}>返回</Button>
+              </View>
             </List.Item>
           </List>
         </ScrollView>