Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 57ae7633 by peii
Options

临调下单

parent eb65aee0
Expand all
Inline Side-by-side
Showing with 102 additions and 10 deletions
app/action/SelfAction.js
...@@ -9,7 +9,8 @@ import { ...@@ -9,7 +9,8 @@ import {
SELF_SUBMIT_SUCCESS, SELF_SUBMIT_SUCCESS,
SELF_SUBMIT_FAILURE, SELF_SUBMIT_FAILURE,
SELF_INIT_DATA, SELF_INIT_DATA,
SET_SELECT_PRODUCT_OPTS SET_SELECT_PRODUCT_OPTS,
SET_LEND_ORDER_VALUES
} from '../base/ActionTypes'; } from '../base/ActionTypes';
import local_inter_mock from '../containers/selfOrder/module/mock/inter_mock' import local_inter_mock from '../containers/selfOrder/module/mock/inter_mock'
import * as R from 'ramda' import * as R from 'ramda'
...@@ -415,4 +416,30 @@ export function setSelectProductOpts(data) { ...@@ -415,4 +416,30 @@ export function setSelectProductOpts(data) {
*/ */
export async function requestSurgeryType(global_domain_config, params) { export async function requestSurgeryType(global_domain_config, params) {
return await GetRequest(global_domain_config, getUrlParams(`/inventory/category/search`, params)) return await GetRequest(global_domain_config, getUrlParams(`/inventory/category/search`, params))
} }
\ No newline at end of file
/**
* @description: 请求临调订单各种显示
* @param {*}
* @return {*}
*/
export function getLendOrderCodeValues() {
return (dispatch, getState) => {
let {global_domain_config, token} = getState().login
const params = {
access_token: token,
value_set_code: 'OBS_MOBILE_LEND_ORDER'
}
GetRequest(global_domain_config, getUrlParams('/system/value_set/search', params)).then(res => {
const values = R.pathOr([], ['data', 'sys_values'])(res)
dispatch(setLendOrderCodeValues(values))
})
}
}
export function setLendOrderCodeValues(values) {
return {
type: SET_LEND_ORDER_VALUES,
values
}
}
app/base/ActionTypes.js
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @FilePath: /BoneHouse_Business_APP/app/base/ActionTypes.js * @FilePath: /BoneHouse_Business_APP/app/base/ActionTypes.js
* @Author: peii * @Author: peii
* @Date: 2022-01-04 10:18:02 * @Date: 2022-01-04 10:18:02
* @LastEditTime: 2022-01-05 14:52:02 * @LastEditTime: 2022-01-05 18:15:40
* @LastEditors: peii * @LastEditors: peii
* @Vision: 1.0 * @Vision: 1.0
* @Description: * @Description:
...@@ -32,6 +32,7 @@ export const SELF_SUBMIT_SUCCESS = "SELF_SUBMIT_SUCCESS" ...@@ -32,6 +32,7 @@ export const SELF_SUBMIT_SUCCESS = "SELF_SUBMIT_SUCCESS"
export const SELF_SUBMIT_FAILURE = "SELF_SUBMIT_FAILURE" export const SELF_SUBMIT_FAILURE = "SELF_SUBMIT_FAILURE"
export const SELF_INIT_DATA = "SELF_INIT_DATA" export const SELF_INIT_DATA = "SELF_INIT_DATA"
export const SET_SELECT_PRODUCT_OPTS = "SET_SELECT_PRODUCT_OPTS" export const SET_SELECT_PRODUCT_OPTS = "SET_SELECT_PRODUCT_OPTS"
export const SET_LEND_ORDER_VALUES = "SET_LEND_ORDER_VALUES"
//-----------quick order--------------------- //-----------quick order---------------------
export const QUICK_ORDER_LIST_NO = "QUICK_ORDER_LIST_NO" export const QUICK_ORDER_LIST_NO = "QUICK_ORDER_LIST_NO"
export const QUICK_ORDER_LIST_DOING = "QUICK_ORDER_LIST_DOING" export const QUICK_ORDER_LIST_DOING = "QUICK_ORDER_LIST_DOING"
......
app/containers/home/HomePage.js
...@@ -14,6 +14,7 @@ import { ...@@ -14,6 +14,7 @@ import {
font_family_regular, font_family_regular,
} from '../../base/BaseStyle' } from '../../base/BaseStyle'
import { exitLoginStatus, requestSysProfile, setNavigation } from '../../action/LoginAction' import { exitLoginStatus, requestSysProfile, setNavigation } from '../../action/LoginAction'
import { getLendOrderCodeValues } from '../../action/SelfAction'
import { getSettlementStatus, getInvoiceStatus } from '../../action/SettlementAction' import { getSettlementStatus, getInvoiceStatus } from '../../action/SettlementAction'
import HeadBackItem from '../common/HeadBackItem' import HeadBackItem from '../common/HeadBackItem'
import StatusBarView from '../common/StatusBarView' import StatusBarView from '../common/StatusBarView'
...@@ -44,6 +45,9 @@ class HomePage extends Component { ...@@ -44,6 +45,9 @@ class HomePage extends Component {
icon: require('../../images/self_order.png'), icon: require('../../images/self_order.png'),
title: '自助下单', title: '自助下单',
page: 'SelfOrderPage', page: 'SelfOrderPage',
params: {
isLendOrder: false,
},
}, },
MOBILE_TRANSFER_APPLICATION: { MOBILE_TRANSFER_APPLICATION: {
icon: require('../../images/trans_order.png'), icon: require('../../images/trans_order.png'),
...@@ -55,6 +59,14 @@ class HomePage extends Component { ...@@ -55,6 +59,14 @@ class HomePage extends Component {
title: '门禁管理', title: '门禁管理',
page: 'DeviceInfoPage', page: 'DeviceInfoPage',
}, },
MOBILE_LEND_ORDER: {
icon: require('../../images/lend_icon.png'),
title: '临调下单',
page: 'SelfOrderPage',
params: {
isLendOrder: true,
},
},
}, },
// 结算模块 // 结算模块
MOBILE_SETTLEMENT_MODULE: { MOBILE_SETTLEMENT_MODULE: {
...@@ -91,7 +103,7 @@ class HomePage extends Component { ...@@ -91,7 +103,7 @@ class HomePage extends Component {
}, },
}, },
tabs: [], tabs: [],
initialPage: 1, initialPage: 0,
icons: { icons: {
MOBILE_BUSINESS_MODULE: { MOBILE_BUSINESS_MODULE: {
defIcon: require('../../images/tab_mod_def.png'), defIcon: require('../../images/tab_mod_def.png'),
...@@ -115,6 +127,7 @@ class HomePage extends Component { ...@@ -115,6 +127,7 @@ class HomePage extends Component {
this.getSysConfigValue() this.getSysConfigValue()
this.props.setNavigation(this.props.navigation) this.props.setNavigation(this.props.navigation)
this.getSettlementStatus() this.getSettlementStatus()
this.getLendOrderCodeValues()
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
...@@ -195,15 +208,32 @@ class HomePage extends Component { ...@@ -195,15 +208,32 @@ class HomePage extends Component {
} }
} }
/**
* @description: 请求结算单状态
* @param {*}
* @return {*}
*/
getSettlementStatus() { getSettlementStatus() {
const { tabs } = this.state const { tabs } = this.state
const settlementModule = R.find(R.propEq('code', 'MOBILE_SETTLEMENT_MODULE'))(tabs) const settlementModule = R.find(R.propEq('code', 'MOBILE_SETTLEMENT_MODULE'))(tabs)
if (isBlank(settlementModule)) return if (isBlank(settlementModule)) return
// 结算单状态
this.props.getSettlementStatus() this.props.getSettlementStatus()
// 直销开票状态
this.props.getInvoiceStatus() this.props.getInvoiceStatus()
} }
getLendOrderCodeValues() {
const { tabs } = this.state
const businessModule = R.find(R.propEq('code', 'MOBILE_BUSINESS_MODULE'))(tabs)
if (isBlank(businessModule)) return
const lendOrder = R.find(R.propEq('function_code', 'MOBILE_LEND_ORDER'))(businessModule.children)
if (isBlank(lendOrder)) return
this.props.getLendOrderCodeValues()
}
// 跳转页面 // 跳转页面
jumpToSubpage(menu) { jumpToSubpage(menu) {
const page = menu.page const page = menu.page
...@@ -213,7 +243,7 @@ class HomePage extends Component { ...@@ -213,7 +243,7 @@ class HomePage extends Component {
if ('LoginPage' === page) { if ('LoginPage' === page) {
this.props.exitLoginStatus() this.props.exitLoginStatus()
} }
this.props.navigation.navigate(page, { title: menu.function_name }) this.props.navigation.navigate(page, { title: menu.function_name, params: menu.params })
} }
render() { render() {
...@@ -350,6 +380,9 @@ const mapDispatchToProps = dispatch => ({ ...@@ -350,6 +380,9 @@ const mapDispatchToProps = dispatch => ({
getInvoiceStatus: () => { getInvoiceStatus: () => {
dispatch(getInvoiceStatus()) dispatch(getInvoiceStatus())
}, },
getLendOrderCodeValues: () => {
dispatch(getLendOrderCodeValues())
},
}) })
export default connect(mapStateToProps, mapDispatchToProps)(HomePage) export default connect(mapStateToProps, mapDispatchToProps)(HomePage)
app/reducers/module/selfOrder.js
/*
* @FilePath: /BoneHouse_Business_APP/app/reducers/module/selfOrder.js
* @Author: peii
* @Date: 2021-02-03 20:59:10
* @LastEditTime: 2022-01-06 10:43:33
* @LastEditors: peii
* @Vision: 1.0
* @Description:
*/
import { import {
SELF_ORDER_LIST_NO, SELF_ORDER_LIST_NO,
SELF_ORDER_LIST_DOING, SELF_ORDER_LIST_DOING,
...@@ -8,7 +17,8 @@ import { ...@@ -8,7 +17,8 @@ import {
SELF_SUBMIT_SUCCESS, SELF_SUBMIT_SUCCESS,
SELF_SUBMIT_FAILURE, SELF_SUBMIT_FAILURE,
SELF_INIT_DATA, SELF_INIT_DATA,
SET_SELECT_PRODUCT_OPTS SET_SELECT_PRODUCT_OPTS,
SET_LEND_ORDER_VALUES
} from '../../base/ActionTypes'; } from '../../base/ActionTypes';
// 自助下单状态 // 自助下单状态
...@@ -17,6 +27,7 @@ const defaultState = { ...@@ -17,6 +27,7 @@ const defaultState = {
submit_self_order_status: SELF_SUBMIT_NO, // 提交订单状态 submit_self_order_status: SELF_SUBMIT_NO, // 提交订单状态
selfOrderOption: {}, // 当前临时存储数据 selfOrderOption: {}, // 当前临时存储数据
local_sele_pro_options: {}, // 选择产品临时存储 local_sele_pro_options: {}, // 选择产品临时存储
lend_order_value_profiles: []
} }
export default selfOrder = (state = defaultState, action) => { export default selfOrder = (state = defaultState, action) => {
...@@ -59,6 +70,10 @@ export default selfOrder = (state = defaultState, action) => { ...@@ -59,6 +70,10 @@ export default selfOrder = (state = defaultState, action) => {
return Object.assign({}, state, { return Object.assign({}, state, {
local_sele_pro_options: action.rawData local_sele_pro_options: action.rawData
}) })
case SET_LEND_ORDER_VALUES:
return Object.assign({}, state, {
lend_order_value_profiles: action.values
})
default: default:
return state; return state;
} }
......
app/utils/Utils.js
...@@ -325,3 +325,19 @@ export const showErrorMessage = (dispatch, err, errorCallback, logTit) => { ...@@ -325,3 +325,19 @@ export const showErrorMessage = (dispatch, err, errorCallback, logTit) => {
export const isBlank = R.anyPass([R.isNil, R.isEmpty]) export const isBlank = R.anyPass([R.isNil, R.isEmpty])
export const isNotBlank = R.complement(isBlank) export const isNotBlank = R.complement(isBlank)
/**
* @description: 解释显示及必填
* @param {*}
* @return {object} {show: boolean, required: boolean}
*/
export const decodeDisplayProfiles = R.curry((codeValues, code) => {
if (isBlank(codeValues)) return { show: false }
const values = R.find(R.propEq('value_code', code))(codeValues);
if (isBlank(values)) return {show: false}
return {
show: R.includes(R.prop('value_tag')(values), ['2', '3']),
required: R.includes(R.prop('value_tag')(values), ['3']),
}
})
\ No newline at end of file
src/pages/invoice/direct/index.tsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @FilePath: /BoneHouse_Business_APP/src/pages/invoice/direct/index.tsx * @FilePath: /BoneHouse_Business_APP/src/pages/invoice/direct/index.tsx
* @Author: peii * @Author: peii
* @Date: 2021-12-27 09:59:21 * @Date: 2021-12-27 09:59:21
* @LastEditTime: 2022-01-04 17:48:31 * @LastEditTime: 2022-01-06 11:45:09
* @LastEditors: peii * @LastEditors: peii
* @Vision: 1.0 * @Vision: 1.0
* @Description: 基于消耗单的直销开票申请 * @Description: 基于消耗单的直销开票申请
......
src/services/api.ts
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @FilePath: /BoneHouse_Business_APP/src/services/api.ts * @FilePath: /BoneHouse_Business_APP/src/services/api.ts
* @Author: peii * @Author: peii
* @Date: 2021-12-19 16:06:26 * @Date: 2021-12-19 16:06:26
* @LastEditTime: 2022-01-05 15:32:02 * @LastEditTime: 2022-01-06 14:24:53
* @LastEditors: peii * @LastEditors: peii
* @Vision: 1.0 * @Vision: 1.0
* @Description: 未重构完全暂用的所有请求 * @Description: 未重构完全暂用的所有请求
...@@ -130,6 +130,6 @@ export default { ...@@ -130,6 +130,6 @@ export default {
process_code: ConsumeProcessCode process_code: ConsumeProcessCode
data: { consume_order_number: string; sur_consume_line_if?: { line_number: string; process_code: string }[] } data: { consume_order_number: string; sur_consume_line_if?: { line_number: string; process_code: string }[] }
}) { }) {
return request({ url: `${v}/consume/update`, data, method: `POST` }) return request({ url: `${v}/surgery/consume/update`, data, method: `POST` })
}, },
} }
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