Merge branch 'develop' into product

app/containers/historicalOrder/HistoricalOrderPage.js

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