Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 7e64ce60 by Denglingling
Options

1、增加【弹窗】的【错误提示】弹窗；2、完善【IOS】下筛选的布局

parent c96ed5be
Inline Side-by-side
Showing with 183 additions and 123 deletions
app/containers/common/ErrorTipModel.js 0 → 100644
import React, { Component } from 'react';
import {
View,
Text,
StyleSheet,
Modal,
TouchableOpacity
} from 'react-native';
import {
safe_view,
font_family_regular
} from '../../base/BaseStyle';
class ErrorTipModel extends Component {
constructor(props) {
super(props);
this.state = {
isVisible: false
}
}
componentWillReceiveProps(nextProps) {
let that = this
if(this.state.isVisible != nextProps.show) {
this.setState({
isVisible: nextProps.show
}, () => {
setTimeout(() => {
that.closeModal()
}, 1000)
})
}
}
closeModal() {
this.setState({
isVisible: false
})
this.props.closeModal(false)
}
renderDialog() {
let { title } = this.props
return(
<View style={styles.dia_inner}>
<View style={styles.dia_box}>
<Text style={styles.main_txt}>
{title}
</Text>
</View>
</View>
)
}
render() {
return (
<View style={styles.dia_container}>
<Modal
transparent={true}
visible={this.state.isVisible}
animationType={'fade'}
>
<View style={safe_view}>
<TouchableOpacity style={styles.container} activeOpacity={1}>
{this.renderDialog()}
</TouchableOpacity>
</View>
</Modal>
</View>
);
}
}
const styles = StyleSheet.create({
dia_container: {
flex: 1
},
container: {
flex: 1
},
dia_inner: {
position: 'relative',
flex: 1
},
dia_box: {
position: 'absolute',
left: 20,
top: '52%',
right: 20,
flex: 1,
alignItems: 'center'
},
main_txt: {
fontSize: 14,
fontFamily: font_family_regular,
color: '#fafafa',
backgroundColor: '#3d3e3d',
paddingHorizontal: 10,
textAlign: 'center'
},
})
export default ErrorTipModel;
app/containers/common/ShowModel.js
......@@ -5,9 +5,7 @@ import {
StyleSheet,
Modal,
TouchableOpacity,
Image,
SafeAreaView,
ScrollView
Image
} from 'react-native';
import {
Width,
......@@ -16,7 +14,6 @@ import {
pxSize,
safe_view,
icon_style,
font_family_medium,
font_family_semibold
} from '../../base/BaseStyle';
......@@ -97,7 +94,6 @@ const styles = StyleSheet.create({
},
opt_area: {
flex: 1,
// flexDirection: 'column',
justifyContent: 'center',
position: 'relative'
},
......@@ -109,8 +105,6 @@ const styles = StyleSheet.create({
flex: 1,
flexDirection: "column",
backgroundColor: '#ffffff',
// borderTopLeftRadius: 20,
// borderTopRightRadius: 20,
minHeight: pxHeight(380),
maxHeight: pxHeight(480),
borderRadius: 20,
......@@ -134,14 +128,8 @@ const styles = StyleSheet.create({
width: pxSize(28),
height: pxSize(28)
},
// clo_icon: {
// width: '100%',
// height: '100%'
// },
model_cont: {
paddingTop: 20,
// height: pxHeight(220),
// flex: 1
paddingTop: 20
},
})
......
app/containers/historicalOrder/HistoricalOrderPage.js
......@@ -16,12 +16,10 @@ import {
first_text_color,
font_family_regular,
pxSize,
title_text_color,
promary_text_color,
font_family_medium,
third_text_color,
second_text_size,
pxHeight,
Height,
} from '../../base/BaseStyle';
import LodingModel from '../common/LodingModel';
......@@ -556,7 +554,7 @@ const styles = StyleSheet.create({
cont_main: {
backgroundColor: foundation_color,
maxHeight: Height() - 258,
maxHeight: Height() - 300,
minHeight: Height() - 358,
paddingBottom: 10
},
......
app/containers/historicalOrder/module/FilterModel.js
......@@ -47,6 +47,7 @@ import {
} from '../../../action/HistorAction';
import { show, dedupQuoteArray, cloneObject } from '../../../utils/Utils';
import moment from 'moment';
import ErrorTipModel from '../../common/ErrorTipModel';
class FilterModel extends Component {
......@@ -153,14 +154,12 @@ class FilterModel extends Component {
}, {
"id": "8",
title: '手术时间',
// subTitle: '开始时间',
name: '开始时间',
value: '',
dateValue: new Date()
}, {
"id": "9",
title: '手术时间',
// subTitle: '结束时间',
name: '结束时间',
value: '',
dateValue: new Date()
......@@ -204,14 +203,12 @@ class FilterModel extends Component {
},{
"id": "6",
title: '消耗时间',
// subTitle: '开始时间',
name: '开始时间',
value: '',
dateValue: new Date()
}, {
"id": "7",
title: '消耗时间',
// subTitle: '结束时间',
name: '结束时间',
value: '',
dateValue: new Date()
......@@ -262,14 +259,12 @@ class FilterModel extends Component {
}, {
"id": "5",
title: '手术时间',
// subTitle: '开始时间',
name: '开始时间',
value: '',
dateValue: new Date()
}, {
"id": "6",
title: '手术时间',
// subTitle: '结束时间',
name: '结束时间',
value: '',
dateValue: new Date()
......@@ -306,7 +301,8 @@ class FilterModel extends Component {
"Y"
],
searchTransStatus: [], // 【转单】对应的状态值
searchColorIsAct: false, // 筛选颜色变化
errorPopType: false, // 错误提示弹窗
errorTit: '', // 错误提示文字
}
}
......@@ -363,7 +359,6 @@ class FilterModel extends Component {
}
componentWillReceiveProps(nextProps) {
console.log('nextProps.show----', nextProps.show)
let {isVisible, topActiveIndex} = this.state
let {loginState, navigation, callSupClick} = this.props;
if(loginState != nextProps.loginState) {
......@@ -391,7 +386,7 @@ class FilterModel extends Component {
})
}
if(nextProps.callSupClick) {
console.log('父组件传递============', callSupClick, nextProps.callSupClick)
// 父组件调用查询
this.handleFilterSubmitCheck()
}
}
......@@ -671,7 +666,8 @@ class FilterModel extends Component {
// 修改当前选择器数据
let { data: { organizations } } = orgResult
if(organizations.length === 0) {
show(`当前组织为空`)
// show(`当前组织为空`)
that.showErrorModel(`当前组织为空`)
return
}
let tempOption = []
......@@ -682,12 +678,14 @@ class FilterModel extends Component {
})
} else if(orgResult.error_code == 41006) {
that.props.callSupLoading(false)
show('登录过期，请重新登录');
// show('登录过期，请重新登录');
that.showErrorModel(`登录过期，请重新登录`)
props.exitLoginStatus();
} else {
that.props.callSupLoading(false)
let error_msg = orgResult.error_msg || orgResult.message
show(error_msg);
// show(error_msg);
that.showErrorModel(error_msg)
}
})
}
......@@ -717,7 +715,8 @@ class FilterModel extends Component {
// 修改当前选择器数据
let { data: { customers } } = orgResult
if(customers.length === 0) {
show(`当前客户名称为空`)
// show(`当前客户名称为空`)
that.showErrorModel(`当前客户名称为空`)
return
}
// 去重医院数据
......@@ -740,12 +739,14 @@ class FilterModel extends Component {
})
} else if(orgResult.error_code == 41006) {
that.props.callSupLoading(false)
show('登录过期，请重新登录');
// show('登录过期，请重新登录');
that.showErrorModel(`登录过期，请重新登录`)
props.exitLoginStatus();
} else {
that.props.callSupLoading(false)
let error_msg = orgResult.error_msg || orgResult.message
show(error_msg);
// show(error_msg);
that.showErrorModel(error_msg)
}
})
}
......@@ -957,7 +958,8 @@ class FilterModel extends Component {
// 修改当前选择器数据
let { data: { sys_values } } = orgResult
if(sys_values.length === 0) {
show(`当前订单类型为空`)
// show(`当前订单类型为空`)
that.showErrorModel(`当前订单类型为空`)
return
}
let tempOption = []
......@@ -968,12 +970,14 @@ class FilterModel extends Component {
})
} else if(orgResult.error_code == 41006) {
that.props.callSupLoading(false)
show('登录过期，请重新登录');
// show('登录过期，请重新登录');
that.showErrorModel(`登录过期，请重新登录`)
props.exitLoginStatus();
} else {
that.props.callSupLoading(false)
let error_msg = orgResult.error_msg || orgResult.message
show(error_msg);
// show(error_msg);
that.showErrorModel(error_msg);
}
})
}
......@@ -1056,7 +1060,8 @@ class FilterModel extends Component {
break;
}
if(!orgVal) {
show(`请先选择${titVal}`)
// show(`请先选择${titVal}`)
this.showErrorModel(`请先选择${titVal}`)
return false
} else {
return true
......@@ -1081,7 +1086,8 @@ class FilterModel extends Component {
break;
}
if(!coumVal) {
show(`请先选择${titVal}`)
// show(`请先选择${titVal}`)
this.showErrorModel(`请先选择${titVal}`)
return false
} else {
return true
......@@ -1118,10 +1124,9 @@ class FilterModel extends Component {
}
}
// 确定 - 筛选 传递参数给父组件！！！通过调用函数的方式 -- 待修改
// 确定 - 筛选 传递参数给父组件
handleFilterSubmitCheck() {
console.log('筛选 - 确定---')
// console.log('筛选 - 确定---')
let {
topActiveIndex,
borrowListOptionData,
......@@ -1129,27 +1134,11 @@ class FilterModel extends Component {
searchBorrowStatus,
searchComsumeStatus,
borrowSearchOption,
consumeSearchOption,
// contOptionData
consumeSearchOption
} = this.state
let {props} = this
let that = this
// if(noCloseSel == 'close') {
// this.setState({
// isShowSelect: false // 关闭筛选
// })
// } else if(noCloseSel != 'close' && noCloseSel != 'mount') {
// // this.handleSelectClick() // 切换筛选
// // // this.changeSeaColorAct() // 改变筛选颜色
// this.handleSubSelectClick()
// }
// this.setState({
// contOptionData: [] // 清空数据
// })
let tempSubOption = {}
let params = {
access_token: props.token
......@@ -1181,8 +1170,7 @@ class FilterModel extends Component {
tempSubOption.surgery_date_to = borrowListOptionData[9].value
tempSubOption.order_type_code = borrowListOptionData[10].value
params = Object.assign({}, params, tempSubOption)
// props.requestGetAllBorrow(params)
console.log('------', params)
props.callSupSubmit(params)
that.changeSeaColorAct() // 改变筛选颜色
that.closeModal() // 关闭弹窗
......@@ -1207,10 +1195,8 @@ class FilterModel extends Component {
tempSubOption.hospitalization_number = consumeListOptionData[9].value
tempSubOption.settled_flag = consumeListOptionData[10].isRedio
params = Object.assign({}, params, tempSubOption)
// props.requestGetAllConsume(params)
props.callSupSubmit(params)
that.changeSeaColorAct() // 改变筛选颜色
that.closeModal() // 关闭弹窗
......@@ -1223,7 +1209,7 @@ class FilterModel extends Component {
}
// 判断筛选颜色变化 -- 待修改
// 判断筛选颜色变化
changeSeaColorAct() {
let {
topActiveIndex,
......@@ -1231,16 +1217,12 @@ class FilterModel extends Component {
consumeListOptionData,
subBorrowInitListOption,
subConsumeInitListOption,
searchColorIsAct,
topProcOptionList
} = this.state
console.log('--------topProcOptionList', topProcOptionList)
switch(topActiveIndex) {
case 0:
topProcOptionList[0].selIsAct = this.bothArrayIsCom(borrowListOptionData, subBorrowInitListOption);
// searchColorIsAct = this.bothArrayIsCom(borrowListOptionData, subBorrowInitListOption);
this.setState({
topProcOptionList
})
......@@ -1248,9 +1230,7 @@ class FilterModel extends Component {
break;
case 1:
topProcOptionList[1].selIsAct = this.bothArrayIsCom(consumeListOptionData, subConsumeInitListOption);
// searchColorIsAct = this.bothArrayIsCom(consumeListOptionData, subConsumeInitListOption);
this.setState({
// searchColorIsAct
topProcOptionList
})
this.props.callSupTopList(topProcOptionList)
......@@ -1268,19 +1248,17 @@ class FilterModel extends Component {
let that = this
otherFor:
for(let i in arr) {
if(arr[i] instanceof Object) {
if(arr[i] instanceof Object && newArr[i] instanceof Object) {
for(let key of Object.keys(arr[i])) {
if(arr[i][key] instanceof Array) {
if(arr[i][key] instanceof Array && newArr[i][key] instanceof Array) {
comFlag = that.bothArrayIsCom(arr[i][key], newArr[i][key])
} else if(newArr[i][key] != arr[i][key]) {
console.log('--arr[i][key]--', newArr[i][key] , arr[i][key])
comFlag = true;
break otherFor;
}
}
} else {
if(newArr[i] != arr[i]) {
console.log('--arr[i]--', newArr[i] , arr[i])
comFlag = true;
break otherFor;
}
......@@ -1298,11 +1276,9 @@ class FilterModel extends Component {
this.props.callChangeTopNav(index)
}
// 点击筛选 -- 关闭即可 ===》 并且调用查询数据！！！
// 点击筛选 -- 关闭即可
handleSubSelectClick() {
this.closeModal()
// ===》 并且调用查询数据！！！
// 不用调用吧
}
// 关闭弹窗
......@@ -1315,15 +1291,26 @@ class FilterModel extends Component {
// 返回回调，先关闭弹窗
handelGoBack() {
console.log('返回-----')
this.closeModal()
}
renderDialog() {
let { topProcOptionList, topActiveIndex, isVisible, searchColorIsAct } = this.state
// 显示错误提示弹窗
showErrorModel(title) {
this.setState({
errorPopType: true,
errorTit: title
})
}
console.log('topProcOptionList[topActiveIndex]------', topProcOptionList[topActiveIndex], topProcOptionList)
// 错误提示回调
handelCloseErrorModel(show) {
this.setState({
errorPopType: show
})
}
renderDialog() {
let { topProcOptionList, topActiveIndex, isVisible } = this.state
return (
<View style={styles.cont_mian}>
<View style={styles.cont_inner}>
......@@ -1403,6 +1390,7 @@ class FilterModel extends Component {
let {topActiveIndex, borrowListOptionData, consumeListOptionData, transferListOptionData} = this.state
return (
<View style={styles.sea_container}>
<View style={styles.sea_scr_box}>
<ScrollView style={styles.sea_scroll}>
{
topActiveIndex == 0 ?
......@@ -1954,6 +1942,7 @@ class FilterModel extends Component {
</View> : null
}
</ScrollView>
</View>
<View style={styles.sea_btn_box}>
<TouchableOpacity
activeOpacity={.8}
......@@ -1974,6 +1963,8 @@ class FilterModel extends Component {
{ this.renderDateModel() }
{ this.renderPickerModel() }
{ this.renderErrorModel() }
</View>
)
}
......@@ -2017,7 +2008,17 @@ class FilterModel extends Component {
}
// 返回错误提示弹窗
renderErrorModel() {
let {errorPopType, errorTit} = this.state
return(
<ErrorTipModel
title={errorTit}
show={errorPopType}
closeModal={(show) => this.handelCloseErrorModel(show)}
/>
)
}
render() {
......@@ -2054,8 +2055,6 @@ const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: 'rgba(0, 0, 0, 0.5)'
// paddingTop: '55%',
// alignItems: 'center'
},
cont_mian: {
flex: 1,
......@@ -2069,14 +2068,8 @@ const styles = StyleSheet.create({
width: Width(),
flex: 1,
flexDirection: 'column',
backgroundColor: '#F5F5F5',
height: pxHeight(500),
// borderRadius: 10,
// marginHorizontal: 30,
// marginVertical: 20,
// paddingTop: 30,
// paddingBottom: 60,
// paddingHorizontal: 20
// backgroundColor: '#FF0000',
height: Height() - 266
},
cont_item_box: {},
top_box: {},
......@@ -2097,10 +2090,8 @@ const styles = StyleSheet.create({
top_inner: {
justifyContent: 'center',
alignItems: 'center',
// marginRight: 14,
borderBottomWidth: 2,
borderBottomColor: foundation_color,
// minWidth: 50
borderBottomColor: foundation_color
},
top_inner_act: {
borderBottomWidth: 2,
......@@ -2119,8 +2110,7 @@ const styles = StyleSheet.create({
top_sea_box: {
paddingVertical: 14,
position: 'relative',
// paddingHorizontal: 24,
// flex: 1
backgroundColor: '#F5F5F5'
},
sea_inner: {
flexDirection: 'row',
......@@ -2144,28 +2134,15 @@ const styles = StyleSheet.create({
marginLeft: 4
},
sea_main: {
// height: 800,
// backgroundColor: 'rgba(0, 0, 0, .5)',
// position: 'absolute',
// top: 44,
// left: 0,
// right: 0,
// zIndex: 1,
// borderTopWidth: .5,
// borderTopColor: '#C8C8C8'
},
sea_main: {},
sea_container: {
// backgroundColor: '#000',
// minHeight: Height() - 218,
// height: pxHeight(506),
// height: Height() - 170
// flex: 1
height: pxHeight(412)
flex: 1
},
sea_scroll: {
sea_scr_box: {
height: Height() - 420,
backgroundColor: '#F5F5F5'
},
sea_scroll: {},
sea_sel_opt: {
paddingHorizontal: 20,
paddingBottom: 40
......@@ -2183,7 +2160,6 @@ const styles = StyleSheet.create({
sea_stu_box:{
flexDirection: 'row',
flexWrap: 'wrap'
// justifyContent: 'space-between'
},
sta_btn: {
width: '30%',
......@@ -2267,8 +2243,7 @@ const styles = StyleSheet.create({
},
cell_rig_input: {
flex: 1,
lineHeight: 18,
// height: 40,
lineHeight: 20,
color: first_text_color
},
btn_radio_box: {
......@@ -2330,9 +2305,7 @@ const styles = StyleSheet.create({
},
sea_btn_box: {
// alignItems: 'flex-end',
flexDirection: 'row',
// marginTop: 40
flexDirection: 'row'
},
sea_btn_inner: {
backgroundColor: promary_color,
......
app/containers/home/module/TabBottomItem.js
......@@ -35,7 +35,6 @@ class TabBottomItem extends Component {
// 返回每一个tab
renderTabOption(tab, i) {
const color = this.props.activeTab == i ? "#6B8E23" : "#ADADAD"; // 判断i是否是当前选中的tab，设置不同的颜色
console.log('props.activeTab---', tab, i)
let {props} = this
return(
<TouchableOpacity
......@@ -88,9 +87,7 @@ const styles = StyleSheet.create({
shadowOpacity: 1,
elevation: 10,
},
tab_opt: {
// backgroundColor: 'red'
},
tab_opt: {},
tab_item_box: {
alignItems: 'center',
paddingVertical: 10,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment