Commit 28295252 by lhc Committed by peii

fix: 修复全局搜索后生成订单没加入商品的问题

(cherry picked from commit 89e379a7)
parent d1514eb6
import React, { Component } from 'react'; import React, { Component } from 'react'
import { View, Text, SafeAreaView, StyleSheet, TouchableOpacity, Image, ScrollView, TextInput, Alert, Linking, NativeModules, Platform } from 'react-native'; import {
import { connect } from 'react-redux'; View,
import { home_background_color, placehold_text_color, promary_color, safe_view, icon_style, list_common_item } from '../../base/BaseStyle'; Text,
import { ImageTextStyle, CellTextStyle, FooterBtnStyle } from '../common/CellTextStyle'; SafeAreaView,
import { show, formatStrForDate, cloneObject, dedupQuoteArray, isBlank, isNotBlank, decodeDisplayProfiles, getCodeValue } from '../../utils/Utils'; StyleSheet,
import HeadBackItem from '../common/HeadBackItem'; TouchableOpacity,
import StatusBarView from '../common/StatusBarView'; Image,
import DialogModel from '../common/DialogModel'; ScrollView,
import LodingModel from '../common/LodingModel'; TextInput,
import DateModel from '../common/DateModel'; Alert,
import { AudioRecorder, AudioUtils } from 'react-native-audio'; Linking,
import Sound from 'react-native-sound'; NativeModules,
import { requestSelfOrganizations, requestSelfSurgeryHospital, requestSelfOrderType, requestSelfTemplateCollect, requestSelfAudio, requestSelfSumbit, setSelfInitData, reqSelfSurgeryHospital, requestListDataSuccess, requestSelfSurgeryType, setSelectProductOpts, reqSelfOrganizations, reqOrgDepartments, requestQuickSurColSetting, requestSurgeryType} from '../../action/SelfAction'; Platform,
import { exitLoginStatus, requestSysProfile } from '../../action/LoginAction'; } from 'react-native'
import { SELF_ORDER_LIST_DOING, SELF_ORDER_LIST_SUCCESS, SELF_ORDER_LIST_FAILURE, LOGIN_NO, SELF_SUBMIT_DOING, SELF_SUBMIT_SUCCESS, SELF_SUBMIT_FAILURE } from '../../base/ActionTypes'; import { connect } from 'react-redux'
import PageListArrow from '../common/listDataComponent/PageListArrow'; import {
import TipInfoNeedSelect from '../common/listDataComponent/TipInfoNeedSelect'; home_background_color,
import LocalVariable from '../common/LocalVariable'; placehold_text_color,
import LoadingModel from '../common/listDataComponent/LoadingModel'; promary_color,
import NotEnoughModel from '../common/NotEnoughModel'; safe_view,
import ImagePicker from 'react-native-image-picker'; icon_style,
import ZoomPictureModel from '../common/ZoomPictureModel'; list_common_item,
import { uploadTransImg } from '../../action/TransAction'; } from '../../base/BaseStyle'
import moment from 'moment'; import { ImageTextStyle, CellTextStyle, FooterBtnStyle } from '../common/CellTextStyle'
import * as R from "ramda"; import {
show,
formatStrForDate,
cloneObject,
dedupQuoteArray,
isBlank,
isNotBlank,
decodeDisplayProfiles,
getCodeValue,
} from '../../utils/Utils'
import HeadBackItem from '../common/HeadBackItem'
import StatusBarView from '../common/StatusBarView'
import DialogModel from '../common/DialogModel'
import LodingModel from '../common/LodingModel'
import DateModel from '../common/DateModel'
import { AudioRecorder, AudioUtils } from 'react-native-audio'
import Sound from 'react-native-sound'
import {
requestSelfOrganizations,
requestSelfSurgeryHospital,
requestSelfOrderType,
requestSelfTemplateCollect,
requestSelfAudio,
requestSelfSumbit,
setSelfInitData,
reqSelfSurgeryHospital,
requestListDataSuccess,
requestSelfSurgeryType,
setSelectProductOpts,
reqSelfOrganizations,
reqOrgDepartments,
requestQuickSurColSetting,
requestSurgeryType,
} from '../../action/SelfAction'
import { exitLoginStatus, requestSysProfile } from '../../action/LoginAction'
import {
SELF_ORDER_LIST_DOING,
SELF_ORDER_LIST_SUCCESS,
SELF_ORDER_LIST_FAILURE,
LOGIN_NO,
SELF_SUBMIT_DOING,
SELF_SUBMIT_SUCCESS,
SELF_SUBMIT_FAILURE,
} from '../../base/ActionTypes'
import PageListArrow from '../common/listDataComponent/PageListArrow'
import TipInfoNeedSelect from '../common/listDataComponent/TipInfoNeedSelect'
import LocalVariable from '../common/LocalVariable'
import LoadingModel from '../common/listDataComponent/LoadingModel'
import NotEnoughModel from '../common/NotEnoughModel'
import ImagePicker from 'react-native-image-picker'
import ZoomPictureModel from '../common/ZoomPictureModel'
import { uploadTransImg } from '../../action/TransAction'
import moment from 'moment'
import * as R from 'ramda'
class SelfOrderPage extends Component { class SelfOrderPage extends Component {
constructor(props) { constructor(props) {
super(props); super(props)
this.state = { this.state = {
canSubFlag: false, // 提交按钮样式 canSubFlag: false, // 提交按钮样式
listOptionData: [ listOptionData: [
{ {
"id": "0", id: '0',
title: '销售员', title: '销售员',
name: '', name: '',
value: '' value: '',
}, },
{ {
"id": "1", id: '1',
title: '组织', title: '组织',
name: '请选择', name: '请选择',
value: '' value: '',
}, },
{ {
"id": "2", id: '2',
title: '客户名称', title: '客户名称',
name: '请选择', name: '请选择',
value: '' value: '',
}, },
{ {
"id": "3", id: '3',
title: '收单地点', title: '收单地点',
name: '请选择', name: '请选择',
value: '' value: '',
}, },
{ {
"id": "4", id: '4',
title: '收货地点', title: '收货地点',
name: '请选择', name: '请选择',
value: '' value: '',
}, },
{ {
"id": "5", id: '5',
title: '主治医生', title: '主治医生',
name: '请选择', name: '请选择',
value: '', value: '',
showInput: false, showInput: false,
inputValue: '' inputValue: '',
}, },
{ {
"id": "6", id: '6',
title: '手术时间', title: '手术时间',
name: (() => { name: (() => {
let date = moment(new Date()).add(1, 'd') let date = moment(new Date()).add(1, 'd')
...@@ -90,121 +143,121 @@ class SelfOrderPage extends Component { ...@@ -90,121 +143,121 @@ class SelfOrderPage extends Component {
date.set('minute', 0) date.set('minute', 0)
return date.toDate() return date.toDate()
})(), })(),
showDatePicker: true showDatePicker: true,
}, },
{ {
"id": "7", id: '7',
title: '订单类型', title: '订单类型',
name: '请选择', name: '请选择',
value: '' value: '',
}, },
{ {
"id": "8", id: '8',
title: '选择产品', title: '选择产品',
name: '请选择', name: '请选择',
value: '', value: '',
lines: [], lines: [],
sub_lines: [], sub_lines: [],
replace_item_flag: 'N', // 器械包 replace_item_flag: 'N', // 器械包
take_cert_flag: 'N' // 合格证 take_cert_flag: 'N', // 合格证
}, },
{ {
"id": "9", id: '9',
title: '需要携带合格证', title: '需要携带合格证',
value: '', value: '',
isRedio: '' // 单选 isRedio: '', // 单选
}, },
{ {
"id": "10", id: '10',
title: '同意替换器械包', // 同意替换同品不同器械包 title: '同意替换器械包', // 同意替换同品不同器械包
value: 'N', value: 'N',
isRedio: 'N' // 单选 isRedio: 'N', // 单选
}, },
{ {
"id": "11", id: '11',
title: '备注', title: '备注',
value: '', value: '',
isRemark: true // 备注 isRemark: true, // 备注
}, },
{ {
"id": "12", id: '12',
title: '还有什么要安排的,可录音备注哟!', title: '还有什么要安排的,可录音备注哟!',
value: '', value: '',
isRecode: true // 录音 isRecode: true, // 录音
}, },
{ {
"id": "13", id: '13',
title: '添加图片', title: '添加图片',
value: '', value: '',
isAddImage: true, // 添加图片 isAddImage: true, // 添加图片
uploadImgArr: [] // 上传后的路径 uploadImgArr: [], // 上传后的路径
}, },
{ {
"id": "14", id: '14',
title: '部门', title: '部门',
name: '请选择', name: '请选择',
value: '', value: '',
}, },
{ {
"id": "15", id: '15',
title: '业务经理', title: '业务经理',
name: '请选择', name: '请选择',
value: '', value: '',
}, },
{ {
"id": "16", id: '16',
title: '跟台员', title: '跟台员',
name: '请选择', name: '请选择',
value: '', value: '',
}, },
{ {
"id": "17", id: '17',
title: '送货员', title: '送货员',
name: '请选择', name: '请选择',
value: '', value: '',
}, },
{ {
"id": "18", id: '18',
title: '借货仓库', title: '借货仓库',
name: '请选择', name: '请选择',
value: '', value: '',
}, },
{ {
"id": "19", id: '19',
title: '手术类型', title: '手术类型',
name: '请选择', name: '请选择',
value: '', value: '',
}, },
{ {
"id": "20", id: '20',
title: '患者姓名', title: '患者姓名',
value: '' value: '',
}, },
{ {
"id": "21", id: '21',
title: '性别', // 选择 title: '性别', // 选择
name: '请选择', name: '请选择',
value: '' value: '',
}, },
{ {
"id": "22", id: '22',
title: '年龄', // 输入 title: '年龄', // 输入
value: '' value: '',
}, },
{ {
"id": "23", id: '23',
title: '床位', title: '床位',
value: '' value: '',
}, },
{ {
"id": "24", id: '24',
title: '病历号', title: '病历号',
value: '' value: '',
}, },
], ],
subInitListOption: [], // 存储最初数据 subInitListOption: [], // 存储最初数据
submitOption: { // 提交的信息 submitOption: {
// 提交的信息
seller_code: '', // 用户名username seller_code: '', // 用户名username
org_code: '', // 组织 org_code: '', // 组织
customer_code: '', // 客户名称 customer_code: '', // 客户名称
...@@ -221,24 +274,27 @@ class SelfOrderPage extends Component { ...@@ -221,24 +274,27 @@ class SelfOrderPage extends Component {
Caller: 'dingding', // Caller: 'APP', Caller: 'dingding', // Caller: 'APP',
force_balance_check_flag: 'Y', // 检查缺失物料 force_balance_check_flag: 'Y', // 检查缺失物料
replace_item_flag: 'N', // 器械包 replace_item_flag: 'N', // 器械包
take_cert_flag: 'N' // 合格证 take_cert_flag: 'N', // 合格证
}, },
currentItem: { currentItem: {
name: '请选择', name: '请选择',
value: '-1' value: '-1',
}, },
localOtherObj: { // 恢复原状态 localOtherObj: {
// 恢复原状态
name: '请选择', name: '请选择',
value: '' value: '',
}, },
sexTypeOption: [ // 性别 sexTypeOption: [
// 性别
{ {
name:'男', name: '男',
value:'男' value: '男',
},{ },
name:'女', {
value:'女' name: '女',
} value: '女',
},
], ],
currentTitle: '组织', // 当前点击项 currentTitle: '组织', // 当前点击项
showTypePop: false, // 选择器弹窗 showTypePop: false, // 选择器弹窗
...@@ -265,12 +321,12 @@ class SelfOrderPage extends Component { ...@@ -265,12 +321,12 @@ class SelfOrderPage extends Component {
OBS_MOBILE_BOR_WARE_REQUIRED: 0, OBS_MOBILE_BOR_WARE_REQUIRED: 0,
}, },
departments: [], departments: [],
surgery_types: [] surgery_types: [],
} }
} }
componentDidMount() { componentDidMount() {
const {sysProfiles} = this.props const { sysProfiles } = this.props
this.getSysProfileValue() this.getSysProfileValue()
this.props.setSelectProductOpts([]) this.props.setSelectProductOpts([])
this.getSellerName() this.getSellerName()
...@@ -301,14 +357,14 @@ class SelfOrderPage extends Component { ...@@ -301,14 +357,14 @@ class SelfOrderPage extends Component {
let { state, props } = this let { state, props } = this
let { listOptionData } = this.state let { listOptionData } = this.state
this.setState({ this.setState({
subInitListOption: cloneObject(listOptionData) // 存储初始化数据,提交成功后赋此值 subInitListOption: cloneObject(listOptionData), // 存储初始化数据,提交成功后赋此值
}) })
if (state.listOptionData[0].name !== props.userInfo.person_name) { if (state.listOptionData[0].name !== props.userInfo.person_name) {
listOptionData[0].name = props.userInfo.person_name listOptionData[0].name = props.userInfo.person_name
listOptionData[0].value = props.userInfo.user_name listOptionData[0].value = props.userInfo.user_name
this.setState({ this.setState({
listOptionData, listOptionData,
subInitListOption: cloneObject(listOptionData) subInitListOption: cloneObject(listOptionData),
}) })
} }
} }
...@@ -318,18 +374,18 @@ class SelfOrderPage extends Component { ...@@ -318,18 +374,18 @@ class SelfOrderPage extends Component {
*/ */
async getSysProfileValue() { async getSysProfileValue() {
let { global_domain_config, token } = this.props let { global_domain_config, token } = this.props
const {sysValues} = this.state const { sysValues } = this.state
const getSysValue = async (key) => { const getSysValue = async key => {
const params = { const params = {
access_token: token, access_token: token,
profile_code: key profile_code: key,
} }
const res = await requestSysProfile(global_domain_config, params) const res = await requestSysProfile(global_domain_config, params)
if (res.error_code || res.status) return if (res.error_code || res.status) return
sysValues[key] = isNaN(res.data.profile_value) ? res.data.profile_value : parseInt(res.data.profile_value) sysValues[key] = isNaN(res.data.profile_value) ? res.data.profile_value : parseInt(res.data.profile_value)
this.setState({ this.setState({
sysValues sysValues,
}) })
} }
...@@ -338,39 +394,40 @@ class SelfOrderPage extends Component { ...@@ -338,39 +394,40 @@ class SelfOrderPage extends Component {
// 请求授权 // 请求授权
getAudioAuthorize() { getAudioAuthorize() {
AudioRecorder.requestAuthorization() AudioRecorder.requestAuthorization().then(isAuthor => {
.then(isAuthor => {
console.log('是否授权: ' + isAuthor) console.log('是否授权: ' + isAuthor)
if (!isAuthor) { if (!isAuthor) {
return Alert.alert('提示信息', 'APP需要使用录音,请打开录音权限允许APP使用', [{ return Alert.alert('提示信息', 'APP需要使用录音,请打开录音权限允许APP使用', [
{
text: '设置', text: '设置',
onPress: () => { onPress: () => {
if (Platform.OS == 'ios') { if (Platform.OS == 'ios') {
Linking.openURL('app-settings:') Linking.openURL('app-settings:').catch(err => console.log('error', err))
.catch(err => console.log('error', err))
} else if (Platform.OS == 'android') { } else if (Platform.OS == 'android') {
NativeModules.OpenSettings.openNetworkSettings(data => { NativeModules.OpenSettings.openNetworkSettings(data => {
console.log('call back data', data) console.log('call back data', data)
}).catch(err => console.log('android---', err)) }).catch(err => console.log('android---', err))
} }
} },
}, { },
{
text: '取消', text: '取消',
}]) },
])
} }
this.setState({ hasPermission: isAuthor }) this.setState({ hasPermission: isAuthor })
this.prepareRecordingPath(this.state.audioPath); this.prepareRecordingPath(this.state.audioPath)
// 录音进展 // 录音进展
AudioRecorder.onProgress = (data) => { AudioRecorder.onProgress = data => {
this.setState({ this.setState({
currentTime: Math.ceil(data.currentTime) currentTime: Math.ceil(data.currentTime),
}); })
}; }
// 完成录音 // 完成录音
AudioRecorder.onFinished = (data) => { AudioRecorder.onFinished = data => {
// data 录音数据 // data 录音数据
console.log(this.state.currentTime) console.log(this.state.currentTime)
}; }
}) })
} }
...@@ -380,7 +437,7 @@ class SelfOrderPage extends Component { ...@@ -380,7 +437,7 @@ class SelfOrderPage extends Component {
* path 路径 * path 路径
* option 参数 * option 参数
*/ */
prepareRecordingPath = (path) => { prepareRecordingPath = path => {
const option = { const option = {
SampleRate: 44100.0, //采样率 SampleRate: 44100.0, //采样率
Channels: 2, //通道 Channels: 2, //通道
...@@ -399,21 +456,23 @@ class SelfOrderPage extends Component { ...@@ -399,21 +456,23 @@ class SelfOrderPage extends Component {
// 开始录音 // 开始录音
_record = async () => { _record = async () => {
if (!this.state.hasPermission) { if (!this.state.hasPermission) {
return Alert.alert('提示信息', 'APP需要使用录音,请打开录音权限允许APP使用', [{ return Alert.alert('提示信息', 'APP需要使用录音,请打开录音权限允许APP使用', [
{
text: '设置', text: '设置',
onPress: () => { onPress: () => {
if (Platform.OS == 'ios') { if (Platform.OS == 'ios') {
Linking.openURL('app-settings:') Linking.openURL('app-settings:').catch(err => console.log('error', err))
.catch(err => console.log('error', err))
} else if (Platform.OS == 'android') { } else if (Platform.OS == 'android') {
NativeModules.OpenSettings.openNetworkSettings(data => { NativeModules.OpenSettings.openNetworkSettings(data => {
console.log('call back data', data) console.log('call back data', data)
}).catch(err => console.log('android---', err)) }).catch(err => console.log('android---', err))
} }
} },
}, { },
{
text: '取消', text: '取消',
}]) },
])
} }
show('录音开始') show('录音开始')
if (this.state.stop) { if (this.state.stop) {
...@@ -434,10 +493,10 @@ class SelfOrderPage extends Component { ...@@ -434,10 +493,10 @@ class SelfOrderPage extends Component {
} }
show('录音结束') show('录音结束')
try { try {
await AudioRecorder.stopRecording(); await AudioRecorder.stopRecording()
this.setState({ stop: true }); this.setState({ stop: true })
} catch (error) { } catch (error) {
console.log('stop record--error->', error); console.log('stop record--error->', error)
} }
} }
...@@ -445,7 +504,7 @@ class SelfOrderPage extends Component { ...@@ -445,7 +504,7 @@ class SelfOrderPage extends Component {
_play = async () => { _play = async () => {
let that = this let that = this
show('正在播放') show('正在播放')
that.whoosh = new Sound(this.state.audioPath, '', (err) => { that.whoosh = new Sound(this.state.audioPath, '', err => {
if (err) { if (err) {
show('加载音频失败') show('加载音频失败')
return console.log('加载音频失败-->', err) return console.log('加载音频失败-->', err)
...@@ -470,7 +529,7 @@ class SelfOrderPage extends Component { ...@@ -470,7 +529,7 @@ class SelfOrderPage extends Component {
this.setState({ this.setState({
currentTime: 0, currentTime: 0,
stop: false, stop: false,
listOptionData listOptionData,
}) })
} }
...@@ -482,34 +541,37 @@ class SelfOrderPage extends Component { ...@@ -482,34 +541,37 @@ class SelfOrderPage extends Component {
case SELF_ORDER_LIST_DOING: case SELF_ORDER_LIST_DOING:
// that.refs.LoadingModel.show() // that.refs.LoadingModel.show()
that.changeSubLoding(true) that.changeSubLoding(true)
break; break
case SELF_ORDER_LIST_SUCCESS: case SELF_ORDER_LIST_SUCCESS:
// that.refs.LoadingModel.hide() // that.refs.LoadingModel.hide()
// setTimeout(() => { // setTimeout(() => {
// that.changeCurrentOption() // that.changeCurrentOption()
// }, 500) // IOS问题 // }, 500) // IOS问题
that.setState({ that.setState(
{
isSubLoding: false, isSubLoding: false,
lodingTitle: '加载中' lodingTitle: '加载中',
}, () => { },
() => {
that.changeCurrentOption() that.changeCurrentOption()
}) },
break; )
break
case SELF_ORDER_LIST_FAILURE: case SELF_ORDER_LIST_FAILURE:
// that.refs.LoadingModel.hide() // that.refs.LoadingModel.hide()
that.changeSubLoding(false) that.changeSubLoding(false)
break; break
default: default:
break; break
} }
} }
if (loginState != nextProps.loginState) { if (loginState != nextProps.loginState) {
switch (nextProps.loginState) { switch (nextProps.loginState) {
case LOGIN_NO: case LOGIN_NO:
navigation.navigate('LoginPage') navigation.navigate('LoginPage')
break; break
default: default:
break; break
} }
} }
if (submit_self_order_status != nextProps.submit_self_order_status) { if (submit_self_order_status != nextProps.submit_self_order_status) {
...@@ -517,27 +579,30 @@ class SelfOrderPage extends Component { ...@@ -517,27 +579,30 @@ class SelfOrderPage extends Component {
case SELF_SUBMIT_DOING: case SELF_SUBMIT_DOING:
// that.refs.LoadingModel.show('提交中') // that.refs.LoadingModel.show('提交中')
that.changeSubLoding(true, '提交中') that.changeSubLoding(true, '提交中')
break; break
case SELF_SUBMIT_SUCCESS: case SELF_SUBMIT_SUCCESS:
// setTimeout(() => { // setTimeout(() => {
// that.refs.LoadingModel.hide() // that.refs.LoadingModel.hide()
// that.processReturnData() // that.processReturnData()
// }, 500) // IOS问题 // }, 500) // IOS问题
setTimeout(() => { setTimeout(() => {
that.setState({ that.setState(
{
isSubLoding: false, isSubLoding: false,
lodingTitle: '提交中' lodingTitle: '提交中',
}, () => { },
() => {
that.processReturnData() that.processReturnData()
}) },
)
}, 500) }, 500)
break; break
case SELF_SUBMIT_FAILURE: case SELF_SUBMIT_FAILURE:
// that.refs.LoadingModel.hide() // that.refs.LoadingModel.hide()
that.changeSubLoding(false, '提交中') that.changeSubLoding(false, '提交中')
break; break
default: default:
break; break
} }
} }
} }
...@@ -546,7 +611,7 @@ class SelfOrderPage extends Component { ...@@ -546,7 +611,7 @@ class SelfOrderPage extends Component {
changeSubLoding(loading, loadTit) { changeSubLoding(loading, loadTit) {
this.setState({ this.setState({
isSubLoding: loading || false, isSubLoding: loading || false,
lodingTitle: loadTit || '加载中' lodingTitle: loadTit || '加载中',
}) })
} }
...@@ -569,23 +634,22 @@ class SelfOrderPage extends Component { ...@@ -569,23 +634,22 @@ class SelfOrderPage extends Component {
that.customerGetShip() that.customerGetShip()
} }
if (item.title == '主治医生') { if (item.title == '主治医生') {
item.showInput = false, ;(item.showInput = false), (item.inputValue = '')
item.inputValue = ''
} }
} }
return item return item
}) }),
}) })
} }
// 判断是否都有值,修改提交按钮的颜色 // 判断是否都有值,修改提交按钮的颜色
changeCanSub(isSubCheck) { changeCanSub(isSubCheck) {
let { listOptionData, sysValues} = this.state let { listOptionData, sysValues } = this.state
let { sysProfiles, navigation } = this.props let { sysProfiles, navigation } = this.props
let tempStatus = false let tempStatus = false
let tempTit = '' let tempTit = ''
let curTip = '未选择' let curTip = '未选择'
const {isLendOrder} = navigation.getParam('params') const { isLendOrder } = navigation.getParam('params')
const doctorNameProfile = this.decodeDisplayLendProfile('DOCTOR_DISPLAY') const doctorNameProfile = this.decodeDisplayLendProfile('DOCTOR_DISPLAY')
const patientNameProfile = this.decodeDisplayLendProfile('PATIENT_NAME_DISPLAY') const patientNameProfile = this.decodeDisplayLendProfile('PATIENT_NAME_DISPLAY')
const patientGenderProfile = this.decodeDisplayLendProfile('PATIENT_GENDER_DISPLAY') const patientGenderProfile = this.decodeDisplayLendProfile('PATIENT_GENDER_DISPLAY')
...@@ -594,9 +658,13 @@ class SelfOrderPage extends Component { ...@@ -594,9 +658,13 @@ class SelfOrderPage extends Component {
const patientIdProfile = this.decodeDisplayLendProfile('PATIENT_ID_DISPLAY') const patientIdProfile = this.decodeDisplayLendProfile('PATIENT_ID_DISPLAY')
for (let chIndex in listOptionData) { for (let chIndex in listOptionData) {
if (chIndex > 0 && chIndex < 10 && chIndex != 5 if (
&& !listOptionData[chIndex].value chIndex > 0 &&
&& listOptionData[chIndex].name !== '其他') { chIndex < 10 &&
chIndex != 5 &&
!listOptionData[chIndex].value &&
listOptionData[chIndex].name !== '其他'
) {
// 不是主治医生 // 不是主治医生
tempTit = listOptionData[chIndex].title tempTit = listOptionData[chIndex].title
tempStatus = true tempStatus = true
...@@ -605,33 +673,37 @@ class SelfOrderPage extends Component { ...@@ -605,33 +673,37 @@ class SelfOrderPage extends Component {
} }
break break
} }
if (((chIndex == 14 && sysValues.OBS_MOBILE_DEPARTMENT_DISPLAY > 2) if (
|| (chIndex == 15 && sysValues.OBS_MOBILE_BM_DISPLAY > 2) ((chIndex == 14 && sysValues.OBS_MOBILE_DEPARTMENT_DISPLAY > 2) ||
|| (chIndex == 16 && sysValues.OBS_MOBILE_SUR_FOLLOWER_DISPLAY > 2) (chIndex == 15 && sysValues.OBS_MOBILE_BM_DISPLAY > 2) ||
|| (chIndex == 17 && sysValues.OBS_MOBILE_DELIVERYMAN_DISPLAY > 2) (chIndex == 16 && sysValues.OBS_MOBILE_SUR_FOLLOWER_DISPLAY > 2) ||
|| (chIndex == 18 && sysValues.OBS_MOBILE_BOR_WARE_REQUIRED > 2) (chIndex == 17 && sysValues.OBS_MOBILE_DELIVERYMAN_DISPLAY > 2) ||
|| (chIndex == 19 && sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 2)) (chIndex == 18 && sysValues.OBS_MOBILE_BOR_WARE_REQUIRED > 2) ||
&& !listOptionData[chIndex].value) { (chIndex == 19 && sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 2)) &&
!listOptionData[chIndex].value
) {
tempTit = listOptionData[chIndex].title tempTit = listOptionData[chIndex].title
tempStatus = true tempStatus = true
break break
} }
if (isLendOrder && if (
(chIndex == 20 && patientNameProfile.required || isLendOrder &&
chIndex == 21 && patientGenderProfile.required || ((chIndex == 20 && patientNameProfile.required) ||
chIndex == 22 && patientAgeProfile.required || (chIndex == 21 && patientGenderProfile.required) ||
chIndex == 23 && hospitalizationNumberProfile.required || (chIndex == 22 && patientAgeProfile.required) ||
chIndex == 24 && patientIdProfile.required (chIndex == 23 && hospitalizationNumberProfile.required) ||
) && (chIndex == 24 && patientIdProfile.required)) &&
!listOptionData[chIndex].value !listOptionData[chIndex].value
) { ) {
tempTit = listOptionData[chIndex].title tempTit = listOptionData[chIndex].title
tempStatus = true tempStatus = true
break break
} }
if (isLendOrder && chIndex == 5 && doctorNameProfile.required && ( if (
listOptionData[chIndex].value != '-1' || isLendOrder &&
!listOptionData[chIndex].inputValue) chIndex == 5 &&
doctorNameProfile.required &&
(listOptionData[chIndex].value != '-1' || !listOptionData[chIndex].inputValue)
) { ) {
tempTit = listOptionData[chIndex].title tempTit = listOptionData[chIndex].title
tempStatus = true tempStatus = true
...@@ -639,7 +711,7 @@ class SelfOrderPage extends Component { ...@@ -639,7 +711,7 @@ class SelfOrderPage extends Component {
} }
} }
this.setState({ this.setState({
canSubFlag: !tempStatus canSubFlag: !tempStatus,
}) })
if (isSubCheck && tempStatus) { if (isSubCheck && tempStatus) {
show(`${tempTit}${curTip},不能提交`) show(`${tempTit}${curTip},不能提交`)
...@@ -683,18 +755,21 @@ class SelfOrderPage extends Component { ...@@ -683,18 +755,21 @@ class SelfOrderPage extends Component {
// } // }
} }
}) })
this.setState({ this.setState(
{
currentItem: item, currentItem: item,
listOptionData: listOptionData listOptionData: listOptionData,
}, () => { },
() => {
that.changeCanSub() that.changeCanSub()
}) },
)
} }
// 关闭弹窗 // 关闭弹窗
handleCloseModal(show) { handleCloseModal(show) {
this.setState({ this.setState({
showTypePop: show showTypePop: show,
}) })
} }
...@@ -704,7 +779,7 @@ class SelfOrderPage extends Component { ...@@ -704,7 +779,7 @@ class SelfOrderPage extends Component {
let { selfOrderOption } = this.props let { selfOrderOption } = this.props
let tempOption = [] let tempOption = []
let that = this let that = this
const {isLendOrder} = this.props.navigation.getParam('params') const { isLendOrder } = this.props.navigation.getParam('params')
if (selfOrderOption.length === 0) { if (selfOrderOption.length === 0) {
show(`当前${currentTitle}为空`) show(`当前${currentTitle}为空`)
return return
...@@ -716,22 +791,26 @@ class SelfOrderPage extends Component { ...@@ -716,22 +791,26 @@ class SelfOrderPage extends Component {
// 兼容旧接口 customers结构有可能是扁平的, 要改成层级的 // 兼容旧接口 customers结构有可能是扁平的, 要改成层级的
if (customers.length && !!R.path([0, 'ship_to_site_code'], customers)) { if (customers.length && !!R.path([0, 'ship_to_site_code'], customers)) {
customers = R.map(cus => ({ customers = R.map(cus => ({
bill_to_sites: [{ bill_to_sites: [
{
bill_to_site_code: cus.bill_to_site_code, bill_to_site_code: cus.bill_to_site_code,
bill_to_site_name: cus.bill_to_site_name, bill_to_site_name: cus.bill_to_site_name,
ship_to_sites: [{ ship_to_sites: [
{
ship_to_site_code: cus.ship_to_site_code, ship_to_site_code: cus.ship_to_site_code,
ship_to_site_name: cus.ship_to_site_name, ship_to_site_name: cus.ship_to_site_name,
customer_doctor: cus.customer_doctor customer_doctor: cus.customer_doctor,
}] },
}], ],
},
],
customer_code: cus.customer_code, customer_code: cus.customer_code,
customer_name: cus.customer_name, customer_name: cus.customer_name,
}))(customers) }))(customers)
} }
that.setState({ that.setState({
localCustomersOption: customers localCustomersOption: customers,
}) })
// 去重医院数据 // 去重医院数据
...@@ -781,9 +860,11 @@ class SelfOrderPage extends Component { ...@@ -781,9 +860,11 @@ class SelfOrderPage extends Component {
} }
tempOption = this.changeNameAndValue(filterOpt, 'source_inv_name', 'source_inv_code') tempOption = this.changeNameAndValue(filterOpt, 'source_inv_name', 'source_inv_code')
} }
that.setState({ that.setState(
listCurrentOption: [...tempOption] {
}, () => { listCurrentOption: [...tempOption],
},
() => {
if (tempOption && tempOption.length === 0) { if (tempOption && tempOption.length === 0) {
show('当前数据为空!') show('当前数据为空!')
return return
...@@ -792,7 +873,8 @@ class SelfOrderPage extends Component { ...@@ -792,7 +873,8 @@ class SelfOrderPage extends Component {
setTimeout(() => { setTimeout(() => {
that.handleCloseModal(true) that.handleCloseModal(true)
}, 500) }, 500)
}) },
)
} }
// 修改选择器为属性 name 和 value // 修改选择器为属性 name 和 value
...@@ -801,8 +883,7 @@ class SelfOrderPage extends Component { ...@@ -801,8 +883,7 @@ class SelfOrderPage extends Component {
if (data && data.length > 0) { if (data && data.length > 0) {
data.forEach(item => { data.forEach(item => {
let obj = {} let obj = {}
obj.name = item[nameType], ;(obj.name = item[nameType]), (obj.value = item[valueType])
obj.value = item[valueType]
result.push(obj) result.push(obj)
}) })
} }
...@@ -812,18 +893,21 @@ class SelfOrderPage extends Component { ...@@ -812,18 +893,21 @@ class SelfOrderPage extends Component {
// 组织 点击 // 组织 点击
handleOrganizationCheck(curData) { handleOrganizationCheck(curData) {
let { props } = this let { props } = this
this.setState({ this.setState(
{
currentTitle: curData.title, currentTitle: curData.title,
currentItem: { currentItem: {
name: curData.name, name: curData.name,
value: curData.value value: curData.value,
} },
}, () => { },
() => {
let params = { let params = {
access_token: props.token access_token: props.token,
} }
props.requestSelfOrganizations(params) props.requestSelfOrganizations(params)
}) },
)
} }
/** /**
...@@ -831,12 +915,12 @@ class SelfOrderPage extends Component { ...@@ -831,12 +915,12 @@ class SelfOrderPage extends Component {
* @param {*} org_code * @param {*} org_code
*/ */
async getDepartmentsByOrg(org_code) { async getDepartmentsByOrg(org_code) {
const {token, global_domain_config, userInfo} = this.props const { token, global_domain_config, userInfo } = this.props
const params = { const params = {
access_token: token, access_token: token,
org_code, org_code,
seller_code: userInfo.user_name, seller_code: userInfo.user_name,
scope_flag: 'Y' scope_flag: 'Y',
} }
try { try {
const res = await reqOrgDepartments(global_domain_config, params) const res = await reqOrgDepartments(global_domain_config, params)
...@@ -845,13 +929,15 @@ class SelfOrderPage extends Component { ...@@ -845,13 +929,15 @@ class SelfOrderPage extends Component {
let departments = res.data.relationships let departments = res.data.relationships
this.setState({ departments }) this.setState({ departments })
const {listOptionData, sysValues} = this.state const { listOptionData, sysValues } = this.state
const noop = () => {} const noop = () => {}
// 部门只有一个时直接设置 // 部门只有一个时直接设置
R.cond([ R.cond([
[R.equals(0), () => setTimeout(() =>show('当前组织没有部门信息'), 4000)], [R.equals(0), () => setTimeout(() => show('当前组织没有部门信息'), 4000)],
[R.equals(1), () => { [
R.equals(1),
() => {
const dep = R.head(departments) const dep = R.head(departments)
listOptionData[14].name = dep.department_name listOptionData[14].name = dep.department_name
listOptionData[14].value = dep.department_code listOptionData[14].value = dep.department_code
...@@ -859,13 +945,13 @@ class SelfOrderPage extends Component { ...@@ -859,13 +945,13 @@ class SelfOrderPage extends Component {
// 只有一个部门时可以自动设置 // 只有一个部门时可以自动设置
this.autoSetBMAndSFAndDMWhildSelectDepartment(dep) this.autoSetBMAndSFAndDMWhildSelectDepartment(dep)
}], },
[R.T, noop] ],
[R.T, noop],
])(R.length(departments)) ])(R.length(departments))
} catch (error) { } catch (error) {
console.log(error) console.log(error)
} }
} }
/** /**
...@@ -878,30 +964,41 @@ class SelfOrderPage extends Component { ...@@ -878,30 +964,41 @@ class SelfOrderPage extends Component {
// 业务经理只有一个时,直接设置业务经理 // 业务经理只有一个时,直接设置业务经理
R.cond([ R.cond([
[R.equals(0), () => show('当前部门没有业务经理')], [R.equals(0), () => show('当前部门没有业务经理')],
[R.equals(1), () => { [
R.equals(1),
() => {
const bm = R.pathOr([], ['business_manager_list', 0])(department) const bm = R.pathOr([], ['business_manager_list', 0])(department)
listOptionData[15].name = bm.business_manager_name listOptionData[15].name = bm.business_manager_name
listOptionData[15].value = bm.business_manager_code listOptionData[15].value = bm.business_manager_code
this.setState({ listOptionData }) this.setState({ listOptionData })
}], },
[R.T, noop] ],
[R.T, noop],
])(R.length(department.business_manager_list)) ])(R.length(department.business_manager_list))
// 跟台员只有一个 // 跟台员只有一个
R.ifElse(R.equals(1), () => { R.ifElse(
R.equals(1),
() => {
const sf = R.pathOr([], ['surgery_follower_list', 0])(department) const sf = R.pathOr([], ['surgery_follower_list', 0])(department)
listOptionData[16].name = sf.surgery_follower_name listOptionData[16].name = sf.surgery_follower_name
listOptionData[16].value = sf.surgery_follower_code listOptionData[16].value = sf.surgery_follower_code
this.setState({ listOptionData }) this.setState({ listOptionData })
}, noop)(R.length(department.surgery_follower_list)) },
noop,
)(R.length(department.surgery_follower_list))
// 送货员只有一个 // 送货员只有一个
R.ifElse(R.equals(1), () => { R.ifElse(
R.equals(1),
() => {
const dm = R.pathOr([], ['deliveryman_list', 0])(department) const dm = R.pathOr([], ['deliveryman_list', 0])(department)
listOptionData[17].name = dm.deliveryman_name listOptionData[17].name = dm.deliveryman_name
listOptionData[17].value = dm.deliveryman_code listOptionData[17].value = dm.deliveryman_code
this.setState({ listOptionData }) this.setState({ listOptionData })
}, noop)(R.length(department.deliveryman_list)) },
noop,
)(R.length(department.deliveryman_list))
} }
/** /**
...@@ -910,13 +1007,15 @@ class SelfOrderPage extends Component { ...@@ -910,13 +1007,15 @@ class SelfOrderPage extends Component {
async getOrganizationData() { async getOrganizationData() {
let { state, props } = this let { state, props } = this
let params = { let params = {
access_token: props.token access_token: props.token,
} }
let that = this let that = this
let { global_domain_config } = props let { global_domain_config } = props
let orgResult = await reqSelfOrganizations(global_domain_config, params); let orgResult = await reqSelfOrganizations(global_domain_config, params)
if (orgResult.error_code == 0) { if (orgResult.error_code == 0) {
let { data: { organizations } } = orgResult let {
data: { organizations },
} = orgResult
let { listOptionData, sysValues } = state let { listOptionData, sysValues } = state
// props.requestListDataSuccess(organizations) // props.requestListDataSuccess(organizations)
let filterOpt = dedupQuoteArray(organizations, 'org_code') let filterOpt = dedupQuoteArray(organizations, 'org_code')
...@@ -927,16 +1026,19 @@ class SelfOrderPage extends Component { ...@@ -927,16 +1026,19 @@ class SelfOrderPage extends Component {
if (filterOpt.length === 1) { if (filterOpt.length === 1) {
listOptionData[1].name = filterOpt[0].org_name listOptionData[1].name = filterOpt[0].org_name
listOptionData[1].value = filterOpt[0].org_code listOptionData[1].value = filterOpt[0].org_code
that.setState({ that.setState(
listOptionData {
}, () => { listOptionData,
},
() => {
that.organizationGetCustomerData() that.organizationGetCustomerData()
setTimeout(() => { setTimeout(() => {
if (sysValues.OBS_MOBILE_DEPARTMENT_DISPLAY > 0) { if (sysValues.OBS_MOBILE_DEPARTMENT_DISPLAY > 0) {
that.getDepartmentsByOrg(listOptionData[1].value) that.getDepartmentsByOrg(listOptionData[1].value)
} }
}, 1000); }, 1000)
}) },
)
} }
// 贵州需要不显示组织, 所以只能每个用户只能授权1个组织 // 贵州需要不显示组织, 所以只能每个用户只能授权1个组织
...@@ -945,11 +1047,11 @@ class SelfOrderPage extends Component { ...@@ -945,11 +1047,11 @@ class SelfOrderPage extends Component {
show(`请先选择组织`) show(`请先选择组织`)
} }
} else if (orgResult.error_code == 41006) { } else if (orgResult.error_code == 41006) {
show('登录过期,请重新登录'); show('登录过期,请重新登录')
props.exitLoginStatus(); props.exitLoginStatus()
} else { } else {
let error_msg = orgResult.error_msg || orgResult.message let error_msg = orgResult.error_msg || orgResult.message
show(error_msg); show(error_msg)
} }
} }
...@@ -962,7 +1064,7 @@ class SelfOrderPage extends Component { ...@@ -962,7 +1064,7 @@ class SelfOrderPage extends Component {
// objName有值直接是部门 // objName有值直接是部门
if (!!objName && !this.judgeDepartmentIsNull()) return if (!!objName && !this.judgeDepartmentIsNull()) return
const {departments, listOptionData} = this.state const { departments, listOptionData } = this.state
let options = departments let options = departments
// 非部门 // 非部门
...@@ -972,19 +1074,21 @@ class SelfOrderPage extends Component { ...@@ -972,19 +1074,21 @@ class SelfOrderPage extends Component {
options = R.propOr([], objName, dep) options = R.propOr([], objName, dep)
} }
const listOptions = R.map(R.applySpec({ const listOptions = R.map(
R.applySpec({
name: R.prop(itemName), name: R.prop(itemName),
value: R.prop(itemVal) value: R.prop(itemVal),
}))(options) }),
)(options)
this.setState({ this.setState({
currentTitle: curData.title, currentTitle: curData.title,
currentItem: { currentItem: {
name: curData.name, name: curData.name,
value: curData.value value: curData.value,
}, },
showTypePop: true, showTypePop: true,
listCurrentOption: listOptions listCurrentOption: listOptions,
}) })
} }
...@@ -992,15 +1096,18 @@ class SelfOrderPage extends Component { ...@@ -992,15 +1096,18 @@ class SelfOrderPage extends Component {
handleCustomerCheck(curData) { handleCustomerCheck(curData) {
let that = this let that = this
if (this.judgeOrgIsNull()) { if (this.judgeOrgIsNull()) {
that.setState({ that.setState(
{
currentTitle: curData.title, currentTitle: curData.title,
currentItem: { currentItem: {
name: curData.name, name: curData.name,
value: curData.value value: curData.value,
} },
}, () => { },
() => {
that.getCustomerData() that.getCustomerData()
}) },
)
} }
} }
// 获取客户名称 // 获取客户名称
...@@ -1023,23 +1130,29 @@ class SelfOrderPage extends Component { ...@@ -1023,23 +1130,29 @@ class SelfOrderPage extends Component {
} }
let that = this let that = this
let { global_domain_config } = props let { global_domain_config } = props
let cusResult = await reqSelfSurgeryHospital(global_domain_config, params); let cusResult = await reqSelfSurgeryHospital(global_domain_config, params)
console.log(cusResult) console.log(cusResult)
if (cusResult.error_code == 0) { if (cusResult.error_code == 0) {
let { data: { customers } } = cusResult let {
data: { customers },
} = cusResult
// customers结构有可能是扁平的, 要改成层级的,新版的 // customers结构有可能是扁平的, 要改成层级的,新版的
if (customers.length && !!R.path([0, 'ship_to_site_code'], customers)) { if (customers.length && !!R.path([0, 'ship_to_site_code'], customers)) {
customers = R.map(cus => ({ customers = R.map(cus => ({
bill_to_sites: [{ bill_to_sites: [
{
bill_to_site_code: cus.bill_to_site_code, bill_to_site_code: cus.bill_to_site_code,
bill_to_site_name: cus.bill_to_site_name, bill_to_site_name: cus.bill_to_site_name,
ship_to_sites: [{ ship_to_sites: [
{
ship_to_site_code: cus.ship_to_site_code, ship_to_site_code: cus.ship_to_site_code,
ship_to_site_name: cus.ship_to_site_name, ship_to_site_name: cus.ship_to_site_name,
customer_doctor: cus.customer_doctor customer_doctor: cus.customer_doctor,
}] },
}], ],
},
],
customer_code: cus.customer_code, customer_code: cus.customer_code,
customer_name: cus.customer_name, customer_name: cus.customer_name,
}))(customers) }))(customers)
...@@ -1055,20 +1168,23 @@ class SelfOrderPage extends Component { ...@@ -1055,20 +1168,23 @@ class SelfOrderPage extends Component {
if (filterOpt.length === 1) { if (filterOpt.length === 1) {
listOptionData[2].name = filterOpt[0].customer_name listOptionData[2].name = filterOpt[0].customer_name
listOptionData[2].value = filterOpt[0].customer_code listOptionData[2].value = filterOpt[0].customer_code
that.setState({ that.setState(
{
listOptionData, listOptionData,
localCustomersOption: customers localCustomersOption: customers,
}, () => { },
() => {
that.customerGetBill() that.customerGetBill()
that.customerGetShip() that.customerGetShip()
}) },
)
} }
} else if (cusResult.error_code == 41006) { } else if (cusResult.error_code == 41006) {
show('登录过期,请重新登录'); show('登录过期,请重新登录')
props.exitLoginStatus(); props.exitLoginStatus()
} else { } else {
let error_msg = cusResult.error_msg || cusResult.message let error_msg = cusResult.error_msg || cusResult.message
show(error_msg); show(error_msg)
} }
} }
...@@ -1079,30 +1195,35 @@ class SelfOrderPage extends Component { ...@@ -1079,30 +1195,35 @@ class SelfOrderPage extends Component {
let { localCustomersOption, listOptionData } = this.state let { localCustomersOption, listOptionData } = this.state
let that = this let that = this
if (this.judgeOrgIsNull() && this.judgeCustomerIsNull()) { if (this.judgeOrgIsNull() && this.judgeCustomerIsNull()) {
that.setState({ that.setState(
{
currentTitle: curData.title, currentTitle: curData.title,
currentItem: { currentItem: {
name: curData.name, name: curData.name,
value: curData.value value: curData.value,
} },
}, () => { },
() => {
const customer = R.find(R.propEq('customer_code', listOptionData[2].value), localCustomersOption) const customer = R.find(R.propEq('customer_code', listOptionData[2].value), localCustomersOption)
let options = [] let options = []
if (isNotBlank(customer.bill_to_sites)) { if (isNotBlank(customer.bill_to_sites)) {
options = R.compose( options = R.compose(
R.curry(dedupQuoteArray)(R.__, 'name'), R.curry(dedupQuoteArray)(R.__, 'name'),
R.map(R.applySpec({ R.map(
R.applySpec({
value: R.prop('bill_to_site_code'), value: R.prop('bill_to_site_code'),
name: R.prop('bill_to_site_name'), name: R.prop('bill_to_site_name'),
})), }),
R.prop('bill_to_sites') ),
R.prop('bill_to_sites'),
)(customer) )(customer)
} }
that.setState({ that.setState({
showTypePop: true, showTypePop: true,
listCurrentOption: options listCurrentOption: options,
})
}) })
},
)
} }
} }
...@@ -1123,7 +1244,7 @@ class SelfOrderPage extends Component { ...@@ -1123,7 +1244,7 @@ class SelfOrderPage extends Component {
listOptionData[3].name = R.pathOr('', [0, 'bill_to_site_name'], sites) listOptionData[3].name = R.pathOr('', [0, 'bill_to_site_name'], sites)
listOptionData[3].value = R.pathOr('', [0, 'bill_to_site_code'], sites) listOptionData[3].value = R.pathOr('', [0, 'bill_to_site_code'], sites)
that.setState({ that.setState({
listOptionData listOptionData,
}) })
} }
} }
...@@ -1133,13 +1254,15 @@ class SelfOrderPage extends Component { ...@@ -1133,13 +1254,15 @@ class SelfOrderPage extends Component {
let { localCustomersOption, listOptionData } = this.state let { localCustomersOption, listOptionData } = this.state
let that = this let that = this
if (this.judgeOrgIsNull() && this.judgeCustomerIsNull() && this.judgeBillIsNull()) { if (this.judgeOrgIsNull() && this.judgeCustomerIsNull() && this.judgeBillIsNull()) {
that.setState({ that.setState(
{
currentTitle: curData.title, currentTitle: curData.title,
currentItem: { currentItem: {
name: curData.name, name: curData.name,
value: curData.value value: curData.value,
} },
}, () => { },
() => {
const customer = R.find(R.propEq('customer_code', listOptionData[2].value), localCustomersOption) const customer = R.find(R.propEq('customer_code', listOptionData[2].value), localCustomersOption)
let options = [] let options = []
...@@ -1148,19 +1271,22 @@ class SelfOrderPage extends Component { ...@@ -1148,19 +1271,22 @@ class SelfOrderPage extends Component {
if (isNotBlank(billSite) && isNotBlank(billSite.ship_to_sites)) { if (isNotBlank(billSite) && isNotBlank(billSite.ship_to_sites)) {
options = R.compose( options = R.compose(
R.curry(dedupQuoteArray)(R.__, 'name'), R.curry(dedupQuoteArray)(R.__, 'name'),
R.map(R.applySpec({ R.map(
R.applySpec({
value: R.prop('ship_to_site_code'), value: R.prop('ship_to_site_code'),
name: R.prop('ship_to_site_name'), name: R.prop('ship_to_site_name'),
})), }),
R.prop('ship_to_sites') ),
R.prop('ship_to_sites'),
)(billSite) )(billSite)
} }
} }
that.setState({ that.setState({
showTypePop: true, showTypePop: true,
listCurrentOption: options listCurrentOption: options,
})
}) })
},
)
} }
} }
...@@ -1173,7 +1299,7 @@ class SelfOrderPage extends Component { ...@@ -1173,7 +1299,7 @@ class SelfOrderPage extends Component {
let that = this let that = this
const customer = R.find(R.propEq('customer_code', listOptionData[2].value), localCustomersOption) const customer = R.find(R.propEq('customer_code', listOptionData[2].value), localCustomersOption)
if (R.any(isBlank, [customer, customer.bill_to_sites]) ) { if (R.any(isBlank, [customer, customer.bill_to_sites])) {
return show(`当前${listOptionData[4].title}为空`) return show(`当前${listOptionData[4].title}为空`)
} }
...@@ -1197,7 +1323,7 @@ class SelfOrderPage extends Component { ...@@ -1197,7 +1323,7 @@ class SelfOrderPage extends Component {
listOptionData[4].name = shipSites[0].ship_to_site_name listOptionData[4].name = shipSites[0].ship_to_site_name
listOptionData[4].value = shipSites[0].ship_to_site_code listOptionData[4].value = shipSites[0].ship_to_site_code
that.setState({ that.setState({
listOptionData listOptionData,
}) })
} }
} }
...@@ -1209,14 +1335,16 @@ class SelfOrderPage extends Component { ...@@ -1209,14 +1335,16 @@ class SelfOrderPage extends Component {
let that = this let that = this
if (this.judgeOrgIsNull() && this.judgeCustomerIsNull()) { if (this.judgeOrgIsNull() && this.judgeCustomerIsNull()) {
// 点击 // 点击
that.setState({ that.setState(
{
currentTitle: curData.title, currentTitle: curData.title,
currentItem: { currentItem: {
name: curData.name, name: curData.name,
value: curData.value value: curData.value,
} },
}, () => { },
let tempOption = [{name: '其他', value: '-1'}] () => {
let tempOption = [{ name: '其他', value: '-1' }]
if (isNotBlank(localCustomersOption) && listOptionData[2].value) { if (isNotBlank(localCustomersOption) && listOptionData[2].value) {
const customer = R.find(R.propEq('customer_code', listOptionData[2].value))(localCustomersOption) const customer = R.find(R.propEq('customer_code', listOptionData[2].value))(localCustomersOption)
...@@ -1230,11 +1358,13 @@ class SelfOrderPage extends Component { ...@@ -1230,11 +1358,13 @@ class SelfOrderPage extends Component {
if (isNotBlank(ship)) { if (isNotBlank(ship)) {
tempOption = R.compose( tempOption = R.compose(
R.concat(R.__, tempOption), R.concat(R.__, tempOption),
R.map(R.applySpec({ R.map(
R.applySpec({
value: R.prop('customer_doctor'), value: R.prop('customer_doctor'),
name: R.prop('customer_doctor') name: R.prop('customer_doctor'),
})), }),
R.filter(R.compose(isNotBlank, R.prop('customer_doctor'))) ),
R.filter(R.compose(isNotBlank, R.prop('customer_doctor'))),
)(ship) )(ship)
} }
} }
...@@ -1244,9 +1374,10 @@ class SelfOrderPage extends Component { ...@@ -1244,9 +1374,10 @@ class SelfOrderPage extends Component {
tempOption = dedupQuoteArray(tempOption, 'name') tempOption = dedupQuoteArray(tempOption, 'name')
that.setState({ that.setState({
showTypePop: true, showTypePop: true,
listCurrentOption: [...tempOption] listCurrentOption: [...tempOption],
})
}) })
},
)
} }
} }
// 主治医生 输入 // 主治医生 输入
...@@ -1257,11 +1388,14 @@ class SelfOrderPage extends Component { ...@@ -1257,11 +1388,14 @@ class SelfOrderPage extends Component {
item.inputValue = text item.inputValue = text
} }
}) })
this.setState({ this.setState(
listOptionData: listOptionData {
}, () => { listOptionData: listOptionData,
},
() => {
this.changeCanSub() this.changeCanSub()
}) },
)
} }
// 手术名称 输入 // 手术名称 输入
...@@ -1291,7 +1425,7 @@ class SelfOrderPage extends Component { ...@@ -1291,7 +1425,7 @@ class SelfOrderPage extends Component {
} }
}) })
this.setState({ this.setState({
listOptionData: listOptionData listOptionData: listOptionData,
}) })
} }
this.closeDateModal(true) this.closeDateModal(true)
...@@ -1300,7 +1434,7 @@ class SelfOrderPage extends Component { ...@@ -1300,7 +1434,7 @@ class SelfOrderPage extends Component {
// 关闭日期选择器 // 关闭日期选择器
closeDateModal(show) { closeDateModal(show) {
this.setState({ this.setState({
dateModelPop: show dateModelPop: show,
}) })
} }
...@@ -1315,11 +1449,14 @@ class SelfOrderPage extends Component { ...@@ -1315,11 +1449,14 @@ class SelfOrderPage extends Component {
item.dateValue = formatStrForDate(date) item.dateValue = formatStrForDate(date)
} }
}) })
that.setState({ that.setState(
listOptionData: listOptionData {
}, () => { listOptionData: listOptionData,
},
() => {
that.changeCanSub() that.changeCanSub()
}) },
)
} }
/** /**
...@@ -1331,43 +1468,52 @@ class SelfOrderPage extends Component { ...@@ -1331,43 +1468,52 @@ class SelfOrderPage extends Component {
let { token, global_domain_config } = this.props let { token, global_domain_config } = this.props
let params = { let params = {
access_token: token, access_token: token,
category_set: 'PRODUCT_LINE_CATEGORY' category_set: 'PRODUCT_LINE_CATEGORY',
} }
const res = await requestSurgeryType(global_domain_config, params).catch(err => {return {}}) const res = await requestSurgeryType(global_domain_config, params).catch(err => {
return {}
})
if (res.error_code !== 0) return if (res.error_code !== 0) return
let surgery_types = R.compose( let surgery_types = R.compose(
R.map(R.applySpec({ R.map(
R.applySpec({
name: R.prop('category_name'), name: R.prop('category_name'),
value: R.prop('category_code'), value: R.prop('category_code'),
})), }),
R.propOr([], 'data') ),
R.propOr([], 'data'),
)(res) )(res)
this.setState({ surgery_types }) this.setState({ surgery_types })
} }
// 手术类型 点击 // 手术类型 点击
async handleSurTypeCheck(curData) { async handleSurTypeCheck(curData) {
let {surgery_types} = this.state let { surgery_types } = this.state
if (!this.judgeOrgIsNull() || !this.judgeCustomerIsNull()) { if (!this.judgeOrgIsNull() || !this.judgeCustomerIsNull()) {
return return
} }
if (isBlank(surgery_types)) { return show('手术类型为空') } if (isBlank(surgery_types)) {
return show('手术类型为空')
}
this.setState({ this.setState(
{
currentTitle: curData.title, currentTitle: curData.title,
currentItem: { currentItem: {
name: curData.name, name: curData.name,
value: curData.value value: curData.value,
}, },
listCurrentOption: surgery_types, listCurrentOption: surgery_types,
surgery_types surgery_types,
}, () => { },
() => {
setTimeout(() => { setTimeout(() => {
this.handleCloseModal(true) this.handleCloseModal(true)
}, 100) }, 100)
}) },
)
} }
// 订单类型 点击 // 订单类型 点击
...@@ -1375,21 +1521,24 @@ class SelfOrderPage extends Component { ...@@ -1375,21 +1521,24 @@ class SelfOrderPage extends Component {
let { props } = this let { props } = this
const { listOptionData } = this.state const { listOptionData } = this.state
if (this.judgeOrgIsNull() && this.judgeCustomerIsNull()) { if (this.judgeOrgIsNull() && this.judgeCustomerIsNull()) {
this.setState({ this.setState(
{
currentTitle: curData.title, currentTitle: curData.title,
currentItem: { currentItem: {
name: curData.name, name: curData.name,
value: curData.value value: curData.value,
} },
}, () => { },
() => {
let params = { let params = {
access_token: props.token, access_token: props.token,
value_set_code: 'SUR_ORDER_TYPE', value_set_code: 'SUR_ORDER_TYPE',
org_code: listOptionData[1].value, org_code: listOptionData[1].value,
order_type: 'SUR_ORDER_TYPE' order_type: 'SUR_ORDER_TYPE',
} }
props.requestSelfOrderType(params) props.requestSelfOrderType(params)
}) },
)
} }
} }
...@@ -1403,11 +1552,14 @@ class SelfOrderPage extends Component { ...@@ -1403,11 +1552,14 @@ class SelfOrderPage extends Component {
item.value = certFlag item.value = certFlag
} }
}) })
that.setState({ that.setState(
listOptionData: listOptionData {
}, () => { listOptionData: listOptionData,
},
() => {
that.changeCanSub() that.changeCanSub()
}) },
)
} }
// // 自动更换同品不同器械包 点击 // // 自动更换同品不同器械包 点击
...@@ -1418,7 +1570,7 @@ class SelfOrderPage extends Component { ...@@ -1418,7 +1570,7 @@ class SelfOrderPage extends Component {
// 选择产品 点击跳转 // 选择产品 点击跳转
handleProductCheck() { handleProductCheck() {
const { localCustomersOption, listOptionData } = this.state const { localCustomersOption, listOptionData } = this.state
console.log(localCustomersOption); console.log(localCustomersOption)
if (isBlank(listOptionData[2].value) || isBlank(listOptionData[3].value) || isBlank(listOptionData[4].value)) { if (isBlank(listOptionData[2].value) || isBlank(listOptionData[3].value) || isBlank(listOptionData[4].value)) {
return show('请先选择客户相关信息') return show('请先选择客户相关信息')
...@@ -1440,14 +1592,14 @@ class SelfOrderPage extends Component { ...@@ -1440,14 +1592,14 @@ class SelfOrderPage extends Component {
product_line_category_list: R.compose( product_line_category_list: R.compose(
R.uniqBy(R.prop('product_line_category_code')), R.uniqBy(R.prop('product_line_category_code')),
R.unnest, R.unnest,
R.pluck('product_line_category_list') R.pluck('product_line_category_list'),
)(values), )(values),
supplier_code: R.pathOr('', [0, 'supplier_code'])(values), supplier_code: R.pathOr('', [0, 'supplier_code'])(values),
supplier_name: R.pathOr('', [0, 'supplier_name'])(values), supplier_name: R.pathOr('', [0, 'supplier_name'])(values),
} }
}), }),
R.keys, R.keys,
R.clone R.clone,
)(suppliers) )(suppliers)
} }
...@@ -1458,11 +1610,14 @@ class SelfOrderPage extends Component { ...@@ -1458,11 +1610,14 @@ class SelfOrderPage extends Component {
title: `选择产品`, title: `选择产品`,
selfData: { selfData: {
org_code: listOptionData[1].value, org_code: listOptionData[1].value,
doctor_name: (listOptionData[5].name == '其他' || listOptionData[5].name == '请选择') ? listOptionData[5].inputValue : listOptionData[5].name, doctor_name:
listOptionData[5].name == '其他' || listOptionData[5].name == '请选择'
? listOptionData[5].inputValue
: listOptionData[5].name,
authorizations, authorizations,
productAuthorization productAuthorization,
}, },
productCallBack: that.productCallBack.bind(that) productCallBack: that.productCallBack.bind(that),
}) })
} }
} }
...@@ -1487,11 +1642,14 @@ class SelfOrderPage extends Component { ...@@ -1487,11 +1642,14 @@ class SelfOrderPage extends Component {
} }
} }
listOptionData[8] = local_prod listOptionData[8] = local_prod
this.setState({ this.setState(
listOptionData: listOptionData {
}, () => { listOptionData: listOptionData,
},
() => {
this.changeCanSub() this.changeCanSub()
}) },
)
} }
// 备注 输入 // 备注 输入
...@@ -1503,21 +1661,23 @@ class SelfOrderPage extends Component { ...@@ -1503,21 +1661,23 @@ class SelfOrderPage extends Component {
} }
}) })
this.setState({ this.setState({
listOptionData: listOptionData listOptionData: listOptionData,
}) })
} }
// 借货仓库 点击 // 借货仓库 点击
handleWareCheck(curData){ handleWareCheck(curData) {
let { state, props } = this let { state, props } = this
if(this.judgeOrgIsNull() && this.judgeCustomerIsNull()) { if (this.judgeOrgIsNull() && this.judgeCustomerIsNull()) {
this.setState({ this.setState(
{
currentTitle: curData.title, currentTitle: curData.title,
currentItem: { currentItem: {
name: curData.name, name: curData.name,
value: curData.value value: curData.value,
} },
}, () => { },
() => {
// 在此修改接口 // 在此修改接口
let params = { let params = {
access_token: props.token, access_token: props.token,
...@@ -1525,10 +1685,11 @@ class SelfOrderPage extends Component { ...@@ -1525,10 +1685,11 @@ class SelfOrderPage extends Component {
customer_code: state.listOptionData[2].value, customer_code: state.listOptionData[2].value,
bill_to_site_code: state.listOptionData[3].value, bill_to_site_code: state.listOptionData[3].value,
ship_to_site_code: state.listOptionData[4].value, ship_to_site_code: state.listOptionData[4].value,
process_code: 'COLLECT' process_code: 'COLLECT',
} }
props.requestQuickSurColSetting(params) props.requestQuickSurColSetting(params)
}) },
)
} }
} }
...@@ -1556,87 +1717,88 @@ class SelfOrderPage extends Component { ...@@ -1556,87 +1717,88 @@ class SelfOrderPage extends Component {
noData: false, noData: false,
storageOptions: { storageOptions: {
skipBackup: true, skipBackup: true,
path: 'WisdomTrans' // 存储本地地址 path: 'WisdomTrans', // 存储本地地址
},
} }
};
ImagePicker.showImagePicker(options, async (res) => { ImagePicker.showImagePicker(options, async res => {
if (res.didCancel) { if (res.didCancel) {
console.log('User cancelled photo picker'); console.log('User cancelled photo picker')
} } else if (res.error) {
else if (res.error) { console.log('ImagePicker Error: ', res.error)
console.log('ImagePicker Error: ', res.error);
if (res.error.indexOf('Camera permissions not granted') > -1) { if (res.error.indexOf('Camera permissions not granted') > -1) {
Alert.alert(('提示信息', 'APP需要使用相机,请打开相机权限允许APP使用'), [{ Alert.alert(('提示信息', 'APP需要使用相机,请打开相机权限允许APP使用'), [
{
text: '设置', text: '设置',
onPress: () => { onPress: () => {
Linking.openURL('app-settings:') Linking.openURL('app-settings:').catch(err => console.log('error', err))
.catch(err => console.log('error', err)) },
} },
}, { {
text: '取消' text: '取消',
}]) },
])
} }
if (res.error.indexOf('Photo library permissions not granted') > -1) { if (res.error.indexOf('Photo library permissions not granted') > -1) {
Alert.alert('提示信息', 'APP需要使用相册,请打开相册权限允许APP使用', [{ Alert.alert('提示信息', 'APP需要使用相册,请打开相册权限允许APP使用', [
{
text: '设置', text: '设置',
onPress: () => { onPress: () => {
Linking.openURL('app-settings:') Linking.openURL('app-settings:').catch(err => console.log('error', err))
.catch(err => console.log('error', err)) },
} },
}, { {
text: '取消' text: '取消',
}]); },
} ])
} }
else if (res.customButton) { } else if (res.customButton) {
console.log('User tapped custom button: ', res.customButton); console.log('User tapped custom button: ', res.customButton)
} else { } else {
that.changeSubLoding(true, '上传中') that.changeSubLoding(true, '上传中')
let source; //保存选中的图片 let source //保存选中的图片
if (Platform.OS === 'android') { if (Platform.OS === 'android') {
source = res.uri; source = res.uri
} else { } else {
source = res.uri.replace('file://', ''); source = res.uri.replace('file://', '')
if (!res.fileName) { if (!res.fileName) {
res.fileName = new Date().getTime() + '.HEIC' res.fileName = new Date().getTime() + '.HEIC'
} }
} }
const formData = new FormData(); const formData = new FormData()
let file = { uri: source, type: 'multipart/form-data', name: res.fileName }; let file = { uri: source, type: 'multipart/form-data', name: res.fileName }
formData.append('file', file); formData.append('file', file)
let params = { let params = {
access_token: props.token, access_token: props.token,
formData formData,
} }
let { global_domain_config } = props let { global_domain_config } = props
//上传图片接口 //上传图片接口
let imgResult = await uploadTransImg(global_domain_config, params); let imgResult = await uploadTransImg(global_domain_config, params)
console.log('res=', imgResult) console.log('res=', imgResult)
if (imgResult.error_code == 0) { if (imgResult.error_code == 0) {
that.changeSubLoding(false) that.changeSubLoding(false)
// 提交订单 // 提交订单
show('上传成功'); show('上传成功')
let { url } = imgResult.data let { url } = imgResult.data
localPhoOption.push(source); // 本地图片地址 localPhoOption.push(source) // 本地图片地址
listOptionData[13].uploadImgArr.push(url) // 服务器图片地址 listOptionData[13].uploadImgArr.push(url) // 服务器图片地址
that.setState({ that.setState({
localPhoOption, localPhoOption,
listOptionData listOptionData,
}); })
} else if (imgResult.error_code == 41006) { } else if (imgResult.error_code == 41006) {
that.changeSubLoding(false) that.changeSubLoding(false)
show('登录过期,请重新登录'); show('登录过期,请重新登录')
props.exitLoginStatus(); props.exitLoginStatus()
} else { } else {
that.changeSubLoding(false) that.changeSubLoding(false)
let error_msg = imgResult.error_msg || imgResult.message let error_msg = imgResult.error_msg || imgResult.message
show(error_msg); show(error_msg)
} }
} }
}) })
} }
// 删除单个照片 点击 // 删除单个照片 点击
...@@ -1644,12 +1806,15 @@ class SelfOrderPage extends Component { ...@@ -1644,12 +1806,15 @@ class SelfOrderPage extends Component {
let { listOptionData, localPhoOption } = this.state let { listOptionData, localPhoOption } = this.state
localPhoOption.splice(index, 1) // 删除本地地址 localPhoOption.splice(index, 1) // 删除本地地址
listOptionData[7].uploadImgArr.splice(index, 1) // 删除服务器地址 listOptionData[7].uploadImgArr.splice(index, 1) // 删除服务器地址
this.setState({ this.setState(
{
listOptionData, listOptionData,
localPhoOption localPhoOption,
}, () => { },
() => {
show('删除成功') show('删除成功')
}) },
)
} }
// 生成订单 点击 // 生成订单 点击
...@@ -1663,35 +1828,37 @@ class SelfOrderPage extends Component { ...@@ -1663,35 +1828,37 @@ class SelfOrderPage extends Component {
if (state.stop) { if (state.stop) {
let params = { let params = {
access_token: props.token, access_token: props.token,
path: state.audioPath path: state.audioPath,
} }
let { global_domain_config } = props let { global_domain_config } = props
console.log('params==', params) console.log('params==', params)
let audioResult = await requestSelfAudio(global_domain_config, params); let audioResult = await requestSelfAudio(global_domain_config, params)
console.log('res==', audioResult) console.log('res==', audioResult)
that.changeSubLoding(true, '上传中') that.changeSubLoding(true, '上传中')
if (audioResult.error_code == 0) { if (audioResult.error_code == 0) {
// 提交订单 // 提交订单
that.setState({ that.setState(
{
listOptionData: state.listOptionData.map((item, index) => { listOptionData: state.listOptionData.map((item, index) => {
if (index == 12) { if (index == 12) {
item.value = audioResult.data.url item.value = audioResult.data.url
} }
return item return item
}) }),
}, () => { },
() => {
that.changeSubLoding(false) that.changeSubLoding(false)
that.getSumLinesOps() that.getSumLinesOps()
}) },
)
} else if (audioResult.error_code == 41006) { } else if (audioResult.error_code == 41006) {
that.changeSubLoding(false) that.changeSubLoding(false)
show('登录过期,请重新登录'); show('登录过期,请重新登录')
props.exitLoginStatus(); props.exitLoginStatus()
} else { } else {
that.changeSubLoding(false) that.changeSubLoding(false)
let error_msg = audioResult.error_msg || audioResult.message let error_msg = audioResult.error_msg || audioResult.message
show(error_msg); show(error_msg)
that.getSumLinesOps() that.getSumLinesOps()
} }
} else { } else {
...@@ -1703,7 +1870,7 @@ class SelfOrderPage extends Component { ...@@ -1703,7 +1870,7 @@ class SelfOrderPage extends Component {
// 提交订单 // 提交订单
submitSelfOrder() { submitSelfOrder() {
let { state, props } = this let { state, props } = this
const {isLendOrder} = this.props.navigation.getParam('params') const { isLendOrder } = this.props.navigation.getParam('params')
let tempSubOption = state.submitOption let tempSubOption = state.submitOption
tempSubOption.seller_code = state.listOptionData[0].value tempSubOption.seller_code = state.listOptionData[0].value
...@@ -1733,13 +1900,13 @@ class SelfOrderPage extends Component { ...@@ -1733,13 +1900,13 @@ class SelfOrderPage extends Component {
tempSubOption.collect_src_inv_code = state.listOptionData[18].value tempSubOption.collect_src_inv_code = state.listOptionData[18].value
// 有部门显示的提交 // 有部门显示的提交
const {sysValues} = state const { sysValues } = state
sysValues.OBS_MOBILE_DEPARTMENT_DISPLAY > 0 && (tempSubOption.department_code = state.listOptionData[14].value) sysValues.OBS_MOBILE_DEPARTMENT_DISPLAY > 0 && (tempSubOption.department_code = state.listOptionData[14].value)
sysValues.OBS_MOBILE_BM_DISPLAY > 0 && (tempSubOption.business_manager_code = state.listOptionData[15].value) sysValues.OBS_MOBILE_BM_DISPLAY > 0 && (tempSubOption.business_manager_code = state.listOptionData[15].value)
sysValues.OBS_MOBILE_SUR_FOLLOWER_DISPLAY > 0 && (tempSubOption.surgery_follower_code = state.listOptionData[16].value) sysValues.OBS_MOBILE_SUR_FOLLOWER_DISPLAY > 0 &&
(tempSubOption.surgery_follower_code = state.listOptionData[16].value)
sysValues.OBS_MOBILE_DELIVERYMAN_DISPLAY > 0 && (tempSubOption.deliveryman_code = state.listOptionData[17].value) sysValues.OBS_MOBILE_DELIVERYMAN_DISPLAY > 0 && (tempSubOption.deliveryman_code = state.listOptionData[17].value)
const patientNameProfile = this.decodeDisplayLendProfile('PATIENT_NAME_DISPLAY') const patientNameProfile = this.decodeDisplayLendProfile('PATIENT_NAME_DISPLAY')
const patientGenderProfile = this.decodeDisplayLendProfile('PATIENT_GENDER_DISPLAY') const patientGenderProfile = this.decodeDisplayLendProfile('PATIENT_GENDER_DISPLAY')
const patientAgeProfile = this.decodeDisplayLendProfile('PATIENT_AGE_DISPLAY') const patientAgeProfile = this.decodeDisplayLendProfile('PATIENT_AGE_DISPLAY')
...@@ -1748,7 +1915,9 @@ class SelfOrderPage extends Component { ...@@ -1748,7 +1915,9 @@ class SelfOrderPage extends Component {
isLendOrder && patientNameProfile.show && (tempSubOption.patient_name = state.listOptionData[20].value) isLendOrder && patientNameProfile.show && (tempSubOption.patient_name = state.listOptionData[20].value)
isLendOrder && patientGenderProfile.show && (tempSubOption.patient_gender = state.listOptionData[21].value) isLendOrder && patientGenderProfile.show && (tempSubOption.patient_gender = state.listOptionData[21].value)
isLendOrder && patientAgeProfile.show && (tempSubOption.patient_age = state.listOptionData[22].value) isLendOrder && patientAgeProfile.show && (tempSubOption.patient_age = state.listOptionData[22].value)
isLendOrder && hospitalizationNumberProfile.show && (tempSubOption.hospitalization_number = state.listOptionData[23].value) isLendOrder &&
hospitalizationNumberProfile.show &&
(tempSubOption.hospitalization_number = state.listOptionData[23].value)
isLendOrder && patientIdProfile.show && (tempSubOption.patient_id = state.listOptionData[24].value) isLendOrder && patientIdProfile.show && (tempSubOption.patient_id = state.listOptionData[24].value)
// tempSubOption.replace_item_flag = state.listOptionData[10].replace_item_flag // tempSubOption.replace_item_flag = state.listOptionData[10].replace_item_flag
...@@ -1756,7 +1925,7 @@ class SelfOrderPage extends Component { ...@@ -1756,7 +1925,7 @@ class SelfOrderPage extends Component {
let params = { let params = {
access_token: props.token, access_token: props.token,
data: { ...tempSubOption } data: { ...tempSubOption },
} }
console.log('params=', params) console.log('params=', params)
props.requestSelfSumbit(params) props.requestSelfSumbit(params)
...@@ -1771,7 +1940,11 @@ class SelfOrderPage extends Component { ...@@ -1771,7 +1940,11 @@ class SelfOrderPage extends Component {
let res_lines = [] let res_lines = []
let showPackageTip = false let showPackageTip = false
local_lines.forEach(sup_item => { local_lines.forEach(sup_item => {
if (sup_item[LocalVariable.SELECTED_QUQNTITY] > 0 && sup_item.leftOptionList && sup_item.leftOptionList.length > 0) { if (
sup_item[LocalVariable.SELECTED_QUQNTITY] > 0 &&
sup_item.leftOptionList &&
sup_item.leftOptionList.length > 0
) {
sup_item.leftOptionList.map(lef_item => { sup_item.leftOptionList.map(lef_item => {
// let select_arr = lef_item[LocalVariable.SELECTED_DATA_ARR] // let select_arr = lef_item[LocalVariable.SELECTED_DATA_ARR]
let select_arr = lef_item.selectedArr || [] let select_arr = lef_item.selectedArr || []
...@@ -1780,11 +1953,17 @@ class SelfOrderPage extends Component { ...@@ -1780,11 +1953,17 @@ class SelfOrderPage extends Component {
// 手术套包 // 手术套包
select_arr.forEach(sel_item => { select_arr.forEach(sel_item => {
let template_number = sel_item.template_number let template_number = sel_item.template_number
if (sel_item[LocalVariable.CHILDREN_LINE_NAME] && sel_item[LocalVariable.CHILDREN_LINE_NAME].length > 0) { if (
sel_item[LocalVariable.CHILDREN_LINE_NAME] &&
sel_item[LocalVariable.CHILDREN_LINE_NAME].length > 0
) {
sel_item[LocalVariable.CHILDREN_LINE_NAME].forEach(chi_item => { sel_item[LocalVariable.CHILDREN_LINE_NAME].forEach(chi_item => {
if (chi_item[LocalVariable.LINE_OPTIONS] && chi_item[LocalVariable.LINE_OPTIONS].length > 0) { if (chi_item[LocalVariable.LINE_OPTIONS] && chi_item[LocalVariable.LINE_OPTIONS].length > 0) {
chi_item[LocalVariable.LINE_OPTIONS].forEach(lin_item => { chi_item[LocalVariable.LINE_OPTIONS].forEach(lin_item => {
if (lin_item[LocalVariable.SELECTED_DATA_ARR] && lin_item[LocalVariable.SELECTED_DATA_ARR].length > 0) { if (
lin_item[LocalVariable.SELECTED_DATA_ARR] &&
lin_item[LocalVariable.SELECTED_DATA_ARR].length > 0
) {
lin_item[LocalVariable.SELECTED_DATA_ARR].forEach(sel_item => { lin_item[LocalVariable.SELECTED_DATA_ARR].forEach(sel_item => {
if (sel_item[LocalVariable.QUANTITY_FIELD] > 0) { if (sel_item[LocalVariable.QUANTITY_FIELD] > 0) {
// sel_item['template_number'] = template_number // 暂时不用 // sel_item['template_number'] = template_number // 暂时不用
...@@ -1798,7 +1977,10 @@ class SelfOrderPage extends Component { ...@@ -1798,7 +1977,10 @@ class SelfOrderPage extends Component {
}) })
} }
}) })
} else if (lef_item.category_code === LocalVariable.NAIL_BOX || lef_item.category_code === LocalVariable.EQUIPMENT_BAG) { } else if (
lef_item.category_code === LocalVariable.NAIL_BOX ||
lef_item.category_code === LocalVariable.EQUIPMENT_BAG
) {
// 钉盒/器械包 // 钉盒/器械包
if (lef_item.category_code === LocalVariable.EQUIPMENT_BAG) { if (lef_item.category_code === LocalVariable.EQUIPMENT_BAG) {
showPackageTip = true showPackageTip = true
...@@ -1811,17 +1993,15 @@ class SelfOrderPage extends Component { ...@@ -1811,17 +1993,15 @@ class SelfOrderPage extends Component {
res_lines.push(sel_item) res_lines.push(sel_item)
} }
}) })
} } else if (lef_item.category_code === LocalVariable.SCATTERED_EQUIPMENT) {
else if (lef_item.category_code === LocalVariable.SCATTERED_EQUIPMENT) {
// 零散器械 // 零散器械
select_arr.forEach(sel_item => { select_arr.forEach(sel_item => {
if(sel_item[LocalVariable.QUANTITY_FIELD] > 0){ if (sel_item[LocalVariable.QUANTITY_FIELD] > 0) {
sel_item[LocalVariable.PLAN_QUANTITY] = sel_item[LocalVariable.QUANTITY_FIELD] sel_item[LocalVariable.PLAN_QUANTITY] = sel_item[LocalVariable.QUANTITY_FIELD]
res_lines.push(sel_item) res_lines.push(sel_item)
} }
}) })
} } else {
else {
// 耗材 // 耗材
if (select_arr[0].details && select_arr[0].details.length > 0) { if (select_arr[0].details && select_arr[0].details.length > 0) {
// 大-中-小类 // 大-中-小类
...@@ -1836,7 +2016,7 @@ class SelfOrderPage extends Component { ...@@ -1836,7 +2016,7 @@ class SelfOrderPage extends Component {
} else { } else {
// 大类-小类 // 大类-小类
select_arr.forEach(sel_item => { select_arr.forEach(sel_item => {
if(sel_item[LocalVariable.QUANTITY_FIELD] > 0){ if (sel_item[LocalVariable.QUANTITY_FIELD] > 0) {
sel_item[LocalVariable.PLAN_QUANTITY] = sel_item[LocalVariable.QUANTITY_FIELD] sel_item[LocalVariable.PLAN_QUANTITY] = sel_item[LocalVariable.QUANTITY_FIELD]
res_lines.push(sel_item) res_lines.push(sel_item)
} }
...@@ -1874,19 +2054,20 @@ class SelfOrderPage extends Component { ...@@ -1874,19 +2054,20 @@ class SelfOrderPage extends Component {
listOptionData[8].sub_lines = end_lines listOptionData[8].sub_lines = end_lines
that.setState({ that.setState(
listOptionData: listOptionData {
}, () => { listOptionData: listOptionData,
},
() => {
that.submitSelfOrder() that.submitSelfOrder()
}) },
)
// if (showPackageTip) { // if (showPackageTip) {
// this.refs.PackageModel.show() // this.refs.PackageModel.show()
// } else { // } else {
// this.refs.CertModel.show('需要携带合格证?') // this.refs.CertModel.show('需要携带合格证?')
// } // }
} }
// 判断组织是否为空 // 判断组织是否为空
...@@ -1906,10 +2087,15 @@ class SelfOrderPage extends Component { ...@@ -1906,10 +2087,15 @@ class SelfOrderPage extends Component {
* @returns * @returns
*/ */
judgeDepartmentIsNull() { judgeDepartmentIsNull() {
let {listOptionData } = this.state let { listOptionData } = this.state
return R.ifElse(R.isEmpty, () => {show('请先选择部门'); return R.F()}, R.T)( return R.ifElse(
R.path(['listOptionData', 14, 'value'], this.state) R.isEmpty,
) () => {
show('请先选择部门')
return R.F()
},
R.T,
)(R.path(['listOptionData', 14, 'value'], this.state))
} }
// 判断客户名称是否为空 // 判断客户名称是否为空
...@@ -1929,10 +2115,15 @@ class SelfOrderPage extends Component { ...@@ -1929,10 +2115,15 @@ class SelfOrderPage extends Component {
* @returns * @returns
*/ */
judgeBillIsNull() { judgeBillIsNull() {
let {listOptionData } = this.state let { listOptionData } = this.state
return R.ifElse(R.isEmpty, () => {show('请先选择收单地点'); return R.F()}, R.T)( return R.ifElse(
R.path(['listOptionData', 3, 'value'], this.state) R.isEmpty,
) () => {
show('请先选择收单地点')
return R.F()
},
R.T,
)(R.path(['listOptionData', 3, 'value'], this.state))
} }
// 处理提交后返回的数据 // 处理提交后返回的数据
...@@ -1942,23 +2133,30 @@ class SelfOrderPage extends Component { ...@@ -1942,23 +2133,30 @@ class SelfOrderPage extends Component {
if (selfOrderOption) { if (selfOrderOption) {
if (selfOrderOption.create_success == 'N') { if (selfOrderOption.create_success == 'N') {
// 打开库存不足弹窗 // 打开库存不足弹窗
this.setState({ this.setState(
not_enough_items_list: selfOrderOption.not_enough_items_list {
}, () => { not_enough_items_list: selfOrderOption.not_enough_items_list,
},
() => {
// 解决 IOS 弹窗显示问题 // 解决 IOS 弹窗显示问题
setTimeout(() => { setTimeout(() => {
that.setState({ that.setState({
showNotEnogPop: true showNotEnogPop: true,
}) })
}, 500) }, 500)
}) },
)
} else if (selfOrderOption.create_success == 'Y') { } else if (selfOrderOption.create_success == 'Y') {
// 打开下单成功页面 // 打开下单成功页面
that.clearAllData() that.clearAllData()
let { state: { params: { title } } } = that.props.navigation let {
state: {
params: { title },
},
} = that.props.navigation
that.props.navigation.navigate('SubSuccPage', { that.props.navigation.navigate('SubSuccPage', {
title: `${title} - 下单成功`, title: `${title} - 下单成功`,
orderNumber: selfOrderOption.survey_collect_number orderNumber: selfOrderOption.survey_collect_number,
// orderNumber: selfOrderOption.order_number // orderNumber: selfOrderOption.order_number
}) })
} }
...@@ -1974,7 +2172,7 @@ class SelfOrderPage extends Component { ...@@ -1974,7 +2172,7 @@ class SelfOrderPage extends Component {
listOptionData, listOptionData,
currentTime: 0, currentTime: 0,
stop: false, stop: false,
localPhoOption: [] localPhoOption: [],
}) })
} }
...@@ -1984,7 +2182,7 @@ class SelfOrderPage extends Component { ...@@ -1984,7 +2182,7 @@ class SelfOrderPage extends Component {
* @return {*} * @return {*}
*/ */
patientInfoInputHandler(text, item) { patientInfoInputHandler(text, item) {
const {listOptionData} = this.state const { listOptionData } = this.state
item.value = text item.value = text
this.setState({ listOptionData }, () => { this.setState({ listOptionData }, () => {
this.changeCanSub() this.changeCanSub()
...@@ -1994,19 +2192,22 @@ class SelfOrderPage extends Component { ...@@ -1994,19 +2192,22 @@ class SelfOrderPage extends Component {
handleGenderCheck(curData) { handleGenderCheck(curData) {
let { sexTypeOption } = this.state let { sexTypeOption } = this.state
let that = this let that = this
if(this.judgeOrgIsNull() && this.judgeCustomerIsNull()) { if (this.judgeOrgIsNull() && this.judgeCustomerIsNull()) {
that.setState({ that.setState(
{
currentTitle: curData.title, currentTitle: curData.title,
currentItem: { currentItem: {
name: curData.name, name: curData.name,
value: curData.value value: curData.value,
} },
}, () => { },
() => {
that.setState({ that.setState({
showTypePop: true, showTypePop: true,
listCurrentOption: [...sexTypeOption] listCurrentOption: [...sexTypeOption],
})
}) })
},
)
} }
} }
...@@ -2028,20 +2229,23 @@ class SelfOrderPage extends Component { ...@@ -2028,20 +2229,23 @@ class SelfOrderPage extends Component {
handleNotEnoughCallBack() { handleNotEnoughCallBack() {
let { submitOption } = this.state let { submitOption } = this.state
let that = this let that = this
this.setState({ this.setState(
{
submitOption: { submitOption: {
...submitOption, ...submitOption,
force_balance_check_flag: 'N' force_balance_check_flag: 'N',
} },
}, () => { },
() => {
// that.handleSubmit() // that.handleSubmit()
that.submitSelfOrder() that.submitSelfOrder()
}) },
)
} }
// 库存不足弹窗关闭 // 库存不足弹窗关闭
handleNotEnoughCloseModal(show) { handleNotEnoughCloseModal(show) {
this.setState({ this.setState({
showNotEnogPop: show showNotEnogPop: show,
}) })
} }
...@@ -2049,14 +2253,14 @@ class SelfOrderPage extends Component { ...@@ -2049,14 +2253,14 @@ class SelfOrderPage extends Component {
handleZoomPicture(flag, index) { handleZoomPicture(flag, index) {
this.setState({ this.setState({
isShowImage: flag, isShowImage: flag,
currShowImgIndex: index || 0 currShowImgIndex: index || 0,
}) })
} }
// 返回备注以上的元素 // 返回备注以上的元素
renderListItem() { renderListItem() {
let { listOptionData, dateModelPop, sysValues } = this.state let { listOptionData, dateModelPop, sysValues } = this.state
const {sysProfiles, navigation} = this.props const { sysProfiles, navigation } = this.props
const isShowOrg = R.compose(R.equals('Y'), R.prop('OBS_SHOW_ORG_FLAG'))(sysProfiles) const isShowOrg = R.compose(R.equals('Y'), R.prop('OBS_SHOW_ORG_FLAG'))(sysProfiles)
const { isLendOrder } = navigation.getParam('params') const { isLendOrder } = navigation.getParam('params')
...@@ -2077,10 +2281,9 @@ class SelfOrderPage extends Component { ...@@ -2077,10 +2281,9 @@ class SelfOrderPage extends Component {
listDefaValue={'name'} listDefaValue={'name'}
listTitle={'title'} listTitle={'title'}
/> />
{ {isShowOrg && (
isShowOrg && (
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={true} listHasAster={true}
listItem={listOptionData[1]} listItem={listOptionData[1]}
listName={'name'} listName={'name'}
...@@ -2088,62 +2291,73 @@ class SelfOrderPage extends Component { ...@@ -2088,62 +2291,73 @@ class SelfOrderPage extends Component {
listCallBack={() => this.handleOrganizationCheck(listOptionData[1])} listCallBack={() => this.handleOrganizationCheck(listOptionData[1])}
listHasArrow={true} listHasArrow={true}
/> />
) )}
} {sysValues.OBS_MOBILE_DEPARTMENT_DISPLAY > 1 && (
{
sysValues.OBS_MOBILE_DEPARTMENT_DISPLAY > 1 && (
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={sysValues.OBS_MOBILE_DEPARTMENT_DISPLAY > 2} listHasAster={sysValues.OBS_MOBILE_DEPARTMENT_DISPLAY > 2}
listItem={listOptionData[14]} listItem={listOptionData[14]}
listName={'name'} listName={'name'}
listTitle={'title'} listTitle={'title'}
listCallBack={() => this.handleDepartmentCheck(listOptionData[14], null, 'department_name', 'department_code')} listCallBack={() =>
this.handleDepartmentCheck(listOptionData[14], null, 'department_name', 'department_code')
}
listHasArrow={true} listHasArrow={true}
/> />
) )}
} {sysValues.OBS_MOBILE_BM_DISPLAY > 1 && (
{
sysValues.OBS_MOBILE_BM_DISPLAY > 1 && (
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={sysValues.OBS_MOBILE_BM_DISPLAY > 2} listHasAster={sysValues.OBS_MOBILE_BM_DISPLAY > 2}
listItem={listOptionData[15]} listItem={listOptionData[15]}
listName={'name'} listName={'name'}
listTitle={'title'} listTitle={'title'}
listCallBack={this.handleDepartmentCheck.bind(this, listOptionData[15], 'business_manager_list', 'business_manager_name', 'business_manager_code')} listCallBack={this.handleDepartmentCheck.bind(
this,
listOptionData[15],
'business_manager_list',
'business_manager_name',
'business_manager_code',
)}
listHasArrow={true} listHasArrow={true}
/> />
) )}
} {sysValues.OBS_MOBILE_SUR_FOLLOWER_DISPLAY > 1 && (
{
sysValues.OBS_MOBILE_SUR_FOLLOWER_DISPLAY > 1 && (
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={sysValues.OBS_MOBILE_SUR_FOLLOWER_DISPLAY > 2} listHasAster={sysValues.OBS_MOBILE_SUR_FOLLOWER_DISPLAY > 2}
listItem={listOptionData[16]} listItem={listOptionData[16]}
listName={'name'} listName={'name'}
listTitle={'title'} listTitle={'title'}
listCallBack={this.handleDepartmentCheck.bind(this, listOptionData[16], 'surgery_follower_list', 'surgery_follower_name', 'surgery_follower_code')} listCallBack={this.handleDepartmentCheck.bind(
this,
listOptionData[16],
'surgery_follower_list',
'surgery_follower_name',
'surgery_follower_code',
)}
listHasArrow={true} listHasArrow={true}
/> />
) )}
} {sysValues.OBS_MOBILE_DELIVERYMAN_DISPLAY > 1 && (
{
sysValues.OBS_MOBILE_DELIVERYMAN_DISPLAY > 1 && (
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={sysValues.OBS_MOBILE_DELIVERYMAN_DISPLAY > 2} listHasAster={sysValues.OBS_MOBILE_DELIVERYMAN_DISPLAY > 2}
listItem={listOptionData[17]} listItem={listOptionData[17]}
listName={'name'} listName={'name'}
listTitle={'title'} listTitle={'title'}
listCallBack={this.handleDepartmentCheck.bind(this, listOptionData[17], 'deliveryman_list', 'deliveryman_name', 'deliveryman_code')} listCallBack={this.handleDepartmentCheck.bind(
this,
listOptionData[17],
'deliveryman_list',
'deliveryman_name',
'deliveryman_code',
)}
listHasArrow={true} listHasArrow={true}
/> />
) )}
}
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={true} listHasAster={true}
listItem={listOptionData[2]} listItem={listOptionData[2]}
listName={'name'} listName={'name'}
...@@ -2152,7 +2366,7 @@ class SelfOrderPage extends Component { ...@@ -2152,7 +2366,7 @@ class SelfOrderPage extends Component {
listHasArrow={true} listHasArrow={true}
/> />
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={true} listHasAster={true}
listItem={listOptionData[3]} listItem={listOptionData[3]}
listName={'name'} listName={'name'}
...@@ -2161,7 +2375,7 @@ class SelfOrderPage extends Component { ...@@ -2161,7 +2375,7 @@ class SelfOrderPage extends Component {
listHasArrow={true} listHasArrow={true}
/> />
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={true} listHasAster={true}
listItem={listOptionData[4]} listItem={listOptionData[4]}
listName={'name'} listName={'name'}
...@@ -2169,10 +2383,10 @@ class SelfOrderPage extends Component { ...@@ -2169,10 +2383,10 @@ class SelfOrderPage extends Component {
listCallBack={() => this.handleShipCheck(listOptionData[4])} listCallBack={() => this.handleShipCheck(listOptionData[4])}
listHasArrow={true} listHasArrow={true}
/> />
{ {isLendOrder ? (
isLendOrder ? (doctorNameProfile.show && doctorNameProfile.show && (
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={doctorNameProfile.required} listHasAster={doctorNameProfile.required}
listItem={listOptionData[5]} listItem={listOptionData[5]}
listName={'name'} listName={'name'}
...@@ -2181,10 +2395,12 @@ class SelfOrderPage extends Component { ...@@ -2181,10 +2395,12 @@ class SelfOrderPage extends Component {
listHasArrow={true} listHasArrow={true}
listOtherInput={'请输入主治医生'} listOtherInput={'请输入主治医生'}
otherInput={'showInput'} otherInput={'showInput'}
otherInputCallBack={(text) => this.handleDoctorInput(text, listOptionData[5])} otherInputCallBack={text => this.handleDoctorInput(text, listOptionData[5])}
/>) : ( />
)
) : (
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
// listHasAster={true} // listHasAster={true}
listItem={listOptionData[5]} listItem={listOptionData[5]}
listName={'name'} listName={'name'}
...@@ -2193,10 +2409,9 @@ class SelfOrderPage extends Component { ...@@ -2193,10 +2409,9 @@ class SelfOrderPage extends Component {
listHasArrow={true} listHasArrow={true}
listOtherInput={'请输入主治医生'} listOtherInput={'请输入主治医生'}
otherInput={'showInput'} otherInput={'showInput'}
otherInputCallBack={(text) => this.handleDoctorInput(text, listOptionData[5])} otherInputCallBack={text => this.handleDoctorInput(text, listOptionData[5])}
/> />
) )}
}
{/* <PageListArrow {/* <PageListArrow
listActOpa={.8} listActOpa={.8}
listHasAster={true} listHasAster={true}
...@@ -2208,7 +2423,7 @@ class SelfOrderPage extends Component { ...@@ -2208,7 +2423,7 @@ class SelfOrderPage extends Component {
isTitInputStyle={true} isTitInputStyle={true}
/> */} /> */}
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={true} listHasAster={true}
listItem={listOptionData[6]} listItem={listOptionData[6]}
listName={'name'} listName={'name'}
...@@ -2216,10 +2431,9 @@ class SelfOrderPage extends Component { ...@@ -2216,10 +2431,9 @@ class SelfOrderPage extends Component {
listCallBack={() => this.handleSurDateCheck(listOptionData[6])} listCallBack={() => this.handleSurDateCheck(listOptionData[6])}
listHasArrow={true} listHasArrow={true}
/> />
{ {sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 1 && (
sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 1 &&
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listItem={listOptionData[19]} listItem={listOptionData[19]}
listHasAster={sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 2} listHasAster={sysProfiles.SUR_MOBILE_INV_PRODUCT_LINE_CATEGORY_FLAG > 2}
listName={'name'} listName={'name'}
...@@ -2227,9 +2441,8 @@ class SelfOrderPage extends Component { ...@@ -2227,9 +2441,8 @@ class SelfOrderPage extends Component {
listCallBack={() => this.handleSurTypeCheck(listOptionData[19])} listCallBack={() => this.handleSurTypeCheck(listOptionData[19])}
listHasArrow={true} listHasArrow={true}
/> />
} )}
{ {isLendOrder && patientNameProfile.show && (
isLendOrder && patientNameProfile.show &&
<PageListArrow <PageListArrow
listHasAster={true} listHasAster={true}
listItem={listOptionData[20]} listItem={listOptionData[20]}
...@@ -2237,15 +2450,14 @@ class SelfOrderPage extends Component { ...@@ -2237,15 +2450,14 @@ class SelfOrderPage extends Component {
listHasAster={patientNameProfile.required} listHasAster={patientNameProfile.required}
listTitle={'title'} listTitle={'title'}
listInputPlace={`请输入${listOptionData[20].title}`} listInputPlace={`请输入${listOptionData[20].title}`}
inputCallBack={(text) => this.patientInfoInputHandler(text, listOptionData[20])} inputCallBack={text => this.patientInfoInputHandler(text, listOptionData[20])}
isTitInputStyle={true} isTitInputStyle={true}
listCellStyle={styles.list_cell_box} listCellStyle={styles.list_cell_box}
/> />
} )}
{ {isLendOrder && patientGenderProfile.show && (
isLendOrder && patientGenderProfile.show &&
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={patientGenderProfile.required} listHasAster={patientGenderProfile.required}
listItem={listOptionData[21]} listItem={listOptionData[21]}
listName={'name'} listName={'name'}
...@@ -2253,9 +2465,8 @@ class SelfOrderPage extends Component { ...@@ -2253,9 +2465,8 @@ class SelfOrderPage extends Component {
listCallBack={() => this.handleGenderCheck(listOptionData[21])} listCallBack={() => this.handleGenderCheck(listOptionData[21])}
listHasArrow={true} listHasArrow={true}
/> />
} )}
{ {isLendOrder && patientAgeProfile.show && (
isLendOrder && patientAgeProfile.show &&
<PageListArrow <PageListArrow
listHasAster={true} listHasAster={true}
listItem={listOptionData[22]} listItem={listOptionData[22]}
...@@ -2263,13 +2474,12 @@ class SelfOrderPage extends Component { ...@@ -2263,13 +2474,12 @@ class SelfOrderPage extends Component {
listHasAster={patientAgeProfile.required} listHasAster={patientAgeProfile.required}
listTitle={'title'} listTitle={'title'}
listInputPlace={`请输入${listOptionData[22].title}`} listInputPlace={`请输入${listOptionData[22].title}`}
inputCallBack={(text) => this.patientInfoInputHandler(text, listOptionData[22])} inputCallBack={text => this.patientInfoInputHandler(text, listOptionData[22])}
isTitInputStyle={true} isTitInputStyle={true}
listCellStyle={styles.list_cell_box} listCellStyle={styles.list_cell_box}
/> />
} )}
{ {isLendOrder && hospitalizationNumberProfile.show && (
isLendOrder && hospitalizationNumberProfile.show &&
<PageListArrow <PageListArrow
listHasAster={true} listHasAster={true}
listItem={listOptionData[23]} listItem={listOptionData[23]}
...@@ -2277,13 +2487,12 @@ class SelfOrderPage extends Component { ...@@ -2277,13 +2487,12 @@ class SelfOrderPage extends Component {
listHasAster={hospitalizationNumberProfile.required} listHasAster={hospitalizationNumberProfile.required}
listTitle={'title'} listTitle={'title'}
listInputPlace={`请输入${listOptionData[23].title}`} listInputPlace={`请输入${listOptionData[23].title}`}
inputCallBack={(text) => this.patientInfoInputHandler(text, listOptionData[23])} inputCallBack={text => this.patientInfoInputHandler(text, listOptionData[23])}
isTitInputStyle={true} isTitInputStyle={true}
listCellStyle={styles.list_cell_box} listCellStyle={styles.list_cell_box}
/> />
} )}
{ {isLendOrder && patientIdProfile.show && (
isLendOrder && patientIdProfile.show &&
<PageListArrow <PageListArrow
listHasAster={true} listHasAster={true}
listItem={listOptionData[24]} listItem={listOptionData[24]}
...@@ -2291,13 +2500,13 @@ class SelfOrderPage extends Component { ...@@ -2291,13 +2500,13 @@ class SelfOrderPage extends Component {
listHasAster={patientIdProfile.required} listHasAster={patientIdProfile.required}
listTitle={'title'} listTitle={'title'}
listInputPlace={`请输入${listOptionData[24].title}`} listInputPlace={`请输入${listOptionData[24].title}`}
inputCallBack={(text) => this.patientInfoInputHandler(text, listOptionData[24])} inputCallBack={text => this.patientInfoInputHandler(text, listOptionData[24])}
isTitInputStyle={true} isTitInputStyle={true}
listCellStyle={styles.list_cell_box} listCellStyle={styles.list_cell_box}
/> />
} )}
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={true} listHasAster={true}
listItem={listOptionData[7]} listItem={listOptionData[7]}
listName={'name'} listName={'name'}
...@@ -2306,7 +2515,7 @@ class SelfOrderPage extends Component { ...@@ -2306,7 +2515,7 @@ class SelfOrderPage extends Component {
listHasArrow={true} listHasArrow={true}
/> />
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={true} listHasAster={true}
listItem={listOptionData[8]} listItem={listOptionData[8]}
listName={'name'} listName={'name'}
...@@ -2316,29 +2525,28 @@ class SelfOrderPage extends Component { ...@@ -2316,29 +2525,28 @@ class SelfOrderPage extends Component {
listMaxLines={1} listMaxLines={1}
/> />
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={true} listHasAster={true}
listItem={listOptionData[9]} listItem={listOptionData[9]}
// listName={'name'} // listName={'name'}
listTitle={'title'} listTitle={'title'}
listValue={'value'} listValue={'value'}
listCallBack={(radioFlag) => this.handleCertAndItemCheck(listOptionData[9], radioFlag)} listCallBack={radioFlag => this.handleCertAndItemCheck(listOptionData[9], radioFlag)}
listIsAudio={true} listIsAudio={true}
/> />
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listItem={listOptionData[10]} listItem={listOptionData[10]}
// listName={'name'} // listName={'name'}
listTitle={'title'} listTitle={'title'}
listValue={'value'} listValue={'value'}
listCallBack={(radioFlag) => this.handleCertAndItemCheck(listOptionData[10], radioFlag)} listCallBack={radioFlag => this.handleCertAndItemCheck(listOptionData[10], radioFlag)}
listIsAudio={true} listIsAudio={true}
/> />
{ {sysValues.OBS_MOBILE_BOR_WARE_REQUIRED > 1 ? (
sysValues.OBS_MOBILE_BOR_WARE_REQUIRED > 1 ?
<PageListArrow <PageListArrow
listActOpa={.8} listActOpa={0.8}
listHasAster={sysValues.OBS_MOBILE_BOR_WARE_REQUIRED > 2} listHasAster={sysValues.OBS_MOBILE_BOR_WARE_REQUIRED > 2}
listItem={listOptionData[18]} listItem={listOptionData[18]}
listName={'name'} listName={'name'}
...@@ -2346,17 +2554,18 @@ class SelfOrderPage extends Component { ...@@ -2346,17 +2554,18 @@ class SelfOrderPage extends Component {
listCallBack={() => this.handleWareCheck(listOptionData[18])} listCallBack={() => this.handleWareCheck(listOptionData[18])}
listHasArrow={true} listHasArrow={true}
/> />
: <Text></Text> ) : (
} <Text></Text>
)}
<DateModel <DateModel
date={listOptionData[6].dateValue} date={listOptionData[6].dateValue}
closeModal={(show) => this.closeDateModal(show)} closeModal={show => this.closeDateModal(show)}
show={dateModelPop} show={dateModelPop}
callback={(date) => this.dateModalCallback(date, listOptionData[6])} callback={date => this.dateModalCallback(date, listOptionData[6])}
minuteInterval={30} minuteInterval={30}
/> />
{ this.renderPickerModel()} {this.renderPickerModel()}
{/* { this.renderTipModelPackage()} {/* { this.renderTipModelPackage()}
{ this.renderTipModelCert()} */} { this.renderTipModelCert()} */}
</View> </View>
...@@ -2383,7 +2592,7 @@ class SelfOrderPage extends Component { ...@@ -2383,7 +2592,7 @@ class SelfOrderPage extends Component {
show={showTypePop} show={showTypePop}
itemValue={currentItem.value} itemValue={currentItem.value}
itemTitle={currentTitle} itemTitle={currentTitle}
closeModal={(show) => this.handleCloseModal(show)} closeModal={show => this.handleCloseModal(show)}
/> />
</SafeAreaView> </SafeAreaView>
) )
...@@ -2396,18 +2605,22 @@ class SelfOrderPage extends Component { ...@@ -2396,18 +2605,22 @@ class SelfOrderPage extends Component {
<CellTextStyle style={list_common_item.remark_item}> <CellTextStyle style={list_common_item.remark_item}>
<View style={list_common_item.rema_box}> <View style={list_common_item.rema_box}>
<Text style={list_common_item.rema_tit}>备注</Text> <Text style={list_common_item.rema_tit}>备注</Text>
<View style={list_common_item.rema_Input_outer} > <View style={list_common_item.rema_Input_outer}>
<TouchableOpacity activeOpacity={1} style={list_common_item.rema_Input_inner} onPress={() => this.TextInput.focus()} > <TouchableOpacity
activeOpacity={1}
style={list_common_item.rema_Input_inner}
onPress={() => this.TextInput.focus()}
>
<TextInput <TextInput
placeholder={'请输入备注信息'} placeholder={'请输入备注信息'}
placeholderTextColor={placehold_text_color} placeholderTextColor={placehold_text_color}
underlineColorAndroid={'transparent'} underlineColorAndroid={'transparent'}
multiline={true} multiline={true}
ref={textInput => this.TextInput = textInput} ref={textInput => (this.TextInput = textInput)}
numberOfLines={8} numberOfLines={8}
style={list_common_item.rema_Input} style={list_common_item.rema_Input}
maxLength={140} maxLength={140}
onChangeText={(text) => this.handleRemarkInput(text, listOptionData[11])} onChangeText={text => this.handleRemarkInput(text, listOptionData[11])}
defaultValue={listOptionData[11].value} defaultValue={listOptionData[11].value}
/> />
</TouchableOpacity> </TouchableOpacity>
...@@ -2424,11 +2637,10 @@ class SelfOrderPage extends Component { ...@@ -2424,11 +2637,10 @@ class SelfOrderPage extends Component {
<CellTextStyle style={[list_common_item.reco_item, !stop ? '' : list_common_item.reco_play_height]}> <CellTextStyle style={[list_common_item.reco_item, !stop ? '' : list_common_item.reco_play_height]}>
<View style={list_common_item.reco_btn_cont}> <View style={list_common_item.reco_btn_cont}>
{!stop ? <Text style={list_common_item.reco_btn_tit}>还有什么要安排的,可录音备注哟!</Text> : null} {!stop ? <Text style={list_common_item.reco_btn_tit}>还有什么要安排的,可录音备注哟!</Text> : null}
{ {!stop ? (
!stop ?
<View style={list_common_item.reco_btn_inner}> <View style={list_common_item.reco_btn_inner}>
<TouchableOpacity <TouchableOpacity
activeOpacity={.8} activeOpacity={0.8}
style={list_common_item.reco_btn_box} style={list_common_item.reco_btn_box}
onLongPress={this._record} onLongPress={this._record}
onPressOut={this._stop} onPressOut={this._stop}
...@@ -2439,26 +2651,29 @@ class SelfOrderPage extends Component { ...@@ -2439,26 +2651,29 @@ class SelfOrderPage extends Component {
<Text style={list_common_item.reco_btn_text}>长按录音</Text> <Text style={list_common_item.reco_btn_text}>长按录音</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
: <View style={list_common_item.reco_play_box}> ) : (
<View style={list_common_item.reco_play_box}>
<View style={list_common_item.play_btn}> <View style={list_common_item.play_btn}>
<TouchableOpacity <TouchableOpacity
activeOpacity={.8} activeOpacity={0.8}
style={[list_common_item.reco_list_box, list_common_item.reco_del_btn]} style={[list_common_item.reco_list_box, list_common_item.reco_del_btn]}
onPress={this._del} onPress={this._del}
> >
<Text style={[list_common_item.reco_text, list_common_item.reco_del_tit]}> 删除 </Text> <Text style={[list_common_item.reco_text, list_common_item.reco_del_tit]}> 删除 </Text>
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity <TouchableOpacity
activeOpacity={.8} activeOpacity={0.8}
style={[list_common_item.reco_list_box, list_common_item.reco_play_btn]} style={[list_common_item.reco_list_box, list_common_item.reco_play_btn]}
onPress={this._play} onPress={this._play}
> >
<Text style={[list_common_item.reco_text, list_common_item.reco_play_tit]}> 点击播放({currentTime}'') </Text> <Text style={[list_common_item.reco_text, list_common_item.reco_play_tit]}>
{' '}
点击播放({currentTime}''){' '}
</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
} )}
</View> </View>
</CellTextStyle> </CellTextStyle>
) )
...@@ -2472,13 +2687,11 @@ class SelfOrderPage extends Component { ...@@ -2472,13 +2687,11 @@ class SelfOrderPage extends Component {
<View style={list_common_item.addpic_inner}> <View style={list_common_item.addpic_inner}>
<Text style={list_common_item.addpic_tit}>添加图片</Text> <Text style={list_common_item.addpic_tit}>添加图片</Text>
<View style={list_common_item.addpic_cont}> <View style={list_common_item.addpic_cont}>
{ {state.localPhoOption.length
state.localPhoOption.length
? state.localPhoOption.map((item, index) => this.renderPicItem(item, index)) ? state.localPhoOption.map((item, index) => this.renderPicItem(item, index))
: null : null}
}
<TouchableOpacity <TouchableOpacity
activeOpacity={.8} activeOpacity={0.8}
style={list_common_item.addpic_img_btn} style={list_common_item.addpic_img_btn}
onPress={() => this.handleAddPicCheck()} onPress={() => this.handleAddPicCheck()}
> >
...@@ -2496,14 +2709,14 @@ class SelfOrderPage extends Component { ...@@ -2496,14 +2709,14 @@ class SelfOrderPage extends Component {
return ( return (
<View style={list_common_item.addnew_pic_btn} key={index}> <View style={list_common_item.addnew_pic_btn} key={index}>
<TouchableOpacity <TouchableOpacity
activeOpacity={.8} activeOpacity={0.8}
style={list_common_item.show_pic_btn} style={list_common_item.show_pic_btn}
onPress={() => this.handleZoomPicture(true, index)} onPress={() => this.handleZoomPicture(true, index)}
> >
<Image style={icon_style} source={{ uri: item }} /> <Image style={icon_style} source={{ uri: item }} />
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity <TouchableOpacity
activeOpacity={.8} activeOpacity={0.8}
style={list_common_item.del_img_box} style={list_common_item.del_img_box}
onPress={(item, index) => this.handleDelPickCheck(item, index)} onPress={(item, index) => this.handleDelPickCheck(item, index)}
> >
...@@ -2532,7 +2745,7 @@ class SelfOrderPage extends Component { ...@@ -2532,7 +2745,7 @@ class SelfOrderPage extends Component {
let zoomImages = [] let zoomImages = []
listOptionData[13].uploadImgArr.forEach(item => { listOptionData[13].uploadImgArr.forEach(item => {
zoomImages.push({ zoomImages.push({
url: `${global_domain_config}/${item}` url: `${global_domain_config}/${item}`,
}) })
}) })
return ( return (
...@@ -2540,38 +2753,41 @@ class SelfOrderPage extends Component { ...@@ -2540,38 +2753,41 @@ class SelfOrderPage extends Component {
isShowImage={isShowImage} isShowImage={isShowImage}
currShowImgIndex={currShowImgIndex} currShowImgIndex={currShowImgIndex}
zoomImages={zoomImages} zoomImages={zoomImages}
callBack={(flag) => this.handleZoomPicture(flag)} callBack={flag => this.handleZoomPicture(flag)}
></ZoomPictureModel> ></ZoomPictureModel>
) )
} }
// 返回正在加载中 // 返回正在加载中
renderLodingItem() { renderLodingItem() {
let { lodingTitle, isSubLoding } = this.state let { lodingTitle, isSubLoding } = this.state
return ( return <LodingModel title={lodingTitle} show={isSubLoding} style_back={styles.loding_back} />
<LodingModel title={lodingTitle} show={isSubLoding} style_back={styles.loding_back} />
)
} }
// 返回加载中 // 返回加载中
renderLodingItemNew() { renderLodingItemNew() {
return ( return <LoadingModel ref="LoadingModel" />
<LoadingModel ref="LoadingModel" />
)
} }
// 返回提交器械包提示 // 返回提交器械包提示
renderTipModelPackage() { renderTipModelPackage() {
return ( return (
<TipInfoNeedSelect ref="PackageModel" closeCallBack={() => this.modelPackageCertCB('replace_item_flag', 'N')} submitCallBack={() => this.modelPackageCertCB('replace_item_flag', 'Y')} /> <TipInfoNeedSelect
ref="PackageModel"
closeCallBack={() => this.modelPackageCertCB('replace_item_flag', 'N')}
submitCallBack={() => this.modelPackageCertCB('replace_item_flag', 'Y')}
/>
) )
} }
// 返回提交合格证提示 // 返回提交合格证提示
renderTipModelCert() { renderTipModelCert() {
return ( return (
<TipInfoNeedSelect ref="CertModel" closeCallBack={() => this.modelPackageCertCB('take_cert_flag', 'N')} submitCallBack={() => this.modelPackageCertCB('take_cert_flag', 'Y')} /> <TipInfoNeedSelect
ref="CertModel"
closeCallBack={() => this.modelPackageCertCB('take_cert_flag', 'N')}
submitCallBack={() => this.modelPackageCertCB('take_cert_flag', 'Y')}
/>
) )
} }
...@@ -2584,7 +2800,7 @@ class SelfOrderPage extends Component { ...@@ -2584,7 +2800,7 @@ class SelfOrderPage extends Component {
not_enough_items_list={not_enough_items_list} not_enough_items_list={not_enough_items_list}
callback={() => this.handleNotEnoughCallBack()} callback={() => this.handleNotEnoughCallBack()}
show={showNotEnogPop} show={showNotEnogPop}
closeModal={(show) => this.handleNotEnoughCloseModal(show)} closeModal={show => this.handleNotEnoughCloseModal(show)}
/> />
</SafeAreaView> </SafeAreaView>
) )
...@@ -2596,17 +2812,10 @@ class SelfOrderPage extends Component { ...@@ -2596,17 +2812,10 @@ class SelfOrderPage extends Component {
let { title } = navigation.state.params let { title } = navigation.state.params
return ( return (
<View style={styles.self_container}> <View style={styles.self_container}>
<StatusBarView <StatusBarView isReactStackNavigator={true} backgroundColor={promary_color} barStyle="light-content" />
isReactStackNavigator={true}
backgroundColor={promary_color}
barStyle='light-content'
/>
<SafeAreaView style={safe_view}> <SafeAreaView style={safe_view}>
<HeadBackItem title={title} navigation={navigation} /> <HeadBackItem title={title} navigation={navigation} />
<ScrollView <ScrollView style={styles.self_main} showsVerticalScrollIndicator={false}>
style={styles.self_main}
showsVerticalScrollIndicator={false}
>
{this.renderListItem()} {this.renderListItem()}
{this.renderRemarksItem()} {this.renderRemarksItem()}
{this.renderRecordingItem()} {this.renderRecordingItem()}
...@@ -2614,54 +2823,52 @@ class SelfOrderPage extends Component { ...@@ -2614,54 +2823,52 @@ class SelfOrderPage extends Component {
{this.renderZoomPicture()} {this.renderZoomPicture()}
<FooterBtnStyle <FooterBtnStyle
style={canSubFlag ? styles.sub_btn_pro : ''} style={canSubFlag ? styles.sub_btn_pro : ''}
activeOpacity={canSubFlag ? .8 : 1} activeOpacity={canSubFlag ? 0.8 : 1}
title={'生成订单'} title={'生成订单'}
textStyle={styles.sub_btn} textStyle={styles.sub_btn}
onPress={() => this.handleSubmit()} onPress={() => this.handleSubmit()}
/> />
</ScrollView> </ScrollView>
{this.renderLodingItem()} {this.renderLodingItem()}
{this.renderLodingItemNew()} {this.renderLodingItemNew()}
{this.renderNotEnoughModel()} {this.renderNotEnoughModel()}
</SafeAreaView> </SafeAreaView>
</View> </View>
); )
} }
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
self_container: { self_container: {
flex: 1, flex: 1,
backgroundColor: home_background_color backgroundColor: home_background_color,
}, },
self_main: { self_main: {
padding: 14 padding: 14,
}, },
sub_btn_pro: { sub_btn_pro: {
backgroundColor: promary_color backgroundColor: promary_color,
}, },
sub_btn: {}, sub_btn: {},
list_cont: { list_cont: {
flex: 1 flex: 1,
}, },
item_container: { item_container: {
flex: 1 flex: 1,
}, },
cell_title: { cell_title: {
width: 120 width: 120,
}, },
cell_input: { cell_input: {
textAlign: 'left' textAlign: 'left',
}, },
loding_back: { loding_back: {
backgroundColor: 'rgba(0, 0, 0, 0)' backgroundColor: 'rgba(0, 0, 0, 0)',
} },
}) })
const mapStateToProps = (state) => { const mapStateToProps = state => {
return { return {
userInfo: state.login.userInfo, userInfo: state.login.userInfo,
token: state.login.token, token: state.login.token,
...@@ -2672,25 +2879,25 @@ const mapStateToProps = (state) => { ...@@ -2672,25 +2879,25 @@ const mapStateToProps = (state) => {
global_domain_config: state.login.global_domain_config, global_domain_config: state.login.global_domain_config,
local_sele_pro_options: state.selfOrder.local_sele_pro_options, local_sele_pro_options: state.selfOrder.local_sele_pro_options,
sysProfiles: state.login.sysProfiles, sysProfiles: state.login.sysProfiles,
lend_order_value_profiles: state.selfOrder.lend_order_value_profiles lend_order_value_profiles: state.selfOrder.lend_order_value_profiles,
} }
} }
const mapDispatchToProps = (dispatch) => { const mapDispatchToProps = dispatch => {
return { return {
requestSelfOrganizations: (params) => { requestSelfOrganizations: params => {
dispatch(requestSelfOrganizations(params)) dispatch(requestSelfOrganizations(params))
}, },
requestSelfSurgeryHospital: (params) => { requestSelfSurgeryHospital: params => {
dispatch(requestSelfSurgeryHospital(params)) dispatch(requestSelfSurgeryHospital(params))
}, },
requestSelfOrderType: (params) => { requestSelfOrderType: params => {
dispatch(requestSelfOrderType(params)) dispatch(requestSelfOrderType(params))
}, },
requestSelfTemplateCollect: (params) => { requestSelfTemplateCollect: params => {
dispatch(requestSelfTemplateCollect(params)) dispatch(requestSelfTemplateCollect(params))
}, },
requestSelfSumbit: (params) => { requestSelfSumbit: params => {
dispatch(requestSelfSumbit(params)) dispatch(requestSelfSumbit(params))
}, },
exitLoginStatus: () => { exitLoginStatus: () => {
...@@ -2699,19 +2906,19 @@ const mapDispatchToProps = (dispatch) => { ...@@ -2699,19 +2906,19 @@ const mapDispatchToProps = (dispatch) => {
setSelfInitData: () => { setSelfInitData: () => {
dispatch(setSelfInitData()) dispatch(setSelfInitData())
}, },
requestListDataSuccess: (data) => { requestListDataSuccess: data => {
dispatch(requestListDataSuccess(data)) dispatch(requestListDataSuccess(data))
}, },
requestSelfSurgeryType: (params) => { requestSelfSurgeryType: params => {
dispatch(requestSelfSurgeryType(params)) dispatch(requestSelfSurgeryType(params))
}, },
setSelectProductOpts: (data) => { setSelectProductOpts: data => {
dispatch(setSelectProductOpts(data)) dispatch(setSelectProductOpts(data))
}, },
requestQuickSurColSetting: (params) => { requestQuickSurColSetting: params => {
dispatch(requestQuickSurColSetting(params)) dispatch(requestQuickSurColSetting(params))
} },
} }
} }
export default connect(mapStateToProps, mapDispatchToProps)(SelfOrderPage); export default connect(mapStateToProps, mapDispatchToProps)(SelfOrderPage)
...@@ -22,6 +22,7 @@ import { connect } from 'react-redux' ...@@ -22,6 +22,7 @@ import { connect } from 'react-redux'
import LoadingModel from '../../common/listDataComponent/LoadingModel' import LoadingModel from '../../common/listDataComponent/LoadingModel'
import { Width } from '../../../base/BaseStyle' import { Width } from '../../../base/BaseStyle'
import { show } from '../../../utils/Utils' import { show } from '../../../utils/Utils'
import * as R from 'ramda'
class SearchPage extends Component { class SearchPage extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
...@@ -302,6 +303,13 @@ class SearchPage extends Component { ...@@ -302,6 +303,13 @@ class SearchPage extends Component {
[LocalVariable.SELECTED_QUQNTITY]: topProcOptionList[topActiveIndex][LocalVariable.SELECTED_QUQNTITY] + 1, [LocalVariable.SELECTED_QUQNTITY]: topProcOptionList[topActiveIndex][LocalVariable.SELECTED_QUQNTITY] + 1,
leftOptionList: leftOptionList.map(ele => { leftOptionList: leftOptionList.map(ele => {
const childrenLineData = this.getChildrenLineData(ele.localSecondData) const childrenLineData = this.getChildrenLineData(ele.localSecondData)
if (!ele[LocalVariable.SELECTED_DATA_ARR]) {
ele[LocalVariable.SELECTED_DATA_ARR] = []
}
const selectData = R.filter(R.compose(R.lt(0), R.prop(LocalVariable.QUANTITY_FIELD)))(
ele[LocalVariable.LOCAL_SECOND_DATA],
)
ele.selectedArr = selectData
console.log('selectedDataArr', childrenLineData) console.log('selectedDataArr', childrenLineData)
return { return {
...ele, ...ele,
......
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