统一将 bms_region 替换为 region,更新相关注释和文档以反映这一变化。
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// ========== countries that have zones (from bms_region) ==========
|
||||
// ========== countries that have zones (from region) ==========
|
||||
|
||||
export function listCountry(query) {
|
||||
return request({
|
||||
@@ -17,7 +17,7 @@ export function getCountry(regionId) {
|
||||
})
|
||||
}
|
||||
|
||||
/** Delete all zones + postcodes for region(s); does not delete bms_region */
|
||||
/** Delete all zones + postcodes for region(s); does not delete region */
|
||||
export function delCountryZones(regionIds) {
|
||||
return request({
|
||||
url: '/price/zone/country/' + regionIds,
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
link
|
||||
type="warning"
|
||||
icon="Refresh"
|
||||
:disabled="row.successStatus === 'SUCCESS'"
|
||||
:loading="retryingId === row.taskId"
|
||||
v-hasPermi="['monitor:billingTask:retry']"
|
||||
@click="handleRetry(row)"
|
||||
@@ -131,7 +130,8 @@ const searchColumns = [
|
||||
{ label: '失败码', prop: 'failCode', component: 'select', options: failCodeOptions, placeholder: '请选择失败码', width: '220px', props: { clearable: true, filterable: true } },
|
||||
{ label: '订单号', prop: 'orderNo', component: 'input', placeholder: '订单号', width: '180px' },
|
||||
{ label: '运单号', prop: 'trackingNo', component: 'input', placeholder: '运单号', width: '180px' },
|
||||
{ label: '转单号', prop: 'transferNo', component: 'input', placeholder: '转单号', width: '180px' }
|
||||
{ label: '转单号', prop: 'transferNo', component: 'input', placeholder: '转单号', width: '180px' },
|
||||
{ label: '计费时间', prop: 'dateRange', component: 'daterange', width: '308px' }
|
||||
]
|
||||
|
||||
const columns = [
|
||||
@@ -149,7 +149,9 @@ const columns = [
|
||||
]
|
||||
|
||||
function queryList(params) {
|
||||
return listBillingTask(params)
|
||||
const p = proxy.addDateRange({ ...params }, params.dateRange)
|
||||
delete p.dateRange
|
||||
return listBillingTask(p)
|
||||
}
|
||||
|
||||
function billTypeLabel(type) {
|
||||
|
||||
@@ -172,7 +172,7 @@ function handleZoneDelete(zoneIds) {
|
||||
|
||||
function handleClearZones() {
|
||||
if (!selectedRegionId.value) return
|
||||
proxy.$modal.confirm('是否清空国家 regionId="' + selectedRegionId.value + '" 下的全部分区与邮编?(不会删除 bms_region 国家主数据)').then(() => {
|
||||
proxy.$modal.confirm('是否清空国家 regionId="' + selectedRegionId.value + '" 下的全部分区与邮编?(不会删除 region 国家主数据)').then(() => {
|
||||
return delCountryZones(selectedRegionId.value)
|
||||
}).then(() => {
|
||||
zoneList.value = []
|
||||
|
||||
@@ -35,7 +35,7 @@ import { addZone, updateZone } from '@/api/price/zone'
|
||||
const { proxy } = getCurrentInstance()
|
||||
|
||||
const props = defineProps({
|
||||
/** 当前抽屉选中的国家(bms_region 行) */
|
||||
/** 当前抽屉选中的国家(region 行) */
|
||||
country: {
|
||||
type: Object,
|
||||
default: null
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
:closable="false"
|
||||
show-icon
|
||||
class="mb16"
|
||||
title="国家来自 bms_region;点击「分区」在抽屉中查看/维护国家分区,抽屉内点击「分区点击」查看邮编明细。导入 Excel 时需 sheet 名以「分区」结尾且能匹配国家表。"
|
||||
title="国家来自 region;点击「分区」在抽屉中查看/维护国家分区,抽屉内点击「分区点击」查看邮编明细。导入 Excel 时需 sheet 名以「分区」结尾且能匹配国家表。"
|
||||
/>
|
||||
|
||||
<basic-table
|
||||
@@ -94,7 +94,7 @@ function onZoneChanged() {
|
||||
}
|
||||
|
||||
function handleCountryDelete(regionIds) {
|
||||
proxy.$modal.confirm('是否清空国家 regionId="' + regionIds + '" 下的全部分区与邮编?(不会删除 bms_region 国家主数据)').then(() => {
|
||||
proxy.$modal.confirm('是否清空国家 regionId="' + regionIds + '" 下的全部分区与邮编?(不会删除 region 国家主数据)').then(() => {
|
||||
return delCountryZones(regionIds)
|
||||
}).then(() => {
|
||||
countryTableRef.value.refresh()
|
||||
|
||||
Reference in New Issue
Block a user