Merge branch 'develop' into product

app/containers/historicalOrder/HistoricalOrderPage.js

@@ -73,7 +73,7 @@ class HistoricalOrderPage extends Component {
             ],
             isShowSelect: false,  // 显示/隐藏 筛选内容
             borrowStatus: ['待审核','待出库','待还货','其他'],
-            consumeStatus: ['待审核','已消耗'],
+            consumeStatus: ['待确认消耗','已确认消耗'],
             transferStatus: ['已输入', '已审批', '已驳回', '已提交', '已取消'],
             searchBorrowStatus: [ // 【借货】对应的状态值
                "ENTERED,SUBMITTED",
@@ -474,9 +474,9 @@ class HistoricalOrderPage extends Component {
                             <Text
                                 style={[
                                     styles.cont_rig_status,
-                                    (item.local_his_status == '待审核' || item.local_his_status == '已提交') ? styles.status_audit : '',
-                                    (item.local_his_status == '待还货' || item.local_his_status == '已输入' || 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_audit,
+                                    ['待还货', '已输入', '已驳回', '已确认消耗'].includes(item.local_his_status) && styles.status_return,
+                                    ['其他', '已取消'].includes(item.local_his_status) && styles.status_other
                                 ]}>
                                 {item.local_his_status}
                             </Text>