运费模板区域改成多选

This commit is contained in:
jason 2023-05-27 11:32:16 +08:00
parent b12aefe46e
commit 70c5082776
4 changed files with 40 additions and 31 deletions

View File

@ -10,7 +10,7 @@ export interface DeliveryExpressTemplateVO {
}
export declare type ExpressTemplateChargeVO = {
areaId: number
areaIds: number[]
startCount: number
startPrice: number
extraCount: number
@ -18,7 +18,7 @@ export declare type ExpressTemplateChargeVO = {
}
export declare type ExpressTemplateFreeVO = {
areaId: number
areaIds: number[]
freeCount: number
freePrice: number
}

View File

@ -6,11 +6,11 @@ export const getAreaTree = async () => {
}
export const getChildrenArea = async (id: number) => {
return await request.get({ url: '/system/area/getChildrenArea?id=' + id })
return await request.get({ url: '/system/area/get-children?id=' + id })
}
export const getAreaListByIds = async (data) => {
return await request.post({ url: '/system/area/list', data })
export const getAreaListByIds = async (ids) => {
return await request.get({ url: '/system/area/get-by-ids?ids=' + ids })
}
// 获得 IP 对应的地区名

View File

@ -27,10 +27,11 @@
<template #default="{ row }">
<!-- 区域数据太多用赖加载方式要不然性能有问题 -->
<el-tree-select
v-model="row.areaId"
v-model="row.areaIds"
lazy
:load="loadChargeArea"
:props="defaultProps"
multiple
node-key="id"
check-strictly
show-checkbox
@ -90,7 +91,8 @@
<template #default="{ row }">
<!-- 区域数据太多用赖加载方式要不然性能有问题 -->
<el-tree-select
v-model="row.areaId"
v-model="row.areaIds"
multiple
lazy
:load="loadFreeArea"
:props="defaultProps"
@ -98,7 +100,7 @@
check-strictly
show-checkbox
check-on-click-node
:render-after-expand="false"
:render-after-expand="true"
:cache-data="areaCache"
/>
</template>
@ -170,7 +172,6 @@ const formRules = reactive({
})
const formRef = ref() // Ref
const areaCache = ref([]) //
// let areaTree: any[]
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
@ -183,25 +184,30 @@ const open = async (type: string, id?: number) => {
formLoading.value = true
formData.value = await DeliveryExpressTemplateApi.getDeliveryExpressTemplate(id)
columnTitle.value = columnTitleMap.get(formData.value.chargeMode)
//
const areaIds = []
const chargeAreaIds = []
const freeAreaIds = []
formData.value.templateCharge.forEach((item) => {
//
if (item.areaId !== 1) {
areaIds.push(item.areaId)
for (let i = 0; i < item.areaIds.length; i++) {
if (!chargeAreaIds.includes(item.areaIds[i])) {
chargeAreaIds.push(item.areaIds[i])
}
}
//
item.startPrice = fenToYuan(item.startPrice)
item.extraPrice = fenToYuan(item.extraPrice)
})
formData.value.templateFree.forEach((item) => {
if (item.areaId !== 1 && !areaIds.includes(item.areaId)) {
areaIds.push(item.areaId)
for (let i = 0; i < item.areaIds.length; i++) {
if (!chargeAreaIds.includes(item.areaIds[i]) && !freeAreaIds.includes(item.areaIds[i])) {
freeAreaIds.push(item.areaIds[i])
}
}
item.freePrice = fenToYuan(item.freePrice)
})
//
const areaIds = chargeAreaIds.concat(freeAreaIds)
//
areaCache.value = await getAreaListByIds(areaIds)
areaCache.value = await getAreaListByIds(areaIds.join(','))
}
} finally {
formLoading.value = false
@ -250,7 +256,7 @@ const resetForm = () => {
chargeMode: 1,
templateCharge: [
{
areaId: 1,
areaIds: [1],
startCount: 2,
startPrice: 5,
extraCount: 5,
@ -300,10 +306,11 @@ const initData = async () => {
/** 懒加载运费区域树 */
const loadChargeArea = async (node, resolve) => {
//
const areaIds = []
formData.value.templateCharge.forEach((item) => {
if (item.areaId) {
areaIds.push(item.areaId)
if (item.areaIds.length > 0) {
item.areaIds.forEach((areaId) => areaIds.push(areaId))
}
})
if (node.isLeaf) return resolve([])
@ -312,7 +319,8 @@ const loadChargeArea = async (node, resolve) => {
const data = cloneDeep(defaultArea)
const item = data[0]
if (areaIds.includes(item.id)) {
item.disabled = true
// TODO @
//item.disabled = true
}
resolve(data)
} else {
@ -320,7 +328,7 @@ const loadChargeArea = async (node, resolve) => {
const data = await getChildrenArea(id)
data.forEach((item) => {
if (areaIds.includes(item.id)) {
item.disabled = true
//item.disabled = true
}
})
resolve(data)
@ -330,11 +338,11 @@ const loadChargeArea = async (node, resolve) => {
/** 懒加载包邮区域树 */
const loadFreeArea = async (node, resolve) => {
if (node.isLeaf) return resolve([])
//id
//
const areaIds = []
formData.value.templateFree.forEach((item) => {
if (item.areaId) {
areaIds.push(item.areaId)
if (item.areaIds.length > 0) {
item.areaIds.forEach((areaId) => areaIds.push(areaId))
}
})
const length = node.data.length
@ -343,7 +351,7 @@ const loadFreeArea = async (node, resolve) => {
const data = cloneDeep(defaultArea)
const item = data[0]
if (areaIds.includes(item.id)) {
item.disabled = true
//item.disabled = true
}
resolve(data)
} else {
@ -352,7 +360,8 @@ const loadFreeArea = async (node, resolve) => {
//
data.forEach((item) => {
if (areaIds.includes(item.id)) {
item.disabled = true
// TODO @
//item.disabled = true
}
})
resolve(data)
@ -362,7 +371,7 @@ const loadFreeArea = async (node, resolve) => {
const addChargeArea = () => {
const data = formData.value
data.templateCharge.push({
areaId: undefined,
areaIds: [],
startCount: 1,
startPrice: 1,
extraCount: 1,
@ -378,7 +387,7 @@ const deleteChargeArea = (index) => {
const addFreeArea = () => {
const data = formData.value
data.templateFree.push({
areaId: undefined,
areaIds: [],
freeCount: 1,
freePrice: 1
})

View File

@ -90,13 +90,13 @@
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<DeliveryExpressTemplateForm ref="formRef" @success="getList" />
<ExpressTemplateForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts" name="DeliveryExpressTemplate">
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import * as DeliveryExpressTemplateApi from '@/api/mall/trade/delivery/expressTemplate'
import DeliveryExpressTemplateForm from './DeliveryExpressTemplateForm.vue'
import ExpressTemplateForm from './ExpressTemplateForm.vue'
const message = useMessage() //
const { t } = useI18n() //