Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit de4dcb5c by Denglingling
Options

增加【器械消耗】模块需要的组件

parent 7f6c648e
Expand all
Inline Side-by-side
Showing with 22 additions and 31 deletions
app/Router.js
...@@ -13,6 +13,7 @@ import ChooseProductPage from './containers/selfOrder/module/ChooseProductPage'; ...@@ -13,6 +13,7 @@ import ChooseProductPage from './containers/selfOrder/module/ChooseProductPage';
import EditStencilPage from './containers/selfOrder/module/EditStencilPage'; import EditStencilPage from './containers/selfOrder/module/EditStencilPage';
import SubSuccessPage from './containers/selfOrder/module/SubSuccessPage'; import SubSuccessPage from './containers/selfOrder/module/SubSuccessPage';
import EquipConsuPage from './containers/equipConsu/EquipConsuPage'; import EquipConsuPage from './containers/equipConsu/EquipConsuPage';
import ConsumDetailsPage from './containers/equipConsu//module/ConsumDetailsPage';
import QuickOrderPage from './containers/quickOrder/QuickOrderPage'; import QuickOrderPage from './containers/quickOrder/QuickOrderPage';
import TransOrderPage from './containers/transOrder/TransOrderPage'; import TransOrderPage from './containers/transOrder/TransOrderPage';
import TransSearchPage from './containers/transOrder/module/TransSearchPage'; import TransSearchPage from './containers/transOrder/module/TransSearchPage';
...@@ -26,6 +27,7 @@ const Router = createAppContainer(createStackNavigator({ ...@@ -26,6 +27,7 @@ const Router = createAppContainer(createStackNavigator({
EditStencilPage: {screen: EditStencilPage}, EditStencilPage: {screen: EditStencilPage},
SubSuccessPage: {screen: SubSuccessPage}, SubSuccessPage: {screen: SubSuccessPage},
EquipConsuPage: {screen: EquipConsuPage}, EquipConsuPage: {screen: EquipConsuPage},
ConsumDetailsPage: {screen: ConsumDetailsPage},
QuickOrderPage: {screen: QuickOrderPage}, QuickOrderPage: {screen: QuickOrderPage},
TransOrderPage: {screen: TransOrderPage}, TransOrderPage: {screen: TransOrderPage},
TransSearchPage: {screen: TransSearchPage}, TransSearchPage: {screen: TransSearchPage},
......
app/containers/equipConsu/EquipConsuPage.js
...@@ -326,9 +326,9 @@ class EquipConsuPage extends Component { ...@@ -326,9 +326,9 @@ class EquipConsuPage extends Component {
// 耗材明细 点击 // 耗材明细 点击
handleConsumDetailCheck() { handleConsumDetailCheck() {
console.warn('耗材明细------check') console.warn('耗材明细------check')
// this.props.navigation.navigate('TransSearchPage', { this.props.navigation.navigate('ConsumDetailsPage', {
// title: '器械消耗 - 添加明细' title: '器械消耗 - 添加明细'
// }) })
} }
// 添加图片 点击 // 添加图片 点击
...@@ -344,18 +344,6 @@ class EquipConsuPage extends Component { ...@@ -344,18 +344,6 @@ class EquipConsuPage extends Component {
// 返回备注以上的元素 // 返回备注以上的元素
renderListItem() { renderListItem() {
let { listOptionData, dateModelPop } = this.state let { listOptionData, dateModelPop } = this.state
let {userInfo:{ person_name }} = this.props
if(!isEmpty(person_name)) {
// this.setState({
// listOptionData: listOptionData.map(item => {
// if(item.title === '销售员') {
// item.name = person_name
// item.value = person_name
// }
// return item
// })
// })
}
return( return(
<View style={styles.list_cont}> <View style={styles.list_cont}>
...@@ -366,7 +354,7 @@ class EquipConsuPage extends Component { ...@@ -366,7 +354,7 @@ class EquipConsuPage extends Component {
<CellTextStyle> <CellTextStyle>
<AsteriskTextStyle>*</AsteriskTextStyle> <AsteriskTextStyle>*</AsteriskTextStyle>
<TitleTextStyle>{'销售员'}</TitleTextStyle> <TitleTextStyle>{'销售员'}</TitleTextStyle>
<ContInputTextStyle editable={false} defaultValue={listOptionData[0].value}></ContInputTextStyle> <ContInputTextStyle editable={false} defaultValue={listOptionData[0].name}></ContInputTextStyle>
</CellTextStyle> </CellTextStyle>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
...@@ -648,7 +636,7 @@ class EquipConsuPage extends Component { ...@@ -648,7 +636,7 @@ class EquipConsuPage extends Component {
{ {
state.listOptionData[12].isShowSub ? state.listOptionData[12].isShowSub ?
<View style={list_common_item.detail_sub_inner}> <View style={list_common_item.detail_sub_inner}>
<ScrollView {/* <ScrollView
style={list_common_item.detail_scroll} style={list_common_item.detail_scroll}
onPress={() => {console.log('--触碰---')}} onPress={() => {console.log('--触碰---')}}
onScrollBeginDrag={() => {console.log('--滚动---')}} onScrollBeginDrag={() => {console.log('--滚动---')}}
...@@ -659,7 +647,12 @@ class EquipConsuPage extends Component { ...@@ -659,7 +647,12 @@ class EquipConsuPage extends Component {
return this.renderConDeSubItem(item, index) return this.renderConDeSubItem(item, index)
}) })
} }
</ScrollView> </ScrollView> */}
{
state.listOptionData[12].subOption.map((item, index) => {
return this.renderConDeSubItem(item, index)
})
}
</View> : null </View> : null
} }
</View> : null </View> : null
...@@ -746,26 +739,22 @@ class EquipConsuPage extends Component { ...@@ -746,26 +739,22 @@ class EquipConsuPage extends Component {
style={styles.equip_main} style={styles.equip_main}
showsVerticalScrollIndicator={false} showsVerticalScrollIndicator={false}
> >
<Text>'器械消耗'</Text>
{this.renderListItem()}
{this.renderListItem()}
{this.renderRemarksItem()} {this.renderRemarksItem()}
{this.renderConsumablesDetailsItem()} {this.renderConsumablesDetailsItem()}
{this.renderAddPicturesItem()} {this.renderAddPicturesItem()}
<FooterBtnStyle
style={canSubFlag ? styles.sub_btn_pro : ''}
activeOpacity={canSubFlag ? .8 : 1}
title={'生成订单'}
textStyle= {styles.sub_btn}
onPress={() => this.handleSubmit()}
/>
</ScrollView> </ScrollView>
</SafeAreaView> </SafeAreaView>
<FooterBtnStyle
style={canSubFlag ? styles.sub_btn_pro : ''}
activeOpacity={canSubFlag ? .8 : 1}
title={'生成订单'}
textStyle= {styles.sub_btn}
onPress={() => this.handleSubmit()}
/>
</View> </View>
); );
} }
......
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