Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 3f1a84e8 by Denglingling
Options

完善自助下单提交接口需要的数据 

(cherry picked from commit affd9956)
parent 24750fcd
Expand all
Inline Side-by-side
Showing with 117 additions and 28 deletions
app/action/SelfAction.js
...@@ -223,35 +223,35 @@ export function requestSelfSumbit({access_token, ...params}) { ...@@ -223,35 +223,35 @@ export function requestSelfSumbit({access_token, ...params}) {
// 选择产品-供应商信息查询接口 // 选择产品-供应商信息查询接口
export const reqPurSupplierSearch = async (global_domain_config, params) => { export const reqPurSupplierSearch = async (global_domain_config, params) => {
// return local_inter_mock.inter_1 return local_inter_mock.inter_1
return await GetRequest(global_domain_config, getUrlParams('/order/pur_supplier/search', params)) return await GetRequest(global_domain_config, getUrlParams('/order/pur_supplier/search', params))
} }
// 选择产品-产品信息分类查询接口 // 选择产品-产品信息分类查询接口
export const reqProCategorySearch = async (global_domain_config, params) => { export const reqProCategorySearch = async (global_domain_config, params) => {
// return local_inter_mock.inter_2 return local_inter_mock.inter_2
return await GetRequest(global_domain_config, getUrlParams('/order/item/search', params)) return await GetRequest(global_domain_config, getUrlParams('/order/item/search', params))
} }
// 选择产品-手术模板头查询接口 // 选择产品-手术模板头查询接口
export const reqSurTempHeadSearch = async (global_domain_config, params) => { export const reqSurTempHeadSearch = async (global_domain_config, params) => {
// return local_inter_mock.inter_3 return local_inter_mock.inter_3
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 reqSurTempLineSearch = async (global_domain_config, params) => { export const reqSurTempLineSearch = async (global_domain_config, params) => {
// return local_inter_mock.inter_4 return local_inter_mock.inter_4
return await GetRequest(global_domain_config, getUrlParams('/surgery/template_line/search', params)) return await GetRequest(global_domain_config, getUrlParams('/surgery/template_line/search', params))
} }
// 选择产品-螺钉盒（器械包）头查询接口 // 选择产品-螺钉盒（器械包）头查询接口
export const reqNailEquipHeadSearch = async (global_domain_config, params) => { export const reqNailEquipHeadSearch = async (global_domain_config, params) => {
// if(params.category_code === '1301'){ if(params.category_code === '1301'){
// return local_inter_mock.inter_5 return local_inter_mock.inter_5
// }else { }else {
// return local_inter_mock.inter_55 return local_inter_mock.inter_55
// } }
return await GetRequest(global_domain_config, getUrlParams('/inventory/item_package_header/search', params)) return await GetRequest(global_domain_config, getUrlParams('/inventory/item_package_header/search', params))
} }
...@@ -272,7 +272,7 @@ export const reqEquipPackageLineSearch = async (global_domain_config, params) => ...@@ -272,7 +272,7 @@ export const reqEquipPackageLineSearch = async (global_domain_config, params) =>
// 选择产品-零散器械查询接口 // 选择产品-零散器械查询接口
export const reqScatEquipmentSearch = async (global_domain_config, params) => { export const reqScatEquipmentSearch = async (global_domain_config, params) => {
// return local_inter_mock.inter_8 return local_inter_mock.inter_8
return await GetRequest(global_domain_config, getUrlParams('/order/tool/search', params)) return await GetRequest(global_domain_config, getUrlParams('/order/tool/search', params))
} }
......
app/containers/common/LocalVariable.js 0 → 100644
/**
* 自助下单-本地常用变量名
*/
export default class LocalVariable {
/**
* 计算数量的字段名
*/
static QUANTITY_FIELD = 'quantity'
/**
* 显示的子类数组名
*/
static CHILDREN_LINE_NAME = 'childrenLineData'
/**
* 外层已选数量字段名
*/
static SELECTED_QUQNTITY = 'selectedQuantity'
/**
* 外层已选数组名
*/
static SELECTED_DATA_ARR = 'selectedDataArr'
/**
* 中类原本元素
*/
static LOCAL_SECOND_DATA = 'localSecondData'
/**
* 只有两级的耗材
*/
static ONLY_TWO_LEVELS = 'onlyTwoLevels'
/**
* 三级原本元素
*/
static LOCAL_THRID_CONT_DATA = 'localThridContData'
/**
* 最终子类数组名
*/
static LINE_OPTIONS = 'lineOptions'
/**
* 已选展示父级标题名
*/
static SUPER_TITLE_NAME = 'super_title_name'
/**
* 已选展示父级提示名
*/
static SUPER_TITLE_TIP = 'super_title_tip'
/**
* 计划数量名
*/
static PLAN_QUANTITY = 'plan_quantity'
/**
* 手术模板名
*/
static SURGICAL_TEMPLATE = 'surg_temp'
/**
* 钉盒名
*/
static NAIL_BOX = 'screw_box'
/**
* 器械包名
*/
static EQUIPMENT_BAG = 'equip_bag'
/**
* 零散器械名
*/
static SCATTERED_EQUIPMENT = 'auxili_tool'
/**
* 单选耗材名
*/
static SIGN_SELECT_CONSUMABLES = 'sign_consu'
}
\ No newline at end of file
app/containers/common/listDataComponent/ChooseCardList.js
...@@ -40,6 +40,7 @@ class ChooseCardList extends Component { ...@@ -40,6 +40,7 @@ class ChooseCardList extends Component {
cardCouStyle: PropTypes.object, // 指定计数样式 cardCouStyle: PropTypes.object, // 指定计数样式
cardShowDefIcon: PropTypes.bool, // 是否显示默认无图 cardShowDefIcon: PropTypes.bool, // 是否显示默认无图
cardKeyName: PropTypes.string, // 关键key值
} }
...@@ -54,7 +55,7 @@ class ChooseCardList extends Component { ...@@ -54,7 +55,7 @@ class ChooseCardList extends Component {
render() { render() {
let {cardScrollEnabled, cardHorizontal, cardShowsHorizontalScrollIndicator, cardShowsVerticalScrollIndicator, cardStyleBox, cardStyleScroll, cardListOptions, cardItemTitle, cardItemIcon, cardImgName, let {cardScrollEnabled, cardHorizontal, cardShowsHorizontalScrollIndicator, cardShowsVerticalScrollIndicator, cardStyleBox, cardStyleScroll, cardListOptions, cardItemTitle, cardItemIcon, cardImgName,
cardStyleListItem, cardStyleListItemAct, cardStyleItemIcon, cardStyleItemTit, cardStyleNotIconTit, cardStyleItemTitAct, cardCallBack, curActIndex, cardCountName, cardStyleType, cardCouStyle, cardStyleListItem, cardStyleListItemAct, cardStyleItemIcon, cardStyleItemTit, cardStyleNotIconTit, cardStyleItemTitAct, cardCallBack, curActIndex, cardCountName, cardStyleType, cardCouStyle,
global_domain_config, cardShowDefIcon } = this.props global_domain_config, cardShowDefIcon, cardKeyName } = this.props
let {countStyleType} = this.state let {countStyleType} = this.state
...@@ -82,7 +83,7 @@ class ChooseCardList extends Component { ...@@ -82,7 +83,7 @@ class ChooseCardList extends Component {
item[cardItemIcon] = {uri: global_domain_config+'/jeecg-boot/sys/common/view/'+item[cardItemIcon][0]} // 正式 item[cardItemIcon] = {uri: global_domain_config+'/jeecg-boot/sys/common/view/'+item[cardItemIcon][0]} // 正式
} }
return <View style={styles.card_list_box}> return <View style={styles.card_list_box} key={'choose_card'+index}>
<TouchableOpacity <TouchableOpacity
activeOpacity={.8} activeOpacity={.8}
style={styles.list_touch_cont} style={styles.list_touch_cont}
......
app/containers/common/listDataComponent/TipInfoNeedSelect.js
...@@ -37,7 +37,7 @@ class TipInfoNeedSelect extends Component { ...@@ -37,7 +37,7 @@ class TipInfoNeedSelect extends Component {
super(props); super(props);
this.state = { this.state = {
isVisible: false, isVisible: false,
title: '愿意自动更换器械包?' title: '同意自动更换同品不同器械包?'
} }
} }
...@@ -86,14 +86,14 @@ class TipInfoNeedSelect extends Component { ...@@ -86,14 +86,14 @@ class TipInfoNeedSelect extends Component {
onPress={() => this.closeModal()} onPress={() => this.closeModal()}
style={[styles.foo_btn, styles.btn_cel]} style={[styles.foo_btn, styles.btn_cel]}
> >
<Text style={[styles.btn_tit, styles.tit_cel]}>取消</Text> <Text style={[styles.btn_tit, styles.tit_cel]}>否</Text>
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity <TouchableOpacity
activeOpacity={.8} activeOpacity={.8}
onPress={() => this.submitModal()} onPress={() => this.submitModal()}
style={[styles.foo_btn, styles.btn_sub]} style={[styles.foo_btn, styles.btn_sub]}
> >
<Text style={styles.btn_tit}>确定</Text> <Text style={styles.btn_tit}>是</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
......
app/containers/selfOrder/module/ChooseProductPage.js
...@@ -328,18 +328,21 @@ class ChooseProductPage extends Component { ...@@ -328,18 +328,21 @@ class ChooseProductPage extends Component {
} else if (leftIndex > 3) { } else if (leftIndex > 3) {
let params = { let params = {
access_token: token, access_token: token,
category_code: leftItem.category_code,
manufacturer_code: topItem.supplier_code,
org_code: cur_org_code,
leftIndex: leftIndex, // 本地测试 leftIndex: leftIndex, // 本地测试
} }
let single_all_search = await reqSingleConsumSearch(global_domain_config, params) let single_all_search = await reqSingleConsumSearch(global_domain_config, params)
console.log('res_3 : ', single_all_search, leftIndex, leftIndex % 2) console.log('res_3 : ', single_all_search, leftIndex, leftIndex % 2)
if (single_all_search.error_code === 0) { if (single_all_search.error_code === 0) {
let { data } = single_all_search let { data } = single_all_search
console.log('data : ', data, data instanceof Array) console.log('data : ', data, data.items)
if (data instanceof Array) { if (data && data.items) {
// if(leftItem[SELECTED_QUQNTITY] === 0){ // if(leftItem[SELECTED_QUQNTITY] === 0){
//大-中-小类 //大-中-小类
leftItem.localSecondData = cloneObject(data) leftItem.localSecondData = cloneObject(data.items)
leftItem['localSecondData'].forEach(function (righDa) { leftItem['localSecondData'].forEach(function (righDa) {
righDa[CHILDREN_LINE_NAME] = [] righDa[CHILDREN_LINE_NAME] = []
// if (!righDa['quantity']) { // if (!righDa['quantity']) {
......
app/containers/selfOrder/module/EditThirdLevelPage.js
...@@ -421,7 +421,7 @@ class EditThirdLevelPage extends Component { ...@@ -421,7 +421,7 @@ class EditThirdLevelPage extends Component {
curImgIcon = 'photos' curImgIcon = 'photos'
return ( return (
<SafeAreaView style={styles.column_container}> <SafeAreaView style={styles.column_container} key={'item_code'+index}>
<PicTitDetaiCalcu <PicTitDetaiCalcu
listItem={item} listItem={item}
listIndex={index} listIndex={index}
......
app/containers/selfOrder/module/ProductRightStyle.js
...@@ -4,10 +4,10 @@ import { third_text_color, foundation_color, second_text_size, Width, pxSize, fo ...@@ -4,10 +4,10 @@ import { third_text_color, foundation_color, second_text_size, Width, pxSize, fo
import PicTitDetaiCalcu from '../../common/listDataComponent/PicTitDetaiCalcu'; import PicTitDetaiCalcu from '../../common/listDataComponent/PicTitDetaiCalcu';
import PictureZoom from '../../common/listDataComponent/PictureZoom'; import PictureZoom from '../../common/listDataComponent/PictureZoom';
import { cloneObject } from '../../../utils/Utils'; import { cloneObject } from '../../../utils/Utils';
import { PicListNoData } from '../../common/CellTextStyle';
import _ from "lodash"; import _ from "lodash";
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import localMockData from './mock/sen_mock'; import localMockData from './mock/sen_mock';
import { PicListNoData } from '../../common/CellTextStyle';
const PropTypes = require('prop-types'); const PropTypes = require('prop-types');
const QUANTITY_FIELD = 'quantity' // 计算的字段 const QUANTITY_FIELD = 'quantity' // 计算的字段
...@@ -469,7 +469,7 @@ class ProductRightStyle extends Component { ...@@ -469,7 +469,7 @@ class ProductRightStyle extends Component {
curReduceCallBack = (() => this.props.superReduceBack()) curReduceCallBack = (() => this.props.superReduceBack())
} }
return ( return (
<SafeAreaView style={styles.ri_container}> <SafeAreaView style={styles.ri_container} key={'template_name'+index}>
<PicTitDetaiCalcu <PicTitDetaiCalcu
listItem={item} listItem={item}
listIndex={index} listIndex={index}
...@@ -516,7 +516,7 @@ class ProductRightStyle extends Component { ...@@ -516,7 +516,7 @@ class ProductRightStyle extends Component {
// 单选耗材 -- 小类每一列 // 单选耗材 -- 小类每一列
renderThridItem(item, index) { renderThridItem(item, index) {
return ( return (
<SafeAreaView style={styles.thr_container}> <SafeAreaView style={styles.thr_container} key={'item_code'+index}>
<PicTitDetaiCalcu <PicTitDetaiCalcu
listItem={item} listItem={item}
listIndex={index} listIndex={index}
...@@ -573,7 +573,7 @@ class ProductRightStyle extends Component { ...@@ -573,7 +573,7 @@ class ProductRightStyle extends Component {
// console.log('大类===', item) // console.log('大类===', item)
return ( return (
<SafeAreaView style={styles.oth_container}> <SafeAreaView style={styles.oth_container} key={'item_code'+index}>
<PicTitDetaiCalcu <PicTitDetaiCalcu
listItem={item} listItem={item}
listIndex={index} listIndex={index}
......
app/containers/selfOrder/module/mock/inter_mock.js
...@@ -508,8 +508,8 @@ const inter_9 = //大-中-小类 ...@@ -508,8 +508,8 @@ const inter_9 = //大-中-小类
{ {
"error_code": 0, "error_code": 0,
"error_msg": "成功", "error_msg": "成功",
"data": "data":{
[{ "items": [{
"category_code": "JSTH-01-01", "category_code": "JSTH-01-01",
"category_name": "股骨头", "category_name": "股骨头",
"details": [ "details": [
...@@ -550,9 +550,8 @@ const inter_9 = //大-中-小类 ...@@ -550,9 +550,8 @@ const inter_9 = //大-中-小类
"photos": local_photos "photos": local_photos
} }
] ]
} }]
}
]
} }
//大-小类 //大-小类
......
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