Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit e39b2ef1 by Denglingling
Options

调整器械消耗模块，“费用明细”提交、以及“消耗明细”的布局

parent b0ecec3d
Expand all
Inline Side-by-side
Showing with 175 additions and 94 deletions
app/action/EquipAction.js
......@@ -8,8 +8,8 @@ import {
EQUIP_SUBMIT_DOING,
EQUIP_SUBMIT_SUCCESS,
EQUIP_SUBMIT_FAILURE,
GET_SUB_DETAIL_OPTION,
GET_CHARGE_DETAILS_OPTION,
SET_SUB_DETAIL_OPTION,
SET_CHARGE_DETAILS_OPTION,
EQUIP_INIT_DATA
} from '../base/ActionTypes';
......@@ -21,6 +21,7 @@ export function requestEquipOrganizations(params) {
let {global_domain_config} = getState().login
GetRequest(global_domain_config, getUrlParams('/authorized_inventory/search', params))
.then(res => {
console.log('获取组织 res=====', res)
if(res.error_code == 0) {
let { data: { organizations } } = res
dispatch(requestListDataSuccess(organizations));
......@@ -48,6 +49,7 @@ export function requestEquipSurgeryHospital(params) {
let {global_domain_config} = getState().login
GetRequest(global_domain_config, getUrlParams('/sale/seller_customer/search', params))
.then(res => {
console.log('获取客户名称 res=====', res)
if(res.error_code == 0) {
let { data: { customers } } = res
dispatch(requestListDataSuccess(customers));
......@@ -79,7 +81,7 @@ export function requestEquipOrderInfo(params) {
let {global_domain_config} = getState().login
GetRequest(global_domain_config, getUrlParams('/surgery/collect_order/search', params))
.then(res => {
console.log('res===', res)
console.log('获取订单信息 res=====', res)
if(res.error_code == 0) {
let { data: { surgery_collect_headers } } = res
dispatch(requestListDataSuccess(surgery_collect_headers));
......@@ -124,17 +126,17 @@ function requestListDataFail() {
}
// 设置当前临时存储的明细
export function getSubdetailOption(data) {
export function setSubdetailOption(data) {
return {
type: GET_SUB_DETAIL_OPTION,
type: SET_SUB_DETAIL_OPTION,
rawData: data
}
}
// 设置当前费用明细
export function getCharDetailsOption(data) {
export function setCharDetailsOption(data) {
return {
type: GET_CHARGE_DETAILS_OPTION,
type: SET_CHARGE_DETAILS_OPTION,
rawData: data
}
}
......@@ -157,6 +159,7 @@ export function requestEquipSumbit({access_token, ...params}) {
let {global_domain_config} = getState().login
PostRequest(global_domain_config, getUrlParams('/surgery/consume_order/create', {access_token: access_token}), params)
.then(res => {
console.log('提交数据 res=====', res)
if(res.error_code == 0) {
dispatch(requestSubmitSuccess(res));
} else if(res.error_code === 41006) {
......
app/base/ActionTypes.js
......@@ -38,8 +38,8 @@ export const EQUIP_SUBMIT_DOING = "EQUIP_SUBMIT_DOING"
export const EQUIP_SUBMIT_SUCCESS = "EQUIP_SUBMIT_SUCCESS"
export const EQUIP_SUBMIT_FAILURE = "EQUIP_SUBMIT_FAILURE"
export const EQUIP_INIT_DATA = "EQUIP_INIT_DATA"
export const GET_SUB_DETAIL_OPTION = "GET_SUB_DETAIL_OPTION"
export const GET_CHARGE_DETAILS_OPTION = "GET_CHARGE_DETAILS_OPTION"
export const SET_SUB_DETAIL_OPTION = "SET_SUB_DETAIL_OPTION"
export const SET_CHARGE_DETAILS_OPTION = "SET_CHARGE_DETAILS_OPTION"
//-----------historical order search---------------------
export const HISTOR_ORDER_SEARCH_NO = "HISTOR_ORDER_SEARCH_NO"
export const HISTOR_ORDER_SEARCH_DOING = "HISTOR_ORDER_SEARCH_DOING"
......
app/base/BaseConstants.js
......@@ -2,4 +2,12 @@ export const BaseUrl = "https://obs.uat.guke.tech";
export const BaseUrlOther = "https://sob-os.uat.guke.tech";
export const VERSION = '/api/latest';
export const ACCESS_TOKEN = '201904091445193616b5e3d3a777848dda1de1a8123d0fdf9xw7t566c1S92U88';//未获取到access_token时使用
// export let
\ No newline at end of file
export let OBS_MOBILE_EQU_CON_DISPLAY_PRICE = 'N'
/**
* 设置耗材明细单价权限
* @param {String} price_flag 'Y'/'N'
*/
export const setEquConDisplayPrice = (price_flag) => {
OBS_MOBILE_EQU_CON_DISPLAY_PRICE = price_flag
}
app/base/BaseStyle.js
......@@ -44,6 +44,10 @@ export const text_default_color = "#01B2B9"; // 默认颜色
export const text_audit_color = "#FF0000"; // 拒绝颜色
export const text_return_color = "#007EFF"; // 归还颜色
export const text_other_color = "#F4B61B"; // 其他颜色
export const list_tit_color = 'rgba(0, 0, 0, 0.87)'; // 列表标题颜色
export const list_str_color = "#0CB4E8"; // 列表加粗颜色
export const list_one_color = "#1B40B5"; // 列表一级颜色
export const list_thr_color = "#3B4C82"; // 列表其他颜色
// 字号
export const first_text_size = 20; // 一级字号
......@@ -269,10 +273,13 @@ export const list_common_item = {
marginBottom: 10
},
de_sub_tit: {
color: second_text_color
color: first_text_color,
fontSize: 14
},
de_tip: {
color: second_text_color
color: second_text_color,
fontSize: 12,
lineHeight: 18
},
detail_btn_box: {
backgroundColor: promary_color,
......
app/containers/equipConsu/module/ConsumDetailsPage.js
......@@ -10,17 +10,7 @@ import {
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
} from '../../../base/BaseStyle';
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 HeadBackItem from '../../common/HeadBackItem';
import DetailsModel from './DetailsModel';
......@@ -31,6 +21,7 @@ import { connect } from 'react-redux';
import { show} from '../../../utils/Utils';
import LodingModel from '../../common/LodingModel';
import { exitLoginStatus } from '../../../action/LoginAction';
import { OBS_MOBILE_EQU_CON_DISPLAY_PRICE } from '../../../base/BaseConstants';
const CONSUM_SEARCH_VALUE_BAR_CODE = 'CONSUM_SEARCH_VALUE_BAR_CODE';
......@@ -230,16 +221,17 @@ class ConsumDetailsPage extends Component {
show('请选择耗材')
return
}
// this.props.navigation.navigate('FillUnitPricePage', {
// title: '器械消耗 - 填写单价',
// localSelectOption: localSelectOption
// })
if(OBS_MOBILE_EQU_CON_DISPLAY_PRICE === 'Y'){
this.props.navigation.navigate('FillUnitPricePage', {
title: '器械消耗 - 填写单价',
localSelectOption: localSelectOption
})
}else {
this.props.navigation.navigate('ShowDetailPage', {
title: '器械消耗 - 已选明细',
localSelectOption: localSelectOption
})
}
}
// 返回搜索元素
......@@ -310,17 +302,20 @@ class ConsumDetailsPage extends Component {
</View>
<View style={styles.sub_list_rig}>
<Text style={styles.rig_tit}>
{index+1}. {item.item_name}
{index+1}. {item.item_name ? item.item_name : '物料名称无'}
</Text>
<Text style={styles.rig_ser}>
通用名称：{item.general_name}
<Text style={[styles.rig_ser, styles.te_ot_str]}>
通用名称：{item.general_name ? item.general_name : '无'}
</Text>
<Text style={styles.rig_ser}>
规格型号：{item.specification}
<Text style={[styles.rig_ser, styles.te_ot_one]}>
规格型号：{item.specification ? item.specification : '无'}
</Text>
<Text style={styles.rig_ser}>
序列号：{item.serial_number}
<Text style={[styles.rig_ser, styles.te_ot_two]}>
序列号：{item.serial_number ? item.serial_number : '无'}
</Text>
{/* <Text style={styles.rig_ser}>
厂家产品代码：{item.manufacturer_product_code ? item.manufacturer_product_code : '无'}
</Text> */}
</View>
</TouchableOpacity>
)
......@@ -408,12 +403,17 @@ const styles = StyleSheet.create({
flex: 1
},
cons_cont_scroll: {},
cons_cont: {},
cons_cont: {
marginTop: 16
},
cons_sub_list: {
paddingHorizontal: 20,
paddingVertical: 12,
flexDirection: 'row',
alignItems: 'center'
alignItems: 'center',
backgroundColor: foundation_color,
marginHorizontal: 16,
marginBottom: 16
},
sub_list_lef: {
paddingRight: 12
......@@ -422,17 +422,38 @@ const styles = StyleSheet.create({
width: pxSize(20),
height: pxSize(20)
},
sub_list_rig: {},
sub_list_rig: {
flex: 1
},
rig_tit: {
fontSize: second_text_size,
color: promary_text_color,
fontFamily: font_family_regular
// color: promary_text_color,
fontFamily: font_family_regular,
color: list_tit_color,
},
rig_ser: {
fontSize: 14,
color: '#ADADAD',
// fontSize: 14,
// color: '#ADADAD',
fontSize: third_text_size,
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
},
fot_btn_lef: {
// width: pxSize(220)
},
......
app/containers/equipConsu/module/FillUnitPricePage.js
......@@ -15,7 +15,7 @@ import {
import StatusBarView from '../../common/StatusBarView';
import HeadBackItem from '../../common/HeadBackItem';
import { show } from '../../../utils/Utils';
import { getSubdetailOption } from '../../../action/EquipAction';
import { setSubdetailOption } from '../../../action/EquipAction';
import { connect } from 'react-redux';
// 可填写单价
......@@ -23,17 +23,7 @@ class FillUnitPricePage extends Component {
constructor(props) {
super(props);
this.state = {
unitPriceOption: [
// {
// "id": "2",
// item_name: '人工髋关节假体-JS-HB ||| T',
// specification: '3g,Ytg-DG-SZGT',
// serial_number: '2001202001001774',
// sale_price: 90890,
// local_add_price: 90890,
// select: true
// }
]
unitPriceOption: []
}
}
......@@ -65,7 +55,7 @@ class FillUnitPricePage extends Component {
let {props} = this
for(let i in unitPriceOption) {
if(!unitPriceOption[i].local_add_price) {
show('请填写完单价')
show('请填写完单价！')
canSubFlag = false
break
}
......@@ -76,7 +66,7 @@ class FillUnitPricePage extends Component {
unitPriceOption
})
// 存储于store中，并跳转
props.getSubdetailOption(unitPriceOption)
props.setSubdetailOption(unitPriceOption)
props.navigation.navigate('EquipConsuPage', { title: '器械消耗' })
}
}
......@@ -243,8 +233,8 @@ const mapStateToProps = (state) => {
const mapDispatchToProps = (dispatch) => {
return {
getSubdetailOption: (data) => {
dispatch(getSubdetailOption(data))
setSubdetailOption: (data) => {
dispatch(setSubdetailOption(data))
}
}
}
......
app/containers/equipConsu/module/ShowDetailPage.js
......@@ -10,12 +10,11 @@ import {
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
} 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, 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 HeadBackItem from '../../common/HeadBackItem';
import { show } from '../../../utils/Utils';
import { getSubdetailOption } from '../../../action/EquipAction';
import { setSubdetailOption } from '../../../action/EquipAction';
import { connect } from 'react-redux';
// 仅展示明细
......@@ -58,7 +57,7 @@ class ShowDetailPage extends Component {
unitPriceOption
})
// 存储于store中，并跳转
props.getSubdetailOption(unitPriceOption)
props.setSubdetailOption(unitPriceOption)
props.navigation.navigate('EquipConsuPage', { title: '器械消耗' })
}
}
......@@ -83,18 +82,23 @@ class ShowDetailPage extends Component {
// 返回每一列元素
renderSubListItem(item, index) {
let price = ''
if(item.local_add_price) {
price = String(item.local_add_price)
}
return(
<View style={styles.cons_sub_list}>
<Text style={styles.cont_tit}>
{index+1}. {item.item_name}
{index+1}. {item.item_name ? item.item_name : '物料名称无'}
</Text>
<Text style={[styles.cont_ser, styles.te_ot_str]}>
通用名称：{item.general_name ? item.general_name : '无'}
</Text>
<Text style={styles.cont_ser}>
序列号：{item.serial_number}
<Text style={[styles.cont_ser, styles.te_ot_one]}>
规格型号：{item.specification ? item.specification : '无'}
</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>
)
}
......@@ -150,24 +154,44 @@ const styles = StyleSheet.create({
},
cons_cont_scroll: {},
cons_cont: {
paddingHorizontal: 20
paddingHorizontal: 20,
marginTop: 16
},
cons_sub_list: {
backgroundColor: '#FFF',
marginVertical: 10,
padding: 10
backgroundColor: foundation_color,
padding: 10,
marginBottom: 16
},
cont_tit: {
fontSize: second_text_size,
color: promary_text_color,
fontFamily: font_family_regular
// color: promary_text_color,
fontFamily: font_family_regular,
color: list_tit_color,
},
cont_ser: {
fontSize: 14,
color: '#A3A3A3',
// fontSize: 14,
// color: '#A3A3A3',
fontSize: third_text_size,
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: {
flexDirection: 'row',
alignItems: 'center'
......@@ -203,8 +227,8 @@ const mapStateToProps = (state) => {
const mapDispatchToProps = (dispatch) => {
return {
getSubdetailOption: (data) => {
dispatch(getSubdetailOption(data))
setSubdetailOption: (data) => {
dispatch(setSubdetailOption(data))
}
}
}
......
app/containers/home/HomePage.js
......@@ -18,13 +18,14 @@ import {
safe_view,
font_family_regular
} from '../../base/BaseStyle';
import { exitLoginStatus } from '../../action/LoginAction';
import { exitLoginStatus, requestSysProfile } from '../../action/LoginAction';
import HeadBackItem from '../common/HeadBackItem';
import StatusBarView from '../common/StatusBarView';
import ScrollableTabView from 'react-native-scrollable-tab-view';
import TabBottomItem from './module/TabBottomItem';
import HistoricalOrderPage from '../historicalOrder/HistoricalOrderPage';
import { referenceArrSort } from '../../utils/Utils';
import { referenceArrSort, show } from '../../utils/Utils';
import { setEquConDisplayPrice } from '../../base/BaseConstants';
class HomePage extends Component {
......@@ -107,6 +108,7 @@ class HomePage extends Component {
componentDidMount() {
this.getMenuRuleInfo()
this.getSysConfigValue()
}
// 获取菜单权限
......@@ -167,6 +169,26 @@ class HomePage extends Component {
}
// 获取配置值
async getSysConfigValue() {
let { global_domain_config, token } = this.props
const params = {
access_token: token,
profile_code: 'OBS_MOBILE_EQU_CON_DISPLAY_PRICE'
}
let sysRes = await requestSysProfile(global_domain_config, params)
console.log('sysRes:==', sysRes)
if(sysRes.error_code === 0){
setEquConDisplayPrice(sysRes.data.profile_value)
} else if(sysRes.error_code == 41006) {
show('登录过期，请重新登录');
this.props.exitLoginStatus();
} else {
let error_msg = sysRes.error_msg || sysRes.message
show(error_msg);
}
}
// 跳转页面
jumpToSubpage(index) {
let {page, title} = this.state.showList[index]
......@@ -287,7 +309,9 @@ const styles = StyleSheet.create({
const mapStateToProps = (state) => ({
loginState:state.login.loginState,
userInfo: state.login.userInfo
userInfo: state.login.userInfo,
token: state.login.token,
global_domain_config: state.login.global_domain_config
})
const mapDispatchToProps = (dispatch) => ({
......
app/containers/login/LoginPage.js
......@@ -7,7 +7,8 @@ import {
ImageBackground,
Image,
TextInput,
TouchableOpacity
TouchableOpacity,
NativeModules
} from 'react-native';
import {connect} from "react-redux";
import {
......@@ -24,8 +25,7 @@ import {
placehold_text_color,
font_family_regular,
safe_view,
font_family_medium,
third_text_color
font_family_medium
} from '../../base/BaseStyle';
import { requestLogin, autoLogin, setDomainConfigurate } from '../../action/LoginAction';
import { show, isEmpty } from '../../utils/Utils';
......@@ -45,7 +45,7 @@ class LoginPage extends Component{
subTitList: ['登录', '登录中...'],
isSubLoding: false,
isShowDomain: false, // 域名填写
version_apk: 'v1.2.0'
version_apk: 'v1.2.1'
}
}
......@@ -98,6 +98,11 @@ class LoginPage extends Component{
}
}
// 设置版本号
setVersion() {
// NativeModules
}
// 判断是否打开域名弹窗
isOpenDomainModel() {
let {global_domain_config} = this.props
......@@ -442,8 +447,8 @@ const styles = StyleSheet.create({
marginTop: 42
},
fo_vers: {
fontSize: 10,
color: third_text_color,
fontSize: 12,
color: title_text_color,
paddingTop: 4
},
footer_img: {
......
app/reducers/module/equip.js
......@@ -8,8 +8,8 @@ import {
EQUIP_SUBMIT_SUCCESS,
EQUIP_SUBMIT_FAILURE,
EQUIP_INIT_DATA,
GET_SUB_DETAIL_OPTION,
GET_CHARGE_DETAILS_OPTION
SET_SUB_DETAIL_OPTION,
SET_CHARGE_DETAILS_OPTION
} from '../../base/ActionTypes';
// 器械消耗状态
......@@ -59,11 +59,11 @@ export default equip = (state = defaultState, action) => {
subDetOption: [],
charDetailOption: []
})
case GET_SUB_DETAIL_OPTION:
case SET_SUB_DETAIL_OPTION:
return Object.assign({}, state, {
subDetOption: action.rawData
})
case GET_CHARGE_DETAILS_OPTION:
case SET_CHARGE_DETAILS_OPTION:
return Object.assign({}, state, {
charDetailOption: action.rawData
})
......
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