调整自助下单已选弹窗，支持产品分类下，根据厂家分类展示

app/action/EquipAction.js

@@ -78,6 +78,7 @@ export function requestEquipOrderInfo(params) {
         let {global_domain_config} = getState().login
         GetRequest(global_domain_config, getUrlParams('/surgery/collect_order/search', params))
             .then(res => {
+                console.log('res===', res)
                 if(res.error_code == 0) {
                     let { data: { surgery_collect_headers } } = res
                     dispatch(requestListDataSuccess(surgery_collect_headers));

app/action/SelfAction.js

@@ -222,67 +222,67 @@ export function requestSelfSumbit({access_token, ...params}) {
 
 // 选择产品-供应商信息查询接口
 export const reqPurSupplierSearch = async (global_domain_config, params) => {
-    // return local_inter_mock.inter_1
+    return local_inter_mock.inter_1
     return await GetRequest(global_domain_config, getUrlParams('/order/pur_supplier/search', params))
 }
 
 // 选择产品-产品信息分类查询接口
 export const reqProCategorySearch = async (global_domain_config, params) => {
-    // return local_inter_mock.inter_2
+    return local_inter_mock.inter_2
     return await GetRequest(global_domain_config, getUrlParams('/order/item/search', params))
 }
 
 // 选择产品-手术模板头查询接口
 export const reqSurTempHeadSearch = async (global_domain_config, params) => {
-    // return local_inter_mock.inter_3
+    return local_inter_mock.inter_3
     return await GetRequest(global_domain_config, getUrlParams('/surgery/template_header/search', params))
 }
 
 // 选择产品-手术模板行查询接口
 export const reqSurTempLineSearch = async (global_domain_config, params) => {
-    // return local_inter_mock.inter_4
+    return local_inter_mock.inter_4
     return await GetRequest(global_domain_config, getUrlParams('/surgery/template_line/search', params))
 }
 
 // 选择产品-螺钉盒（器械包）头查询接口
 export const reqNailEquipHeadSearch = async (global_domain_config, params) => {
-    // if(params.category_code === '1301'){
-    //     return local_inter_mock.inter_5
-    // }else {
-    //     return local_inter_mock.inter_55
-    // }
+    if(params.category_code === '1301'){
+        return local_inter_mock.inter_5
+    }else {
+        return local_inter_mock.inter_55
+    }
     return await GetRequest(global_domain_config, getUrlParams('/inventory/item_package_header/search', params))
 }
 
 
 // 选择产品-螺钉盒明细查询接口
 export const reqNailBoxLineSearch = async (global_domain_config, params) => {
-    // return local_inter_mock.inter_6
+    return local_inter_mock.inter_6
     return await GetRequest(global_domain_config, getUrlParams('/inventory/nail_box_template_detail/search', params))
 }
 
 
 // 选择产品-器械包明细查询接口
 export const reqEquipPackageLineSearch = async (global_domain_config, params) => {
-    // return local_inter_mock.inter_7
+    return local_inter_mock.inter_7
     return await GetRequest(global_domain_config, getUrlParams('/inventory/item_package/search', params))
 }
 
 
 // 选择产品-零散器械查询接口
 export const reqScatEquipmentSearch = async (global_domain_config, params) => {
-    // return local_inter_mock.inter_8
+    return local_inter_mock.inter_8
     return await GetRequest(global_domain_config, getUrlParams('/order/tool/search', params))
 }
 
 
 // 选择产品-单点耗材查询接口
 export const reqSingleConsumSearch = async (global_domain_config, params) => {
-    // if(params.leftIndex && params.leftIndex%2 === 0){
-    //     return local_inter_mock.inter_9
-    // }else {
-    //     return local_inter_mock.inter_99
-    // }
+    if(params.leftIndex && params.leftIndex%2 === 0){
+        return local_inter_mock.inter_9
+    }else {
+        return local_inter_mock.inter_99
+    }
     return await GetRequest(global_domain_config, getUrlParams('/order/item_detail/search', params))
 }
 

app/containers/common/listDataComponent/ChooseCardList.js

@@ -90,7 +90,7 @@ class ChooseCardList extends Component {
                                                 resizeMode="cover" /> : <Image source={cur_icon} style={icon_style} resizeMode="cover" />
                                         }
                                     </View> : null}
-                                    <Text numberOfLines={2} style={[styles.list_item_tit, cardStyleItemTit, cur_icon ? '' : cardStyleNotIconTit, index == curActIndex ? [styles.list_tit_act, cardStyleItemTitAct] : '']}>
+                                    <Text numberOfLines={3} style={[styles.list_item_tit, cardStyleItemTit, cur_icon ? '' : cardStyleNotIconTit, index == curActIndex ? [styles.list_tit_act, cardStyleItemTitAct] : '']}>
                                         {item[cardItemTitle]}
                                         {(item[cardCountName] && countStyleType[0] === cardStyleType) ? <Text style={[styles.sum_def, cardCouStyle]}>({item[cardCountName]})</Text> : null}
                                     </Text>

app/containers/equipConsu/EquipConsuPage.js

@@ -580,6 +580,7 @@ class EquipConsuPage extends Component {
                     customer_code: state.listOptionData[2].value,
                     collect_header_status: 'RETURNED,COLLECTED'
                 }
+                console.log('params----', params)
                 props.requestEquipOrderInfo(params)
             })
         }

app/containers/selfOrder/module/EditThirdLevelPage.js

@@ -12,6 +12,7 @@ import { cloneObject, show } from '../../../utils/Utils';
 import { reqSurTempLineSearch, reqNailBoxLineSearch, reqEquipPackageLineSearch } from '../../../action/SelfAction';
 import LoadingModel from '../../common/listDataComponent/LoadingModel';
 import LocalVariable from '../../common/LocalVariable';
+import { exitLoginStatus } from '../../../action/LoginAction';
 
 class EditThirdLevelPage extends Component {
 
@@ -211,6 +212,7 @@ class EditThirdLevelPage extends Component {
         this.refs.LoadingModel.hide()
         if (result.error_code == 41006) {
             show('登录过期，请重新登录');
+            console.log('this.props---', this.props)
             this.props.exitLoginStatus();
         } else {
             let error_msg = result.error_msg || result.message