[TBID:ECX-9138] release 4.8.0

This commit is contained in:
lukaijie
2026-07-03 14:40:01 +08:00
5 changed files with 25 additions and 22 deletions

View File

@@ -763,7 +763,10 @@ export default {
if (this.form.license_validity_type != null && this.form.license_validity_type !== '') {
this.form.license_validity_type = Number(this.form.license_validity_type)
}
if (this.form.legal_cert_validity_type != null && this.form.legal_cert_validity_type !== '') {
if (
this.form.legal_cert_validity_type != null &&
this.form.legal_cert_validity_type !== ''
) {
this.form.legal_cert_validity_type = Number(this.form.legal_cert_validity_type)
}
this.form.license_regions_id = [

View File

@@ -1760,7 +1760,10 @@ export default {
if (this.selectionItems.length > 0) {
this.saleCategoryForm.item_id = this.selectionItems.map((item) => item.item_id)
const categoryIds = await this.resolveSelectionSaleCategoryIds()
this.saleCategoryForm.category_id = this.getSaleCategoryPaths(this.categoryList, categoryIds)
this.saleCategoryForm.category_id = this.getSaleCategoryPaths(
this.categoryList,
categoryIds
)
this.saleCategoryDialog = true
} else {
this.$message.error(this.$t('dc9cefd6.ace302'))

View File

@@ -143,7 +143,9 @@
</div>
</div>
<div slot="reference" class="name-wrapper">
{{ formatMoneyWithSymbol(scope.row.discountFee, getCurrencySymbol(scope.row)) }}
{{
formatMoneyWithSymbol(scope.row.discountFee, getCurrencySymbol(scope.row))
}}
</div>
</el-popover>
</el-form-item>
@@ -220,7 +222,9 @@
<span class="mark">{{ scope.row.payFee }} {{ $t('35ec026d.9f68a8') }}</span>
</div>
<div v-else>
<span>{{ formatMoneyWithSymbol(scope.row.payFee, getCurrencySymbol(scope.row)) }}</span>
<span>{{
formatMoneyWithSymbol(scope.row.payFee, getCurrencySymbol(scope.row))
}}</span>
</div>
</template>
</el-table-column>
@@ -280,7 +284,10 @@
<template slot-scope="scope">
{{
scope.row.self_delivery_fee
? formatMoneyWithSymbol(scope.row.self_delivery_fee, getCurrencySymbol(scope.row))
? formatMoneyWithSymbol(
scope.row.self_delivery_fee,
getCurrencySymbol(scope.row)
)
: ''
}}
</template>

View File

@@ -390,9 +390,7 @@
>
<template slot-scope="scope">
{{ scope.row.fee_symbol || '¥'
}}{{
(scope.row.freight_fee / 100 + scope.row.freight_point_fee / 100).toFixed(2)
}}
}}{{ (scope.row.freight_fee / 100 + scope.row.freight_point_fee / 100).toFixed(2) }}
</template>
</el-table-column>

View File

@@ -1204,15 +1204,11 @@ export default {
if (newEnabled && paymentItem.name === 'doumen_intl') {
try {
await this.$confirm(
'请确认是否启用斗门国际收银台,启用会默认关闭其他支付方式',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
)
await this.$confirm('请确认是否启用斗门国际收银台,启用会默认关闭其他支付方式', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
} catch {
paymentItem.enabled = false
return
@@ -1290,11 +1286,7 @@ export default {
}
}
if (
payType !== 'doumen_intl' &&
params.is_open === 'true' &&
this.isDoumenIntlEnabled()
) {
if (payType !== 'doumen_intl' && params.is_open === 'true' && this.isDoumenIntlEnabled()) {
throw new Error('请先关闭斗门国际收银台')
}