Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit a266f6aa by Denglingling
Options

完善转单历史查询接口，调整部分布局 

(cherry picked from commit b5e41d1d)
parent 6d428278
Expand all
Inline Side-by-side
Showing with 34 additions and 26 deletions
app/action/HistorAction.js
...@@ -103,12 +103,9 @@ export function requestGetAllTrans(params) { ...@@ -103,12 +103,9 @@ export function requestGetAllTrans(params) {
let {global_domain_config} = getState().login let {global_domain_config} = getState().login
GetRequest(global_domain_config, getUrlParams('/surgery/trans_header/search', params)) GetRequest(global_domain_config, getUrlParams('/surgery/trans_header/search', params))
.then(res => { .then(res => {
console.log('--requestGetAllTrans-----res------', res)
if(res.error_code == 0) { if(res.error_code == 0) {
let { data: { sur_order_transfer_head_chs_v } } = res let { data: { sur_order_transfer_head_chs_v } } = res
dispatch(requestSearchSuccess(sur_order_transfer_head_chs_v)); dispatch(requestSearchSuccess(sur_order_transfer_head_chs_v));
} else if(res.error_code === 41006) { } else if(res.error_code === 41006) {
show('登录过期，请重新登录'); show('登录过期，请重新登录');
dispatch(exitLoginStatus()); dispatch(exitLoginStatus());
......
app/containers/historicalOrder/HistoricalOrderPage.js
...@@ -37,7 +37,7 @@ import { ...@@ -37,7 +37,7 @@ import {
requestGetAllConsume, requestGetAllConsume,
requestGetAllTrans requestGetAllTrans
} from '../../action/HistorAction'; } from '../../action/HistorAction';
import { show, cloneObject } from '../../utils/Utils'; import { show, cloneObject, dedupQuoteArray } from '../../utils/Utils';
import moment from 'moment'; import moment from 'moment';
import FilterModel from './module/FilterModel'; import FilterModel from './module/FilterModel';
...@@ -165,7 +165,6 @@ class HistoricalOrderPage extends Component { ...@@ -165,7 +165,6 @@ class HistoricalOrderPage extends Component {
return return
} }
contOptionData = cloneObject(historOrderOption) contOptionData = cloneObject(historOrderOption)
console.log('contOptionData--------', contOptionData)
switch(topActiveIndex) { switch(topActiveIndex) {
case 0: case 0:
contOptionData = contOptionData.map((supItem, ind) => { contOptionData = contOptionData.map((supItem, ind) => {
...@@ -238,8 +237,6 @@ class HistoricalOrderPage extends Component { ...@@ -238,8 +237,6 @@ class HistoricalOrderPage extends Component {
default: default:
break; break;
} }
console.log('------contOptionData-------', contOptionData)
this.setState({ this.setState({
contOptionData contOptionData
}) })
...@@ -305,7 +302,6 @@ class HistoricalOrderPage extends Component { ...@@ -305,7 +302,6 @@ class HistoricalOrderPage extends Component {
this.setState({ this.setState({
isShowSelect: !isShowSelect isShowSelect: !isShowSelect
}) })
// 判断筛选颜色变化！！！！！===
} }
// 关闭筛选弹窗 回调 // 关闭筛选弹窗 回调
...@@ -389,7 +385,6 @@ class HistoricalOrderPage extends Component { ...@@ -389,7 +385,6 @@ class HistoricalOrderPage extends Component {
} }
</View> </View>
</TouchableOpacity> </TouchableOpacity>
{/* 筛选弹窗 */} {/* 筛选弹窗 */}
<FilterModel <FilterModel
show={isShowSelect} show={isShowSelect}
...@@ -403,7 +398,6 @@ class HistoricalOrderPage extends Component { ...@@ -403,7 +398,6 @@ class HistoricalOrderPage extends Component {
callSupClick={whetherCallClick} callSupClick={whetherCallClick}
callSupTopList={(data) => this.handleChangeTopList(data) } callSupTopList={(data) => this.handleChangeTopList(data) }
/> />
</View> </View>
</View> </View>
...@@ -424,8 +418,7 @@ class HistoricalOrderPage extends Component { ...@@ -424,8 +418,7 @@ class HistoricalOrderPage extends Component {
</TouchableOpacity> </TouchableOpacity>
</View> </View>
: null : null
} }
{/* 底部每一列数据 */} {/* 底部每一列数据 */}
{ {
contOptionData.map((item, index) => contOptionData.map((item, index) =>
...@@ -452,7 +445,7 @@ class HistoricalOrderPage extends Component { ...@@ -452,7 +445,7 @@ class HistoricalOrderPage extends Component {
tempTit = '结单标识：' tempTit = '结单标识：'
tempNum = item.surgery_collect_number // 还是显示借货单号，但是接口还是传递消耗单号 tempNum = item.surgery_collect_number // 还是显示借货单号，但是接口还是传递消耗单号
}else if(topActiveIndex == 2) { }else if(topActiveIndex == 2) {
tempTit = '目标借货订单：' tempTit = '目标借货订单号：'
tempNum = item.local_his_number tempNum = item.local_his_number
} }
...@@ -473,6 +466,18 @@ class HistoricalOrderPage extends Component { ...@@ -473,6 +466,18 @@ class HistoricalOrderPage extends Component {
<Text style={styles.cont_tip}> <Text style={styles.cont_tip}>
{item.local_his_time} {item.local_his_time}
</Text> </Text>
{
topActiveIndex == 2 ?
<Text style={styles.cont_tip}>
来源借货订单号：{item.source_surgery_order_number}
</Text> : null
}
{
topActiveIndex == 2 ?
<Text style={styles.cont_tip}>
{item.source_surgery_date ? moment(item.source_surgery_date).format('YYYY/MM/DD HH:mm') : '无'}
</Text> : null
}
</View> </View>
<View style={styles.cont_rig}> <View style={styles.cont_rig}>
<Text <Text
...@@ -501,11 +506,8 @@ class HistoricalOrderPage extends Component { ...@@ -501,11 +506,8 @@ class HistoricalOrderPage extends Component {
render() { render() {
return ( return (
<View style={styles.hist_main}> <View style={styles.hist_main}>
{ this.renderContItem() } { this.renderContItem() }
{this.renderLodingItem()} {this.renderLodingItem()}
</View> </View>
); );
} }
......
app/containers/historicalOrder/module/LineOrderPage.js
...@@ -223,8 +223,6 @@ class LineOrderPage extends Component { ...@@ -223,8 +223,6 @@ class LineOrderPage extends Component {
order_number: supData.order_number order_number: supData.order_number
} }
let conResult = await requestGetLineFormTrans(props.global_domain_config, params) let conResult = await requestGetLineFormTrans(props.global_domain_config, params)
console.log('params========', params)
console.log('conResult========', conResult)
if(conResult.error_code == 0) { if(conResult.error_code == 0) {
that.changeSubLoding(false) that.changeSubLoding(false)
// 成功 // 成功
...@@ -364,7 +362,7 @@ class LineOrderPage extends Component { ...@@ -364,7 +362,7 @@ class LineOrderPage extends Component {
} else if(supIndex == 1) { } else if(supIndex == 1) {
tempTit.push('结单标识：', '消耗时间：') tempTit.push('结单标识：', '消耗时间：')
} else if(supIndex == 2) { } else if(supIndex == 2) {
tempTit.push('目标借货订单：', '手术时间：') tempTit.push('目标借货订单号：', '手术时间：')
} }
return ( return (
...@@ -403,11 +401,22 @@ class LineOrderPage extends Component { ...@@ -403,11 +401,22 @@ class LineOrderPage extends Component {
</Text> </Text>
</View> : null </View> : null
} }
<View style={styles.fo_cell_box}> {
<Text style={styles.fo_tip_txt}> supIndex !== 2 ?
客户名称：{orderSupOptions.customer_name ? orderSupOptions.customer_name : '无'} <View style={styles.fo_cell_box}>
</Text> <Text style={styles.fo_tip_txt}>
</View> 客户名称：{orderSupOptions.customer_name ? orderSupOptions.customer_name : '无'}
</Text>
</View> :
<View style={styles.fo_cell_box}>
<Text style={styles.fo_tip_txt}>
目标客户名称：{orderSupOptions.destination_customer_name ? orderSupOptions.destination_customer_name : '无'}
</Text>
<Text style={styles.fo_tip_txt}>
来源客户名称：{orderSupOptions.source_customer_name ? orderSupOptions.source_customer_name : '无'}
</Text>
</View>
}
<View style={styles.fo_cell_box}> <View style={styles.fo_cell_box}>
<Text style={styles.fo_tip_txt}> <Text style={styles.fo_tip_txt}>
订单号：{supIndex == 0 ? orderSupOptions.local_his_number : 订单号：{supIndex == 0 ? orderSupOptions.local_his_number :
...@@ -470,8 +479,8 @@ class LineOrderPage extends Component { ...@@ -470,8 +479,8 @@ class LineOrderPage extends Component {
<Text style={[ <Text style={[
styles.fo_sta_txt, styles.fo_sta_txt,
(orderSupOptions.local_his_status == '待审核' || orderSupOptions.local_his_status == '已提交') ? styles.status_audit : '', (orderSupOptions.local_his_status == '待审核' || orderSupOptions.local_his_status == '已提交') ? styles.status_audit : '',
orderSupOptions.local_his_status == '待还货' ? styles.status_return : '', (orderSupOptions.local_his_status == '待还货' || orderSupOptions.local_his_status == '已输入' || orderSupOptions.local_his_status == '已驳回') ? styles.status_return : '',
orderSupOptions.local_his_status == '其他' ? styles.status_other : '' (orderSupOptions.local_his_status == '其他' || orderSupOptions.local_his_status == '已取消') ? styles.status_other : ''
]}> ]}>
{orderSupOptions.local_his_status} {orderSupOptions.local_his_status}
</Text> </Text>
......
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