Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit d897b6d0 by wong.peiyi
Options

Merge branch 'develop' into product

parents 15e67e1a 1659da2f
Expand all
Inline Side-by-side
Showing with 58 additions and 60 deletions
app/containers/historicalOrder/HistoricalOrderPage.js
...@@ -44,7 +44,7 @@ import FilterModel from './module/FilterModel'; ...@@ -44,7 +44,7 @@ import FilterModel from './module/FilterModel';
class HistoricalOrderPage extends Component { class HistoricalOrderPage extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
searchValue: '', searchValue: '',
isSubLoding: false, // 加载中弹窗 isSubLoding: false, // 加载中弹窗
lodingTitle: '加载中', lodingTitle: '加载中',
...@@ -73,14 +73,14 @@ class HistoricalOrderPage extends Component { ...@@ -73,14 +73,14 @@ class HistoricalOrderPage extends Component {
], ],
isShowSelect: false, // 显示/隐藏 筛选内容 isShowSelect: false, // 显示/隐藏 筛选内容
borrowStatus: ['待审核','待出库','待还货','其他'], borrowStatus: ['待审核','待出库','待还货','其他'],
consumeStatus: ['待审核','已消耗'], consumeStatus: ['待确认消耗','已确认消耗'],
transferStatus: ['已输入', '已审批', '已驳回', '已提交', '已取消'], transferStatus: ['已输入', '已审批', '已驳回', '已提交', '已取消'],
searchBorrowStatus: [ // 【借货】对应的状态值 searchBorrowStatus: [ // 【借货】对应的状态值
"ENTERED,SUBMITTED", "ENTERED,SUBMITTED",
"APPROVED,COLLECTING_WAITING_CONFIRM", "APPROVED,COLLECTING_WAITING_CONFIRM",
"COLLECTED,RETURNING_WAITING_CONFIRM", "COLLECTED,RETURNING_WAITING_CONFIRM",
"RETURNED,CLOSED,REJECTED,CANCELED,CONSUMED" "RETURNED,CLOSED,REJECTED,CANCELED,CONSUMED"
], ],
searchComsumeStatus: [ // 【消耗】对应的状态值 searchComsumeStatus: [ // 【消耗】对应的状态值
"N", "N",
"Y" "Y"
...@@ -90,7 +90,7 @@ class HistoricalOrderPage extends Component { ...@@ -90,7 +90,7 @@ class HistoricalOrderPage extends Component {
], ],
whetherCallClick: false, // 是否调用筛选弹窗的查询 whetherCallClick: false, // 是否调用筛选弹窗的查询
wheShowNoData: false, // 是否展示无数据提示 wheShowNoData: false, // 是否展示无数据提示
} }
} }
...@@ -106,7 +106,7 @@ class HistoricalOrderPage extends Component { ...@@ -106,7 +106,7 @@ class HistoricalOrderPage extends Component {
case LOGIN_NO: case LOGIN_NO:
navigation.navigate('LoginPage') navigation.navigate('LoginPage')
break; break;
default: default:
break; break;
} }
} }
...@@ -124,12 +124,12 @@ class HistoricalOrderPage extends Component { ...@@ -124,12 +124,12 @@ class HistoricalOrderPage extends Component {
that.changeCurrentOption(); that.changeCurrentOption();
}) })
}, 500) }, 500)
break; break;
case HISTOR_ORDER_SEARCH_FAILURE: case HISTOR_ORDER_SEARCH_FAILURE:
that.changeSubLoding(false) that.changeSubLoding(false)
break; break;
default: default:
break; break;
} }
} }
...@@ -247,7 +247,7 @@ class HistoricalOrderPage extends Component { ...@@ -247,7 +247,7 @@ class HistoricalOrderPage extends Component {
contOptionData: [], // 清空查询数据 contOptionData: [], // 清空查询数据
wheShowNoData: false // 默认不展示 wheShowNoData: false // 默认不展示
}) })
switch(topActiveIndex) { switch(topActiveIndex) {
case 0: case 0:
props.requestGetAllBorrow(params) props.requestGetAllBorrow(params)
...@@ -324,7 +324,7 @@ class HistoricalOrderPage extends Component { ...@@ -324,7 +324,7 @@ class HistoricalOrderPage extends Component {
// 返回中间主要内容 // 返回中间主要内容
renderContItem() { renderContItem() {
let { let {
whetherCallClick, whetherCallClick,
topProcOptionList, topProcOptionList,
topActiveIndex, topActiveIndex,
...@@ -337,7 +337,7 @@ class HistoricalOrderPage extends Component { ...@@ -337,7 +337,7 @@ class HistoricalOrderPage extends Component {
<View style={styles.top_box}> <View style={styles.top_box}>
<View style={styles.top_tab_cont}> <View style={styles.top_tab_cont}>
{ {
topProcOptionList.map((item, index) => topProcOptionList.map((item, index) =>
<TouchableOpacity <TouchableOpacity
activeOpacity={1} activeOpacity={1}
style={styles.top_touch_cont} style={styles.top_touch_cont}
...@@ -370,7 +370,7 @@ class HistoricalOrderPage extends Component { ...@@ -370,7 +370,7 @@ class HistoricalOrderPage extends Component {
</Text> </Text>
<View style={styles.sea_icon}> <View style={styles.sea_icon}>
{ {
isShowSelect ? isShowSelect ?
<Image source={require('../../images/arr_top.png')} style={icon_style} /> <Image source={require('../../images/arr_top.png')} style={icon_style} />
: <Image source={require('../../images/arr_bom.png')} style={icon_style} /> : <Image source={require('../../images/arr_bom.png')} style={icon_style} />
} }
...@@ -389,7 +389,7 @@ class HistoricalOrderPage extends Component { ...@@ -389,7 +389,7 @@ class HistoricalOrderPage extends Component {
callSupClick={whetherCallClick} callSupClick={whetherCallClick}
callSupTopList={(data) => this.handleChangeTopList(data) } callSupTopList={(data) => this.handleChangeTopList(data) }
/> />
</View> </View>
</View> </View>
{/* 底部筛选数据 */} {/* 底部筛选数据 */}
...@@ -399,9 +399,9 @@ class HistoricalOrderPage extends Component { ...@@ -399,9 +399,9 @@ class HistoricalOrderPage extends Component {
> >
{/* 查询为空数据时 */} {/* 查询为空数据时 */}
{ {
wheShowNoData ? wheShowNoData ?
<View style={styles.cont_list_item}> <View style={styles.cont_list_item}>
<TouchableOpacity <TouchableOpacity
activeOpacity={1} activeOpacity={1}
style={styles.cont_no_list_box} style={styles.cont_no_list_box}
> >
...@@ -409,10 +409,10 @@ class HistoricalOrderPage extends Component { ...@@ -409,10 +409,10 @@ class HistoricalOrderPage extends Component {
</TouchableOpacity> </TouchableOpacity>
</View> </View>
: null : null
} }
{/* 底部每一列数据 */} {/* 底部每一列数据 */}
{ {
contOptionData.map((item, index) => contOptionData.map((item, index) =>
this.renderSubListItem(item, index) this.renderSubListItem(item, index)
) )
} }
...@@ -458,13 +458,13 @@ class HistoricalOrderPage extends Component { ...@@ -458,13 +458,13 @@ class HistoricalOrderPage extends Component {
{item.local_his_time} {item.local_his_time}
</Text> </Text>
{ {
topActiveIndex == 2 ? topActiveIndex == 2 ?
<Text style={styles.cont_tip}> <Text style={styles.cont_tip}>
来源借货订单号：{item.source_surgery_order_number} 来源借货订单号：{item.source_surgery_order_number}
</Text> : null </Text> : null
} }
{ {
topActiveIndex == 2 ? topActiveIndex == 2 ?
<Text style={styles.cont_tip}> <Text style={styles.cont_tip}>
{item.source_surgery_date ? moment(item.source_surgery_date).format('YYYY/MM/DD HH:mm') : '无'} {item.source_surgery_date ? moment(item.source_surgery_date).format('YYYY/MM/DD HH:mm') : '无'}
</Text> : null </Text> : null
...@@ -474,9 +474,9 @@ class HistoricalOrderPage extends Component { ...@@ -474,9 +474,9 @@ class HistoricalOrderPage extends Component {
<Text <Text
style={[ style={[
styles.cont_rig_status, styles.cont_rig_status,
(item.local_his_status == '待审核' || item.local_his_status == '已提交') ? styles.status_audit : '', ['待审核', '已提交', '待确认消耗'].includes(item.local_his_status) && styles.status_audit,
(item.local_his_status == '待还货' || item.local_his_status == '已输入' || item.local_his_status == '已驳回') ? styles.status_return : '', ['待还货', '已输入', '已驳回', '已确认消耗'].includes(item.local_his_status) && styles.status_return,
(item.local_his_status == '其他' || item.local_his_status == '已取消') ? styles.status_other : '' ['其他', '已取消'].includes(item.local_his_status) && styles.status_other
]}> ]}>
{item.local_his_status} {item.local_his_status}
</Text> </Text>
...@@ -671,5 +671,5 @@ const mapDispatchToProps = (dispatch) => { ...@@ -671,5 +671,5 @@ const mapDispatchToProps = (dispatch) => {
} }
} }
} }
export default connect(mapStateToProps, mapDispatchToProps)(HistoricalOrderPage); export default connect(mapStateToProps, mapDispatchToProps)(HistoricalOrderPage);
\ No newline at end of file
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