Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 4e96620a by wong.peiyi
Options

自助下单、快速下单添加显示部门、业务经理、跟台员、送货员

parent e2e7bd48
Expand all
Inline Side-by-side
Showing with 56 additions and 19 deletions
app/action/QuickAction.js
...@@ -155,6 +155,10 @@ export const reqQuickTemplateCollect = async (global_domain_config, params) => { ...@@ -155,6 +155,10 @@ export const reqQuickTemplateCollect = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/surgery/template_header/search', params)) return await GetRequest(global_domain_config, getUrlParams('/surgery/template_header/search', params))
} }
export const reqOrgDepartments = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/sale/sale_relationship/search', params))
}
// 获取手术类型 params={access_token:'', value_set_code:'ORTHOPEDICS_PRODUCT_CLASS'} // 获取手术类型 params={access_token:'', value_set_code:'ORTHOPEDICS_PRODUCT_CLASS'}
export function requestQuickSurgeryType(params) { export function requestQuickSurgeryType(params) {
return (dispatch, getState) => { return (dispatch, getState) => {
...@@ -211,7 +215,7 @@ function requestListDataFail() { ...@@ -211,7 +215,7 @@ function requestListDataFail() {
} }
} }
// 上传语音 // 上传语音
export const requestQuickAudio = async (global_domain_config, params) => { export const requestQuickAudio = async (global_domain_config, params) => {
let { access_token, path } = params let { access_token, path } = params
let formData = new FormData() let formData = new FormData()
...@@ -363,4 +367,4 @@ export const reqQuickSurColSetting = async (global_domain_config, params) => { ...@@ -363,4 +367,4 @@ export const reqQuickSurColSetting = async (global_domain_config, params) => {
// }else { // }else {
// dispatch(requestListDataFail()); // dispatch(requestListDataFail());
// } // }
// } // }
\ No newline at end of file
app/action/SelfAction.js
...@@ -48,6 +48,10 @@ export const reqSelfOrganizations = async (global_domain_config, params) => { ...@@ -48,6 +48,10 @@ export const reqSelfOrganizations = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/authorized_inventory/search', params)) return await GetRequest(global_domain_config, getUrlParams('/authorized_inventory/search', params))
} }
export const reqOrgDepartments = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/sale/sale_relationship/search', params))
}
// 获取客户名称 params={access_token:'', org_code:'', seller_code:''} // 获取客户名称 params={access_token:'', org_code:'', seller_code:''}
export function requestSelfSurgeryHospital(params) { export function requestSelfSurgeryHospital(params) {
...@@ -205,7 +209,7 @@ function requestListDataFail() { ...@@ -205,7 +209,7 @@ function requestListDataFail() {
} }
// 上传语音 // 上传语音
export const requestSelfAudio = async (global_domain_config, params) => { export const requestSelfAudio = async (global_domain_config, params) => {
let { access_token, path } = params let { access_token, path } = params
let formData = new FormData() let formData = new FormData()
...@@ -356,4 +360,4 @@ export function setSelectProductOpts(data) { ...@@ -356,4 +360,4 @@ export function setSelectProductOpts(data) {
type: SET_SELECT_PRODUCT_OPTS, type: SET_SELECT_PRODUCT_OPTS,
rawData: data rawData: data
} }
} }
\ No newline at end of file
app/containers/common/DialogModel.js
...@@ -25,14 +25,14 @@ import { connect } from 'react-redux'; ...@@ -25,14 +25,14 @@ import { connect } from 'react-redux';
class DialogModel extends Component { class DialogModel extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
isVisible: false, isVisible: false,
entityList: this.props.entityList, entityList: this.props.entityList,
isShowImage: false, isShowImage: false,
zoomImages: [] zoomImages: []
} }
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
if (this.state.isVisible != nextProps.show) { if (this.state.isVisible != nextProps.show) {
this.setState({ this.setState({
...@@ -43,7 +43,7 @@ class DialogModel extends Component { ...@@ -43,7 +43,7 @@ class DialogModel extends Component {
this.setState({ this.setState({
entityList: nextProps.entityList entityList: nextProps.entityList
}) })
} }
} }
closeModal() { closeModal() {
...@@ -52,7 +52,7 @@ class DialogModel extends Component { ...@@ -52,7 +52,7 @@ class DialogModel extends Component {
}); });
this.props.closeModal(false); this.props.closeModal(false);
} }
handleChooseItem(item) { handleChooseItem(item) {
let { itemTitle } = this.props let { itemTitle } = this.props
if (this.state.isVisible) { if (this.state.isVisible) {
...@@ -113,7 +113,7 @@ class DialogModel extends Component { ...@@ -113,7 +113,7 @@ class DialogModel extends Component {
<View style={styles.opt_area}> <View style={styles.opt_area}>
<View style={styles.modal_style}> <View style={styles.modal_style}>
<View style={styles.scro_box}> <View style={styles.scro_box}>
<ScrollView <ScrollView
style={styles.item_scroll} style={styles.item_scroll}
// showsVerticalScrollIndicator={false} // showsVerticalScrollIndicator={false}
> >
...@@ -151,7 +151,7 @@ class DialogModel extends Component { ...@@ -151,7 +151,7 @@ class DialogModel extends Component {
) )
} }
render() { render() {
return ( return (
<View style={styles.dia_container}> <View style={styles.dia_container}>
<Modal <Modal
...@@ -165,7 +165,7 @@ class DialogModel extends Component { ...@@ -165,7 +165,7 @@ class DialogModel extends Component {
style={styles.container} activeOpacity={1} style={styles.container} activeOpacity={1}
onPress={() => this.closeModal()} onPress={() => this.closeModal()}
> >
{this.renderZoomPicture()} {this.renderZoomPicture()}
{this.renderDialog()} {this.renderDialog()}
</TouchableOpacity> </TouchableOpacity>
</SafeAreaView> </SafeAreaView>
...@@ -218,7 +218,9 @@ const styles = StyleSheet.create({ ...@@ -218,7 +218,9 @@ const styles = StyleSheet.create({
}, },
list_item_text: { list_item_text: {
fontSize: 16, fontSize: 16,
color: third_text_color color: third_text_color,
width: '100%',
textAlign: 'center',
}, },
curr_item: { curr_item: {
color: first_text_color, color: first_text_color,
...@@ -244,7 +246,10 @@ const styles = StyleSheet.create({ ...@@ -244,7 +246,10 @@ const styles = StyleSheet.create({
height: 'auto' height: 'auto'
}, },
list_txt_box: { list_txt_box: {
flex: 1 flex: 1,
width: '100%',
alignItems: 'center',
justifyContent: 'center',
}, },
list_img_box: { list_img_box: {
width: pxSize(60), width: pxSize(60),
...@@ -266,5 +271,5 @@ const mapStateToProps = (state) => { ...@@ -266,5 +271,5 @@ const mapStateToProps = (state) => {
global_domain_config: state.login.global_domain_config global_domain_config: state.login.global_domain_config
} }
} }
export default connect(mapStateToProps, null)(DialogModel); export default connect(mapStateToProps, null)(DialogModel);
\ No newline at end of file
app/containers/historicalOrder/module/LineOrderPage.js
...@@ -487,7 +487,7 @@ class LineOrderPage extends Component { ...@@ -487,7 +487,7 @@ class LineOrderPage extends Component {
subColumns.map(col => { subColumns.map(col => {
const obj = this.state[col.obj] || orderSupOptions const obj = this.state[col.obj] || orderSupOptions
if(!!col.ifShow && !col.ifShow()) return null if(!!col.ifShow && !col.ifShow()) return null
console.log(Object.prototype.toString.call(col.prop))
return ( return (
<View key={col.name} style={styles.fo_cell_box}> <View key={col.name} style={styles.fo_cell_box}>
<View style={{minWidth: pxSize(70), }}> <View style={{minWidth: pxSize(70), }}>
......
app/utils/Utils.js
import Toast from 'react-native-root-toast'; import Toast from 'react-native-root-toast';
import { Dimensions, Platform, NativeModules, PixelRatio, Text } from "react-native"; import { Dimensions, Platform, NativeModules, PixelRatio, Text } from "react-native";
import * as R from 'ramda';
/** /**
* 提示框 * 提示框
...@@ -319,3 +320,10 @@ export const showErrorMessage = (dispatch, err, errorCallback, logTit) => { ...@@ -319,3 +320,10 @@ export const showErrorMessage = (dispatch, err, errorCallback, logTit) => {
show(error_msg); show(error_msg);
dispatch(errorCallback()); dispatch(errorCallback());
} }
/**
* 空值或空判断
*/
export const isBlank = R.anyPass([R.isNil, R.isEmpty])
export const isNotBlank = R.complement(isBlank)
package.json
...@@ -8,7 +8,9 @@ ...@@ -8,7 +8,9 @@
"test": "jest" "test": "jest"
}, },
"dependencies": { "dependencies": {
"@types/ramda": "^0.27.39",
"moment": "2.29.1", "moment": "2.29.1",
"ramda": "^0.27.1",
"react": "16.8.3", "react": "16.8.3",
"react-native": "0.59.9", "react-native": "0.59.9",
"react-native-audio": "4.3.0", "react-native-audio": "4.3.0",
......
yarn.lock
...@@ -937,6 +937,13 @@ ...@@ -937,6 +937,13 @@
"@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-coverage" "*"
"@types/istanbul-lib-report" "*" "@types/istanbul-lib-report" "*"
"@types/ramda@^0.27.39":
version "0.27.39"
resolved "https://registry.npm.taobao.org/@types/ramda/download/@types/ramda-0.27.39.tgz?cache=0&sync_timestamp=1615893039310&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Framda%2Fdownload%2F%40types%2Framda-0.27.39.tgz#7541d9d745a2003c8f635897dff8c65c12be9327"
integrity sha1-dUHZ10WiADyPY1iX3/jGXBK+kyc=
dependencies:
ts-toolbelt "^6.15.1"
"@types/stack-utils@^1.0.1": "@types/stack-utils@^1.0.1":
version "1.0.1" version "1.0.1"
resolved "https://registry.npm.taobao.org/@types/stack-utils/download/@types/stack-utils-1.0.1.tgz?cache=0&sync_timestamp=1605057309059&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fstack-utils%2Fdownload%2F%40types%2Fstack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" resolved "https://registry.npm.taobao.org/@types/stack-utils/download/@types/stack-utils-1.0.1.tgz?cache=0&sync_timestamp=1605057309059&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fstack-utils%2Fdownload%2F%40types%2Fstack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
...@@ -5155,6 +5162,11 @@ querystringify@^2.1.1: ...@@ -5155,6 +5162,11 @@ querystringify@^2.1.1:
resolved "https://registry.npm.taobao.org/querystringify/download/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" resolved "https://registry.npm.taobao.org/querystringify/download/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
integrity sha1-M0WUG0FTy50ILY7uTNogFqmu9/Y= integrity sha1-M0WUG0FTy50ILY7uTNogFqmu9/Y=
ramda@^0.27.1:
version "0.27.1"
resolved "https://registry.npm.taobao.org/ramda/download/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9"
integrity sha1-Zvwt8++HOHT/wtpqqJhGWKus9ck=
randomatic@^3.0.0: randomatic@^3.0.0:
version "3.1.1" version "3.1.1"
resolved "https://registry.npm.taobao.org/randomatic/download/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" resolved "https://registry.npm.taobao.org/randomatic/download/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
...@@ -6519,6 +6531,11 @@ tr46@^1.0.1: ...@@ -6519,6 +6531,11 @@ tr46@^1.0.1:
dependencies: dependencies:
punycode "^2.1.0" punycode "^2.1.0"
ts-toolbelt@^6.15.1:
version "6.15.5"
resolved "https://registry.npm.taobao.org/ts-toolbelt/download/ts-toolbelt-6.15.5.tgz#cb3b43ed725cb63644782c64fbcad7d8f28c0a83"
integrity sha1-yztD7XJctjZEeCxk+8rX2PKMCoM=
tslib@^1.9.0: tslib@^1.9.0:
version "1.14.1" version "1.14.1"
resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.14.1.tgz?cache=0&sync_timestamp=1609887539329&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.14.1.tgz?cache=0&sync_timestamp=1609887539329&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
......
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