Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 74bcbe53 by Denglingling
Options

新增自助下单-选择产品 - 接口信息 

(cherry picked from commit 154efb7f)
parent 16e48613
Inline Side-by-side
Showing with 136 additions and 314 deletions
app/action/SelfAction.js
......@@ -195,7 +195,8 @@ export function requestSelfSumbit({access_token, ...params}) {
return (dispatch, getState) => {
dispatch(requestSubmiting());
let {global_domain_config} = getState().login
PostRequest(global_domain_config, getUrlParams('/surgery/collect_order/via_data/create', {access_token: access_token}), params)
PostRequest(global_domain_config, getUrlParams('/order/sur_requirement/create', {access_token: access_token}), params)
// PostRequest(global_domain_config, getUrlParams('/surgery/collect_order/via_data/create', {access_token: access_token}), params)
.then(res => {
console.log('提交数据 res=====', res);
if(res.error_code == 0) {
......@@ -218,6 +219,55 @@ export function requestSelfSumbit({access_token, ...params}) {
}
}
// 选择产品-供应商信息查询接口
export const reqPurSupplierSearch = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/order/pur_supplier/search', params))
}
// 选择产品-产品信息分类查询接口
export const reqProCategorySearch = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/order/item/search', params))
}
// 选择产品-手术模板头查询接口
export const reqSurTempHeadSearch = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/surgery/template_header/search', params))
}
// 选择产品-手术模板行查询接口
export const reqSurTempLineSearch = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/surgery/template_line/search', params))
}
// 选择产品-螺钉盒（器械包）头查询接口
export const reqNailEquipHeadSearch = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/inventory/item_package/search', params))
}
// 选择产品-螺钉盒明细查询接口
export const reqNailBoxLineSearch = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/inventory/nail_box_template_detail/search', params))
}
// 选择产品-器械包明细查询接口
export const reqEquipPackageLineSearch = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/inventory/item_package/search', params))
}
// 选择产品-零散器械查询接口
export const reqScatEquipmentSearch = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/order/tool/search', params))
}
// 选择产品-单点耗材查询接口
export const reqSingleConsumSearch = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/order/item_detail/search', params))
}
function requestSubmiting() {
return {
type: SELF_SUBMIT_DOING
......
app/containers/common/ProductModel.js
import React, { Component } from 'react';
import {
View,
Text,
StyleSheet,
SafeAreaView,
Modal,
ScrollView,
TouchableOpacity,
FlatList,
Image
} from 'react-native';
import {
pxHeight,
foundation_color,
promary_color,
second_text_color,
third_text_color,
first_text_color,
second_text_size,
Width,
pxSize,
dis_sub_color,
safe_view,
font_family_medium,
font_family_light,
list_common_item,
third_text_size,
icon_style
} from '../../base/BaseStyle';
import { View, Text, StyleSheet, SafeAreaView, Modal, ScrollView, TouchableOpacity, FlatList, Image } from 'react-native';
import { pxHeight, foundation_color, promary_color, second_text_color, third_text_color, first_text_color, second_text_size, Width, pxSize, safe_view, font_family_medium, font_family_light, list_common_item, third_text_size, icon_style } from '../../base/BaseStyle';
import { FooterBtnStyle } from '../common/CellTextStyle';
import ChooseCardList from '../common/listDataComponent/ChooseCardList';
import PicTitDetaiCalcu from '../common/listDataComponent/PicTitDetaiCalcu';
......@@ -690,9 +663,7 @@ const styles = StyleSheet.create({
backgroundColor: '#ffffff',
borderTopLeftRadius: 12,
borderTopRightRadius: 12,
height: pxHeight(680),
// maxHeight: pxHeight(580),
// minHeight: pxHeight(360)
height: pxHeight(680)
},
scro_box: {
flex: 1
......@@ -700,7 +671,6 @@ const styles = StyleSheet.create({
top_box: {
width: Width(),
paddingHorizontal: 20
// backgroundColor: foundation_color,
},
top_scroll_cont: {
paddingBottom: 4,
......@@ -716,12 +686,6 @@ const styles = StyleSheet.create({
borderBottomColor: foundation_color,
minWidth: 45,
},
// se_thr_width: {
// minWidth: 42
// },
// four_width: {
// minWidth: 28
// },
top_inner_act: {
borderBottomWidth: 2,
borderBottomColor: promary_color
......@@ -731,16 +695,13 @@ const styles = StyleSheet.create({
paddingBottom: 10,
color: second_text_color,
fontSize: third_text_size
// fontSize: 12
},
top_tit_act: {
color: first_text_color,
fontFamily: font_family_medium,
fontSize: 12
// fontWeight: 'bold'
},
edit_cont: {
// height: pxHeight(430)
flex: 1
},
edit_scroll_cont: {
......@@ -758,64 +719,6 @@ const styles = StyleSheet.create({
list_tit: {
fontSize: 14
},
ri_inner: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
paddingVertical: 14,
paddingHorizontal: 8,
backgroundColor: foundation_color,
marginBottom: 14,
borderBottomWidth: 1,
borderBottomColor: '#F9F9F9'
},
oth_img_box: {
borderColor: '#ccc',
borderWidth: 1,
borderRadius: 50,
width: pxSize(50),
height: pxSize(50),
justifyContent: 'center',
alignItems: 'center'
},
oth_img: {
width: '90%',
height: '90%'
},
ri_text_box: {},
ri_te_tit: {
fontSize: second_text_size,
color: first_text_color,
// fontWeight: 'bold',
fontFamily: font_family_medium
},
thr_ot: {
// fontWeight: 'normal',
// color: first_text_color
},
ri_te_ot: {
fontSize: 14,
color: third_text_color,
fontFamily: font_family_light
},
ri_num_box: {
flexDirection: 'row',
alignItems: 'center'
},
thr_num_btn: {
width: pxSize(24),
height: pxSize(24)
},
thr_btn_left: {
marginRight: 4
},
thr_btn_right: {
marginLeft: 4
},
thr_num_icon: {
width: '100%',
height: '100%'
},
btn_inner: {},
thr_num: {
minWidth: pxSize(20),
......@@ -824,8 +727,7 @@ const styles = StyleSheet.create({
rb_top_cont:{
paddingHorizontal: 16,
paddingTop: 16,
alignItems: 'flex-end',
// backgroundColor: 'red'
alignItems: 'flex-end'
},
rb_top_inner: {
display: 'flex',
......
app/containers/selfOrder/module/ChooseProductPage.js
import React, { Component } from 'react';
import {
View,
Text,
StyleSheet,
TouchableOpacity,
Image,
TextInput,
ScrollView,
SafeAreaView
} from 'react-native';
import { View, Text, StyleSheet, TouchableOpacity, Image, TextInput } from 'react-native';
import {connect} from 'react-redux';
import {
foundation_color,
second_text_size,
home_background_color,
dis_sub_color,
Width,
third_text_size,
first_text_color,
pxSize,
promary_color,
second_text_color,
third_text_color,
first_text_size,
safe_view,
font_family_semibold,
font_family_regular,
icon_style,
title_text_color,
font_family_medium,
list_common_item
} from '../../../base/BaseStyle';
import { foundation_color, home_background_color, Width, third_text_size, pxSize, promary_color, safe_view, font_family_semibold, font_family_regular, icon_style, title_text_color, font_family_medium, list_common_item} from '../../../base/BaseStyle';
import HeadBackItem from '../../common/HeadBackItem';
import { FooterBtnStyle } from '../../common/CellTextStyle';
import ProductRightStyle from './ProductRightStyle';
import ProductModel from '../../common/ProductModel';
import StatusBarView from '../../common/StatusBarView';
import ChooseCardList from '../../common/listDataComponent/ChooseCardList';
import {cloneObject} from '../../../utils/Utils';
import localMockData from './mock/sen_mock';
// import ScrollableTabView, { ScrollableTabBar } from 'react-native-scrollable-tab-view';
// import TopTabBar from './customTabbar/TopTabBar';
// import LeftTabBar from './customTabbar/LeftTabBar';
const DEFAULT_FIELD = 'quantity' // 计算的字段
const CHILD_DATA_NAME = 'childrenLineData' // 显示的子类数组名称
......@@ -351,6 +318,17 @@ class ChooseProductPage extends Component {
})
}
// 接口错误提示
showRrrorTip(result){
if(result.error_code == 41006) {
show('登录过期，请重新登录');
this.props.exitLoginStatus();
} else {
let error_msg = result.error_msg || result.message
show(error_msg);
}
}
// 返回搜索元素
renderSearchItem() {
return (
......@@ -657,4 +635,21 @@ const styles = StyleSheet.create({
},
})
export default ChooseProductPage;
\ No newline at end of file
const mapStateToProps = (state) => {
return {
userInfo: state.login.userInfo,
token: state.login.token,
loginState: state.login.loginState,
global_domain_config: state.login.global_domain_config
}
}
const mapDispatchToProps = (dispatch) => {
return {
// requestSelfOrganizations: (params) => {
// dispatch(requestSelfOrganizations(params))
// }
}
}
export default connect(mapStateToProps, mapDispatchToProps)(ChooseProductPage);
\ No newline at end of file
app/containers/selfOrder/module/EditThirdLevelPage.js
import React, { Component } from 'react';
import {
View,
Text,
StyleSheet,
SafeAreaView,
TouchableOpacity,
ScrollView,
FlatList,
Image
} from 'react-native';
import { View, StyleSheet, SafeAreaView, ScrollView, FlatList } from 'react-native';
import {connect} from 'react-redux';
import HeadBackItem from '../../common/HeadBackItem';
import {
home_background_color,
foundation_color,
promary_color,
second_text_color,
third_text_color,
first_text_color,
second_text_size,
Width,
pxSize,
safe_view,
font_family_semibold,
font_family_light,
btn_sub_color
} from '../../../base/BaseStyle';
import { home_background_color, foundation_color, promary_color, third_text_color, first_text_color, second_text_size, Width, pxSize, safe_view, font_family_semibold, font_family_light } from '../../../base/BaseStyle';
import {
FooterBtnStyle
} from '../../common/CellTextStyle';
......@@ -350,35 +327,19 @@ const styles = StyleSheet.create({
top_box: {
width: Width(),
paddingHorizontal: 20,
paddingTop: 12,
// backgroundColor: foundation_color,
// borderBottomColor: '#F4F4F4',
// borderBottomWidth: 1
paddingTop: 12
},
top_scroll_cont: {},
top_touch_cont: {},
top_inner: {
// justifyContent: 'center',
// alignItems: 'center',
// marginRight: 14,
// borderBottomWidth: 2,
// borderBottomColor: home_background_color,
// minWidth: 50,
},
top_inner: {},
se_thr_width: {
minWidth: 42
},
four_width: {
minWidth: 28
},
top_inner_act: {
// borderBottomWidth: 2,
// borderBottomColor: promary_color
},
top_inner_act: {},
top_tit: {
// paddingTop: 10,
// paddingBottom: 12,
// color: second_text_color,
fontSize: 14
},
top_tit_act: {
......@@ -389,7 +350,6 @@ const styles = StyleSheet.create({
marginTop: 14,
flex: 1,
paddingHorizontal: 20
// height: Height() - 187
},
edit_list: {},
column_container: {
......@@ -398,15 +358,7 @@ const styles = StyleSheet.create({
paddingVertical: 6,
backgroundColor: foundation_color
},
ri_inner: {
// flexDirection: 'row',
// justifyContent: 'space-between',
// alignItems: 'center',
// paddingVertical: 14,
// paddingHorizontal: 8,
// backgroundColor: foundation_color,
// marginBottom: 14
},
ri_inner: {},
oth_img_box: {
borderColor: '#ccc',
borderWidth: 1,
......@@ -424,13 +376,9 @@ const styles = StyleSheet.create({
ri_te_tit: {
fontSize: second_text_size,
color: first_text_color,
// fontWeight: 'bold',
fontFamily: font_family_semibold
},
thr_ot: {
// fontWeight: 'normal',
// color: first_text_color
},
thr_ot: {},
ri_te_ot: {
fontSize: 14,
color: third_text_color,
......@@ -483,9 +431,24 @@ const styles = StyleSheet.create({
list_style_box: {
borderBottomWidth: 0
},
sub_btn_txt: {
// fontSize: 14
}
sub_btn_txt: {}
})
const mapStateToProps = (state) => {
return {
userInfo: state.login.userInfo,
token: state.login.token,
loginState: state.login.loginState,
global_domain_config: state.login.global_domain_config
}
}
export default EditThirdLevelPage;
\ No newline at end of file
const mapDispatchToProps = (dispatch) => {
return {
// requestSelfOrganizations: (params) => {
// dispatch(requestSelfOrganizations(params))
// }
}
}
export default connect(mapStateToProps, mapDispatchToProps)(EditThirdLevelPage);
\ No newline at end of file
app/containers/selfOrder/module/ProductRightStyle.js
import React , { Component } from 'react';
import {
View,
Text,
StyleSheet,
TouchableOpacity,
Image,
ScrollView,
FlatList,
SafeAreaView
} from 'react-native';
import {
first_text_color,
third_text_color,
foundation_color,
second_text_size,
Width,
second_text_color,
pxSize,
font_family_medium,
font_family_light,
font_family_regular,
icon_style
} from '../../../base/BaseStyle';
import { View, Text, StyleSheet, TouchableOpacity, Image, ScrollView, FlatList, SafeAreaView } from 'react-native';
import { third_text_color, foundation_color, second_text_size, Width, pxSize, font_family_regular, icon_style } from '../../../base/BaseStyle';
import PicTitDetaiCalcu from '../../common/listDataComponent/PicTitDetaiCalcu';
import PictureZoom from '../../common/listDataComponent/PictureZoom';
import {cloneObject} from '../../../utils/Utils';
import _ from "lodash";
import localMockData from './mock/sen_mock';
import { connect } from 'react-redux';
const PropTypes = require('prop-types');
const DEFAULT_FIELD = 'quantity' // 计算的字段
......@@ -555,92 +535,11 @@ const styles = StyleSheet.create({
cont_right_scroll_cont: {},
cont_right_list: {},
ri_container: {},
// ri_tou_box: {},
// ri_inner: {
// flexDirection: 'row',
// justifyContent: 'space-between',
// alignItems: 'center',
// paddingVertical: 14
// },
// ri_text_box: {},
// ri_te_tit: {
// fontSize: 18,
// color: first_text_color,
// // fontWeight: 'bold',
// fontFamily: font_family_medium
// },
// ri_te_ot: {
// fontSize: 14,
// color: third_text_color,
// fontFamily: font_family_light
// },
// ri_img_box: {
// width: 18,
// height: 18
// },
// ri_img_check: {
// width: '100%',
// height: '100%'
// },
model_cont: {},
// model_cont_inner: {
// marginBottom: 48
// },
// mo_cont_title: {
// color: first_text_color,
// // fontWeight: 'bold',
// fontSize: 14,
// lineHeight: 24,
// fontFamily: font_family_medium
// },
// mo_cont_tip: {
// color: second_text_color,
// fontSize: 14,
// lineHeight: 24,
// fontFamily: font_family_regular
// },
// mo_img_box: {
// flex: 1,
// borderWidth: 1,
// borderColor: '#E1E1E1',
// justifyContent: 'center',
// alignItems: 'center',
// height: pxSize(120)
// },
// mo_img: {
// width: pxSize(100),
// height: '100%'
// },
// other right
cont_other_cont: {},
cont_other_list: {},
oth_container: {},
// oth_inner: {},
// oth_box: {},
// oth_box_item: {
// flexDirection: 'row',
// justifyContent: 'flex-start',
// alignItems: 'center'
// },
// oth_img_box: {
// borderColor: '#ccc',
// borderWidth: 1,
// borderRadius: 50,
// width: pxSize(50),
// height: pxSize(50),
// justifyContent: 'center',
// alignItems: 'center'
// },
// oth_img: {
// width: '90%',
// height: '90%'
// },
// oth_tit: {
// textAlign: 'left',
// paddingLeft: 10,
// fontSize: second_text_size,
// fontFamily: font_family_regular
// },
stencil_cont: {},
thr_head_inner: {},
thr_head_back: {
......@@ -652,10 +551,6 @@ const styles = StyleSheet.create({
width: pxSize(14),
height: pxSize(18)
},
// thr_icon: {
// width: '100%',
// height: '100%'
// },
thr_head_tit: {
color: third_text_color,
paddingLeft: 6,
......@@ -671,4 +566,21 @@ const styles = StyleSheet.create({
thr_container: {}
})
export default ProductRightStyle;
\ No newline at end of file
const mapStateToProps = (state) => {
return {
userInfo: state.login.userInfo,
token: state.login.token,
loginState: state.login.loginState,
global_domain_config: state.login.global_domain_config
}
}
const mapDispatchToProps = (dispatch) => {
return {
// requestSelfOrganizations: (params) => {
// dispatch(requestSelfOrganizations(params))
// }
}
}
export default connect(mapStateToProps, mapDispatchToProps)(ProductRightStyle);
\ No newline at end of file
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