diff --git a/src/components/SpacePicker/index.vue b/src/components/SpacePicker/index.vue
new file mode 100644
index 00000000..754f6978
--- /dev/null
+++ b/src/components/SpacePicker/index.vue
@@ -0,0 +1,182 @@
+
+
+
+
+ 选择
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
diff --git a/src/components/UpperTable/index.vue b/src/components/UpperTable/index.vue
index 84598099..064b9f74 100644
--- a/src/components/UpperTable/index.vue
+++ b/src/components/UpperTable/index.vue
@@ -399,6 +399,10 @@ const props = defineProps({
columnConfigSchemaVersion: {
type: Number,
default: 1,
+ },
+ rowClassName: {
+ type: [String, Function],
+ default: '',
}
})
@@ -1164,6 +1168,10 @@ function isVirtualSpacerRow(row: any): row is VirtualSpacerRow {
function getRowClassName({ row }: { row: any }) {
if (isVirtualSpacerRow(row)) return 'virtual-spacer-row'
+ if (typeof props.rowClassName === 'function') {
+ return props.rowClassName({ row }) || ''
+ }
+ if (typeof props.rowClassName === 'string') return props.rowClassName
return ''
}
diff --git a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue
index 2ebb15bf..5c294f8e 100644
--- a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue
+++ b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue
@@ -65,156 +65,203 @@
@row-click="handlePreviewRowClick"
@selection-change="handlePreviewSelectionChange"
>
+
+
+
+ {{ getRowIssues(row).length }}项异常
+
+
+
-
+
+
+
-
-
-
+
+
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
- handlePreviewProvinceChange(row, code)"
- >
-
-
+
+ handlePreviewProvinceChange(row, code)"
+ >
+
+
+
- handlePreviewCityChange(row, code)"
- >
-
-
+
+ handlePreviewCityChange(row, code)"
+ >
+
+
+
+
+ handlePreviewAreaChange(row, code)"
+ >
+
+
+
+
+
+
+
+
+
+
handlePreviewAreaChange(row, code)"
+ placeholder="请选择快递"
+ :disabled="isPreviewRowLocked(row)"
+ @change="markPreviewRowDirty(row)"
>
-
-
-
-
-
-
-
+ >
+
+
-
- 添加商品{{ row.selected_items.length ? `(${row.selected_items.length})` : '' }}
-
+
+
+ 添加商品{{ row.selected_items.length ? `(${row.selected_items.length})` : '' }}
+
+
成功
@@ -312,6 +359,7 @@ import SelectProductDialog from './SelectProductDialog.vue'
import type { SelectProductItem } from './SelectProductDialog.vue'
import * as indexApi from '@/api/index/index'
import { warehouseSearch } from '@/api/stock/stock'
+import { orderList } from '@/api/order.index/orderindex'
import {
extractPendingOrderParseAddressData,
orderPendingOrder,
@@ -356,6 +404,7 @@ type PreviewSelectedItem = SelectProductItem
type ImportPreviewRow = {
_rowKey: string
+ _orderExists?: boolean
row_no: number
delivery_order_code: string
store_id?: number
@@ -379,6 +428,7 @@ type ImportPreviewRow = {
const importPreviewColumns = [
{ prop: 'row_no', label: '行号', width: '70', fixed: 'left' },
+ { prop: '_issue', label: '异常', width: '60', fixed: 'left' },
{ prop: 'delivery_order_code', label: '订单号', minWidth: '140', fixed: 'left' },
{ prop: 'store_id', label: '货主', minWidth: '160' },
{ prop: 'name', label: '收件人', minWidth: '100' },
@@ -389,8 +439,8 @@ const importPreviewColumns = [
{ prop: 'area', label: '区/县*', minWidth: '120' },
{ prop: 'detail_address', label: '详细地址', minWidth: '150' },
{ prop: 'selected_items', label: '商品', minWidth: '110' },
- { prop: 'logistics_code', label: '快递编码', minWidth: '110' },
- { prop: 'sys_platform_code', label: '平台编码', minWidth: '110' },
+ { prop: 'logistics_code', label: '快递', minWidth: '140' },
+ { prop: 'sys_platform_code', label: '平台', minWidth: '140' },
{ prop: 'import_status', label: '状态', width: '90' },
{ prop: 'import_message', label: '结果说明', minWidth: '180' },
{ prop: 'row_action', label: '操作', width: '70', fixed: 'right' }
@@ -406,6 +456,8 @@ const importOrderFileName = ref('')
const importPreviewRows = ref([])
const importOrderResult = ref(null)
const storeOptions = ref>([])
+const importExpressOptions = ref>([])
+const importPlatformOptions = ref>([])
const defaultStoreId = ref(undefined)
const provinceOptions = buildProvinceOptions()
@@ -439,6 +491,7 @@ const importPreviewOrderCount = computed(() => {
watch(visible, (opened) => {
if (opened) {
void loadStoreOptions()
+ void loadImportSelectOptions()
}
})
@@ -532,26 +585,69 @@ async function lookupStockItemByCode(storeId: number, itemCode: string) {
)
}
+/**
+ * 不带货主搜索商品编码,如果所有匹配项都属于同一个货主,则自动推断出货主ID
+ */
+async function lookupStockItemByCodeAcrossStores(itemCode: string): Promise<{
+ matched: any | null
+ detectedStoreId: number | undefined
+}> {
+ const res: any = await warehouseSearch({ keyword: itemCode })
+ const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success')
+ if (!ok) return { matched: null, detectedStoreId: undefined }
+
+ const list = (Array.isArray(res?.data) ? res.data : []).map(mapStockPickerItem)
+ const exactMatch = list.find((row: any) => getStockItemCode(row) === itemCode)
+ const fuzzyMatch = exactMatch || list.find((row: any) => String(row.item_id) === itemCode) || null
+ if (!fuzzyMatch) return { matched: null, detectedStoreId: undefined }
+
+ // 检查所有匹配项的 store_id 是否一致(store_id 在 store_stock 内)
+ const storeIds = new Set()
+ for (const row of list) {
+ const sid = Number(row.store_stock?.store_id ?? row.store_id)
+ if (Number.isFinite(sid) && sid > 0) storeIds.add(sid)
+ }
+ const detectedStoreId = storeIds.size === 1 ? storeIds.values().next().value : undefined
+ return { matched: fuzzyMatch, detectedStoreId }
+}
+
async function resolveMissingItemIdsForGroup(rows: ImportPreviewRow[]) {
const header = rows[0]
if (!header) return false
const orderLabel = String(header.delivery_order_code || '').trim() || `明细组 ${header._rowKey}`
- const storeId = Number(header.store_id)
- if (!Number.isFinite(storeId) || storeId <= 0) return false
+ let storeId = Number(header.store_id)
for (const row of rows) {
for (const item of row.selected_items) {
if (hasValidSelectedItemId(item)) continue
const itemCode = String(item.item_code || '').trim()
if (!itemCode) continue
- const matched = await lookupStockItemByCode(storeId, itemCode)
- if (!matched?.item_id) {
- ElMessage.warning(`订单「${orderLabel}」:商品「${itemCode}」未匹配到有效商品,请在右侧重新选择`)
- return false
+
+ if (Number.isFinite(storeId) && storeId > 0) {
+ const matched = await lookupStockItemByCode(storeId, itemCode)
+ if (!matched?.item_id) {
+ ElMessage.warning(`订单「${orderLabel}」:商品「${itemCode}」未匹配到有效商品,请在右侧重新选择`)
+ return false
+ }
+ item.item_id = matched.item_id
+ if (!item.item_name) item.item_name = matched.item_name
+ if (!item.item_code) item.item_code = matched.item_code
+ } else {
+ // 无货主:全库搜索,尝试自动推断货主
+ const { matched, detectedStoreId } = await lookupStockItemByCodeAcrossStores(itemCode)
+ if (!matched?.item_id) {
+ ElMessage.warning(`订单「${orderLabel}」:商品「${itemCode}」未匹配到有效商品,请在右侧重新选择`)
+ return false
+ }
+ item.item_id = matched.item_id
+ if (!item.item_name) item.item_name = matched.item_name
+ if (!item.item_code) item.item_code = matched.item_code
+ // 如果检测到唯一货主且行上还未设置,自动填入
+ if (detectedStoreId !== undefined && !header.store_id) {
+ storeId = detectedStoreId
+ for (const r of rows) r.store_id = detectedStoreId
+ }
}
- item.item_id = matched.item_id
- if (!item.item_name) item.item_name = matched.item_name
- if (!item.item_code) item.item_code = matched.item_code
}
}
return true
@@ -597,6 +693,43 @@ function resolvePreviewRowRegionCodes(row: Pick {
+ if (!String(item.item_code || '').trim()) return false
+ return !hasValidSelectedItemId(item)
+ })
+}
+
+function getRowIssues(row: ImportPreviewRow): string[] {
+ const issues: string[] = []
+ if (row._orderExists) issues.push('订单号已存在')
+ if (isRequiredFieldEmpty(row, 'store_id')) issues.push('货主未选择')
+ if (isRequiredFieldEmpty(row, 'name')) issues.push('收件人未填写')
+ if (isRequiredFieldEmpty(row, 'mobile') && isRequiredFieldEmpty(row, 'tel')) issues.push('手机号/电话未填写')
+ if (isRequiredFieldEmpty(row, 'province')) issues.push('省份未选择')
+ if (isRequiredFieldEmpty(row, 'city')) issues.push('城市未选择')
+ if (isRequiredFieldEmpty(row, 'area')) issues.push('区/县未选择')
+ if (isRequiredFieldEmpty(row, 'detail_address')) issues.push('详细地址未填写')
+ if (hasUnmatchedItems(row)) issues.push('商品未匹配')
+ return issues
+}
+
+function isRequiredFieldEmpty(row: ImportPreviewRow, field: string): boolean {
+ if (isPreviewRowLocked(row)) return false
+ switch (field) {
+ case 'store_id': return !row.store_id || !Number.isFinite(Number(row.store_id)) || Number(row.store_id) <= 0
+ case 'name': return !String(row.name || '').trim()
+ case 'mobile': return !String(row.mobile || '').trim()
+ case 'tel': return !String(row.tel || '').trim()
+ case 'province': return !String(row.province || '').trim()
+ case 'city': return !String(row.city || '').trim()
+ case 'area': return !String(row.area || '').trim()
+ case 'detail_address': return !String(row.detail_address || '').trim()
+ default: return false
+ }
+}
+
function isPreviewRowLocked(row: ImportPreviewRow) {
return row.import_status === '成功'
}
@@ -638,6 +771,49 @@ function selectPreviewRowInTable(row: ImportPreviewRow, selected = true) {
})
}
+function mergeDuplicateOrderRows(rows: ImportPreviewRow[]): ImportPreviewRow[] {
+ const map = new Map()
+ for (const row of rows) {
+ const code = String(row.delivery_order_code || '').trim()
+ if (!code) {
+ // 无订单号的行独立保留
+ map.set(row._rowKey, { ...row })
+ continue
+ }
+ const existing = map.get(code)
+ if (!existing) {
+ map.set(code, { ...row, selected_items: [...row.selected_items] })
+ } else {
+ // 合并商品明细
+ const mergedItems = [...existing.selected_items]
+ for (const item of row.selected_items) {
+ // 相同 item_code 累加数量,否则追加
+ const same = mergedItems.find((i) => i.item_code === item.item_code)
+ if (same) {
+ same.plan_qty = String(Number(same.plan_qty || 0) + Number(item.plan_qty || 0))
+ } else {
+ mergedItems.push({ ...item })
+ }
+ }
+ existing.selected_items = mergedItems
+ // 头信息取首行,空白字段用后续行补充
+ if (!existing.name && row.name) existing.name = row.name
+ if (!existing.mobile && row.mobile) existing.mobile = row.mobile
+ if (!existing.tel && row.tel) existing.tel = row.tel
+ if (!existing.detail_address && row.detail_address) existing.detail_address = row.detail_address
+ if (!existing.province && row.province) existing.province = row.province
+ if (!existing.city && row.city) existing.city = row.city
+ if (!existing.area && row.area) existing.area = row.area
+ if (!existing.province_code && row.province_code) existing.province_code = row.province_code
+ if (!existing.city_code && row.city_code) existing.city_code = row.city_code
+ if (!existing.area_code && row.area_code) existing.area_code = row.area_code
+ if (!existing.logistics_code && row.logistics_code) existing.logistics_code = row.logistics_code
+ if (!existing.sys_platform_code && row.sys_platform_code) existing.sys_platform_code = row.sys_platform_code
+ }
+ }
+ return Array.from(map.values())
+}
+
function getOrderGroupKey(row: ImportPreviewRow) {
const code = String(row.delivery_order_code || '').trim()
return code || row._rowKey
@@ -685,10 +861,39 @@ function resolveStoreId(raw: unknown): number | undefined {
})
if (byLabel) return Number(byLabel.value)
- if (Number.isFinite(numeric) && numeric > 0) return numeric
+ // 数值匹配不上或名称匹配不上时,返回空
return undefined
}
+async function loadImportSelectOptions() {
+ try {
+ const [expressRes, platformRes]: any = await Promise.all([
+ indexApi.getExpressList({}),
+ indexApi.getPlatformList({})
+ ])
+ const expressRaw = expressRes?.data?.list || expressRes?.data || []
+ const platformRaw = platformRes?.data?.list || platformRes?.data || []
+ importExpressOptions.value = mapCodeNameLabelOptions(expressRaw, ['code', 'express_code', 'value'], ['name', 'express_name', 'label'])
+ importPlatformOptions.value = mapCodeNameLabelOptions(platformRaw, ['code', 'platform_code', 'value'], ['name', 'platform_name', 'sys_platform_name', 'label'])
+ } catch {
+ importExpressOptions.value = []
+ importPlatformOptions.value = []
+ }
+}
+
+function mapCodeNameLabelOptions(rawList: any[], codeKeys: string[], nameKeys: string[]) {
+ const result: Array<{ label: string; value: string }> = []
+ const seen = new Set()
+ for (const item of rawList || []) {
+ const code = String(item?.[codeKeys.find((k) => item?.[k] !== undefined && item?.[k] !== null && item?.[k] !== '') || ''] ?? '').trim()
+ if (!code || seen.has(code)) continue
+ const name = String(item?.[nameKeys.find((k) => item?.[k] !== undefined && item?.[k] !== null && item?.[k] !== '') || ''] ?? '').trim()
+ result.push({ value: code, label: name ? `${code} (${name})` : code })
+ seen.add(code)
+ }
+ return result
+}
+
function handleDefaultStoreChange() {
if (!defaultStoreId.value) return
importPreviewRows.value.forEach((row) => {
@@ -817,7 +1022,7 @@ function buildPreviewRow(row: Record, rowNo: number): ImportPreview
'发货单号'
]))
const storeRaw = pickImportValue(row, ['*货主ID', '货主ID*', '货主ID', 'store_id', '货主', '*货主', '货主*'])
- const name = toImportString(pickImportValue(row, ['*收件人', '收件人*', '收件人', 'name']))
+ const name = toImportString(pickImportValue(row, ['*收件人', '收件人*', '收件人', '收件人姓名', '*收件人姓名', '姓名', '收货人', 'name']))
const itemCode = toImportString(pickImportValue(row, ['*商品编码', '商品编码*', '商品编码', 'item_code']))
const planQty = toImportString(pickImportValue(row, ['*计划数量', '计划数量*', '计划数量', 'plan_qty']))
const storeId = resolveStoreId(storeRaw)
@@ -838,7 +1043,7 @@ function buildPreviewRow(row: Record, rowNo: number): ImportPreview
delivery_order_code: deliveryOrderCode,
store_id: storeId,
name,
- mobile: toImportString(pickImportValue(row, ['手机号', 'mobile'])),
+ mobile: toImportString(pickImportValue(row, ['手机号', '手机', '手机号码', '*手机号', '*手机号(mobile/tel至少填一项)', '联系电话', '联系方式', 'mobile'])),
tel: toImportString(pickImportValue(row, ['电话', 'tel'])),
detail_address: toImportString(pickImportValue(row, ['*详细地址', '详细地址*', '详细地址', 'detail_address'])),
province,
@@ -881,23 +1086,114 @@ async function parseImportPreviewFromFile(file: File) {
}
const rawRows = XLSX.utils.sheet_to_json>(sheet, { defval: '' })
+ console.log('【Excel导入】原始行数据(前3行):', rawRows.slice(0, 3).map((r: any) => {
+ const keys = Object.keys(r)
+ return { keys, sample: keys.slice(0, 8).map(k => `${k}=${r[k]}`) }
+ }))
const previewRows: ImportPreviewRow[] = []
for (let index = 0; index < rawRows.length; index += 1) {
const previewRow = buildPreviewRow(rawRows[index] || {}, index + 1)
if (previewRow) previewRows.push(previewRow)
}
- importPreviewRows.value = previewRows
+ // 合并相同订单号的行
+ const mergedRows = mergeDuplicateOrderRows(previewRows)
+ importPreviewRows.value = mergedRows
renumberPreviewRows()
- if (!previewRows.length) {
+ if (!mergedRows.length) {
ElMessage.warning('未解析到有效明细行,可手动添加明细')
return
}
- const firstRow = previewRows[0]
+
+ // 省市区为空时自动地址智能识别(逐个订单串行执行避免并发)
+ for (const row of mergedRows) {
+ if (String(row.province || '').trim() && String(row.city || '').trim() && String(row.area || '').trim()) {
+ continue
+ }
+ const address = String(row.detail_address || '').trim()
+ if (!address) continue
+ try {
+ const res: any = await orderPendingOrderParseAddress({ address })
+ const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success')
+ if (!ok) continue
+ const data = extractPendingOrderParseAddressData(res)
+ if (data) {
+ if (data.province) row.province = String(data.province).trim()
+ if (data.city) row.city = String(data.city).trim()
+ if (data.area) row.area = String(data.area).trim()
+ if (data.detailAddress) row.detail_address = String(data.detailAddress).trim()
+ if (data.name && !row.name) row.name = String(data.name).trim()
+ if (data.mobile && !row.mobile) row.mobile = String(data.mobile).trim()
+ const regionCodes = resolvePreviewRowRegionCodes({ province: row.province, city: row.city, area: row.area })
+ if (regionCodes.provinceCode) row.province_code = regionCodes.provinceCode
+ if (regionCodes.cityCode) row.city_code = regionCodes.cityCode
+ if (regionCodes.districtCode) row.area_code = regionCodes.districtCode
+ }
+ } catch {
+ // 解析失败不影响导入
+ }
+ }
+
+ // 订单号预检查:查询系统中是否已存在相同订单号
+ const orderCodesToCheck = mergedRows
+ .map((r) => String(r.delivery_order_code || '').trim())
+ .filter(Boolean)
+ if (orderCodesToCheck.length) {
+ try {
+ const existRes: any = await orderList({ where: { delivery_order_code: orderCodesToCheck } })
+ const existOk = existRes && (existRes.code === 1 || existRes.code === 200 || existRes.flag === 'success')
+ if (existOk) {
+ const existList = Array.isArray(existRes?.data?.list) ? existRes.data.list : []
+ const existCodeSet = new Set(existList.map((o: any) => String(o.delivery_order_code || '').trim()).filter(Boolean))
+ for (const row of mergedRows) {
+ const code = String(row.delivery_order_code || '').trim()
+ if (code && existCodeSet.has(code)) {
+ row._orderExists = true
+ }
+ }
+ }
+ } catch {
+ // 检查失败不影响导入
+ }
+ }
+
+ // 自动匹配商品(按 item_code 查询并填充 item_id)
+ for (const row of mergedRows) {
+ let storeId = Number(row.store_id)
+ for (const item of row.selected_items) {
+ if (hasValidSelectedItemId(item)) continue
+ const itemCode = String(item.item_code || '').trim()
+ if (!itemCode) continue
+ try {
+ if (Number.isFinite(storeId) && storeId > 0) {
+ const matched = await lookupStockItemByCode(storeId, itemCode)
+ if (matched?.item_id) {
+ item.item_id = matched.item_id
+ if (!item.item_name) item.item_name = matched.item_name
+ }
+ } else {
+ // 无货主:全库搜索,尝试自动推断货主
+ const { matched, detectedStoreId } = await lookupStockItemByCodeAcrossStores(itemCode)
+ if (matched?.item_id) {
+ item.item_id = matched.item_id
+ if (!item.item_name) item.item_name = matched.item_name
+ if (detectedStoreId !== undefined && !row.store_id) {
+ row.store_id = detectedStoreId
+ storeId = detectedStoreId
+ }
+ }
+ }
+ } catch {
+ // 匹配失败不影响导入
+ }
+ }
+ }
+
+ const firstRow = mergedRows[0]
if (firstRow) {
void selectPreviewRow(firstRow)
}
- ElMessage.success(`已解析 ${previewRows.length} 行,请确认货主与明细后批量创建`)
+ ElMessage.success(`已解析 ${mergedRows.length} 个订单,请确认货主与明细后批量创建`)
} catch (error) {
console.error('parse import excel failed:', error)
importPreviewRows.value = []
@@ -1136,6 +1432,30 @@ async function submitImportOrders() {
ElMessage.warning('请先选择 Excel 或添加明细')
return
}
+
+ // 省市区为空时,自动使用详细地址做地址智能识别
+ const groupsBeforeValidate = groupPendingRowsByOrder()
+ for (const [, rows] of groupsBeforeValidate) {
+ const header = rows[0]
+ if (!header) continue
+ if (String(header.province || '').trim() && String(header.city || '').trim() && String(header.area || '').trim()) {
+ continue
+ }
+ const address = String(header.detail_address || '').trim()
+ if (!address) continue
+ try {
+ const res: any = await orderPendingOrderParseAddress({ address })
+ const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success')
+ if (!ok) continue
+ const data = extractPendingOrderParseAddressData(res)
+ for (const row of rows) {
+ applyParsedAddressToRow(row, data)
+ }
+ } catch {
+ // 解析失败不影响提交流程
+ }
+ }
+
if (!validatePreviewRowsBeforeSubmit()) return
const groups = groupPendingRowsByOrder()
@@ -1319,6 +1639,8 @@ function getStockItemCode(row: any) {
margin-bottom: 10px;
}
+
+
.batch-import-toolbar {
display: flex;
align-items: center;
@@ -1331,6 +1653,51 @@ function getStockItemCode(row: any) {
width: 180px;
}
+.issue-indicator {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.issue-text {
+ display: inline-block;
+ background: #f56c6c;
+ color: #fff;
+ font-size: 11px;
+ line-height: 1.4;
+ padding: 0 4px;
+ border-radius: 2px;
+ cursor: pointer;
+ white-space: nowrap;
+}
+
+.unmatched-tip {
+ color: #f56c6c;
+ font-size: 11px;
+ margin-left: 2px;
+ white-space: nowrap;
+}
+
+:deep(.el-table__body tr.current-row > td) {
+ background-color: #d1e9ff !important;
+}
+:deep(.el-table__body tr.current-row:hover > td) {
+ background-color: #b7e0ff !important;
+}
+
+:deep(.cell-required-empty) {
+ .el-input__wrapper,
+ .el-select__wrapper {
+ box-shadow: 0 0 0 1px #f56c6c inset !important;
+ }
+ .el-input__inner::placeholder {
+ color: #f56c6c;
+ }
+ .el-button {
+ box-shadow: 0 0 0 1px #f56c6c !important;
+ border-radius: 2px;
+ }
+}
+
.picker-hint {
color: #606266;
font-size: 12px;
diff --git a/src/views/order/orderManagement/component/OrderDetailPanel.vue b/src/views/order/orderManagement/component/OrderDetailPanel.vue
index 2457e896..d1f1cc2e 100644
--- a/src/views/order/orderManagement/component/OrderDetailPanel.vue
+++ b/src/views/order/orderManagement/component/OrderDetailPanel.vue
@@ -42,7 +42,7 @@ const props = defineProps<{
const needTranslateFields = new Set([
'status',
- 'inspection_status',
+ 'recheck_status',
'is_urgency',
'sync_status',
'invoice_flag',
diff --git a/src/views/store/store-config.ts b/src/views/store/store-config.ts
index fcbf5088..a3893d7b 100644
--- a/src/views/store/store-config.ts
+++ b/src/views/store/store-config.ts
@@ -168,8 +168,8 @@ export const qimenTableColumns = [
export const columns = [
- { prop: 'counterparty_name', label: '对方主体', Width: 90 },
- { prop: 'current_subject_role', label: '当前角色', width: 90, align: 'center' },
+ { prop: 'store_id', label: '货主ID', width: 90 },
+ { prop: 'counterparty_name', label: '货主', minWidth: 120 },
{ prop: 'auth_status', label: '签约状态', width: 100, align: 'center' },
{ prop: 'use_status', label: '使用状态', width: 90, align: 'center' },
{ prop: 'print_quantity', label: '面单余额', width: 100, align: 'center' },