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 4 additions and 4 deletions
app/containers/historicalOrder/HistoricalOrderPage.js
...@@ -73,7 +73,7 @@ class HistoricalOrderPage extends Component { ...@@ -73,7 +73,7 @@ class HistoricalOrderPage extends Component {
], ],
isShowSelect: false, // 显示/隐藏 筛选内容 isShowSelect: false, // 显示/隐藏 筛选内容
borrowStatus: ['待审核','待出库','待还货','其他'], borrowStatus: ['待审核','待出库','待还货','其他'],
consumeStatus: ['待审核','已消耗'], consumeStatus: ['待确认消耗','已确认消耗'],
transferStatus: ['已输入', '已审批', '已驳回', '已提交', '已取消'], transferStatus: ['已输入', '已审批', '已驳回', '已提交', '已取消'],
searchBorrowStatus: [ // 【借货】对应的状态值 searchBorrowStatus: [ // 【借货】对应的状态值
"ENTERED,SUBMITTED", "ENTERED,SUBMITTED",
...@@ -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>
......
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