权利人信息详情

android/local.properties

@@ -8,4 +8,5 @@
 # For customization when using a Version Control System, please read the
 # header note.
 #Fri Oct 27 18:29:04 CST 2017
-sdk.dir=D\:\\Android\\sdk
+sdk.dir=D\:\\AppData\\Local\\Android\\sdk1
+# sdk.dir=D\:\\Android\\sdk

src/models/houseinfo/ObligeeInfo.js

@@ -6,36 +6,56 @@ import { getData } from '../../utils/DataTemplate';
 export default {
   namespace: 'obligeeInfo',
   state: {
-    sourceData: [],
+    sourceData: {},
+    detailData: {},
+    isDetail: false,
   },
   effects: {
-    *getObligeeInfo({ payload }, { take, put, call, select }) {
-      console.log('come on ~~');
+    *getObligeeInfo({ payload }, { put, call, select }) {
       if (payload === 'clear') {
         yield put({ type: 'clearList', payload: {} });
       }
       const { sourceData } = yield select(state => state.obligeeInfo);
-      console.log(sourceData);
       const size = sourceData.length;
       const coordinate = {
         containerType: 'module',
         containerName: 'query-DSRInfo',
         datasourceName: 'QueryDSRInfoTable',
       };
-      const result = yield call(getData, coordinate, { pst: size, psz: 10 });
-      console.log(result);
-      for (const row of result) {
-        yield put({ type: 'addDSR', payload: row });
-        yield take('addDSR/@@end');
-      }
+      const result = yield call(getData, coordinate, { pst: size, psz: 10, params: { pID: payload } });
+      const singularData = result[0];
+      yield put({ type: 'setDSRList', payload: { ...singularData } });
     },
-    *addDSR({ payload }, { put }) {
-      yield put({ type: 'setDSRList', payload: { arrayData: [payload] } });
+    *getObligeeDetail({ payload }, { put, call, select }) {
+      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({ type: 'setDetail', payload: true });
     },
   },
   reducers: {
-    setDSRList(state, { payload: { arrayData } }) {
-      return { ...state, sourceData: [...state.sourceData, ...arrayData] };
+    getDSRDetail(state, { payload }) {
+      return {
+        ...state,
+        detailData: payload,
+      };
+    },
+    setDSRList(state, { payload }) {
+      return {
+        ...state,
+        sourceData: payload,
+      };
+    },
+    setDetail(state, { payload }) {
+      return {
+        ...state,
+        isDetail: payload,
+      };
     },
   },
 };

src/models/houseinfo/listhouse.js

+import { NavigationActions } from 'react-navigation';
 import { getData } from '../../utils/DataTemplate';
 
 export default {
   namespace: 'ListHouse',
   state: {
     sourceData: [],
+    houseID: '',
   },
   reducers: {
+    setHouseID(state, { payload }) {
+      return {
+        ...state,
+        houseID: payload,
+      };
+    },
     setList(state, { payload: { arrayData } }) {
       return { ...state, sourceData: [...state.sourceData, ...arrayData] };
     },
@@ -15,12 +23,17 @@ export default {
     },
   },
   effects: {
+    *jumpPage({ payload: id }, { put }) {
+      yield put({ type: 'setHouseID', payload: id });
+      yield put(NavigationActions.navigate({
+        routeName: 'HouseDetail',
+      }));
+    },
     *getHouseList({ payload }, { take, put, call, select }) {
       if (payload === 'clear') {
         yield put({ type: 'clearList', payload: {} });
       }
       const { sourceData } = yield select(state => state.ListHouse);
-      console.info(sourceData);
       const size = sourceData.length;
       const coordinate = {
         containerType: 'module',

src/routes/main/houseinfo/HouseDetail.js

@@ -5,18 +5,18 @@ import { createForm } from 'rc-form';
 import { connect } from 'react-redux';
 import { createAction } from '../../../utils/index';
 
-@connect(({ HouseDetail }) => ({ HouseDetail }))
+@connect(({ HouseDetail, ListHouse }) => ({ HouseDetail, ListHouse }))
 class HouseDetail extends Component {
   componentDidMount() {
-    const { dispatch, navigation } = this.props;
-    dispatch(createAction('HouseDetail/getHouseDetail')(navigation.state.params.id));
+    const { dispatch, ListHouse } = this.props;
+    dispatch(createAction('HouseDetail/getHouseDetail')(ListHouse.houseID));
   }
   onSubmit = () => {
     this.props.form.validateFields({ force: true }, (error, value) => {
       if (!error) {
         // 校验成功执行这里的代码
         console.info({ id: this.props.navigation.state.params.id, singularData: value });
-        this.props.dispatch(createAction('HouseDetail/updateHouseDetail')({ id: this.props.navigation.state.params.id, singularData: value }));
+        this.props.dispatch(createAction('HouseDetail/updateHouseDetail')({ id: this.props.ListHouse.houseID, singularData: value }));
         console.log(this.props.form.getFieldsValue());
       } else {
         // 执行出现错误，弹出错处理

src/routes/main/houseinfo/ObligeeInfo.js

@@ -2,98 +2,143 @@
  * Created by zhouhuan on 2017/10/30.
  */
 import React from 'react';
+import { createForm } from 'rc-form';
 import { View, StyleSheet, FlatList, Text, ScrollView } from 'react-native';
-import { Card, WingBlank, WhiteSpace } from 'antd-mobile';
+import { Card, WingBlank, WhiteSpace, Button, List, InputItem } from 'antd-mobile';
 import { connect } from 'react-redux';
 import { createAction } from '../../../utils';
 
-@connect(({ obligeeInfo }) => ({ obligeeInfo }))
+@connect(({ obligeeInfo, ListHouse }) => ({ obligeeInfo, ListHouse }))
 class ObligeeInfo extends React.Component {
   componentDidMount() {
-    this.props.dispatch(createAction('obligeeInfo/getObligeeInfo')());
+    const { houseID } = this.props.ListHouse;
+    this.props.dispatch(createAction('obligeeInfo/getObligeeInfo')(houseID));
   }
+  onPress = () => {
+    const ID = this.props.obligeeInfo.sourceData.id;
+    this.props.dispatch(createAction('obligeeInfo/getObligeeDetail')(ID));
+  };
   render() {
-    const { sourceData } = this.props.obligeeInfo;
-    console.log(sourceData);
+    const { sourceData, isDetail, detailData } = this.props.obligeeInfo;
+    console.log(detailData);
+    const { getFieldProps } = this.props.form;
+    if (isDetail === false) {
       return (
         <ScrollView >
           <WingBlank size="lg">
             <WhiteSpace size="lg" />
             <Card>
               <Card.Header
-              title="张三"
-              extra={<Text style={Styles.cardText}>&gt;&gt;详情</Text>}
+                title={sourceData.dangShiRenXingMing}
+                extra={<Text style={Styles.cardText} onPress={this.onPress}>&gt;&gt;详情</Text>}
               />
               <Card.Body>
-              <Text style={Styles.cardBodyText}>性别:<Text style={Styles.cardBodyText2}>男</Text></Text>
-              <Text style={Styles.cardBodyText}>证件号码:<Text style={Styles.cardBodyText2}>350502199210236034</Text></Text>
-              <Text style={Styles.cardBodyText}>与户主关系:<Text style={Styles.cardBodyText2}>户主</Text></Text>
-            </Card.Body>
-          </Card>
-          <WhiteSpace size="lg" />
-        </WingBlank>
-        <WingBlank size="lg">
-          <WhiteSpace size="lg" />
-          <Card>
-            <Card.Header
-              title="张三"
-              extra={<Text style={Styles.cardText}>&gt;&gt;详情</Text>}
-            />
-            <Card.Body>
-              <Text style={Styles.cardBodyText}>性别:男</Text>
-              <Text style={Styles.cardBodyText}>证件号码:350502199210236034</Text>
-              <Text style={Styles.cardBodyText}>与户主关系:户主</Text>
-            </Card.Body>
-          </Card>
-          <WhiteSpace size="lg" />
-        </WingBlank>
-        <WingBlank size="lg">
-          <WhiteSpace size="lg" />
-          <Card>
-            <Card.Header
-              title="张三"
-              extra={<Text style={Styles.cardText}>&gt;&gt;详情</Text>}
-            />
-            <Card.Body>
-              <Text style={Styles.cardBodyText}>性别:男</Text>
-              <Text style={Styles.cardBodyText}>证件号码:350502199210236034</Text>
-              <Text style={Styles.cardBodyText}>与户主关系:户主</Text>
-            </Card.Body>
-          </Card>
-          <WhiteSpace size="lg" />
-        </WingBlank>
-        <WingBlank size="lg">
-          <WhiteSpace size="lg" />
-          <Card>
-            <Card.Header
-              title="张三"
-              extra={<Text style={Styles.cardText}>&gt;&gt;详情</Text>}
-            />
-            <Card.Body>
-              <Text style={Styles.cardBodyText}>性别:男</Text>
-              <Text style={Styles.cardBodyText}>证件号码:350502199210236034</Text>
-              <Text style={Styles.cardBodyText}>与户主关系:户主</Text>
-            </Card.Body>
-          </Card>
-          <WhiteSpace size="lg" />
-        </WingBlank>
-        <WingBlank size="lg">
-          <WhiteSpace size="lg" />
-          <Card>
-            <Card.Header
-              title="张三"
-              extra={<Text style={Styles.cardText}>&gt;&gt;详情</Text>}
-            />
-            <Card.Body>
-              <Text style={Styles.cardBodyText}>性别:男</Text>
-              <Text style={Styles.cardBodyText}>证件号码:350502199210236034</Text>
-              <Text style={Styles.cardBodyText}>与户主关系:户主</Text>
+                <Text style={Styles.cardBodyText}>当事人编号:<Text style={Styles.cardBodyText2}>{sourceData.dangShiRenBianHao}</Text></Text>
+                <Text style={Styles.cardBodyText}>证件号码:<Text style={Styles.cardBodyText2}>{sourceData.dangShiRenIdentityCard}</Text></Text>
               </Card.Body>
             </Card>
             <WhiteSpace size="lg" />
           </WingBlank>
         </ScrollView >
       );
+    } else {
+      return (
+        <ScrollView>
+          <List>
+            <InputItem
+              {...getFieldProps('dangShiRenXingMing', {
+                initialValue: detailData.dangShiRenXingMing,
+                rules: [
+                  { required: true, message: '不允许为空' },
+                  { validator: this.validateFWBianMa },
+                ],
+              })}
+              clear
+              placeholder="请输入"
+              ref={(el) => { this.customFocusInst = el; }}
+            >
+              姓名
+            </InputItem>
+            <InputItem
+              {...getFieldProps('dangShiRenXingBie', {
+                initialValue: detailData.dangShiRenXingBie,
+              })}
+              clear
+              placeholder="请输入"
+              ref={(el) => { this.customFocusInst = el; }}
+            >
+              性别
+            </InputItem>
+            <InputItem
+              {...getFieldProps('dangShiRenTelephone', {
+                initialValue: detailData.dangShiRenTelephone,
+              })}
+              clear
+              placeholder="请输入"
+              ref={(el) => { this.customFocusInst = el; }}
+            >
+              电话号码
+            </InputItem>
+            <InputItem
+              {...getFieldProps('dangShiRenIdentityCard', {
+                initialValue: detailData.dangShiRenIdentityCard,
+              })}
+              clear
+              placeholder="请输入"
+              ref={(el) => { this.customFocusInst = el; }}
+            >
+              身份证号码
+            </InputItem>
+            <InputItem
+              {...getFieldProps('dangShiRenIdentityCardbak', {
+                initialValue: detailData.dangShiRenIdentityCardbak,
+              })}
+              clear
+              placeholder="请输入"
+              ref={(el) => { this.customFocusInst = el; }}
+            >
+              身份证类型
+            </InputItem>
+            <InputItem
+              {...getFieldProps('dangShiRenAddress', {
+                initialValue: detailData.dangShiRenAddress,
+              })}
+              clear
+              placeholder="请输入"
+              ref={(el) => { this.customFocusInst = el; }}
+            >
+              地址
+            </InputItem>
+            <InputItem
+              {...getFieldProps('DSRMaritalStatus', {
+                initialValue: detailData.DSRMaritalStatus,
+              })}
+              clear
+              placeholder="请输入"
+              ref={(el) => { this.customFocusInst = el; }}
+            >
+              婚姻状态
+            </InputItem>
+            <InputItem
+              {...getFieldProps('DSRCensusType', {
+                initialValue: detailData.DSRCensusType,
+              })}
+              clear
+              placeholder="请输入"
+              ref={(el) => { this.customFocusInst = el; }}
+            >
+              是否原村民
+            </InputItem>
+            <List.Item>
+              <View style={{ flexDirection: 'row' }}>
+                <Button type="primary" onClick={this.onEdit}>编辑</Button>
+                <Button onClick={this.onReset}>返回</Button>
+              </View>
+            </List.Item>
+          </List>
+        </ScrollView>
+      );
+    }
   }
 }
 const Styles = StyleSheet.create({
@@ -106,4 +151,4 @@ const Styles = StyleSheet.create({
     marginLeft: 13,
   },
 });
-export default ObligeeInfo;
+export default createForm()(ObligeeInfo);

src/routes/main/houseinfo/listhouse.js

@@ -20,7 +20,8 @@ class ListHouContent extends Component {
     }
   };
   onPressItem = (id) => {
-    this.props.navigation.navigate('HouseDetail', { id });
+    // this.props.navigation.navigate('HouseDetail', { id });
+    this.props.dispatch(createAction('ListHouse/jumpPage')(id));
   };
   getItemLayout = (data, index) => (
     { length: 120, offset: (120 + 1) * index, index }