@@ -30,26 +30,18 @@
< / el-col >
< / template >
< template # col -taxMode = " { row } " >
< el-tag : type = "row.taxMode === 'TAX_INCLUDED' ? 'success' : 'warning'" size = "small" >
{ { row . taxMode === 'TAX_INCLUDED' ? '包税' : '不包税' } }
< / el-tag >
< / template >
< template # col -cargoAttr = " { row } " >
< el-tag type = "primary" size = "small" effect = "plain" > { { row . cargoAttr || '-' } } < / el-tag >
< / template >
< template # col -status = " { row } " >
< el-tag : type = "row.status === '0' ? 'success' : 'info'" size = "small" >
{ { row . status === '0' ? '正常' : '停用' } }
< / el-tag >
< dict-tag :options = "bms_product_effect_status" :value = "resolveEffectStatus(row)" / >
< / template >
< template # col -action = " { row } " >
< el-button link type = "primary" icon = "View" @click ="openCountries(row)" v-hasPermi = "['price:product:query']" > 产品明细 < / el -button >
< el-button :disabled = "isProductActive(row)" : title = "isProductActive(row) ? '生效中 不可编辑' : ''" link type = "primary" icon = "Edit" @click ="handleUpdate(row)" v-hasPermi = "['price:product:edit']" > 编辑 < / el -button >
< el-button :disabled = "isProductActive(row)" : title = "isProductActive(row) ? '生效中 不可删除' : ''" link type = "primary" icon = "Delete" @click ="handleDelete(row.productId)" v-hasPermi = "['price:product:remove']" > 删除 < / el -button >
< el-button :disabled = "isProductActive(row)" : title = "isProductActive(row) ? '已 生效不可编辑' : ''" link type = "primary" icon = "Edit" @click ="handleUpdate(row)" v-hasPermi = "['price:product:edit']" > 编辑 < / el -button >
< el-button :disabled = "isProductActive(row)" : title = "isProductActive(row) ? '已 生效不可删除' : ''" link type = "primary" icon = "Delete" @click ="handleDelete(row.productId)" v-hasPermi = "['price:product:remove']" > 删除 < / el -button >
< / template >
< / basic-table >
@@ -88,8 +80,12 @@
< el-col :span = "12" >
< el-form-item label = "税模式" prop = "taxMode" >
< el-select v-model = "form.taxMode" placeholder="请选择" style="width: 100%" >
< el -option label = "包税" value = "TAX_INCLUDED" / >
< el-option label = "不包税" value = "TAX_EXCLUDED" / >
< el -option
v-for = "dict in bms_tax_mode"
:key = "dict.value"
:label = "dict.label"
:value = "dict.value"
/ >
< / el-select >
< / el-form-item >
< / el-col >
@@ -103,8 +99,8 @@
< el-col :span = "12" >
< el-form-item label = "状态" prop = "status" >
< el-radio-group v-model = "form.status" >
< el -radio value = "0" > 正常 < / el-radio >
< el-radio value = "1" > 停用 < / el-radio >
< el -radio value = "0" > 启用 ( 按生效日期自动 : 待生效 / 已生效 ) < / el-radio >
< el-radio value = "1" > 已失效 < / el-radio >
< / el-radio-group >
< / el-form-item >
< / el-col >
@@ -146,6 +142,10 @@
< / template >
< / el-table-column >
< el-table-column label = "时效" prop = "leadTime" width = "100" show -overflow -tooltip / >
< el-table-column label = "生效日期" prop = "effectiveDate" width = "110" align = "center" / >
< el-table-column label = "失效日期" width = "110" align = "center" >
< template # default = "{ row }" > { { row . expireDate || '长期' } } < / template >
< / el-table-column >
< / el-table >
< / el-drawer >
@@ -154,7 +154,7 @@
title = "产品 Excel 导入"
action = "/price/product/importData"
:default-update-support = "true"
update -support -label = " 是否更新已经 存在的产品主数据 ( 国家 / 运费明细每次导入都会覆盖 ) "
update -support -label = " 是否更新已存在的产品主数据 ( 国家明细 : 新生效日晚于上次则保留历史 , 上次失效日 = 本次生效日 ) "
@success ="() => tableRef.refresh()"
/ >
< / div >
@@ -165,6 +165,7 @@ import ExcelImportDialog from '@/components/ExcelImportDialog'
import { listProduct , getProduct , addProduct , updateProduct , delProduct , listProductCountries } from '@/api/price/product'
const { proxy } = getCurrentInstance ( )
const { bms _product _effect _status , bms _tax _mode } = useDict ( 'bms_product_effect_status' , 'bms_tax_mode' )
const tableRef = ref ( )
const importRef = ref ( )
const formRef = ref ( )
@@ -190,34 +191,32 @@ const columns = [
{ prop : 'serviceLevel' , label : '时效等级' , width : 90 , align : 'center' } ,
{ prop : 'cargoAttr' , label : '走货属性' , minWidth : 120 , slot : 'cargoAttr' } ,
{ prop : 'destRegion' , label : '目的区域' , width : 90 , align : 'center' } ,
{ prop : 'taxMode' , label : '税模式' , width : 90 , align : 'center' , slot : 'taxM ode' } ,
{ prop : 'taxMode' , label : '税模式' , width : 90 , align : 'center' , dict : 'bms_ tax_m ode' } ,
{ prop : 'effectiveDate' , label : '生效日期' , width : 120 , align : 'center' } ,
{ prop : 'countryCount' , label : '国家数' , width : 80 , align : 'center' } ,
{ prop : 'status' , label : '状态' , width : 80 , align : 'center' , slot : 'status' } ,
{ prop : 'status' , label : '状态' , width : 90 , align : 'center' , slot : 'status' } ,
{ prop : 'updateNote' , label : '更新内容' , minWidth : 160 , showOverflowTooltip : true } ,
{ prop : 'action' , label : '操作' , width : 240 , fixed : 'right' , slot : 'action' }
]
const searchColumns = [
{ prop : 'productCode' , label : '产品代码' } ,
{ prop : 'productName' , label : '产品名称' } ,
{ prop : 'productCode' , label : '产品代码' , component : 'input' , placeholder : '产品代码' } ,
{ prop : 'productName' , label : '产品名称' , component : 'input' , placeholder : '产品名称' } ,
{
prop : 'taxMode' ,
label : '税模式' ,
type : 'select' ,
options : [
{ label : '包税' , value : 'TAX_INCLUDED' } ,
{ label : '不包税' , value : 'TAX_EXCLUDED' }
]
component : 'select' ,
dict : 'bms_tax_mode' ,
placeholder : '税模式' ,
clearable : true
} ,
{
prop : 's tatus' ,
prop : 'effectS tatus' ,
label : '状态' ,
type : 'select' ,
options : [
{ label : '正常' , value : '0' } ,
{ label : '停用' , value : '1' }
]
component : 'select' ,
dict : 'bms_product_effect_status' ,
placeholder : '请选择状态' ,
clearable : true
}
]
@@ -235,13 +234,21 @@ function queryList(params) {
return listProduct ( params )
}
// 判断产品是否"生效中": status='0'(未停用)且 effectiveDate <= 今天
function todayStr ( ) {
return new Date ( ) . toISOString ( ) . slice ( 0 , 10 )
}
/** ACTIVE已生效 / PENDING待生效 / EXPIRED已失效 */
function resolveEffectStatus ( row ) {
if ( ! row ) return 'PENDING'
if ( row . status === '1' ) return 'EXPIRED'
if ( ! row . effectiveDate ) return 'PENDING'
return String ( row . effectiveDate ) . slice ( 0 , 10 ) <= todayStr ( ) ? 'ACTIVE' : 'PENDING'
}
// 已生效不可编辑/删除
function isProductActive ( row ) {
if ( ! row ) return false
if ( row . status !== '0' ) return false
if ( ! row . effectiveDate ) return false
const today = new Date ( ) . toISOString ( ) . slice ( 0 , 10 )
return String ( row . effectiveDate ) . slice ( 0 , 10 ) <= today
return resolveEffectStatus ( row ) === 'ACTIVE'
}
function reset ( ) {
@@ -269,7 +276,7 @@ function handleAdd() {
function handleUpdate ( row ) {
if ( isProductActive ( row ) ) {
proxy . $modal . msgError ( '生效中 的产品不可编辑' )
proxy . $modal . msgError ( '已 生效的产品不可编辑' )
return
}
reset ( )