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

4e96620a · wong.peiyi · e2e7bd48 · 4e96620a · 4e96620a · 4e96620a
Commit 4e96620a authored Mar 28, 2021 by wong.peiyi
Showing with 43 additions and 3 deletions
app/action/QuickAction.js
app/action/SelfAction.js
app/containers/common/DialogModel.js
app/containers/historicalOrder/module/LineOrderPage.js
app/containers/quickOrder/QuickOrderPage.js
app/containers/selfOrder/SelfOrderPage.js
app/utils/Utils.js
package.json
yarn.lock
--- a/app/action/QuickAction.js
+++ b/app/action/QuickAction.js
@@ -155,6 +155,10 @@ export const reqQuickTemplateCollect = async (global_domain_config, 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'}
 export function requestQuickSurgeryType(params) {
    return (dispatch, getState) => {

--- a/app/action/SelfAction.js
+++ b/app/action/SelfAction.js
@@ -48,6 +48,10 @@ export const reqSelfOrganizations = async (global_domain_config, 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:''}
 export function requestSelfSurgeryHospital(params) {

--- a/app/containers/common/DialogModel.js
+++ b/app/containers/common/DialogModel.js
@@ -218,7 +218,9 @@ const styles = StyleSheet.create({
    },
    list_item_text: {
        fontSize: 16,
-        color: third_text_color
+        color: third_text_color,
+        width: '100%',
+        textAlign: 'center',
    },
    curr_item: {
        color: first_text_color,
@@ -244,7 +246,10 @@ const styles = StyleSheet.create({
        height: 'auto'
    },
    list_txt_box: {
-        flex: 1
+        flex: 1,
+        width: '100%',
+        alignItems: 'center',
+        justifyContent: 'center',
    },
    list_img_box: {
        width: pxSize(60),

--- a/app/containers/historicalOrder/module/LineOrderPage.js
+++ b/app/containers/historicalOrder/module/LineOrderPage.js
@@ -487,7 +487,7 @@ class LineOrderPage extends Component {
                        subColumns.map(col => {
                            const obj = this.state[col.obj] || orderSupOptions
                            if(!!col.ifShow && !col.ifShow()) return null
-                            console.log(Object.prototype.toString.call(col.prop))
+
                            return (
                                <View key={col.name} style={styles.fo_cell_box}>
                                    <View style={{minWidth: pxSize(70), }}>

--- a/app/containers/quickOrder/QuickOrderPage.js
+++ b/app/containers/quickOrder/QuickOrderPage.js
--- a/app/containers/selfOrder/SelfOrderPage.js
+++ b/app/containers/selfOrder/SelfOrderPage.js
--- a/app/utils/Utils.js
+++ b/app/utils/Utils.js
 import Toast from 'react-native-root-toast';
 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) => {
    show(error_msg);
    dispatch(errorCallback());
 }
+
+/**
+ * 空值或空判断
+ */
+export const isBlank = R.anyPass([R.isNil, R.isEmpty])
+
+export const isNotBlank = R.complement(isBlank)
--- a/package.json
+++ b/package.json
@@ -8,7 +8,9 @@
    "test": "jest"
  },
  "dependencies": {
+    "@types/ramda": "^0.27.39",
    "moment": "2.29.1",
+    "ramda": "^0.27.1",
    "react": "16.8.3",
    "react-native": "0.59.9",
    "react-native-audio": "4.3.0",

--- a/yarn.lock
+++ b/yarn.lock
@@ -937,6 +937,13 @@
    "@types/istanbul-lib-coverage" "*"
    "@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":
  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"
@@ -5155,6 +5162,11 @@ querystringify@^2.1.1:
  resolved "https://registry.npm.taobao.org/querystringify/download/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
  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:
  version "3.1.1"
  resolved "https://registry.npm.taobao.org/randomatic/download/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
@@ -6519,6 +6531,11 @@ tr46@^1.0.1:
  dependencies:
    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:
  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"