This commit is contained in:
liufumingren 2026-06-05 02:05:56 +08:00
parent 6099c150df
commit 76687296b9
3 changed files with 413 additions and 33 deletions

View File

@ -208,12 +208,14 @@ export function saveApiConfig(data: {
app_name: string
/** ERP AppKey(来自 index.getQimenAppList 下拉选择) */
qimen_app_key?: string
qimen_customer_id?: string
qimen_warehouse_code?: string
api_version?: string
contact_person?: string
contact_phone?: string
email?: string
is_enabled?: number
callback_url?: string
}) {
return request({
url: '/system',
@ -271,3 +273,38 @@ export function storeWarehouseDeleteQimenConfig(data: {
isSystemApi: true
} as any)
}
/** 仓库代货主一键开户:同时完成账号注册、货主创建和仓库-货主签约 */
export function storeWarehouseOpenAccount(data: {
username: string
password?: string
real_name?: string
company_name: string
business_license?: string
contact_person: string
contact_phone?: string
legal_person?: string
contact_email?: string
address?: string
industry?: string
logo_url?: string
domain?: string
auth_start?: string
auth_end?: string
print_quantity?: number
apply_reason?: string
store_remask?: string
warehouse_remask?: string
}) {
return request({
url: '/system',
method: 'post',
params: {
method: 'storeWarehouse.store.openAccount',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}

View File

@ -17,6 +17,9 @@
<el-button size="small" type="primary" @click="openSignDialog">
<el-icon><Plus /></el-icon> 发起签约
</el-button>
<el-button size="small" type="success" @click="openOpenAccountDialog">
<el-icon><Plus /></el-icon> 代开户
</el-button>
<el-button size="small" @click="loadList">
<el-icon><Refresh /></el-icon> 刷新
</el-button>
@ -586,7 +589,7 @@
<el-dialog
v-model="qimenDialog.visible"
:title="`接口配置管理 — ${qimenDialog.contractRow?.remask || qimenDialog.contractRow?.counterparty_name || ''}`"
width="820px"
width="80%"
align-center
:close-on-click-modal="false"
@close="resetQimenDialog"
@ -601,7 +604,51 @@
</el-button>
</div>
<el-table :data="qimenDialog.list" v-loading="qimenDialog.loading" size="small" border>
<el-table-column v-for="col in qimenTableColumns" :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 => c.prop !== 'self_app_key')" :key="col.prop" :prop="col.prop" :label="col.label" :min-width="col.minWidth" :width="col.width" />
<el-table-column prop="self_app_key" label="APPKEY" min-width="200">
<template #default="{ row }">
<div class="appkey-cell">
<span class="appkey-text">{{ row.self_app_key || '—' }}</span>
<el-button
v-if="row.self_app_key"
size="small"
type="primary"
link
@click="copyText(row.self_app_key)"
>
复制
</el-button>
</div>
</template>
</el-table-column>
<el-table-column label="APPSECRET" min-width="130">
<template #default="{ row }">
<div class="appsecret-cell">
<template v-if="visibleSecrets[row.id || row.interface_type_id]">
<span class="appsecret-text">{{ row.self_app_secret || '—' }}</span>
<el-button
v-if="row.self_app_secret"
size="small"
type="primary"
link
@click="copyText(row.self_app_secret)"
>
复制
</el-button>
</template>
<el-button
v-else-if="row.self_app_secret"
size="small"
type="warning"
link
@click="toggleSecret(row)"
>
显示
</el-button>
<span v-else>—</span>
</div>
</template>
</el-table-column>
<el-table-column label="状态" width="70" align="center">
<template #default="{ row }">
<el-tag size="small" :type="row.is_enabled ? 'success' : 'info'">
@ -701,17 +748,9 @@
</el-select>
</el-form-item>
</el-col>
<el-col v-if="qimenDialog.editingConfig && getEditingQimenCustomerId()" :span="12">
<el-form-item label="客户ID">
<el-input
:model-value="getEditingQimenCustomerId()"
readonly
placeholder="客户ID"
>
<template #append>
<el-button @click="copyEditingQimenCustomerId">复制</el-button>
</template>
</el-input>
<el-col :span="12">
<el-form-item label="客户ID" required>
<el-input v-model="qimenForm.qimen_customer_id" placeholder="奇门客户ID(必填)" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -729,13 +768,23 @@
</el-form-item>
</el-col>
</template>
<!-- OPEN_API 类型提示 -->
<!-- OPEN_API 类型提示 + 回调地址 -->
<template v-else-if="qimenForm.interface_code === 'OPEN_API'">
<el-col :span="24">
<el-alert type="info" :closable="false" style="margin-bottom:8px">
<template #default>OPEN_API 类型无需填写奇门字段,系统将自动生成 AppKey 与 AppSecret。</template>
</el-alert>
</el-col>
<el-col :span="24">
<el-form-item label="回调地址">
<div class="callback-url-row">
<el-input v-model="qimenForm.callback_url" placeholder="API 回调通知 URL(可选),订单状态变更时将推送至此地址" maxlength="500" show-word-limit style="flex:1" />
<el-button size="small" type="primary" link @click="openCallbackDoc">
<el-icon><Link /></el-icon> 调试文档
</el-button>
</div>
</el-form-item>
</el-col>
</template>
<!-- 其他类型或未选类型时显示所有奇门字段(向后兼容)-->
<template v-else-if="!qimenForm.interface_code && qimenDialog.editingConfig">
@ -757,17 +806,9 @@
</el-select>
</el-form-item>
</el-col>
<el-col v-if="getEditingQimenCustomerId()" :span="12">
<el-col :span="12">
<el-form-item label="客户ID">
<el-input
:model-value="getEditingQimenCustomerId()"
readonly
placeholder="客户ID"
>
<template #append>
<el-button @click="copyEditingQimenCustomerId">复制</el-button>
</template>
</el-input>
<el-input v-model="qimenForm.qimen_customer_id" placeholder="奇门客户ID(可选)" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -895,24 +936,91 @@
</el-button>
</template>
</el-dialog>
<!-- 代开户弹窗 -->
<el-dialog
v-model="openAccountDialog.visible"
title="仓库代货主一键开户"
width="720px"
align-center
:close-on-click-modal="false"
@close="resetOpenAccountDialog"
>
<el-form
ref="openAccountFormRef"
:model="openAccountForm"
:rules="openAccountFormRules"
label-width="120px"
size="small"
class="open-account-form-grid"
>
<el-row :gutter="16">
<el-col v-for="item in openAccountFormItems" :key="item.prop" :span="12">
<el-form-item :label="item.label" :prop="item.prop" :required="item.required">
<el-input-number
v-if="item.type === 'number'"
v-model="openAccountForm[item.prop]"
:placeholder="item.placeholder"
:min="0"
:precision="0"
style="width:100%"
controls-position="right"
/>
<el-date-picker
v-else-if="item.type === 'date'"
v-model="openAccountForm[item.prop]"
type="date"
:placeholder="item.placeholder"
value-format="YYYY-MM-DD"
style="width:100%"
/>
<div v-else-if="item.prop === 'username'" class="username-field-row">
<el-input
v-model="openAccountForm[item.prop]"
:placeholder="item.placeholder"
style="flex:1"
/>
<el-button size="small" @click="generateRandomUsername">
<el-icon><Refresh /></el-icon> 随机生成
</el-button>
</div>
<el-input
v-else
v-model="openAccountForm[item.prop]"
:placeholder="item.placeholder"
:maxlength="item.prop === 'company_name' ? 200 : item.prop === 'apply_reason' ? 2000 : item.prop === 'store_remask' || item.prop === 'warehouse_remask' ? 50 : undefined"
show-word-limit
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button size="small" @click="openAccountDialog.visible = false">取消</el-button>
<el-button size="small" type="primary" :loading="openAccountDialog.loading" @click="submitOpenAccount">
确认开户
</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup lang="ts">
import { ref, reactive, onMounted, computed, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Search, Plus, Refresh, QuestionFilled } from '@element-plus/icons-vue'
import { Search, Plus, Refresh, QuestionFilled, Link } from '@element-plus/icons-vue'
import { storeWarehouseList, storeWarehouseSign, storeWarehouseUnbind,
storeWarehouseRename, storeWarehouseGetPolicyConfig, storeWarehouseGetPolicyConfigFields,
storeWarehouseSavePolicyConfig, saveApiConfig, storeWarehouseDeleteQimenConfig,
storeWarehouseAdjustPrintQuantity, storeWarehouseQueryPrintQuantityLogs, listApiConfig
storeWarehouseAdjustPrintQuantity, storeWarehouseQueryPrintQuantityLogs, listApiConfig,
storeWarehouseOpenAccount
} from '@/api/storewarehouse.store/storeWarehouse'
import { listInterfaceTypes, getExpressList, getPlatformList, getQimenAppList } from '@/api/index/index'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import Detail from './component/detail.vue'
import Log from './component/log.vue'
import { columns as defaultColumns, availableFields as defaultAvailableFields, presetTree as defaultPresetTree, signDialogDefault, signFormDefault, qimenFormDefault, signFormItems, qimenFormItems, qimenTableColumns, detailPanel, adjustBalanceDialogDefault, adjustBalanceFormDefault, adjustBalanceFormItems } from './store-config'
import { columns as defaultColumns, availableFields as defaultAvailableFields, presetTree as defaultPresetTree, signDialogDefault, signFormDefault, qimenFormDefault, signFormItems, qimenFormItems, qimenTableColumns, detailPanel, adjustBalanceDialogDefault, adjustBalanceFormDefault, adjustBalanceFormItems, openAccountDialogDefault, openAccountFormDefault, openAccountFormItems } from './store-config'
// ─── 列表 ───────────────────────────────────────────────────────────────────
const loading = ref(false)
@ -1628,6 +1736,12 @@ const qimenAppOptions = ref<Array<{ label: string; value: string }>>([])
const selectableTypes = computed(() => qimenDialog.availableTypes)
const qimenForm = reactive<Record<string, any>>({ ...qimenFormDefault })
const visibleSecrets = reactive<Record<string | number, boolean>>({})
function toggleSecret(row: any) {
const key = row.id || row.interface_type_id
visibleSecrets[key] = !visibleSecrets[key]
}
// ─── 面单余额调整 ─────────────────────────────────────────────────────────
const adjustBalanceDialog = reactive({ ...adjustBalanceDialogDefault })
@ -1794,6 +1908,100 @@ async function submitAdjustBalance() {
}
}
// ─── 代开户 ────────────────────────────────────────────────────────────────────
const openAccountDialog = reactive({ ...openAccountDialogDefault })
const openAccountForm = reactive<Record<string, any>>({ ...openAccountFormDefault })
const openAccountFormRef = ref<any>(null)
const openAccountFormRules: Record<string, any> = {
username: [{ required: true, message: '请输入登录账号', trigger: 'blur' }],
company_name: [
{ required: true, message: '请输入公司全称', trigger: 'blur' },
{ max: 200, message: '公司全称不能超过200字符', trigger: 'blur' }
],
contact_person: [
{ required: true, message: '请输入联系人姓名', trigger: 'blur' },
{ max: 50, message: '联系人姓名不能超过50字符', trigger: 'blur' }
],
apply_reason: [{ max: 2000, message: '申请原因不能超过2000字符', trigger: 'blur' }],
store_remask: [{ max: 50, message: '货主备注名不能超过50字符', trigger: 'blur' }],
warehouse_remask: [{ max: 50, message: '仓库备注名不能超过50字符', trigger: 'blur' }]
}
function generateRandomUsername() {
const prefix = 'user'
const chars = 'abcdefghijklmnopqrstuvwxyz0123456789'
let suffix = ''
for (let i = 0; i < 8; i++) {
suffix += chars.charAt(Math.floor(Math.random() * chars.length))
}
openAccountForm.username = `${prefix}${suffix}`
}
function openOpenAccountDialog() {
resetOpenAccountDialog()
// 默认授权开始日期为当天
const today = new Date()
openAccountForm.auth_start = today.toISOString().slice(0, 10)
openAccountDialog.visible = true
}
function resetOpenAccountDialog() {
Object.assign(openAccountDialog, openAccountDialogDefault)
Object.assign(openAccountForm, openAccountFormDefault)
openAccountFormRef.value?.clearValidate?.()
}
async function submitOpenAccount() {
if (!openAccountFormRef.value) return
try {
await openAccountFormRef.value.validate()
} catch {
return
}
openAccountDialog.loading = true
try {
const payload: Record<string, any> = {
username: openAccountForm.username.trim(),
company_name: openAccountForm.company_name.trim(),
contact_person: openAccountForm.contact_person.trim()
}
// 仅提交非空值
const optionalFields = [
'password', 'real_name', 'business_license', 'contact_phone',
'legal_person', 'contact_email', 'address', 'industry', 'logo_url',
'domain', 'auth_start', 'auth_end', 'apply_reason', 'store_remask', 'warehouse_remask'
]
for (const field of optionalFields) {
const val = openAccountForm[field]
if (val !== undefined && val !== null && String(val).trim() !== '') {
payload[field] = typeof val === 'string' ? val.trim() : val
}
}
if (openAccountForm.print_quantity > 0) {
payload.print_quantity = openAccountForm.print_quantity
}
// 默认申请原因
if (!payload.apply_reason) {
payload.apply_reason = '仓库代开户'
}
const res = await storeWarehouseOpenAccount(payload as any) as any
if (res?.flag === 'success' || res?.code === 200 || res?.code === 1) {
ElMessage.success(res?.message || '开户成功')
openAccountDialog.visible = false
loadList()
} else {
ElMessage.error(res?.message || '开户失败')
}
} catch (e: any) {
ElMessage.error(e?.message || '开户失败')
} finally {
openAccountDialog.loading = false
}
}
function openQimenDialog(row: any) {
qimenDialog.contractRow = row
qimenDialog.formVisible = false
@ -1917,6 +2125,27 @@ function generateQimenWarehouseCode() {
qimenForm.qimen_warehouse_code = `WH_${randomAlphaNum(10)}`
}
async function copyText(text: string) {
try {
if (navigator?.clipboard?.writeText) {
await navigator.clipboard.writeText(text)
} else {
const input = document.createElement('textarea')
input.value = text
input.style.position = 'fixed'
input.style.opacity = '0'
document.body.appendChild(input)
input.focus()
input.select()
document.execCommand('copy')
document.body.removeChild(input)
}
ElMessage.success('已复制')
} catch {
ElMessage.error('复制失败')
}
}
async function copyEditingQimenCustomerId() {
const customerId = getEditingQimenCustomerId()
if (!customerId) {
@ -1944,6 +2173,11 @@ async function copyEditingQimenCustomerId() {
}
}
function openCallbackDoc() {
const baseApi = String(import.meta.env.VITE_APP_BASE_API || '').replace(/\/+$/, '')
window.open(`${baseApi}/docs/api/openapi/callback-test`, '_blank')
}
function openQimenForm(config: any) {
qimenDialog.editingConfig = config
if (config) {
@ -1995,15 +2229,20 @@ async function submitQimenForm() {
qimenDialog.formLoading = true
try {
// 仅提交 saveApiConfig 接口所要求的字段
const payload = {
const payload: Record<string, any> = {
id: qimenDialog.contractRow?.id as number,
interface_type_id: resolvedTypeId,
app_name: qimenForm.app_name.trim()
} as const
}
// QM_WMS 类型额外传奇门字段
if (isQmWms) {
;(payload as any).qimen_app_key = qimenForm.qimen_app_key.trim()
;(payload as any).qimen_warehouse_code = qimenForm.qimen_warehouse_code.trim()
payload.qimen_app_key = qimenForm.qimen_app_key.trim()
payload.qimen_customer_id = qimenForm.qimen_customer_id.trim()
payload.qimen_warehouse_code = qimenForm.qimen_warehouse_code.trim()
}
// 回调地址(所有类型)
if (qimenForm.callback_url?.trim()) {
payload.callback_url = qimenForm.callback_url.trim()
}
const res = await saveApiConfig(payload as any) as any
if (res?.flag === 'success' || res?.code === 200) {
@ -2196,6 +2435,56 @@ onMounted(loadList)
display: flex;
justify-content: flex-end;
}
.open-account-form-grid {
.el-row {
width: 100%;
}
.el-form-item {
margin-bottom: 18px;
}
.username-field-row {
display: flex;
width: 100%;
gap: 6px;
align-items: center;
}
}
.appkey-cell {
display: flex;
align-items: center;
gap: 6px;
.appkey-text {
font-family: monospace;
font-size: 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
flex: 1;
}
}
.callback-url-row {
display: flex;
width: 100%;
gap: 8px;
align-items: flex-start;
}
.appsecret-cell {
display: flex;
align-items: center;
gap: 6px;
.appsecret-text {
font-family: monospace;
font-size: 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
flex: 1;
}
}
}
.sign-preview {

View File

@ -27,12 +27,14 @@ export const qimenFormDefault = {
interface_code: '' as string, // 本地控制字段,不提交,用于区分 QM_WMS / OPEN_API 等类型
app_name: '',
qimen_app_key: '',
qimen_customer_id: '',
qimen_warehouse_code: '',
api_version: '1.0',
contact_person: '',
contact_phone: '',
email: '',
is_enabled: 1 as number
is_enabled: 1 as number,
callback_url: ''
}
// 面单余额调整弹窗默认配置
@ -69,6 +71,56 @@ export const qimenFormItems = [
{ label: '是否启用', prop: 'is_enabled', type: 'switch', activeValue: 1, inactiveValue: 0, activeText: '启用', inactiveText: '停用', span: 12 }
]
// 代开户弹窗默认配置
export const openAccountDialogDefault = {
visible: false,
loading: false
}
// 代开户表单默认配置
export const openAccountFormDefault = {
username: '',
password: '',
real_name: '',
company_name: '',
business_license: '',
contact_person: '',
contact_phone: '',
legal_person: '',
contact_email: '',
address: '',
industry: '',
logo_url: '',
domain: '',
auth_start: '',
auth_end: '',
print_quantity: 0,
apply_reason: '仓库代开户',
store_remask: '',
warehouse_remask: ''
}
// 代开户表单项配置
export const openAccountFormItems = [
{ label: '登录账号', prop: 'username', required: true, placeholder: '登录账号(全局唯一)' },
{ label: '初始密码', prop: 'password', placeholder: '留空则自动随机生成12位密码' },
{ label: '真实姓名', prop: 'real_name', placeholder: '可选' },
{ label: '公司全称', prop: 'company_name', required: true, placeholder: '公司全称(全局唯一,1-200字符)' },
{ label: '营业执照号', prop: 'business_license', placeholder: '可选' },
{ label: '联系人', prop: 'contact_person', required: true, placeholder: '联系人姓名(1-50字符)' },
{ label: '联系电话', prop: 'contact_phone', placeholder: '可选' },
{ label: '法人代表', prop: 'legal_person', placeholder: '可选' },
{ label: '联系邮箱', prop: 'contact_email', placeholder: '可选' },
{ label: '公司地址', prop: 'address', placeholder: '可选' },
{ label: '所属行业', prop: 'industry', placeholder: '可选' },
{ label: '初始面单余额', prop: 'print_quantity', type: 'number', placeholder: '默认0' },
{ label: '授权开始日期', prop: 'auth_start', type: 'date', placeholder: '默认当天' },
{ label: '授权结束日期', prop: 'auth_end', type: 'date', placeholder: '可选' },
{ label: '申请原因', prop: 'apply_reason', placeholder: '默认"仓库代开户"' },
{ label: '货主备注名', prop: 'store_remask', placeholder: '最长50字符' },
{ label: '仓库备注名', prop: 'warehouse_remask', placeholder: '最长50字符' }
]
// 面单余额调整表单项配置
export const adjustBalanceFormItems = [
{
@ -109,7 +161,9 @@ export const qimenTableColumns = [
{ prop: 'interface_name', label: '接口类型', width: 130 },
{ prop: 'interface_code', label: '类型编码', width: 100 },
{ prop: 'erp_display', label: 'ERP', minWidth: 110 },
{ prop: 'qimen_warehouse_code', label: '仓库编码', width: 110 }
{ prop: 'qimen_warehouse_code', label: '仓库编码', width: 110 },
{ prop: 'self_app_key', label: 'APPKEY', minWidth: 180 },
{ prop: 'callback_url', label: '回调地址', minWidth: 200 }
]