Commit ad256431 by peii

无法选择同一个组织同一个客户同一个地点下的第二个医生bug修复

parent 7c2c75a0
...@@ -734,7 +734,6 @@ class EquipConsuPage extends Component { ...@@ -734,7 +734,6 @@ class EquipConsuPage extends Component {
customer_name: cus.customer_name, customer_name: cus.customer_name,
}))(customers) }))(customers)
} }
that.setState({ that.setState({
localCustomersOption: customers localCustomersOption: customers
}) })
...@@ -1210,13 +1209,15 @@ class EquipConsuPage extends Component { ...@@ -1210,13 +1209,15 @@ class EquipConsuPage extends Component {
const billSite = R.find(R.propEq('bill_to_site_code', listOptionData[3].value))(customer.bill_to_sites) const billSite = R.find(R.propEq('bill_to_site_code', listOptionData[3].value))(customer.bill_to_sites)
if (isNotBlank(billSite) && isNotBlank(billSite.ship_to_sites) && listOptionData[4].value) { if (isNotBlank(billSite) && isNotBlank(billSite.ship_to_sites) && listOptionData[4].value) {
const ship = R.find(R.propEq('ship_to_site_code', listOptionData[4].value))(billSite.ship_to_sites) const ship = R.filter(R.propEq('ship_to_site_code', listOptionData[4].value))(billSite.ship_to_sites)
if (isNotBlank(ship)) { if (isNotBlank(ship)) {
tempOption = R.prepend({ tempOption = R.compose(
value: ship.customer_doctor, R.concat(R.__, tempOption),
name: ship.customer_doctor R.map(R.applySpec({
}, tempOption) value: R.prop('customer_doctor'),
name: R.prop('customer_doctor')
}))
)(ship)
} }
} }
} }
......
...@@ -1103,13 +1103,16 @@ class SelfOrderPage extends Component { ...@@ -1103,13 +1103,16 @@ class SelfOrderPage extends Component {
const billSite = R.find(R.propEq('bill_to_site_code', listOptionData[3].value))(customer.bill_to_sites) const billSite = R.find(R.propEq('bill_to_site_code', listOptionData[3].value))(customer.bill_to_sites)
if (isNotBlank(billSite) && isNotBlank(billSite.ship_to_sites) && listOptionData[4].value) { if (isNotBlank(billSite) && isNotBlank(billSite.ship_to_sites) && listOptionData[4].value) {
const ship = R.find(R.propEq('ship_to_site_code', listOptionData[4].value))(billSite.ship_to_sites) const ship = R.filter(R.propEq('ship_to_site_code', listOptionData[4].value))(billSite.ship_to_sites)
if (isNotBlank(ship)) { if (isNotBlank(ship)) {
tempOption = R.prepend({ tempOption = R.compose(
value: ship.customer_doctor, R.concat(R.__, tempOption),
name: ship.customer_doctor R.map(R.applySpec({
}, tempOption) value: R.prop('customer_doctor'),
name: R.prop('customer_doctor')
}))
)(ship)
} }
} }
} }
......
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