Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit a2e2494b by Denglingling
Options

器械消耗 / 历史查询，隐藏“是否结单” 

(cherry picked from commit 9d78f282)
parent feb754da
Inline Side-by-side
Showing with 16 additions and 22 deletions
app/containers/equipConsu/EquipConsuPage.js
...@@ -175,7 +175,7 @@ class EquipConsuPage extends Component { ...@@ -175,7 +175,7 @@ class EquipConsuPage extends Component {
patient_age: '', // 年龄 patient_age: '', // 年龄
patient_bed: '', // 床位 patient_bed: '', // 床位
patient_id: '', // 病历号 patient_id: '', // 病历号
settled_flag: false, // 是否结单 // settled_flag: false, // 是否结单
remark: '', // 备注信息 remark: '', // 备注信息
lines: [], // 消耗明细 lines: [], // 消耗明细
img_url: '', // 图片路径，逗号分割 img_url: '', // 图片路径，逗号分割
...@@ -954,7 +954,7 @@ class EquipConsuPage extends Component { ...@@ -954,7 +954,7 @@ class EquipConsuPage extends Component {
tempSubOption.patient_age = state.listOptionData[7].value tempSubOption.patient_age = state.listOptionData[7].value
tempSubOption.patient_bed = state.listOptionData[8].value tempSubOption.patient_bed = state.listOptionData[8].value
tempSubOption.patient_id = state.listOptionData[9].value tempSubOption.patient_id = state.listOptionData[9].value
tempSubOption.settled_flag = state.listOptionData[10].isRedio // tempSubOption.settled_flag = state.listOptionData[10].isRedio
tempSubOption.remark = state.listOptionData[11].value tempSubOption.remark = state.listOptionData[11].value
tempSubOption.lines = state.listOptionData[12].subOption tempSubOption.lines = state.listOptionData[12].subOption
if( tempSubOption.lines.length ) { if( tempSubOption.lines.length ) {
...@@ -1195,7 +1195,7 @@ class EquipConsuPage extends Component { ...@@ -1195,7 +1195,7 @@ class EquipConsuPage extends Component {
</CellTextStyle> </CellTextStyle>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<View style={styles.item_container}> {/* <View style={styles.item_container}>
<TouchableOpacity <TouchableOpacity
activeOpacity={.8} activeOpacity={.8}
> >
...@@ -1234,7 +1234,7 @@ class EquipConsuPage extends Component { ...@@ -1234,7 +1234,7 @@ class EquipConsuPage extends Component {
</View> </View>
</CellTextStyle> </CellTextStyle>
</TouchableOpacity> </TouchableOpacity>
</View> </View> */}
{ this.renderPickerModel() } { this.renderPickerModel() }
</View> </View>
) )
......
app/containers/historicalOrder/module/FilterModel.js
...@@ -99,7 +99,7 @@ class FilterModel extends Component { ...@@ -99,7 +99,7 @@ class FilterModel extends Component {
consume_date_to: '', // 消耗时间结束 consume_date_to: '', // 消耗时间结束
patient_bed: '', // 床位 patient_bed: '', // 床位
hospitalization_number: '', // 住院号 hospitalization_number: '', // 住院号
settled_flag: 'Y', // 是否结单 'Y'/'N' // settled_flag: 'Y', // 是否结单 'Y'/'N'
}, },
transferSearchOption: { // [转单]筛选条件 -- 待定 transferSearchOption: { // [转单]筛选条件 -- 待定
header_status: '', header_status: '',
...@@ -229,12 +229,14 @@ class FilterModel extends Component { ...@@ -229,12 +229,14 @@ class FilterModel extends Component {
title: '住院号', title: '住院号',
name: '请输入', name: '请输入',
value: '' value: ''
}, { },
"id": "10", // {
title: '是否结单', // "id": "10",
value: '', // title: '是否结单',
isRedio: '' // 单选'Y'/'N' // value: '',
},], // isRedio: '' // 单选'Y'/'N'
// },
],
transferListOptionData: [{ // [转单]筛选-对应字段 -- 待定 transferListOptionData: [{ // [转单]筛选-对应字段 -- 待定
"id": "0", "id": "0",
title: '状态筛选', title: '状态筛选',
...@@ -1370,7 +1372,7 @@ class FilterModel extends Component { ...@@ -1370,7 +1372,7 @@ class FilterModel extends Component {
tempSubOption.consume_date_to = consumeListOptionData[7].value tempSubOption.consume_date_to = consumeListOptionData[7].value
tempSubOption.patient_bed = consumeListOptionData[8].value tempSubOption.patient_bed = consumeListOptionData[8].value
tempSubOption.hospitalization_number = consumeListOptionData[9].value tempSubOption.hospitalization_number = consumeListOptionData[9].value
tempSubOption.settled_flag = consumeListOptionData[10].isRedio // tempSubOption.settled_flag = consumeListOptionData[10].isRedio
params = Object.assign({}, params, tempSubOption) params = Object.assign({}, params, tempSubOption)
props.callSupSubmit(params) props.callSupSubmit(params)
that.changeSeaColorAct() // 改变筛选颜色 that.changeSeaColorAct() // 改变筛选颜色
...@@ -1956,19 +1958,11 @@ class FilterModel extends Component { ...@@ -1956,19 +1958,11 @@ class FilterModel extends Component {
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<View style={styles.qui_cell}> {/* <View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>是否结单</Text> <Text style={styles.qui_cell_tit}>是否结单</Text>
<TouchableOpacity <TouchableOpacity
activeOpacity={1} activeOpacity={1}
style={styles.qui_cell_inp}> style={styles.qui_cell_inp}>
{/* <TextInput
placeholder={'请输入!!!!需要修改'}
style={[styles.cell_rig_sel, styles.cell_rig_input]}
placeholderTextColor = {placehold_text_color}
underlineColorAndroid = {'transparent'}
keyboardType={'numeric'}
onChangeText={(text) => this.handleHospitalNumInput(text)}
/> */}
<View style={styles.btn_radio_box}> <View style={styles.btn_radio_box}>
<TouchableOpacity <TouchableOpacity
activeOpacity={.8} activeOpacity={.8}
...@@ -2002,7 +1996,7 @@ class FilterModel extends Component { ...@@ -2002,7 +1996,7 @@ class FilterModel extends Component {
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View> */}
</View> </View>
</View> </View>
</View> : null </View> : null
......
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