This commit is contained in:
yin 2026-08-18 18:11:42 +08:00
parent 916aa4444c
commit 8839bbc601
24 changed files with 307 additions and 37 deletions

View File

@ -12,7 +12,7 @@ const v = '1.0'
export type AfterSaleType = 'order' | 'receiving' | 'entry' | 'stockout'
/** 售后状态 */
export type AfterSaleStatus = 'pending' | 'processing' | 'completed' | 'closed' | 'cancelled'
export type AfterSaleStatus = 'pending' | 'pending_feedback' | 'processing' | 'completed' | 'closed' | 'cancelled'
/** 角色组 */
export type AfterSaleRoleGroup = 'customer_service' | 'warehouse' | 'finance'
@ -291,6 +291,16 @@ export interface AfterSaleHandleWorkOrderParams {
attachment_ids?: number[]
}
/** afterSale.handleWorkOrder 响应 */
export interface AfterSaleHandleWorkOrderResponse {
/** 本次写入的步骤ID(wms_after_sale_detail.id) */
detail_id: number
/** 售后工单ID */
after_sale_id: number
/** 处理备注发送到的货主售后群数量(未填写备注或未找到货主售后群时为0) */
notified_groups?: number
}
/** 登记理赔参数 */
export interface AfterSaleRegisterClaimParams {
id: number
@ -439,7 +449,9 @@ export function afterSaleTransfer(data: AfterSaleTransferParams) {
}
/** 2.7 处理工单 afterSale.handleWorkOrder */
export function afterSaleHandleWorkOrder(data: AfterSaleHandleWorkOrderParams) {
export function afterSaleHandleWorkOrder(
data: AfterSaleHandleWorkOrderParams
): Promise<AfterSaleHandleWorkOrderResponse> {
return request({
url: '/system',
method: 'post',

View File

@ -968,6 +968,7 @@ export type WaveSingleFetchByIdsResponse = {
fetched_order_ids: Array<number>
fetched_order_count: number
excluded_existing_wave_order_ids?: Array<number>
excluded_locked_order_ids?: Array<number>
skipped_order_ids?: Array<number>
not_found_order_ids?: Array<number>
}

View File

@ -96,6 +96,10 @@ export type ExpressInterfaceUpdateParams = {
is_enabled?: number
/** 发件人详细地址,使用 index.getShopExpressList 返回的 detail 字段值 */
address?: string
province_name?: string
city_name?: string
district_name?: string
town_name?: string
}
export function expressInterfaceUpdate(data: ExpressInterfaceUpdateParams & Record<string, any>) {

View File

@ -79,10 +79,52 @@ export function storeWarehouseSign(data: {
} as any)
}
/** 货主确认签约 */
export function storeWarehouseConfirmSign(data: {
/** storeWarehouse.store.confirmSign 响应中的签约关系精简对象 */
export interface StoreWarehouseConfirmSignContract {
/** 签约关系主键 ID */
id: number
}) {
/** 货主方主体 ID */
store_id: number
/** 仓库方主体 ID */
warehouse_id: number
/** 对方主体名称 */
counterparty_name: string
/** 当前主体视角的签约备注名 */
remask: string
/** 当前主体启用状态:0=禁用 1=启用 */
use_status: number
/** 签约状态:1=申请中 2=已通过 3=已拒绝 4=已解除 5=已过期 */
auth_status: number
/** 签约状态中文标签 */
auth_status_label: string
/** 授权结束时间 */
auth_end: string | null
/** 面单余额数量 */
print_quantity: number
/** 是否已配置奇门 */
has_qimen_config: boolean
}
/** storeWarehouse.store.confirmSign 响应数据 */
export interface StoreWarehouseConfirmSignData {
/** 确认模式标识,固定为 confirm */
mode: string
/** 签约关系精简对象 */
contract: StoreWarehouseConfirmSignContract
}
/** storeWarehouse.store.confirmSign 响应(含请求封装层) */
export interface StoreWarehouseConfirmSignResponse {
flag?: string
code?: number
message?: string
data?: StoreWarehouseConfirmSignData
}
/** 货主确认签约 */
export function storeWarehouseConfirmSign(
data: { id: number }
): Promise<StoreWarehouseConfirmSignResponse> {
return request({
url: '/system',
method: 'post',

View File

@ -21,3 +21,40 @@ export function storeWarehouseWarehouseList(data: {
isSystemApi: true
} as any)
}
/**
* 仓库侧发起签约(当前仓库在 store_id 方,对方在 warehouse_id 方,支持签约外部合作仓库)
* - counterparty_id:对方主体 ID(必传,兼容 warehouse_id / store_id)
*/
export function storeWarehouseWarehouseSign(data: {
counterparty_id: number
}) {
return request({
url: '/system',
method: 'post',
params: {
method: 'storeWarehouse.warehouse.sign',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}
/** 仓库侧确认签约:作为对方主体确认待签约申请,签约状态从 1(申请中)变为 2(已通过) */
export function storeWarehouseWarehouseConfirmSign(data: {
id: number
}) {
return request({
url: '/system',
method: 'post',
params: {
method: 'storeWarehouse.warehouse.confirmSign',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}

BIN
src/cloc-2.10.exe Normal file

Binary file not shown.

View File

@ -77,6 +77,7 @@
:close-on-click-modal="false"
width="50%"
@close="handleDialogClose"
align-center
>
<component
v-if="currentComponent"

View File

@ -1,6 +1,6 @@
<template>
<div>
<el-form ref="formRef" :model="form" :rules="rules" label-width="120px" label-position="right" size="default">
<el-form ref="formRef" :model="form" :rules="rules" label-width="120px" label-position="right" size="default" align-center >
<el-form-item label="公司全称" prop="company_name">
<el-input v-model="form.company_name" placeholder="请输入公司全称" clearable style="width: 100%" />

View File

@ -52,7 +52,7 @@ export interface FieldDefinition {
key: string
label: string
scanBox: {
type: 'text' | 'select' | 'daterange' | 'number'
type: 'text' | 'select' | 'daterange' | 'datetimerange' | 'number'
group?: string
options?: { label: string; value: any }[]
multiple?: boolean

View File

@ -121,8 +121,11 @@ export const COMMON_TRANSLATIONS: Record<string, Record<string, string>> = {
'error': '错误'
},
lock_status: {
N: '未锁定',
Y: '已锁定',
none: '未锁定',
warehouse: '仓库锁定'
warehouse: '已锁定',
store: '已锁定'
},
claim_status: {
none: '未认领',
@ -241,8 +244,11 @@ export const COMMON_TAG_TYPES: Record<string, Record<string, string>> = {
'error': 'danger'
},
lock_status: {
N: 'info',
Y: 'warning',
none: 'info',
warehouse: 'warning'
warehouse: 'warning',
store: 'warning'
},
claim_status: {
none: 'info',
@ -1554,6 +1560,7 @@ export const reviewAvailableFields = [
// 流程状态
{ ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...lockStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...orderStatusScanField(reviewOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP },
// 收货信息
{ ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP },
@ -1577,6 +1584,7 @@ export const reviewColums = applyOrderListCopyActions([
{ prop: 'name', label: '收件人', width: '110' },
{ prop: 'sync_status', label: '同步状态', width: '100' },
{ prop: 'recheck_status', label: '复核状态', width: '100' },
{ prop: 'lock_status', label: '锁定状态', width: '100' },
{ prop: 'is_urgency', label: '是否紧急', width: '80' },
{ prop: 'logistics_name', label: '快递', width: '120' },
{ prop: 'items_total', label: '商品总数', width: '100' },
@ -1717,6 +1725,7 @@ export const pendingAvailableFields = [
{ ...pickStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...packStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...lockStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...orderStatusScanField(pendingOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP },
// 收货信息
{ ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP },
@ -1750,6 +1759,7 @@ export const pendingCloums = [
{ prop: 'pick_status', label: '拣货状态', width: '100' },
{ prop: 'pack_status', label: '打包状态', width: '100' },
{ prop: 'intercept_status', label: '拦截状态', width: '100', tag: true },
{ prop: 'lock_status', label: '锁定状态', width: '100' },
{ prop: 'express_numbers', label: '快递单号', width: '160', formatter: waybillCodesFormatter },
{ prop: 'items_count', label: '商品种类', width: '100' },
{ prop: 'items_total', label: '商品总数', width: '100' },
@ -2082,6 +2092,7 @@ export const expectionOrderAvailableFields = [
{ ...interceptStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...lockStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...orderStatusScanField(exceptionOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP },
// 收货信息
{ ...buyerMessageHasScanField, group: SCAN_RECEIVING_INFO_GROUP },
@ -2105,6 +2116,7 @@ export const expectionColumns = [
{ prop: 'pick_status', label: '拣货状态', width: '100' },
{ prop: 'pack_status', label: '打包状态', width: '100' },
{ prop: 'intercept_status', label: '拦截状态', width: '100', tag: true },
{ prop: 'lock_status', label: '锁定状态', width: '100' },
{ prop: 'express_numbers', label: '运单号', width: '160', formatter: waybillCodesFormatter },
{ prop: 'name', label: '收件人', width: '110' },
{ prop: 'mobile', label: '电话', width: '120' },

View File

@ -110,6 +110,12 @@
</el-tag>
</template>
<template #column-lock_status="{ row }">
<el-tag :type="getTagType('lock_status', row.lock_status)" size="small">
{{ translateOrderField('lock_status', row.lock_status) }}
</el-tag>
</template>
<template #column-order_flag="{ row }">
<el-tooltip
:content="orderFlagFullText(row)"

View File

@ -102,6 +102,12 @@
</el-tag>
</template>
<template #column-lock_status="{ row }">
<el-tag :type="getTagType('lock_status', row.lock_status)" size="small">
{{ translateOrderField('lock_status', row.lock_status) }}
</el-tag>
</template>
<template #column-sync_status="{ row }">
<el-tag :type="getTagType('sync_status', row.sync_status)" size="small">
{{ translateOrderField('sync_status', row.sync_status) }}

View File

@ -75,6 +75,12 @@
</el-tag>
</template>
<template #column-lock_status="{ row }">
<el-tag :type="getTagType('lock_status', row.lock_status)" size="small">
{{ translateOrderField('lock_status', row.lock_status) }}
</el-tag>
</template>
<template #column-is_urgency="{ row }">
<el-tag :type="getTagType('is_urgency', row.is_urgency)" size="small">
{{ translateOrderField('is_urgency', row.is_urgency) }}

View File

@ -695,11 +695,15 @@ export function createPendingToolbarController(params: {
Number.isFinite(fetched) && fetched >= 0 ? `已抓取 ${fetched} 单` : ''
]
const excluded = payload?.excluded_existing_wave_order_ids
const excludedLocked = payload?.excluded_locked_order_ids
const skipped = payload?.skipped_order_ids
const notFound = payload?.not_found_order_ids
if (Array.isArray(excluded) && excluded.length) {
parts.push(`已在波次中跳过 ${excluded.length} 单`)
}
if (Array.isArray(excludedLocked) && excludedLocked.length) {
parts.push(`已锁定跳过 ${excludedLocked.length} 单`)
}
if (Array.isArray(skipped) && skipped.length) {
parts.push(`跳过 ${skipped.length} 单`)
}

View File

@ -57,7 +57,7 @@
<div class="toolbar-left">
<el-button size="small" type="primary" :loading="loading" @click="loadList">刷新</el-button>
<el-button size="small" type="success" @click="openWeighingForm">运单称重</el-button>
<el-tag size="small" type="info">共 {{ pagination.total }} 条</el-tag>
<!-- <el-tag size="small" type="info">共 {{ pagination.total }} 条</el-tag> -->
</div>
<el-input
v-model="filterWaybill"

View File

@ -1061,6 +1061,7 @@ const batchAllocateExpressTaskProgress = reactive({
totalCount: 0,
successCount: 0,
failedCount: 0,
skippedLockedCount: 0,
progressPercent: 0,
durationMs: 0,
updateTime: '',
@ -2320,6 +2321,9 @@ function applyBatchAllocateExpressTaskProgress(progress: Partial<WaveBatchAlloca
?? batchAllocateExpressTaskProgress.failedCount
?? 0
)
batchAllocateExpressTaskProgress.skippedLockedCount = Array.isArray(progress.skipped_locked_order_ids)
? progress.skipped_locked_order_ids.length
: Number(progress.skipped_locked_count ?? batchAllocateExpressTaskProgress.skippedLockedCount ?? 0)
batchAllocateExpressTaskProgress.progressPercent = Number(progress.progress_percent ?? batchAllocateExpressTaskProgress.progressPercent ?? 0)
batchAllocateExpressTaskProgress.durationMs = Number(progress.duration_ms ?? batchAllocateExpressTaskProgress.durationMs ?? 0)
batchAllocateExpressTaskProgress.updateTime = String(progress.update_time || '')
@ -2333,6 +2337,7 @@ function resetBatchAllocateExpressTaskProgress() {
batchAllocateExpressTaskProgress.totalCount = 0
batchAllocateExpressTaskProgress.successCount = 0
batchAllocateExpressTaskProgress.failedCount = 0
batchAllocateExpressTaskProgress.skippedLockedCount = 0
batchAllocateExpressTaskProgress.progressPercent = 0
batchAllocateExpressTaskProgress.durationMs = 0
batchAllocateExpressTaskProgress.updateTime = ''
@ -3904,11 +3909,15 @@ async function submitFallbackOrderFetchByIds() {
Number.isFinite(fetched) && fetched >= 0 ? `已抓取 ${fetched} 单` : ''
]
const excluded = payload?.excluded_existing_wave_order_ids
const excludedLocked = payload?.excluded_locked_order_ids
const skipped = payload?.skipped_order_ids
const notFound = payload?.not_found_order_ids
if (Array.isArray(excluded) && excluded.length) {
parts.push(`已在波次中跳过 ${excluded.length} 单`)
}
if (Array.isArray(excludedLocked) && excludedLocked.length) {
parts.push(`已锁定跳过 ${excludedLocked.length} 单`)
}
if (Array.isArray(skipped) && skipped.length) {
parts.push(`跳过 ${skipped.length} 单`)
}

View File

@ -632,6 +632,7 @@ const batchAllocateExpressTaskProgress = reactive({
totalCount: 0,
successCount: 0,
failedCount: 0,
skippedLockedCount: 0,
progressPercent: 0,
durationMs: 0,
updateTime: '',
@ -1807,6 +1808,9 @@ function applyBatchAllocateExpressTaskProgress(progress: Partial<WaveBatchAlloca
?? batchAllocateExpressTaskProgress.failedCount
?? 0
)
batchAllocateExpressTaskProgress.skippedLockedCount = Array.isArray(progress.skipped_locked_order_ids)
? progress.skipped_locked_order_ids.length
: Number(progress.skipped_locked_count ?? batchAllocateExpressTaskProgress.skippedLockedCount ?? 0)
batchAllocateExpressTaskProgress.progressPercent = Number(progress.progress_percent ?? batchAllocateExpressTaskProgress.progressPercent ?? 0)
batchAllocateExpressTaskProgress.durationMs = Number(progress.duration_ms ?? batchAllocateExpressTaskProgress.durationMs ?? 0)
batchAllocateExpressTaskProgress.updateTime = String(progress.update_time || '')
@ -1820,6 +1824,7 @@ function resetBatchAllocateExpressTaskProgress() {
batchAllocateExpressTaskProgress.totalCount = 0
batchAllocateExpressTaskProgress.successCount = 0
batchAllocateExpressTaskProgress.failedCount = 0
batchAllocateExpressTaskProgress.skippedLockedCount = 0
batchAllocateExpressTaskProgress.progressPercent = 0
batchAllocateExpressTaskProgress.durationMs = 0
batchAllocateExpressTaskProgress.updateTime = ''

View File

@ -19,6 +19,7 @@
<span>状态:{{ statusText }}</span>
<span>{{ successCountLabel }}:{{ progress.successCount }} / {{ progress.totalCount }}</span>
<span>{{ failedCountLabel }}:{{ progress.failedCount }}</span>
<span v-if="progress.skippedLockedCount">跳过锁定:{{ progress.skippedLockedCount }}</span>
<span v-if="progress.updateTime">更新时间:{{ formattedUpdateTime }}</span>
</div>
<div v-if="progress.message || progress.error" class="task-progress-panel__message">
@ -38,6 +39,7 @@ export interface WaveBatchTaskProgressViewModel {
totalCount: number
successCount: number
failedCount: number
skippedLockedCount?: number
progressPercent: number
durationMs: number
updateTime: string

View File

@ -119,6 +119,16 @@
</template>
</div>
</div>
<batch-receiving-print-dialog
v-model="printDialogVisible"
:selection-rows="selectionRows"
business-type="STOCKOUT"
dialog-title="批量打印出库单"
queue-no-field="stockout_order_code"
document-label="出库单"
:fetch-print-data="fetchPrintData"
/>
</div>
</template>
@ -128,6 +138,7 @@ import { useRoute } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import BatchReceivingPrintDialog from '@/components/BatchReceivingPrintDialog.vue'
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import { safeInvoke } from '@/utils/safe-invoke'
@ -142,6 +153,7 @@ import {
syncStatusConfig,
stockoutToolbarButtons,
formatStockoutData,
formatStockoutListItems,
} from './stockout-config'
import stockoutdetail from './component/stockoutdetail.vue'
@ -207,6 +219,7 @@ const columns = ref(entryColums)
const selectionRows = ref<any[]>([])
const hasSelection = ref(false)
const selectedStockoutId = ref<number | string | null>(null)
const printDialogVisible = ref(false)
// ── 工具栏状态 ──
const buttonLoadingMap = computed(() => ({
@ -253,6 +266,7 @@ const toolbarActionMap: Record<string, () => void> = {
toggleDetailVisible: () => toggleDetailVisible(),
handleCreateStockout: () => handleCreateStockout(),
handleImport: () => handleImport(),
handleOpenPrintDialog: () => { void handleOpenPrintDialog() },
confirmBatchCancel: () => { void confirmBatchCancel() }
}
@ -403,6 +417,74 @@ function onSelectionChange(rows: any[]) {
hasSelection.value = selectionRows.value.length > 0
}
// ── 打印出库单 ──
async function handleOpenPrintDialog() {
if (!selectionRows.value.length) {
ElMessage.warning('请先选择要打印的出库单')
return
}
// 仅“已完成”状态的出库单可打印
const invalidRows = selectionRows.value.filter(
row => String(row.order_status || '').toUpperCase() !== 'COMPLETED'
)
if (invalidRows.length > 0) {
ElMessage.warning(`只有“已完成”状态的单据才能打印。当前选中包含 ${invalidRows.length} 个非已完成单据。`)
return
}
printDialogVisible.value = true
}
async function fetchPrintData(row: any, _index: number) {
const formData: any = {
stockout_order_code: row.stockout_order_code || '',
express_code: row.express_code || '',
express_codes: row.express_codes || '',
order_type: row.order_type || '',
source_type: row.source_type || '',
order_status: row.order_status || '',
sync_status: row.sync_status || '',
store_name: row.store_name || row['store.remask'] || row['store.store_remask'] || '',
total_order_lines: row.total_order_lines ?? '',
remark: row.remark || '',
order_create_time: row.order_create_time || '',
created_at: row.created_at || '',
updated_at: row.updated_at || '',
details: []
}
try {
const res: any = await stockoutApi.stockoutListItems({ id: Number(row.id) })
if (res && (res.code === 200 || res.code === 1 || res.flag === 'success')) {
const payload = res.data || res
const order = payload.order || {}
const rows = Array.isArray(payload.list)
? payload.list
: Array.isArray(payload.items)
? payload.items
: []
formData.details = formatStockoutListItems(rows)
Object.assign(formData, {
stockout_order_code: order.stockout_order_code || formData.stockout_order_code,
express_code: order.express_code ?? formData.express_code,
express_codes: order.express_codes ?? formData.express_codes,
order_type: order.order_type ?? formData.order_type,
source_type: order.source_type ?? formData.source_type,
order_status: order.order_status ?? formData.order_status,
store_name: order.store_name ?? formData.store_name,
total_order_lines: order.total_order_lines ?? formData.total_order_lines,
remark: order.remark ?? formData.remark,
order_create_time: order.order_create_time ?? formData.order_create_time
})
}
} catch (e) {
console.error('加载出库单打印明细失败', e)
}
return formData
}
// 将 scan-box 返回的条件标准化为后端推荐结构:{ operator, value, type }
function normalizeToWhere(condition: any) {
if (!condition) return {}

View File

@ -42,6 +42,14 @@ export const stockoutToolbarButtons: ToolbarButtonConfig[] = [
size: 'small',
action: 'handleImport'
},
{
key: 'print',
label: '打印出库单',
category: 'action',
size: 'small',
disabledKey: 'hasNoSelection',
action: 'handleOpenPrintDialog'
},
{
key: 'batchCancel',
label: '批量作废',
@ -145,9 +153,14 @@ export const entryColums = [
{ prop: 'stockout_order_code', label: '出库单号', width: '220', fixed: 'left', copyAction: 'copy' as const },
{ prop: 'order_status', label: '出库状态', width: '100' },
{ prop: 'sync_status', label: '同步状态', width: '100' },
{ prop: 'sync_message', label: '同步消息', minWidth: '140', showOverflowTooltip: true },
{ prop: 'order_type', label: '单据类型', width: '100' },
{ prop: 'source_type', label: '来源类型', width: '100' },
{ prop: 'express_code', label: '运单号', width: '120' },
{ prop: 'qimen_owner_code', label: '奇门货主编码', width: '140' },
{ prop: 'qimen_warehouse_code', label: '奇门仓库编码', width: '140' },
{ prop: 'express_codes', label: '运单号', width: '140' },
{ prop: 'express_code', label: '快递编码', width: '110' },
{ prop: 'express_name', label: '快递名称', width: '110' },
{ prop: 'total_order_lines', label: '订单行数', width: '90' },
{ prop: 'remark', label: '备注', minWidth: '150' },
{ prop: 'order_create_time', label: '下单时间', width: '160', sortable: true, formatter: (row: any) => formatDateTime(row.order_create_time) },

View File

@ -461,8 +461,8 @@ async function handleConfirmSign(row: any) {
)
} catch { return }
try {
const res = await storeWarehouseConfirmSign({ id: row.id }) as any
if (res?.flag === 'success' || res?.code === 200) {
const res = await storeWarehouseConfirmSign({ id: row.id })
if (res?.flag === 'success' || res?.code === 200 || res?.data?.mode === 'confirm') {
ElMessage.success('签约已确认')
loadList()
} else {

View File

@ -72,7 +72,7 @@
</el-tag>
</template>
<template #column-needs_my_confirm="{ row }">
<el-tag v-if="row.needs_my_confirm" size="small" type="warning" effect="dark">待我确认</el-tag>
<el-tag v-if="row.auth_status === 1" size="small" type="warning" effect="dark">待我确认</el-tag>
<span v-else class="text-muted">—</span>
</template>
<template #column-use_status="{ row }">
@ -108,7 +108,7 @@
<template #column-actions="{ row }">
<div class="wave-operation-actions">
<el-button
v-if="row.needs_my_confirm"
v-if="row.auth_status === 1"
size="small"
type="warning"
link
@ -1520,12 +1520,12 @@ async function handleConfirmSign(row: any) {
return
}
try {
const res = await storeWarehouseConfirmSign({ id: row.id }) as any
if (res?.flag === 'success' || res?.code === 200) {
const res = await storeWarehouseConfirmSign({ id: row.id })
if (res?.flag === 'success' || res?.code === 200 || res?.data?.mode === 'confirm') {
ElMessage.success('签约已确认')
loadList()
if (selectedRow.value && selectedRow.value.id === row.id) {
selectedRow.value.needs_my_confirm = false
if (selectedRow.value && selectedRow.value.id === row.id && res.data?.contract) {
Object.assign(selectedRow.value, res.data.contract)
}
} else {
ElMessage.error(res?.message || '确认签约失败')

View File

@ -364,29 +364,36 @@
</el-col>
<el-col v-if="dialogMode === 'create' || showRegionField" :span="24">
<el-form-item label="省市区">
<el-form-item label="省市区/乡镇">
<el-row :gutter="8" class="region-display-row">
<el-col :span="8">
<el-col :span="6">
<el-input
v-model="formData.province_name"
readonly
placeholder="省"
/>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-input
v-model="formData.city_name"
readonly
placeholder="市"
/>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-input
v-model="formData.district_name"
readonly
placeholder="区/县"
/>
</el-col>
<el-col :span="6">
<el-input
v-model="formData.town_name"
readonly
placeholder="镇/街道"
/>
</el-col>
</el-row>
</el-form-item>
</el-col>
@ -1566,6 +1573,7 @@ function applyAddressRaw(raw?: Record<string, any>) {
formData.province_name = ''
formData.city_name = ''
formData.district_name = ''
formData.town_name = ''
formData.address = ''
return
}
@ -1578,6 +1586,7 @@ function applyAddressRaw(raw?: Record<string, any>) {
formData.province_name = String(raw?.province || '').trim()
formData.city_name = String(raw?.city || '').trim()
formData.district_name = String(raw?.district || '').trim()
formData.town_name = String(raw?.town ?? raw?.town_name ?? '').trim()
formData.address = resolveExpressInterfaceAddress(raw)
}

View File

@ -8,7 +8,7 @@
:auto-submit="false"
:preset-tree="presetTree"
:available-fields="availableFields"
:initial-conditions="{ store_use_status: 1 }"
:initial-conditions="{ use_status: 1 }"
@condition-change="handleConditionChange"
@reset="handleReset"
@condition-clear="handleConditionClear"
@ -61,6 +61,18 @@
class="real-name"
>({{ row.counterparty_name }})</span>
</template>
<template #column-store_name="{ row }">
<span>{{ row.remask || row.store_name || '—' }}</span>
<span
v-if="row.remask && row.store_name && row.remask !== row.store_name"
class="real-name"
>({{ row.store_name }})</span>
</template>
<template #column-counterparty_role="{ row }">
<el-tag size="small" :type="row.counterparty_role === 'warehouse' ? 'primary' : 'warning'" effect="light">
{{ row.counterparty_role === 'warehouse' ? '仓库方' : '货主方' }}
</el-tag>
</template>
<template #column-auth_status="{ row }">
<el-tag size="small" :type="getAuthStatusType(row.auth_status)" effect="light">
{{ row.auth_status_label || getAuthStatusLabel(row.auth_status) }}
@ -70,9 +82,9 @@
<el-tag v-if="row.needs_my_confirm" size="small" type="warning" effect="dark">待我确认</el-tag>
<span v-else class="text-muted">—</span>
</template>
<template #column-store_use_status="{ row }">
<el-tag size="small" :type="row.store_use_status === 1 ? 'success' : 'info'" effect="light">
{{ row.store_use_status === 1 ? '启用' : '禁用' }}
<template #column-use_status="{ row }">
<el-tag size="small" :type="row.use_status === 1 ? 'success' : 'info'" effect="light">
{{ row.use_status === 1 ? '启用' : '禁用' }}
</el-tag>
</template>
<template #column-auth_end="{ row }">
@ -108,14 +120,14 @@
@click.stop="handleConfirmSign(row)"
>确认签约</el-button>
<el-button
v-if="row.store_use_status === 1 && row.auth_status !== 1"
v-if="row.use_status === 1 && row.auth_status !== 1"
size="small"
type="danger"
link
@click.stop="handleUnbind(row, 0)"
>禁用</el-button>
<el-button
v-else-if="row.store_use_status === 0 && row.auth_status !== 1"
v-else-if="row.use_status === 0 && row.auth_status !== 1"
size="small"
type="success"
link
@ -156,8 +168,8 @@
</el-descriptions-item>
<el-descriptions-item label="仓库ID">{{ selectedRow.warehouse_id }}</el-descriptions-item>
<el-descriptions-item label="使用状态">
<el-tag size="small" :type="selectedRow.store_use_status === 1 ? 'success' : 'info'" effect="light">
{{ selectedRow.store_use_status === 1 ? '启用' : '禁用' }}
<el-tag size="small" :type="selectedRow.use_status === 1 ? 'success' : 'info'" effect="light">
{{ selectedRow.use_status === 1 ? '启用' : '禁用' }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="授权截止">
@ -530,9 +542,12 @@ function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
// ─── 列表列配置 ─────────────────────────────────────────────────────────────
const columns = [
{ prop: 'counterparty_name', label: '签约仓库', minWidth: 140 },
{ prop: 'store_name', label: '货主备注', minWidth: 140 },
{ prop: 'warehouse_id', label: '仓库ID', width: 90 },
{ prop: 'counterparty_role', label: '对方角色', width: 90 },
{ prop: 'auth_status', label: '签约状态', width: 100 },
{ prop: 'needs_my_confirm', label: '待确认', width: 90 },
{ prop: 'store_use_status', label: '使用状态', width: 90 },
{ prop: 'use_status', label: '使用状态', width: 90 },
{ prop: 'print_quantity', label: '面单余额', width: 100 },
{ prop: 'has_qimen_config', label: '奇门配置', width: 100 },
{ prop: 'auth_end', label: '授权截止', width: 120 },
@ -562,7 +577,7 @@ const availableFields = [
},
{
label: '使用状态',
value: 'store_use_status',
value: 'use_status',
type: 'select',
options: [
{ label: '全部', value: undefined },
@ -589,7 +604,7 @@ const scanBox = ref<any>(null)
const activeTab = ref('details')
const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
const currentCondition = ref<any>({ store_use_status: 1 })
const currentCondition = ref<any>({ use_status: 1 })
// ─── 操作日志状态 ──────────────────────────────────────────────────────────
const logLoading = ref(false)
@ -865,9 +880,13 @@ async function handleConfirmSign(row: any) {
return
}
try {
await storeWarehouseConfirmSign({ id: row.id })
ElMessage.success('签约已确认')
loadList()
const res = await storeWarehouseConfirmSign({ id: row.id })
if (res?.flag === 'success' || res?.code === 200 || res?.data?.mode === 'confirm') {
ElMessage.success('签约已确认')
loadList()
} else {
ElMessage.error(res?.message || '确认签约失败')
}
} catch (e) {
ElMessage.error('确认签约失败')
}