@@ -7,142 +7,129 @@
@close ="close"
>
< div class = "drawer-body" v-loading = "loading" >
< div class = "toolbar " >
< el-select
v-model = "query. productKeyword"
filterable
clearable
:placeholder = "phProduct"
:loading = "optionsLoad ing "
style = "width: 200px"
>
< el-option v-for = "p in optionProducts" :key="p.code" :label="p.label" :value="p.code" >
< span class = "opt-name" > { { p . name } } < / span >
< span class = "opt-code" > { { p . code } } < / span >
< / el-option >
< / el-select >
< el-select
v-if = "isFixed"
v-model = "query.countryKeyword"
filterable
clearable
:placeholder = "phCountry"
:loading = "optionsLoading"
style = "width: 160px"
>
< el-option v-for = "c in optionCountries" :key="c.key" :label="c.label" :value="c.value" >
< span class = "opt-name" > { { c . name } } < / span >
< span class = "opt-code" > { { c . code } } < / span >
< / el-option >
< / el-select >
< el-select
v-if = "isFixed"
v-model = "query.zoneKeyword"
filterable
clearable
:placeholder = "phZone"
:loading = "optionsLoading"
style = "width: 160px"
>
< el-option v-for = "z in optionZones" :key="z.key" :label="z.label" :value="z.value" >
< span class = "opt-name" > { { z . name } } < / span >
< span class = "opt-code" > { { z . code } } < / span >
< / el-option >
< / el-select >
< el-button type = "primary" @click ="search" > 查询 < / el -button >
< el-button @click ="reset" > 重置 < / el -button >
< div v-show = "!detailOpen" class="product-pane " >
< div class = "toolbar" >
< el-input v-model = "productKeyword" clearable :placeholder="phSearch" style="width: 220px" / >
< el-button type = "primary" @click ="noop" > 查询 < / el -button >
< el-button @click ="productKeyword = ''" > 重置 < / el -button >
< / div >
< el-alert type = "info" :c losable = "false" show -icon class = "mb12" :title = "h int " / >
< el-empty v-if = "!filteredProducts.length" :description="emptyProduct" :image-size="72" / >
< el-table v-else :data = "filteredProducts" border height = "calc(100vh - 280px)" @ row -click = " openProductDetail " >
< el-table-column :label = "colCode" min -width = " 100 " >
< template # default = "{ row }" > < b > { { row . productCode } } < / b > < / template >
< / el-table-column >
< el-table-column :label = "colName" prop = "productName" min -width = " 140 " show -overflow -tooltip / >
< el-table-column :label = "colLevel" prop = "serviceLevel" width = "90" align = "center" / >
< el-table-column :label = "colCargo" min -width = " 140 " align = "center" show -overflow -tooltip >
< template # default = "{ row }" >
< el-tag v-if = "row.cargoAttr" type="primary" size="small" effect="plain" > {{ row.cargoAttr }} < / el -tag >
< span v-else > - < / span >
< / template >
< / el -table -column >
< el-table-column :label = "colRegion" prop = "destRegion" width = "100" align = "center" / >
< el-table-column :label = "colAction" width = "110" align = "center" fixed = "right" >
< template # default = "{ row }" >
< el-button link type = "primary" @click.stop ="openProductDetail(row)" > 查看明细 < / el -button >
< / template >
< / el-table-column >
< / el-table >
< div class = "product-count" > { { productCountText } } < / div >
< / div >
< el-table :data = "rows" border height = "calc(100vh - 220px)" empty -text = " 暂无明细 " >
< el-table-column :label = "colProduct" min -width = " 180 " >
< template # default = "{ row } ">
< div class = "cell-product" >
< span class = "p-code" > { { row . productCode } } < / span >
< span class = "p-name" > { { row . productName || '' } } < / span >
< / div >
< div v-show = "detailOpen" class="detail-pane" >
< div class = "toolbar" >
< el-button link type = "primary" @click ="backToProducts ">
< el -icon > < arrow-left / > < / el-icon >
返回产品
< / el-button >
< span class = "detail-title" > { { detailTitleText } } < / span >
< el-input
v-if = "isFixed"
v-model = "detailKeyword"
clearable
:placeholder = "phDetailSearch"
style = "width: 200px; margin-left: auto"
/ >
< / div >
< el-table
v-loading = "detailLoading"
:data = "displayDetailRows"
border
height = "calc(100vh - 260px)"
:empty-text = "emptyDetail"
:span-method = "spanMethod"
>
< template v-if = "isFixed" >
< el -table -column :label = "colCountry" min -width = " 100 " >
< template # default = "{ row }" > { { row . countryName || row . countryCode || '-' } } < / template >
< / el-table-column >
< el-table-column :label = "colZone" min -width = " 90 " >
< template # default = "{ row }" > { { row . zoneName || row . zoneCode || '-' } } < / template >
< / el-table-column >
< el-table-column :label = "colWeight" prop = "weightLabel" min -width = " 120 " / >
< el-table-column :label = "colFv" min -width = " 130 " align = "right" >
< template # default = "{ row }" >
< el-tooltip placement = "top" :disabled = "!hasBaseFreight(row)" >
< template # content >
< span > 产品基础运费 : { { formatBase ( row . baseFreightPrice , 4 ) } } RMB / KG < / span >
< / template >
< span class = "price-tip" >
< template v-if = "row.fvValue == null" >
< span class = "unit" > 未覆盖 < / span >
< / template >
< template v-else >
< span class = "hl" > { { row . fvValue } } < / span >
< span class = "unit" > RMB / KG < / span >
< / template >
< / span >
< / el-tooltip >
< / template >
< / el-table-column >
< el-table-column :label = "colReg" min -width = " 120 " align = "right" >
< template # default = "{ row }" >
< el-tooltip placement = "top" :disabled = "!hasBaseReg(row)" >
< template # content >
< span > 产品基础挂号费 : { { formatBase ( row . baseRegistrationFee , 2 ) } } RMB / 票 < / span >
< / template >
< span class = "price-tip" >
< span class = "reg" > { { row . fvRegistrationFee } } < / span >
< span class = "unit" > RMB / 票 < / span >
< / span >
< / el-tooltip >
< / template >
< / el-table-column >
< / template >
< / el-table-column >
< template v-if = "isFixed" >
< el -table -column :label = "colCountry" min -width = " 120 " >
< template # default = "{ row }" > { { row . countryName || row . countryCode || '-' } } < / template >
< / el-table-column >
< el-table-column :label = "colZone" min -width = " 110 " >
< template # default = "{ row }" > { { row . zoneName || row . zoneCode || '-' } } < / template >
< / el-table-column >
< el-table-column :label = "colWeight" prop = "weightLabel" min -width = " 120 " / >
< el-table-column :label = "colFv" min -width = " 130 " align = "right" >
< el-table-column v-else :label = "colDisc" min -width = " 120 " align = "center" >
< template # default = "{ row }" >
< el-tooltip placement = "top" :disabled = "!hasBaseFreight(row)" >
< template # content >
< span > 产品基础运费 : { { formatBase ( row . baseFreightPrice , 4 ) } } RMB / KG < / span >
< / template >
< span class = "price-tip" >
< template v-if = "row.fvValue == null" >
< span class = "unit" > 未覆盖 < / span >
< / template >
< template v-else >
< span class = "hl" > { { row . fvValue } } < / span >
< span class = "unit" > RMB / KG < / span >
< / template >
< / span >
< / el-tooltip >
< el-tag v-if = "row.discountValue == null" size="small" type="info" effect="plain" > 默认折扣 < / el -tag >
< span v-else class = "pct" > { { row . discountValue } } % < / span >
< / template >
< / el-table-column >
< el-table-column :label = "colReg " min -width = " 120 " align = "right" >
< el-table-column :label = "colSc " min -width = " 200 " >
< template # default = "{ row }" >
< el-tooltip placement = "top" :disabled = "!hasBaseReg(row)" >
< template # content >
< span > 产品基础挂号费 : { { formatBase ( row . baseRegistrationFee , 2 ) } } RMB / 票 < / span >
< / template >
< span class = "price-tip" >
< span class = "reg" > { { row . fvRegistrationFee } } < / span >
< span class = "unit" > RMB / 票 < / span >
< / span >
< / el-tooltip >
< surcharge-tags : list = "row.surcharges || []" :empty-text = "noneSc" / >
< / template >
< / el-table-column >
< / template >
< el-table-column v-else :label = "colDisc" min -width = " 120 " align = "center" >
< template # default = "{ row }" >
< el-tag v-if = "row.discountValue == null" size="small" type="info" effect="plain" > 默认折扣 < / el -tag >
< span v-else class = "pct" > { { row . discountValue } } % < / span >
< / template >
< / el-table-column >
< el-table-column :label = "colSc" min -width = " 200 " >
< template # default = "{ row }" >
< surcharge-tags : list = "row.surcharges || []" :empty-text = "noneSc" / >
< / template >
< / el-table-column >
< el-table-column :label = "colRound" min -width = " 100 " align = "center" >
< template # default = "{ row }" > { { roundModeLabel ( row . roundMode ) } } < / template >
< / el-table-column >
< / el-table >
< div class = "pager" >
< pagination
v-show = "total > 0"
:total = "total"
v -model :page = "query.pageNum"
v -model :limit = "query.pageSize"
@pagination ="load"
/ >
< el-table-column :label = "colRound" min -width = " 100 " align = "center" >
< template # default = "{ row }" > { { roundModeLabel ( row . roundMode ) } } < / template >
< / el-table-column >
< / el-table >
< / div >
< / div >
< template # footer >
< el-button v-if = "detailOpen" @click="backToProducts" > 返回产品 < / el -button >
< el-button @click ="close" > 关闭 < / el -button >
< / template >
< / el-drawer >
< / template >
< script setup name = "SetVersionDetailDrawer" >
import { ArrowLeft } from '@element-plus/icons-vue'
import SurchargeTags from '../SurchargeTags.vue'
import { isFixedType } from '../../utils/priceSet'
import { listSetDetail , listSetDetailOptions } from '@/api/price/set'
import { listSetDetailByProduct , listSetDetailOptions } from '@/api/price/set'
const props = defineProps ( {
modelValue : { type : Boolean , default : false } ,
@@ -154,61 +141,25 @@ const emit = defineEmits(['update:modelValue'])
const { bms _round _mode } = useDict ( 'bms_round_mode' )
const loading = ref ( false )
const rows = ref ( [ ] )
const total = ref ( 0 )
const query = reactive ( {
pageNum : 1 ,
pageSize : 20 ,
productKeyword : '' ,
countryKeyword : '' ,
zoneKeyword : ''
} )
const productKeyword = ref ( '' )
const products = ref ( [ ] )
const detailOpen = ref ( false )
const detailLoading = ref ( false )
const detailKeyword = ref ( '' )
const detailRows = ref ( [ ] )
const activeProduct = ref ( null )
// 下拉选项:当前版本内去重后的 产品/国家/分区
const optionsLoading = ref ( false )
const optionProducts = ref ( [ ] )
const optionCountries = ref ( [ ] )
const optionZones = ref ( [ ] )
function loadOptions ( ) {
const psvId = props . version && props . version . psvId
if ( ! psvId ) {
optionProducts . value = [ ]
optionCountries . value = [ ]
optionZones . value = [ ]
return
}
optionsLoading . value = true
listSetDetailOptions ( psvId ) . then ( res => {
const data = res . data || { }
optionProducts . value = ( data . products || [ ] ) . map ( p => ( {
code : p . code ,
name : p . name || p . code ,
label : ( p . name && p . name !== p . code ) ? ` ${ p . code } ${ p . name } ` : p . code
} ) )
optionCountries . value = ( data . countries || [ ] ) . map ( c => ( {
key : c . code || c . name ,
code : c . code || '-' ,
name : c . name || c . code ,
value : c . code || c . name , // 有代码按代码搜,否则按名称搜(后端 code/name 双 LIKE)
label : ( c . name && c . code ) ? ` ${ c . name } ${ c . code } ` : ( c . name || c . code )
} ) )
optionZones . value = ( data . zones || [ ] ) . map ( z => ( {
key : z . code || z . name ,
code : z . code || '-' ,
name : z . name || z . code ,
value : z . code || z . name ,
label : ( z . name && z . code ) ? ` ${ z . name } ${ z . code } ` : ( z . name || z . code )
} ) )
} ) . finally ( ( ) => {
optionsLoading . value = false
} )
}
const phProduct = '产品'
const phCountry = '国家'
const phZone = '分区'
const colProduct = '产品'
const phSearch = '产品代码/名称'
const phDetailSearch = '搜索国家/分区'
const hint = '点击产品行查看国家/重量段明细(仅查看)'
const emptyProduct = '暂无产品'
const emptyDetail = '暂无明细'
const colCode = '产品代码'
const colName = '产品名称'
const colLevel = '时效等级'
const colCargo = '走货属性'
const colRegion = '目的区域'
const colAction = '操作'
const colCountry = '国家'
const colZone = '分区'
const colWeight = '重量段'
@@ -224,6 +175,92 @@ const title = computed(() => {
const v = props . version || { }
return ( v . versionNo || '-' ) + ' · 版本明细'
} )
const detailTitleText = computed ( ( ) => {
const p = activeProduct . value || { }
return ( p . productCode || '' ) + ' · ' + ( p . productName || '' ) + ' · 国家服务价格'
} )
const filteredProducts = computed ( ( ) => {
const kw = ( productKeyword . value || '' ) . trim ( ) . toLowerCase ( )
return ( products . value || [ ] ) . filter ( p => {
if ( ! p || ! p . productCode ) return false
if ( ! kw ) return true
const blob = [ p . productCode , p . productName ] . filter ( Boolean ) . join ( ' ' ) . toLowerCase ( )
return blob . includes ( kw )
} )
} )
/** Footer: "共 N 个产品" (show filtered vs total when searching). */
const productCountText = computed ( ( ) => {
const n = filteredProducts . value . length
const total = ( products . value || [ ] ) . length
if ( n === total ) {
return '\u5171 ' + n + ' \u4e2a\u4ea7\u54c1'
}
return '\u5171 ' + n + ' \u4e2a\u4ea7\u54c1\uff08\u5168\u90e8 ' + total + ' \u4e2a\uff09'
} )
function countryKey ( row ) {
return String ( ( row && ( row . countryCode || row . countryName ) ) || '' ) . toUpperCase ( )
}
function zoneKey ( row ) {
return String ( ( row && ( row . zoneCode || row . zoneName ) ) || '' )
}
const displayDetailRows = computed ( ( ) => {
const kw = ( detailKeyword . value || '' ) . trim ( ) . toLowerCase ( )
let list = [ ... ( detailRows . value || [ ] ) ]
if ( kw ) {
list = list . filter ( r => {
if ( ! r ) return false
const blob = [ r . countryName , r . countryCode , r . zoneName , r . zoneCode , r . weightLabel ]
. filter ( Boolean ) . join ( ' ' ) . toLowerCase ( )
return blob . includes ( kw )
} )
}
list . sort ( ( a , b ) => {
const ca = countryKey ( a )
const cb = countryKey ( b )
if ( ca !== cb ) return ca . localeCompare ( cb )
const za = zoneKey ( a )
const zb = zoneKey ( b )
if ( za !== zb ) return za . localeCompare ( zb )
return String ( ( a && a . weightLabel ) || '' ) . localeCompare ( String ( ( b && b . weightLabel ) || '' ) )
} )
return list
} )
function buildSpans ( rows , keyOf ) {
const spans = new Array ( rows . length ) . fill ( 1 )
let i = 0
while ( i < rows . length ) {
let j = i + 1
const key = keyOf ( rows [ i ] )
while ( j < rows . length && keyOf ( rows [ j ] ) === key ) j ++
spans [ i ] = j - i
for ( let k = i + 1 ; k < j ; k ++ ) spans [ k ] = 0
i = j
}
return spans
}
const countrySpans = computed ( ( ) => buildSpans ( displayDetailRows . value , countryKey ) )
const zoneSpans = computed ( ( ) => buildSpans ( displayDetailRows . value , r => countryKey ( r ) + '|' + zoneKey ( r ) ) )
function spanOf ( spans , rowIndex ) {
const rowspan = spans [ rowIndex ] || 0
return rowspan > 0 ? { rowspan , colspan : 1 } : { rowspan : 0 , colspan : 0 }
}
function spanMethod ( { columnIndex , rowIndex } ) {
if ( ! isFixed . value ) return { rowspan : 1 , colspan : 1 }
if ( columnIndex === 0 ) return spanOf ( countrySpans . value , rowIndex )
if ( columnIndex === 1 ) return spanOf ( zoneSpans . value , rowIndex )
return { rowspan : 1 , colspan : 1 }
}
function noop ( ) { }
function hasBaseFreight ( row ) {
return row && row . baseFreightPrice != null && row . baseFreightPrice !== ''
@@ -237,7 +274,6 @@ function formatBase(v, precision) {
if ( Number . isNaN ( n ) ) return String ( v )
return n . toFixed ( precision )
}
function roundModeLabel ( mode ) {
const hit = ( bms _round _mode . value || [ ] ) . find ( d => d . value === mode )
return hit ? hit . label : ( mode || '四舍五入' )
@@ -247,52 +283,73 @@ function close() {
emit ( 'update:modelValue' , false )
}
function search ( ) {
query . pageNum = 1
load ( )
function backToProducts ( ) {
detailOpen . value = false
activeProduct . value = null
detailRows . value = [ ]
detailKeyword . value = ''
}
function reset ( ) {
query . productKeyword = ''
query . countryKeyword = ''
query . zoneKeyword = ''
query . pageNum = 1
load ( )
function normalizeProducts ( list ) {
return ( list || [ ] )
. filter ( p => p && ( p . productCode || p . code ) )
. map ( p => ( {
productCode : p . productCode || p . code ,
productName : p . productName || p . name || p . productCode || p . code ,
serviceLevel : p . serviceLevel ,
cargoAttr : p . cargoAttr ,
destRegion : p . destRegion ,
taxMode : p . taxMode
} ) )
}
function load ( ) {
const psvId = props . version && props . version . psvId
async function loadProducts ( ) {
const v = props . version || { }
const psvId = v . psvId
if ( ! psvId ) {
rows . value = [ ]
total . value = 0
products . value = [ ]
return
}
loading . value = true
listSetDetail ( {
psvId ,
productKeyword : query . productKeyword || undefined ,
countryKeyword : isFixed . value ? ( query . countryKeyword || undefined ) : undefined ,
zoneKeyword : isFixed . value ? ( query . zoneKeyword || undefined ) : undefined ,
pageNum : query . pageNum ,
pageSize : query . pageSize
} ) . then ( res => {
rows . value = res . rows || [ ]
total . value = res . total || 0
} ) . finally ( ( ) => {
try {
const fromVersion = normalizeProducts ( v . products )
if ( fromVersion . length ) {
products . value = fromVersion
return
}
const res = await listSetDetailOptions ( psvId )
const data = res . data || { }
products . value = normalizeProducts ( data . products || [ ] )
} finally {
loading . value = false
} )
}
}
async function openProductDetail ( row ) {
if ( ! row || ! row . productCode ) return
const psvId = props . version && props . version . psvId
if ( ! psvId ) return
activeProduct . value = row
detailOpen . value = true
detailKeyword . value = ''
detailLoading . value = true
try {
const res = await listSetDetailByProduct ( psvId , row . productCode )
detailRows . value = res . data || [ ]
} catch ( e ) {
detailRows . value = [ ]
} finally {
detailLoading . value = false
}
}
watch (
( ) => [ props . modelValue , props . version && props . version . psvId ] ,
( [ open ] ) => {
if ( open ) {
query . pageNum = 1
query . productKeyword = ''
query . countryKeyword = ''
query . zoneKeyword = ''
loadOptions ( )
load ( )
productKeyword . value = ''
backToProducts ( )
loadProducts ( )
}
}
)
@@ -312,29 +369,16 @@ watch(
flex - wrap : wrap ;
align - items : center ;
}
. pager {
margin - top : 12 px ;
}
. cell - product {
display : flex ;
align - items : baseline ;
gap : 6 px ;
}
. p - code {
font - family : Consolas , Monaco , monospace ;
font - size : 12 px ;
. mb12 { margin - bottom : 12 px ; }
. product - count {
margin - top : 10 px ;
text - align : right ;
color : # 606266 ;
background : # f4f4f5 ;
border - radius : 3 px ;
padding : 0 6 px ;
font - size : 13 px ;
}
. p - name { color : # 303133 ; }
. opt - name { margin - right : 8 px ; }
. opt - code {
float : right ;
color : var ( -- el - text - color - secondary ) ;
font - size : 12 px ;
font - family : Consolas , Monaco , monospace ;
. detail - title {
font - weight : 600 ;
color : # 303133 ;
}
. hl { color : # 1890 ff ; font - weight : 600 ; }
. reg { color : # d48806 ; font - weight : 600 ; }
@@ -347,4 +391,7 @@ watch(
. price - tip : hover {
border - bottom - color : # c0c4cc ;
}
: deep ( . el - table _ _row ) {
cursor : pointer ;
}
< / style >