Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 84c64254 by Denglingling
Options

增加【转单】历史订单查询功能，还未对接后端接口 

(cherry picked from commit dd130d86)
parent ebb67d79
Expand all
Inline Side-by-side
Showing with 109 additions and 17 deletions
app/action/HistorAction.js
...@@ -22,6 +22,11 @@ export const requestHistorOrderType = async (global_domain_config, params) => { ...@@ -22,6 +22,11 @@ export const requestHistorOrderType = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/system/value_set/search', 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))
}
// 借货订单查询 params: {access_token: '', ...} // 借货订单查询 params: {access_token: '', ...}
export function requestGetAllBorrow(params) { export function requestGetAllBorrow(params) {
return (dispatch, getState) => { return (dispatch, getState) => {
...@@ -64,7 +69,6 @@ export function requestGetAllConsume(params) { ...@@ -64,7 +69,6 @@ export function requestGetAllConsume(params) {
if(res.error_code == 0) { if(res.error_code == 0) {
let { data: { sur_consume_headers } } = res let { data: { sur_consume_headers } } = res
dispatch(requestSearchSuccess(sur_consume_headers)); dispatch(requestSearchSuccess(sur_consume_headers));
} else if(res.error_code === 41006) { } else if(res.error_code === 41006) {
show('登录过期，请重新登录'); show('登录过期，请重新登录');
dispatch(exitLoginStatus()); dispatch(exitLoginStatus());
...@@ -75,7 +79,7 @@ export function requestGetAllConsume(params) { ...@@ -75,7 +79,7 @@ export function requestGetAllConsume(params) {
} }
}) })
.catch(err => { .catch(err => {
console.log('------err--====requestGetAllBorrow----', Object.keys(err), err) console.log('------err--====requestGetAllConsume----', Object.keys(err), err)
show(err.error); show(err.error);
dispatch(requestSearchFail()); dispatch(requestSearchFail());
}) })
...@@ -87,8 +91,39 @@ export const requestGetLineFormConsume = async (global_domain_config, params) => ...@@ -87,8 +91,39 @@ export const requestGetLineFormConsume = async (global_domain_config, params) =>
return await GetRequest(global_domain_config, getUrlParams('/surgery/consume_line/search', params)) return await GetRequest(global_domain_config, getUrlParams('/surgery/consume_line/search', params))
} }
// 转单订单查询 // 转单订单查询 params: {access_token: '', ...} ----- 待定
export function requestGetAllTrans(params) {
return (dispatch, getState) => {
dispatch(requestSearching())
let {global_domain_config} = getState().login
GetRequest(global_domain_config, getUrlParams('xxxx', params))
.then(res => {
if(res.error_code == 0) {
// let { data: { sur_consume_headers } } = res
// dispatch(requestSearchSuccess(sur_consume_headers));
} else if(res.error_code === 41006) {
show('登录过期，请重新登录');
dispatch(exitLoginStatus());
} else {
let error_msg = res.error_msg || res.message
show(error_msg);
dispatch(requestSearchFail());
}
})
.catch(err => {
console.log('------err--====requestGetAllTrans----', Object.keys(err), err)
show(err.error);
dispatch(requestSearchFail());
})
}
}
// 转单订单-行表查询 params: {access_token: '', xxx: ''} ----- 待定
export const requestGetLineFormTrans = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('xxx', params))
}
function requestSearching() { function requestSearching() {
return { return {
......
app/containers/common/DateModel.js
...@@ -4,7 +4,6 @@ import { ...@@ -4,7 +4,6 @@ import {
Text, Text,
StyleSheet, StyleSheet,
Modal, Modal,
ScrollView,
TouchableOpacity, TouchableOpacity,
SafeAreaView SafeAreaView
} from 'react-native'; } from 'react-native';
......
app/containers/common/HeadBackItem.js
...@@ -38,12 +38,17 @@ class HeadBackItem extends Component { ...@@ -38,12 +38,17 @@ class HeadBackItem extends Component {
} }
goLogin() { goLogin() {
let { navigation } = this.props let { callback, navigation } = this.props
this.props.exitLoginStatus() this.props.exitLoginStatus()
show('退出登录') show('退出登录')
if(callback && callback instanceof Function) {
callback()
setTimeout(() => { setTimeout(() => {
navigation.navigate('LoginPage') navigation.navigate('LoginPage')
}, 300) }, 500)
} else {
navigation.navigate('LoginPage')
}
} }
render() { render() {
......
app/containers/historicalOrder/HistoricalOrderPage.js
...@@ -34,7 +34,8 @@ import { ...@@ -34,7 +34,8 @@ import {
} from '../../base/ActionTypes'; } from '../../base/ActionTypes';
import { import {
requestGetAllBorrow, requestGetAllBorrow,
requestGetAllConsume requestGetAllConsume,
requestGetAllTrans
} from '../../action/HistorAction'; } from '../../action/HistorAction';
import { show, cloneObject } from '../../utils/Utils'; import { show, cloneObject } from '../../utils/Utils';
import moment from 'moment'; import moment from 'moment';
...@@ -56,9 +57,10 @@ class HistoricalOrderPage extends Component { ...@@ -56,9 +57,10 @@ class HistoricalOrderPage extends Component {
title: '消耗订单', title: '消耗订单',
selIsAct: false selIsAct: false
}, },
// { {
// title: '转单订单' title: '转单订单',
// } selIsAct: false
}
], ],
topActiveIndex: 0, topActiveIndex: 0,
contOptionData: [ contOptionData: [
...@@ -89,11 +91,14 @@ class HistoricalOrderPage extends Component { ...@@ -89,11 +91,14 @@ class HistoricalOrderPage extends Component {
"COLLECTED,RETURNING_WAITING_CONFIRM", "COLLECTED,RETURNING_WAITING_CONFIRM",
"RETURNED,CLOSED,REJECTED,CANCELED,CONSUMED" "RETURNED,CLOSED,REJECTED,CANCELED,CONSUMED"
], ],
searchComsumeStatus: [ // 【借货】对应的状态值 searchComsumeStatus: [ // 【消耗】对应的状态值
"N",
"Y"
],
searchTransStatus: [ // 【转单】对应的状态值
"N", "N",
"Y" "Y"
], ],
searchTransStatus: [], // 【转单】对应的状态值
whetherCallClick: false, // 是否调用筛选弹窗的查询 whetherCallClick: false, // 是否调用筛选弹窗的查询
wheShowNoData: false, // 是否展示无数据提示 wheShowNoData: false, // 是否展示无数据提示
...@@ -240,6 +245,7 @@ class HistoricalOrderPage extends Component { ...@@ -240,6 +245,7 @@ class HistoricalOrderPage extends Component {
props.requestGetAllConsume(params) props.requestGetAllConsume(params)
break; break;
case 2: case 2:
props.requestGetAllTrans(params)
break; break;
default: default:
break; break;
...@@ -442,7 +448,7 @@ class HistoricalOrderPage extends Component { ...@@ -442,7 +448,7 @@ class HistoricalOrderPage extends Component {
<Text <Text
style={[ style={[
styles.cont_rig_status, styles.cont_rig_status,
item.local_his_status == '待审核' ? styles.status_audit : '', (item.local_his_status == '待审核' || item.local_his_status == '已提交') ? styles.status_audit : '',
item.local_his_status == '待还货' ? styles.status_return : '', item.local_his_status == '待还货' ? styles.status_return : '',
item.local_his_status == '其他' ? styles.status_other : '' item.local_his_status == '其他' ? styles.status_other : ''
]}> ]}>
...@@ -502,8 +508,8 @@ const styles = StyleSheet.create({ ...@@ -502,8 +508,8 @@ const styles = StyleSheet.create({
borderBottomWidth: 1 borderBottomWidth: 1
}, },
top_touch_cont: { top_touch_cont: {
// width: '33.33333%' width: '33.33333%'
width: '50%' // width: '50%'
}, },
top_inner: { top_inner: {
justifyContent: 'center', justifyContent: 'center',
...@@ -634,6 +640,9 @@ const mapDispatchToProps = (dispatch) => { ...@@ -634,6 +640,9 @@ const mapDispatchToProps = (dispatch) => {
}, },
requestGetAllConsume: (params) => { requestGetAllConsume: (params) => {
dispatch(requestGetAllConsume(params)) dispatch(requestGetAllConsume(params))
},
requestGetAllTrans: (params) => {
dispatch(requestGetAllTrans(params))
} }
} }
} }
......
app/containers/historicalOrder/module/LineOrderPage.js
...@@ -29,7 +29,8 @@ import { CellTextStyle } from '../../common/CellTextStyle'; ...@@ -29,7 +29,8 @@ import { CellTextStyle } from '../../common/CellTextStyle';
import LodingModel from '../../common/LodingModel'; import LodingModel from '../../common/LodingModel';
import { import {
requestGetLineFormBorrow, requestGetLineFormBorrow,
requestGetLineFormConsume requestGetLineFormConsume,
requestGetLineFormTrans
} from '../../../action/HistorAction'; } from '../../../action/HistorAction';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { show } from '../../../utils/Utils'; import { show } from '../../../utils/Utils';
...@@ -125,6 +126,7 @@ class LineOrderPage extends Component { ...@@ -125,6 +126,7 @@ class LineOrderPage extends Component {
break; break;
case 2: case 2:
// 转单 // 转单
this.getReqTransLineData(data)
break; break;
default: default:
break; break;
...@@ -210,6 +212,48 @@ class LineOrderPage extends Component { ...@@ -210,6 +212,48 @@ class LineOrderPage extends Component {
} }
} }
// 获取转单订单行数据 -- 待定
async getReqTransLineData(supData) {
// let that = this
// let {consumaData} = that.state
// let {props} = this
// that.changeSubLoding(true)
// let params = {
// access_token: props.token,
// consume_order_number: supData.local_his_number
// }
// let conResult = await requestGetLineFormTrans(props.global_domain_config, params)
// if(conResult.error_code == 0) {
// that.changeSubLoding(false)
// // 成功
// let {sur_consume_lines} = conResult.data
// let tempSum = 0
// let tempConQuanSum = 0
// sur_consume_lines.length && sur_consume_lines.forEach(item => {
// if(item.sale_price) {
// tempSum += Number(item.sale_price)
// }
// if(item.consumed_quantity) {
// tempConQuanSum += Number(item.consumed_quantity)
// }
// })
// consumaData.subOption = [...sur_consume_lines]
// consumaData.allOptSum = tempSum
// consumaData.allConmQuanSum = tempConQuanSum
// that.setState({
// consumaData
// })
// } else if(conResult.error_code == 41006) {
// that.changeSubLoding(false)
// show('登录过期，请重新登录');
// props.exitLoginStatus();
// } else {
// that.changeSubLoding(false)
// let error_msg = conResult.error_msg || conResult.message
// show(error_msg);
// }
}
// 耗材明细 隐藏/显示子项 // 耗材明细 隐藏/显示子项
handleDetailBtmCheck(flagType) { handleDetailBtmCheck(flagType) {
let {consumaData} = this.state let {consumaData} = this.state
...@@ -403,7 +447,7 @@ class LineOrderPage extends Component { ...@@ -403,7 +447,7 @@ class LineOrderPage extends Component {
<View style={styles.fo_sta_inner}> <View style={styles.fo_sta_inner}>
<Text style={[ <Text style={[
styles.fo_sta_txt, styles.fo_sta_txt,
orderSupOptions.local_his_status == '待审核' ? styles.status_audit : '', (orderSupOptions.local_his_status == '待审核' || orderSupOptions.local_his_status == '已提交') ? styles.status_audit : '',
orderSupOptions.local_his_status == '待还货' ? styles.status_return : '', orderSupOptions.local_his_status == '待还货' ? styles.status_return : '',
orderSupOptions.local_his_status == '其他' ? styles.status_other : '' orderSupOptions.local_his_status == '其他' ? styles.status_other : ''
]}> ]}>
......
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