Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 6bb42289 by Denglingling
Options

调整转单查询 - 限制必须输入一个条件、请求【来源借货订单号】接口参数问题、以及ios版本号 

(cherry picked from commit 9e28ac0a)
parent 9ac9d35f
Inline Side-by-side
Showing with 39 additions and 51 deletions
app/containers/historicalOrder/HistoricalOrderPage.js
......@@ -601,7 +601,9 @@ const styles = StyleSheet.create({
flexDirection: 'row',
justifyContent: 'space-between'
},
cont_lef: {},
cont_lef: {
maxWidth: '80%'
},
cont_lef_tit: {
color: promary_text_color,
fontSize: 18,
......
app/containers/transOrder/TransOrderPage.js
......@@ -810,7 +810,9 @@ class TransOrderPage extends Component {
let { listOptionData } = this.state
let subTransObj = {
seller_name: listOptionData[0].name,
seller_code: listOptionData[0].value,
org_name: listOptionData[1].name,
org_code: listOptionData[1].value,
customer_code: listOptionData[2].value,
collect_number: listOptionData[3].value
}
......
app/containers/transOrder/module/TransSearchPage.js
......@@ -102,13 +102,6 @@ class TransSearchPage extends Component {
// surgery_collect_number: "SC20200529000010",
// serial_number: '2001202001001771',
// select: false
// },{
// "id": "1",
// item_name: '人工髋关节假体-JS-HB ||| T2',
// specification: '3g,Ytg-DG-SZGT',
// surgery_collect_number: "SC20200529000010",
// serial_number: '2001202001001772',
// select: false
// }
],
allConOption: [], // 所有数据（未筛选过的）
......@@ -125,14 +118,6 @@ class TransSearchPage extends Component {
showTypePop: false, // 选择器弹窗
listCurrentOption: [ // 当前选择器数据
// {
// name: '男cs',
// value: 'boy'
// },
// {
// name: '女cs',
// value: 'girl'
// },
// {
// name: '其他',
// value: 'other'
// }
......@@ -252,7 +237,9 @@ class TransSearchPage extends Component {
}
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
......@@ -363,21 +350,22 @@ class TransSearchPage extends Component {
let { listOptionData } = this.state;
let seaFlag = false
let that = this
for(let item of listOptionData) {
// 当前查询数据
if(item.value) {
seaFlag = true
break
}
}
// for(let item of listOptionData) {
// // 当前查询数据
// if(item.value) {
// seaFlag = true
// break
// }
// }
let curLen = curForm && Object.keys(curForm).length
if(curLen) {
// 已存在明细数据
seaFlag = true
} else if(curForm instanceof Object) {
return
}
if(seaFlag) {
// if(curLen) {
// // 已存在明细数据
// seaFlag = true
// } else if(curForm instanceof Object) {
// return
// }
// if(seaFlag) {
// 调用接口
let { subTransObj } = that.props.navigation.state.params
let { token } = that.props
......@@ -412,7 +400,8 @@ class TransSearchPage extends Component {
subTransDetOption.length && subTransDetOption.forEach((item) => {
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.surgery_collect_number == item.surgery_collect_number
&& chItem.item_name == item.item_name ) {
chItem.select = true
}
})
......@@ -433,9 +422,10 @@ class TransSearchPage extends Component {
let error_msg = detailResult.error_msg || detailResult.message
show(error_msg);
}
} else {
show('请至少输入一个查询条件')
}
// } else {
// show('请至少输入一个查询条件')
// }
}
// 修改加载中
......@@ -473,7 +463,7 @@ class TransSearchPage extends Component {
}
})
tempArr = [...tempArr, ...subTransDetOption]
tempArr = that.dedupQuoteDetailArr(tempArr, 'serial_number', 'surgery_collect_number')
tempArr = that.dedupQuoteDetailArr(tempArr, 'serial_number', 'surgery_collect_number', 'item_name')
that.setState({
localSelectOption: tempArr
})
......@@ -481,12 +471,12 @@ class TransSearchPage extends Component {
}
// 去重耗材明细 根据两个属性
dedupQuoteDetailArr(arr, typeName1, typeName2){
dedupQuoteDetailArr(arr, typeName1, typeName2, typeName3){
let result = [], tmp = {}
if( arr.length ) {
result = arr.reduce(function(init, item) {
if(!tmp[item[typeName1]+item[typeName2]]) {
tmp[item[typeName1]+item[typeName2]] = true
if(!tmp[item[typeName1]+item[typeName2]+item[typeName3]]) {
tmp[item[typeName1]+item[typeName2]+item[typeName3]] = true
init.push(item)
}
return init
......@@ -537,14 +527,12 @@ class TransSearchPage extends Component {
show('请选择耗材')
return
}
let searchForm = {
surgery_collect_number: listOptionData[0].value,
serial_number: listOptionData[1].value,
surgery_date_from: listOptionData[2].value,
surgery_date_to: listOptionData[3].value
}
this.props.setTransDetailOption(localSelectOption, searchForm)
this.props.navigation.navigate('TransOrderPage', { title: '转单申请' })
}
......@@ -571,7 +559,7 @@ class TransSearchPage extends Component {
let { serchForm, listOptionData } = this.state
return(
<View style={styles.list_cont}>
<Text style={styles.search_top_tip}>查询条件，至少输入一个条件</Text>
{/* <Text style={styles.search_top_tip}>查询条件，至少输入一个条件</Text> */}
<View style={styles.item_container}>
<TouchableOpacity
activeOpacity={.8}
......@@ -848,7 +836,6 @@ class TransSearchPage extends Component {
<Text style={list_common_item.rig_tip}>{'确定'}</Text>
</TouchableOpacity>
</View>
<TransDetailsModel
show={ selectShowPopup }
closeModal={(show) => this.handleCloseSelectModal(show)}
......@@ -888,9 +875,7 @@ class TransSearchPage extends Component {
{this.renderLodingItem()}
</ScrollView>
</View>
{this.renderFooterBtnItem()}
</SafeAreaView>
</View>
);
......@@ -912,8 +897,7 @@ const styles = StyleSheet.create({
paddingHorizontal: 16
},
list_cont: {
flex: 1,
// alignItems: 'center'
flex: 1
},
item_container: {
flex: 1
......
ios/BoneHouse_Business_APP.xcodeproj/project.pbxproj
......@@ -1522,7 +1522,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
CURRENT_PROJECT_VERSION = 1.0.2;
CURRENT_PROJECT_VERSION = 1.0.6;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = 2BWXWUS2NV;
HEADER_SEARCH_PATHS = (
......@@ -1538,7 +1538,7 @@
INFOPLIST_FILE = BoneHouse_Business_APP/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.1.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......@@ -1556,7 +1556,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
CODE_SIGN_IDENTITY = "Apple Development";
CURRENT_PROJECT_VERSION = 1.0.2;
CURRENT_PROJECT_VERSION = 1.0.6;
DEVELOPMENT_TEAM = 2BWXWUS2NV;
HEADER_SEARCH_PATHS = (
"$(inherited)",
......@@ -1571,7 +1571,7 @@
INFOPLIST_FILE = BoneHouse_Business_APP/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.1.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......
ios/BoneHouse_Business_APP.xcodeproj/xcshareddata/xcschemes/BoneHouse_Business_APP.xcscheme
......@@ -116,7 +116,7 @@
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
buildConfiguration = "Release">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
......
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