Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 4bbcb5c9 by Denglingling
Options

调整转单已选明细缓存问题； 

(cherry picked from commit 32a25bce)
parent 31af49ae
Inline Side-by-side
Showing with 36 additions and 63 deletions
app/containers/transOrder/module/TransDetailsModel.js
......@@ -241,7 +241,7 @@ class TransDetailsModel extends Component {
onRequestClose={() => this.closeModal()}>
<SafeAreaView style={safe_view}>
<TouchableOpacity style={styles.container} activeOpacity={1}
// onPress={() => this.closeModal()}
onPress={() => this.closeModal()}
>
{this.renderDialog()}
</TouchableOpacity>
......@@ -313,7 +313,6 @@ const styles = StyleSheet.create({
paddingTop: 16,
paddingBottom: 12,
color: second_text_color,
// fontSize: third_text_size
fontSize: 14
},
top_tit_act: {
......
app/containers/transOrder/module/TransSearchPage.js
......@@ -22,14 +22,12 @@ import {
foundation_color,
second_text_size,
font_family_regular,
first_text_color,
promary_text_color,
list_common_item,
third_text_color
} from '../../../base/BaseStyle';
import StatusBarView from '../../common/StatusBarView';
import {
FooterBtnStyle,
CellTextStyle,
TitleTextStyle,
ContInputTextStyle,
......@@ -42,7 +40,6 @@ import { connect } from 'react-redux';
import { show } from '../../../utils/Utils';
import {
requestTransDetails,
requestSubTransOrganizations,
requestSubSourBorOrdNum,
setTransDetailOption
} from '../../../action/TransAction';
......@@ -116,12 +113,7 @@ class TransSearchPage extends Component {
},
currentTitle: '组织', // 当前点击项
showTypePop: false, // 选择器弹窗
listCurrentOption: [ // 当前选择器数据
// {
// name: '其他',
// value: 'other'
// }
],
listCurrentOption: [], // 当前选择器数据
dateModelPop: false, // 日期选择器
currentDateVal: new Date() , // 当前日期值
}
......@@ -232,14 +224,11 @@ class TransSearchPage extends Component {
access_token: props.token,
org_code: subTransObj.org_code,
seller_code: props.userInfo.user_name,
// customer_code: '',
collect_header_status: 'COLLECTING_WAITING_CONFIRM,CONFIRM_COLLECT,COLLECTED_WAITING_CONFIRMED,APPROVED,COLLECTED'
}
let { global_domain_config } = that.props
that.changeLodingFlag(true)
console.log('params-------', params)
let sourResult = await requestSubSourBorOrdNum(global_domain_config, params)
console.log('sourResult------==========------', sourResult)
if(sourResult.error_code === 0) {
that.changeLodingFlag(false)
let { data: { surgery_collect_headers } } = sourResult
......@@ -386,11 +375,9 @@ class TransSearchPage extends Component {
org_name: subTransObj.org_name,
...seaForm
}
console.log('params------', params)
this.changeLodingFlag(true)
let { global_domain_config } = that.props
let detailResult = await requestTransDetails(global_domain_config, params)
console.log('detailResult------', detailResult)
if(detailResult.error_code === 0) {
let { data: { sur_transfer_lines }} = detailResult
if(sur_transfer_lines.length == 0) {
......@@ -401,7 +388,7 @@ class TransSearchPage extends Component {
sur_transfer_lines.length && sur_transfer_lines.forEach((chItem) => {
if(chItem.serial_number == item.serial_number
&& chItem.surgery_collect_number == item.surgery_collect_number
&& chItem.item_name == item.item_name ) {
&& chItem.item_name == item.item_name) {
chItem.select = true
}
})
......@@ -460,8 +447,21 @@ class TransSearchPage extends Component {
conDetaOption.forEach(item => {
if(item.select) {
tempArr.push(item)
} else {
subTransDetOption.map(subItem => {
if(subItem.serial_number == item.serial_number
&& subItem.surgery_collect_number == item.surgery_collect_number
&& subItem.item_name == item.item_name) {
subItem.select = false
}
})
}
})
if(subTransDetOption.length) {
subTransDetOption = subTransDetOption.filter(fiItem => {
return fiItem.select
})
}
tempArr = [...tempArr, ...subTransDetOption]
tempArr = that.dedupQuoteDetailArr(tempArr, 'serial_number', 'surgery_collect_number', 'item_name')
that.setState({
......@@ -494,8 +494,10 @@ class TransSearchPage extends Component {
item.select = false
if(subOpt.length) {
subOpt.forEach(subIt => {
// 序列号唯一：serial_number ??? 哪一个唯一！！！！
if(subIt.serial_number == item.serial_number) {
// 序列号唯一、序列名
if(subIt.serial_number == item.serial_number
&& subIt.surgery_collect_number == item.surgery_collect_number
&& subIt.item_name == item.item_name) {
item.select = true
}
})
......@@ -736,46 +738,6 @@ class TransSearchPage extends Component {
extraData={this.state}
renderItem={ ({item, index}) => this.renderSubListItem(item, index) }
/>
{/* <View style={styles.cont_list_item}>
<View style={styles.list_left}>
<TouchableOpacity
activeOpacity={.8}
style={styles.btn_single_box}
onPress={() => console.log('单选！！！')}
>
<Image style={icon_style} source={require('../../../images/add_icon.png')}/>
</TouchableOpacity>
</View>
<View style={styles.list_right}>
<Text style={styles.right_top_tit}>
人工髋关节假体-JS-HB ||| T人工髋关节假体-JS
</Text>
<Text style={styles.right_tip}>
SC20200506000006, SC20200506000006
</Text>
</View>
</View>
<View style={styles.cont_list_item}>
<View style={styles.list_left}>
<TouchableOpacity
activeOpacity={.8}
style={styles.btn_single_box}
onPress={() => console.log('单选！！！')}
>
<Image style={icon_style} source={require('../../../images/add_icon.png')}/>
</TouchableOpacity>
</View>
<View style={styles.list_right}>
<Text style={styles.right_top_tit}>
人工髋关节假体-JS-HB ||| T人工髋关节假体-JS
</Text>
<Text style={styles.right_tip}>
SC20200506000006, SC20200506000006
</Text>
</View>
</View>
*/}
</View>
</View>
)
......@@ -784,20 +746,32 @@ class TransSearchPage extends Component {
// 返回每一列数据
renderSubListItem(item, index) {
return(
<View style={styles.cons_sub_list}>
<TouchableOpacity
style={styles.cons_sub_list}
activeOpacity={.8}
onPress={() => {
if(item.select) {
return this.handleCelSelCheck(index)
} else {
return this.handleSubSelectedCheck(index)
}
}}
>
<View style={styles.sub_list_lef}>
{
item.select ?
<TouchableOpacity
activeOpacity={.8}
style={styles.sub_icon_box}
onPress={() => this.handleCelSelCheck(index)}>
onPress={() => this.handleCelSelCheck(index)}
>
<Image style={icon_style} source={require('../../../images/radio_yes.png')} />
</TouchableOpacity>
: <TouchableOpacity
activeOpacity={.8}
style={styles.sub_icon_box}
onPress={() => this.handleSubSelectedCheck(index)}>
onPress={() => this.handleSubSelectedCheck(index)}
>
<Image style={icon_style} source={require('../../../images/radio_no.png')} />
</TouchableOpacity>
}
......@@ -811,7 +785,7 @@ class TransSearchPage extends Component {
{item.surgery_collect_number}，{item.serial_number}
</Text>
</View>
</View>
</TouchableOpacity>
)
}
......
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