Commit 30835c4d by wong.peiyi

APP提报消耗选择明细时非序列不展示,增加生产批号、生产序号、生产日期、过期日期等字段展示

parent 6d18288b
......@@ -11,6 +11,7 @@ import LodingModel from '../../common/LodingModel';
import { exitLoginStatus } from '../../../action/LoginAction';
import { OBS_MOBILE_EQU_CON_DISPLAY_PRICE } from '../../../base/BaseConstants';
import { LOGIN_NO } from '../../../base/ActionTypes';
import moment from 'moment';
const CONSUM_SEARCH_VALUE_BAR_CODE = 'CONSUM_SEARCH_VALUE_BAR_CODE';
......@@ -300,19 +301,31 @@ class ConsumDetailsPage extends Component {
</View>
<View style={styles.sub_list_rig}>
<Text style={styles.rig_tit}>
{index+1}. {item.manufacturer_product_code ? item.manufacturer_product_code : '厂家产品代码无'}
{index+1}. {item.manufacturer_product_code || '无厂家产品代码'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_str]}>
物料名称 {item.item_name ? item.item_name : '无'}
<Text style={[styles.rig_ser, styles.te_ot_str]} numberOfLines={1}>
物料名称 {item.item_name || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_one]}>
通用名称 {item.general_name ? item.general_name : '无'}
<Text style={[styles.rig_ser, styles.te_ot_one]} numberOfLines={1}>
通用名称 {item.general_name || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_one]}>
规格型号:{item.specification ? item.specification : '无'}
<Text style={[styles.rig_ser, styles.te_ot_one]} numberOfLines={1}>
规格型号:{item.specification || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_thr]}>
序列号:{item.serial_number ? item.serial_number : '无'}
<Text style={[styles.rig_ser, styles.te_ot_thr]} numberOfLines={1}>
序列号:{item.serial_number_v || item.serial_number || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_thr]} numberOfLines={1}>
生产批号:{item.production_batch_number || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_thr]} numberOfLines={1}>
生产序号:{item.production_serial_number || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_thr]} numberOfLines={1}>
生产日期:{item.production_date && moment(item.production_date).format('YYYY-MM-DD') || '无'}
</Text>
<Text style={[styles.rig_ser, styles.te_ot_thr]} numberOfLines={1}>
过期日期:{item.expiration_date && moment(item.expiration_date).format('YYYY-MM-DD') || '无'}
</Text>
</View>
</TouchableOpacity>
......@@ -430,7 +443,7 @@ const styles = StyleSheet.create({
},
rig_ser: {
fontSize: third_text_size,
fontFamily: font_family_regular
fontFamily: font_family_regular,
},
te_ot_str: {
fontFamily: font_family_semibold,
......
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