Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 34bd4432 by Denglingling
Options

完善器械消耗展示内容

parent e39b2ef1
Inline Side-by-side
Showing with 53 additions and 23 deletions
app/containers/equipConsu/EquipConsuPage.js
...@@ -1328,10 +1328,10 @@ class EquipConsuPage extends Component { ...@@ -1328,10 +1328,10 @@ class EquipConsuPage extends Component {
return( return(
<View style={list_common_item.con_de_sub} key={index}> <View style={list_common_item.con_de_sub} key={index}>
<Text style={[list_common_item.de_sub_tit]}> <Text style={[list_common_item.de_sub_tit]}>
{index+1}：[ { item.item_name } ] - {item.specification} {index+1}：{ item.item_name } - {item.specification}
</Text> </Text>
<Text style={list_common_item.de_tip}> <Text style={list_common_item.de_tip}>
序列号：{ item.serial_number } 序列号：{item.serial_number ? item.serial_number : '无'}
</Text> </Text>
{ OBS_MOBILE_EQU_CON_DISPLAY_PRICE === 'Y' ? { OBS_MOBILE_EQU_CON_DISPLAY_PRICE === 'Y' ?
<Text style={list_common_item.de_tip}> <Text style={list_common_item.de_tip}>
...@@ -1389,7 +1389,7 @@ class EquipConsuPage extends Component { ...@@ -1389,7 +1389,7 @@ class EquipConsuPage extends Component {
{index+1}：{ item.fee_type_name } {index+1}：{ item.fee_type_name }
</Text> </Text>
<Text style={list_common_item.de_tip}> <Text style={list_common_item.de_tip}>
{item.fee_amount_title}：{ item.fee_amount } {item.fee_amount_title}(¥)：{ item.fee_amount }
</Text> </Text>
</View> </View>
) )
......
app/containers/equipConsu/module/ConsumDetailsPage.js
...@@ -302,10 +302,10 @@ class ConsumDetailsPage extends Component { ...@@ -302,10 +302,10 @@ class ConsumDetailsPage extends Component {
</View> </View>
<View style={styles.sub_list_rig}> <View style={styles.sub_list_rig}>
<Text style={styles.rig_tit}> <Text style={styles.rig_tit}>
{index+1}. {item.item_name ? item.item_name : '物料名称无'} {index+1}. {item.general_name ? item.general_name : '通用名称无'}
</Text> </Text>
<Text style={[styles.rig_ser, styles.te_ot_str]}> <Text style={[styles.rig_ser, styles.te_ot_str]}>
通用名称：{item.general_name ? item.general_name : '无'} 物料名称 ：{item.item_name ? item.item_name : '无'}
</Text> </Text>
<Text style={[styles.rig_ser, styles.te_ot_one]}> <Text style={[styles.rig_ser, styles.te_ot_one]}>
规格型号：{item.specification ? item.specification : '无'} 规格型号：{item.specification ? item.specification : '无'}
......
app/containers/equipConsu/module/FillUnitPricePage.js
...@@ -9,9 +9,7 @@ import { ...@@ -9,9 +9,7 @@ import {
FlatList, FlatList,
TextInput TextInput
} from 'react-native'; } from 'react-native';
import { 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';
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
} 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 { show } from '../../../utils/Utils';
...@@ -98,11 +96,20 @@ class FillUnitPricePage extends Component { ...@@ -98,11 +96,20 @@ class FillUnitPricePage extends Component {
return( return(
<View style={styles.cons_sub_list}> <View style={styles.cons_sub_list}>
<Text style={styles.cont_tit}> <Text style={styles.cont_tit}>
{item.item_name} {index+1}. {item.general_name ? item.general_name : '通用名称无'}
</Text>
<Text style={[styles.cont_ser, styles.te_ot_str]}>
物料名称：{item.item_name ? item.item_name : '无'}
</Text> </Text>
<Text style={styles.cont_ser}> <Text style={[styles.cont_ser, styles.te_ot_one]}>
序列号：{item.serial_number} 规格型号：{item.specification ? item.specification : '无'}
</Text> </Text>
<Text style={[styles.cont_ser, styles.te_ot_two]}>
序列号：{item.serial_number ? item.serial_number : '无'}
</Text>
{/* <Text style={styles.cont_ser}>
厂家产品代码：{item.manufacturer_product_code ? item.manufacturer_product_code : '无'}
</Text> */}
<View style={styles.cont_pri}> <View style={styles.cont_pri}>
<Text style={styles.pri_icon}>*</Text> <Text style={styles.pri_icon}>*</Text>
<Text style={styles.pri_inner}>单价：</Text> <Text style={styles.pri_inner}>单价：</Text>
...@@ -187,17 +194,37 @@ const styles = StyleSheet.create({ ...@@ -187,17 +194,37 @@ const styles = StyleSheet.create({
}, },
cont_tit: { cont_tit: {
fontSize: second_text_size, fontSize: second_text_size,
color: promary_text_color, // color: promary_text_color,
fontFamily: font_family_regular fontFamily: font_family_regular,
color: list_tit_color,
}, },
cont_ser: { cont_ser: {
fontSize: 14, // fontSize: 14,
color: '#A3A3A3', // color: '#A3A3A3',
fontSize: third_text_size,
fontFamily: font_family_regular fontFamily: font_family_regular
}, },
te_ot_str: {
fontFamily: font_family_semibold,
// color: '#0CB4E8'
color: list_str_color
},
te_ot_one:{
// color: '#1B40B5',
color: list_one_color
},
te_ot_two:{
// color: '#1B40B5',
color: list_one_color
},
te_ot_thr:{
// color: '#3B4C82',
color: list_thr_color
},
cont_pri: { cont_pri: {
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center' alignItems: 'center',
marginTop: 6
}, },
pri_icon: { pri_icon: {
color: '#EC3A2E', color: '#EC3A2E',
...@@ -206,17 +233,20 @@ const styles = StyleSheet.create({ ...@@ -206,17 +233,20 @@ const styles = StyleSheet.create({
}, },
pri_inner: { pri_inner: {
fontFamily: font_family_medium, fontFamily: font_family_medium,
fontSize: second_text_size, fontSize: 14,
color: promary_text_color // color: promary_text_color
color: list_thr_color
}, },
cont_pri_box: { cont_pri_box: {
flex: 1, flex: 1,
paddingRight: 20 paddingRight: 20
}, },
pri_txt: { pri_txt: {
fontFamily: font_family_medium, fontFamily: font_family_regular,
fontSize: second_text_size, // fontSize: second_text_size,
color: promary_text_color fontSize: 14,
// color: promary_text_color
color: list_thr_color
}, },
......
app/containers/equipConsu/module/ShowDetailPage.js
...@@ -85,10 +85,10 @@ class ShowDetailPage extends Component { ...@@ -85,10 +85,10 @@ class ShowDetailPage extends Component {
return( return(
<View style={styles.cons_sub_list}> <View style={styles.cons_sub_list}>
<Text style={styles.cont_tit}> <Text style={styles.cont_tit}>
{index+1}. {item.item_name ? item.item_name : '物料名称无'} {index+1}. {item.general_name ? item.general_name : '通用名称无'}
</Text> </Text>
<Text style={[styles.cont_ser, styles.te_ot_str]}> <Text style={[styles.cont_ser, styles.te_ot_str]}>
通用名称：{item.general_name ? item.general_name : '无'} 物料名称：{item.item_name ? item.item_name : '无'}
</Text> </Text>
<Text style={[styles.cont_ser, styles.te_ot_one]}> <Text style={[styles.cont_ser, styles.te_ot_one]}>
规格型号：{item.specification ? item.specification : '无'} 规格型号：{item.specification ? item.specification : '无'}
......
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