Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 4b7600ee by Denglingling
Options

完善器械消耗展示内容、转单展示内容，以及token过期退出登录

parent 377709c3
Inline Side-by-side
Showing with 165 additions and 237 deletions
app/containers/common/listDataComponent/PicTitDetaiCalcu.js
import React, { Component } from 'react'; import React, { Component } from 'react';
import { StyleSheet, Image, Text, TouchableOpacity, View } from 'react-native'; import { StyleSheet, Image, Text, TouchableOpacity, View } from 'react-native';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { first_text_color, font_family_medium, font_family_regular, font_family_semibold, home_background_color, icon_style, pxSize, second_text_color, second_text_size, text_audit_color, text_default_color, text_other_color, text_return_color, third_text_color, third_text_size } from '../../../base/BaseStyle'; import { first_text_color, font_family_medium, font_family_regular, font_family_semibold, home_background_color, icon_style, pxSize, second_text_size, third_text_color, third_text_size, list_tit_color, list_str_color, list_one_color, list_thr_color } from '../../../base/BaseStyle';
import PictureZoom from '../../common/listDataComponent/PictureZoom'; import PictureZoom from '../../common/listDataComponent/PictureZoom';
const PropTypes = require('prop-types'); const PropTypes = require('prop-types');
...@@ -123,8 +123,6 @@ class PicTitDetaiCalcu extends Component { ...@@ -123,8 +123,6 @@ class PicTitDetaiCalcu extends Component {
cur_photos[0] = { url: global_domain_config + '/jeecg-boot/sys/common/view/' + listItem[listImgIcon] } cur_photos[0] = { url: global_domain_config + '/jeecg-boot/sys/common/view/' + listItem[listImgIcon] }
} }
// console.log('cur_photos--', cur_photos)
return ( return (
<View style={[styles.ri_inner, listStyleBox]}> <View style={[styles.ri_inner, listStyleBox]}>
{(listImgIcon && cur_photos.length > 0) ? {(listImgIcon && cur_photos.length > 0) ?
...@@ -240,35 +238,21 @@ const styles = StyleSheet.create({ ...@@ -240,35 +238,21 @@ const styles = StyleSheet.create({
thr_ot: { thr_ot: {
fontFamily: font_family_medium, fontFamily: font_family_medium,
fontSize: second_text_size, fontSize: second_text_size,
color: 'rgba(0, 0, 0, 0.87)', color: list_tit_color,
// color: text_default_color,
paddingBottom: 4 paddingBottom: 4
}, },
te_ot_str: { te_ot_str: {
fontFamily: font_family_semibold, fontFamily: font_family_semibold,
color: '#0CB4E8', color: list_str_color
// color: '#0CB4E8',
// color: '#02a5ab'
// color: 'rgba(58, 58, 58, 100)'
// color: text_default_color
// color: text_return_color
}, },
te_ot_one:{ te_ot_one:{
color: '#1B40B5', color: list_one_color
// color: '#003BF5',
// color: text_return_color
// color: first_text_color
}, },
te_ot_two:{ te_ot_two:{
color: '#1B40B5', color: list_one_color
// color: '#3B4C82',
// color: '#0080FF',
// color: text_return_color
}, },
te_ot_thr:{ te_ot_thr:{
color: '#3B4C82', color: list_thr_color
// color: '#0CB4E8',
// color: text_return_color
}, },
oth_img_box: { oth_img_box: {
width: pxSize(58), width: pxSize(58),
...@@ -303,9 +287,7 @@ const styles = StyleSheet.create({ ...@@ -303,9 +287,7 @@ const styles = StyleSheet.create({
paddingHorizontal: 4, paddingHorizontal: 4,
paddingVertical: 4 paddingVertical: 4
}, },
btn_clear_inner: { btn_clear_inner: {},
},
icon_cle_btn: { icon_cle_btn: {
width: pxSize(22), width: pxSize(22),
height: pxSize(22) height: pxSize(22)
......
app/containers/equipConsu/module/ChargeDetailsPage.js
...@@ -45,6 +45,19 @@ class ChargeDetailsPage extends Component { ...@@ -45,6 +45,19 @@ class ChargeDetailsPage extends Component {
this.getChargeType() this.getChargeType()
} }
componentWillReceiveProps(nextProps) {
let { loginState, navigation } = this.props
if(loginState != nextProps.loginState) {
switch(nextProps.loginState) {
case LOGIN_NO:
navigation.navigate('LoginPage')
break;
default:
break;
}
}
}
// 获取费用类型 // 获取费用类型
async getChargeType() { async getChargeType() {
let { props } = this let { props } = this
...@@ -499,6 +512,7 @@ const styles = StyleSheet.create({ ...@@ -499,6 +512,7 @@ const styles = StyleSheet.create({
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {
token: state.login.token, token: state.login.token,
loginState: state.login.loginState,
global_domain_config: state.login.global_domain_config, global_domain_config: state.login.global_domain_config,
charDetailOption: state.equip.charDetailOption charDetailOption: state.equip.charDetailOption
} }
......
app/containers/equipConsu/module/ConsumDetailsPage.js
import React, { Component } from 'react'; import React, { Component } from 'react';
import { import { View, Text, StyleSheet, SafeAreaView, Image, TextInput, ScrollView, TouchableOpacity, FlatList } from 'react-native';
View, import { home_background_color, promary_color, safe_view, list_common_item, icon_style, pxSize, second_text_size, font_family_regular, font_family_semibold, foundation_color, list_tit_color, list_str_color, list_one_color, list_thr_color, third_text_size } from '../../../base/BaseStyle';
Text,
StyleSheet,
SafeAreaView,
Image,
TextInput,
ScrollView,
TouchableOpacity,
FlatList
} from 'react-native';
import { home_background_color, promary_color, safe_view, list_common_item, icon_style, pxSize, second_text_size, promary_text_color, font_family_regular, font_family_semibold, foundation_color, list_tit_color, list_str_color, list_one_color, list_thr_color, third_text_size } from '../../../base/BaseStyle';
import StatusBarView from '../../common/StatusBarView'; import StatusBarView from '../../common/StatusBarView';
import HeadBackItem from '../../common/HeadBackItem'; import HeadBackItem from '../../common/HeadBackItem';
import DetailsModel from './DetailsModel'; import DetailsModel from './DetailsModel';
import { import { requestEquipDetails} from '../../../action/EquipAction';
requestEquipDetails
} from '../../../action/EquipAction';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { show} from '../../../utils/Utils'; import { show} from '../../../utils/Utils';
import LodingModel from '../../common/LodingModel'; import LodingModel from '../../common/LodingModel';
import { exitLoginStatus } from '../../../action/LoginAction'; import { exitLoginStatus } from '../../../action/LoginAction';
import { OBS_MOBILE_EQU_CON_DISPLAY_PRICE } from '../../../base/BaseConstants'; import { OBS_MOBILE_EQU_CON_DISPLAY_PRICE } from '../../../base/BaseConstants';
import { LOGIN_NO } from '../../../base/ActionTypes';
const CONSUM_SEARCH_VALUE_BAR_CODE = 'CONSUM_SEARCH_VALUE_BAR_CODE'; const CONSUM_SEARCH_VALUE_BAR_CODE = 'CONSUM_SEARCH_VALUE_BAR_CODE';
...@@ -46,6 +35,7 @@ class ConsumDetailsPage extends Component { ...@@ -46,6 +35,7 @@ class ConsumDetailsPage extends Component {
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
let { barCodeData } = nextProps.navigation.state.params let { barCodeData } = nextProps.navigation.state.params
let { loginState, navigation } = this.props
let that = this let that = this
if(barCodeData && barCodeData.typeValue && barCodeData.typeName == CONSUM_SEARCH_VALUE_BAR_CODE) { if(barCodeData && barCodeData.typeValue && barCodeData.typeName == CONSUM_SEARCH_VALUE_BAR_CODE) {
that.setState({ that.setState({
...@@ -53,6 +43,15 @@ class ConsumDetailsPage extends Component { ...@@ -53,6 +43,15 @@ class ConsumDetailsPage extends Component {
}) })
that.handleSearchInput(barCodeData.typeValue) that.handleSearchInput(barCodeData.typeValue)
} }
if(loginState != nextProps.loginState) {
switch(nextProps.loginState) {
case LOGIN_NO:
navigation.navigate('LoginPage')
break;
default:
break;
}
}
} }
// 获取当前订单的消耗明细 // 获取当前订单的消耗明细
...@@ -72,7 +71,7 @@ class ConsumDetailsPage extends Component { ...@@ -72,7 +71,7 @@ class ConsumDetailsPage extends Component {
return fiItem.raised_consume != 'Y' return fiItem.raised_consume != 'Y'
}) })
if(lines.length == 0) { if(lines.length == 0) {
show('当前明细数据为空，请重现选择订单') show('当前明细数据为空，请重新选择订单')
} else { } else {
let {subDetOption} = this.props // 【器械消耗】已存在的明细 let {subDetOption} = this.props // 【器械消耗】已存在的明细
lines.length && lines.forEach((chItem, chInd) => { lines.length && lines.forEach((chItem, chInd) => {
...@@ -285,8 +284,7 @@ class ConsumDetailsPage extends Component { ...@@ -285,8 +284,7 @@ class ConsumDetailsPage extends Component {
style={styles.cons_sub_list} style={styles.cons_sub_list}
onPress={() => this.handleSubSelectCheck(index, !item.select)}> onPress={() => this.handleSubSelectCheck(index, !item.select)}>
<View style={styles.sub_list_lef}> <View style={styles.sub_list_lef}>
{ { item.select ?
item.select ?
<View <View
style={styles.sub_icon_box} style={styles.sub_icon_box}
// onPress={() => this.handleCelSelCheck(item, index)} // onPress={() => this.handleCelSelCheck(item, index)}
...@@ -298,8 +296,7 @@ class ConsumDetailsPage extends Component { ...@@ -298,8 +296,7 @@ class ConsumDetailsPage extends Component {
// onPress={() => this.handleSubSelectedCheck(item, index)} // onPress={() => this.handleSubSelectedCheck(item, index)}
> >
<Image style={icon_style} source={require('../../../images/radio_no.png')} /> <Image style={icon_style} source={require('../../../images/radio_no.png')} />
</View> </View> }
}
</View> </View>
<View style={styles.sub_list_rig}> <View style={styles.sub_list_rig}>
<Text style={styles.rig_tit}> <Text style={styles.rig_tit}>
...@@ -428,39 +425,28 @@ const styles = StyleSheet.create({ ...@@ -428,39 +425,28 @@ const styles = StyleSheet.create({
}, },
rig_tit: { rig_tit: {
fontSize: second_text_size, fontSize: second_text_size,
// color: promary_text_color,
fontFamily: font_family_regular, fontFamily: font_family_regular,
color: list_tit_color, color: list_tit_color,
}, },
rig_ser: { rig_ser: {
// fontSize: 14,
// color: '#ADADAD',
fontSize: third_text_size, fontSize: third_text_size,
fontFamily: font_family_regular fontFamily: font_family_regular
}, },
te_ot_str: { te_ot_str: {
fontFamily: font_family_semibold, fontFamily: font_family_semibold,
// color: '#0CB4E8'
color: list_str_color color: list_str_color
}, },
te_ot_one:{ te_ot_one:{
// color: '#1B40B5',
color: list_one_color color: list_one_color
}, },
te_ot_two:{ te_ot_two:{
// color: '#1B40B5',
color: list_one_color color: list_one_color
}, },
te_ot_thr:{ te_ot_thr:{
// color: '#3B4C82',
color: list_thr_color color: list_thr_color
}, },
fot_btn_lef: { fot_btn_lef: {},
// width: pxSize(220) fot_btn_rig: {},
},
fot_btn_rig: {
// width: pxSize(120)
},
loding_back: { loding_back: {
backgroundColor: 'rgba(0, 0, 0, 0)' backgroundColor: 'rgba(0, 0, 0, 0)'
}, },
......
app/containers/equipConsu/module/DetailsModel.js
...@@ -33,60 +33,16 @@ class DetailsModel extends Component { ...@@ -33,60 +33,16 @@ class DetailsModel extends Component {
{ {
title: '已选耗材' title: '已选耗材'
}, },
// {
// title: '螺钉盒'
// },
// {
// title: '器械包'
// },
// {
// title: '工具'
// }
], ],
topActiveIndex: 0, topActiveIndex: 0,
contOptionData: [ // 底部产品内容 contOptionData: [ // 底部产品内容
{ // {
"id": "0", // "id": "0",
item_name: '人工髋关节假体-JS-HB ||| T', // item_name: '人工髋关节假体-JS-HB ||| T',
specification: '3g,Ytg-DG-SZGT', // specification: '3g,Ytg-DG-SZGT',
serial_number: '2001202001001774', // serial_number: '2001202001001774',
select: false // select: false
}, // }
{
"id": "1",
item_name: '规格：JS-CGO PE 10 11',
specification: '3g,Ytg-DG-SZGT',
serial_number: '2001202001001774',
select: false
},
{
"id": "2",
item_name: '规格：JS-CGO PE 10 22',
specification: '3g,Ytg-DG-SZGT',
serial_number: '2001202001001774',
select: false
},
{
"id": "3",
item_name: '规格：JS-CGO PE 10 33',
specification: '3g,Ytg-DG-SZGT',
serial_number: '2001202001001774',
select: false
},
{
"id": "4",
item_name: '规格：JS-CGO PE 10 44',
specification: '3g,Ytg-DG-SZGT',
serial_number: '2001202001001774',
select: false
},
{
"id": "5",
item_name: '规格：JS-CGO PE 10 55',
specification: '3g,Ytg-DG-SZGT',
serial_number: '2001202001001774',
select: false
}
] ]
} }
} }
...@@ -102,18 +58,13 @@ class DetailsModel extends Component { ...@@ -102,18 +58,13 @@ class DetailsModel extends Component {
// 已选 点击 // 已选 点击
handleCloseSelected() { handleCloseSelected() {
// console.warn('已选：666--model')
let {contOptionData} = this.state let {contOptionData} = this.state
this.props.callback(contOptionData) this.props.callback(contOptionData)
this.closeModal() this.closeModal()
// this.props.closeSelected(false)
} }
// 确定耗材 点击 // 确定耗材 点击
handleCloseSubmit() { handleCloseSubmit() {
// console.warn('确定耗材--model')
this.closeModal() this.closeModal()
this.props.closeSubmit(false) this.props.closeSubmit(false)
} }
...@@ -131,7 +82,6 @@ class DetailsModel extends Component { ...@@ -131,7 +82,6 @@ class DetailsModel extends Component {
* @param {number} index 当前角标 * @param {number} index 当前角标
*/ */
handleDelItemClick(item, index) { handleDelItemClick(item, index) {
// console.log('-----删除-----', item, index)
let { contOptionData } = this.state let { contOptionData } = this.state
contOptionData.splice(index, 1) contOptionData.splice(index, 1)
this.setState({ this.setState({
...@@ -166,8 +116,6 @@ class DetailsModel extends Component { ...@@ -166,8 +116,6 @@ class DetailsModel extends Component {
> >
<View style={[ <View style={[
styles.top_inner, styles.top_inner,
// (index == 1 || index == 2) ? styles.se_thr_width : '',
// index == 3 ? styles.four_width : '',
index == topActiveIndex ? styles.top_inner_act : '' index == topActiveIndex ? styles.top_inner_act : ''
]}> ]}>
<Text style={[styles.top_tit, index == topActiveIndex ? styles.top_tit_act : '']}> <Text style={[styles.top_tit, index == topActiveIndex ? styles.top_tit_act : '']}>
...@@ -264,7 +212,6 @@ class DetailsModel extends Component { ...@@ -264,7 +212,6 @@ class DetailsModel extends Component {
<View style={styles.scro_box}> <View style={styles.scro_box}>
{this.renderTopProItem()} {this.renderTopProItem()}
{this.renderContItem()} {this.renderContItem()}
{/* {this.renderFooterBtnItem()} */}
</View> </View>
{this.renderFooterBtnItem()} {this.renderFooterBtnItem()}
</View> </View>
...@@ -319,28 +266,12 @@ const styles = StyleSheet.create({ ...@@ -319,28 +266,12 @@ const styles = StyleSheet.create({
borderTopRightRadius: 12, borderTopRightRadius: 12,
height: pxHeight(580) height: pxHeight(580)
}, },
// item: {
// width: Width(),
// height: 40,
// paddingLeft: 20,
// paddingRight: 20,
// alignItems: 'center'
// },
// itemText: {
// fontSize: 16,
// color: third_text_color
// },
// curr_item: {
// color: first_text_color,
// fontWeight: 'bold'
// },
scro_box: { scro_box: {
flex: 1 flex: 1
}, },
top_box: { top_box: {
width: Width(), width: Width(),
paddingHorizontal: 20 paddingHorizontal: 20
// backgroundColor: foundation_color,
}, },
top_scroll_cont: { top_scroll_cont: {
paddingBottom: 4, paddingBottom: 4,
...@@ -370,7 +301,6 @@ const styles = StyleSheet.create({ ...@@ -370,7 +301,6 @@ const styles = StyleSheet.create({
paddingTop: 16, paddingTop: 16,
paddingBottom: 12, paddingBottom: 12,
color: second_text_color, color: second_text_color,
// fontSize: third_text_size
fontSize: 14 fontSize: 14
}, },
top_tit_act: { top_tit_act: {
...@@ -378,7 +308,6 @@ const styles = StyleSheet.create({ ...@@ -378,7 +308,6 @@ const styles = StyleSheet.create({
fontWeight: 'bold' fontWeight: 'bold'
}, },
edit_cont: { edit_cont: {
// height: pxHeight(430)
flex: 1 flex: 1
}, },
edit_scroll_cont: { edit_scroll_cont: {
......
app/containers/equipConsu/module/FillUnitPricePage.js
import React, { Component } from 'react'; import React, { Component } from 'react';
import { import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity, ScrollView, FlatList, TextInput } from 'react-native';
View,
Text,
StyleSheet,
SafeAreaView,
TouchableOpacity,
ScrollView,
FlatList,
TextInput
} from 'react-native';
import { home_background_color, promary_color, safe_view, list_common_item, placehold_text_color, second_text_size, promary_text_color, font_family_regular, font_family_medium, list_tit_color, list_str_color, list_one_color, list_thr_color, third_text_size, font_family_semibold } from '../../../base/BaseStyle'; import { home_background_color, promary_color, safe_view, list_common_item, placehold_text_color, second_text_size, promary_text_color, font_family_regular, font_family_medium, list_tit_color, list_str_color, list_one_color, list_thr_color, third_text_size, font_family_semibold } from '../../../base/BaseStyle';
import StatusBarView from '../../common/StatusBarView'; import StatusBarView from '../../common/StatusBarView';
import HeadBackItem from '../../common/HeadBackItem'; import HeadBackItem from '../../common/HeadBackItem';
...@@ -186,7 +177,6 @@ const styles = StyleSheet.create({ ...@@ -186,7 +177,6 @@ const styles = StyleSheet.create({
cons_cont: { cons_cont: {
paddingHorizontal: 20 paddingHorizontal: 20
}, },
cons_sub_list: { cons_sub_list: {
backgroundColor: '#FFF', backgroundColor: '#FFF',
marginVertical: 10, marginVertical: 10,
...@@ -194,31 +184,24 @@ const styles = StyleSheet.create({ ...@@ -194,31 +184,24 @@ const styles = StyleSheet.create({
}, },
cont_tit: { cont_tit: {
fontSize: second_text_size, fontSize: second_text_size,
// color: promary_text_color,
fontFamily: font_family_regular, fontFamily: font_family_regular,
color: list_tit_color, color: list_tit_color,
}, },
cont_ser: { cont_ser: {
// fontSize: 14,
// color: '#A3A3A3',
fontSize: third_text_size, fontSize: third_text_size,
fontFamily: font_family_regular fontFamily: font_family_regular
}, },
te_ot_str: { te_ot_str: {
fontFamily: font_family_semibold, fontFamily: font_family_semibold,
// color: '#0CB4E8'
color: list_str_color color: list_str_color
}, },
te_ot_one:{ te_ot_one:{
// color: '#1B40B5',
color: list_one_color color: list_one_color
}, },
te_ot_two:{ te_ot_two:{
// color: '#1B40B5',
color: list_one_color color: list_one_color
}, },
te_ot_thr:{ te_ot_thr:{
// color: '#3B4C82',
color: list_thr_color color: list_thr_color
}, },
cont_pri: { cont_pri: {
...@@ -234,7 +217,6 @@ const styles = StyleSheet.create({ ...@@ -234,7 +217,6 @@ const styles = StyleSheet.create({
pri_inner: { pri_inner: {
fontFamily: font_family_medium, fontFamily: font_family_medium,
fontSize: 14, fontSize: 14,
// color: promary_text_color
color: list_thr_color color: list_thr_color
}, },
cont_pri_box: { cont_pri_box: {
...@@ -243,9 +225,7 @@ const styles = StyleSheet.create({ ...@@ -243,9 +225,7 @@ const styles = StyleSheet.create({
}, },
pri_txt: { pri_txt: {
fontFamily: font_family_regular, fontFamily: font_family_regular,
// fontSize: second_text_size,
fontSize: 14, fontSize: 14,
// color: promary_text_color
color: list_thr_color color: list_thr_color
}, },
......
app/containers/equipConsu/module/ShowDetailPage.js
import React, { Component } from 'react'; import React, { Component } from 'react';
import { import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity, ScrollView, FlatList } from 'react-native';
View, import { home_background_color, promary_color, safe_view, list_common_item, second_text_size, promary_text_color, font_family_regular, font_family_medium, font_family_semibold, foundation_color, list_tit_color, list_str_color, list_one_color, list_thr_color, third_text_size } from '../../../base/BaseStyle';
Text,
StyleSheet,
SafeAreaView,
TouchableOpacity,
ScrollView,
FlatList,
TextInput
} from 'react-native';
import {
home_background_color, promary_color, safe_view, list_common_item, placehold_text_color, second_text_size, promary_text_color, font_family_regular, font_family_medium, font_family_semibold, foundation_color, list_tit_color, list_str_color, list_one_color, list_thr_color, third_text_size } from '../../../base/BaseStyle';
import StatusBarView from '../../common/StatusBarView'; import StatusBarView from '../../common/StatusBarView';
import HeadBackItem from '../../common/HeadBackItem'; import HeadBackItem from '../../common/HeadBackItem';
import { show } from '../../../utils/Utils';
import { setSubdetailOption } from '../../../action/EquipAction'; import { setSubdetailOption } from '../../../action/EquipAction';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
...@@ -165,31 +154,24 @@ const styles = StyleSheet.create({ ...@@ -165,31 +154,24 @@ const styles = StyleSheet.create({
}, },
cont_tit: { cont_tit: {
fontSize: second_text_size, fontSize: second_text_size,
// color: promary_text_color,
fontFamily: font_family_regular, fontFamily: font_family_regular,
color: list_tit_color, color: list_tit_color,
}, },
cont_ser: { cont_ser: {
// fontSize: 14,
// color: '#A3A3A3',
fontSize: third_text_size, fontSize: third_text_size,
fontFamily: font_family_regular fontFamily: font_family_regular
}, },
te_ot_str: { te_ot_str: {
fontFamily: font_family_semibold, fontFamily: font_family_semibold,
// color: '#0CB4E8'
color: list_str_color color: list_str_color
}, },
te_ot_one:{ te_ot_one:{
// color: '#1B40B5',
color: list_one_color color: list_one_color
}, },
te_ot_two:{ te_ot_two:{
// color: '#1B40B5',
color: list_one_color color: list_one_color
}, },
te_ot_thr:{ te_ot_thr:{
// color: '#3B4C82',
color: list_thr_color color: list_thr_color
}, },
cont_pri: { cont_pri: {
......
app/containers/home/HomePage.js
...@@ -26,6 +26,7 @@ import TabBottomItem from './module/TabBottomItem'; ...@@ -26,6 +26,7 @@ import TabBottomItem from './module/TabBottomItem';
import HistoricalOrderPage from '../historicalOrder/HistoricalOrderPage'; import HistoricalOrderPage from '../historicalOrder/HistoricalOrderPage';
import { referenceArrSort, show } from '../../utils/Utils'; import { referenceArrSort, show } from '../../utils/Utils';
import { setEquConDisplayPrice } from '../../base/BaseConstants'; import { setEquConDisplayPrice } from '../../base/BaseConstants';
import { LOGIN_NO } from '../../base/ActionTypes';
class HomePage extends Component { class HomePage extends Component {
...@@ -111,6 +112,19 @@ class HomePage extends Component { ...@@ -111,6 +112,19 @@ class HomePage extends Component {
this.getSysConfigValue() this.getSysConfigValue()
} }
componentWillReceiveProps(nextProps) {
let { loginState, navigation } = this.props
if(loginState != nextProps.loginState) {
switch(nextProps.loginState) {
case LOGIN_NO:
navigation.navigate('LoginPage')
break;
default:
break;
}
}
}
// 获取菜单权限 // 获取菜单权限
getMenuRuleInfo() { getMenuRuleInfo() {
let { functions } = this.props.userInfo let { functions } = this.props.userInfo
......
app/containers/transOrder/TransOrderPage.js
...@@ -114,12 +114,7 @@ class TransOrderPage extends Component { ...@@ -114,12 +114,7 @@ class TransOrderPage extends Component {
value: '', value: '',
isJumpSubPage: true, // 跳转子页 isJumpSubPage: true, // 跳转子页
isShowSub: true, // 是否展示子项 isShowSub: true, // 是否展示子项
subOption: [ subOption: []
// {
// item_name: '人工髋关节假体-JS-HB ||| 人工髋关节假体-JS-HB',
// serial_number: 'SC20200506000006, SC20200506000006'
// }
]
}, },
{ {
"id": "7", "id": "7",
...@@ -157,10 +152,7 @@ class TransOrderPage extends Component { ...@@ -157,10 +152,7 @@ class TransOrderPage extends Component {
isSubLoding: false, // 加载中弹窗 isSubLoding: false, // 加载中弹窗
lodingTitle: '加载中', lodingTitle: '加载中',
listCurrentOption: [ // 当前选择器数据 listCurrentOption: [ // 当前选择器数据
// {
// name: '男',
// value: 'boy'
// }
], ],
hasPermission: undefined, //录音 授权状态 hasPermission: undefined, //录音 授权状态
audioPath: AudioUtils.DocumentDirectoryPath + `/trans_audio_${new Date().getTime()}.aac`, // 文件路径 audioPath: AudioUtils.DocumentDirectoryPath + `/trans_audio_${new Date().getTime()}.aac`, // 文件路径
...@@ -1327,6 +1319,9 @@ class TransOrderPage extends Component { ...@@ -1327,6 +1319,9 @@ class TransOrderPage extends Component {
<Text style={list_common_item.de_tip}> <Text style={list_common_item.de_tip}>
{item.surgery_collect_number}，{ item.serial_number } {item.surgery_collect_number}，{ item.serial_number }
</Text> </Text>
<Text style={[list_common_item.de_tip]}>
{item.specification ? item.specification : '规格型号无'}
</Text>
</View> </View>
) )
} }
......
app/containers/transOrder/module/TransDetailsModel.js
...@@ -21,7 +21,14 @@ import { ...@@ -21,7 +21,14 @@ import {
safe_view, safe_view,
list_common_item, list_common_item,
icon_style, icon_style,
font_family_regular font_family_regular,
second_text_size,
third_text_size,
font_family_semibold,
list_str_color,
list_one_color,
list_tit_color,
list_thr_color
} from '../../../base/BaseStyle'; } from '../../../base/BaseStyle';
class TransDetailsModel extends Component { class TransDetailsModel extends Component {
...@@ -33,15 +40,6 @@ class TransDetailsModel extends Component { ...@@ -33,15 +40,6 @@ class TransDetailsModel extends Component {
{ {
title: '已选' title: '已选'
}, },
// {
// title: '螺钉盒'
// },
// {
// title: '器械包'
// },
// {
// title: '工具'
// }
], ],
topActiveIndex: 0, topActiveIndex: 0,
contOptionData: [ // 底部产品内容 contOptionData: [ // 底部产品内容
...@@ -168,11 +166,17 @@ class TransDetailsModel extends Component { ...@@ -168,11 +166,17 @@ class TransDetailsModel extends Component {
style={styles.column_container}> style={styles.column_container}>
<View style={styles.ri_inner}> <View style={styles.ri_inner}>
<View style={styles.ri_text_box}> <View style={styles.ri_text_box}>
<Text style={styles.ri_te_tit}> <Text style={[styles.rig_tit]}>
{ item.item_name } - {item.specification} {item.item_name ? item.item_name : '物料名称无'}
</Text> </Text>
<Text style={[styles.ri_te_ot, styles.thr_ot]}> <Text style={[styles.rig_ser, styles.te_ot_str]}>
{item.surgery_collect_number}，{item.serial_number} {item.general_name ? item.general_name : '通用名称无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_one]}>
{item.surgery_collect_number}，{item.serial_number ? item.serial_number : '序列号无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_one]}>
{item.specification ? item.specification : '规格型号无'}
</Text> </Text>
</View> </View>
<View style={styles.ri_num_box}> <View style={styles.ri_num_box}>
...@@ -342,17 +346,6 @@ const styles = StyleSheet.create({ ...@@ -342,17 +346,6 @@ const styles = StyleSheet.create({
borderBottomColor: '#EAEAEA', borderBottomColor: '#EAEAEA',
paddingVertical: 14, paddingVertical: 14,
}, },
ri_te_tit: {
fontSize: 14,
color: first_text_color,
fontFamily: font_family_regular
},
thr_ot: {},
ri_te_ot: {
fontSize: 14,
color: '#C5C6C5',
fontFamily: font_family_regular
},
ri_num_box: { ri_num_box: {
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center' alignItems: 'center'
...@@ -366,6 +359,29 @@ const styles = StyleSheet.create({ ...@@ -366,6 +359,29 @@ const styles = StyleSheet.create({
marginLeft: 14 marginLeft: 14
}, },
btn_inner: {}, btn_inner: {},
rig_tit: {
fontSize: second_text_size,
fontFamily: font_family_regular,
color: list_tit_color
},
rig_ser: {
fontSize: third_text_size,
fontFamily: font_family_regular
},
te_ot_str: {
fontFamily: font_family_semibold,
color: list_str_color
},
te_ot_one:{
color: list_one_color
},
te_ot_two:{
color: list_one_color
},
te_ot_thr:{
color: list_thr_color
},
}) })
export default TransDetailsModel; export default TransDetailsModel;
\ No newline at end of file
app/containers/transOrder/module/TransSearchPage.js
...@@ -23,7 +23,13 @@ import { ...@@ -23,7 +23,13 @@ import {
font_family_regular, font_family_regular,
promary_text_color, promary_text_color,
list_common_item, list_common_item,
third_text_color third_text_color,
list_one_color,
list_thr_color,
font_family_semibold,
list_str_color,
list_tit_color,
third_text_size
} from '../../../base/BaseStyle'; } from '../../../base/BaseStyle';
import StatusBarView from '../../common/StatusBarView'; import StatusBarView from '../../common/StatusBarView';
import { import {
...@@ -47,6 +53,7 @@ import { exitLoginStatus } from '../../../action/LoginAction'; ...@@ -47,6 +53,7 @@ import { exitLoginStatus } from '../../../action/LoginAction';
import DialogModel from '../../common/DialogModel'; import DialogModel from '../../common/DialogModel';
import DateModel from '../../common/DateModel'; import DateModel from '../../common/DateModel';
import moment from 'moment'; import moment from 'moment';
import { LOGIN_NO } from '../../../base/ActionTypes';
const SERIAL_NUMBER_BAR_CODE = 'SERIAL_NUMBER_BAR_CODE'; const SERIAL_NUMBER_BAR_CODE = 'SERIAL_NUMBER_BAR_CODE';
const SURGERY_COLLECT_NUMBER_BAR_CODE = 'SURGERY_COLLECT_NUMBER_BAR_CODE'; const SURGERY_COLLECT_NUMBER_BAR_CODE = 'SURGERY_COLLECT_NUMBER_BAR_CODE';
...@@ -117,6 +124,7 @@ class TransSearchPage extends Component { ...@@ -117,6 +124,7 @@ class TransSearchPage extends Component {
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
let { barCodeData } = nextProps.navigation.state.params let { barCodeData } = nextProps.navigation.state.params
let { listOptionData } = this.state let { listOptionData } = this.state
let { loginState, navigation } = this.props
let that = this let that = this
if(barCodeData && barCodeData.typeValue && barCodeData.typeName == SERIAL_NUMBER_BAR_CODE) { if(barCodeData && barCodeData.typeValue && barCodeData.typeName == SERIAL_NUMBER_BAR_CODE) {
listOptionData[1].value = barCodeData.typeValue listOptionData[1].value = barCodeData.typeValue
...@@ -130,6 +138,15 @@ class TransSearchPage extends Component { ...@@ -130,6 +138,15 @@ class TransSearchPage extends Component {
listOptionData listOptionData
}) })
} }
if(loginState != nextProps.loginState) {
switch(nextProps.loginState) {
case LOGIN_NO:
navigation.navigate('LoginPage')
break;
default:
break;
}
}
} }
// 获取已存在的数据 // 获取已存在的数据
...@@ -309,7 +326,6 @@ class TransSearchPage extends Component { ...@@ -309,7 +326,6 @@ class TransSearchPage extends Component {
// 手术时间 // 手术时间
handleSurDateCheck(typeName) { handleSurDateCheck(typeName) {
console.log('筛选 - 手术时间---', typeName)
let { listOptionData } = this.state let { listOptionData } = this.state
let tempCurTit = '手术时间' let tempCurTit = '手术时间'
let tempCurDate = new Date() let tempCurDate = new Date()
...@@ -369,6 +385,7 @@ class TransSearchPage extends Component { ...@@ -369,6 +385,7 @@ class TransSearchPage extends Component {
this.changeLodingFlag(true) this.changeLodingFlag(true)
let { global_domain_config } = that.props let { global_domain_config } = that.props
let detailResult = await requestTransDetails(global_domain_config, params) let detailResult = await requestTransDetails(global_domain_config, params)
console.log('查询明细 res===', detailResult)
if(detailResult.error_code === 0) { if(detailResult.error_code === 0) {
let { data: { sur_transfer_lines }} = detailResult let { data: { sur_transfer_lines }} = detailResult
if(sur_transfer_lines.length == 0) { if(sur_transfer_lines.length == 0) {
...@@ -749,8 +766,7 @@ class TransSearchPage extends Component { ...@@ -749,8 +766,7 @@ class TransSearchPage extends Component {
}} }}
> >
<View style={styles.sub_list_lef}> <View style={styles.sub_list_lef}>
{ {item.select ?
item.select ?
<TouchableOpacity <TouchableOpacity
activeOpacity={.8} activeOpacity={.8}
style={styles.sub_icon_box} style={styles.sub_icon_box}
...@@ -764,16 +780,20 @@ class TransSearchPage extends Component { ...@@ -764,16 +780,20 @@ class TransSearchPage extends Component {
onPress={() => this.handleSubSelectedCheck(index)} onPress={() => this.handleSubSelectedCheck(index)}
> >
<Image style={icon_style} source={require('../../../images/radio_no.png')} /> <Image style={icon_style} source={require('../../../images/radio_no.png')} />
</TouchableOpacity> </TouchableOpacity> }
}
</View> </View>
<View style={styles.sub_list_rig}> <View style={styles.sub_list_rig}>
<Text style={styles.rig_tit}> <Text style={[styles.rig_tit]}>
{item.item_name} {item.item_name ? item.item_name : '物料名称无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_str]}>
{item.general_name ? item.general_name : '通用名称无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_one]}>
{item.surgery_collect_number}，{item.serial_number ? item.serial_number : '序列号无'}
</Text> </Text>
<Text style={styles.rig_ser}> <Text style={[styles.rig_ser, styles.te_ot_one]}>
{item.surgery_collect_number}，{item.serial_number} {item.specification ? item.specification : '规格型号无'}
</Text> </Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
...@@ -975,9 +995,7 @@ const styles = StyleSheet.create({ ...@@ -975,9 +995,7 @@ const styles = StyleSheet.create({
width: 80, width: 80,
backgroundColor: '#666' backgroundColor: '#666'
}, },
cle_btn: { cle_btn: {},
// color: ''
},
cont_list:{ cont_list:{
paddingVertical: 16 paddingVertical: 16
}, },
...@@ -999,10 +1017,9 @@ const styles = StyleSheet.create({ ...@@ -999,10 +1017,9 @@ const styles = StyleSheet.create({
right_tip:{}, right_tip:{},
cons_cont: {}, cons_cont: {},
cons_sub_list: { cons_sub_list: {
// paddingHorizontal: 0,
paddingVertical: 12,
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center' alignItems: 'center',
marginTop: 12
}, },
sub_list_lef: { sub_list_lef: {
paddingRight: 10 paddingRight: 10
...@@ -1012,21 +1029,33 @@ const styles = StyleSheet.create({ ...@@ -1012,21 +1029,33 @@ const styles = StyleSheet.create({
height: pxSize(20) height: pxSize(20)
}, },
sub_list_rig: { sub_list_rig: {
flex: 1 flex: 1,
borderBottomColor: '#EAEAEA',
borderBottomWidth: 1,
paddingBottom: 8,
marginBottom: 8
}, },
rig_tit: { rig_tit: {
fontSize: second_text_size, fontSize: second_text_size,
color: promary_text_color, fontFamily: font_family_regular,
fontFamily: font_family_regular color: list_tit_color
}, },
rig_ser: { rig_ser: {
fontSize: 14, fontSize: third_text_size,
color: '#ADADAD',
fontFamily: font_family_regular fontFamily: font_family_regular
}, },
te_ot_str: {
sub_btn_pro: { fontFamily: font_family_semibold,
backgroundColor: promary_color color: list_str_color
},
te_ot_one:{
color: list_one_color
},
te_ot_two:{
color: list_one_color
},
te_ot_thr:{
color: list_thr_color
}, },
}) })
......
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