Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 4052ca0a by peii
Options

Merge branch 'develop' into product

parents a5c65353 10f67d54
Inline Side-by-side
Showing with 102 additions and 4 deletions
app/containers/common/listDataComponent/PageListArrow.js
...@@ -56,7 +56,7 @@ class PageListArrow extends Component { ...@@ -56,7 +56,7 @@ class PageListArrow extends Component {
<View style={styles.item_container}> <View style={styles.item_container}>
<TouchableOpacity <TouchableOpacity
activeOpacity={listActOpa} activeOpacity={listActOpa}
onPress={() => {return listCallBack ? listCallBack() : ''}} onPress={() => {return listCallBack && !listIsAudio ? listCallBack() : ''}}
> >
<CellTextStyle style={listCellStyle ? listCellStyle : ''}> <CellTextStyle style={listCellStyle ? listCellStyle : ''}>
{ listHasAster ? <AsteriskTextStyle>*</AsteriskTextStyle> : null } { listHasAster ? <AsteriskTextStyle>*</AsteriskTextStyle> : null }
......
app/containers/quickOrder/QuickOrderPage.js
...@@ -204,7 +204,19 @@ class EquipConsuPage extends Component { ...@@ -204,7 +204,19 @@ class EquipConsuPage extends Component {
title: '送货员', title: '送货员',
name: '请选择', name: '请选择',
value: '', value: '',
} },
{
id: '18',
title: '是否补单', // 同意替换同品不同器械包
value: 'N',
isRedio: 'N', // 单选
},
{
id: '19',
title: '是否长期借货', // 同意替换同品不同器械包
value: 'N',
isRedio: 'N', // 单选
},
], ],
subInitListOption: [], // 提交成功后，初始化当前数据 subInitListOption: [], // 提交成功后，初始化当前数据
submitOption: { // 提交的信息 submitOption: { // 提交的信息
...@@ -270,6 +282,8 @@ class EquipConsuPage extends Component { ...@@ -270,6 +282,8 @@ class EquipConsuPage extends Component {
OBS_MOBILE_BM_DISPLAY: 0, OBS_MOBILE_BM_DISPLAY: 0,
OBS_MOBILE_SUR_FOLLOWER_DISPLAY: 0, OBS_MOBILE_SUR_FOLLOWER_DISPLAY: 0,
OBS_MOBILE_DELIVERYMAN_DISPLAY: 0, OBS_MOBILE_DELIVERYMAN_DISPLAY: 0,
OBS_MOBILE_SUPPLYMENT_DISPLAY: 0,
OBS_MOBILE_LONG_COLLECT_DISPLAY: 0,
}, },
departments: [] departments: []
} }
...@@ -1509,6 +1523,9 @@ class EquipConsuPage extends Component { ...@@ -1509,6 +1523,9 @@ class EquipConsuPage extends Component {
sysValues.OBS_MOBILE_BM_DISPLAY > 0 && (tempSubOption.business_manager_code = state.listOptionData[15].value) sysValues.OBS_MOBILE_BM_DISPLAY > 0 && (tempSubOption.business_manager_code = state.listOptionData[15].value)
sysValues.OBS_MOBILE_SUR_FOLLOWER_DISPLAY > 0 && (tempSubOption.surgery_follower_code = state.listOptionData[16].value) sysValues.OBS_MOBILE_SUR_FOLLOWER_DISPLAY > 0 && (tempSubOption.surgery_follower_code = state.listOptionData[16].value)
sysValues.OBS_MOBILE_DELIVERYMAN_DISPLAY > 0 && (tempSubOption.deliveryman_code = state.listOptionData[17].value) sysValues.OBS_MOBILE_DELIVERYMAN_DISPLAY > 0 && (tempSubOption.deliveryman_code = state.listOptionData[17].value)
sysValues.OBS_MOBILE_SUPPLYMENT_DISPLAY > 0 && (tempSubOption.supplement_flag = state.listOptionData[18].value)
sysValues.OBS_MOBILE_LONG_COLLECT_DISPLAY > 0 && (tempSubOption.is_long_collected = state.listOptionData[19].value)
let params = { let params = {
access_token: props.token, access_token: props.token,
data: { ...tempSubOption } data: { ...tempSubOption }
...@@ -1614,6 +1631,26 @@ class EquipConsuPage extends Component { ...@@ -1614,6 +1631,26 @@ class EquipConsuPage extends Component {
that.handleSubmit() that.handleSubmit()
}) })
} }
handleCertAndItemCheck(curData, certFlag) {
console.log('更新', curData, certFlag)
let { listOptionData } = this.state
let that = this
listOptionData.map(function (item) {
if (item.title === curData.title) {
item.value = certFlag
}
})
that.setState(
{
listOptionData: listOptionData,
},
() => {
that.changeCanSub()
},
)
}
// 库存不足弹窗关闭 // 库存不足弹窗关闭
handleNotEnoughCloseModal(show) { handleNotEnoughCloseModal(show) {
this.setState({ this.setState({
...@@ -1812,6 +1849,29 @@ class EquipConsuPage extends Component { ...@@ -1812,6 +1849,29 @@ class EquipConsuPage extends Component {
listCallBack={() => this.handleOrderCheck(listOptionData[9])} listCallBack={() => this.handleOrderCheck(listOptionData[9])}
listHasArrow={true} listHasArrow={true}
/> />
{sysValues.OBS_MOBILE_SUPPLYMENT_DISPLAY > 1 && (
<PageListArrow
listHasAster={sysValues.OBS_MOBILE_SUPPLYMENT_DISPLAY > 2}
listActOpa={0.8}
listItem={listOptionData[18]}
listTitle={'title'}
listValue={'value'}
listCallBack={radioFlag => this.handleCertAndItemCheck(listOptionData[18], radioFlag)}
listIsAudio={true}
/>
)}
{sysValues.OBS_MOBILE_LONG_COLLECT_DISPLAY > 1 && (
<PageListArrow
listHasAster={sysValues.OBS_MOBILE_LONG_COLLECT_DISPLAY > 2}
listActOpa={0.8}
listItem={listOptionData[19]}
listTitle={'title'}
listValue={'value'}
listCallBack={radioFlag => this.handleCertAndItemCheck(listOptionData[19], radioFlag)}
listIsAudio={true}
/>
)}
{ {
sysValues.OBS_MOBILE_BOR_WARE_REQUIRED > 1 ? sysValues.OBS_MOBILE_BOR_WARE_REQUIRED > 1 ?
<PageListArrow <PageListArrow
......
app/containers/selfOrder/SelfOrderPage.js
...@@ -254,6 +254,18 @@ class SelfOrderPage extends Component { ...@@ -254,6 +254,18 @@ class SelfOrderPage extends Component {
title: '病历号', title: '病历号',
value: '', value: '',
}, },
{
id: '25',
title: '是否补单', // 同意替换同品不同器械包
value: 'N',
isRedio: 'N', // 单选
},
{
id: '26',
title: '是否长期借货', // 同意替换同品不同器械包
value: 'N',
isRedio: 'N', // 单选
},
], ],
subInitListOption: [], // 存储最初数据 subInitListOption: [], // 存储最初数据
submitOption: { submitOption: {
...@@ -319,6 +331,8 @@ class SelfOrderPage extends Component { ...@@ -319,6 +331,8 @@ class SelfOrderPage extends Component {
OBS_MOBILE_SUR_FOLLOWER_DISPLAY: 0, OBS_MOBILE_SUR_FOLLOWER_DISPLAY: 0,
OBS_MOBILE_DELIVERYMAN_DISPLAY: 0, OBS_MOBILE_DELIVERYMAN_DISPLAY: 0,
OBS_MOBILE_BOR_WARE_REQUIRED: 0, OBS_MOBILE_BOR_WARE_REQUIRED: 0,
OBS_MOBILE_SUPPLYMENT_DISPLAY: 0,
OBS_MOBILE_LONG_COLLECT_DISPLAY: 0,
}, },
departments: [], departments: [],
surgery_types: [], surgery_types: [],
...@@ -1920,8 +1934,8 @@ class SelfOrderPage extends Component { ...@@ -1920,8 +1934,8 @@ class SelfOrderPage extends Component {
(tempSubOption.hospitalization_number = state.listOptionData[23].value) (tempSubOption.hospitalization_number = state.listOptionData[23].value)
isLendOrder && patientIdProfile.show && (tempSubOption.patient_id = state.listOptionData[24].value) isLendOrder && patientIdProfile.show && (tempSubOption.patient_id = state.listOptionData[24].value)
// tempSubOption.replace_item_flag = state.listOptionData[10].replace_item_flag sysValues.OBS_MOBILE_SUPPLYMENT_DISPLAY > 0 && (tempSubOption.supplement_flag = state.listOptionData[25].value)
// tempSubOption.take_cert_flag = state.listOptionData[10].take_cert_flag sysValues.OBS_MOBILE_LONG_COLLECT_DISPLAY > 0 && (tempSubOption.is_long_collected = state.listOptionData[26].value)
let params = { let params = {
access_token: props.token, access_token: props.token,
...@@ -2544,6 +2558,30 @@ class SelfOrderPage extends Component { ...@@ -2544,6 +2558,30 @@ class SelfOrderPage extends Component {
listIsAudio={true} listIsAudio={true}
/> />
{sysValues.OBS_MOBILE_SUPPLYMENT_DISPLAY > 1 && (
<PageListArrow
listHasAster={sysValues.OBS_MOBILE_SUPPLYMENT_DISPLAY > 2}
listActOpa={0.8}
listItem={listOptionData[25]}
listTitle={'title'}
listValue={'value'}
listCallBack={radioFlag => this.handleCertAndItemCheck(listOptionData[25], radioFlag)}
listIsAudio={true}
/>
)}
{sysValues.OBS_MOBILE_LONG_COLLECT_DISPLAY > 1 && (
<PageListArrow
listHasAster={sysValues.OBS_MOBILE_LONG_COLLECT_DISPLAY > 2}
listActOpa={0.8}
listItem={listOptionData[26]}
listTitle={'title'}
listValue={'value'}
listCallBack={radioFlag => this.handleCertAndItemCheck(listOptionData[26], radioFlag)}
listIsAudio={true}
/>
)}
{sysValues.OBS_MOBILE_BOR_WARE_REQUIRED > 1 ? ( {sysValues.OBS_MOBILE_BOR_WARE_REQUIRED > 1 ? (
<PageListArrow <PageListArrow
listActOpa={0.8} listActOpa={0.8}
......
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