|
@@ -97,7 +97,8 @@ export function sortOrderInfo(order = {}) {
|
|
if (saleFinalList.length === 1) {
|
|
if (saleFinalList.length === 1) {
|
|
const saleInfo = saleFinalList[0]
|
|
const saleInfo = saleFinalList[0]
|
|
if (saleInfo) {
|
|
if (saleInfo) {
|
|
- const userInfo = findUserInDeptTree(saleInfo.name)
|
|
|
|
|
|
+ // const userInfo = findUserInDeptTree(saleInfo.name)
|
|
|
|
+ const userInfo = findUserInDeptTree((u) => u.name === saleInfo.name)
|
|
if (userInfo && userInfo.id) {
|
|
if (userInfo && userInfo.id) {
|
|
pageFormValue.salePerson = [userInfo.id]
|
|
pageFormValue.salePerson = [userInfo.id]
|
|
}
|
|
}
|
|
@@ -109,7 +110,8 @@ export function sortOrderInfo(order = {}) {
|
|
} else {
|
|
} else {
|
|
const salePerson = []
|
|
const salePerson = []
|
|
pageFormValue.salePersonTableList = saleFinalList.map(sale => {
|
|
pageFormValue.salePersonTableList = saleFinalList.map(sale => {
|
|
- const userInfo = findUserInDeptTree(sale.name)
|
|
|
|
|
|
+ // const userInfo = findUserInDeptTree(sale.name)
|
|
|
|
+ const userInfo = findUserInDeptTree((u) => u.name === sale.name)
|
|
const saleWay = calcChannelSelectorList(sale.distribution_channel)
|
|
const saleWay = calcChannelSelectorList(sale.distribution_channel)
|
|
salePerson.push(userInfo?.id)
|
|
salePerson.push(userInfo?.id)
|
|
return new SalePersonTableRow(sale.name, userInfo?.id, div(sale.money, 100), saleWay)
|
|
return new SalePersonTableRow(sale.name, userInfo?.id, div(sale.money, 100), saleWay)
|
|
@@ -175,6 +177,7 @@ export function sortProductFormArr(type, product, order) {
|
|
const common = sortCommonForm(product, order)
|
|
const common = sortCommonForm(product, order)
|
|
const pForm = callback(product, order)
|
|
const pForm = callback(product, order)
|
|
Object.assign(map, common, pForm)
|
|
Object.assign(map, common, pForm)
|
|
|
|
+ console.log(map, common , pForm)
|
|
}
|
|
}
|
|
|
|
|
|
return map
|
|
return map
|