Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 26965bbc by Denglingling
Options

新增【借货订单】历史查询-手术类型接口函数；新增国药pro域名 

(cherry picked from commit 2126b9bc)
parent fcfbb2f0
Inline Side-by-side
Showing with 55 additions and 40 deletions
app/action/HistorAction.js
......@@ -22,16 +22,21 @@ export const requestHistorOrderType = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/system/value_set/search', params))
}
// 获取来源借货订单号 parmas={access_token: '', org_code: '', seller_code: '', customer_code: '', collect_header_status: 'COLLECTING_WAITING_CONFIRM,CONFIRM_COLLECT,COLLECTED_WAITING_CONFIRMED,APPROVED,COLLECTED'} -- 不用这个！！！！
export const requestHistorSourBorOrdNum = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/surgery/collect_order/search', params))
}
// // 获取来源借货订单号 parmas={access_token: '', org_code: '', seller_code: '', customer_code: '', collect_header_status: 'COLLECTING_WAITING_CONFIRM,CONFIRM_COLLECT,COLLECTED_WAITING_CONFIRMED,APPROVED,COLLECTED'} -- 不用这个！！！！
// export const requestHistorSourBorOrdNum = async (global_domain_config, params) => {
// return await GetRequest(global_domain_config, getUrlParams('/surgery/collect_order/search', params))
// }
// 获取目标借货订单/来源借货订单 parmas={access_token: '', seller_code: ''}
export const requestHistorTarOrSourOrd = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/surgery/trans_header/search', params))
}
// 获取手术类型 params={access_token:'', value_set_code:'ORTHOPEDICS_PRODUCT_CLASS'}
export const requestHistorSurgeryType = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/system/value_set/search', params))
}
// 借货订单查询 params: {access_token: '', ...}
export function requestGetAllBorrow(params) {
return (dispatch, getState) => {
......
app/containers/historicalOrder/module/FilterModel.js
......@@ -41,8 +41,8 @@ import {
requestHistorOrganizations,
requestHistorSurgeryHospital,
requestHistorOrderType,
requestHistorSourBorOrdNum,
requestHistorTarOrSourOrd
requestHistorTarOrSourOrd,
requestHistorSurgeryType
} from '../../../action/HistorAction';
import { show, dedupQuoteArray, cloneObject } from '../../../utils/Utils';
import moment from 'moment';
......@@ -71,10 +71,6 @@ class FilterModel extends Component {
// {
// name: '测试1',
// value: '测试1'
// },
// {
// name: '测试2',
// value: '测试2'
// }
],
dateModelPop: false, // 日期选择器
......@@ -87,7 +83,7 @@ class FilterModel extends Component {
bill_to_site_code: '', // 收单地点
ship_to_site_code: '', // 收货地点
doctor_name: '', // 主治医生
surgery_type_code: '', // 手术类型
// surgery_type_code: '', // 手术类型 -- 不用此参数
surgery_date_from: '', // 手术时间开始
surgery_date_to: '', // 手术时间结束
order_type_code: '' // 订单类型
......@@ -295,23 +291,6 @@ class FilterModel extends Component {
subBorrowInitListOption: [], // 初始化 [借货]
subConsumeInitListOption: [], // 初始化 [消耗]
subTransferInitListOption: [], // 初始化 [转单]
surgeryTypeOption: [ // 手术类型
{
name:'创伤',
value:'创伤'
},{
name:'关节',
value:'关节'
},
{
name:'脊柱',
value:'脊柱'
},
{
name:'运动医学',
value:'运动医学'
}
],
localCustomersOption: [], // 当前医院信息：客户名称、收单地点、收货地点、主治医生
searchBorrowStatus: [ // 【借货】对应的状态值
"ENTERED,SUBMITTED",
......@@ -910,9 +889,10 @@ class FilterModel extends Component {
}
}
// 手术类型 - 筛选
// 手术类型 - 筛选 -- 不用此参数
handleSurTypeCheck() {
let {borrowListOptionData, surgeryTypeOption} = this.state
let {borrowListOptionData} = this.state
let {props} = this
let that = this
this.setState({
currentTitle: '手术类型',
......@@ -920,11 +900,41 @@ class FilterModel extends Component {
name: borrowListOptionData[7].name,
value: borrowListOptionData[7].value
}
}, () => {
that.setState({
showTypePop: true,
listCurrentOption: [...surgeryTypeOption]
})
}, async() => {
let params = {
access_token: props.token,
value_set_code: 'ORTHOPEDICS_PRODUCT_CLASS'
}
let orgResult = await requestHistorSurgeryType(props.global_domain_config, params)
that.props.callSupLoading(true)
if(orgResult.error_code == 0) {
that.props.callSupLoading(false)
let { data: { sys_values } } = orgResult
if(sys_values.length === 0) {
that.showErrorModel(`当前手术类型为空`)
return
}
let resultArr = []
sys_values.forEach(item => {
let obj = {}
obj.name = item.value_name
obj.value = item.value_name
resultArr.push(obj)
})
tempOption = [...resultArr]
that.setState({
showTypePop: true,
listCurrentOption: [...tempOption]
})
} else if(orgResult.error_code == 41006) {
that.props.callSupLoading(false)
that.showErrorModel(`登录过期，请重新登录`)
props.exitLoginStatus();
} else {
that.props.callSupLoading(false)
let error_msg = orgResult.error_msg || orgResult.message
that.showErrorModel(error_msg);
}
})
}
......@@ -1334,7 +1344,7 @@ class FilterModel extends Component {
} else {
tempSubOption.doctor_name = borrowListOptionData[6].value
}
tempSubOption.surgery_type_code = borrowListOptionData[7].value
// tempSubOption.surgery_type_code = borrowListOptionData[7].value
tempSubOption.surgery_date_from = borrowListOptionData[8].value
tempSubOption.surgery_date_to = borrowListOptionData[9].value
tempSubOption.order_type_code = borrowListOptionData[10].value
......@@ -1725,7 +1735,7 @@ class FilterModel extends Component {
: null
}
<View style={styles.qui_cell}>
{/* <View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>手术类型</Text>
<TouchableOpacity
activeOpacity={.8}
......@@ -1737,7 +1747,7 @@ class FilterModel extends Component {
<Image source={require('../../../images/arr_rig.png')} style={icon_style} />
</View>
</TouchableOpacity>
</View>
</View> */}
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>手术时间</Text>
<View style={styles.qui_cell_rig_date}>
......
app/reducers/module/login.js
......@@ -17,8 +17,8 @@ const defaultState = {
username:'',
password:'',
global_domain_config: 'https://obs.uat.guke.tech',
// 默认【深圳仓】https://obs.uat.guke.tech；【十方】https://obs.uat.sfrx.guke.tech
// 【国药】https://obs.dev.guke.tech
// 默认【深圳仓】https://obs.uat.guke.tech；【十方uat】https://obs.uat.sfrx.guke.tech
// 【国药dev】https://obs.dev.guke.tech；【国药pro】https://obs-pro.gyjtsx.com
}
export default login = (state = defaultState, action) => {
......
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