This commit is contained in:
yin 2026-07-10 18:15:10 +08:00
parent e2f09a9bc3
commit d1ef9e502d
5 changed files with 95 additions and 32 deletions

View File

@ -58,17 +58,13 @@ export function warehouseList(data: {
} as any)
}
/**
* 发起签约 / 预览签约信息
* - 不带 action:提交签约申请(返回 mode: initiate | already_exists | already_confirmed)
* - action='preview' + warehouse_id:预览双方主体信息(返回 mode: preview)
* 发起或确认签约(当前主体始终为 store_id 方/消费方,对方为 warehouse_id 方/提供方)
* - counterparty_id:对方主体 ID(必传,兼容 warehouse_id / store_id)
* - temp_code:临时签约码;传入后进入确认或预览流程
*/
export function storeWarehouseSign(data: {
store_id?: number
warehouse_id?: number
counterparty_id: number
temp_code?: string
action?: 'preview' | 'confirm'
counterparty_id?: number
remask?: string
}) {
return request({
url: '/system',

View File

@ -52,6 +52,7 @@
</div>
<div class="qimen-info">
<span>ERP:{{ getQimenErpDisplay(cfg) }}</span>
<span>货主编码:{{ cfg.qimen_customer_id || '—' }}</span>
<span>仓库编码:{{ cfg.qimen_warehouse_code }}</span>
</div>
</div>
@ -65,6 +66,7 @@
</div>
<div class="qimen-info">
<span>ERP:{{ getQimenErpDisplay(row.qimen_config) }}</span>
<span>货主编码:{{ row.qimen_config.qimen_customer_id || '—' }}</span>
<span>仓库编码:{{ row.qimen_config.qimen_warehouse_code }}</span>
</div>
</template>

View File

@ -163,7 +163,7 @@
<div class="lower-level" v-if="selectedRow" :style="lowerPaneStyle">
<div class="detail-header">
<el-tabs v-model="activeTab" class="detail-tab">
<el-tab-pane label="基本详情" name="details" />
<!-- <el-tab-pane label="基本详情" name="details" /> -->
<el-tab-pane label="操作日志" name="logs" />
<el-tab-pane label="余额变动" name="balanceLogs" />
</el-tabs>
@ -442,7 +442,32 @@
</el-button>
</div>
<el-table :data="qimenDialog.list" v-loading="qimenDialog.loading" size="small" border>
<el-table-column v-for="col in qimenTableColumns.filter(c => c.prop !== 'self_app_key')" :key="col.prop" :prop="col.prop" :label="col.label" :min-width="col.minWidth" :width="col.width" />
<el-table-column
v-for="col in qimenTableColumns.filter(c => !['self_app_key', 'qimen_customer_id', 'qimen_warehouse_code', 'callback_url'].includes(c.prop))"
:key="col.prop"
:prop="col.prop"
:label="col.label"
:min-width="col.minWidth"
:width="col.width"
/>
<el-table-column label="货主编码" min-width="150">
<template #default="{ row }">
<div class="appkey-cell">
<span class="appkey-text">{{ row.qimen_customer_id || '—' }}</span>
<el-button
v-if="row.qimen_customer_id"
size="small"
type="primary"
link
@click="copyText(row.qimen_customer_id)"
>
复制
</el-button>
</div>
</template>
</el-table-column>
<el-table-column prop="qimen_warehouse_code" label="仓库编码" width="110" />
<el-table-column prop="callback_url" label="回调地址" min-width="200" />
<el-table-column prop="self_app_key" label="APPKEY" min-width="200">
<template #default="{ row }">
<div class="appkey-cell">
@ -497,6 +522,13 @@
<el-table-column label="操作" width="140" align="center" fixed="right">
<template #default="{ row }">
<el-button size="small" type="primary" link @click="openQimenForm(row)">编辑</el-button>
<el-button
v-if="row.interface_code === 'QM_WMS'"
size="small"
type="success"
link
@click="copyQmWmsConfig(row)"
>复制配置</el-button>
<el-button
v-if="row.interface_code === 'OPEN_API'"
size="small"
@ -594,8 +626,12 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户ID" required>
<el-input v-model="qimenForm.qimen_customer_id" placeholder="奇门客户ID(必填)" />
<el-form-item label="货主编码" required>
<el-input v-model="qimenForm.qimen_customer_id" placeholder="奇门货主编码(必填)">
<template #append>
<el-button @click="generateQimenCustomerCode">随机生成</el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@ -652,8 +688,12 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户ID">
<el-input v-model="qimenForm.qimen_customer_id" placeholder="奇门客户ID(可选)" />
<el-form-item label="货主编码">
<el-input v-model="qimenForm.qimen_customer_id" placeholder="奇门货主编码(如适用)">
<template #append>
<el-button @click="generateQimenCustomerCode">随机生成</el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@ -1930,6 +1970,7 @@ async function loadQimenConfigs() {
function handleInterfaceTypeChange(_code: string) {
// interface_code 已由 v-model 绑定自动更新,此处只做联动清空
qimenForm.qimen_app_key = ''
qimenForm.qimen_customer_id = ''
qimenForm.qimen_warehouse_code = ''
}
@ -1943,6 +1984,10 @@ function randomAlphaNum(length = 12): string {
return result
}
function generateQimenCustomerCode() {
qimenForm.qimen_customer_id = `ST_${randomAlphaNum(10)}`
}
function generateQimenWarehouseCode() {
qimenForm.qimen_warehouse_code = `WH_${randomAlphaNum(10)}`
}
@ -1971,7 +2016,7 @@ async function copyText(text: string) {
async function copyEditingQimenCustomerId() {
const customerId = getEditingQimenCustomerId()
if (!customerId) {
ElMessage.warning('暂无可复制的客户ID')
ElMessage.warning('暂无可复制的货主编码')
return
}
@ -1989,12 +2034,25 @@ async function copyEditingQimenCustomerId() {
document.execCommand('copy')
document.body.removeChild(input)
}
ElMessage.success('客户ID已复制')
ElMessage.success('货主编码已复制')
} catch {
ElMessage.error('复制客户ID失败')
ElMessage.error('复制货主编码失败')
}
}
function copyQmWmsConfig(row: any) {
const customerId = String(row.qimen_customer_id || '').trim()
const warehouseCode = String(row.qimen_warehouse_code || '').trim()
if (!customerId && !warehouseCode) {
ElMessage.warning('暂无可复制的奇门配置')
return
}
const lines: string[] = []
if (customerId) lines.push(`货主编码:${customerId}`)
if (warehouseCode) lines.push(`仓库编码:${warehouseCode}`)
copyText(lines.join('\n'))
}
function copyOpenApiConfig(row: any) {
const baseApi = String(import.meta.env.VITE_APP_BASE_API || '').replace(/\/+$/, '')
const lines: string[] = []
@ -2053,6 +2111,10 @@ async function submitQimenForm() {
ElMessage.warning('奇门备山 QM_WMS 类型必须选择ERP')
return
}
if (!qimenForm.qimen_customer_id?.trim()) {
ElMessage.warning('奇门备山 QM_WMS 类型必须填写货主编码')
return
}
if (!qimenForm.qimen_warehouse_code?.trim()) {
ElMessage.warning('奇门备山 QM_WMS 类型必须填写仓库编码')
return

View File

@ -65,6 +65,7 @@ export const signFormItems = [
export const qimenFormItems = [
{ label: '应用名称', prop: 'app_name', type: 'input', required: true, placeholder: '请输入应用名称', span: 24 },
{ label: 'ERP', prop: 'qimen_app_key', type: 'input', required: true, placeholder: '请选择ERP', span: 12 },
{ label: '货主编码', prop: 'qimen_customer_id', type: 'input', required: true, placeholder: '奇门货主编码', span: 12 },
{ label: '仓库编码', prop: 'qimen_warehouse_code', type: 'input', required: true, placeholder: '奇门仓库编码', span: 12 },
{ label: 'API版本', prop: 'api_version', type: 'input', placeholder: '默认1.0', span: 12 },
{ label: '联系人', prop: 'contact_person', type: 'input', span: 12 },
@ -163,6 +164,7 @@ export const qimenTableColumns = [
{ prop: 'interface_name', label: '接口类型', width: 130 },
{ prop: 'interface_code', label: '类型编码', width: 100 },
{ prop: 'erp_display', label: 'ERP', minWidth: 110 },
{ prop: 'qimen_customer_id', label: '货主编码', width: 110 },
{ prop: 'qimen_warehouse_code', label: '仓库编码', width: 110 },
{ prop: 'self_app_key', label: 'APPKEY', minWidth: 180 },
{ prop: 'callback_url', label: '回调地址', minWidth: 200 }

View File

@ -181,9 +181,6 @@
<el-form-item label="对方主体ID" required>
<el-input-number v-model.number="signForm.counterparty_id" placeholder="请输入对方主体ID" style="width: 100%" :controls="false" />
</el-form-item>
<el-form-item label="通用名备注">
<el-input v-model="signForm.remask" placeholder="给对方主体的通用名称(可选)" />
</el-form-item>
</el-form>
</template>
@ -349,7 +346,7 @@ import { ref, reactive, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Search, Plus, Refresh } from '@element-plus/icons-vue'
import {
storeWarehouseList,
warehouseList,
storeWarehouseSign,
storeWarehouseConfirmSign,
storeWarehouseUnbind,
@ -431,7 +428,7 @@ async function loadList() {
}
if (queryForm.keyword) params.keyword = queryForm.keyword
const res = await storeWarehouseList(params) as any
const res = await warehouseList(params) as any
if (res?.data) {
const payload = res.data
list.value = payload.list || []
@ -559,14 +556,14 @@ const signDialog = reactive({
step: 1,
loading: false,
signMode: '' as string,
temp_code: '' as string,
contract: null as any,
currentSubject: null as any,
counterparty: null as any
})
const signForm = reactive({
counterparty_id: undefined as number | undefined,
remask: ''
counterparty_id: undefined as number | undefined
})
function openSignDialog() {
@ -574,18 +571,18 @@ function openSignDialog() {
signDialog.step = 1
signDialog.title = '发起签约'
signDialog.signMode = ''
signDialog.temp_code = ''
signDialog.contract = null
signDialog.currentSubject = null
signDialog.counterparty = null
signForm.counterparty_id = undefined
signForm.remask = ''
}
function resetSignDialog() {
signForm.counterparty_id = undefined
signForm.remask = ''
signDialog.step = 1
signDialog.loading = false
signDialog.temp_code = ''
}
async function doPreviewSign() {
@ -596,12 +593,12 @@ async function doPreviewSign() {
signDialog.loading = true
try {
const res = await storeWarehouseSign({
action: 'preview',
warehouse_id: signForm.counterparty_id
counterparty_id: signForm.counterparty_id
}) as any
if (res?.data) {
const d = res.data
signDialog.signMode = d.mode || ''
signDialog.temp_code = d.temp_code || ''
signDialog.contract = d.contract || null
signDialog.currentSubject = d.current_subject || null
signDialog.counterparty = d.counterparty || null
@ -622,10 +619,13 @@ async function doSubmitSign() {
}
signDialog.loading = true
try {
await storeWarehouseSign({
counterparty_id: signForm.counterparty_id,
remask: signForm.remask
})
const payload: { counterparty_id: number; temp_code?: string } = {
counterparty_id: signForm.counterparty_id
}
if (signDialog.temp_code) {
payload.temp_code = signDialog.temp_code
}
await storeWarehouseSign(payload)
ElMessage.success('签约申请已提交')
signDialog.visible = false
loadList()
@ -639,6 +639,7 @@ async function doSubmitSign() {
function goBackToStep1() {
signDialog.step = 1
signDialog.signMode = ''
signDialog.temp_code = ''
signDialog.contract = null
signDialog.currentSubject = null
signDialog.counterparty = null