Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit b7c69c78 by wong.peiyi
Options

借货订单筛选增加部门及其他销售员搜索

parent d05845e5
Inline Side-by-side
Showing with 411 additions and 124 deletions
app/action/HistorAction.js
......@@ -37,6 +37,10 @@ export const requestHistorSurgeryType = async (global_domain_config, params) =>
return await GetRequest(global_domain_config, getUrlParams('/system/value_set/search', params))
}
export const reqOrgDepartments = async (global_domain_config, params) => {
return await GetRequest(global_domain_config, getUrlParams('/sale/sale_relationship/search', params))
}
// 借货订单查询 params: {access_token: '', ...}
export function requestGetAllBorrow(params) {
return (dispatch, getState) => {
......@@ -202,4 +206,4 @@ function getDuplicateIncreCount(data, typeName) {
}
})
return dupData
}
\ No newline at end of file
}
app/containers/historicalOrder/module/FilterModel.js
......@@ -26,14 +26,15 @@ import {
pxSize,
third_text_color,
Height,
font_family_medium
font_family_medium,
btn_sub_color
} from '../../../base/BaseStyle';
import DateModel from '../../common/DateModel';
import DialogModel from '../../common/DialogModel';
import StatusBarView from '../../common/StatusBarView';
import HeadBackItem from '../../common/HeadBackItem';
import { connect } from 'react-redux';
import { exitLoginStatus } from '../../../action/LoginAction';
import { exitLoginStatus, requestSysProfile} from '../../../action/LoginAction';
import {
LOGIN_NO
} from '../../../base/ActionTypes';
......@@ -42,18 +43,20 @@ import {
requestHistorSurgeryHospital,
requestHistorOrderType,
requestHistorTarOrSourOrd,
requestHistorSurgeryType
requestHistorSurgeryType,
reqOrgDepartments
} from '../../../action/HistorAction';
import { show, dedupQuoteArray, cloneObject } from '../../../utils/Utils';
import { show, dedupQuoteArray, cloneObject, isBlank, isNotBlank } from '../../../utils/Utils';
import moment from 'moment';
import ErrorTipModel from '../../common/ErrorTipModel';
import * as R from 'ramda';
const REQUEST_NUMBER_BAR_CODE = 'REQUEST_NUMBER_BAR_CODE'
class FilterModel extends Component {
constructor(props) {
super(props);
this.state = {
this.state = {
isVisible: false,
topProcOptionList: [],
topActiveIndex: 0,
......@@ -86,7 +89,8 @@ class FilterModel extends Component {
// surgery_type_code: '', // 手术类型 -- 不用此参数
surgery_date_from: '', // 手术时间开始
surgery_date_to: '', // 手术时间结束
order_type_code: '' // 订单类型
order_type_code: '', // 订单类型
department_code: '' // 部门
},
consumeSearchOption: { // [消耗]筛选条件
consumed_flag: '', // 状态筛选 'Y'/'N'
......@@ -175,6 +179,11 @@ class FilterModel extends Component {
title: '订单类型',
name: '请选择',
value: ''
}, {
"id": "11",
title: '部门',
name: '请选择',
value: ''
}],
consumeListOptionData: [{ // [消耗]筛选-对应字段
"id": "0",
......@@ -299,7 +308,7 @@ class FilterModel extends Component {
"APPROVED,COLLECTING_WAITING_CONFIRM",
"COLLECTED,RETURNING_WAITING_CONFIRM",
"RETURNED,CLOSED,REJECTED,CANCELED,CONSUMED"
],
],
searchComsumeStatus: [ // 【消耗】对应的状态值
"N",
"Y"
......@@ -311,13 +320,19 @@ class FilterModel extends Component {
],
errorPopType: false, // 错误提示弹窗
errorTit: '', // 错误提示文字
isRightExit: true
isRightExit: true,
sysValues: {
OBS_MOBILE_COLL_DEPARTMENT: 'N'
},
departments: {},
sellers: []
}
}
componentDidMount() {
this.getSellerName()
this.initSelectPickerData()
this.getSysConfigValue()
}
// 赋值销售员 初始化数据
......@@ -377,7 +392,7 @@ class FilterModel extends Component {
case LOGIN_NO:
navigation.navigate('LoginPage')
break;
default:
default:
break;
}
}
......@@ -402,6 +417,31 @@ class FilterModel extends Component {
}
}
/**
* 获取系统配置
*/
getSysConfigValue() {
const { global_domain_config, token} = this.props
const {sysValues} = this.state
const getSysProfile = async code => {
const params = {
access_token: token,
profile_code: code
}
let res = await requestSysProfile(global_domain_config, params)
console.log('sysRes:==', res)
if(res && res.error_code === 0) {
const value = res.data.profile_value
sysValues[code] = isNaN(value) ? value : Number(value)
this.setState({ sysValues })
}
}
R.compose(R.map(getSysProfile), R.keys)(sysValues)
}
// 修改选择器为属性 name 和 value
changeNameAndValue(data, nameType, valueType) {
let result = []
......@@ -415,13 +455,14 @@ class FilterModel extends Component {
}
// 清空当前项以下的值
clearInitNameAndValue(curIndex) {
clearInitNameAndValue(curIndex, endIndex) {
let { topActiveIndex, borrowListOptionData, consumeListOptionData, localOtherObj} = this.state
switch(topActiveIndex) {
case 0:
borrowListOptionData = borrowListOptionData.map((item, index) => {
if(index > curIndex && index < 7 ) {
!endIndex && (endIndex = 7)
if(index > curIndex && index < endIndex ) {
item.name = localOtherObj.name
item.value = localOtherObj.value
if(item.title == '主治医生') {
......@@ -434,7 +475,8 @@ class FilterModel extends Component {
break;
case 1:
consumeListOptionData = consumeListOptionData.map((item, index) => {
if(index > curIndex && index < 4 ) {
!endIndex && (endIndex = 4)
if(index > curIndex && index < endIndex ) {
item.name = localOtherObj.name
item.value = localOtherObj.value
}
......@@ -456,6 +498,7 @@ class FilterModel extends Component {
// 选择器弹窗回调函数
handleCallBack(item, itemTitle) {
let { topActiveIndex, borrowListOptionData, consumeListOptionData, transferListOptionData} = this.state
const {userInfo} = this.props
let self = this
this.setState({
currentItem: item
......@@ -468,6 +511,16 @@ class FilterModel extends Component {
chItem.value = item.value
if(itemTitle === '组织') {
self.clearInitNameAndValue(2)
self.clearInitNameAndValue(10, 12)
self.getDepartmentsByOrg(item.value)
self.setSellerList()
}
if (itemTitle === '部门') {
borrowListOptionData[1].value = userInfo.user_name
borrowListOptionData[1].name = userInfo.person_name
this.setState({ borrowListOptionData, sellers: [] }, () => {
this.setSellerList()
})
}
if(itemTitle === '客户名称') {
self.clearInitNameAndValue(3)
......@@ -522,7 +575,9 @@ class FilterModel extends Component {
transferListOptionData
})
}
// 修改当前选择器值 -- 可隐藏
changeCurrentObj(item, itemTitle, optArray) {
let result = []
......@@ -667,6 +722,73 @@ class FilterModel extends Component {
return [obj, org_code];
}
/**
* 获取部门信息
* @param {*} org_code
*/
async getDepartmentsByOrg(org_code) {
const {token, global_domain_config, userInfo} = this.props
const params = {
access_token: token,
org_code,
seller_code: userInfo.user_name,
scope_flag: 'Y'
}
try {
const res = await reqOrgDepartments(global_domain_config, params)
console.log('depRes', res)
let departments = res.data.relationships
this.setState({ departments })
const {borrowListOptionData} = this.state
const noop = () => {}
// 部门只有一个时直接设置
R.cond([
[R.equals(0), () => show('当前组织没有部门信息')],
[R.equals(1), () => {
const dep = R.head(departments)
borrowListOptionData[11].name = dep.department_name
borrowListOptionData[11].value = dep.department_code
this.setState({ borrowListOptionData }, () => {
this.setSellerList()
})
}],
[R.T, noop]
])(R.length(departments))
} catch (error) {
console.log(error)
}
}
/**
* 根据部门信息设置销售员
*/
setSellerList() {
const {userInfo} = this.props
const {departments, borrowListOptionData} = this.state
let sellers = []
const department = R.find(R.propEq('department_code', borrowListOptionData[11].value))(departments)
if (isNotBlank(department)) {
sellers = R.compose(
R.map(R.applySpec({
name: R.prop('seller_name'),
value: R.prop('seller_code'),
})),
R.propOr([], 'seller_list')
)(department)
R.ifElse(R.compose(R.includes(userInfo.user_name), R.pluck('value')), () => { }, () => {
sellers = R.concat([{
name: userInfo.person_name,
value: userInfo.user_name
}], sellers)
})(sellers)
}
this.setState({ sellers })
}
// 组织 - 筛选
handleOrganizationCheck() {
let {props} = this
......@@ -710,6 +832,57 @@ class FilterModel extends Component {
})
}
/**
* 部门
*/
handleDepartmentCheck() {
if(!this.judgeOrgIsNull()) return
const curItem = this.getCurrentOption(11)
const {departments} = this.state
const options = R.compose(
R.map(
R.applySpec({
name: R.prop('department_name'),
value: R.prop('department_code'),
})
)
)(departments)
this.setState({
currentTitle: '部门',
currentItem: curItem[0],
showTypePop: true,
listCurrentOption: options
})
}
/**
* 设置销售员
*/
setCollectSeller(seller) {
const {sellers, borrowListOptionData} = this.state
let sellerCodes = R.compose(R.split(','), R.pathOr('', [1, 'value']))(borrowListOptionData)
R.ifElse(R.contains(R.__, sellerCodes), () => {
// 已在其中，减掉
if (R.length(sellerCodes) === 1) {
return show('最少要有一个销售员')
}
const idx = R.findIndex(R.equals(seller.value))(sellerCodes)
borrowListOptionData[1].value = R.compose(R.join(','), R.remove(idx, 1))(sellerCodes)
let sellerNames = R.compose(R.split(','), R.pathOr('', [1, 'name']))(borrowListOptionData)
borrowListOptionData[1].name = R.compose(R.join(','), R.remove(idx, 1))(sellerNames)
}, () => {
borrowListOptionData[1].value += `,${seller.value}`
borrowListOptionData[1].name += `,${seller.name}`
})(seller.value)
this.setState({ borrowListOptionData })
}
// 客户名称 - 筛选
handleCustomerCheck() {
if(!this.judgeOrgIsNull()) {
......@@ -1267,11 +1440,11 @@ class FilterModel extends Component {
// 重置 - 筛选
handleSubResetCheck() {
let {
topActiveIndex,
topActiveIndex,
borrowListOptionData,
consumeListOptionData,
transferListOptionData,
subBorrowInitListOption,
subBorrowInitListOption,
subConsumeInitListOption,
subTransferInitListOption
} = this.state
......@@ -1279,7 +1452,8 @@ class FilterModel extends Component {
case 0:
borrowListOptionData = cloneObject(subBorrowInitListOption)
this.setState({
borrowListOptionData
borrowListOptionData,
sellers: []
})
break;
case 1:
......@@ -1302,8 +1476,8 @@ class FilterModel extends Component {
// 确定 - 筛选 传递参数给父组件
handleFilterSubmitCheck() {
let {
topActiveIndex,
borrowListOptionData,
topActiveIndex,
borrowListOptionData,
consumeListOptionData,
transferListOptionData,
searchBorrowStatus,
......@@ -1315,7 +1489,7 @@ class FilterModel extends Component {
} = this.state
let {props} = this
let that = this
let tempSubOption = {}
let params = {
access_token: props.token
......@@ -1350,10 +1524,11 @@ class FilterModel extends Component {
tempSubOption.surgery_date_from = borrowListOptionData[8].value
tempSubOption.surgery_date_to = borrowListOptionData[9].value
tempSubOption.order_type_code = borrowListOptionData[10].value
tempSubOption.department_code = borrowListOptionData[11].value
params = Object.assign({}, params, tempSubOption)
props.callSupSubmit(params)
that.changeSeaColorAct() // 改变筛选颜色
that.closeModal() // 关闭弹窗
that.closeModal() // 关闭弹窗
break;
case 1:
tempSubOption = {...consumeSearchOption}
......@@ -1459,7 +1634,7 @@ class FilterModel extends Component {
bothArrayIsCom(arr, newArr) {
let comFlag = false
let that = this
otherFor:
otherFor:
for(let i in arr) {
if(arr[i] instanceof Object && newArr[i] instanceof Object) {
for(let key of Object.keys(arr[i])) {
......@@ -1539,7 +1714,7 @@ class FilterModel extends Component {
showsHorizontalScrollIndicator={false}
> */}
{
topProcOptionList.map((item, index) =>
topProcOptionList.map((item, index) =>
<TouchableOpacity
activeOpacity={1}
style={styles.top_touch_cont}
......@@ -1573,22 +1748,22 @@ class FilterModel extends Component {
</Text>
<View style={styles.sea_icon}>
{
isVisible ?
isVisible ?
<Image source={require('../../../images/arr_top.png')} style={icon_style} />
: <Image source={require('../../../images/arr_bom.png')} style={icon_style} />
}
</View>
</TouchableOpacity>
{
isVisible ?
isVisible ?
<View style={styles.sea_main}>
{
this.renderTopSelectItem()
}
this.renderTopSelectItem()
}
</View>
: null
}
</View>
</View>
</View>
</View>
......@@ -1600,21 +1775,21 @@ class FilterModel extends Component {
// 返回筛选
renderTopSelectItem() {
let {topActiveIndex, borrowListOptionData, consumeListOptionData, transferListOptionData} = this.state
let {topActiveIndex, borrowListOptionData, consumeListOptionData, transferListOptionData, sysValues, sellers} = this.state
return (
<View style={styles.sea_container}>
<View style={styles.sea_scr_box}>
<ScrollView style={styles.sea_scroll}>
{
topActiveIndex == 0 ?
topActiveIndex == 0 ?
<View style={styles.sea_sel_opt}>
<View style={styles.sea_stu_select}>
<Text style={styles.sea_stu_tit}>状态筛选</Text>
<View style={styles.sea_stu_box}>
{
borrowListOptionData[0].status.map((item, index) =>
<TouchableOpacity
activeOpacity={.8}
borrowListOptionData[0].status.map((item, index) =>
<TouchableOpacity
activeOpacity={.8}
style={[
styles.sta_btn,
borrowListOptionData[0].curStatus.includes(index) ? styles.sta_btn_act : '',
......@@ -1625,10 +1800,10 @@ class FilterModel extends Component {
>
<Text style={[styles.btn_txt, borrowListOptionData[0].curStatus.includes(index) ? styles.btn_txt_act: '']}>{item}</Text>
{
borrowListOptionData[0].curStatus.includes(index) ?
borrowListOptionData[0].curStatus.includes(index) ?
<View style={styles.btn_act_icon}>
<Image source={require('../../../images/his_ord_sel.png')} style={icon_style} />
</View>
</View>
: null
}
</TouchableOpacity>
......@@ -1639,33 +1814,118 @@ class FilterModel extends Component {
<View style={styles.sea_qui_select}>
<Text style={styles.sea_qui_tit}>快捷筛选</Text>
<View style={styles.sea_qui_box}>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>销售员</Text>
<TouchableOpacity
activeOpacity={1}
style={styles.qui_cell_rig}
>
<Text style={styles.cell_rig_sel}>{borrowListOptionData[1].name}</Text>
<View style={styles.arr_icon_box}>
</View>
</TouchableOpacity>
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>组织</Text>
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleOrganizationCheck() }
>
<Text style={styles.cell_rig_sel}>{borrowListOptionData[2].name}</Text>
<View style={styles.arr_icon_box}>
<Image source={require('../../../images/arr_rig.png')} style={icon_style} />
</View>
</TouchableOpacity>
</View>
{
// 兼容旧版本的
sysValues.OBS_MOBILE_COLL_DEPARTMENT === 'Y' && (
<>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>组织</Text>
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleOrganizationCheck() }
>
<Text style={styles.cell_rig_sel}>{borrowListOptionData[2].name}</Text>
<View style={styles.arr_icon_box}>
<Image source={require('../../../images/arr_rig.png')} style={icon_style} />
</View>
</TouchableOpacity>
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>部门</Text>
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleDepartmentCheck() }
>
<Text style={styles.cell_rig_sel}>{borrowListOptionData[11].name}</Text>
<View style={styles.arr_icon_box}>
<Image source={require('../../../images/arr_rig.png')} style={icon_style} />
</View>
</TouchableOpacity>
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>销售员</Text>
<TouchableOpacity
activeOpacity={1}
style={styles.qui_cell_rig}
>
<Text style={styles.cell_rig_sel}>{borrowListOptionData[1].name}</Text>
<View style={styles.arr_icon_box}>
</View>
</TouchableOpacity>
</View>
{
sellers && sellers.length > 0 &&
<View style={[styles.qui_cell, styles.qui_cell_select]}>
{
sellers.map(seller => {
const isSelected = R.compose(R.includes(seller.value), R.pathOr('', [1, 'value']))(borrowListOptionData)
return (
<TouchableOpacity style={isSelected
? [styles.qui_cell_select_box, styles.qui_cell_select_box_selected]
: styles.qui_cell_select_box}
key={seller.value}
activeOpacity={0.5}
onPress={() => this.setCollectSeller(seller)}
>
<Text style={
borrowListOptionData[1].value === seller.value
? styles.qui_cell_select_text_selected
: styles.qui_cell_select_text
}
>
{seller.name}
</Text>
{
isSelected &&
<View style={styles.btn_act_icon}>
<Image source={require('../../../images/his_ord_sel.png')} style={icon_style} />
</View>
}
</TouchableOpacity>
)
})
}
</View>
}
</>
)
}
{
// 兼容旧版本的
sysValues.OBS_MOBILE_COLL_DEPARTMENT === 'N' && (
<>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>销售员</Text>
<TouchableOpacity
activeOpacity={1}
style={styles.qui_cell_rig}
>
<Text style={styles.cell_rig_sel}>{borrowListOptionData[1].name}</Text>
<View style={styles.arr_icon_box}>
</View>
</TouchableOpacity>
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>组织</Text>
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleOrganizationCheck() }
>
<Text style={styles.cell_rig_sel}>{borrowListOptionData[2].name}</Text>
<View style={styles.arr_icon_box}>
<Image source={require('../../../images/arr_rig.png')} style={icon_style} />
</View>
</TouchableOpacity>
</View>
</>
)
}
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>客户名称</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleCustomerCheck() }
......@@ -1678,7 +1938,7 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>收单地点</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleBillCheck() }
......@@ -1691,7 +1951,7 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>收货地点</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleShipCheck() }
......@@ -1704,8 +1964,8 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>主治医生</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleDoctorCheck() }
......@@ -1718,13 +1978,13 @@ class FilterModel extends Component {
</View>
{
borrowListOptionData[6].showInput ?
borrowListOptionData[6].showInput ?
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}></Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_inp}>
<TextInput
<TextInput
placeholder={'请输入主治医生'}
style={[styles.cell_rig_sel, styles.cell_rig_input]}
placeholderTextColor = {placehold_text_color}
......@@ -1733,13 +1993,13 @@ class FilterModel extends Component {
defaultValue={borrowListOptionData[6].inputValue}
/>
</TouchableOpacity>
</View>
: null
</View>
: null
}
{/* <View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>手术类型</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleSurTypeCheck() }
......@@ -1753,7 +2013,7 @@ class FilterModel extends Component {
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>手术时间</Text>
<View style={styles.qui_cell_rig_date}>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_date_box}
onPress={() => this.handleSurDateCheck('start') }
......@@ -1764,7 +2024,7 @@ class FilterModel extends Component {
</View>
</TouchableOpacity>
<Text style={styles.qui_date_line}>—</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_date_box}
onPress={() => this.handleSurDateCheck('end') }
......@@ -1778,7 +2038,7 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>订单类型</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleOrderCheck() }
......@@ -1795,15 +2055,15 @@ class FilterModel extends Component {
</View> : null
}
{
topActiveIndex == 1 ?
topActiveIndex == 1 ?
<View style={styles.sea_sel_opt}>
<View style={styles.sea_stu_select}>
<Text style={styles.sea_stu_tit}>状态筛选</Text>
<View style={styles.sea_stu_box}>
{
consumeListOptionData[0].status.map((item, index) =>
<TouchableOpacity
activeOpacity={.8}
consumeListOptionData[0].status.map((item, index) =>
<TouchableOpacity
activeOpacity={.8}
style={[
styles.sta_btn,
consumeListOptionData[0].curStatus.includes(index) ? styles.sta_btn_act : '',
......@@ -1814,10 +2074,10 @@ class FilterModel extends Component {
>
<Text style={[styles.btn_txt, consumeListOptionData[0].curStatus.includes(index) ? styles.btn_txt_act: '']}>{item}</Text>
{
consumeListOptionData[0].curStatus.includes(index) ?
consumeListOptionData[0].curStatus.includes(index) ?
<View style={styles.btn_act_icon}>
<Image source={require('../../../images/his_ord_sel.png')} style={icon_style} />
</View>
</View>
: null
}
</TouchableOpacity>
......@@ -1831,7 +2091,7 @@ class FilterModel extends Component {
<View style={styles.sea_qui_box}>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>销售员</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={1}
style={styles.qui_cell_rig}
>
......@@ -1842,7 +2102,7 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>组织</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleOrganizationCheck() }
......@@ -1855,7 +2115,7 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>客户名称</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleCustomerCheck() }
......@@ -1868,10 +2128,10 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>患者姓名</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_inp}>
<TextInput
<TextInput
placeholder={'请输入'}
style={[styles.cell_rig_sel, styles.cell_rig_input]}
placeholderTextColor = {placehold_text_color}
......@@ -1883,10 +2143,10 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>病历号</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_inp}>
<TextInput
<TextInput
placeholder={'请输入'}
style={[styles.cell_rig_sel, styles.cell_rig_input]}
placeholderTextColor = {placehold_text_color}
......@@ -1900,7 +2160,7 @@ class FilterModel extends Component {
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>消耗时间</Text>
<View style={styles.qui_cell_rig_date}>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_date_box}
onPress={() => this.handleSurDateCheck('start') }
......@@ -1911,7 +2171,7 @@ class FilterModel extends Component {
</View>
</TouchableOpacity>
<Text style={styles.qui_date_line}>—</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_date_box}
onPress={() => this.handleSurDateCheck('end') }
......@@ -1926,10 +2186,10 @@ class FilterModel extends Component {
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>床位</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_inp}>
<TextInput
<TextInput
placeholder={'请输入'}
style={[styles.cell_rig_sel, styles.cell_rig_input]}
placeholderTextColor = {placehold_text_color}
......@@ -1943,10 +2203,10 @@ class FilterModel extends Component {
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>住院号</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_inp}>
<TextInput
<TextInput
placeholder={'请输入'}
style={[styles.cell_rig_sel, styles.cell_rig_input]}
placeholderTextColor = {placehold_text_color}
......@@ -1960,7 +2220,7 @@ class FilterModel extends Component {
{/* <View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>是否结单</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={1}
style={styles.qui_cell_inp}>
<View style={styles.btn_radio_box}>
......@@ -1971,7 +2231,7 @@ class FilterModel extends Component {
>
<View style={styles.radio_icon}>
{
consumeListOptionData[10].isRedio == 'Y' ?
consumeListOptionData[10].isRedio == 'Y' ?
<Image style={icon_style} source={require('../../../images/radio_yes.png')} />
: <Image style={icon_style} source={require('../../../images/radio_no.png')} />
}
......@@ -1985,9 +2245,9 @@ class FilterModel extends Component {
>
<View style={styles.radio_icon}>
{
!consumeListOptionData[10].isRedio ?
!consumeListOptionData[10].isRedio ?
<Image style={icon_style} source={require('../../../images/radio_no.png')} />
: ( consumeListOptionData[10].isRedio == 'Y' ?
: ( consumeListOptionData[10].isRedio == 'Y' ?
<Image style={icon_style} source={require('../../../images/radio_no.png')} />
: <Image style={icon_style} source={require('../../../images/radio_yes.png')} /> )
}
......@@ -1999,18 +2259,18 @@ class FilterModel extends Component {
</View> */}
</View>
</View>
</View> : null
</View> : null
}
{
topActiveIndex == 2 ?
topActiveIndex == 2 ?
<View style={styles.sea_sel_opt}>
<View style={styles.sea_stu_select}>
<Text style={styles.sea_stu_tit}>状态筛选</Text>
<View style={styles.sea_stu_box}>
{
transferListOptionData[0].status.map((item, index) =>
<TouchableOpacity
activeOpacity={.8}
transferListOptionData[0].status.map((item, index) =>
<TouchableOpacity
activeOpacity={.8}
style={[
styles.sta_btn,
transferListOptionData[0].curStatus.includes(index) ? styles.sta_btn_act : '',
......@@ -2021,10 +2281,10 @@ class FilterModel extends Component {
>
<Text style={[styles.btn_txt, transferListOptionData[0].curStatus.includes(index) ? styles.btn_txt_act: '']}>{item}</Text>
{
transferListOptionData[0].curStatus.includes(index) ?
transferListOptionData[0].curStatus.includes(index) ?
<View style={styles.btn_act_icon}>
<Image source={require('../../../images/his_ord_sel.png')} style={icon_style} />
</View>
</View>
: null
}
</TouchableOpacity>
......@@ -2037,7 +2297,7 @@ class FilterModel extends Component {
<View style={styles.sea_qui_box}>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>销售员</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={1}
style={styles.qui_cell_rig}
>
......@@ -2048,7 +2308,7 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>组织</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleOrganizationCheck() }
......@@ -2061,7 +2321,7 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>客户名称</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleCustomerCheck() }
......@@ -2074,7 +2334,7 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>目标借货订单</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleTargetBorCheck() }
......@@ -2087,7 +2347,7 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>来源借货订单号</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_cell_rig}
onPress={() => this.handleSourOrdCheck() }
......@@ -2100,10 +2360,10 @@ class FilterModel extends Component {
</View>
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>申请单号</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={[styles.qui_cell_inp, styles.qui_cell_tran]}>
<TextInput
<TextInput
placeholder={'请输入'}
style={[styles.cell_rig_sel, styles.cell_rig_input]}
placeholderTextColor = {placehold_text_color}
......@@ -2124,7 +2384,7 @@ class FilterModel extends Component {
<View style={styles.qui_cell}>
<Text style={styles.qui_cell_tit}>手术时间</Text>
<View style={styles.qui_cell_rig_date}>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_date_box}
onPress={() => this.handleSurDateCheck('start') }
......@@ -2135,7 +2395,7 @@ class FilterModel extends Component {
</View>
</TouchableOpacity>
<Text style={styles.qui_date_line}>—</Text>
<TouchableOpacity
<TouchableOpacity
activeOpacity={.8}
style={styles.qui_date_box}
onPress={() => this.handleSurDateCheck('end') }
......@@ -2149,7 +2409,7 @@ class FilterModel extends Component {
</View>
</View>
</View>
</View> : null
</View> : null
}
</ScrollView>
</View>
......@@ -2171,7 +2431,7 @@ class FilterModel extends Component {
{ this.renderErrorModel() }
</View>
{ this.renderDateModel() }
......@@ -2197,7 +2457,7 @@ class FilterModel extends Component {
// 返回选择器
renderPickerModel() {
let {
let {
listCurrentOption,
currentItem,
currentTitle,
......@@ -2222,7 +2482,7 @@ class FilterModel extends Component {
renderErrorModel() {
let {errorPopType, errorTit} = this.state
return(
<ErrorTipModel
<ErrorTipModel
title={errorTit}
show={errorPopType}
closeModal={(show) => this.handelCloseErrorModel(show)}
......@@ -2350,7 +2610,7 @@ const styles = StyleSheet.create({
sea_main: {},
sea_container: {
// flex: 1
height: Height()
height: Height()
},
sea_scr_box: {
// height: Height() - 360,
......@@ -2419,13 +2679,38 @@ const styles = StyleSheet.create({
qui_cell: {
flexDirection: 'row',
alignItems: 'center',
marginTop: 12
marginTop: pxSize(12)
},
qui_cell_tit: {
color: first_text_color,
fontSize: 14,
fontFamily: font_family_regular,
width: 80
width: pxSize(80)
},
qui_cell_select: {
paddingLeft: pxSize(80),
justifyContent: 'space-between',
flexWrap: 'wrap',
},
qui_cell_select_box: {
width: "30%",
padding: pxSize(5),
borderWidth: pxSize(1),
borderColor: "#eee",
backgroundColor: "#FFF",
marginBottom: pxSize(5)
},
qui_cell_select_box_selected: {
backgroundColor: "#E7F1FD",
},
qui_cell_select_text: {
width: "100%",
textAlign: 'center'
},
qui_cell_select_text_selected: {
width: "100%",
textAlign: 'center',
color: '#007EFF'
},
qui_cell_rig: {
height: 40,
......@@ -2569,5 +2854,5 @@ const mapDispatchToProps = (dispatch) => {
}
}
}
export default connect(mapStateToProps, mapDispatchToProps)(FilterModel);
\ No newline at end of file
export default connect(mapStateToProps, mapDispatchToProps)(FilterModel);
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