Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 84d9e098ba | |||
| c1c4fa18c9 |
@@ -1,6 +1,5 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
node_modules
|
node_modules
|
||||||
pnpm-lock.yaml
|
|
||||||
/dist
|
/dist
|
||||||
|
|
||||||
/tests/e2e/videos/
|
/tests/e2e/videos/
|
||||||
|
|||||||
@@ -13,6 +13,8 @@
|
|||||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
||||||
<meta name="format-detection" content="telephone=no" />
|
<meta name="format-detection" content="telephone=no" />
|
||||||
|
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
|
||||||
|
<meta http-equiv="Pragma" content="no-cache" />
|
||||||
<link rel="stylesheet" href="/iconfont/index.css" />
|
<link rel="stylesheet" href="/iconfont/index.css" />
|
||||||
<link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
|
<link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
|
||||||
<link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
|
<link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>oa登录</title>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.10.2/jquery.min.js">
|
||||||
|
</script>
|
||||||
|
<script>
|
||||||
|
// 获取URL查询字符串
|
||||||
|
const queryString = window.location.search;
|
||||||
|
|
||||||
|
// 使用URLSearchParams解析查询字符串
|
||||||
|
const urlParams = new URLSearchParams(queryString);
|
||||||
|
|
||||||
|
// 获取特定的参数值
|
||||||
|
var userid = urlParams.get('userid'); // 用户id
|
||||||
|
var username = urlParams.get('username'); // 用户名
|
||||||
|
var redirectUrl = urlParams.get('redirectUrl'); // 重定向地址
|
||||||
|
|
||||||
|
if(userid==null){
|
||||||
|
userid="";
|
||||||
|
}
|
||||||
|
if(username==null){
|
||||||
|
username="";
|
||||||
|
}
|
||||||
|
|
||||||
|
$.get("/oaApi/getToken?userid="+userid+"&username="+username,function(result){
|
||||||
|
debugger
|
||||||
|
//成功返回token
|
||||||
|
if(result.data.token){
|
||||||
|
//设置系统的cookie
|
||||||
|
document.cookie = "X-AUTH-TOKEN="+result.data.token;
|
||||||
|
|
||||||
|
if(redirectUrl==null){
|
||||||
|
//如果是登录就跳转到系统首页
|
||||||
|
window.location.href = "./";
|
||||||
|
}else {
|
||||||
|
//如果是待办有重定向就跳转
|
||||||
|
window.location.href = redirectUrl;
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
alert("该业务系统未同步当前oa用户");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
+2
-5
@@ -6,8 +6,7 @@
|
|||||||
"prod": "vite --mode production",
|
"prod": "vite --mode production",
|
||||||
"build": "vite build",
|
"build": "vite build",
|
||||||
"build:prod": "vite build --mode production",
|
"build:prod": "vite build --mode production",
|
||||||
"serve": "vite preview --host",
|
"serve": "vite preview --host"
|
||||||
"typecheck": "vue-tsc --noEmit"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@element-plus/icons-vue": "^2.3.1",
|
"@element-plus/icons-vue": "^2.3.1",
|
||||||
@@ -47,11 +46,9 @@
|
|||||||
"prettier": "^2.8.7",
|
"prettier": "^2.8.7",
|
||||||
"sass": "^1.85.1",
|
"sass": "^1.85.1",
|
||||||
"terser": "^5.31.1",
|
"terser": "^5.31.1",
|
||||||
"typescript": "^7.0.2",
|
|
||||||
"unplugin-auto-import": "^0.11.2",
|
"unplugin-auto-import": "^0.11.2",
|
||||||
"vite": "^5.4.19",
|
"vite": "^5.4.19",
|
||||||
"vite-plugin-compression": "^0.5.1",
|
"vite-plugin-compression": "^0.5.1",
|
||||||
"vite-plugin-vue-setup-extend": "^0.4.0",
|
"vite-plugin-vue-setup-extend": "^0.4.0"
|
||||||
"vue-tsc": "^3.3.11"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+4259
File diff suppressed because it is too large
Load Diff
@@ -58,14 +58,3 @@ export const changeStatus = (id, status) => {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getBfiExchangeRate = (currencyCode, effectdate) => {
|
|
||||||
return request({
|
|
||||||
url: '/blade-transport/bfi/exchange-rate',
|
|
||||||
method: 'get',
|
|
||||||
params: {
|
|
||||||
currencyCode,
|
|
||||||
effectdate,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|||||||
@@ -79,6 +79,15 @@ export const cancel = id =>
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const start = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/start`,
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
export const complete = id =>
|
export const complete = id =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/complete`,
|
url: `${baseUrl}/complete`,
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ export const approve = data => request({ url: `${baseUrl}/approve`, method: 'pos
|
|||||||
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
||||||
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
||||||
export const syncKingdee = id =>
|
export const syncKingdee = id =>
|
||||||
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id }, timeout: 120000 });
|
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
|
||||||
|
|
||||||
export const invoiceTypeOptions = [
|
export const invoiceTypeOptions = [
|
||||||
{ label: '电子专票', value: 'electronic_special' },
|
{ label: '电子专票', value: 'electronic_special' },
|
||||||
|
|||||||
@@ -5,17 +5,8 @@ const baseUrl = '/blade-transport/invoice-receipt';
|
|||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
||||||
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
export const queryInvoicePool = params =>
|
export const getInvoicePool = keyword =>
|
||||||
request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });
|
request({ url: `${baseUrl}/invoice-pool`, method: 'get', params: { keyword } });
|
||||||
export const downloadInvoicePoolAttachment = invoiceNo =>
|
|
||||||
// 金蝶票池发票文件下载(后端代理 A801-2 流式回源),耗时较普通接口长,放宽到 120s
|
|
||||||
request({
|
|
||||||
url: `${baseUrl}/invoice-pool/attachment/download`,
|
|
||||||
method: 'get',
|
|
||||||
params: { invoiceNo },
|
|
||||||
responseType: 'blob',
|
|
||||||
timeout: 120000,
|
|
||||||
});
|
|
||||||
export const getSettlementCandidates = (keyword, receiptId) =>
|
export const getSettlementCandidates = (keyword, receiptId) =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/settlement-candidates`,
|
url: `${baseUrl}/settlement-candidates`,
|
||||||
@@ -34,9 +25,8 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post'
|
|||||||
export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
|
export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
|
||||||
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
||||||
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
||||||
export const pushKingdee = ids =>
|
export const syncKingdee = id =>
|
||||||
// 推送联带 A902 附件上传(登记附件 + 镜像发票文件下载回传),耗时较普通接口长,放宽到 120s
|
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
|
||||||
request({ url: `${baseUrl}/push-kingdee`, method: 'post', data: ids, timeout: 120000 });
|
|
||||||
|
|
||||||
export const approvalStatusOptions = [
|
export const approvalStatusOptions = [
|
||||||
{ label: '草稿', value: 'draft' },
|
{ label: '草稿', value: 'draft' },
|
||||||
@@ -46,9 +36,8 @@ export const approvalStatusOptions = [
|
|||||||
{ label: '已作废', value: 'voided' },
|
{ label: '已作废', value: 'voided' },
|
||||||
];
|
];
|
||||||
|
|
||||||
export const kingdeePushStatusOptions = [
|
export const kingdeeStatusOptions = [
|
||||||
{ label: '未推送', value: 'unsynced' },
|
{ label: '未同步', value: 'unsynced' },
|
||||||
{ label: '已保存收票单', value: 'pushed' },
|
{ label: '已同步', value: 'synced' },
|
||||||
{ label: '已指定应付', value: 'assigned' },
|
{ label: '同步失败', value: 'failed' },
|
||||||
{ label: '推送失败', value: 'failed' },
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -16,15 +16,10 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post'
|
|||||||
export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
|
export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
|
||||||
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
||||||
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
||||||
// 同步金蝶涉及多次金蝶远程接口调用(A103-2 预检 + A103-1/A103-3 推送),单笔可达 20s+,覆盖全局 10s 超时
|
|
||||||
export const syncKingdee = id =>
|
export const syncKingdee = id =>
|
||||||
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id }, timeout: 120000 });
|
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
|
||||||
// 批量同步逐单单据级事务串行推送,耗时随单量线性增长
|
|
||||||
export const syncKingdeeBatch = ids =>
|
export const syncKingdeeBatch = ids =>
|
||||||
request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', data: ids, timeout: 300000 });
|
request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', data: ids });
|
||||||
// 回写任务按 paymentNo 分批远程查询 A103-2/A103-4,同样可能超过全局超时
|
|
||||||
export const syncKingdeeResult = () =>
|
|
||||||
request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: 300000 });
|
|
||||||
|
|
||||||
export const paymentTypeOptions = [
|
export const paymentTypeOptions = [
|
||||||
{ label: '项目预付', value: 'project_advance' },
|
{ label: '项目预付', value: 'project_advance' },
|
||||||
@@ -41,8 +36,5 @@ export const approvalStatusOptions = [
|
|||||||
export const kingdeeStatusOptions = [
|
export const kingdeeStatusOptions = [
|
||||||
{ label: '未生成', value: 'unsynced' },
|
{ label: '未生成', value: 'unsynced' },
|
||||||
{ label: '已生成', value: 'synced' },
|
{ label: '已生成', value: 'synced' },
|
||||||
{ label: '付款中', value: 'paying' },
|
|
||||||
{ label: '已付款', value: 'paid' },
|
|
||||||
{ label: '已关闭', value: 'closed' },
|
|
||||||
{ label: '生成失败', value: 'failed' },
|
{ label: '生成失败', value: 'failed' },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -30,9 +30,8 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post'
|
|||||||
export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
|
export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
|
||||||
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
||||||
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
||||||
// 同步金蝶涉及多次金蝶远程接口调用(A102-4 预检 + A102-2 保存),可达 20s+,覆盖全局 10s 超时
|
|
||||||
export const syncKingdee = id =>
|
export const syncKingdee = id =>
|
||||||
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id }, timeout: 120000 });
|
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
|
||||||
export const getDetailFees = detailId =>
|
export const getDetailFees = detailId =>
|
||||||
request({ url: `${baseUrl}/detail-fees`, method: 'get', params: { detailId } });
|
request({ url: `${baseUrl}/detail-fees`, method: 'get', params: { detailId } });
|
||||||
export const getReceiptClaims = formalSettlementId =>
|
export const getReceiptClaims = formalSettlementId =>
|
||||||
@@ -49,5 +48,3 @@ export const applyPayments = data =>
|
|||||||
request({ url: `${baseUrl}/apply-payments`, method: 'post', data });
|
request({ url: `${baseUrl}/apply-payments`, method: 'post', data });
|
||||||
export const claimInvoices = data =>
|
export const claimInvoices = data =>
|
||||||
request({ url: `${baseUrl}/claim-invoices`, method: 'post', data });
|
request({ url: `${baseUrl}/claim-invoices`, method: 'post', data });
|
||||||
export const queryInvoicePool = params =>
|
|
||||||
request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });
|
|
||||||
|
|||||||
@@ -41,6 +41,13 @@ export const add = row => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const syncIamOrganizations = () => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/sync-iam-organizations',
|
||||||
|
method: 'post',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const update = row => {
|
export const update = row => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-system/dept/submit',
|
url: '/blade-system/dept/submit',
|
||||||
|
|||||||
@@ -31,6 +31,13 @@ export const add = row => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const syncIamAccounts = () => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/user/sync-iam-accounts',
|
||||||
|
method: 'post',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const update = row => {
|
export const update = row => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-system/user/update',
|
url: '/blade-system/user/update',
|
||||||
|
|||||||
@@ -113,26 +113,6 @@ export const getScoreTemplate = quantificationId => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export const queryKingdeeCustomer = creditCode => {
|
|
||||||
return request({
|
|
||||||
url: '/blade-transport/bfi/customer/query-by-credit-code',
|
|
||||||
method: 'get',
|
|
||||||
params: {
|
|
||||||
creditCode,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export const syncKingdee = id => {
|
|
||||||
return request({
|
|
||||||
url: '/blade-transport/customer-archive/sync-kingdee',
|
|
||||||
method: 'post',
|
|
||||||
params: {
|
|
||||||
id,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export const recognizeBusinessLicenseOcr = imageUrl => {
|
export const recognizeBusinessLicenseOcr = imageUrl => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-transport/baidu-ocr/recognize-url',
|
url: '/blade-transport/baidu-ocr/recognize-url',
|
||||||
|
|||||||
@@ -223,14 +223,6 @@ axios.interceptors.response.use(
|
|||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
NProgress.done();
|
NProgress.done();
|
||||||
// 网络级失败(HTTP 状态 >500、网关错误、超时、断网等 validateStatus 放行之外的响应)
|
|
||||||
// 原为静默 reject,接口报错页面无任何感知;统一补错误提示,取消请求与刷新令牌请求除外
|
|
||||||
if (!axios.isCancel(error) && !isRefreshTokenRequest(error?.config)) {
|
|
||||||
ElMessage({
|
|
||||||
message: error?.response?.data?.msg || '请求失败,请稍后重试',
|
|
||||||
type: 'error',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return Promise.reject(new Error(error));
|
return Promise.reject(new Error(error));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,380 +0,0 @@
|
|||||||
<template>
|
|
||||||
<el-dialog v-model="visible" :title="title" width="92%" append-to-body destroy-on-close @open="handleOpen">
|
|
||||||
<el-form :model="query" inline label-width="130px" @submit.prevent>
|
|
||||||
<el-form-item label="发票号码">
|
|
||||||
<el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="开票日期">
|
|
||||||
<el-date-picker
|
|
||||||
v-model="query.invoiceDateRange"
|
|
||||||
type="daterange"
|
|
||||||
value-format="YYYY-MM-DD"
|
|
||||||
format="YYYY-MM-DD"
|
|
||||||
start-placeholder="开始日期"
|
|
||||||
end-placeholder="结束日期"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="销方(开票方税号)">
|
|
||||||
<el-input
|
|
||||||
v-model="query.salerTaxNo"
|
|
||||||
clearable
|
|
||||||
style="width: 180px"
|
|
||||||
@keyup.enter="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="购方(收票方税号)">
|
|
||||||
<el-input
|
|
||||||
v-model="query.buyerTaxNo"
|
|
||||||
clearable
|
|
||||||
style="width: 180px"
|
|
||||||
@keyup.enter="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="发票类型">
|
|
||||||
<el-select
|
|
||||||
v-model="query.invoiceType"
|
|
||||||
clearable
|
|
||||||
filterable
|
|
||||||
placeholder="不限"
|
|
||||||
style="width: 230px"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="option in invoiceTypeOptions"
|
|
||||||
:key="option.value"
|
|
||||||
:label="option.label"
|
|
||||||
:value="option.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item>
|
|
||||||
<el-button :disabled="loading" @click="resetQuery">重置</el-button>
|
|
||||||
<el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<el-table
|
|
||||||
ref="poolTable"
|
|
||||||
v-loading="loading"
|
|
||||||
:data="rows"
|
|
||||||
:row-key="rowKey"
|
|
||||||
border
|
|
||||||
height="520"
|
|
||||||
:highlight-current-row="!multiple"
|
|
||||||
@selection-change="selection => (selected = selection)"
|
|
||||||
@row-dblclick="handleRowDblclick"
|
|
||||||
>
|
|
||||||
<el-table-column v-if="multiple" type="selection" width="52" fixed="left" align="center" reserve-selection />
|
|
||||||
<el-table-column v-else width="52" align="center" fixed="left">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<el-radio
|
|
||||||
:model-value="current && current.invoiceNo"
|
|
||||||
:value="row.invoiceNo"
|
|
||||||
@change="current = row"
|
|
||||||
>
|
|
||||||
<span></span>
|
|
||||||
</el-radio>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
|
|
||||||
<el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
|
|
||||||
<el-table-column prop="invoiceType" label="发票类型" min-width="140" />
|
|
||||||
<el-table-column prop="issuerName" label="开票单位" min-width="180" show-overflow-tooltip />
|
|
||||||
<el-table-column prop="receiverName" label="受票单位" min-width="180" show-overflow-tooltip />
|
|
||||||
<el-table-column label="金额(含税)" min-width="130" align="right">
|
|
||||||
<template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="税率" min-width="90" align="center">
|
|
||||||
<template #default="{ row }">{{ formatRate(row.taxRate) }}</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="税额" min-width="120" align="right">
|
|
||||||
<template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="剩余可用金额" min-width="130" align="right">
|
|
||||||
<template #default="{ row }">{{ formatMoney(row.availableTaxAmount) }}</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="210" show-overflow-tooltip />
|
|
||||||
<el-table-column label="认领状态" min-width="100" align="center">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<el-tag v-if="row.claimed" type="danger" size="small">已认领</el-tag>
|
|
||||||
<el-tag v-else type="info" size="small">未认领</el-tag>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="登记状态" min-width="100" align="center">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<el-tag v-if="row.registered" type="warning" size="small">已登记</el-tag>
|
|
||||||
<el-tag v-else type="info" size="small">未登记</el-tag>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="附件" width="120" fixed="right" align="center">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<el-link
|
|
||||||
type="primary"
|
|
||||||
:underline="false"
|
|
||||||
:disabled="attachmentBusy === row.invoiceNo"
|
|
||||||
@click.stop="viewAttachment(row)"
|
|
||||||
>查看</el-link
|
|
||||||
>
|
|
||||||
<el-link
|
|
||||||
type="primary"
|
|
||||||
:underline="false"
|
|
||||||
:disabled="attachmentBusy === row.invoiceNo"
|
|
||||||
@click.stop="downloadAttachment(row)"
|
|
||||||
>下载</el-link
|
|
||||||
>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column v-if="!multiple" label="操作" width="90" fixed="right" align="center">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<el-link type="primary" @click.stop="confirmRows([row])">选择</el-link>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
<div class="kingdee-pool-dialog__pager">
|
|
||||||
<span class="kingdee-pool-dialog__pager-info">第 {{ page.current }} 页</span>
|
|
||||||
<el-button :disabled="page.current <= 1 || loading" @click="prevPage">上一页</el-button>
|
|
||||||
<el-button :disabled="!page.hasMore || loading" @click="nextPage">下一页</el-button>
|
|
||||||
<el-select v-model="page.size" style="width: 110px" @change="handleSizeChange">
|
|
||||||
<el-option v-for="n in [10, 20, 50, 100]" :key="n" :label="`${n}条/页`" :value="n" />
|
|
||||||
</el-select>
|
|
||||||
</div>
|
|
||||||
<template #footer>
|
|
||||||
<el-button @click="visible = false">取消</el-button>
|
|
||||||
<el-button type="primary" @click="handleConfirm">{{ confirmText }}</el-button>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
import {
|
|
||||||
downloadKingdeeInvoiceFile,
|
|
||||||
isKingdeePathAttachment,
|
|
||||||
viewKingdeeInvoiceFile,
|
|
||||||
} from '@/utils/kingdee-attachment';
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'KingdeeInvoicePoolDialog',
|
|
||||||
props: {
|
|
||||||
modelValue: { type: Boolean, required: true },
|
|
||||||
title: { type: String, default: '查询金蝶票据池' },
|
|
||||||
confirmText: { type: String, default: '确定' },
|
|
||||||
multiple: { type: Boolean, default: false },
|
|
||||||
initialInvoiceNo: { type: String, default: '' },
|
|
||||||
queryApi: { type: Function, required: true },
|
|
||||||
},
|
|
||||||
emits: ['update:modelValue', 'confirm'],
|
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
loading: false,
|
|
||||||
// 与后端 BfiConstant.INVOICE_TYPE_NAMES 对齐:value 为发票类型编码,label 为中文名
|
|
||||||
// 选票场景只开放数电票(普票/专票)
|
|
||||||
invoiceTypeOptions: [
|
|
||||||
{ value: '26', label: '数电发票(普通发票)' },
|
|
||||||
{ value: '27', label: '数电发票(增值税专用发票)' },
|
|
||||||
],
|
|
||||||
rows: [],
|
|
||||||
selected: [],
|
|
||||||
current: null,
|
|
||||||
page: { current: 1, size: 10, hasMore: false },
|
|
||||||
// 续扫游标(服务端过滤补页后翻页须按游标对齐,防漏行/重行)
|
|
||||||
nextCursor: null,
|
|
||||||
// 下一页请求待回传的游标:nextPage 时暂存,load 成功或失败后清空
|
|
||||||
pendingCursor: null,
|
|
||||||
// 已浏览页缓存:上一页直接回显不再请求(0 远程调用)
|
|
||||||
pageCache: {},
|
|
||||||
// 正在查看/下载附件的发票号(行级 loading 守卫)
|
|
||||||
attachmentBusy: null,
|
|
||||||
query: this.emptyQuery(),
|
|
||||||
};
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
visible: {
|
|
||||||
get() {
|
|
||||||
return this.modelValue;
|
|
||||||
},
|
|
||||||
set(value) {
|
|
||||||
this.$emit('update:modelValue', value);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
emptyQuery() {
|
|
||||||
return {
|
|
||||||
invoiceNo: '',
|
|
||||||
// 默认查近一个月,随请求传后端并在页面回显
|
|
||||||
invoiceDateRange: [this.$dayjs().subtract(1, 'month').format('YYYY-MM-DD'), this.$dayjs().format('YYYY-MM-DD')],
|
|
||||||
salerTaxNo: '',
|
|
||||||
buyerTaxNo: '',
|
|
||||||
invoiceType: '',
|
|
||||||
};
|
|
||||||
},
|
|
||||||
// 远程实时查询的票未入本地镜像,id 恒空,用发票号码兜底作为行主键
|
|
||||||
rowKey(row) {
|
|
||||||
return row.invoiceNo || row.id;
|
|
||||||
},
|
|
||||||
// 票池行附件字段为复数 attachmentsJson,行内首项即发票文件({source,path,name})
|
|
||||||
rowAttachment(row = {}) {
|
|
||||||
const value = row.attachmentsJson;
|
|
||||||
if (!value) return null;
|
|
||||||
let parsed = value;
|
|
||||||
if (typeof value === 'string') {
|
|
||||||
try {
|
|
||||||
parsed = JSON.parse(value);
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return Array.isArray(parsed) ? parsed[0] || null : parsed || null;
|
|
||||||
},
|
|
||||||
attachmentName(row) {
|
|
||||||
const attachment = this.rowAttachment(row);
|
|
||||||
return attachment?.name || `${row.invoiceNo || '发票'}.pdf`;
|
|
||||||
},
|
|
||||||
async viewAttachment(row) {
|
|
||||||
const attachment = this.rowAttachment(row);
|
|
||||||
if (!isKingdeePathAttachment(attachment)) {
|
|
||||||
this.$message.warning('当前发票暂无可查看附件');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.attachmentBusy = row.invoiceNo;
|
|
||||||
try {
|
|
||||||
await viewKingdeeInvoiceFile(row.invoiceNo, this.attachmentName(row));
|
|
||||||
} finally {
|
|
||||||
this.attachmentBusy = null;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async downloadAttachment(row) {
|
|
||||||
const attachment = this.rowAttachment(row);
|
|
||||||
if (!isKingdeePathAttachment(attachment)) {
|
|
||||||
this.$message.warning('当前发票暂无可下载附件');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.attachmentBusy = row.invoiceNo;
|
|
||||||
try {
|
|
||||||
await downloadKingdeeInvoiceFile(row.invoiceNo, this.attachmentName(row));
|
|
||||||
} finally {
|
|
||||||
this.attachmentBusy = null;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
handleOpen() {
|
|
||||||
this.query = this.emptyQuery();
|
|
||||||
this.query.invoiceNo = this.initialInvoiceNo || '';
|
|
||||||
this.current = null;
|
|
||||||
this.selected = [];
|
|
||||||
this.$refs.poolTable?.clearSelection();
|
|
||||||
this.page.current = 1;
|
|
||||||
this.resetScanState();
|
|
||||||
this.load();
|
|
||||||
},
|
|
||||||
handleQuery() {
|
|
||||||
this.page.current = 1;
|
|
||||||
this.resetScanState();
|
|
||||||
this.load();
|
|
||||||
},
|
|
||||||
handleSizeChange() {
|
|
||||||
this.page.current = 1;
|
|
||||||
this.resetScanState();
|
|
||||||
this.load();
|
|
||||||
},
|
|
||||||
prevPage() {
|
|
||||||
// 已浏览页直接回显缓存,不再请求
|
|
||||||
const cached = this.pageCache[this.page.current - 1];
|
|
||||||
if (cached) {
|
|
||||||
this.page.current -= 1;
|
|
||||||
this.rows = cached.rows;
|
|
||||||
this.page.hasMore = cached.hasMore;
|
|
||||||
this.nextCursor = cached.nextCursor;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.page.current -= 1;
|
|
||||||
this.load();
|
|
||||||
},
|
|
||||||
nextPage() {
|
|
||||||
this.pendingCursor = this.nextCursor;
|
|
||||||
this.page.current += 1;
|
|
||||||
this.load();
|
|
||||||
},
|
|
||||||
resetQuery() {
|
|
||||||
this.query = this.emptyQuery();
|
|
||||||
this.handleQuery();
|
|
||||||
},
|
|
||||||
// 新查询/换页容量/重新打开时清空游标与已浏览页缓存,重新锚定扫描
|
|
||||||
resetScanState() {
|
|
||||||
this.nextCursor = null;
|
|
||||||
this.pendingCursor = null;
|
|
||||||
this.pageCache = {};
|
|
||||||
},
|
|
||||||
unwrap(response) {
|
|
||||||
const body = response?.data || response || {};
|
|
||||||
return body?.data || body;
|
|
||||||
},
|
|
||||||
async load() {
|
|
||||||
this.loading = true;
|
|
||||||
// 请求前快照页码:prev/next 会先改写 current,远程失败时回滚避免停留在错页
|
|
||||||
const lastRequested = this.page.current;
|
|
||||||
const cursor = this.pendingCursor;
|
|
||||||
this.pendingCursor = null;
|
|
||||||
try {
|
|
||||||
const range = this.query.invoiceDateRange || [];
|
|
||||||
const data = this.unwrap(
|
|
||||||
await this.queryApi({
|
|
||||||
current: this.page.current,
|
|
||||||
size: this.page.size,
|
|
||||||
cursor: cursor || undefined,
|
|
||||||
invoiceNo: this.query.invoiceNo || undefined,
|
|
||||||
invoiceDateStart: range[0] || undefined,
|
|
||||||
invoiceDateEnd: range[1] || undefined,
|
|
||||||
salerTaxNo: this.query.salerTaxNo || undefined,
|
|
||||||
buyerTaxNo: this.query.buyerTaxNo || undefined,
|
|
||||||
invoiceType: this.query.invoiceType || undefined,
|
|
||||||
})
|
|
||||||
);
|
|
||||||
this.rows = data.records || [];
|
|
||||||
this.page.hasMore = !!data.hasMore;
|
|
||||||
this.nextCursor = data.nextCursor || null;
|
|
||||||
this.pageCache[this.page.current] = { rows: this.rows, hasMore: this.page.hasMore, nextCursor: this.nextCursor };
|
|
||||||
} catch (error) {
|
|
||||||
if (this.page.current !== lastRequested) {
|
|
||||||
this.page.current = lastRequested;
|
|
||||||
}
|
|
||||||
throw error;
|
|
||||||
} finally {
|
|
||||||
this.loading = false;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
handleRowDblclick(row) {
|
|
||||||
if (!this.multiple) {
|
|
||||||
this.confirmRows([row]);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
handleConfirm() {
|
|
||||||
const picked = this.multiple ? this.selected : this.current ? [this.current] : [];
|
|
||||||
this.confirmRows(picked);
|
|
||||||
},
|
|
||||||
confirmRows(rows) {
|
|
||||||
if (!rows.length) {
|
|
||||||
this.$message.warning(this.multiple ? '请至少选择一条发票' : '请选择一张发票');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.$emit('confirm', rows);
|
|
||||||
this.visible = false;
|
|
||||||
},
|
|
||||||
formatMoney(value) {
|
|
||||||
const number = Number(value);
|
|
||||||
return Number.isFinite(number) ? number.toFixed(2) : '-';
|
|
||||||
},
|
|
||||||
formatRate(value) {
|
|
||||||
const number = Number(value);
|
|
||||||
return Number.isFinite(number) ? `${number}%` : '-';
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
.kingdee-pool-dialog__pager {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 12px;
|
|
||||||
justify-content: flex-end;
|
|
||||||
margin-top: 12px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
FROM nginx
|
FROM nginx
|
||||||
VOLUME /tmp
|
VOLUME /tmp
|
||||||
ENV LANG en_US.UTF-8
|
ENV LANG en_US.UTF-8
|
||||||
|
ADD ./src/docker/nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
ADD ./dist/ /usr/share/nginx/html/
|
ADD ./dist/ /usr/share/nginx/html/
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
EXPOSE 443
|
EXPOSE 443
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name localhost;
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
index index.html;
|
||||||
|
|
||||||
|
gzip on;
|
||||||
|
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
|
||||||
|
|
||||||
|
location /assets/ {
|
||||||
|
add_header Cache-Control "public, max-age=31536000, immutable";
|
||||||
|
try_files $uri =404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
add_header Cache-Control "no-store, no-cache, must-revalidate";
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +1,12 @@
|
|||||||
import store from './store';
|
import store from './store';
|
||||||
|
import { isChunkLoadError, reloadForChunkError } from './utils/chunk-reload';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
install: app => {
|
install: app => {
|
||||||
app.config.errorHandler = (err, vm, info) => {
|
app.config.errorHandler = (err, vm, info) => {
|
||||||
|
if (isChunkLoadError(err) && reloadForChunkError()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
store.commit('ADD_LOGS', {
|
store.commit('ADD_LOGS', {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
message: err.message,
|
message: err.message,
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { createApp } from 'vue';
|
import { createApp } from 'vue';
|
||||||
|
import { installChunkReload } from './utils/chunk-reload';
|
||||||
import website from './config/website';
|
import website from './config/website';
|
||||||
import axios from './axios';
|
import axios from './axios';
|
||||||
import router from './router/';
|
import router from './router/';
|
||||||
@@ -46,6 +47,7 @@ import sectionCard from './components/section-card/main.vue';
|
|||||||
import mapSearchResults from './components/map-search-results/main.vue';
|
import mapSearchResults from './components/map-search-results/main.vue';
|
||||||
|
|
||||||
window.$crudCommon = crudCommon;
|
window.$crudCommon = crudCommon;
|
||||||
|
installChunkReload();
|
||||||
debug();
|
debug();
|
||||||
window.axios = axios;
|
window.axios = axios;
|
||||||
const app = createApp(App);
|
const app = createApp(App);
|
||||||
|
|||||||
@@ -55,8 +55,8 @@ export const config = {
|
|||||||
'templateType',
|
'templateType',
|
||||||
'transportType',
|
'transportType',
|
||||||
'createUserName',
|
'createUserName',
|
||||||
'remark',
|
|
||||||
'updateTime',
|
'updateTime',
|
||||||
|
'remark',
|
||||||
'createTime',
|
'createTime',
|
||||||
],
|
],
|
||||||
exportColumns: [
|
exportColumns: [
|
||||||
@@ -65,8 +65,8 @@ export const config = {
|
|||||||
{ prop: 'templateType', label: '模板类型' },
|
{ prop: 'templateType', label: '模板类型' },
|
||||||
{ prop: 'transportType', label: '运输方式' },
|
{ prop: 'transportType', label: '运输方式' },
|
||||||
{ prop: 'createUserName', label: '创建人' },
|
{ prop: 'createUserName', label: '创建人' },
|
||||||
{ prop: 'remark', label: '备注' },
|
|
||||||
{ prop: 'updateTime', label: '更新时间' },
|
{ prop: 'updateTime', label: '更新时间' },
|
||||||
|
{ prop: 'remark', label: '备注' },
|
||||||
{ prop: 'createTime', label: '创建时间' },
|
{ prop: 'createTime', label: '创建时间' },
|
||||||
],
|
],
|
||||||
enableAllDept: false,
|
enableAllDept: false,
|
||||||
@@ -82,12 +82,14 @@ export const config = {
|
|||||||
detailAttachmentDescriptionPlain: true,
|
detailAttachmentDescriptionPlain: true,
|
||||||
enableTransportPlanForm: true,
|
enableTransportPlanForm: true,
|
||||||
enableShippingTemplateFreight: true,
|
enableShippingTemplateFreight: true,
|
||||||
editableRoadAddress: true,
|
editableRoadAddress: false,
|
||||||
fixedTransportAddressType: true,
|
fixedTransportAddressType: true,
|
||||||
enableTemplateCodePreview: true,
|
enableTemplateCodePreview: true,
|
||||||
attachmentTitle: '附件',
|
attachmentTitle: '附件',
|
||||||
defaultForm: {
|
defaultForm: {
|
||||||
templateType: '运输计划',
|
templateType: '运输计划',
|
||||||
|
transportType: '公路运输',
|
||||||
|
transportTypeName: '公路运输',
|
||||||
},
|
},
|
||||||
transportFormRequiredFields: [
|
transportFormRequiredFields: [
|
||||||
['projectName', '项目'],
|
['projectName', '项目'],
|
||||||
@@ -119,15 +121,16 @@ export const option = {
|
|||||||
labelWidth: 0,
|
labelWidth: 0,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '模板编号',
|
label: '模板类型',
|
||||||
prop: 'templateCode',
|
prop: 'templateType',
|
||||||
|
type: 'select',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 4,
|
searchOrder: 2,
|
||||||
span: 8,
|
span: 8,
|
||||||
order: 390,
|
order: 390,
|
||||||
minWidth: 170,
|
dicData: templateTypeOptions,
|
||||||
disabled: true,
|
minWidth: 120,
|
||||||
placeholder: '系统自动生成',
|
rules: selectRule('模板类型'),
|
||||||
display: true,
|
display: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -142,16 +145,15 @@ export const option = {
|
|||||||
display: true,
|
display: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '模板类型',
|
label: '模板编号',
|
||||||
prop: 'templateType',
|
prop: 'templateCode',
|
||||||
type: 'select',
|
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 2,
|
searchOrder: 4,
|
||||||
span: 8,
|
span: 8,
|
||||||
order: 370,
|
order: 370,
|
||||||
dicData: templateTypeOptions,
|
minWidth: 170,
|
||||||
minWidth: 120,
|
disabled: true,
|
||||||
rules: selectRule('模板类型'),
|
placeholder: '系统自动生成',
|
||||||
display: true,
|
display: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -209,12 +209,12 @@ export const config = {
|
|||||||
attachmentTitle: '附件',
|
attachmentTitle: '附件',
|
||||||
searchRangeMap: {
|
searchRangeMap: {
|
||||||
planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
|
planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
|
||||||
planEndDateRange: ['planEndDateStart', 'planEndDateEnd'],
|
createTimeRange: ['createTimeStart', 'createTimeEnd', '00:00:00', '23:59:59'],
|
||||||
},
|
},
|
||||||
actions: ['copy', 'complete'],
|
actions: ['copy', 'complete'],
|
||||||
statusProp: 'businessStatus',
|
statusProp: 'businessStatus',
|
||||||
statusTextProp: 'businessStatusName',
|
statusTextProp: 'businessStatusName',
|
||||||
deleteStatus: ['draft', 'waiting_dispatch'],
|
deleteStatus: ['draft'],
|
||||||
editStatus: ['draft', 'waiting_dispatch', 'dispatching'],
|
editStatus: ['draft', 'waiting_dispatch', 'dispatching'],
|
||||||
detailButton: true,
|
detailButton: true,
|
||||||
detailSections: [
|
detailSections: [
|
||||||
@@ -341,6 +341,7 @@ export const option = {
|
|||||||
{
|
{
|
||||||
label: '发货地址',
|
label: '发货地址',
|
||||||
prop: 'departureAddress',
|
prop: 'departureAddress',
|
||||||
|
slot: true,
|
||||||
formslot: true,
|
formslot: true,
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 7,
|
searchOrder: 7,
|
||||||
@@ -352,6 +353,7 @@ export const option = {
|
|||||||
{
|
{
|
||||||
label: '到货地址',
|
label: '到货地址',
|
||||||
prop: 'arrivalAddress',
|
prop: 'arrivalAddress',
|
||||||
|
slot: true,
|
||||||
formslot: true,
|
formslot: true,
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 6,
|
searchOrder: 6,
|
||||||
@@ -577,8 +579,8 @@ export const option = {
|
|||||||
viewDisplay: false,
|
viewDisplay: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '计划结束日期',
|
label: '创建时间',
|
||||||
prop: 'planEndDateRange',
|
prop: 'createTimeRange',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
format: 'YYYY-MM-DD',
|
format: 'YYYY-MM-DD',
|
||||||
valueFormat: 'YYYY-MM-DD',
|
valueFormat: 'YYYY-MM-DD',
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ export const invoiceApplicationTableColumns = [
|
|||||||
{ prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
|
{ prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
|
||||||
{ prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 },
|
{ prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 },
|
||||||
{ prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 },
|
{ prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 },
|
||||||
{ prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
|
|
||||||
];
|
];
|
||||||
|
|
||||||
export const invoiceApplicationDetailColumns = [
|
export const invoiceApplicationDetailColumns = [
|
||||||
|
|||||||
@@ -11,8 +11,6 @@ export const invoiceReceiptTableColumns = [
|
|||||||
{ prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
|
{ prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
|
||||||
{ prop: 'createUserName', label: '创建人', minWidth: 110 },
|
{ prop: 'createUserName', label: '创建人', minWidth: 110 },
|
||||||
{ prop: 'createTime', label: '创建时间', minWidth: 170 },
|
{ prop: 'createTime', label: '创建时间', minWidth: 170 },
|
||||||
{ prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
|
{ prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 },
|
||||||
{ prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
|
{ prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 },
|
||||||
{ prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
|
|
||||||
{ prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -17,5 +17,4 @@ export const paymentApplicationTableColumns = [
|
|||||||
{ prop: 'currentProcessor', label: '当前处理人', minWidth: 120 },
|
{ prop: 'currentProcessor', label: '当前处理人', minWidth: 120 },
|
||||||
{ prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 130 },
|
{ prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 130 },
|
||||||
{ prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 130 },
|
{ prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 130 },
|
||||||
{ prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ export const formalSettlementTableColumns = [
|
|||||||
{ label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
|
{ label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
|
||||||
{ label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
|
{ label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
|
||||||
{ label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
|
{ label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
|
||||||
{ label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },
|
|
||||||
{ label: '创建人', prop: 'createUserName', minWidth: 110 },
|
{ label: '创建人', prop: 'createUserName', minWidth: 110 },
|
||||||
{ label: '创建时间', prop: 'createTime', minWidth: 170 },
|
{ label: '创建时间', prop: 'createTime', minWidth: 170 },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -88,8 +88,6 @@ export const updateFeeFormFields = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
export const transferSearchFields = [
|
export const transferSearchFields = [
|
||||||
{ label: '单据号', prop: 'documentNo', type: 'input' },
|
|
||||||
{ label: '合同编码', prop: 'contractNo', type: 'input' },
|
|
||||||
{ label: '合同名称', prop: 'contractName', type: 'input' },
|
{ label: '合同名称', prop: 'contractName', type: 'input' },
|
||||||
{ label: '批次号', prop: 'batchNo', type: 'input' },
|
{ label: '批次号', prop: 'batchNo', type: 'input' },
|
||||||
{ label: '生成日期', prop: 'generateDateRange', type: 'daterange' },
|
{ label: '生成日期', prop: 'generateDateRange', type: 'daterange' },
|
||||||
|
|||||||
@@ -1,7 +1,18 @@
|
|||||||
<template>
|
<template>
|
||||||
<router-view #="{ Component }">
|
<router-view #="{ Component }">
|
||||||
<keep-alive :include="$store.getters.tagsKeep">
|
<keep-alive :include="$store.getters.tagsKeep">
|
||||||
<component :is="Component" />
|
<component :is="tabView($route, Component)" />
|
||||||
</keep-alive>
|
</keep-alive>
|
||||||
</router-view>
|
</router-view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { tabView } from '@/router/tab';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'layout',
|
||||||
|
methods: {
|
||||||
|
tabView,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|||||||
+13
-10
@@ -3,6 +3,8 @@ import store from './store';
|
|||||||
import { tabKeyOf } from '@/router/tab';
|
import { tabKeyOf } from '@/router/tab';
|
||||||
import { getToken } from '@/utils/auth';
|
import { getToken } from '@/utils/auth';
|
||||||
import {
|
import {
|
||||||
|
consumeReloadQuery,
|
||||||
|
hasReloadQuery,
|
||||||
isChunkLoadError,
|
isChunkLoadError,
|
||||||
reloadForChunkError,
|
reloadForChunkError,
|
||||||
setPendingRoutePath,
|
setPendingRoutePath,
|
||||||
@@ -17,19 +19,20 @@ const lockPage = '/lock'; //锁屏页
|
|||||||
router.onError(error => {
|
router.onError(error => {
|
||||||
if (!isChunkLoadError(error)) return;
|
if (!isChunkLoadError(error)) return;
|
||||||
if (reloadForChunkError()) {
|
if (reloadForChunkError()) {
|
||||||
ElMessage.warning('页面资源加载失败,正在重新加载…');
|
ElMessage.warning('页面资源已更新,正在重新加载…');
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
window.addEventListener('unhandledrejection', event => {
|
|
||||||
if (!isChunkLoadError(event.reason)) return;
|
|
||||||
if (reloadForChunkError()) {
|
|
||||||
event.preventDefault();
|
|
||||||
ElMessage.warning('页面资源加载失败,正在重新加载…');
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
router.beforeEach((to, from, next) => {
|
router.beforeEach((to, from, next) => {
|
||||||
|
if (hasReloadQuery(to.query)) {
|
||||||
|
next({
|
||||||
|
path: to.path,
|
||||||
|
query: consumeReloadQuery(to.query),
|
||||||
|
hash: to.hash,
|
||||||
|
replace: true,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
setPendingRoutePath(to.fullPath);
|
setPendingRoutePath(to.fullPath);
|
||||||
const meta = to.meta || {};
|
const meta = to.meta || {};
|
||||||
const isMenu = meta.menu === undefined ? to.query.menu : meta.menu;
|
const isMenu = meta.menu === undefined ? to.query.menu : meta.menu;
|
||||||
@@ -59,7 +62,7 @@ router.beforeEach((to, from, next) => {
|
|||||||
fullPath: tabKeyOf(to),
|
fullPath: tabKeyOf(to),
|
||||||
params: to.params,
|
params: to.params,
|
||||||
query: to.query,
|
query: to.query,
|
||||||
meta: meta,
|
meta: { ...meta, keepAlive: true },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
next();
|
next();
|
||||||
|
|||||||
+13
-10
@@ -2,6 +2,7 @@ import website from '@/config/website';
|
|||||||
import { getToken } from '@/utils/auth';
|
import { getToken } from '@/utils/auth';
|
||||||
import store from '@/store';
|
import store from '@/store';
|
||||||
import { generateIframePath, processUrlForQuery, isURL } from './router';
|
import { generateIframePath, processUrlForQuery, isURL } from './router';
|
||||||
|
import { wrapViewLoader } from '@/utils/chunk-reload';
|
||||||
const modules = import.meta.glob('../**/**/*.vue');
|
const modules = import.meta.glob('../**/**/*.vue');
|
||||||
|
|
||||||
// 将多级路由扁平化为二级路由,支持 keep-alive 跨层级缓存
|
// 将多级路由扁平化为二级路由,支持 keep-alive 跨层级缓存
|
||||||
@@ -96,21 +97,23 @@ RouterPlugin.install = function (option = {}) {
|
|||||||
component: (() => {
|
component: (() => {
|
||||||
// 判断是否为首路由
|
// 判断是否为首路由
|
||||||
if (first) {
|
if (first) {
|
||||||
return modules[
|
return wrapViewLoader(
|
||||||
option.store.getters.isMacOs || !website.setting.menu
|
modules[
|
||||||
? '../page/index/layout.vue'
|
option.store.getters.isMacOs || !website.setting.menu
|
||||||
: '../page/index/index.vue'
|
? '../page/index/layout.vue'
|
||||||
];
|
: '../page/index/index.vue'
|
||||||
|
]
|
||||||
|
);
|
||||||
// 判断是否为多层路由
|
// 判断是否为多层路由
|
||||||
} else if (isChild && !first) {
|
} else if (isChild && !first) {
|
||||||
return modules['../page/index/layout.vue'];
|
return wrapViewLoader(modules['../page/index/layout.vue']);
|
||||||
// 判断是否为最终的页面视图
|
// 判断是否为最终的页面视图
|
||||||
} else {
|
} else {
|
||||||
let result = modules[`../${component}.vue`];
|
let result = modules[`../${component}.vue`];
|
||||||
if (!result) {
|
if (!result) {
|
||||||
isComponent = false;
|
isComponent = false;
|
||||||
}
|
}
|
||||||
return result;
|
return wrapViewLoader(result);
|
||||||
}
|
}
|
||||||
})(),
|
})(),
|
||||||
name,
|
name,
|
||||||
@@ -127,7 +130,7 @@ RouterPlugin.install = function (option = {}) {
|
|||||||
if (first) {
|
if (first) {
|
||||||
oMenu[propsDefault.path] = `${path}`;
|
oMenu[propsDefault.path] = `${path}`;
|
||||||
let componentPath = oMenu.component || component;
|
let componentPath = oMenu.component || component;
|
||||||
let result = modules[`../${componentPath}.vue`];
|
let result = wrapViewLoader(modules[`../${componentPath}.vue`]);
|
||||||
if (!result) {
|
if (!result) {
|
||||||
isComponent = false;
|
isComponent = false;
|
||||||
}
|
}
|
||||||
@@ -173,7 +176,7 @@ export const formatPath = (ele, first) => {
|
|||||||
const icon = ele[propsDefault.icon];
|
const icon = ele[propsDefault.icon];
|
||||||
ele[propsDefault.icon] = icon || '';
|
ele[propsDefault.icon] = icon || '';
|
||||||
ele.meta = {
|
ele.meta = {
|
||||||
keepAlive: ele.isOpen === 2,
|
keepAlive: true,
|
||||||
};
|
};
|
||||||
const iframeComponent = 'components/iframe/main';
|
const iframeComponent = 'components/iframe/main';
|
||||||
const iframeSrc = href => {
|
const iframeSrc = href => {
|
||||||
@@ -215,7 +218,7 @@ export const formatPath = (ele, first) => {
|
|||||||
ele[propsDefault.children].forEach(child => {
|
ele[propsDefault.children].forEach(child => {
|
||||||
child.component = 'views' + child[propsDefault.path];
|
child.component = 'views' + child[propsDefault.path];
|
||||||
child.meta = {
|
child.meta = {
|
||||||
keepAlive: child.isOpen === 2,
|
keepAlive: true,
|
||||||
};
|
};
|
||||||
if (isURL(child[propsDefault.href])) {
|
if (isURL(child[propsDefault.href])) {
|
||||||
let href = child[propsDefault.href];
|
let href = child[propsDefault.href];
|
||||||
|
|||||||
+1
-1
@@ -128,5 +128,5 @@ export function tabView(route, Component) {
|
|||||||
};
|
};
|
||||||
wrapperMap.set(tabKey, wrapper);
|
wrapperMap.set(tabKey, wrapper);
|
||||||
}
|
}
|
||||||
return h(wrapper);
|
return wrapper;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,11 +16,8 @@ const getters = {
|
|||||||
lockPasswd: state => state.common.lockPasswd,
|
lockPasswd: state => state.common.lockPasswd,
|
||||||
tagList: state => state.tags.tagList,
|
tagList: state => state.tags.tagList,
|
||||||
tagsKeep: (state, getters) => {
|
tagsKeep: (state, getters) => {
|
||||||
return getters.tagList
|
// 所有已打开标签均纳入 keep-alive,关闭标签后自动从白名单移除并释放实例
|
||||||
.filter(ele => {
|
return getters.tagList.map(ele => ele.fullPath).filter(Boolean);
|
||||||
return (ele.meta || {}).keepAlive;
|
|
||||||
})
|
|
||||||
.map(ele => ele.fullPath);
|
|
||||||
},
|
},
|
||||||
tagWel: state => state.tags.tagWel,
|
tagWel: state => state.tags.tagWel,
|
||||||
token: state => state.user.token,
|
token: state => state.user.token,
|
||||||
|
|||||||
+137
-7
@@ -1,38 +1,168 @@
|
|||||||
/**
|
/**
|
||||||
* 懒加载 chunk / CSS preload 失败后的整页恢复。
|
* 懒加载 chunk / CSS preload 失败后的整页恢复。
|
||||||
* 常见于:部署后旧 hash 失效、静态服务空闲断连、代理 CONNECTION_RESET。
|
* 常见于:部署后旧 hash 失效、静态服务空闲断连、代理 CONNECTION_RESET。
|
||||||
|
*
|
||||||
|
* 失败后必须整页刷新:旧入口里的 hashed 资源地址不会自行更新,
|
||||||
|
* 仅捕获路由错误而不刷新时,未打开过的页面会一直无法进入。
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const RELOAD_FLAG = 'app:chunk-reload-ts';
|
const RELOAD_FLAG = 'app:chunk-reload-ts';
|
||||||
const RELOAD_COOLDOWN_MS = 10000;
|
const RELOAD_QUERY = '_chunkreload';
|
||||||
|
const RELOAD_COOLDOWN_MS = 15000;
|
||||||
|
|
||||||
const CHUNK_ERROR_RE =
|
const CHUNK_ERROR_RE =
|
||||||
/Failed to fetch dynamically imported module|Importing a module script failed|Unable to preload CSS|error loading dynamically imported module|Loading CSS chunk|Loading chunk .+ failed|ChunkLoadError/i;
|
/Failed to fetch dynamically imported module|Importing a module script failed|Unable to preload CSS|error loading dynamically imported module|Loading CSS chunk|Loading chunk .+ failed|ChunkLoadError|Unable to preload|error loading module|Load failed/i;
|
||||||
|
|
||||||
/** 最近一次路由跳转目标,供 onError 时整页落到正确地址 */
|
/** 最近一次路由跳转目标,供 onError 时整页落到正确地址 */
|
||||||
let pendingFullPath = '';
|
let pendingFullPath = '';
|
||||||
|
let installed = false;
|
||||||
|
let reloading = false;
|
||||||
|
|
||||||
export function setPendingRoutePath(fullPath = '') {
|
export function setPendingRoutePath(fullPath = '') {
|
||||||
pendingFullPath = fullPath || '';
|
pendingFullPath = fullPath || '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function collectErrorText(error, depth = 0) {
|
||||||
|
if (!error || depth > 3) return '';
|
||||||
|
if (typeof error === 'string') return error;
|
||||||
|
const parts = [
|
||||||
|
error.message,
|
||||||
|
error.msg,
|
||||||
|
error.name,
|
||||||
|
error.stack,
|
||||||
|
error.error && collectErrorText(error.error, depth + 1),
|
||||||
|
error.reason && collectErrorText(error.reason, depth + 1),
|
||||||
|
error.cause && collectErrorText(error.cause, depth + 1),
|
||||||
|
error.payload && collectErrorText(error.payload, depth + 1),
|
||||||
|
];
|
||||||
|
const target = error.target;
|
||||||
|
if (target && (target.src || target.href)) {
|
||||||
|
parts.push(target.src || target.href);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
parts.push(String(error));
|
||||||
|
} catch (e) {
|
||||||
|
/* ignore */
|
||||||
|
}
|
||||||
|
return parts.filter(Boolean).join(' ');
|
||||||
|
}
|
||||||
|
|
||||||
export function isChunkLoadError(error) {
|
export function isChunkLoadError(error) {
|
||||||
if (!error) return false;
|
const text = collectErrorText(error);
|
||||||
const message = error.message || String(error);
|
if (!text) return false;
|
||||||
return CHUNK_ERROR_RE.test(message);
|
if (CHUNK_ERROR_RE.test(text)) return true;
|
||||||
|
return /Failed to fetch/i.test(text) && /\.m?js(\?|$|:)/i.test(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function hasReloadQuery(query = {}) {
|
||||||
|
return !!(query && query[RELOAD_QUERY] !== undefined);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function consumeReloadQuery(query = {}) {
|
||||||
|
if (!hasReloadQuery(query)) return query;
|
||||||
|
const next = { ...query };
|
||||||
|
delete next[RELOAD_QUERY];
|
||||||
|
return next;
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildReloadUrl(targetPath) {
|
||||||
|
const url = new URL(targetPath, window.location.origin);
|
||||||
|
url.searchParams.set(RELOAD_QUERY, String(Date.now()));
|
||||||
|
return url.pathname + url.search + url.hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @returns {boolean} 是否已触发刷新(冷却期内返回 false,避免死循环)
|
* @returns {boolean} 是否已触发刷新(冷却期内返回 false,避免死循环)
|
||||||
*/
|
*/
|
||||||
export function reloadForChunkError(targetPath) {
|
export function reloadForChunkError(targetPath) {
|
||||||
|
if (reloading) return false;
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const last = Number(sessionStorage.getItem(RELOAD_FLAG) || 0);
|
const last = Number(sessionStorage.getItem(RELOAD_FLAG) || 0);
|
||||||
if (now - last < RELOAD_COOLDOWN_MS) {
|
if (now - last < RELOAD_COOLDOWN_MS) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
reloading = true;
|
||||||
sessionStorage.setItem(RELOAD_FLAG, String(now));
|
sessionStorage.setItem(RELOAD_FLAG, String(now));
|
||||||
const path = targetPath || pendingFullPath || window.location.pathname + window.location.search + window.location.hash;
|
const path =
|
||||||
window.location.assign(path);
|
targetPath ||
|
||||||
|
pendingFullPath ||
|
||||||
|
`${window.location.pathname}${window.location.search}${window.location.hash}`;
|
||||||
|
const dest = buildReloadUrl(path);
|
||||||
|
// cache: 'reload' 会回写 HTTP 缓存,降低 index.html 仍指向旧 hash 资源的概率
|
||||||
|
fetch(`${window.location.pathname}?${RELOAD_QUERY}=${now}`, {
|
||||||
|
cache: 'reload',
|
||||||
|
credentials: 'same-origin',
|
||||||
|
headers: {
|
||||||
|
Pragma: 'no-cache',
|
||||||
|
'Cache-Control': 'no-cache',
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.catch(() => {})
|
||||||
|
.finally(() => {
|
||||||
|
window.location.replace(dest);
|
||||||
|
});
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function wrapViewLoader(loader) {
|
||||||
|
if (typeof loader !== 'function') return loader;
|
||||||
|
return () =>
|
||||||
|
Promise.resolve()
|
||||||
|
.then(() => loader())
|
||||||
|
.catch(error => {
|
||||||
|
if (isChunkLoadError(error)) {
|
||||||
|
reloadForChunkError();
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function installChunkReload() {
|
||||||
|
if (installed || typeof window === 'undefined') return;
|
||||||
|
installed = true;
|
||||||
|
|
||||||
|
window.addEventListener('vite:preloadError', event => {
|
||||||
|
if (reloadForChunkError()) {
|
||||||
|
event.preventDefault();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
window.addEventListener('unhandledrejection', event => {
|
||||||
|
if (!isChunkLoadError(event.reason)) return;
|
||||||
|
if (reloadForChunkError()) {
|
||||||
|
event.preventDefault();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
window.addEventListener(
|
||||||
|
'error',
|
||||||
|
event => {
|
||||||
|
const el = event.target;
|
||||||
|
const isAssetNode =
|
||||||
|
el &&
|
||||||
|
el !== window &&
|
||||||
|
(el.tagName === 'SCRIPT' ||
|
||||||
|
(el.tagName === 'LINK' && /modulepreload|stylesheet/i.test(el.rel || '')));
|
||||||
|
if (isAssetNode || isChunkLoadError(event.error || event.message)) {
|
||||||
|
if (reloadForChunkError()) {
|
||||||
|
event.preventDefault();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
true
|
||||||
|
);
|
||||||
|
|
||||||
|
document.addEventListener('visibilitychange', () => {
|
||||||
|
if (document.visibilityState === 'visible') checkDeployedAssets();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function checkDeployedAssets() {
|
||||||
|
const el = document.querySelector('script[type="module"][src*="/assets/"]');
|
||||||
|
if (!el || !el.src) return;
|
||||||
|
fetch(el.src, { method: 'HEAD', cache: 'no-store', credentials: 'same-origin' })
|
||||||
|
.then(res => {
|
||||||
|
if (res.status === 404) reloadForChunkError();
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,90 +0,0 @@
|
|||||||
/**
|
|
||||||
* 金蝶侧发票附件查看/下载公共工具
|
|
||||||
*
|
|
||||||
* 票池发票附件为 {source:'piaozone', path, name}:path 是金蝶侧文件 id(非 http 直链),
|
|
||||||
* 须由后端代理 A801-2 流式回源;OSS 直链附件(url/link/fileUrl)仍由前端直连下载/预览。
|
|
||||||
* 三处入口共用:票池弹窗、正式结算认领发票行、付款申请发票附件行。
|
|
||||||
*/
|
|
||||||
import { ElMessage } from 'element-plus';
|
|
||||||
import { downloadFile } from '@/utils/util';
|
|
||||||
import { downloadInvoicePoolAttachment } from '@/api/payment/invoiceReceipt';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 金蝶侧附件判定:source=piaozone,或有 path 且非 http(s) 直链
|
|
||||||
* @param {Object|Null} attachment 附件对象(attachmentsJson/attachmentJson 行内首项)
|
|
||||||
* @returns {Boolean}
|
|
||||||
*/
|
|
||||||
export const isKingdeePathAttachment = attachment => {
|
|
||||||
if (!attachment) return false;
|
|
||||||
if (attachment.source === 'piaozone') return true;
|
|
||||||
return Boolean(attachment.path) && !/^https?:\/\//i.test(attachment.path);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 请求金蝶文件流:成功返回 Blob;业务失败为 HTTP 200 + R.fail JSON(响应通道未写流时后端即失败),
|
|
||||||
* 按 Content-Type 识别并抛出带 msg 的错误;网络级失败拦截器已提示,标记 silent 避免重复提示
|
|
||||||
* @param {String} invoiceNo 发票号码
|
|
||||||
* @returns {Promise<Blob>}
|
|
||||||
*/
|
|
||||||
const requestKingdeeFile = async invoiceNo => {
|
|
||||||
let res;
|
|
||||||
try {
|
|
||||||
res = await downloadInvoicePoolAttachment(invoiceNo);
|
|
||||||
} catch (error) {
|
|
||||||
throw Object.assign(new Error(error?.message || '附件下载失败'), { silent: true });
|
|
||||||
}
|
|
||||||
const blob = res?.data;
|
|
||||||
if (!(blob instanceof Blob)) {
|
|
||||||
throw new Error('响应不是文件流');
|
|
||||||
}
|
|
||||||
if (blob.type && blob.type.includes('application/json')) {
|
|
||||||
let message = '附件下载失败';
|
|
||||||
try {
|
|
||||||
const parsed = JSON.parse(await blob.text());
|
|
||||||
message = parsed.msg || parsed.message || message;
|
|
||||||
} catch {
|
|
||||||
// 错误体非 JSON 时按默认提示
|
|
||||||
}
|
|
||||||
throw new Error(message);
|
|
||||||
}
|
|
||||||
return blob;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 下载金蝶侧发票附件(经 A801-2 后端代理),失败统一 ElMessage 提示
|
|
||||||
* @param {String} invoiceNo 发票号码
|
|
||||||
* @param {String} fileName 下载文件名(缺省按 发票号.pdf)
|
|
||||||
*/
|
|
||||||
export const downloadKingdeeInvoiceFile = async (invoiceNo, fileName) => {
|
|
||||||
if (!invoiceNo) {
|
|
||||||
ElMessage.warning('当前发票缺少发票号码,无法下载金蝶侧附件');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
const blob = await requestKingdeeFile(invoiceNo);
|
|
||||||
downloadFile(blob, fileName || `${invoiceNo}.pdf`);
|
|
||||||
} catch (error) {
|
|
||||||
if (!error?.silent) ElMessage.error(error?.message || '金蝶附件下载失败');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新窗口预览金蝶侧发票附件:拉取 Blob 转 objectURL(PDF 可预览;OFD 等浏览器不可预览的格式由浏览器触发下载)
|
|
||||||
* @param {String} invoiceNo 发票号码
|
|
||||||
* @param {String} fileName 预览文件名(缺省按 发票号.pdf)
|
|
||||||
*/
|
|
||||||
export const viewKingdeeInvoiceFile = async (invoiceNo, fileName) => {
|
|
||||||
if (!invoiceNo) {
|
|
||||||
ElMessage.warning('当前发票缺少发票号码,无法预览金蝶侧附件');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
const blob = await requestKingdeeFile(invoiceNo);
|
|
||||||
const url = URL.createObjectURL(blob);
|
|
||||||
window.open(url, '_blank');
|
|
||||||
// 延迟释放 objectURL:立即回收可能导致新窗口尚未加载完成即失效
|
|
||||||
setTimeout(() => URL.revokeObjectURL(url), 60000);
|
|
||||||
} catch (error) {
|
|
||||||
if (!error?.silent) ElMessage.error(error?.message || '金蝶附件预览失败');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,8 +1,51 @@
|
|||||||
<template>
|
<template>
|
||||||
<div v-loading="loading" class="master-detail">
|
<div v-loading="loading" class="master-detail">
|
||||||
<section v-if="master" class="detail-overview">
|
<section v-if="master" class="detail-overview">
|
||||||
<div class="detail-heading"><div><h2>多联总单详情 <span>|</span> {{ master.masterNo }}</h2><el-tag :type="statusType(master.businessStatus)" class="status-text">{{ statusName(master.businessStatus) }}</el-tag><el-tag v-if="transportFlowLabel" type="info" class="transport-flow-tag">{{ transportFlowLabel }}</el-tag></div><el-button @click="$emit('back')">取消</el-button></div>
|
<div class="detail-heading"><div><h2>多联总单详情 <span>|</span> {{ master.masterNo }}</h2><el-tag :type="statusType(master.businessStatus)" class="status-text">{{ statusName(master.businessStatus) }}</el-tag><el-tag v-if="transportFlowLabel" type="info" class="transport-flow-tag">{{ transportFlowLabel }}</el-tag></div></div>
|
||||||
<dl class="detail-meta"><div><dt>客户</dt><dd>{{ master.customerName || '-' }}</dd></div><div><dt>合同编号</dt><dd>{{ master.contractNo || '-' }}</dd></div><div><dt>项目</dt><dd>{{ master.projectName || '-' }}</dd></div><div class="detail-meta__attachments"><dt>附件</dt><dd><template v-if="attachments.length"><el-link v-for="file in attachments" :key="file.url || file.link || file.name || file.originalName" type="primary" @click="previewAttachment(file)">{{ attachmentName(file) }}</el-link></template><span v-else>-</span></dd></div></dl>
|
<dl class="detail-meta">
|
||||||
|
<div>
|
||||||
|
<dt>客户</dt>
|
||||||
|
<dd>
|
||||||
|
<el-link v-if="master.customerName" type="primary" @click="openCustomer">{{
|
||||||
|
master.customerName
|
||||||
|
}}</el-link>
|
||||||
|
<span v-else>-</span>
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt>合同编号</dt>
|
||||||
|
<dd>
|
||||||
|
<el-link v-if="master.contractNo && master.contractId" type="primary" @click="openContract">{{
|
||||||
|
master.contractNo
|
||||||
|
}}</el-link>
|
||||||
|
<span v-else>{{ master.contractNo || '-' }}</span>
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt>项目</dt>
|
||||||
|
<dd>
|
||||||
|
<el-link v-if="master.projectName && master.projectId" type="primary" @click="openProject">{{
|
||||||
|
master.projectName
|
||||||
|
}}</el-link>
|
||||||
|
<span v-else>{{ master.projectName || '-' }}</span>
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
<div class="detail-meta__attachments">
|
||||||
|
<dt>附件</dt>
|
||||||
|
<dd>
|
||||||
|
<template v-if="attachments.length">
|
||||||
|
<el-link
|
||||||
|
v-for="file in attachments"
|
||||||
|
:key="file.url || file.link || file.name || file.originalName"
|
||||||
|
type="primary"
|
||||||
|
@click="previewAttachment(file)"
|
||||||
|
>{{ attachmentName(file) }}</el-link
|
||||||
|
>
|
||||||
|
</template>
|
||||||
|
<span v-else>-</span>
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
</dl>
|
||||||
<div class="route-map"><template v-for="(route, index) in segments" :key="route.segmentNo"><div class="route-map__node"><span :class="['route-badge', index ? 'middle' : 'start']">{{ index ? '经' : '起' }}</span><strong>{{ segmentLocationName(route, 'departure') }}</strong><small>{{ route.departureAddress || '-' }}</small><small class="route-map__progress">{{ index ? `已到达 ${quantity(segments[index - 1].arrivedQuantity)}/${quantity(master.totalQuantity)} ${plannedUnit(segments[index - 1])}` : `已调度 ${quantity(route.dispatchedQuantity)}/${quantity(master.totalQuantity)} ${plannedUnit(route)}` }}</small><small v-if="index" class="route-map__progress">已调度 {{ quantity(route.dispatchedQuantity) }}/{{ quantity(master.totalQuantity) }} {{ plannedUnit(route) }}</small></div><div class="route-map__line"></div><div v-if="index === segments.length - 1" class="route-map__node"><span class="route-badge end">终</span><strong>{{ segmentLocationName(route, 'arrival') }}</strong><small>{{ route.arrivalAddress || '-' }}</small><small class="route-map__progress">已到达 {{ quantity(route.arrivedQuantity) }}/{{ quantity(master.totalQuantity) }} {{ plannedUnit(route) }}</small></div></template></div>
|
<div class="route-map"><template v-for="(route, index) in segments" :key="route.segmentNo"><div class="route-map__node"><span :class="['route-badge', index ? 'middle' : 'start']">{{ index ? '经' : '起' }}</span><strong>{{ segmentLocationName(route, 'departure') }}</strong><small>{{ route.departureAddress || '-' }}</small><small class="route-map__progress">{{ index ? `已到达 ${quantity(segments[index - 1].arrivedQuantity)}/${quantity(master.totalQuantity)} ${plannedUnit(segments[index - 1])}` : `已调度 ${quantity(route.dispatchedQuantity)}/${quantity(master.totalQuantity)} ${plannedUnit(route)}` }}</small><small v-if="index" class="route-map__progress">已调度 {{ quantity(route.dispatchedQuantity) }}/{{ quantity(master.totalQuantity) }} {{ plannedUnit(route) }}</small></div><div class="route-map__line"></div><div v-if="index === segments.length - 1" class="route-map__node"><span class="route-badge end">终</span><strong>{{ segmentLocationName(route, 'arrival') }}</strong><small>{{ route.arrivalAddress || '-' }}</small><small class="route-map__progress">已到达 {{ quantity(route.arrivedQuantity) }}/{{ quantity(master.totalQuantity) }} {{ plannedUnit(route) }}</small></div></template></div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -42,6 +85,8 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import * as api from '@/api/business/master-order';
|
import * as api from '@/api/business/master-order';
|
||||||
|
import { getDetail as getProjectDetail } from '@/api/business/project-apply';
|
||||||
|
import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
|
||||||
import { CaretBottom, CaretTop } from '@element-plus/icons-vue';
|
import { CaretBottom, CaretTop } from '@element-plus/icons-vue';
|
||||||
import { ElImageViewer } from 'element-plus';
|
import { ElImageViewer } from 'element-plus';
|
||||||
import { OpenFileViewer } from '@open-file-viewer/vue';
|
import { OpenFileViewer } from '@open-file-viewer/vue';
|
||||||
@@ -51,10 +96,26 @@ import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
|
|||||||
|
|
||||||
const viewerPlugins = [imagePlugin(), pdfPlugin({ workerSrc: pdfWorkerSrc, useFetchData: true }), officePlugin({ pdf: { workerSrc: pdfWorkerSrc, useFetchData: true } }), textPlugin(), fallbackPlugin()];
|
const viewerPlugins = [imagePlugin(), pdfPlugin({ workerSrc: pdfWorkerSrc, useFetchData: true }), officePlugin({ pdf: { workerSrc: pdfWorkerSrc, useFetchData: true } }), textPlugin(), fallbackPlugin()];
|
||||||
|
|
||||||
|
const parseJsonArray = value => {
|
||||||
|
if (Array.isArray(value)) return value;
|
||||||
|
if (!value) return [];
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(value);
|
||||||
|
if (Array.isArray(parsed)) return parsed;
|
||||||
|
return parsed && typeof parsed === 'object' ? [parsed] : [];
|
||||||
|
} catch (error) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const customerRowLabel = (row = {}) =>
|
||||||
|
row.customer || row.fullName || row.shortName || row.customerName || row.customerCode || '';
|
||||||
|
|
||||||
|
const customerRowId = (row = {}) => row.id || row.customerId || '';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { ElImageViewer, OpenFileViewer },
|
components: { ElImageViewer, OpenFileViewer },
|
||||||
props: { id: [String, Number] },
|
props: { id: [String, Number] },
|
||||||
emits: ['back'],
|
|
||||||
data() { return { loading: false, master: null, expandedSegments: {}, CaretBottom, CaretTop, imagePreviewVisible: false, imagePreviewUrls: [], imagePreviewIndex: 0, documentPreviewVisible: false, previewFile: {}, viewerPlugins, viewerToolbar: { download: true, fullscreen: true, print: true, rotate: true, zoom: true } }; },
|
data() { return { loading: false, master: null, expandedSegments: {}, CaretBottom, CaretTop, imagePreviewVisible: false, imagePreviewUrls: [], imagePreviewIndex: 0, documentPreviewVisible: false, previewFile: {}, viewerPlugins, viewerToolbar: { download: true, fullscreen: true, print: true, rotate: true, zoom: true } }; },
|
||||||
computed: {
|
computed: {
|
||||||
segments() {
|
segments() {
|
||||||
@@ -148,6 +209,68 @@ export default {
|
|||||||
this.$router.push({ path: '/business/waybill-manage/detail', query: { id: row.id } });
|
this.$router.push({ path: '/business/waybill-manage/detail', query: { id: row.id } });
|
||||||
},
|
},
|
||||||
openPlan(row) { this.$router.push({ path: '/business/transport-plan', query: { detailId: row.id } }); },
|
openPlan(row) { this.$router.push({ path: '/business/transport-plan', query: { detailId: row.id } }); },
|
||||||
|
openContract() {
|
||||||
|
if (!this.master?.contractId) {
|
||||||
|
this.$message.warning('合同信息缺失,无法打开');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.$router.push({
|
||||||
|
path: '/business/contract-manage/detail',
|
||||||
|
query: { id: this.master.contractId, name: '合同详情' },
|
||||||
|
});
|
||||||
|
},
|
||||||
|
openProject() {
|
||||||
|
if (!this.master?.projectId) {
|
||||||
|
this.$message.warning('项目信息缺失,无法打开');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.$router.push({
|
||||||
|
path: '/business/project-apply/form',
|
||||||
|
query: { mode: 'view', id: this.master.projectId, name: '查看项目管理' },
|
||||||
|
});
|
||||||
|
},
|
||||||
|
async resolveCustomerId() {
|
||||||
|
if (this.master?.customerId) return this.master.customerId;
|
||||||
|
const name = String(this.master?.customerName || '').trim();
|
||||||
|
if (!name) return '';
|
||||||
|
if (this.master?.projectId) {
|
||||||
|
try {
|
||||||
|
const res = await getProjectDetail(this.master.projectId);
|
||||||
|
const rows = parseJsonArray(res.data?.data?.customerJson);
|
||||||
|
const matched =
|
||||||
|
rows.find(row => customerRowLabel(row) === name) ||
|
||||||
|
rows.find(row => {
|
||||||
|
const label = customerRowLabel(row);
|
||||||
|
return label && (name.includes(label) || label.includes(name));
|
||||||
|
});
|
||||||
|
const id = customerRowId(matched);
|
||||||
|
if (id) return id;
|
||||||
|
} catch (error) {
|
||||||
|
// 项目客户解析失败时回退到客商档案检索
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const res = await getCustomerArchiveList(1, 20, { fullName: name });
|
||||||
|
const records = res.data?.data?.records || [];
|
||||||
|
const exact =
|
||||||
|
records.find(item => item.fullName === name || item.shortName === name) || records[0];
|
||||||
|
return exact?.id || '';
|
||||||
|
} catch (error) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async openCustomer() {
|
||||||
|
if (!this.master?.customerName) return;
|
||||||
|
const customerId = await this.resolveCustomerId();
|
||||||
|
if (!customerId) {
|
||||||
|
this.$message.warning('未找到对应客商档案,无法打开');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.$router.push({
|
||||||
|
path: '/vehicle/customer-archive/form',
|
||||||
|
query: { id: String(customerId), name: '查看客商档案', view: '1' },
|
||||||
|
});
|
||||||
|
},
|
||||||
waybillStatusName(value) { return ({ pending: '待执行', waiting: '待执行', running: '进行中', processing: '进行中', completed: '已完成', cancelled: '已取消' })[value] || value || '-'; },
|
waybillStatusName(value) { return ({ pending: '待执行', waiting: '待执行', running: '进行中', processing: '进行中', completed: '已完成', cancelled: '已取消' })[value] || value || '-'; },
|
||||||
waybillStatusType(value) { return ({ pending: 'info', waiting: 'info', running: 'warning', processing: 'warning', completed: 'success', cancelled: 'danger' })[value] || 'info'; },
|
waybillStatusType(value) { return ({ pending: 'info', waiting: 'info', running: 'warning', processing: 'warning', completed: 'success', cancelled: 'danger' })[value] || 'info'; },
|
||||||
statusName(value) { return ({ waiting_dispatch: '待调度', dispatching: '调度中', completed: '调度完成', closed: '调度关闭' })[value] || value || '-'; },
|
statusName(value) { return ({ waiting_dispatch: '待调度', dispatching: '调度中', completed: '调度完成', closed: '调度关闭' })[value] || value || '-'; },
|
||||||
@@ -161,7 +284,7 @@ export default {
|
|||||||
.detail-overview, .execution-detail-card { margin-bottom: 8px; border: 1px solid #eff1f7; background: #fff; }
|
.detail-overview, .execution-detail-card { margin-bottom: 8px; border: 1px solid #eff1f7; background: #fff; }
|
||||||
.detail-heading { display: flex; align-items: center; justify-content: space-between; padding: 18px 24px; h2 { display: inline-block; margin: 0 16px 0 0; font-size: 20px; } h2 span { margin: 0 8px; color: #909399; font-weight: 400; } }
|
.detail-heading { display: flex; align-items: center; justify-content: space-between; padding: 18px 24px; h2 { display: inline-block; margin: 0 16px 0 0; font-size: 20px; } h2 span { margin: 0 8px; color: #909399; font-weight: 400; } }
|
||||||
.transport-flow-tag { margin-left: 8px; }
|
.transport-flow-tag { margin-left: 8px; }
|
||||||
.detail-meta { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 18px 24px; margin: 0; padding: 0 24px 20px; dt { margin-bottom: 6px; color: #909399; font-size: 13px; } dd { display: flex; flex-wrap: wrap; gap: 8px 16px; margin: 0; color: #409eff; font-size: 14px; word-break: break-all; } }
|
.detail-meta { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 18px 24px; margin: 0; padding: 0 24px 20px; dt { margin-bottom: 6px; color: #909399; font-size: 13px; } dd { display: flex; flex-wrap: wrap; gap: 8px 16px; margin: 0; color: #303133; font-size: 14px; word-break: break-all; } :deep(.el-link) { font-size: 14px; } }
|
||||||
.route-map { display: flex; align-items: flex-start; padding: 16px 24px 20px; border-top: 1px solid #eff1f7; overflow-x: auto; }
|
.route-map { display: flex; align-items: flex-start; padding: 16px 24px 20px; border-top: 1px solid #eff1f7; overflow-x: auto; }
|
||||||
.route-map__node { display: grid; flex: 0 0 150px; justify-items: center; gap: 6px; text-align: center; strong { font-size: 16px; white-space: nowrap; } small { color: #606266; white-space: nowrap; } }
|
.route-map__node { display: grid; flex: 0 0 150px; justify-items: center; gap: 6px; text-align: center; strong { font-size: 16px; white-space: nowrap; } small { color: #606266; white-space: nowrap; } }
|
||||||
.route-map__progress { color: #303133 !important; }
|
.route-map__progress { color: #303133 !important; }
|
||||||
|
|||||||
@@ -95,10 +95,51 @@
|
|||||||
<div class="goods-heading"><h3>货物信息</h3><div><el-link type="primary" @click="addGoods(route)">新增货物</el-link></div></div>
|
<div class="goods-heading"><h3>货物信息</h3><div><el-link type="primary" @click="addGoods(route)">新增货物</el-link></div></div>
|
||||||
<el-table :data="route.goods" border class="goods-table">
|
<el-table :data="route.goods" border class="goods-table">
|
||||||
<el-table-column type="index" label="序号" width="64" />
|
<el-table-column type="index" label="序号" width="64" />
|
||||||
<el-table-column min-width="180"><template #header><span>货物类型<span class="goods-required-mark">*</span></span></template><template #default="{ row }"><el-cascader v-model="row.cargoTypePath" class="goods-table__cargo-type" :options="cargoTypeOptions" :props="cargoTypeCascaderProps" placeholder="请选择货物类型" clearable filterable @change="value => handleCargoTypeChange(route, row, value)" /></template></el-table-column>
|
<el-table-column min-width="180"
|
||||||
<el-table-column min-width="180"><template #header><span>货物名称<span class="goods-required-mark">*</span></span></template><template #default="{ row }"><el-select v-model="row.sourceIndex" class="goods-table__cargo-name" placeholder="请选择总单货物" @change="selectGoods(route, row)"><el-option v-for="item in masterGoodsByCargoType(row)" :key="item.sourceIndex" :label="item.cargoName" :value="item.sourceIndex" /></el-select></template></el-table-column>
|
><template #header
|
||||||
<el-table-column prop="remainingQuantity" column-key="remainingQuantity" label="剩余数量" width="150" class-name="goods-table__remaining"><template #default="{ row }">{{ formatQuantity(goodsRemainingQuantity(route, row)) }}</template></el-table-column>
|
><span>货物类型<span class="goods-required-mark">*</span></span></template
|
||||||
<el-table-column prop="dispatchQuantity" column-key="dispatchQuantity" width="200" class-name="goods-table__dispatch"><template #header><span>本次数量<span class="goods-required-mark">*</span></span></template><template #default="{ row }"><el-input :model-value="row.dispatchQuantity" inputmode="decimal" placeholder="请输入" @input="value => handleDispatchQuantityInput(route, row, value)" /></template></el-table-column>
|
><template #default="{ row }"
|
||||||
|
><el-autocomplete
|
||||||
|
v-model="row.cargoType"
|
||||||
|
class="goods-table__cargo-type"
|
||||||
|
clearable
|
||||||
|
:debounce="300"
|
||||||
|
placeholder="请输入货物类型"
|
||||||
|
:fetch-suggestions="fetchCargoTypeSuggestions"
|
||||||
|
@select="item => handleCargoTypeSelect(route, row, item)"
|
||||||
|
@change="value => handleCargoTypeChange(route, row, value)"
|
||||||
|
/></template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column min-width="180"
|
||||||
|
><template #header
|
||||||
|
><span>货物名称<span class="goods-required-mark">*</span></span></template
|
||||||
|
><template #default="{ row }"
|
||||||
|
><el-select
|
||||||
|
v-model="row.sourceIndex"
|
||||||
|
class="goods-table__cargo-name"
|
||||||
|
placeholder="请选择总单货物"
|
||||||
|
@change="selectGoods(route, row)"
|
||||||
|
><el-option
|
||||||
|
v-for="item in masterGoodsByCargoType(row)"
|
||||||
|
:key="item.sourceIndex"
|
||||||
|
:label="item.cargoName"
|
||||||
|
:value="item.sourceIndex" /></el-select
|
||||||
|
></template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="dispatchQuantity"
|
||||||
|
column-key="dispatchQuantity"
|
||||||
|
width="200"
|
||||||
|
class-name="goods-table__dispatch"
|
||||||
|
><template #header
|
||||||
|
><span>本次数量<span class="goods-required-mark">*</span></span></template
|
||||||
|
><template #default="{ row }"
|
||||||
|
><el-input
|
||||||
|
:model-value="row.dispatchQuantity"
|
||||||
|
inputmode="decimal"
|
||||||
|
placeholder="请输入"
|
||||||
|
@input="value => handleDispatchQuantityInput(route, row, value)" /></template
|
||||||
|
></el-table-column>
|
||||||
<el-table-column prop="quantityUnit" width="110"><template #header><span>数量单位<span class="goods-required-mark">*</span></span></template></el-table-column>
|
<el-table-column prop="quantityUnit" width="110"><template #header><span>数量单位<span class="goods-required-mark">*</span></span></template></el-table-column>
|
||||||
<el-table-column prop="packageType" label="包装" min-width="110" />
|
<el-table-column prop="packageType" label="包装" min-width="110" />
|
||||||
<el-table-column prop="brand" label="品牌" min-width="110" />
|
<el-table-column prop="brand" label="品牌" min-width="110" />
|
||||||
@@ -208,7 +249,7 @@ export default {
|
|||||||
props: { id: [String, Number] },
|
props: { id: [String, Number] },
|
||||||
emits: ['back'],
|
emits: ['back'],
|
||||||
data() {
|
data() {
|
||||||
return { loading: false, submitting: false, master: null, routes: [], pending: [], pendingExpanded: false, editingId: null, driverInputs: {}, carrierOptions: [], driverOptions: [], carrierLoading: false, driverLoading: false, escortLoading: false, cargoTypeOptions: [], cargoTypeCascaderProps: { label: 'cargoName', value: 'id', children: 'children', emitPath: true }, quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'] };
|
return { loading: false, submitting: false, master: null, routes: [], pending: [], pendingExpanded: false, editingId: null, driverInputs: {}, carrierOptions: [], driverOptions: [], carrierLoading: false, driverLoading: false, escortLoading: false, quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'] };
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
totalQuantity() { return (this.master?.goods || []).reduce((sum, item) => sum + Number(item.quantity || 0), 0); },
|
totalQuantity() { return (this.master?.goods || []).reduce((sum, item) => sum + Number(item.quantity || 0), 0); },
|
||||||
@@ -216,6 +257,9 @@ export default {
|
|||||||
goodsNames() { return (this.master?.goods || []).map(item => item.cargoName).filter(Boolean).join('、') || '-'; },
|
goodsNames() { return (this.master?.goods || []).map(item => item.cargoName).filter(Boolean).join('、') || '-'; },
|
||||||
goodsTypes() { return [...new Set((this.master?.goods || []).map(item => item.cargoType).filter(Boolean))].join('、') || '-'; },
|
goodsTypes() { return [...new Set((this.master?.goods || []).map(item => item.cargoType).filter(Boolean))].join('、') || '-'; },
|
||||||
masterGoods() { return (this.master?.goods || []).map((item, sourceIndex) => ({ ...item, sourceIndex, label: [item.cargoName, item.cargoType].filter(Boolean).join(' / ') })); },
|
masterGoods() { return (this.master?.goods || []).map((item, sourceIndex) => ({ ...item, sourceIndex, label: [item.cargoName, item.cargoType].filter(Boolean).join(' / ') })); },
|
||||||
|
cargoTypeSelectOptions() {
|
||||||
|
return [...new Set((this.master?.goods || []).map(item => item.cargoType).filter(Boolean))];
|
||||||
|
},
|
||||||
dateRange() { return this.master?.planStartTime && this.master?.planEndTime ? `${String(this.master.planStartTime).slice(0, 10)} ~ ${String(this.master.planEndTime).slice(0, 10)}` : '-'; },
|
dateRange() { return this.master?.planStartTime && this.master?.planEndTime ? `${String(this.master.planStartTime).slice(0, 10)} ~ ${String(this.master.planEndTime).slice(0, 10)}` : '-'; },
|
||||||
pendingGroups() {
|
pendingGroups() {
|
||||||
return this.pending.reduce((groups, item, index) => {
|
return this.pending.reduce((groups, item, index) => {
|
||||||
@@ -256,7 +300,6 @@ export default {
|
|||||||
const res = await api.getDetail(this.id);
|
const res = await api.getDetail(this.id);
|
||||||
this.master = res.data?.data || res.data || res;
|
this.master = res.data?.data || res.data || res;
|
||||||
await this.loadContractCurrency();
|
await this.loadContractCurrency();
|
||||||
this.cargoTypeOptions = this.buildMasterCargoTypeOptions(this.master.goods || []);
|
|
||||||
this.routes = this.dispatchRouteNodes().map((node, index) => this.createRoute(node, index));
|
this.routes = this.dispatchRouteNodes().map((node, index) => this.createRoute(node, index));
|
||||||
} finally { this.loading = false; }
|
} finally { this.loading = false; }
|
||||||
},
|
},
|
||||||
@@ -318,46 +361,42 @@ export default {
|
|||||||
this.syncFreightItems(route);
|
this.syncFreightItems(route);
|
||||||
return route;
|
return route;
|
||||||
},
|
},
|
||||||
buildMasterCargoTypeOptions(goods = []) {
|
|
||||||
return [...new Set(goods.map(item => item.cargoType).filter(Boolean))].map(cargoType => ({
|
|
||||||
id: cargoType,
|
|
||||||
cargoName: cargoType,
|
|
||||||
}));
|
|
||||||
},
|
|
||||||
masterGoodsByCargoType(row = {}) {
|
masterGoodsByCargoType(row = {}) {
|
||||||
return this.masterGoods.filter(item => !row.cargoType || item.cargoType === row.cargoType);
|
const cargoType = String(row.cargoType || '').trim();
|
||||||
|
if (!cargoType) return this.masterGoods;
|
||||||
|
const matched = this.masterGoods.filter(item => item.cargoType === cargoType);
|
||||||
|
return matched.length ? matched : this.masterGoods;
|
||||||
},
|
},
|
||||||
findCargoTypeByPath(path = []) {
|
fetchCargoTypeSuggestions(queryString, callback) {
|
||||||
let options = this.cargoTypeOptions;
|
const keyword = String(queryString || '').trim().toLowerCase();
|
||||||
let selected;
|
const options = this.cargoTypeSelectOptions.map(item => ({ value: item }));
|
||||||
(path || []).forEach(id => {
|
callback(
|
||||||
selected = (options || []).find(item => String(item.id) === String(id));
|
keyword ? options.filter(item => String(item.value).toLowerCase().includes(keyword)) : options
|
||||||
options = selected?.children || [];
|
);
|
||||||
});
|
|
||||||
return selected;
|
|
||||||
},
|
},
|
||||||
findCargoTypePath(cargoType, options = this.cargoTypeOptions, parentPath = []) {
|
handleCargoTypeSelect(route, row, item = {}) {
|
||||||
for (const option of options || []) {
|
this.handleCargoTypeChange(route, row, item.value || '');
|
||||||
const path = [...parentPath, option.id];
|
|
||||||
if (option.cargoName === cargoType) return path;
|
|
||||||
if (option.children?.length) {
|
|
||||||
const result = this.findCargoTypePath(cargoType, option.children, path);
|
|
||||||
if (result.length) return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return [];
|
|
||||||
},
|
},
|
||||||
handleCargoTypeChange(route, row, value) {
|
handleCargoTypeChange(route, row, value) {
|
||||||
const path = Array.isArray(value) ? value : [];
|
row.cargoType = String(value ?? row.cargoType ?? '').trim();
|
||||||
const cargoType = this.findCargoTypeByPath(path);
|
const matched = this.masterGoods.filter(item => item.cargoType === row.cargoType);
|
||||||
row.cargoTypePath = path;
|
const firstGoods = matched[0];
|
||||||
row.cargoType = cargoType?.cargoName || '';
|
|
||||||
const firstGoods = this.masterGoodsByCargoType(row)[0];
|
|
||||||
if (firstGoods) {
|
if (firstGoods) {
|
||||||
row.sourceIndex = firstGoods.sourceIndex;
|
row.sourceIndex = firstGoods.sourceIndex;
|
||||||
this.selectGoods(route, row);
|
this.selectGoods(route, row);
|
||||||
|
} else {
|
||||||
|
Object.assign(row, {
|
||||||
|
sourceIndex: undefined,
|
||||||
|
cargoName: '',
|
||||||
|
quantity: '',
|
||||||
|
quantityUnit: '',
|
||||||
|
packageType: '',
|
||||||
|
brand: '',
|
||||||
|
specification: '',
|
||||||
|
model: '',
|
||||||
|
materialCode: '',
|
||||||
|
});
|
||||||
}
|
}
|
||||||
else Object.assign(row, { sourceIndex: undefined, cargoName: '', quantity: '', quantityUnit: '' });
|
|
||||||
this.syncFreightItems(route);
|
this.syncFreightItems(route);
|
||||||
},
|
},
|
||||||
isRoad(route) {
|
isRoad(route) {
|
||||||
@@ -542,53 +581,48 @@ export default {
|
|||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
pendingGoodsQuantity(route, row) {
|
|
||||||
const goodsIndex = this.masterGoodsIndex(row);
|
|
||||||
return this.pending.reduce((sum, item) => {
|
|
||||||
if (!this.isSameRouteSegment(route, item)) return sum;
|
|
||||||
const pendingGoodsIndex = this.masterGoodsIndex(item);
|
|
||||||
if (
|
|
||||||
(goodsIndex >= 0 && pendingGoodsIndex >= 0 && pendingGoodsIndex !== goodsIndex) ||
|
|
||||||
(goodsIndex < 0 && !this.isSameGoods(item, row))
|
|
||||||
) {
|
|
||||||
return sum;
|
|
||||||
}
|
|
||||||
return sum + this.quantityNumber(item.quantity);
|
|
||||||
}, 0);
|
|
||||||
},
|
|
||||||
isSameRouteSegment(route = {}, item = {}) {
|
isSameRouteSegment(route = {}, item = {}) {
|
||||||
const routeSegment = route.segmentNo || route.relationNo || '';
|
const routeSegment = route.segmentNo || route.relationNo || '';
|
||||||
const itemSegment = item.segmentNo || item.relationNo || '';
|
const itemSegment = item.segmentNo || item.relationNo || '';
|
||||||
return String(routeSegment) === String(itemSegment);
|
return String(routeSegment) === String(itemSegment);
|
||||||
},
|
},
|
||||||
editingGoodsQuantity(route, row) {
|
|
||||||
return (route.goods || []).reduce((sum, item) => {
|
|
||||||
if (item === row || !this.isSameGoods(item, row)) return sum;
|
|
||||||
return sum + this.quantityNumber(item.dispatchQuantity);
|
|
||||||
}, 0);
|
|
||||||
},
|
|
||||||
goodsRemainingQuantity(route, row) {
|
|
||||||
return Math.max(
|
|
||||||
0,
|
|
||||||
this.baseGoodsRemainingQuantity(route, row) -
|
|
||||||
this.pendingGoodsQuantity(route, row) -
|
|
||||||
this.editingGoodsQuantity(route, row)
|
|
||||||
);
|
|
||||||
},
|
|
||||||
availableDispatchQuantity(route, row) { return this.goodsRemainingQuantity(route, row); },
|
|
||||||
handleDispatchQuantityInput(route, row, value) {
|
handleDispatchQuantityInput(route, row, value) {
|
||||||
const [integer = '', decimal = ''] = String(value || '').replace(/[^\d.]/g, '').split('.');
|
const [integer = '', decimal = ''] = String(value || '').replace(/[^\d.]/g, '').split('.');
|
||||||
const nextValue = decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 3)}` : integer;
|
row.dispatchQuantity =
|
||||||
const availableQuantity = this.availableDispatchQuantity(route, row);
|
decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 3)}` : integer;
|
||||||
if (Number(nextValue || 0) > availableQuantity) {
|
|
||||||
row.dispatchQuantity = this.formatQuantity(availableQuantity);
|
|
||||||
this.syncFreightItems(route);
|
|
||||||
this.$message.warning('本次数量不能超过剩余数量');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
row.dispatchQuantity = nextValue;
|
|
||||||
this.syncFreightItems(route);
|
this.syncFreightItems(route);
|
||||||
},
|
},
|
||||||
|
validatePendingTotals() {
|
||||||
|
for (const route of this.routes) {
|
||||||
|
const items = this.pending.filter(item => this.isSameRouteSegment(route, item));
|
||||||
|
if (!items.length) continue;
|
||||||
|
if (!this.validatePreviousSegmentCompletedQuantity(route, [])) return false;
|
||||||
|
|
||||||
|
const totals = new Map();
|
||||||
|
for (const item of items) {
|
||||||
|
const index = this.masterGoodsIndex(item);
|
||||||
|
const key = index >= 0 ? `i:${index}` : this.goodsKey(item);
|
||||||
|
totals.set(key, (totals.get(key) || 0) + this.quantityNumber(item.quantity));
|
||||||
|
}
|
||||||
|
for (const [key, qty] of totals.entries()) {
|
||||||
|
if (!key.startsWith('i:')) continue;
|
||||||
|
const sourceIndex = Number(key.slice(2));
|
||||||
|
const masterGoods = this.master?.goods?.[sourceIndex];
|
||||||
|
if (!masterGoods) continue;
|
||||||
|
const available = this.baseGoodsRemainingQuantity(route, {
|
||||||
|
...masterGoods,
|
||||||
|
sourceIndex,
|
||||||
|
});
|
||||||
|
if (qty > available) {
|
||||||
|
this.$message.warning(
|
||||||
|
`${route.segmentNo}「${masterGoods.cargoName || ''}」调度总量不能超过剩余数量(${this.formatQuantity(available)} ${masterGoods.quantityUnit || this.quantityUnitLabel})`
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
},
|
||||||
handleFreightUnitPriceInput(item, value) {
|
handleFreightUnitPriceInput(item, value) {
|
||||||
const [integer = '', decimal = ''] = String(value || '').replace(/[^\d.]/g, '').split('.');
|
const [integer = '', decimal = ''] = String(value || '').replace(/[^\d.]/g, '').split('.');
|
||||||
item.unitPrice = decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 2)}` : integer;
|
item.unitPrice = decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 2)}` : integer;
|
||||||
@@ -618,7 +652,7 @@ export default {
|
|||||||
const index = (route.goods || []).indexOf(item) + 1;
|
const index = (route.goods || []).indexOf(item) + 1;
|
||||||
const fields = [
|
const fields = [
|
||||||
[!String(item.cargoName || '').trim() || item.sourceIndex === undefined || item.sourceIndex === null || item.sourceIndex === '', '货物名称'],
|
[!String(item.cargoName || '').trim() || item.sourceIndex === undefined || item.sourceIndex === null || item.sourceIndex === '', '货物名称'],
|
||||||
[!String(item.cargoType || '').trim() && !(item.cargoTypePath || []).length, '货物类型'],
|
[!String(item.cargoType || '').trim(), '货物类型'],
|
||||||
[item.dispatchQuantity === undefined || item.dispatchQuantity === null || item.dispatchQuantity === '' || Number(item.dispatchQuantity) <= 0, '本次数量'],
|
[item.dispatchQuantity === undefined || item.dispatchQuantity === null || item.dispatchQuantity === '' || Number(item.dispatchQuantity) <= 0, '本次数量'],
|
||||||
[!String(item.quantityUnit || '').trim(), '数量单位'],
|
[!String(item.quantityUnit || '').trim(), '数量单位'],
|
||||||
];
|
];
|
||||||
@@ -650,7 +684,6 @@ export default {
|
|||||||
return {
|
return {
|
||||||
...goods,
|
...goods,
|
||||||
sourceIndex,
|
sourceIndex,
|
||||||
cargoTypePath: this.findCargoTypePath(goods.cargoType),
|
|
||||||
dispatchQuantity: undefined,
|
dispatchQuantity: undefined,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -666,7 +699,8 @@ export default {
|
|||||||
selectGoods(route, row) {
|
selectGoods(route, row) {
|
||||||
const source = (this.master.goods || [])[Number(row.sourceIndex)];
|
const source = (this.master.goods || [])[Number(row.sourceIndex)];
|
||||||
if (!source) return;
|
if (!source) return;
|
||||||
Object.assign(row, this.createGoodsRow(source, Number(row.sourceIndex)));
|
const cargoType = String(row.cargoType || '').trim() || source.cargoType;
|
||||||
|
Object.assign(row, this.createGoodsRow(source, Number(row.sourceIndex)), { cargoType });
|
||||||
this.syncFreightItems(route);
|
this.syncFreightItems(route);
|
||||||
},
|
},
|
||||||
removeGoods(route, index) { route.goods.splice(index, 1); this.syncFreightItems(route); },
|
removeGoods(route, index) { route.goods.splice(index, 1); this.syncFreightItems(route); },
|
||||||
@@ -854,8 +888,6 @@ export default {
|
|||||||
const goods = route.goods.filter(item => Number(item.dispatchQuantity) > 0);
|
const goods = route.goods.filter(item => Number(item.dispatchQuantity) > 0);
|
||||||
if (!goods.length) return this.$message.warning('请填写本次数量');
|
if (!goods.length) return this.$message.warning('请填写本次数量');
|
||||||
if (!this.validateDispatchGoods(route, goods)) return;
|
if (!this.validateDispatchGoods(route, goods)) return;
|
||||||
if (goods.some(item => Number(item.dispatchQuantity) > this.availableDispatchQuantity(route, item))) return this.$message.warning('本次数量不能超过剩余数量');
|
|
||||||
if (!this.validatePreviousSegmentCompletedQuantity(route, goods)) return;
|
|
||||||
this.syncFreightItems(route);
|
this.syncFreightItems(route);
|
||||||
if (!this.validateFreightItems(route)) return;
|
if (!this.validateFreightItems(route)) return;
|
||||||
if (!this.validateRoutePhones(route)) return;
|
if (!this.validateRoutePhones(route)) return;
|
||||||
@@ -954,6 +986,7 @@ export default {
|
|||||||
async submit() {
|
async submit() {
|
||||||
if (!this.pending.length) return this.$message.warning('请加入待提交调度清单');
|
if (!this.pending.length) return this.$message.warning('请加入待提交调度清单');
|
||||||
if (this.pending.some(item => !this.validateRoutePhones(item))) return;
|
if (this.pending.some(item => !this.validateRoutePhones(item))) return;
|
||||||
|
if (!this.validatePendingTotals()) return;
|
||||||
this.submitting = true;
|
this.submitting = true;
|
||||||
try { await api.dispatch({ id: this.master.id, dispatches: this.pending.map(({ id, ...item }) => ({ ...item, mileage: this.normalizeMileage(item.mileage) })) }); this.$message.success('调度成功'); this.$emit('back'); } finally { this.submitting = false; }
|
try { await api.dispatch({ id: this.master.id, dispatches: this.pending.map(({ id, ...item }) => ({ ...item, mileage: this.normalizeMileage(item.mileage) })) }); this.$message.success('调度成功'); this.$emit('back'); } finally { this.submitting = false; }
|
||||||
},
|
},
|
||||||
@@ -985,7 +1018,7 @@ export default {
|
|||||||
.transport-type-field :deep(.el-input) { width: 240px; }
|
.transport-type-field :deep(.el-input) { width: 240px; }
|
||||||
.goods-heading { display: flex; align-items: center; justify-content: space-between; margin: 0 -24px 12px; padding: 14px 24px; border-top: 1px solid #eff1f7; border-bottom: 1px solid #eff1f7; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } span { color: #909399; font-size: 13px; } }
|
.goods-heading { display: flex; align-items: center; justify-content: space-between; margin: 0 -24px 12px; padding: 14px 24px; border-top: 1px solid #eff1f7; border-bottom: 1px solid #eff1f7; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } span { color: #909399; font-size: 13px; } }
|
||||||
.freight-heading { margin: 16px 0 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } }
|
.freight-heading { margin: 16px 0 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } }
|
||||||
.goods-table { :deep(th.el-table__cell), :deep(td.el-table__cell) { border-color: #eff1f7; } :deep(.el-table__row--striped td.el-table__cell) { background: #fafafa; } :deep(.goods-table__remaining .cell) { white-space: nowrap; } :deep(.goods-table__dispatch .el-input) { width: 100%; min-width: 0; } :deep(.goods-table__cargo-type .el-input__inner), :deep(.goods-table__cargo-name .el-select__selected-item) { color: #303133; } }
|
.goods-table { :deep(th.el-table__cell), :deep(td.el-table__cell) { border-color: #eff1f7; } :deep(.el-table__row--striped td.el-table__cell) { background: #fafafa; } :deep(.goods-table__dispatch .el-input) { width: 100%; min-width: 0; } :deep(.goods-table__cargo-type), :deep(.goods-table__cargo-name) { width: 100%; } :deep(.goods-table__cargo-type .el-input__inner), :deep(.goods-table__cargo-name .el-select__selected-item) { color: #303133; } }
|
||||||
.goods-required-mark { margin-left: 2px; color: #f56c6c; }
|
.goods-required-mark { margin-left: 2px; color: #f56c6c; }
|
||||||
.freight-form { :deep(.freight-unit-select) { width: 92px; flex: 0 0 92px; min-width: 0; } }
|
.freight-form { :deep(.freight-unit-select) { width: 92px; flex: 0 0 92px; min-width: 0; } }
|
||||||
.carrier-type-form { margin-top: 16px; }
|
.carrier-type-form { margin-top: 16px; }
|
||||||
|
|||||||
@@ -146,8 +146,9 @@
|
|||||||
/>
|
/>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="form.departureAddress"
|
v-model="form.departureAddress"
|
||||||
placeholder="请输入发货地址"
|
class="shipping-template-page__address-map-input"
|
||||||
:readonly="transportStationMode || !config.editableRoadAddress"
|
readonly
|
||||||
|
placeholder="请选择发货地址"
|
||||||
:disabled="transportAddressSelectDisabled"
|
:disabled="transportAddressSelectDisabled"
|
||||||
@click="handleTransportSecondaryAddressInputClick('departure')"
|
@click="handleTransportSecondaryAddressInputClick('departure')"
|
||||||
>
|
>
|
||||||
@@ -189,8 +190,9 @@
|
|||||||
/>
|
/>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="form.arrivalAddress"
|
v-model="form.arrivalAddress"
|
||||||
placeholder="请输入收货地址"
|
class="shipping-template-page__address-map-input"
|
||||||
:readonly="transportStationMode || !config.editableRoadAddress"
|
readonly
|
||||||
|
placeholder="请选择收货地址"
|
||||||
:disabled="transportAddressSelectDisabled"
|
:disabled="transportAddressSelectDisabled"
|
||||||
@click="handleTransportSecondaryAddressInputClick('arrival')"
|
@click="handleTransportSecondaryAddressInputClick('arrival')"
|
||||||
>
|
>
|
||||||
@@ -1131,7 +1133,7 @@ const defaultCargo = () => ({
|
|||||||
cargoTypePath: [],
|
cargoTypePath: [],
|
||||||
packageType: '',
|
packageType: '',
|
||||||
quantity: '',
|
quantity: '',
|
||||||
quantityUnit: '',
|
quantityUnit: '吨',
|
||||||
brand: '',
|
brand: '',
|
||||||
specification: '',
|
specification: '',
|
||||||
model: '',
|
model: '',
|
||||||
@@ -1258,6 +1260,7 @@ export default {
|
|||||||
crudDialogType: '',
|
crudDialogType: '',
|
||||||
standaloneFormKey: '',
|
standaloneFormKey: '',
|
||||||
copyingRow: null,
|
copyingRow: null,
|
||||||
|
suppressTransportTypeClear: false,
|
||||||
detailBox: false,
|
detailBox: false,
|
||||||
detailLoading: false,
|
detailLoading: false,
|
||||||
detailRow: {},
|
detailRow: {},
|
||||||
@@ -1511,10 +1514,10 @@ export default {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
'form.transportType'(value, oldValue) {
|
'form.transportType'(value, oldValue) {
|
||||||
if (value !== oldValue) {
|
if (this.suppressTransportTypeClear) return;
|
||||||
this.handleTransportTypeChange(value);
|
if (String(value ?? '') === String(oldValue ?? '')) return;
|
||||||
this.syncFreightItems();
|
this.handleTransportTypeChange(value);
|
||||||
}
|
this.syncFreightItems();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
@@ -1527,6 +1530,20 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
buildOption(option) {
|
buildOption(option) {
|
||||||
const next = { ...option, column: (option.column || []).map(column => ({ ...column })) };
|
const next = { ...option, column: (option.column || []).map(column => ({ ...column })) };
|
||||||
|
const tableOrder = this.config.tableColumnOrder || [];
|
||||||
|
if (tableOrder.length) {
|
||||||
|
const orderMap = new Map(tableOrder.map((prop, index) => [prop, index]));
|
||||||
|
next.column.sort((left, right) => {
|
||||||
|
const leftOrder = orderMap.has(left.prop) ? orderMap.get(left.prop) : tableOrder.length;
|
||||||
|
const rightOrder = orderMap.has(right.prop)
|
||||||
|
? orderMap.get(right.prop)
|
||||||
|
: tableOrder.length;
|
||||||
|
return leftOrder - rightOrder;
|
||||||
|
});
|
||||||
|
next.column.forEach(column => {
|
||||||
|
if (column.prop) column.hide = !orderMap.has(column.prop);
|
||||||
|
});
|
||||||
|
}
|
||||||
if (this.menuWidth != null) next.menuWidth = this.menuWidth;
|
if (this.menuWidth != null) next.menuWidth = this.menuWidth;
|
||||||
if (
|
if (
|
||||||
this.standaloneFormPage &&
|
this.standaloneFormPage &&
|
||||||
@@ -1790,6 +1807,7 @@ export default {
|
|||||||
console.log('进入复制模式分支');
|
console.log('进入复制模式分支');
|
||||||
const copyData = { ...this.copyingRow };
|
const copyData = { ...this.copyingRow };
|
||||||
this.copyingRow = null;
|
this.copyingRow = null;
|
||||||
|
this.suppressTransportTypeClear = true;
|
||||||
this.form = { ...(this.config.defaultForm || {}), ...copyData };
|
this.form = { ...(this.config.defaultForm || {}), ...copyData };
|
||||||
console.log('合并后的 form:', this.form);
|
console.log('合并后的 form:', this.form);
|
||||||
// 删除模板编号,等待系统生成
|
// 删除模板编号,等待系统生成
|
||||||
@@ -1842,7 +1860,11 @@ export default {
|
|||||||
done?.();
|
done?.();
|
||||||
},
|
},
|
||||||
applyFormDetail(row) {
|
applyFormDetail(row) {
|
||||||
|
this.suppressTransportTypeClear = true;
|
||||||
this.form = { ...(row || {}) };
|
this.form = { ...(row || {}) };
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.suppressTransportTypeClear = false;
|
||||||
|
});
|
||||||
this.selectedProjectId = this.form.projectId || '';
|
this.selectedProjectId = this.form.projectId || '';
|
||||||
this.transportCargoRows = this.parseJsonArray(this.form.goodsJson).map(item =>
|
this.transportCargoRows = this.parseJsonArray(this.form.goodsJson).map(item =>
|
||||||
this.normalizeCargo(item)
|
this.normalizeCargo(item)
|
||||||
@@ -1924,14 +1946,6 @@ export default {
|
|||||||
this.$message.warning(`第${index + 1}行货物类型不能为空`);
|
this.$message.warning(`第${index + 1}行货物类型不能为空`);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!String(row.cargoName || '').trim() || !row.quantity || !row.quantityUnit) {
|
|
||||||
this.$message.warning(`第${index + 1}行货物信息不完整`);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (Number(row.quantity) <= 0) {
|
|
||||||
this.$message.warning(`第${index + 1}行数量必须大于0`);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (String(row.remark || '').length > 200) {
|
if (String(row.remark || '').length > 200) {
|
||||||
this.$message.warning(`第${index + 1}行备注不能超过200个字符`);
|
this.$message.warning(`第${index + 1}行备注不能超过200个字符`);
|
||||||
return false;
|
return false;
|
||||||
@@ -2013,6 +2027,8 @@ export default {
|
|||||||
delete detail.updateUser;
|
delete detail.updateUser;
|
||||||
delete detail.updateUserName;
|
delete detail.updateUserName;
|
||||||
delete detail.status;
|
delete detail.status;
|
||||||
|
// 模板名称追加「-副本」
|
||||||
|
detail.templateName = `${detail.templateName || ''}-副本`;
|
||||||
|
|
||||||
console.log('处理后的数据:', detail);
|
console.log('处理后的数据:', detail);
|
||||||
console.log('isStandaloneBusinessPage:', this.isStandaloneBusinessPage);
|
console.log('isStandaloneBusinessPage:', this.isStandaloneBusinessPage);
|
||||||
@@ -2286,13 +2302,60 @@ export default {
|
|||||||
},
|
},
|
||||||
handleTransportTypeChange(value) {
|
handleTransportTypeChange(value) {
|
||||||
this.form.transportTypeName = this.getTransportTypeLabel(value);
|
this.form.transportTypeName = this.getTransportTypeLabel(value);
|
||||||
|
this.clearTransportShippingInfo();
|
||||||
|
},
|
||||||
|
clearTransportShippingInfo() {
|
||||||
|
[
|
||||||
|
'departureName',
|
||||||
|
'departureAddress',
|
||||||
|
'departureAddressCode',
|
||||||
|
'departureSiteCode',
|
||||||
|
'departureLongitude',
|
||||||
|
'departureLatitude',
|
||||||
|
'departureContact',
|
||||||
|
'departurePhone',
|
||||||
|
'arrivalName',
|
||||||
|
'arrivalAddress',
|
||||||
|
'arrivalAddressCode',
|
||||||
|
'arrivalSiteCode',
|
||||||
|
'arrivalLongitude',
|
||||||
|
'arrivalLatitude',
|
||||||
|
'arrivalContact',
|
||||||
|
'arrivalPhone',
|
||||||
|
].forEach(prop => {
|
||||||
|
this.form[prop] = '';
|
||||||
|
});
|
||||||
|
this.transportMapSelected = {};
|
||||||
|
this.transportRouteBox = false;
|
||||||
|
this.transportAddressBox = false;
|
||||||
|
this.transportStationBox = false;
|
||||||
|
this.transportMapBox = false;
|
||||||
|
this.transportAddressTarget = '';
|
||||||
|
this.transportStationTarget = '';
|
||||||
|
this.transportMapTarget = '';
|
||||||
|
this.transportMapKeyword = '';
|
||||||
|
this.transportMapStatus = '可搜索地址或点击地图选点';
|
||||||
|
if (this.transportAmapMarker) {
|
||||||
|
this.transportAmapMarker.setMap(null);
|
||||||
|
this.transportAmapMarker = null;
|
||||||
|
}
|
||||||
|
this.$refs.crud?.clearValidate?.([
|
||||||
|
'departureAddress',
|
||||||
|
'arrivalAddress',
|
||||||
|
'departureName',
|
||||||
|
'arrivalName',
|
||||||
|
'departureContact',
|
||||||
|
'departurePhone',
|
||||||
|
'arrivalContact',
|
||||||
|
'arrivalPhone',
|
||||||
|
]);
|
||||||
},
|
},
|
||||||
openTransportPrimaryAddressPicker(target) {
|
openTransportPrimaryAddressPicker(target) {
|
||||||
if (this.transportStationMode) this.openTransportStationDialog(target);
|
if (this.transportStationMode) this.openTransportStationDialog(target);
|
||||||
},
|
},
|
||||||
handleTransportSecondaryAddressInputClick(target) {
|
handleTransportSecondaryAddressInputClick(target) {
|
||||||
if (this.transportStationMode || !this.config.editableRoadAddress)
|
if (this.transportAddressSelectDisabled) return;
|
||||||
this.openTransportSecondaryAddressPicker(target);
|
this.openTransportSecondaryAddressPicker(target);
|
||||||
},
|
},
|
||||||
openTransportSecondaryAddressPicker(target) {
|
openTransportSecondaryAddressPicker(target) {
|
||||||
this.transportStationMode
|
this.transportStationMode
|
||||||
@@ -3328,6 +3391,13 @@ export default {
|
|||||||
gap: 8px;
|
gap: 8px;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
.shipping-template-page__address-map-input {
|
||||||
|
cursor: pointer;
|
||||||
|
:deep(.el-input__wrapper),
|
||||||
|
:deep(.el-input__inner) {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
.shipping-template-page__section-actions {
|
.shipping-template-page__section-actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 12px;
|
gap: 12px;
|
||||||
|
|||||||
@@ -85,15 +85,23 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #departureAddress="{ row }">
|
<template #departureAddress="{ row }">
|
||||||
<el-tooltip v-if="row.departureAddress" :content="row.departureAddress" placement="top">
|
<el-tooltip
|
||||||
<span>{{ formatTransportPlanProvinceCityDistrict(row.departureAddress) }}</span>
|
v-if="row.departureAddress || row.departureName"
|
||||||
|
:content="row.departureAddress || row.departureName"
|
||||||
|
placement="top"
|
||||||
|
>
|
||||||
|
<span>{{ formatTransportPlanListAddress(row, 'departure') }}</span>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<span v-else>-</span>
|
<span v-else>-</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #arrivalAddress="{ row }">
|
<template #arrivalAddress="{ row }">
|
||||||
<el-tooltip v-if="row.arrivalAddress" :content="row.arrivalAddress" placement="top">
|
<el-tooltip
|
||||||
<span>{{ formatTransportPlanProvinceCityDistrict(row.arrivalAddress) }}</span>
|
v-if="row.arrivalAddress || row.arrivalName"
|
||||||
|
:content="row.arrivalAddress || row.arrivalName"
|
||||||
|
placement="top"
|
||||||
|
>
|
||||||
|
<span>{{ formatTransportPlanListAddress(row, 'arrival') }}</span>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<span v-else>-</span>
|
<span v-else>-</span>
|
||||||
</template>
|
</template>
|
||||||
@@ -574,7 +582,7 @@
|
|||||||
>
|
>
|
||||||
<el-link
|
<el-link
|
||||||
type="primary"
|
type="primary"
|
||||||
v-if="hasPermission(`${config.permission}_view`) && !showDetailButton(row)"
|
v-if="showViewButton(row)"
|
||||||
@click="$refs.crud.rowView(row, index)"
|
@click="$refs.crud.rowView(row, index)"
|
||||||
>
|
>
|
||||||
查看
|
查看
|
||||||
@@ -1492,27 +1500,38 @@
|
|||||||
<el-input
|
<el-input
|
||||||
v-model="dispatchItemForm.departureName"
|
v-model="dispatchItemForm.departureName"
|
||||||
:placeholder="dispatchStationNamePlaceholder"
|
:placeholder="dispatchStationNamePlaceholder"
|
||||||
:suffix-icon="dispatchStationMode ? Search : undefined"
|
:readonly="dispatchStationMode"
|
||||||
disabled
|
@click="openDispatchPrimaryAddressPicker('departure')"
|
||||||
/>
|
>
|
||||||
|
<template v-if="dispatchStationMode" #suffix>
|
||||||
|
<el-icon
|
||||||
|
class="transport-plan-page__map-suffix"
|
||||||
|
@click.stop="openDispatchSecondaryAddressPicker('departure')"
|
||||||
|
>
|
||||||
|
<Search />
|
||||||
|
</el-icon>
|
||||||
|
</template>
|
||||||
|
</el-input>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="dispatchItemForm.departureAddress"
|
v-model="dispatchItemForm.departureAddress"
|
||||||
:placeholder="dispatchAddressDetailPlaceholder"
|
:placeholder="dispatchAddressDetailPlaceholder"
|
||||||
disabled
|
:readonly="dispatchStationMode"
|
||||||
|
@click="handleDispatchSecondaryAddressInputClick('departure')"
|
||||||
>
|
>
|
||||||
<template v-if="!dispatchStationMode" #suffix>
|
<template v-if="!dispatchStationMode" #suffix>
|
||||||
<el-link
|
<el-link
|
||||||
type="primary"
|
type="primary"
|
||||||
:underline="false"
|
:underline="false"
|
||||||
class="transport-plan-page__address-choose-link"
|
class="transport-plan-page__address-choose-link"
|
||||||
|
@click.stop="openTransportMapDialog('departure')"
|
||||||
>选择</el-link
|
>选择</el-link
|
||||||
>
|
>
|
||||||
</template>
|
</template>
|
||||||
</el-input>
|
</el-input>
|
||||||
<span class="transport-plan-page__route-label">联系人</span>
|
<span class="transport-plan-page__route-label">联系人</span>
|
||||||
<el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" disabled />
|
<el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" />
|
||||||
<span class="transport-plan-page__route-label">联系方式</span>
|
<span class="transport-plan-page__route-label">联系方式</span>
|
||||||
<el-input v-model="dispatchItemForm.departurePhone" placeholder="请输入" disabled />
|
<el-input v-model="dispatchItemForm.departurePhone" placeholder="请输入" />
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="收货地址" required>
|
<el-form-item label="收货地址" required>
|
||||||
@@ -1520,27 +1539,38 @@
|
|||||||
<el-input
|
<el-input
|
||||||
v-model="dispatchItemForm.arrivalName"
|
v-model="dispatchItemForm.arrivalName"
|
||||||
:placeholder="dispatchStationNamePlaceholder"
|
:placeholder="dispatchStationNamePlaceholder"
|
||||||
:suffix-icon="dispatchStationMode ? Search : undefined"
|
:readonly="dispatchStationMode"
|
||||||
disabled
|
@click="openDispatchPrimaryAddressPicker('arrival')"
|
||||||
/>
|
>
|
||||||
|
<template v-if="dispatchStationMode" #suffix>
|
||||||
|
<el-icon
|
||||||
|
class="transport-plan-page__map-suffix"
|
||||||
|
@click.stop="openDispatchSecondaryAddressPicker('arrival')"
|
||||||
|
>
|
||||||
|
<Search />
|
||||||
|
</el-icon>
|
||||||
|
</template>
|
||||||
|
</el-input>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="dispatchItemForm.arrivalAddress"
|
v-model="dispatchItemForm.arrivalAddress"
|
||||||
:placeholder="dispatchAddressDetailPlaceholder"
|
:placeholder="dispatchAddressDetailPlaceholder"
|
||||||
disabled
|
:readonly="dispatchStationMode"
|
||||||
|
@click="handleDispatchSecondaryAddressInputClick('arrival')"
|
||||||
>
|
>
|
||||||
<template v-if="!dispatchStationMode" #suffix>
|
<template v-if="!dispatchStationMode" #suffix>
|
||||||
<el-link
|
<el-link
|
||||||
type="primary"
|
type="primary"
|
||||||
:underline="false"
|
:underline="false"
|
||||||
class="transport-plan-page__address-choose-link"
|
class="transport-plan-page__address-choose-link"
|
||||||
|
@click.stop="openTransportMapDialog('arrival')"
|
||||||
>选择</el-link
|
>选择</el-link
|
||||||
>
|
>
|
||||||
</template>
|
</template>
|
||||||
</el-input>
|
</el-input>
|
||||||
<span class="transport-plan-page__route-label">联系人</span>
|
<span class="transport-plan-page__route-label">联系人</span>
|
||||||
<el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" disabled />
|
<el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" />
|
||||||
<span class="transport-plan-page__route-label">联系方式</span>
|
<span class="transport-plan-page__route-label">联系方式</span>
|
||||||
<el-input v-model="dispatchItemForm.arrivalPhone" placeholder="请输入" disabled />
|
<el-input v-model="dispatchItemForm.arrivalPhone" placeholder="请输入" />
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
@@ -1576,20 +1606,15 @@
|
|||||||
><span class="transport-plan-page__required-column">货物类型</span></template
|
><span class="transport-plan-page__required-column">货物类型</span></template
|
||||||
>
|
>
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<el-select
|
<el-autocomplete
|
||||||
v-model="row.cargoType"
|
v-model="row.cargoType"
|
||||||
placeholder="请选择货物类型"
|
placeholder="请输入货物类型"
|
||||||
clearable
|
clearable
|
||||||
filterable
|
:debounce="300"
|
||||||
|
:fetch-suggestions="fetchDispatchConfiguredCargoTypeSuggestions"
|
||||||
|
@select="item => handleDispatchConfiguredCargoTypeSelect(row, item)"
|
||||||
@change="value => handleDispatchConfiguredCargoTypeChange(row, value)"
|
@change="value => handleDispatchConfiguredCargoTypeChange(row, value)"
|
||||||
>
|
/>
|
||||||
<el-option
|
|
||||||
v-for="item in getDispatchConfiguredCargoTypeOptions()"
|
|
||||||
:key="item.value"
|
|
||||||
:label="item.label"
|
|
||||||
:value="item.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column min-width="240" align="center">
|
<el-table-column min-width="240" align="center">
|
||||||
@@ -1597,20 +1622,18 @@
|
|||||||
><span class="transport-plan-page__required-column">货物名称</span></template
|
><span class="transport-plan-page__required-column">货物名称</span></template
|
||||||
>
|
>
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<el-select
|
<el-autocomplete
|
||||||
v-model="row.cargoName"
|
v-model="row.cargoName"
|
||||||
placeholder="请选择货物名称"
|
placeholder="请输入货物名称"
|
||||||
clearable
|
clearable
|
||||||
filterable
|
:debounce="300"
|
||||||
|
:fetch-suggestions="
|
||||||
|
(queryString, callback) =>
|
||||||
|
fetchDispatchConfiguredCargoNameSuggestions(queryString, callback, row)
|
||||||
|
"
|
||||||
|
@select="item => handleDispatchConfiguredCargoNameSelect(row, item)"
|
||||||
@change="value => handleDispatchConfiguredCargoNameChange(row, value)"
|
@change="value => handleDispatchConfiguredCargoNameChange(row, value)"
|
||||||
>
|
/>
|
||||||
<el-option
|
|
||||||
v-for="item in getDispatchConfiguredCargoNameOptions(row)"
|
|
||||||
:key="item.value"
|
|
||||||
:label="item.label"
|
|
||||||
:value="item.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="包装" min-width="130" align="center">
|
<el-table-column label="包装" min-width="130" align="center">
|
||||||
@@ -1627,7 +1650,11 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="剩余数量" min-width="130" align="center">
|
<el-table-column label="剩余数量" min-width="130" align="center">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
{{ formatDispatchQuantity(dispatchItemRemainingQuantity(row)) }}
|
{{
|
||||||
|
isDispatchPlanQuantityUnlimited(row)
|
||||||
|
? '-'
|
||||||
|
: formatDispatchQuantity(dispatchItemRemainingQuantity(row))
|
||||||
|
}}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column min-width="130" align="center">
|
<el-table-column min-width="130" align="center">
|
||||||
@@ -1848,36 +1875,33 @@
|
|||||||
<el-input v-model="dispatchItemForm.escortPhone" placeholder="请输入" />
|
<el-input v-model="dispatchItemForm.escortPhone" placeholder="请输入" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="货物类型" required>
|
<el-form-item label="货物类型" required>
|
||||||
<el-select
|
<el-autocomplete
|
||||||
v-model="dispatchItemForm.cargoType"
|
v-model="dispatchItemForm.cargoType"
|
||||||
placeholder="请选择货物类型"
|
placeholder="请输入货物类型"
|
||||||
clearable
|
clearable
|
||||||
filterable
|
:debounce="300"
|
||||||
@change="handleDispatchConfiguredCargoTypeChange(dispatchItemForm, $event)"
|
:fetch-suggestions="fetchDispatchConfiguredCargoTypeSuggestions"
|
||||||
>
|
@select="item => handleDispatchConfiguredCargoTypeSelect(dispatchItemForm, item)"
|
||||||
<el-option
|
@change="value => handleDispatchConfiguredCargoTypeChange(dispatchItemForm, value)"
|
||||||
v-for="item in getDispatchConfiguredCargoTypeOptions()"
|
/>
|
||||||
:key="item.value"
|
|
||||||
:label="item.label"
|
|
||||||
:value="item.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="货物名称" required>
|
<el-form-item label="货物名称" required>
|
||||||
<el-select
|
<el-autocomplete
|
||||||
v-model="dispatchItemForm.cargoName"
|
v-model="dispatchItemForm.cargoName"
|
||||||
placeholder="请选择货物名称"
|
placeholder="请输入货物名称"
|
||||||
clearable
|
clearable
|
||||||
filterable
|
:debounce="300"
|
||||||
@change="handleDispatchConfiguredCargoNameChange(dispatchItemForm, $event)"
|
:fetch-suggestions="
|
||||||
>
|
(queryString, callback) =>
|
||||||
<el-option
|
fetchDispatchConfiguredCargoNameSuggestions(
|
||||||
v-for="item in getDispatchConfiguredCargoNameOptions(dispatchItemForm)"
|
queryString,
|
||||||
:key="item.value"
|
callback,
|
||||||
:label="item.label"
|
dispatchItemForm
|
||||||
:value="item.value"
|
)
|
||||||
/>
|
"
|
||||||
</el-select>
|
@select="item => handleDispatchConfiguredCargoNameSelect(dispatchItemForm, item)"
|
||||||
|
@change="value => handleDispatchConfiguredCargoNameChange(dispatchItemForm, value)"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="规格">
|
<el-form-item label="规格">
|
||||||
<el-input v-model="dispatchItemForm.specification" placeholder="请输入" />
|
<el-input v-model="dispatchItemForm.specification" placeholder="请输入" />
|
||||||
@@ -1902,7 +1926,10 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</template>
|
</template>
|
||||||
</el-input>
|
</el-input>
|
||||||
<div class="transport-plan-page__dispatch-quantity-hint">
|
<div
|
||||||
|
v-if="!isDispatchPlanQuantityUnlimited(dispatchItemForm)"
|
||||||
|
class="transport-plan-page__dispatch-quantity-hint"
|
||||||
|
>
|
||||||
剩余数量:{{
|
剩余数量:{{
|
||||||
formatDispatchQuantity(dispatchItemRemainingQuantity(dispatchItemForm))
|
formatDispatchQuantity(dispatchItemRemainingQuantity(dispatchItemForm))
|
||||||
}}
|
}}
|
||||||
@@ -3412,15 +3439,21 @@ export default {
|
|||||||
}));
|
}));
|
||||||
},
|
},
|
||||||
dispatchHasAddableQuantity() {
|
dispatchHasAddableQuantity() {
|
||||||
return this.dispatchTableQuantityItems.some(
|
const items = this.dispatchTableQuantityItems;
|
||||||
item => item.total > 0 && item.listed < item.total - 1e-8
|
if (!items.length) return true;
|
||||||
);
|
// 计划总量为 0 时不限制新增调度
|
||||||
|
if (items.every(item => item.total <= 0)) return true;
|
||||||
|
return items.some(item => item.total > 0 && item.listed < item.total - 1e-8);
|
||||||
},
|
},
|
||||||
dispatchSummaryText() {
|
dispatchSummaryText() {
|
||||||
const formatSummary = field =>
|
const formatSummary = field =>
|
||||||
this.dispatchSummaryItems
|
this.dispatchSummaryItems
|
||||||
.map(item => `${this.formatDispatchQuantity(item[field])}${item.unit}`)
|
.map(item => `${this.formatDispatchQuantity(item[field])}${item.unit}`)
|
||||||
.join('、');
|
.join('、');
|
||||||
|
const unlimited = this.dispatchSummaryItems.every(item => item.total <= 0);
|
||||||
|
if (unlimited) {
|
||||||
|
return `已调度 ${formatSummary('assigned') || `0${TRANSPORT_PLAN_QUANTITY_UNIT}`}`;
|
||||||
|
}
|
||||||
return `共${formatSummary('total')} | 已调度 ${formatSummary(
|
return `共${formatSummary('total')} | 已调度 ${formatSummary(
|
||||||
'assigned'
|
'assigned'
|
||||||
)},剩余${formatSummary('remaining')}`;
|
)},剩余${formatSummary('remaining')}`;
|
||||||
@@ -3606,12 +3639,13 @@ export default {
|
|||||||
return ['water', 'rail', 'air'].includes(this.transportMode);
|
return ['water', 'rail', 'air'].includes(this.transportMode);
|
||||||
},
|
},
|
||||||
transportStationTypeLabel() {
|
transportStationTypeLabel() {
|
||||||
|
const mode = this.dispatchItemBox ? this.dispatchTransportMode : this.transportMode;
|
||||||
const labelMap = {
|
const labelMap = {
|
||||||
water: '港口/码头',
|
water: '港口/码头',
|
||||||
rail: '铁路车站',
|
rail: '铁路车站',
|
||||||
air: '空港机场',
|
air: '空港机场',
|
||||||
};
|
};
|
||||||
return labelMap[this.transportMode] || '';
|
return labelMap[mode] || '';
|
||||||
},
|
},
|
||||||
transportStationNamePlaceholder() {
|
transportStationNamePlaceholder() {
|
||||||
if (!this.transportStationMode) return '行政区划自动带出';
|
if (!this.transportStationMode) return '行政区划自动带出';
|
||||||
@@ -3798,6 +3832,37 @@ export default {
|
|||||||
const cityMatch = text.match(/市/);
|
const cityMatch = text.match(/市/);
|
||||||
return cityMatch ? text.slice(0, cityMatch.index + 1) : text;
|
return cityMatch ? text.slice(0, cityMatch.index + 1) : text;
|
||||||
},
|
},
|
||||||
|
formatTransportPlanListAddress(row = {}, field) {
|
||||||
|
const address = String(row[`${field}Address`] || '').trim();
|
||||||
|
const name = String(row[`${field}Name`] || '').trim();
|
||||||
|
const fromAddress = this.extractTransportPlanProvinceCityDistrict(address);
|
||||||
|
if (fromAddress) return fromAddress;
|
||||||
|
const fromName = this.extractTransportPlanProvinceCityDistrict(name);
|
||||||
|
if (fromName) return fromName;
|
||||||
|
return name || address || '-';
|
||||||
|
},
|
||||||
|
extractTransportPlanProvinceCityDistrict(value) {
|
||||||
|
const text = String(value || '')
|
||||||
|
.trim()
|
||||||
|
.replace(/[\\/||、,,\s]+/g, '');
|
||||||
|
if (!text) return '';
|
||||||
|
const districtPattern = '(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)';
|
||||||
|
const parts = [];
|
||||||
|
let remainder = text;
|
||||||
|
const province = text.match(/^(.+?(?:省|自治区|特别行政区))/);
|
||||||
|
if (province) {
|
||||||
|
parts.push(province[1]);
|
||||||
|
remainder = text.slice(province[1].length);
|
||||||
|
}
|
||||||
|
const city = remainder.match(/^(.+?市)/);
|
||||||
|
if (city) {
|
||||||
|
parts.push(city[1]);
|
||||||
|
remainder = remainder.slice(city[1].length);
|
||||||
|
}
|
||||||
|
const district = remainder.match(new RegExp(`^(.+?${districtPattern})`));
|
||||||
|
if (district) parts.push(district[1]);
|
||||||
|
return parts.length ? parts.join('/') : '';
|
||||||
|
},
|
||||||
formatTransportPlanRoadCityDistrict(value) {
|
formatTransportPlanRoadCityDistrict(value) {
|
||||||
const text = String(value || '').trim();
|
const text = String(value || '').trim();
|
||||||
if (!text) return '-';
|
if (!text) return '-';
|
||||||
@@ -3955,6 +4020,11 @@ export default {
|
|||||||
const status = this.statusValue(row);
|
const status = this.statusValue(row);
|
||||||
return status !== 'draft';
|
return status !== 'draft';
|
||||||
},
|
},
|
||||||
|
showViewButton(row) {
|
||||||
|
if (!this.hasPermission(`${this.config.permission}_view`)) return false;
|
||||||
|
if (this.statusValue(row) === 'draft') return false;
|
||||||
|
return !this.showDetailButton(row);
|
||||||
|
},
|
||||||
formatDetailValue(row, prop) {
|
formatDetailValue(row, prop) {
|
||||||
if (!row) return '-';
|
if (!row) return '-';
|
||||||
if (prop === 'businessStatus') return this.displayStatus(row, prop);
|
if (prop === 'businessStatus') return this.displayStatus(row, prop);
|
||||||
@@ -4540,6 +4610,37 @@ export default {
|
|||||||
getDispatchRemainingQuantity(unit) {
|
getDispatchRemainingQuantity(unit) {
|
||||||
return this.getDispatchSummaryItem(unit)?.remaining || 0;
|
return this.getDispatchSummaryItem(unit)?.remaining || 0;
|
||||||
},
|
},
|
||||||
|
/** 计划总量为 0 时不限制调度数量 */
|
||||||
|
isDispatchPlanQuantityUnlimited(row = {}) {
|
||||||
|
const unit = this.getDispatchQuantityUnit(row);
|
||||||
|
const hasCargoIdentity = Boolean(
|
||||||
|
String(row.cargoName || row.goodsName || row.name || '').trim() ||
|
||||||
|
String(row.cargoType || row.secondCargoTypeName || row.goodsType || row.type || '').trim()
|
||||||
|
);
|
||||||
|
const planGoodsRows = this.dispatchPlanGoodsRows;
|
||||||
|
if (planGoodsRows.length && hasCargoIdentity) {
|
||||||
|
const cargoKey = this.getDispatchCargoIdentity(row);
|
||||||
|
const matchedPlanRows = planGoodsRows.filter(
|
||||||
|
goods => this.getDispatchCargoIdentity(goods) === cargoKey
|
||||||
|
);
|
||||||
|
if (!matchedPlanRows.length) {
|
||||||
|
return (this.getDispatchSummaryItem(unit)?.total || 0) <= 0;
|
||||||
|
}
|
||||||
|
const total = matchedPlanRows.reduce(
|
||||||
|
(sum, goods) =>
|
||||||
|
sum +
|
||||||
|
this.parseDispatchQuantity(
|
||||||
|
goods.quantity || goods.cargoQuantity || goods.goodsQuantity
|
||||||
|
),
|
||||||
|
0
|
||||||
|
);
|
||||||
|
return total <= 0;
|
||||||
|
}
|
||||||
|
if (!planGoodsRows.length) {
|
||||||
|
return Number(this.dispatchRow.totalQuantity || this.dispatchRow.quantity || 0) <= 0;
|
||||||
|
}
|
||||||
|
return (this.getDispatchSummaryItem(unit)?.total || 0) <= 0;
|
||||||
|
},
|
||||||
formatDispatchQuantity(value) {
|
formatDispatchQuantity(value) {
|
||||||
const number = Number(value || 0);
|
const number = Number(value || 0);
|
||||||
if (!Number.isFinite(number)) return '0';
|
if (!Number.isFinite(number)) return '0';
|
||||||
@@ -5238,6 +5339,13 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
ensureTransportTypeBeforeAddress() {
|
ensureTransportTypeBeforeAddress() {
|
||||||
|
if (this.dispatchItemBox) {
|
||||||
|
const transportType =
|
||||||
|
this.dispatchItemForm.transportType || this.dispatchRow?.transportType || '';
|
||||||
|
if (!this.isBillingFieldEmpty(transportType)) return true;
|
||||||
|
this.$message.warning('请先选择运输方式');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if (!this.shippingInfoFormEnabled || !this.isBillingFieldEmpty(this.form.transportType)) {
|
if (!this.shippingInfoFormEnabled || !this.isBillingFieldEmpty(this.form.transportType)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -5314,19 +5422,21 @@ export default {
|
|||||||
},
|
},
|
||||||
openTransportStationDialog(target) {
|
openTransportStationDialog(target) {
|
||||||
if (!this.ensureTransportTypeBeforeAddress()) return;
|
if (!this.ensureTransportTypeBeforeAddress()) return;
|
||||||
if (!this.transportStationMode) return;
|
const stationMode = this.dispatchItemBox ? this.dispatchStationMode : this.transportStationMode;
|
||||||
|
if (!stationMode) return;
|
||||||
this.transportStationTarget = target;
|
this.transportStationTarget = target;
|
||||||
this.transportStationQuery = {};
|
this.transportStationQuery = {};
|
||||||
this.transportStationPage.currentPage = 1;
|
this.transportStationPage.currentPage = 1;
|
||||||
this.transportStationBox = true;
|
this.transportStationBox = true;
|
||||||
},
|
},
|
||||||
getTransportStationListRequest() {
|
getTransportStationListRequest() {
|
||||||
|
const mode = this.dispatchItemBox ? this.dispatchTransportMode : this.transportMode;
|
||||||
const requestMap = {
|
const requestMap = {
|
||||||
water: getPortTerminalList,
|
water: getPortTerminalList,
|
||||||
rail: getRailwayStationList,
|
rail: getRailwayStationList,
|
||||||
air: getAirportMasterList,
|
air: getAirportMasterList,
|
||||||
};
|
};
|
||||||
return requestMap[this.transportMode];
|
return requestMap[mode];
|
||||||
},
|
},
|
||||||
loadTransportStationList() {
|
loadTransportStationList() {
|
||||||
const request = this.getTransportStationListRequest();
|
const request = this.getTransportStationListRequest();
|
||||||
@@ -5436,7 +5546,28 @@ export default {
|
|||||||
water: '港口/码头',
|
water: '港口/码头',
|
||||||
air: '空港机场',
|
air: '空港机场',
|
||||||
};
|
};
|
||||||
return typeMap[this.transportMode] || '';
|
const mode = this.dispatchItemBox ? this.dispatchTransportMode : this.transportMode;
|
||||||
|
return typeMap[mode] || '';
|
||||||
|
},
|
||||||
|
getTransportAddressForm() {
|
||||||
|
return this.dispatchItemBox ? this.dispatchItemForm : this.form;
|
||||||
|
},
|
||||||
|
openDispatchPrimaryAddressPicker(target) {
|
||||||
|
if (this.dispatchStationMode) {
|
||||||
|
this.openTransportStationDialog(target);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
openDispatchSecondaryAddressPicker(target) {
|
||||||
|
if (this.dispatchStationMode) {
|
||||||
|
this.openTransportStationDialog(target);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.openTransportMapDialog(target);
|
||||||
|
},
|
||||||
|
handleDispatchSecondaryAddressInputClick(target) {
|
||||||
|
if (this.dispatchStationMode) {
|
||||||
|
this.openDispatchSecondaryAddressPicker(target);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
loadTransportAddressList() {
|
loadTransportAddressList() {
|
||||||
this.transportAddressLoading = true;
|
this.transportAddressLoading = true;
|
||||||
@@ -5487,35 +5618,39 @@ export default {
|
|||||||
},
|
},
|
||||||
applyTransportAddress(target, address = {}) {
|
applyTransportAddress(target, address = {}) {
|
||||||
const prefix = target === 'departure' ? 'departure' : 'arrival';
|
const prefix = target === 'departure' ? 'departure' : 'arrival';
|
||||||
this.form[`${prefix}Name`] = address.preferRegionName
|
const addressForm = this.getTransportAddressForm();
|
||||||
|
addressForm[`${prefix}Name`] = address.preferRegionName
|
||||||
? address.regionName || address.addressName || ''
|
? address.regionName || address.addressName || ''
|
||||||
: address.addressName || address.regionName || '';
|
: address.addressName || address.regionName || '';
|
||||||
this.form[`${prefix}Address`] = address.detailAddress || address.address || '';
|
addressForm[`${prefix}Address`] = address.detailAddress || address.address || '';
|
||||||
this.form[`${prefix}AddressCode`] = address.addressCode || '';
|
addressForm[`${prefix}AddressCode`] = address.addressCode || '';
|
||||||
this.form[`${prefix}SiteCode`] =
|
addressForm[`${prefix}SiteCode`] =
|
||||||
address.addressType === '常规地址'
|
address.addressType === '常规地址'
|
||||||
? '/'
|
? '/'
|
||||||
: address.siteCodeDisplay || address.siteCode || '';
|
: address.siteCodeDisplay || address.siteCode || '';
|
||||||
this.form[`${prefix}Longitude`] = address.longitude || '';
|
addressForm[`${prefix}Longitude`] = address.longitude || '';
|
||||||
this.form[`${prefix}Latitude`] = address.latitude || '';
|
addressForm[`${prefix}Latitude`] = address.latitude || '';
|
||||||
this.form[`${prefix}Contact`] = address.contactName || this.form[`${prefix}Contact`] || '';
|
addressForm[`${prefix}Contact`] =
|
||||||
this.form[`${prefix}Phone`] = address.contactPhone || this.form[`${prefix}Phone`] || '';
|
address.contactName || addressForm[`${prefix}Contact`] || '';
|
||||||
|
addressForm[`${prefix}Phone`] = address.contactPhone || addressForm[`${prefix}Phone`] || '';
|
||||||
// 地址值在本轮响应式更新后再清理校验状态,避免 Avue 以旧空值重新触发必填提示。
|
// 地址值在本轮响应式更新后再清理校验状态,避免 Avue 以旧空值重新触发必填提示。
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.crud?.clearValidate?.([`${prefix}Address`]);
|
this.$refs.crud?.clearValidate?.([`${prefix}Address`]);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
openTransportMapDialog(target) {
|
openTransportMapDialog(target) {
|
||||||
if (this.dialogReadonly) return;
|
if (this.dialogReadonly && !this.dispatchItemBox) return;
|
||||||
if (!this.ensureTransportTypeBeforeAddress()) return;
|
if (!this.ensureTransportTypeBeforeAddress()) return;
|
||||||
const prefix = target === 'departure' ? 'departure' : 'arrival';
|
const prefix = target === 'departure' ? 'departure' : 'arrival';
|
||||||
|
const addressForm = this.getTransportAddressForm();
|
||||||
this.transportMapTarget = prefix;
|
this.transportMapTarget = prefix;
|
||||||
this.transportMapKeyword = this.form[`${prefix}Address`] || this.form[`${prefix}Name`] || '';
|
this.transportMapKeyword =
|
||||||
|
addressForm[`${prefix}Address`] || addressForm[`${prefix}Name`] || '';
|
||||||
this.transportMapSelected = this.buildTransportMapSelection({
|
this.transportMapSelected = this.buildTransportMapSelection({
|
||||||
lng: this.form[`${prefix}Longitude`],
|
lng: addressForm[`${prefix}Longitude`],
|
||||||
lat: this.form[`${prefix}Latitude`],
|
lat: addressForm[`${prefix}Latitude`],
|
||||||
address: this.form[`${prefix}Address`],
|
address: addressForm[`${prefix}Address`],
|
||||||
regionName: this.form[`${prefix}Name`],
|
regionName: addressForm[`${prefix}Name`],
|
||||||
});
|
});
|
||||||
this.transportMapStatus = this.transportMapSelected.longitude
|
this.transportMapStatus = this.transportMapSelected.longitude
|
||||||
? '已加载当前选点,可重新选点'
|
? '已加载当前选点,可重新选点'
|
||||||
@@ -5673,12 +5808,13 @@ export default {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const prefix = this.transportMapTarget;
|
const prefix = this.transportMapTarget;
|
||||||
this.form[`${prefix}Address`] =
|
const addressForm = this.getTransportAddressForm();
|
||||||
this.transportMapSelected.detailAddress || this.form[`${prefix}Address`];
|
addressForm[`${prefix}Address`] =
|
||||||
this.form[`${prefix}Name`] =
|
this.transportMapSelected.detailAddress || addressForm[`${prefix}Address`];
|
||||||
this.transportMapSelected.regionName || this.form[`${prefix}Name`];
|
addressForm[`${prefix}Name`] =
|
||||||
this.form[`${prefix}Longitude`] = this.transportMapSelected.longitude;
|
this.transportMapSelected.regionName || addressForm[`${prefix}Name`];
|
||||||
this.form[`${prefix}Latitude`] = this.transportMapSelected.latitude;
|
addressForm[`${prefix}Longitude`] = this.transportMapSelected.longitude;
|
||||||
|
addressForm[`${prefix}Latitude`] = this.transportMapSelected.latitude;
|
||||||
this.transportMapBox = false;
|
this.transportMapBox = false;
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.crud?.clearValidate?.([`${prefix}Address`]);
|
this.$refs.crud?.clearValidate?.([`${prefix}Address`]);
|
||||||
@@ -7287,8 +7423,9 @@ export default {
|
|||||||
item.cargoTypePath.join('/') === rowTypePath.join('/')
|
item.cargoTypePath.join('/') === rowTypePath.join('/')
|
||||||
)
|
)
|
||||||
: goodsOptions;
|
: goodsOptions;
|
||||||
|
const source = filtered.length ? filtered : goodsOptions;
|
||||||
const options = new Map();
|
const options = new Map();
|
||||||
filtered.forEach(item => {
|
source.forEach(item => {
|
||||||
if (!item.cargoName || options.has(item.cargoName)) return;
|
if (!item.cargoName || options.has(item.cargoName)) return;
|
||||||
options.set(item.cargoName, {
|
options.set(item.cargoName, {
|
||||||
label: item.cargoName,
|
label: item.cargoName,
|
||||||
@@ -7302,26 +7439,73 @@ export default {
|
|||||||
});
|
});
|
||||||
return Array.from(options.values());
|
return Array.from(options.values());
|
||||||
},
|
},
|
||||||
handleDispatchConfiguredCargoTypeChange(row, value) {
|
fetchDispatchConfiguredCargoTypeSuggestions(queryString, callback) {
|
||||||
const option = this.getDispatchConfiguredCargoTypeOptions().find(
|
const keyword = String(queryString || '').trim().toLowerCase();
|
||||||
item => String(item.value) === String(value || '')
|
const options = this.getDispatchConfiguredCargoTypeOptions().map(item => ({
|
||||||
|
...item,
|
||||||
|
value: item.label,
|
||||||
|
}));
|
||||||
|
callback(
|
||||||
|
keyword
|
||||||
|
? options.filter(item => String(item.value).toLowerCase().includes(keyword))
|
||||||
|
: options
|
||||||
);
|
);
|
||||||
row.cargoType = option?.label || '';
|
},
|
||||||
row.cargoTypeCode = option?.cargoTypeCode || '';
|
fetchDispatchConfiguredCargoNameSuggestions(queryString, callback, row = {}) {
|
||||||
row.cargoTypePath = option?.cargoTypePath || [];
|
const keyword = String(queryString || '').trim().toLowerCase();
|
||||||
|
const options = this.getDispatchConfiguredCargoNameOptions(row).map(item => ({
|
||||||
|
...item,
|
||||||
|
value: item.label,
|
||||||
|
}));
|
||||||
|
callback(
|
||||||
|
keyword
|
||||||
|
? options.filter(item => String(item.value).toLowerCase().includes(keyword))
|
||||||
|
: options
|
||||||
|
);
|
||||||
|
},
|
||||||
|
handleDispatchConfiguredCargoTypeSelect(row, item = {}) {
|
||||||
|
this.handleDispatchConfiguredCargoTypeChange(row, item.value || item.label || '');
|
||||||
|
},
|
||||||
|
handleDispatchConfiguredCargoNameSelect(row, item = {}) {
|
||||||
|
this.handleDispatchConfiguredCargoNameChange(row, item.value || item.label || '');
|
||||||
|
},
|
||||||
|
handleDispatchConfiguredCargoTypeChange(row, value) {
|
||||||
|
const nextValue = String(value ?? row.cargoType ?? '').trim();
|
||||||
|
const option = this.getDispatchConfiguredCargoTypeOptions().find(
|
||||||
|
item => String(item.value) === nextValue || item.label === nextValue
|
||||||
|
);
|
||||||
|
if (option) {
|
||||||
|
row.cargoType = option.label || '';
|
||||||
|
row.cargoTypeCode = option.cargoTypeCode || '';
|
||||||
|
row.cargoTypePath = option.cargoTypePath || [];
|
||||||
|
} else {
|
||||||
|
row.cargoType = nextValue;
|
||||||
|
row.cargoTypeCode = '';
|
||||||
|
row.cargoTypePath = [];
|
||||||
|
}
|
||||||
row.cargoName = '';
|
row.cargoName = '';
|
||||||
row.specification = '';
|
row.specification = '';
|
||||||
row.model = '';
|
row.model = '';
|
||||||
},
|
},
|
||||||
handleDispatchConfiguredCargoNameChange(row, value) {
|
handleDispatchConfiguredCargoNameChange(row, value) {
|
||||||
|
const nextValue = String(value ?? row.cargoName ?? '').trim();
|
||||||
const option = this.getDispatchConfiguredCargoNameOptions(row).find(
|
const option = this.getDispatchConfiguredCargoNameOptions(row).find(
|
||||||
item => String(item.value) === String(value || '')
|
item => String(item.value) === nextValue || item.label === nextValue
|
||||||
);
|
);
|
||||||
row.cargoName = option?.value || '';
|
if (!option) {
|
||||||
if (!option) return;
|
row.cargoName = nextValue;
|
||||||
row.cargoType = option.cargoTypeLabel || row.cargoType || '';
|
return;
|
||||||
row.cargoTypeCode = option.cargoTypeCode || row.cargoTypeCode || '';
|
}
|
||||||
row.cargoTypePath = option.cargoTypePath || row.cargoTypePath || [];
|
const previousType = String(row.cargoType || '').trim();
|
||||||
|
const isKnownType = this.getDispatchConfiguredCargoTypeOptions().some(
|
||||||
|
item => item.label === previousType || String(item.value) === previousType
|
||||||
|
);
|
||||||
|
row.cargoName = option.value || '';
|
||||||
|
if (!previousType || isKnownType) {
|
||||||
|
row.cargoType = option.cargoTypeLabel || previousType;
|
||||||
|
row.cargoTypeCode = option.cargoTypeCode || row.cargoTypeCode || '';
|
||||||
|
row.cargoTypePath = option.cargoTypePath || row.cargoTypePath || [];
|
||||||
|
}
|
||||||
row.specification = option.specification || row.specification || '';
|
row.specification = option.specification || row.specification || '';
|
||||||
row.model = option.model || row.model || '';
|
row.model = option.model || row.model || '';
|
||||||
},
|
},
|
||||||
@@ -7345,10 +7529,7 @@ export default {
|
|||||||
vehicleNo: this.dispatchRow.vehicleNo || '',
|
vehicleNo: this.dispatchRow.vehicleNo || '',
|
||||||
cargoName: defaultGoods.cargoName || this.dispatchRow.cargoName || '',
|
cargoName: defaultGoods.cargoName || this.dispatchRow.cargoName || '',
|
||||||
cargoType: defaultGoods.cargoType || this.dispatchRow.cargoType || '',
|
cargoType: defaultGoods.cargoType || this.dispatchRow.cargoType || '',
|
||||||
quantity:
|
quantity: '',
|
||||||
index >= 0
|
|
||||||
? defaultGoods.quantity || ''
|
|
||||||
: this.formatDispatchQuantity(this.getDispatchRemainingQuantity(defaultUnit)),
|
|
||||||
quantityUnit: defaultUnit,
|
quantityUnit: defaultUnit,
|
||||||
specification: defaultGoods.specification || '',
|
specification: defaultGoods.specification || '',
|
||||||
model: defaultGoods.model || '',
|
model: defaultGoods.model || '',
|
||||||
@@ -8003,6 +8184,7 @@ export default {
|
|||||||
quantityGroups.set(key, group);
|
quantityGroups.set(key, group);
|
||||||
});
|
});
|
||||||
for (const { row: goods, quantity } of quantityGroups.values()) {
|
for (const { row: goods, quantity } of quantityGroups.values()) {
|
||||||
|
if (this.isDispatchPlanQuantityUnlimited(goods)) continue;
|
||||||
const unit = this.getDispatchQuantityUnit(goods);
|
const unit = this.getDispatchQuantityUnit(goods);
|
||||||
const remaining = this.dispatchItemRemainingQuantity(goods);
|
const remaining = this.dispatchItemRemainingQuantity(goods);
|
||||||
if (quantity - remaining > 1e-8) {
|
if (quantity - remaining > 1e-8) {
|
||||||
|
|||||||
@@ -10,107 +10,200 @@
|
|||||||
:class="{ 'waybill-import-page': standalone }"
|
:class="{ 'waybill-import-page': standalone }"
|
||||||
@closed="handleClosed"
|
@closed="handleClosed"
|
||||||
>
|
>
|
||||||
<div class="waybill-import-toolbar">
|
<section v-show="searchVisible" class="waybill-import-toolbar__search">
|
||||||
<div class="waybill-import-toolbar__search">
|
<el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
|
||||||
<el-form :inline="true" :model="query" label-width="auto">
|
<div class="waybill-import-toolbar__search-grid">
|
||||||
<el-form-item label="运单批次号"
|
<el-form-item label="运单批次号">
|
||||||
><el-input v-model="query.batchNo" clearable
|
<el-input v-model="query.batchNo" clearable placeholder="请输入" />
|
||||||
/></el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="承运商"
|
<el-form-item label="承运商">
|
||||||
><el-select v-model="query.carrierId" clearable filterable
|
<el-select v-model="query.carrierId" clearable filterable placeholder="请选择">
|
||||||
><el-option
|
<el-option
|
||||||
v-for="item in queryCarriers"
|
v-for="item in queryCarriers"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.name"
|
||||||
:value="item.id" /></el-select
|
:value="item.id"
|
||||||
></el-form-item>
|
/>
|
||||||
<el-form-item label="创建时间"
|
</el-select>
|
||||||
><el-date-picker
|
</el-form-item>
|
||||||
|
<el-form-item label="创建时间">
|
||||||
|
<el-date-picker
|
||||||
v-model="query.createTimeRange"
|
v-model="query.createTimeRange"
|
||||||
type="datetimerange"
|
type="datetimerange"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
/></el-form-item>
|
range-separator="~"
|
||||||
<el-form-item label="创建人"
|
start-placeholder="开始时间"
|
||||||
><el-select v-model="query.createUser" clearable filterable
|
end-placeholder="结束时间"
|
||||||
><el-option
|
clearable
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="创建人">
|
||||||
|
<el-select v-model="query.createUser" clearable filterable placeholder="请选择">
|
||||||
|
<el-option
|
||||||
v-for="item in creators"
|
v-for="item in creators"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.name"
|
||||||
:value="item.id" /></el-select
|
:value="item.id"
|
||||||
></el-form-item>
|
/>
|
||||||
</el-form>
|
</el-select>
|
||||||
<div class="waybill-import-toolbar__search-actions">
|
</el-form-item>
|
||||||
<el-button type="primary" @click="loadBatches">查询</el-button
|
|
||||||
><el-button @click="resetQuery">重置</el-button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="waybill-import-toolbar__search-actions">
|
||||||
<div class="waybill-import-toolbar__actions">
|
<el-button type="primary" @click="loadBatches">查询</el-button>
|
||||||
<el-button type="primary" @click="handleCreate">新建导入</el-button
|
<el-button @click="resetQuery">重置</el-button>
|
||||||
><el-button type="danger" plain :disabled="!selected.length" @click="removeBatches"
|
</div>
|
||||||
|
</el-form>
|
||||||
|
</section>
|
||||||
|
<div class="avue-crud__header waybill-import-toolbar__actions">
|
||||||
|
<div class="avue-crud__left">
|
||||||
|
<el-button type="primary" @click="handleCreate">新建导入</el-button>
|
||||||
|
<el-button type="danger" plain :disabled="!selected.length" @click="removeBatches"
|
||||||
>批量删除</el-button
|
>批量删除</el-button
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="avue-crud__right">
|
||||||
|
<el-button icon="el-icon-refresh" circle @click="loadBatches" />
|
||||||
|
<el-button icon="el-icon-operation" circle @click="columnSettingVisible = true" />
|
||||||
|
<el-button icon="el-icon-search" circle @click="searchVisible = !searchVisible" />
|
||||||
|
<el-button icon="el-icon-grid" circle @click="toggleTableSize" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<el-table :data="batches" border @selection-change="selected = $event">
|
<section class="waybill-import-toolbar__table-panel">
|
||||||
<el-table-column type="selection" width="50" /><el-table-column
|
<el-table
|
||||||
type="index"
|
:data="batches"
|
||||||
label="序号"
|
:size="tableSize"
|
||||||
width="70"
|
border
|
||||||
/>
|
@selection-change="selected = $event"
|
||||||
<el-table-column prop="batchNo" label="运单批次号" min-width="150" /><el-table-column
|
|
||||||
prop="projectName"
|
|
||||||
label="项目名称"
|
|
||||||
min-width="150"
|
|
||||||
/>
|
|
||||||
<el-table-column prop="carrierName" label="承运商" min-width="140" /><el-table-column
|
|
||||||
prop="carrierType"
|
|
||||||
label="承运类型"
|
|
||||||
min-width="120"
|
|
||||||
/>
|
|
||||||
<el-table-column prop="waybillCount" label="运单数" width="90" /><el-table-column
|
|
||||||
prop="importTypeName"
|
|
||||||
label="导入方式"
|
|
||||||
width="100"
|
|
||||||
/>
|
|
||||||
<el-table-column
|
|
||||||
prop="createTime"
|
|
||||||
label="创建时间"
|
|
||||||
min-width="170"
|
|
||||||
sortable
|
|
||||||
/><el-table-column prop="updateTime" label="更新时间" min-width="170" sortable />
|
|
||||||
<el-table-column prop="statusName" label="状态" width="100" /><el-table-column
|
|
||||||
label="操作"
|
|
||||||
width="180"
|
|
||||||
fixed="right"
|
|
||||||
>
|
>
|
||||||
<template #default="{ row }"
|
<el-table-column type="selection" width="50" /><el-table-column
|
||||||
><el-link type="primary" @click="openDetail(row)">查看</el-link
|
type="index"
|
||||||
><el-link
|
label="序号"
|
||||||
v-if="row.importStatus === 'draft'"
|
width="70"
|
||||||
type="primary"
|
/>
|
||||||
@click="editBatch(row)"
|
<el-table-column
|
||||||
>编辑</el-link
|
v-if="columnVisible.batchNo"
|
||||||
><el-link type="danger" @click="removeBatch(row)">删除</el-link></template
|
prop="batchNo"
|
||||||
|
label="运单批次号"
|
||||||
|
min-width="150"
|
||||||
|
/><el-table-column
|
||||||
|
v-if="columnVisible.projectName"
|
||||||
|
prop="projectName"
|
||||||
|
label="项目名称"
|
||||||
|
min-width="150"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
v-if="columnVisible.carrierName"
|
||||||
|
prop="carrierName"
|
||||||
|
label="承运商"
|
||||||
|
min-width="140"
|
||||||
|
/><el-table-column
|
||||||
|
v-if="columnVisible.carrierType"
|
||||||
|
prop="carrierType"
|
||||||
|
label="承运类型"
|
||||||
|
min-width="120"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
v-if="columnVisible.waybillCount"
|
||||||
|
prop="waybillCount"
|
||||||
|
label="运单数"
|
||||||
|
width="90"
|
||||||
|
/> <el-table-column
|
||||||
|
v-if="columnVisible.importTypeName"
|
||||||
|
prop="importTypeName"
|
||||||
|
label="导入方式"
|
||||||
|
width="100"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
v-if="columnVisible.createUserName"
|
||||||
|
prop="createUserName"
|
||||||
|
label="创建人"
|
||||||
|
min-width="120"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
<template #default="{ row }">{{ row.createUserName || '-' }}</template>
|
||||||
</el-table>
|
</el-table-column>
|
||||||
<el-pagination
|
<el-table-column
|
||||||
v-model:current-page="page.current"
|
v-if="columnVisible.statusName"
|
||||||
v-model:page-size="page.size"
|
prop="statusName"
|
||||||
layout="total, prev, pager, next, sizes"
|
label="状态"
|
||||||
:page-sizes="[10, 20, 50]"
|
width="100"
|
||||||
:total="page.total"
|
/>
|
||||||
@current-change="loadBatches"
|
<el-table-column
|
||||||
@size-change="loadBatches"
|
v-if="columnVisible.createTime"
|
||||||
/>
|
prop="createTime"
|
||||||
|
label="创建时间"
|
||||||
|
min-width="170"
|
||||||
|
sortable
|
||||||
|
/><el-table-column
|
||||||
|
v-if="columnVisible.updateTime"
|
||||||
|
prop="updateTime"
|
||||||
|
label="更新时间"
|
||||||
|
min-width="170"
|
||||||
|
sortable
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
label="操作"
|
||||||
|
width="180"
|
||||||
|
fixed="right"
|
||||||
|
>
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-link
|
||||||
|
v-if="row.importStatus !== 'draft'"
|
||||||
|
type="primary"
|
||||||
|
@click="openDetail(row)"
|
||||||
|
>查看</el-link
|
||||||
|
>
|
||||||
|
<el-link
|
||||||
|
v-if="row.importStatus === 'draft'"
|
||||||
|
type="primary"
|
||||||
|
@click="editBatch(row)"
|
||||||
|
>编辑</el-link
|
||||||
|
>
|
||||||
|
<el-link
|
||||||
|
v-if="row.importStatus === 'draft'"
|
||||||
|
type="danger"
|
||||||
|
@click="removeBatch(row)"
|
||||||
|
>删除</el-link
|
||||||
|
>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<div class="waybill-import-toolbar__pagination">
|
||||||
|
<el-pagination
|
||||||
|
background
|
||||||
|
v-model:current-page="page.current"
|
||||||
|
v-model:page-size="page.size"
|
||||||
|
layout="total, sizes, prev, pager, next, jumper"
|
||||||
|
:page-sizes="[10, 20, 50, 100]"
|
||||||
|
:total="page.total"
|
||||||
|
@current-change="loadBatches"
|
||||||
|
@size-change="loadBatches"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
</component>
|
</component>
|
||||||
|
|
||||||
|
<el-dialog
|
||||||
|
v-model="columnSettingVisible"
|
||||||
|
title="列设置"
|
||||||
|
width="360px"
|
||||||
|
append-to-body
|
||||||
|
>
|
||||||
|
<el-checkbox-group v-model="visibleColumnKeys" class="waybill-import-toolbar__column-setting">
|
||||||
|
<el-checkbox v-for="item in columnOptions" :key="item.prop" :label="item.prop">
|
||||||
|
{{ item.label }}
|
||||||
|
</el-checkbox>
|
||||||
|
</el-checkbox-group>
|
||||||
|
<template #footer>
|
||||||
|
<el-button @click="columnSettingVisible = false">关闭</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog v-model="detailVisible" title="导入运单详情" width="90%" append-to-body>
|
<el-dialog v-model="detailVisible" title="导入运单详情" width="90%" append-to-body>
|
||||||
<el-form :inline="true" :model="detailQuery"
|
<el-form :inline="true" :model="detailQuery"
|
||||||
><el-form-item label="车牌号/船号"
|
><el-form-item label="车牌号/船号"
|
||||||
><el-input v-model="detailQuery.vehicleNo" clearable /></el-form-item
|
><el-input v-model="detailQuery.vehicleNo" clearable /></el-form-item
|
||||||
><el-form-item label="货物名称"
|
><el-form-item label="司机/船长姓名"
|
||||||
><el-input v-model="detailQuery.cargoName" clearable /></el-form-item
|
><el-input v-model="detailQuery.driverName" clearable placeholder="请输入" /></el-form-item
|
||||||
><el-button type="primary" @click="loadDetails">查询</el-button></el-form
|
><el-button type="primary" @click="loadDetails">查询</el-button></el-form
|
||||||
>
|
>
|
||||||
<el-table :data="details" border
|
<el-table :data="details" border
|
||||||
@@ -126,7 +219,10 @@
|
|||||||
prop="vehicleNo"
|
prop="vehicleNo"
|
||||||
label="车牌号/航班号/船号/班列号"
|
label="车牌号/航班号/船号/班列号"
|
||||||
min-width="190"
|
min-width="190"
|
||||||
/><el-table-column prop="transportType" label="运输方式" width="110" /><el-table-column
|
/><el-table-column prop="transportType" label="运输方式" width="110">
|
||||||
|
<template #default="{ row }">{{ transportTypeLabel(row.transportType) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
prop="driverName"
|
prop="driverName"
|
||||||
label="司机/船长姓名"
|
label="司机/船长姓名"
|
||||||
min-width="120"
|
min-width="120"
|
||||||
@@ -200,17 +296,20 @@
|
|||||||
prop="waybillIdentifier"
|
prop="waybillIdentifier"
|
||||||
label="同一运单标识号"
|
label="同一运单标识号"
|
||||||
min-width="140"
|
min-width="140"
|
||||||
/><el-table-column label="操作" width="80">-</el-table-column></el-table
|
/></el-table
|
||||||
>
|
>
|
||||||
<el-pagination
|
<div class="waybill-import-toolbar__pagination">
|
||||||
v-model:current-page="detailPage.current"
|
<el-pagination
|
||||||
v-model:page-size="detailPage.size"
|
background
|
||||||
layout="total, prev, pager, next, sizes"
|
v-model:current-page="detailPage.current"
|
||||||
:page-sizes="[10, 20, 50]"
|
v-model:page-size="detailPage.size"
|
||||||
:total="detailPage.total"
|
layout="total, sizes, prev, pager, next, jumper"
|
||||||
@current-change="loadDetails"
|
:page-sizes="[10, 20, 50, 100]"
|
||||||
@size-change="loadDetails"
|
:total="detailPage.total"
|
||||||
/>
|
@current-change="loadDetails"
|
||||||
|
@size-change="loadDetails"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<component
|
<component
|
||||||
@@ -506,8 +605,32 @@ const handleClosed = () => emit('closed');
|
|||||||
const createVisible = ref(props.createPage),
|
const createVisible = ref(props.createPage),
|
||||||
detailVisible = ref(false),
|
detailVisible = ref(false),
|
||||||
formRef = ref();
|
formRef = ref();
|
||||||
|
const searchVisible = ref(true);
|
||||||
|
const columnSettingVisible = ref(false);
|
||||||
|
const tableSize = ref('default');
|
||||||
|
const tableSizeOptions = ['default', 'large', 'small'];
|
||||||
|
const columnOptions = [
|
||||||
|
{ prop: 'batchNo', label: '运单批次号' },
|
||||||
|
{ prop: 'projectName', label: '项目名称' },
|
||||||
|
{ prop: 'carrierName', label: '承运商' },
|
||||||
|
{ prop: 'carrierType', label: '承运类型' },
|
||||||
|
{ prop: 'waybillCount', label: '运单数' },
|
||||||
|
{ prop: 'importTypeName', label: '导入方式' },
|
||||||
|
{ prop: 'createUserName', label: '创建人' },
|
||||||
|
{ prop: 'statusName', label: '状态' },
|
||||||
|
{ prop: 'createTime', label: '创建时间' },
|
||||||
|
{ prop: 'updateTime', label: '更新时间' },
|
||||||
|
];
|
||||||
|
const visibleColumnKeys = ref(columnOptions.map(item => item.prop));
|
||||||
|
const columnVisible = computed(() =>
|
||||||
|
Object.fromEntries(columnOptions.map(item => [item.prop, visibleColumnKeys.value.includes(item.prop)]))
|
||||||
|
);
|
||||||
|
const toggleTableSize = () => {
|
||||||
|
const index = tableSizeOptions.indexOf(tableSize.value);
|
||||||
|
tableSize.value = tableSizeOptions[(index + 1) % tableSizeOptions.length];
|
||||||
|
};
|
||||||
const query = reactive({ batchNo: '', carrierId: '', createUser: '', createTimeRange: [] });
|
const query = reactive({ batchNo: '', carrierId: '', createUser: '', createTimeRange: [] });
|
||||||
const detailQuery = reactive({ vehicleNo: '', cargoName: '' });
|
const detailQuery = reactive({ vehicleNo: '', driverName: '' });
|
||||||
const createDefaultForm = () => ({
|
const createDefaultForm = () => ({
|
||||||
id: '',
|
id: '',
|
||||||
batchNo: '',
|
batchNo: '',
|
||||||
@@ -862,6 +985,20 @@ const loadEditorOptions = async () => {
|
|||||||
cargoTypeFlatOptions.value = flattenCargoTypeOptions(cargoTypeOptions.value);
|
cargoTypeFlatOptions.value = flattenCargoTypeOptions(cargoTypeOptions.value);
|
||||||
driverOptions.value = extractRecords(driverRes);
|
driverOptions.value = extractRecords(driverRes);
|
||||||
};
|
};
|
||||||
|
const ensureTransportTypeOptions = async () => {
|
||||||
|
if (transportTypeOptions.value.length) return;
|
||||||
|
const dictRes = await getDictionary({ code: 'transport_type' });
|
||||||
|
transportTypeOptions.value = extractRecords(dictRes).map(item => ({
|
||||||
|
label: item.dictValue || item.label,
|
||||||
|
value: item.dictKey || item.value,
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
const transportTypeLabel = value => {
|
||||||
|
if (value === null || value === undefined || value === '') return '-';
|
||||||
|
return (
|
||||||
|
transportTypeOptions.value.find(item => String(item.value) === String(value))?.label || value
|
||||||
|
);
|
||||||
|
};
|
||||||
const loadBatches = async () => {
|
const loadBatches = async () => {
|
||||||
const res = await api.getImportBatches({ ...query, current: page.current, size: page.size });
|
const res = await api.getImportBatches({ ...query, current: page.current, size: page.size });
|
||||||
batches.value = res.data?.data?.records || [];
|
batches.value = res.data?.data?.records || [];
|
||||||
@@ -922,9 +1059,13 @@ const closeCreate = () => {
|
|||||||
}
|
}
|
||||||
createVisible.value = false;
|
createVisible.value = false;
|
||||||
};
|
};
|
||||||
const openDetail = row => {
|
const openDetail = async row => {
|
||||||
detailQuery.batchId = row.id;
|
detailQuery.batchId = row.id;
|
||||||
|
detailQuery.vehicleNo = '';
|
||||||
|
detailQuery.driverName = '';
|
||||||
|
detailPage.current = 1;
|
||||||
detailVisible.value = true;
|
detailVisible.value = true;
|
||||||
|
await ensureTransportTypeOptions();
|
||||||
loadDetails();
|
loadDetails();
|
||||||
};
|
};
|
||||||
// 草稿明细已落库为草稿运单,编辑时回填到明细表,避免重新上传附件。
|
// 草稿明细已落库为草稿运单,编辑时回填到明细表,避免重新上传附件。
|
||||||
@@ -1329,34 +1470,81 @@ const confirmImport = async () => {
|
|||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.waybill-import-toolbar {
|
.waybill-import-toolbar {
|
||||||
margin-bottom: 12px;
|
|
||||||
|
|
||||||
&__search {
|
&__search {
|
||||||
display: flex;
|
padding: 18px 18px 8px;
|
||||||
align-items: flex-start;
|
margin-bottom: 8px;
|
||||||
gap: 12px;
|
background: #fff;
|
||||||
|
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
|
||||||
|
}
|
||||||
|
|
||||||
.el-form {
|
&__search-grid {
|
||||||
flex: 1;
|
display: grid;
|
||||||
margin-bottom: 0;
|
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||||
}
|
gap: 8px 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__search :deep(.el-form-item) {
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__search :deep(.el-form-item__label) {
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__search :deep(.el-input),
|
||||||
|
&__search :deep(.el-select),
|
||||||
|
&__search :deep(.el-date-editor),
|
||||||
|
&__search :deep(.el-date-editor.el-input),
|
||||||
|
&__search :deep(.el-date-editor.el-input__wrapper),
|
||||||
|
&__search :deep(.el-date-editor--datetimerange) {
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__search-actions {
|
&__search-actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex: none;
|
justify-content: flex-end;
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
|
margin-bottom: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__actions {
|
&__actions {
|
||||||
margin-top: 8px;
|
margin-top: 12px;
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__column-setting {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__table-panel {
|
||||||
|
padding: 0 12px 12px;
|
||||||
|
background: #fff;
|
||||||
|
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
|
||||||
|
}
|
||||||
|
|
||||||
|
&__pagination {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: 16px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__table-panel :deep(.el-table) {
|
||||||
|
--el-table-border-color: #eff1f7;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__table-panel :deep(.el-table__body tr:nth-child(even) > td.el-table__cell),
|
||||||
|
&__table-panel :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--left),
|
||||||
|
&__table-panel :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--right) {
|
||||||
|
background: #fafafa;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.waybill-import-page {
|
.waybill-import-page {
|
||||||
min-height: calc(100vh - 120px);
|
min-height: calc(100vh - 120px);
|
||||||
padding: 12px 24px 24px;
|
|
||||||
background: #fff;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.waybill-import-create {
|
.waybill-import-create {
|
||||||
|
|||||||
@@ -5172,19 +5172,28 @@ export default {
|
|||||||
if (type === 'add' && copyId) {
|
if (type === 'add' && copyId) {
|
||||||
this.api.getDetail(copyId).then(res => {
|
this.api.getDetail(copyId).then(res => {
|
||||||
const sourceData = res.data.data || {};
|
const sourceData = res.data.data || {};
|
||||||
// 清除不应该复制的字段
|
// 清除不应该复制的字段(业务状态与原运单保持一致)
|
||||||
delete sourceData.id;
|
delete sourceData.id;
|
||||||
delete sourceData.code;
|
delete sourceData.code;
|
||||||
delete sourceData.waybillNo;
|
delete sourceData.waybillNo;
|
||||||
delete sourceData.waybillStatus;
|
delete sourceData.waybillStatus;
|
||||||
|
delete sourceData.driverAcceptStatus;
|
||||||
|
delete sourceData.driverAcceptTime;
|
||||||
|
delete sourceData.driverAcceptDriverId;
|
||||||
|
delete sourceData.driverRejectTime;
|
||||||
|
delete sourceData.driverRejectReason;
|
||||||
|
delete sourceData.loadingNo;
|
||||||
|
delete sourceData.masterNo;
|
||||||
delete sourceData.createTime;
|
delete sourceData.createTime;
|
||||||
delete sourceData.updateTime;
|
delete sourceData.updateTime;
|
||||||
delete sourceData.createUser;
|
delete sourceData.createUser;
|
||||||
delete sourceData.updateUser;
|
delete sourceData.updateUser;
|
||||||
delete sourceData.createDept;
|
delete sourceData.createDept;
|
||||||
|
delete sourceData.createUserName;
|
||||||
|
delete sourceData.updateUserName;
|
||||||
|
|
||||||
this.applyFormDetail(sourceData);
|
this.applyFormDetail(sourceData);
|
||||||
// 标记为手工创建
|
// 标记为手工创建;业务状态沿用原运单
|
||||||
this.form.dataSource = '手工创建';
|
this.form.dataSource = '手工创建';
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -354,7 +354,7 @@
|
|||||||
<el-link
|
<el-link
|
||||||
v-for="action in rowActions(row)"
|
v-for="action in rowActions(row)"
|
||||||
:key="action.type"
|
:key="action.type"
|
||||||
:type="action.type === 'delete' ? 'danger' : 'primary'"
|
:type="['delete', 'cancel'].includes(action.type) ? 'danger' : 'primary'"
|
||||||
@click="handleRowAction(action.type, row)"
|
@click="handleRowAction(action.type, row)"
|
||||||
>{{ action.label }}</el-link
|
>{{ action.label }}</el-link
|
||||||
>
|
>
|
||||||
@@ -583,219 +583,219 @@
|
|||||||
label-width="auto"
|
label-width="auto"
|
||||||
class="loading-manage-dialog__form archive-form"
|
class="loading-manage-dialog__form archive-form"
|
||||||
>
|
>
|
||||||
<section-card title="筛选待配载运单">
|
|
||||||
<template #extra>
|
|
||||||
<el-link v-if="!dialogReadonly" type="primary" @click="openCandidateSearch"
|
|
||||||
>筛选</el-link
|
|
||||||
>
|
|
||||||
</template>
|
|
||||||
<div class="loading-manage-dialog__candidate-search">
|
|
||||||
<el-row :gutter="16">
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="运单号">
|
|
||||||
<el-input v-model="candidateQuery.waybillNo" clearable placeholder="请输入" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="项目名称">
|
|
||||||
<el-select
|
|
||||||
v-model="candidateQuery.projectName"
|
|
||||||
clearable
|
|
||||||
filterable
|
|
||||||
remote
|
|
||||||
reserve-keyword
|
|
||||||
:remote-method="loadProjectOptions"
|
|
||||||
:loading="projectLoading"
|
|
||||||
placeholder="请输入"
|
|
||||||
@visible-change="
|
|
||||||
visible => visible && loadProjectOptions(candidateQuery.projectName)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in projectOptions"
|
|
||||||
:key="item.id || item.projectName"
|
|
||||||
:label="item.projectName"
|
|
||||||
:value="item.projectName"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="发货地址">
|
|
||||||
<el-input
|
|
||||||
v-model="candidateQuery.departureAddress"
|
|
||||||
clearable
|
|
||||||
placeholder="请输入"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<template v-if="candidateSearchVisible">
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="货物名称">
|
|
||||||
<el-input v-model="candidateQuery.cargoName" clearable placeholder="请输入" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="收货地址">
|
|
||||||
<el-input
|
|
||||||
v-model="candidateQuery.arrivalAddress"
|
|
||||||
clearable
|
|
||||||
placeholder="请输入"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="客户名称">
|
|
||||||
<el-select
|
|
||||||
v-model="candidateQuery.customerName"
|
|
||||||
clearable
|
|
||||||
filterable
|
|
||||||
remote
|
|
||||||
reserve-keyword
|
|
||||||
:remote-method="loadCustomerOptions"
|
|
||||||
:loading="customerLoading"
|
|
||||||
placeholder="请输入"
|
|
||||||
@visible-change="
|
|
||||||
visible => visible && loadCustomerOptions(candidateQuery.customerName)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in customerOptions"
|
|
||||||
:key="item.id || item.customerName"
|
|
||||||
:label="item.customerName"
|
|
||||||
:value="item.customerName"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="货物类型">
|
|
||||||
<el-select
|
|
||||||
v-model="candidateQuery.cargoType"
|
|
||||||
clearable
|
|
||||||
filterable
|
|
||||||
remote
|
|
||||||
reserve-keyword
|
|
||||||
:remote-method="loadCargoTypeOptions"
|
|
||||||
:loading="cargoTypeLoading"
|
|
||||||
placeholder="请输入"
|
|
||||||
@visible-change="
|
|
||||||
visible => visible && loadCargoTypeOptions(candidateQuery.cargoType)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in cargoTypeOptions"
|
|
||||||
:key="item.id || item.cargoName || item.cargoType"
|
|
||||||
:label="item.cargoName || item.cargoType || item.label"
|
|
||||||
:value="item.cargoName || item.cargoType || item.label"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="原始单号">
|
|
||||||
<el-input
|
|
||||||
v-model="candidateQuery.originalNo"
|
|
||||||
clearable
|
|
||||||
placeholder="请输入"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="车/船/航班/班列">
|
|
||||||
<el-input v-model="candidateQuery.vehicleNo" clearable placeholder="请输入" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="承运商名称">
|
|
||||||
<el-select
|
|
||||||
v-model="candidateQuery.carrierName"
|
|
||||||
clearable
|
|
||||||
filterable
|
|
||||||
remote
|
|
||||||
reserve-keyword
|
|
||||||
:remote-method="loadCarrierOptions"
|
|
||||||
:loading="carrierLoading"
|
|
||||||
placeholder="请输入"
|
|
||||||
@visible-change="
|
|
||||||
visible => visible && loadCarrierOptions(candidateQuery.carrierName)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in carrierOptions"
|
|
||||||
:key="item.id || item.fullName || item.customerName || item.carrierName"
|
|
||||||
:label="
|
|
||||||
item.fullName || item.customerName || item.carrierName || item.name
|
|
||||||
"
|
|
||||||
:value="
|
|
||||||
item.fullName || item.customerName || item.carrierName || item.name
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="司机">
|
|
||||||
<el-select
|
|
||||||
v-model="candidateQuery.driverName"
|
|
||||||
clearable
|
|
||||||
filterable
|
|
||||||
remote
|
|
||||||
reserve-keyword
|
|
||||||
:remote-method="loadDriverOptions"
|
|
||||||
:loading="driverLoading"
|
|
||||||
placeholder="请输入"
|
|
||||||
@visible-change="
|
|
||||||
visible => visible && loadDriverOptions(candidateQuery.driverName)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in driverOptions"
|
|
||||||
:key="item.id || item.driverName || item.name"
|
|
||||||
:label="item.driverName || item.name"
|
|
||||||
:value="item.driverName || item.name"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="运输方式">
|
|
||||||
<el-select
|
|
||||||
v-model="candidateQuery.transportType"
|
|
||||||
clearable
|
|
||||||
filterable
|
|
||||||
placeholder="请选择"
|
|
||||||
:disabled="dialogMode === 'add'"
|
|
||||||
@visible-change="visible => visible && loadTransportTypeOptions()"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in transportTypeOptions"
|
|
||||||
:key="item.value"
|
|
||||||
:label="item.label"
|
|
||||||
:value="item.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</template>
|
|
||||||
<el-col
|
|
||||||
:span="candidateSearchVisible ? 24 : 6"
|
|
||||||
class="loading-manage-dialog__candidate-actions"
|
|
||||||
>
|
|
||||||
<el-button type="primary" @click="handleCandidateSearch">查询</el-button>
|
|
||||||
<el-button @click="handleCandidateReset">重置</el-button>
|
|
||||||
<el-link
|
|
||||||
type="primary"
|
|
||||||
@click="candidateSearchVisible = !candidateSearchVisible"
|
|
||||||
>{{ candidateSearchVisible ? '收起' : '展开' }}</el-link
|
|
||||||
>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
</div>
|
|
||||||
</section-card>
|
|
||||||
|
|
||||||
<div title="配载信息" class="loading-manage-dialog__load-info-card">
|
<div title="配载信息" class="loading-manage-dialog__load-info-card">
|
||||||
<section-card title="待配载运单">
|
<section-card>
|
||||||
|
<div class="loading-manage-dialog__candidate-search">
|
||||||
|
<el-row :gutter="16">
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="运单号">
|
||||||
|
<el-input v-model="candidateQuery.waybillNo" clearable placeholder="请输入" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="项目名称">
|
||||||
|
<el-select
|
||||||
|
v-model="candidateQuery.projectName"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
remote
|
||||||
|
reserve-keyword
|
||||||
|
:remote-method="loadProjectOptions"
|
||||||
|
:loading="projectLoading"
|
||||||
|
placeholder="请输入"
|
||||||
|
@visible-change="
|
||||||
|
visible => visible && loadProjectOptions(candidateQuery.projectName)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in projectOptions"
|
||||||
|
:key="item.id || item.projectName"
|
||||||
|
:label="item.projectName"
|
||||||
|
:value="item.projectName"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="发货地址">
|
||||||
|
<el-input
|
||||||
|
v-model="candidateQuery.departureAddress"
|
||||||
|
clearable
|
||||||
|
placeholder="请输入"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<template v-if="candidateSearchVisible">
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="货物名称">
|
||||||
|
<el-input
|
||||||
|
v-model="candidateQuery.cargoName"
|
||||||
|
clearable
|
||||||
|
placeholder="请输入"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="收货地址">
|
||||||
|
<el-input
|
||||||
|
v-model="candidateQuery.arrivalAddress"
|
||||||
|
clearable
|
||||||
|
placeholder="请输入"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="客户名称">
|
||||||
|
<el-select
|
||||||
|
v-model="candidateQuery.customerName"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
remote
|
||||||
|
reserve-keyword
|
||||||
|
:remote-method="loadCustomerOptions"
|
||||||
|
:loading="customerLoading"
|
||||||
|
placeholder="请输入"
|
||||||
|
@visible-change="
|
||||||
|
visible => visible && loadCustomerOptions(candidateQuery.customerName)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in customerOptions"
|
||||||
|
:key="item.id || item.customerName"
|
||||||
|
:label="item.customerName"
|
||||||
|
:value="item.customerName"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="货物类型">
|
||||||
|
<el-select
|
||||||
|
v-model="candidateQuery.cargoType"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
remote
|
||||||
|
reserve-keyword
|
||||||
|
:remote-method="loadCargoTypeOptions"
|
||||||
|
:loading="cargoTypeLoading"
|
||||||
|
placeholder="请输入"
|
||||||
|
@visible-change="
|
||||||
|
visible => visible && loadCargoTypeOptions(candidateQuery.cargoType)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in cargoTypeOptions"
|
||||||
|
:key="item.id || item.cargoName || item.cargoType"
|
||||||
|
:label="item.cargoName || item.cargoType || item.label"
|
||||||
|
:value="item.cargoName || item.cargoType || item.label"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="原始单号">
|
||||||
|
<el-input
|
||||||
|
v-model="candidateQuery.originalNo"
|
||||||
|
clearable
|
||||||
|
placeholder="请输入"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="车/船/航班/班列">
|
||||||
|
<el-input
|
||||||
|
v-model="candidateQuery.vehicleNo"
|
||||||
|
clearable
|
||||||
|
placeholder="请输入"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="承运商名称">
|
||||||
|
<el-select
|
||||||
|
v-model="candidateQuery.carrierName"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
remote
|
||||||
|
reserve-keyword
|
||||||
|
:remote-method="loadCarrierOptions"
|
||||||
|
:loading="carrierLoading"
|
||||||
|
placeholder="请输入"
|
||||||
|
@visible-change="
|
||||||
|
visible => visible && loadCarrierOptions(candidateQuery.carrierName)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in carrierOptions"
|
||||||
|
:key="item.id || item.fullName || item.customerName || item.carrierName"
|
||||||
|
:label="
|
||||||
|
item.fullName || item.customerName || item.carrierName || item.name
|
||||||
|
"
|
||||||
|
:value="
|
||||||
|
item.fullName || item.customerName || item.carrierName || item.name
|
||||||
|
"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="司机">
|
||||||
|
<el-select
|
||||||
|
v-model="candidateQuery.driverName"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
remote
|
||||||
|
reserve-keyword
|
||||||
|
:remote-method="loadDriverOptions"
|
||||||
|
:loading="driverLoading"
|
||||||
|
placeholder="请输入"
|
||||||
|
@visible-change="
|
||||||
|
visible => visible && loadDriverOptions(candidateQuery.driverName)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in driverOptions"
|
||||||
|
:key="item.id || item.driverName || item.name"
|
||||||
|
:label="item.driverName || item.name"
|
||||||
|
:value="item.driverName || item.name"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="运输方式">
|
||||||
|
<el-select
|
||||||
|
v-model="candidateQuery.transportType"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
placeholder="请选择"
|
||||||
|
:disabled="dialogMode === 'add'"
|
||||||
|
@visible-change="visible => visible && loadTransportTypeOptions()"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in transportTypeOptions"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</template>
|
||||||
|
<el-col
|
||||||
|
:span="candidateSearchVisible ? 24 : 6"
|
||||||
|
class="loading-manage-dialog__candidate-actions"
|
||||||
|
>
|
||||||
|
<el-button type="primary" @click="handleCandidateSearch">查询</el-button>
|
||||||
|
<el-button @click="handleCandidateReset">重置</el-button>
|
||||||
|
<el-link
|
||||||
|
type="primary"
|
||||||
|
@click="candidateSearchVisible = !candidateSearchVisible"
|
||||||
|
>{{ candidateSearchVisible ? '收起' : '展开' }}</el-link
|
||||||
|
>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
<el-table
|
<el-table
|
||||||
ref="candidateTableRef"
|
ref="candidateTableRef"
|
||||||
v-loading="candidateLoading"
|
v-loading="candidateLoading"
|
||||||
@@ -843,27 +843,43 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
>
|
>
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
{{ formatCandidateWaybillValue(row, 'goodsInfo') }}
|
{{ formatCandidateGoodsInfo(row) }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="departureAddress"
|
prop="departureAddress"
|
||||||
label="发货地址"
|
label="发货地址"
|
||||||
min-width="220"
|
min-width="220"
|
||||||
show-overflow-tooltip
|
|
||||||
>
|
>
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
{{ formatCandidateAddress(row, 'departure') }}
|
<el-tooltip
|
||||||
|
v-if="formatCandidateAddressTooltip(row, 'departure')"
|
||||||
|
:content="formatCandidateAddressTooltip(row, 'departure')"
|
||||||
|
placement="top"
|
||||||
|
>
|
||||||
|
<div class="loading-manage-page__address-cell">
|
||||||
|
{{ formatCandidateAddress(row, 'departure') }}
|
||||||
|
</div>
|
||||||
|
</el-tooltip>
|
||||||
|
<span v-else>{{ formatCandidateAddress(row, 'departure') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="arrivalAddress"
|
prop="arrivalAddress"
|
||||||
label="收货地址"
|
label="收货地址"
|
||||||
min-width="220"
|
min-width="220"
|
||||||
show-overflow-tooltip
|
|
||||||
>
|
>
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
{{ formatCandidateAddress(row, 'arrival') }}
|
<el-tooltip
|
||||||
|
v-if="formatCandidateAddressTooltip(row, 'arrival')"
|
||||||
|
:content="formatCandidateAddressTooltip(row, 'arrival')"
|
||||||
|
placement="top"
|
||||||
|
>
|
||||||
|
<div class="loading-manage-page__address-cell">
|
||||||
|
{{ formatCandidateAddress(row, 'arrival') }}
|
||||||
|
</div>
|
||||||
|
</el-tooltip>
|
||||||
|
<span v-else>{{ formatCandidateAddress(row, 'arrival') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
@@ -995,20 +1011,36 @@
|
|||||||
prop="departureAddress"
|
prop="departureAddress"
|
||||||
label="发货地"
|
label="发货地"
|
||||||
min-width="220"
|
min-width="220"
|
||||||
show-overflow-tooltip
|
|
||||||
>
|
>
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
{{ formatWaybillAddress(row, 'departure') }}
|
<el-tooltip
|
||||||
|
v-if="formatCandidateAddressTooltip(row, 'departure')"
|
||||||
|
:content="formatCandidateAddressTooltip(row, 'departure')"
|
||||||
|
placement="top"
|
||||||
|
>
|
||||||
|
<div class="loading-manage-page__address-cell">
|
||||||
|
{{ formatCandidateAddress(row, 'departure') }}
|
||||||
|
</div>
|
||||||
|
</el-tooltip>
|
||||||
|
<span v-else>{{ formatCandidateAddress(row, 'departure') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="arrivalAddress"
|
prop="arrivalAddress"
|
||||||
label="到货地"
|
label="到货地"
|
||||||
min-width="220"
|
min-width="220"
|
||||||
show-overflow-tooltip
|
|
||||||
>
|
>
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
{{ formatWaybillAddress(row, 'arrival') }}
|
<el-tooltip
|
||||||
|
v-if="formatCandidateAddressTooltip(row, 'arrival')"
|
||||||
|
:content="formatCandidateAddressTooltip(row, 'arrival')"
|
||||||
|
placement="top"
|
||||||
|
>
|
||||||
|
<div class="loading-manage-page__address-cell">
|
||||||
|
{{ formatCandidateAddress(row, 'arrival') }}
|
||||||
|
</div>
|
||||||
|
</el-tooltip>
|
||||||
|
<span v-else>{{ formatCandidateAddress(row, 'arrival') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" width="110" fixed="right">
|
<el-table-column label="操作" width="110" fixed="right">
|
||||||
@@ -1677,7 +1709,6 @@ export default {
|
|||||||
add: '新建配载',
|
add: '新建配载',
|
||||||
edit: '编辑配载单',
|
edit: '编辑配载单',
|
||||||
view: '配载单详情',
|
view: '配载单详情',
|
||||||
copy: '复制配载单',
|
|
||||||
reassign: '重新派单',
|
reassign: '重新派单',
|
||||||
};
|
};
|
||||||
return titleMap[this.dialogMode] || '配载管理';
|
return titleMap[this.dialogMode] || '配载管理';
|
||||||
@@ -1826,6 +1857,7 @@ export default {
|
|||||||
if (!row) return '-';
|
if (!row) return '-';
|
||||||
if (prop === 'businessStatus') return this.statusText(row);
|
if (prop === 'businessStatus') return this.statusText(row);
|
||||||
if (prop === 'transportType') return this.transportTypeLabel(row.transportType);
|
if (prop === 'transportType') return this.transportTypeLabel(row.transportType);
|
||||||
|
if (prop === 'goodsInfo') return this.formatCandidateGoodsInfo(row);
|
||||||
const column = waybillOption.column.find(item => item.prop === prop);
|
const column = waybillOption.column.find(item => item.prop === prop);
|
||||||
if (column?.formatter) {
|
if (column?.formatter) {
|
||||||
const value = column.formatter(row, {}, row[prop]);
|
const value = column.formatter(row, {}, row[prop]);
|
||||||
@@ -1834,14 +1866,130 @@ export default {
|
|||||||
const value = row[prop];
|
const value = row[prop];
|
||||||
return value === undefined || value === null || value === '' ? '-' : value;
|
return value === undefined || value === null || value === '' ? '-' : value;
|
||||||
},
|
},
|
||||||
|
formatCandidateGoodsInfo(row = {}) {
|
||||||
|
const goodsRows =
|
||||||
|
[row.goodsJson, row.goodsList, row.goodsRows, row.cargoList, row.cargoRows, row.goods]
|
||||||
|
.map(source => {
|
||||||
|
if (source === undefined || source === null || source === '') return [];
|
||||||
|
if (Array.isArray(source)) return source;
|
||||||
|
if (typeof source === 'object') return [source];
|
||||||
|
return parseJsonArray(source);
|
||||||
|
})
|
||||||
|
.filter(source => source.length)
|
||||||
|
.sort((left, right) => right.length - left.length)[0] || [];
|
||||||
|
if (!goodsRows.length) return String(row.goodsInfo || row.cargoInfo || '') || '-';
|
||||||
|
const groups = goodsRows.reduce((result, item = {}) => {
|
||||||
|
const unit = String(
|
||||||
|
item.quantityUnit ||
|
||||||
|
item.goodsQuantityUnit ||
|
||||||
|
item.cargoUnit ||
|
||||||
|
item.unit ||
|
||||||
|
row.quantityUnit ||
|
||||||
|
row.goodsQuantityUnit ||
|
||||||
|
row.cargoUnit ||
|
||||||
|
row.unit ||
|
||||||
|
''
|
||||||
|
).trim();
|
||||||
|
const key = unit || '__empty__';
|
||||||
|
if (!result[key]) {
|
||||||
|
result[key] = {
|
||||||
|
typeName:
|
||||||
|
item.secondCargoTypeName ||
|
||||||
|
item.secondCargoType ||
|
||||||
|
item.cargoType ||
|
||||||
|
item.goodsType ||
|
||||||
|
item.typeName ||
|
||||||
|
'货物',
|
||||||
|
count: 0,
|
||||||
|
quantity: 0,
|
||||||
|
unit,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
result[key].count += 1;
|
||||||
|
result[key].quantity += this.parseGoodsQuantity(
|
||||||
|
item.quantity ?? item.cargoQuantity ?? item.goodsQuantity
|
||||||
|
);
|
||||||
|
return result;
|
||||||
|
}, {});
|
||||||
|
return (
|
||||||
|
Object.values(groups)
|
||||||
|
.map(group => {
|
||||||
|
const quantity = this.formatGoodsQuantity(group.quantity);
|
||||||
|
return `${group.typeName}等${group.count}种货物 | ${quantity}${
|
||||||
|
group.unit ? ` ${group.unit}` : ''
|
||||||
|
}`;
|
||||||
|
})
|
||||||
|
.join('; ') || '-'
|
||||||
|
);
|
||||||
|
},
|
||||||
|
parseGoodsQuantity(value) {
|
||||||
|
if (value === undefined || value === null || value === '') return 0;
|
||||||
|
const text = String(value).replace(/,/g, '');
|
||||||
|
const match = text.match(/-?\d+(\.\d+)?/);
|
||||||
|
if (!match) return 0;
|
||||||
|
const number = Number(match[0]);
|
||||||
|
return Number.isFinite(number) ? number : 0;
|
||||||
|
},
|
||||||
|
formatGoodsQuantity(value) {
|
||||||
|
const number = Number(value || 0);
|
||||||
|
if (!Number.isFinite(number)) return '0';
|
||||||
|
const fixed = Math.round((number + Number.EPSILON) * 1000) / 1000;
|
||||||
|
return Number.isInteger(fixed) ? String(fixed) : String(fixed).replace(/\.?0+$/, '');
|
||||||
|
},
|
||||||
formatCandidateDate(value) {
|
formatCandidateDate(value) {
|
||||||
if (!value) return '-';
|
if (!value) return '-';
|
||||||
const date = dayjs(value);
|
const date = dayjs(value);
|
||||||
return date.isValid() ? date.format('YYYY-MM-DD HH:mm:ss') : value;
|
return date.isValid() ? date.format('YYYY-MM-DD HH:mm:ss') : value;
|
||||||
},
|
},
|
||||||
formatCandidateAddress(row, type) {
|
formatCandidateAddress(row, type) {
|
||||||
const value = row?.[`${type}Address`] || row?.[`${type}Name`] || '';
|
const prefix = type === 'departure' ? 'departure' : 'arrival';
|
||||||
return this.formatProvinceCityDistrict(value) || '-';
|
const name = String(row?.[`${prefix}Name`] || '').trim();
|
||||||
|
const address = String(row?.[`${prefix}Address`] || '').trim();
|
||||||
|
if (!this.isRoadTransportType(row?.transportType)) {
|
||||||
|
return name || address || '-';
|
||||||
|
}
|
||||||
|
const region = this.mergeRouteAddressParts(
|
||||||
|
this.routeProvinceName(row, prefix),
|
||||||
|
row[`${prefix}CityName`] || row[`${prefix}City`],
|
||||||
|
row[`${prefix}DistrictName`] || row[`${prefix}District`]
|
||||||
|
);
|
||||||
|
const source = this.mergeRouteAddressParts(region, '', address || name);
|
||||||
|
const parts = this.parseWaybillAddress(source);
|
||||||
|
return (
|
||||||
|
[parts.province, parts.city, parts.district]
|
||||||
|
.map(value => String(value || '').trim())
|
||||||
|
.filter(Boolean)
|
||||||
|
.join('') ||
|
||||||
|
this.formatProvinceCityDistrict(source) ||
|
||||||
|
name ||
|
||||||
|
address ||
|
||||||
|
'-'
|
||||||
|
);
|
||||||
|
},
|
||||||
|
formatCandidateAddressTooltip(row, type) {
|
||||||
|
if (!this.isRoadTransportType(row?.transportType)) return '';
|
||||||
|
const prefix = type === 'departure' ? 'departure' : 'arrival';
|
||||||
|
const address = String(row?.[`${prefix}Address`] || '').trim();
|
||||||
|
const name = String(row?.[`${prefix}Name`] || '').trim();
|
||||||
|
const region = this.mergeRouteAddressParts(
|
||||||
|
this.routeProvinceName(row, prefix),
|
||||||
|
row[`${prefix}CityName`] || row[`${prefix}City`],
|
||||||
|
row[`${prefix}DistrictName`] || row[`${prefix}District`]
|
||||||
|
);
|
||||||
|
const detailAddress =
|
||||||
|
row[`${prefix}DetailAddress`] || row[`${prefix}AddressDetail`] || address;
|
||||||
|
return this.mergeRouteAddressParts(region, '', detailAddress || name) || '';
|
||||||
|
},
|
||||||
|
isRoadTransportType(type) {
|
||||||
|
const value = String(type || '')
|
||||||
|
.trim()
|
||||||
|
.toLowerCase();
|
||||||
|
return (
|
||||||
|
value === 'road' ||
|
||||||
|
value.includes('公路') ||
|
||||||
|
value.includes('道路') ||
|
||||||
|
value.includes('highway')
|
||||||
|
);
|
||||||
},
|
},
|
||||||
splitText(value) {
|
splitText(value) {
|
||||||
if (!value) return [];
|
if (!value) return [];
|
||||||
@@ -2014,31 +2162,28 @@ export default {
|
|||||||
if (status === 'draft') {
|
if (status === 'draft') {
|
||||||
return [
|
return [
|
||||||
{ type: 'edit', label: '编辑' },
|
{ type: 'edit', label: '编辑' },
|
||||||
{ type: 'copy', label: '复制' },
|
|
||||||
{ type: 'delete', label: '删除' },
|
{ type: 'delete', label: '删除' },
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
if (status === 'pending') {
|
if (status === 'pending') {
|
||||||
return [
|
const actions = [
|
||||||
{ type: 'view', label: '详情' },
|
{ type: 'view', label: '详情' },
|
||||||
{ type: 'reassign', label: '重新派单' },
|
{ type: 'start', label: '改为进行中' },
|
||||||
{ type: 'edit', label: '编辑' },
|
|
||||||
{ type: 'copy', label: '复制' },
|
|
||||||
{ type: 'cancel', label: '取消' },
|
|
||||||
];
|
];
|
||||||
|
if (row.driverRejected) {
|
||||||
|
actions.push({ type: 'reassign', label: '重新派单' });
|
||||||
|
}
|
||||||
|
actions.push({ type: 'edit', label: '编辑' }, { type: 'cancel', label: '取消' });
|
||||||
|
return actions;
|
||||||
}
|
}
|
||||||
if (status === 'running') {
|
if (status === 'running') {
|
||||||
return [
|
return [
|
||||||
{ type: 'view', label: '详情' },
|
{ type: 'view', label: '详情' },
|
||||||
{ type: 'copy', label: '复制' },
|
|
||||||
{ type: 'complete', label: '完成' },
|
{ type: 'complete', label: '完成' },
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
if (status === 'completed' || status === 'cancelled') {
|
if (status === 'completed' || status === 'cancelled') {
|
||||||
return [
|
return [{ type: 'view', label: '详情' }];
|
||||||
{ type: 'view', label: '详情' },
|
|
||||||
{ type: 'copy', label: '复制' },
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
return [{ type: 'view', label: '详情' }];
|
return [{ type: 'view', label: '详情' }];
|
||||||
},
|
},
|
||||||
@@ -2047,8 +2192,8 @@ export default {
|
|||||||
view: () => this.openLoadingDialog('view', row),
|
view: () => this.openLoadingDialog('view', row),
|
||||||
edit: () => this.openLoadingDialog('edit', row),
|
edit: () => this.openLoadingDialog('edit', row),
|
||||||
reassign: () => this.openLoadingDialog('reassign', row),
|
reassign: () => this.openLoadingDialog('reassign', row),
|
||||||
copy: () => this.copyLoading(row),
|
|
||||||
delete: () => this.deleteLoading(row),
|
delete: () => this.deleteLoading(row),
|
||||||
|
start: () => this.startLoading(row),
|
||||||
cancel: () => this.cancelLoading(row),
|
cancel: () => this.cancelLoading(row),
|
||||||
complete: () => this.completeLoading(row),
|
complete: () => this.completeLoading(row),
|
||||||
};
|
};
|
||||||
@@ -2466,10 +2611,6 @@ export default {
|
|||||||
if (['road', '公路运输'].includes(normalized)) return 'road,公路运输';
|
if (['road', '公路运输'].includes(normalized)) return 'road,公路运输';
|
||||||
return value || '';
|
return value || '';
|
||||||
},
|
},
|
||||||
openCandidateSearch() {
|
|
||||||
this.candidateSearchVisible = true;
|
|
||||||
this.loadCandidateWaybills();
|
|
||||||
},
|
|
||||||
handleCandidateSearch() {
|
handleCandidateSearch() {
|
||||||
this.candidatePage.currentPage = 1;
|
this.candidatePage.currentPage = 1;
|
||||||
this.loadCandidateWaybills();
|
this.loadCandidateWaybills();
|
||||||
@@ -2571,11 +2712,11 @@ export default {
|
|||||||
};
|
};
|
||||||
rows.forEach((row, rowIndex) => {
|
rows.forEach((row, rowIndex) => {
|
||||||
const departure = row.departureAddress || row.departureName;
|
const departure = row.departureAddress || row.departureName;
|
||||||
appendNode(departure, this.formatWaybillAddress(row, 'departure'), `装${rowIndex + 1}`);
|
appendNode(departure, this.formatCandidateAddress(row, 'departure'), `装${rowIndex + 1}`);
|
||||||
});
|
});
|
||||||
rows.forEach((row, rowIndex) => {
|
rows.forEach((row, rowIndex) => {
|
||||||
const arrival = row.arrivalAddress || row.arrivalName;
|
const arrival = row.arrivalAddress || row.arrivalName;
|
||||||
appendNode(arrival, this.formatWaybillAddress(row, 'arrival'), `卸${rowIndex + 1}`);
|
appendNode(arrival, this.formatCandidateAddress(row, 'arrival'), `卸${rowIndex + 1}`);
|
||||||
});
|
});
|
||||||
return [...nodeMap.values()].map((node, index) => ({
|
return [...nodeMap.values()].map((node, index) => ({
|
||||||
...node,
|
...node,
|
||||||
@@ -2784,16 +2925,6 @@ export default {
|
|||||||
this.dialogSaving = '';
|
this.dialogSaving = '';
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
copyLoading(row) {
|
|
||||||
this.$router.push({
|
|
||||||
path: '/business/loading-manage/form',
|
|
||||||
query: {
|
|
||||||
mode: 'add',
|
|
||||||
copyId: row.id,
|
|
||||||
name: '新增配载管理',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
},
|
|
||||||
deleteLoading(row) {
|
deleteLoading(row) {
|
||||||
ElMessageBox.confirm(`确定删除配载单 ${row.loadingNo}?`, '提示', { type: 'warning' })
|
ElMessageBox.confirm(`确定删除配载单 ${row.loadingNo}?`, '提示', { type: 'warning' })
|
||||||
.then(async () => {
|
.then(async () => {
|
||||||
@@ -2813,6 +2944,15 @@ export default {
|
|||||||
})
|
})
|
||||||
.catch(() => {});
|
.catch(() => {});
|
||||||
},
|
},
|
||||||
|
startLoading(row) {
|
||||||
|
ElMessageBox.confirm(`确定将配载单 ${row.loadingNo} 改为进行中?`, '提示', { type: 'warning' })
|
||||||
|
.then(async () => {
|
||||||
|
await loadingApi.start(row.id);
|
||||||
|
ElMessage.success('已改为进行中');
|
||||||
|
this.loadTable();
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
|
},
|
||||||
completeLoading(row) {
|
completeLoading(row) {
|
||||||
ElMessageBox.confirm(`确定完成配载单 ${row.loadingNo}?`, '提示', { type: 'warning' })
|
ElMessageBox.confirm(`确定完成配载单 ${row.loadingNo}?`, '提示', { type: 'warning' })
|
||||||
.then(async () => {
|
.then(async () => {
|
||||||
@@ -3271,8 +3411,8 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.loading-manage-dialog__candidate-search {
|
.loading-manage-dialog__candidate-search {
|
||||||
padding: 4px 0;
|
padding: 0;
|
||||||
margin-bottom: 8px;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.loading-manage-dialog__waybill-route-layout {
|
.loading-manage-dialog__waybill-route-layout {
|
||||||
|
|||||||
+215
-111
@@ -1,57 +1,58 @@
|
|||||||
<template>
|
<template>
|
||||||
<basic-container class="master-order-page">
|
<basic-container class="master-order-page">
|
||||||
<template v-if="mode === 'list'">
|
<template v-if="mode === 'list'">
|
||||||
<el-form :model="query" class="master-search" label-width="160px" @submit.prevent>
|
<div class="master-order-page__search">
|
||||||
<el-row :gutter="16">
|
<el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
|
||||||
<el-col v-for="field in primaryFields" :key="field.prop" :span="6"
|
<div class="master-order-page__search-grid">
|
||||||
><el-form-item :label="field.label"
|
<el-form-item v-for="field in primaryFields" :key="field.prop" :label="field.label">
|
||||||
><el-input v-model="query[field.prop]" placeholder="请输入" /></el-form-item
|
<el-input v-model="query[field.prop]" clearable placeholder="请输入" />
|
||||||
></el-col>
|
</el-form-item>
|
||||||
<el-col :span="6"
|
<el-form-item label="状态">
|
||||||
><el-form-item label="状态"
|
<el-select v-model="query.businessStatus" clearable placeholder="全部">
|
||||||
><el-select v-model="query.businessStatus" placeholder="全部"
|
<el-option label="全部" value="" />
|
||||||
><el-option label="全部" value="" /><el-option
|
<el-option
|
||||||
v-for="item in statuses"
|
v-for="item in statuses"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
:label="item.label"
|
:label="item.label"
|
||||||
:value="item.value" /></el-select></el-form-item
|
:value="item.value"
|
||||||
></el-col>
|
/>
|
||||||
<template v-if="searchExpanded">
|
</el-select>
|
||||||
<el-col v-for="field in secondaryFields" :key="field.prop" :span="6"
|
</el-form-item>
|
||||||
><el-form-item :label="field.label"
|
<template v-if="searchExpanded">
|
||||||
><el-input v-model="query[field.prop]" placeholder="请输入" /></el-form-item
|
<el-form-item v-for="field in secondaryFields" :key="field.prop" :label="field.label">
|
||||||
></el-col>
|
<el-input v-model="query[field.prop]" clearable placeholder="请输入" />
|
||||||
<el-col :span="6"
|
</el-form-item>
|
||||||
><el-form-item label="计划开始日期"
|
<el-form-item label="计划开始日期">
|
||||||
><el-date-picker
|
<el-date-picker
|
||||||
v-model="query.planStartRange"
|
v-model="query.planStartRange"
|
||||||
type="datetimerange"
|
type="datetimerange"
|
||||||
format="YYYY-MM-DD HH:mm"
|
format="YYYY-MM-DD HH:mm"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
start-placeholder="请选择"
|
start-placeholder="请选择"
|
||||||
end-placeholder="请选择" /></el-form-item
|
end-placeholder="请选择"
|
||||||
></el-col>
|
/>
|
||||||
<el-col :span="6"
|
</el-form-item>
|
||||||
><el-form-item label="计划结束日期"
|
<el-form-item label="计划结束日期">
|
||||||
><el-date-picker
|
<el-date-picker
|
||||||
v-model="query.planEndRange"
|
v-model="query.planEndRange"
|
||||||
type="datetimerange"
|
type="datetimerange"
|
||||||
format="YYYY-MM-DD HH:mm"
|
format="YYYY-MM-DD HH:mm"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
start-placeholder="请选择"
|
start-placeholder="请选择"
|
||||||
end-placeholder="请选择" /></el-form-item
|
end-placeholder="请选择"
|
||||||
></el-col>
|
/>
|
||||||
</template>
|
</el-form-item>
|
||||||
<el-col :span="24" class="search-actions"
|
</template>
|
||||||
><el-button type="primary" @click="search">查询</el-button
|
<div class="master-order-page__search-actions">
|
||||||
><el-button @click="reset">重置</el-button
|
<el-button type="primary" @click="search">查询</el-button>
|
||||||
><el-link type="primary" @click="searchExpanded = !searchExpanded"
|
<el-button @click="reset">重置</el-button>
|
||||||
><el-icon><component :is="searchExpanded ? ArrowUp : ArrowDown" /></el-icon
|
<el-link type="primary" @click="searchExpanded = !searchExpanded">{{
|
||||||
>{{ searchExpanded ? '折叠' : '展开' }}</el-link
|
searchExpanded ? '收起' : '展开'
|
||||||
></el-col
|
}}</el-link>
|
||||||
>
|
</div>
|
||||||
</el-row>
|
</div>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
</div>
|
||||||
<section class="master-list-panel">
|
<section class="master-list-panel">
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<el-button type="primary" @click="goCreate()">新建多联总单</el-button
|
<el-button type="primary" @click="goCreate()">新建多联总单</el-button
|
||||||
@@ -76,7 +77,13 @@
|
|||||||
<div class="route-point">
|
<div class="route-point">
|
||||||
<span :class="['route-node', node.type]">{{ node.text }}</span>
|
<span :class="['route-node', node.type]">{{ node.text }}</span>
|
||||||
<div class="route-detail">
|
<div class="route-detail">
|
||||||
<el-tooltip placement="top"><template #content>{{ node.name }}</template><strong>{{ node.name }}</strong></el-tooltip>
|
<el-tooltip
|
||||||
|
:content="node.address || node.name || '-'"
|
||||||
|
placement="top"
|
||||||
|
:show-after="120"
|
||||||
|
>
|
||||||
|
<strong>{{ node.name }}</strong>
|
||||||
|
</el-tooltip>
|
||||||
<span v-for="line in node.lines" :key="line">{{ line }}</span>
|
<span v-for="line in node.lines" :key="line">{{ line }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -125,7 +132,7 @@
|
|||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<master-order-dispatch v-else-if="mode === 'dispatch'" :id="routeId" @back="goList" />
|
<master-order-dispatch v-else-if="mode === 'dispatch'" :id="routeId" @back="goList" />
|
||||||
<master-order-detail v-else :id="routeId" @back="goList" />
|
<master-order-detail v-else :id="routeId" />
|
||||||
<el-dialog v-model="confirm.visible" title="提示" width="400px"
|
<el-dialog v-model="confirm.visible" title="提示" width="400px"
|
||||||
><span>{{ confirm.message }}</span
|
><span>{{ confirm.message }}</span
|
||||||
><template #footer
|
><template #footer
|
||||||
@@ -138,7 +145,6 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import * as api from '@/api/business/master-order';
|
import * as api from '@/api/business/master-order';
|
||||||
import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
|
|
||||||
import MasterOrderEditor from './components/master-order-editor.vue';
|
import MasterOrderEditor from './components/master-order-editor.vue';
|
||||||
import MasterOrderDispatch from './components/master-order-dispatch.vue';
|
import MasterOrderDispatch from './components/master-order-dispatch.vue';
|
||||||
import MasterOrderDetail from './components/master-order-detail.vue';
|
import MasterOrderDetail from './components/master-order-detail.vue';
|
||||||
@@ -147,8 +153,6 @@ export default {
|
|||||||
components: { MasterOrderEditor, MasterOrderDispatch, MasterOrderDetail },
|
components: { MasterOrderEditor, MasterOrderDispatch, MasterOrderDetail },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
ArrowDown,
|
|
||||||
ArrowUp,
|
|
||||||
searchExpanded: false,
|
searchExpanded: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
records: [],
|
records: [],
|
||||||
@@ -303,7 +307,7 @@ export default {
|
|||||||
},
|
},
|
||||||
timeRange(row) {
|
timeRange(row) {
|
||||||
return row.planStartTime && row.planEndTime
|
return row.planStartTime && row.planEndTime
|
||||||
? `${String(row.planStartTime).slice(0, 16)} - ${String(row.planEndTime).slice(0, 16)}`
|
? `${String(row.planStartTime).slice(0, 10)} - ${String(row.planEndTime).slice(0, 10)}`
|
||||||
: '-';
|
: '-';
|
||||||
},
|
},
|
||||||
goodsSummary(row) {
|
goodsSummary(row) {
|
||||||
@@ -334,6 +338,19 @@ export default {
|
|||||||
const value = String(type || '').trim().toLowerCase();
|
const value = String(type || '').trim().toLowerCase();
|
||||||
return value === 'road' || value.includes('公路');
|
return value === 'road' || value.includes('公路');
|
||||||
},
|
},
|
||||||
|
isStationLikeName(value) {
|
||||||
|
const text = String(value || '').trim();
|
||||||
|
if (!text) return false;
|
||||||
|
return /(?:火车站|高铁站|客运站|货运站|港口|码头|机场|空港|航站楼)$/.test(text) || /(?<!市|州|盟|区|县|旗)站$/.test(text);
|
||||||
|
},
|
||||||
|
isNonRoadLocation({ name, siteCode, transportType, nextTransportType } = {}) {
|
||||||
|
const code = String(siteCode || '').trim();
|
||||||
|
if (code && code !== '/') return true;
|
||||||
|
if (this.isStationLikeName(name)) return true;
|
||||||
|
if (transportType && !this.isRoadTransportType(transportType)) return true;
|
||||||
|
if (nextTransportType && !this.isRoadTransportType(nextTransportType)) return true;
|
||||||
|
return false;
|
||||||
|
},
|
||||||
formatRoadAddress(value) {
|
formatRoadAddress(value) {
|
||||||
const text = String(value || '').replace(/\s+/g, '');
|
const text = String(value || '').replace(/\s+/g, '');
|
||||||
if (!text) return '-';
|
if (!text) return '-';
|
||||||
@@ -355,10 +372,16 @@ export default {
|
|||||||
routeNodeName(value, address, transportType, region = {}) {
|
routeNodeName(value, address, transportType, region = {}) {
|
||||||
const text = String(value || '').trim();
|
const text = String(value || '').trim();
|
||||||
if (!text) return '-';
|
if (!text) return '-';
|
||||||
const siteCode = String(region.siteCode || '').trim();
|
if (
|
||||||
// 运输方式切换不应改变地址本身的展示模式:有站点编码时显示站点名称,
|
this.isNonRoadLocation({
|
||||||
// 没有站点编码的区域地址统一按“市 区县”格式展示。
|
name: text,
|
||||||
if (siteCode && siteCode !== '/') return text;
|
siteCode: region.siteCode,
|
||||||
|
transportType,
|
||||||
|
nextTransportType: region.nextTransportType,
|
||||||
|
})
|
||||||
|
) {
|
||||||
|
return text;
|
||||||
|
}
|
||||||
// 优先从完整的地址名称/详细地址解析,避免后端只返回“梅州”等不完整的市名称时
|
// 优先从完整的地址名称/详细地址解析,避免后端只返回“梅州”等不完整的市名称时
|
||||||
// 提前返回城市,导致区县被遗漏。
|
// 提前返回城市,导致区县被遗漏。
|
||||||
const parsedText = this.formatRoadAddress(text);
|
const parsedText = this.formatRoadAddress(text);
|
||||||
@@ -383,86 +406,149 @@ export default {
|
|||||||
const source = /省|自治区|特别行政区|市|州|盟/.test(text) ? text : address || text;
|
const source = /省|自治区|特别行政区|市|州|盟/.test(text) ? text : address || text;
|
||||||
const formatted = this.formatRoadAddress(source);
|
const formatted = this.formatRoadAddress(source);
|
||||||
if (/(?:区|县|旗)$/.test(text) && !formatted.includes(text)) {
|
if (/(?:区|县|旗)$/.test(text) && !formatted.includes(text)) {
|
||||||
const city = formatted.split(' ')[0];
|
const cityName = formatted.split(' ')[0];
|
||||||
return city && city !== formatted ? `${city} ${text}` : formatted;
|
return cityName && cityName !== formatted ? `${cityName} ${text}` : formatted;
|
||||||
}
|
}
|
||||||
return formatted;
|
return formatted;
|
||||||
},
|
},
|
||||||
|
resolveRouteNodeLocation({
|
||||||
|
name,
|
||||||
|
address,
|
||||||
|
transportType,
|
||||||
|
nextTransportType,
|
||||||
|
cityName,
|
||||||
|
districtName,
|
||||||
|
siteCode,
|
||||||
|
} = {}) {
|
||||||
|
const rawName = String(name || '').trim();
|
||||||
|
const rawAddress = String(address || '').trim();
|
||||||
|
const regionText = [cityName, districtName].filter(Boolean).join(' ');
|
||||||
|
const nonRoad = this.isNonRoadLocation({
|
||||||
|
name: rawName,
|
||||||
|
siteCode,
|
||||||
|
transportType,
|
||||||
|
nextTransportType,
|
||||||
|
});
|
||||||
|
if (nonRoad) {
|
||||||
|
// 非公路:展示站点名称,悬停展示详细地址。
|
||||||
|
// 兼容历史数据把站点名称写在 address、区域信息写在 name 的情况。
|
||||||
|
if (this.isStationLikeName(rawAddress) && !this.isStationLikeName(rawName)) {
|
||||||
|
return {
|
||||||
|
name: rawAddress,
|
||||||
|
address: rawName || regionText || rawAddress,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const displayName = rawName || rawAddress || '-';
|
||||||
|
const tipAddress =
|
||||||
|
(rawAddress && rawAddress !== displayName ? rawAddress : '') ||
|
||||||
|
regionText ||
|
||||||
|
rawAddress ||
|
||||||
|
displayName;
|
||||||
|
return { name: displayName, address: tipAddress };
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
name: this.routeNodeName(rawName || rawAddress, rawAddress, transportType, {
|
||||||
|
cityName,
|
||||||
|
districtName,
|
||||||
|
siteCode,
|
||||||
|
nextTransportType,
|
||||||
|
}),
|
||||||
|
address: rawAddress || rawName || regionText || '-',
|
||||||
|
};
|
||||||
|
},
|
||||||
routeNodes(row = {}) {
|
routeNodes(row = {}) {
|
||||||
const routes = row.routeProgress || [];
|
const routes = row.routeProgress || [];
|
||||||
const total = this.routeNumber(row.totalQuantity);
|
const total = this.routeNumber(row.totalQuantity);
|
||||||
const firstTransportType = routes[0]?.transportType || row.routes?.[0]?.transportType || row.transportType || '';
|
const firstTransportType = routes[0]?.transportType || row.routes?.[0]?.transportType || row.transportType || '';
|
||||||
if (!routes.length) {
|
if (!routes.length) {
|
||||||
|
const start = this.resolveRouteNodeLocation({
|
||||||
|
name: row.departureName || row.departureAddress,
|
||||||
|
address: row.departureAddress,
|
||||||
|
transportType: firstTransportType,
|
||||||
|
cityName: row.departureCityName,
|
||||||
|
districtName: row.departureDistrictName,
|
||||||
|
siteCode: row.departureSiteCode,
|
||||||
|
});
|
||||||
|
const end = this.resolveRouteNodeLocation({
|
||||||
|
name: row.arrivalName || row.arrivalAddress,
|
||||||
|
address: row.arrivalAddress,
|
||||||
|
transportType: row.finalTransportType || firstTransportType,
|
||||||
|
cityName: row.arrivalCityName,
|
||||||
|
districtName: row.arrivalDistrictName,
|
||||||
|
siteCode: row.arrivalSiteCode,
|
||||||
|
});
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
key: 'start',
|
key: 'start',
|
||||||
type: 'start',
|
type: 'start',
|
||||||
text: '起',
|
text: '起',
|
||||||
name: this.routeNodeName(
|
...start,
|
||||||
row.departureName || row.departureAddress,
|
|
||||||
row.departureAddress,
|
|
||||||
firstTransportType,
|
|
||||||
{
|
|
||||||
cityName: row.departureCityName,
|
|
||||||
districtName: row.departureDistrictName,
|
|
||||||
siteCode: row.departureSiteCode,
|
|
||||||
}
|
|
||||||
),
|
|
||||||
lines: [`已调度0/${total}吨`],
|
lines: [`已调度0/${total}吨`],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 'end',
|
key: 'end',
|
||||||
type: 'end',
|
type: 'end',
|
||||||
text: '终',
|
text: '终',
|
||||||
name: this.routeNodeName(
|
...end,
|
||||||
row.arrivalName || row.arrivalAddress,
|
|
||||||
row.arrivalAddress,
|
|
||||||
row.finalTransportType || firstTransportType,
|
|
||||||
{
|
|
||||||
cityName: row.arrivalCityName,
|
|
||||||
districtName: row.arrivalDistrictName,
|
|
||||||
siteCode: row.arrivalSiteCode,
|
|
||||||
}
|
|
||||||
),
|
|
||||||
lines: [`到达0/${total}吨`],
|
lines: [`到达0/${total}吨`],
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
const start = this.resolveRouteNodeLocation({
|
||||||
|
name: row.departureName || row.departureAddress,
|
||||||
|
address: row.departureAddress,
|
||||||
|
transportType: firstTransportType,
|
||||||
|
nextTransportType: firstTransportType,
|
||||||
|
cityName: row.departureCityName,
|
||||||
|
districtName: row.departureDistrictName,
|
||||||
|
siteCode: row.departureSiteCode,
|
||||||
|
});
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
key: 'start',
|
key: 'start',
|
||||||
type: 'start',
|
type: 'start',
|
||||||
text: '起',
|
text: '起',
|
||||||
name: this.routeNodeName(
|
...start,
|
||||||
row.departureName || row.departureAddress,
|
|
||||||
row.departureAddress,
|
|
||||||
firstTransportType,
|
|
||||||
{
|
|
||||||
cityName: row.departureCityName,
|
|
||||||
districtName: row.departureDistrictName,
|
|
||||||
siteCode: row.departureSiteCode,
|
|
||||||
}
|
|
||||||
),
|
|
||||||
lines: [`已调度${this.routeNumber(routes[0]?.dispatchedQuantity)}/${total}吨`],
|
lines: [`已调度${this.routeNumber(routes[0]?.dispatchedQuantity)}/${total}吨`],
|
||||||
},
|
},
|
||||||
...routes.map((route, index) => {
|
...routes.map((route, index) => {
|
||||||
const isEnd = index === routes.length - 1;
|
const isEnd = index === routes.length - 1;
|
||||||
const arrived = this.routeNumber(this.routeArrivedQuantity(route));
|
const arrived = this.routeNumber(this.routeArrivedQuantity(route));
|
||||||
const dispatched = this.routeNumber(routes[index + 1]?.dispatchedQuantity);
|
const dispatched = this.routeNumber(routes[index + 1]?.dispatchedQuantity);
|
||||||
|
const address =
|
||||||
|
route.arrivalAddress ||
|
||||||
|
route.departureAddress ||
|
||||||
|
(isEnd ? row.arrivalAddress : '') ||
|
||||||
|
'';
|
||||||
|
const location = this.resolveRouteNodeLocation({
|
||||||
|
name:
|
||||||
|
route.arrivalName ||
|
||||||
|
route.departureName ||
|
||||||
|
(isEnd ? row.arrivalName : '') ||
|
||||||
|
'',
|
||||||
|
address,
|
||||||
|
transportType: route.transportType,
|
||||||
|
nextTransportType: isEnd
|
||||||
|
? row.finalTransportType || route.transportType
|
||||||
|
: routes[index + 1]?.transportType || '',
|
||||||
|
cityName:
|
||||||
|
route.arrivalCityName ||
|
||||||
|
route.departureCityName ||
|
||||||
|
(isEnd ? row.arrivalCityName : ''),
|
||||||
|
districtName:
|
||||||
|
route.arrivalDistrictName ||
|
||||||
|
route.departureDistrictName ||
|
||||||
|
(isEnd ? row.arrivalDistrictName : ''),
|
||||||
|
siteCode:
|
||||||
|
route.arrivalSiteCode ||
|
||||||
|
route.departureSiteCode ||
|
||||||
|
(isEnd ? row.arrivalSiteCode : ''),
|
||||||
|
});
|
||||||
return {
|
return {
|
||||||
key: route.segmentNo || `route-${index}`,
|
key: route.segmentNo || `route-${index}`,
|
||||||
type: isEnd ? 'end' : 'middle',
|
type: isEnd ? 'end' : 'middle',
|
||||||
text: isEnd ? '终' : '经',
|
text: isEnd ? '终' : '经',
|
||||||
name: this.routeNodeName(
|
...location,
|
||||||
route.arrivalName || route.departureName || row.arrivalName,
|
|
||||||
route.arrivalAddress || route.departureAddress,
|
|
||||||
route.transportType,
|
|
||||||
{
|
|
||||||
cityName: route.arrivalCityName || route.departureCityName,
|
|
||||||
districtName: route.arrivalDistrictName || route.departureDistrictName,
|
|
||||||
siteCode: route.arrivalSiteCode || route.departureSiteCode,
|
|
||||||
}
|
|
||||||
),
|
|
||||||
lines: isEnd
|
lines: isEnd
|
||||||
? [`到达${arrived}/${total}吨`]
|
? [`到达${arrived}/${total}吨`]
|
||||||
: [`到达 ${arrived}/${total}吨`, `已调度 ${dispatched}/到达${arrived}/${total}吨`],
|
: [`到达 ${arrived}/${total}吨`, `已调度 ${dispatched}/到达${arrived}/${total}吨`],
|
||||||
@@ -494,31 +580,43 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.master-search {
|
.master-order-page {
|
||||||
margin-bottom: 12px;
|
&__search {
|
||||||
padding: 12px 12px 4px;
|
padding: 12px 12px 4px;
|
||||||
background: #fff;
|
margin-bottom: 8px;
|
||||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
|
background: #fff;
|
||||||
.el-form-item {
|
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
|
||||||
|
}
|
||||||
|
|
||||||
|
&__search-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||||
|
gap: 8px 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__search-actions {
|
||||||
|
display: flex;
|
||||||
|
grid-column: 1 / -1;
|
||||||
|
justify-content: flex-end;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
min-height: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.el-form-item) {
|
||||||
margin-bottom: 8px;
|
margin-bottom: 8px;
|
||||||
}
|
}
|
||||||
.el-input,
|
|
||||||
.el-select,
|
|
||||||
.el-date-editor {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
:deep(.el-form-item__label) {
|
:deep(.el-form-item__label) {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
.search-actions {
|
|
||||||
display: flex;
|
:deep(.el-input),
|
||||||
justify-content: flex-end;
|
:deep(.el-select),
|
||||||
align-items: center;
|
:deep(.el-date-editor.el-input),
|
||||||
gap: 12px;
|
:deep(.el-date-editor.el-input__wrapper),
|
||||||
min-height: 40px;
|
:deep(.el-date-editor--datetimerange) {
|
||||||
.el-icon {
|
width: 100%;
|
||||||
margin-right: 4px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.master-list-panel {
|
.master-list-panel {
|
||||||
@@ -612,10 +710,16 @@ export default {
|
|||||||
line-height: 1.8;
|
line-height: 1.8;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
strong {
|
strong {
|
||||||
|
display: inline-block;
|
||||||
|
max-width: 150px;
|
||||||
|
overflow: hidden;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
max-width: 180px;
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
vertical-align: bottom;
|
||||||
|
cursor: default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.route-connector {
|
.route-connector {
|
||||||
|
|||||||
@@ -1,116 +1,113 @@
|
|||||||
<template>
|
<template>
|
||||||
<basic-container class="transport-plan-dispatch-page">
|
<basic-container class="transport-plan-dispatch-page">
|
||||||
<div v-loading="loading" class="transport-plan-dispatch-page__shell">
|
<div v-loading="loading" class="transport-plan-dispatch-page__shell">
|
||||||
<!-- 顶部信息区 -->
|
<!-- 顶部信息区:对齐运单详情汇总样式 -->
|
||||||
<div class="transport-plan-dispatch-page__top">
|
<section-card class="transport-plan-dispatch-page__summary">
|
||||||
<div class="transport-plan-dispatch-page__heading">
|
<div class="transport-plan-dispatch-page__heading">
|
||||||
<div class="transport-plan-dispatch-page__heading-title">
|
<el-button icon="el-icon-arrow-left" text @click="handleBack">返回</el-button>
|
||||||
<el-button icon="el-icon-arrow-left" text @click="handleBack">返回</el-button>
|
<strong>计划调度</strong>
|
||||||
<span class="transport-plan-dispatch-page__heading-name">计划调度</span>
|
<span>{{ planData.planNo || planData.loadingNo || '-' }}</span>
|
||||||
<span class="transport-plan-dispatch-page__heading-no">
|
<span class="detail-status-text" :class="statusTextClass">
|
||||||
{{ planData.planNo || planData.loadingNo || '-' }}
|
{{ planData.businessStatusName || '-' }}
|
||||||
|
</span>
|
||||||
|
<span class="detail-status-text detail-transport-type">
|
||||||
|
{{ planData.transportTypeName || '公路整车' }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="transport-plan-dispatch-page__summary-grid">
|
||||||
|
<div class="transport-plan-dispatch-page__summary-item">
|
||||||
|
<span class="transport-plan-dispatch-page__summary-label">客户</span>
|
||||||
|
<span class="transport-plan-dispatch-page__summary-value">
|
||||||
|
{{ planData.customerName || '-' }}
|
||||||
</span>
|
</span>
|
||||||
<el-tag :type="getStatusTagType(planData.businessStatus)" effect="light" class="status-text">
|
</div>
|
||||||
{{ planData.businessStatusName || '-' }}
|
<div class="transport-plan-dispatch-page__summary-item">
|
||||||
</el-tag>
|
<span class="transport-plan-dispatch-page__summary-label">合同编号</span>
|
||||||
<el-tag type="primary" effect="light">
|
<span class="transport-plan-dispatch-page__summary-value is-link">
|
||||||
{{ planData.transportTypeName || '公路整车' }}
|
{{ planData.contractNo || '-' }}
|
||||||
</el-tag>
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="transport-plan-dispatch-page__summary-item">
|
||||||
|
<span class="transport-plan-dispatch-page__summary-label">项目</span>
|
||||||
|
<span class="transport-plan-dispatch-page__summary-value">
|
||||||
|
{{ planData.projectName || '-' }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="transport-plan-dispatch-page__summary-item">
|
||||||
|
<span class="transport-plan-dispatch-page__summary-label">计划执行时间</span>
|
||||||
|
<span class="transport-plan-dispatch-page__summary-value">
|
||||||
|
{{ formatDateRange(planData.planStartDate, planData.planEndDate) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="transport-plan-dispatch-page__summary-item is-goods">
|
||||||
|
<span class="transport-plan-dispatch-page__summary-label">货物信息</span>
|
||||||
|
<span class="transport-plan-dispatch-page__summary-value is-wrap">
|
||||||
|
{{ planData.goodsInfo || formatGoodsInfo(planData) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="transport-plan-dispatch-page__route">
|
||||||
|
<div class="transport-plan-dispatch-page__route-item is-start">
|
||||||
|
<div class="transport-plan-dispatch-page__route-marker">起</div>
|
||||||
|
<div class="transport-plan-dispatch-page__route-detail">
|
||||||
|
<strong class="transport-plan-dispatch-page__route-name">
|
||||||
|
{{
|
||||||
|
formatRouteCityDistrict(planData.departureAddress || planData.departureName)
|
||||||
|
}}
|
||||||
|
</strong>
|
||||||
|
<el-tooltip
|
||||||
|
:content="planData.departureAddress || planData.departureName || '-'"
|
||||||
|
placement="top"
|
||||||
|
>
|
||||||
|
<span class="transport-plan-dispatch-page__route-addr">
|
||||||
|
{{ planData.departureAddress || planData.departureName || '-' }}
|
||||||
|
</span>
|
||||||
|
</el-tooltip>
|
||||||
|
<div class="transport-plan-dispatch-page__route-contact">
|
||||||
|
<span>联系人:{{ planData.departureContact || '-' }}</span>
|
||||||
|
<span>联系方式:{{ planData.departurePhone || '-' }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span class="transport-plan-dispatch-page__route-line" aria-hidden="true" />
|
||||||
|
<div class="transport-plan-dispatch-page__route-item is-end">
|
||||||
|
<div class="transport-plan-dispatch-page__route-marker">终</div>
|
||||||
|
<div class="transport-plan-dispatch-page__route-detail">
|
||||||
|
<strong class="transport-plan-dispatch-page__route-name">
|
||||||
|
{{ formatRouteCityDistrict(planData.arrivalAddress || planData.arrivalName) }}
|
||||||
|
</strong>
|
||||||
|
<el-tooltip
|
||||||
|
:content="planData.arrivalAddress || planData.arrivalName || '-'"
|
||||||
|
placement="top"
|
||||||
|
>
|
||||||
|
<span class="transport-plan-dispatch-page__route-addr">
|
||||||
|
{{ planData.arrivalAddress || planData.arrivalName || '-' }}
|
||||||
|
</span>
|
||||||
|
</el-tooltip>
|
||||||
|
<div class="transport-plan-dispatch-page__route-contact">
|
||||||
|
<span>联系人:{{ planData.arrivalContact || '-' }}</span>
|
||||||
|
<span>联系方式:{{ planData.arrivalPhone || '-' }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="transport-plan-dispatch-page__attachments">
|
||||||
|
<span class="transport-plan-dispatch-page__summary-label">附件</span>
|
||||||
|
<div>
|
||||||
|
<el-link
|
||||||
|
v-for="(item, index) in attachmentList"
|
||||||
|
:key="index"
|
||||||
|
type="primary"
|
||||||
|
:href="item.url"
|
||||||
|
:underline="false"
|
||||||
|
target="_blank"
|
||||||
|
>
|
||||||
|
{{ item.name || item.originalName || '附件' }}
|
||||||
|
</el-link>
|
||||||
|
<span v-if="!attachmentList.length">-</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</section-card>
|
||||||
<div class="transport-plan-dispatch-page__summary">
|
|
||||||
<section-card title="基本信息" class="transport-plan-dispatch-page__summary-card">
|
|
||||||
<div class="transport-plan-dispatch-page__summary-grid">
|
|
||||||
<div class="transport-plan-dispatch-page__summary-item">
|
|
||||||
<div class="transport-plan-dispatch-page__summary-label">客户</div>
|
|
||||||
<div class="transport-plan-dispatch-page__summary-value">
|
|
||||||
{{ planData.customerName || '-' }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="transport-plan-dispatch-page__summary-item">
|
|
||||||
<div class="transport-plan-dispatch-page__summary-label">项目</div>
|
|
||||||
<div class="transport-plan-dispatch-page__summary-value">
|
|
||||||
{{ planData.projectName || '-' }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="transport-plan-dispatch-page__summary-item">
|
|
||||||
<div class="transport-plan-dispatch-page__summary-label">合同编号</div>
|
|
||||||
<div class="transport-plan-dispatch-page__summary-value">
|
|
||||||
{{ planData.contractNo || '-' }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="transport-plan-dispatch-page__summary-item">
|
|
||||||
<div class="transport-plan-dispatch-page__summary-label">计划执行时间</div>
|
|
||||||
<div class="transport-plan-dispatch-page__summary-value">
|
|
||||||
{{ formatDateRange(planData.planStartDate, planData.planEndDate) }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="transport-plan-dispatch-page__summary-item is-wide">
|
|
||||||
<div class="transport-plan-dispatch-page__summary-label">货物信息</div>
|
|
||||||
<div class="transport-plan-dispatch-page__summary-value">
|
|
||||||
{{ planData.goodsInfo || formatGoodsInfo(planData) }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="transport-plan-dispatch-page__summary-item">
|
|
||||||
<div class="transport-plan-dispatch-page__summary-label">附件</div>
|
|
||||||
<div class="transport-plan-dispatch-page__summary-value">
|
|
||||||
<template v-if="attachmentList.length">
|
|
||||||
<el-link
|
|
||||||
v-for="(item, index) in attachmentList"
|
|
||||||
:key="index"
|
|
||||||
type="primary"
|
|
||||||
:href="item.url"
|
|
||||||
:underline="false"
|
|
||||||
target="_blank"
|
|
||||||
class="transport-plan-dispatch-page__attachment-link"
|
|
||||||
>
|
|
||||||
{{ item.name || item.originalName || '附件' }}
|
|
||||||
</el-link>
|
|
||||||
</template>
|
|
||||||
<span v-else>-</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section-card>
|
|
||||||
|
|
||||||
<section-card title="收发货路线" class="transport-plan-dispatch-page__route-card">
|
|
||||||
<div class="transport-plan-dispatch-page__route">
|
|
||||||
<div class="transport-plan-dispatch-page__route-item">
|
|
||||||
<span class="transport-plan-dispatch-page__route-badge is-start">起</span>
|
|
||||||
<div class="transport-plan-dispatch-page__route-body">
|
|
||||||
<div class="transport-plan-dispatch-page__route-title">
|
|
||||||
{{ planData.departureName || '-' }}
|
|
||||||
</div>
|
|
||||||
<div class="transport-plan-dispatch-page__route-address">
|
|
||||||
{{ formatAddress(planData.departureAddress) }}
|
|
||||||
</div>
|
|
||||||
<div class="transport-plan-dispatch-page__route-contact">
|
|
||||||
{{ formatContact(planData.departureContact, planData.departurePhone) }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="transport-plan-dispatch-page__route-vehicle">
|
|
||||||
<el-icon><Van /></el-icon>
|
|
||||||
</div>
|
|
||||||
<div class="transport-plan-dispatch-page__route-item">
|
|
||||||
<span class="transport-plan-dispatch-page__route-badge is-end">终</span>
|
|
||||||
<div class="transport-plan-dispatch-page__route-body">
|
|
||||||
<div class="transport-plan-dispatch-page__route-title">
|
|
||||||
{{ planData.arrivalName || '-' }}
|
|
||||||
</div>
|
|
||||||
<div class="transport-plan-dispatch-page__route-address">
|
|
||||||
{{ formatAddress(planData.arrivalAddress) }}
|
|
||||||
</div>
|
|
||||||
<div class="transport-plan-dispatch-page__route-contact">
|
|
||||||
{{ formatContact(planData.arrivalContact, planData.arrivalPhone) }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section-card>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 调度列表 -->
|
<!-- 调度列表 -->
|
||||||
<section-card class="transport-plan-dispatch-page__list-card">
|
<section-card class="transport-plan-dispatch-page__list-card">
|
||||||
@@ -204,7 +201,6 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { Van } from '@element-plus/icons-vue';
|
|
||||||
import { getDetail, dispatch } from '@/api/business/transport-plan';
|
import { getDetail, dispatch } from '@/api/business/transport-plan';
|
||||||
import SectionCard from '@/components/section-card/main.vue';
|
import SectionCard from '@/components/section-card/main.vue';
|
||||||
import TransportPlanPage from './components/transport-plan-page.vue';
|
import TransportPlanPage from './components/transport-plan-page.vue';
|
||||||
@@ -216,7 +212,6 @@ const TRANSPORT_PLAN_QUANTITY_UNIT = '吨';
|
|||||||
export default {
|
export default {
|
||||||
name: 'TransportPlanDispatch',
|
name: 'TransportPlanDispatch',
|
||||||
components: {
|
components: {
|
||||||
Van,
|
|
||||||
SectionCard,
|
SectionCard,
|
||||||
TransportPlanPage,
|
TransportPlanPage,
|
||||||
},
|
},
|
||||||
@@ -237,11 +232,21 @@ export default {
|
|||||||
planId() {
|
planId() {
|
||||||
return this.$route.query.planId;
|
return this.$route.query.planId;
|
||||||
},
|
},
|
||||||
|
statusTextClass() {
|
||||||
|
const status = this.planData.businessStatus;
|
||||||
|
if (status === 2 || status === '2') return 'status-text-success';
|
||||||
|
if (status === 1 || status === '1') return 'is-dispatching';
|
||||||
|
if (status === 3 || status === '3') return 'is-danger';
|
||||||
|
return 'is-info';
|
||||||
|
},
|
||||||
summaryText() {
|
summaryText() {
|
||||||
const goodsList = this.parseGoodsList(this.planData.goodsJson);
|
const goodsList = this.parseGoodsList(this.planData.goodsJson);
|
||||||
if (!goodsList.length) {
|
if (!goodsList.length) {
|
||||||
const total = Number(this.planData.totalQuantity || 0);
|
const total = Number(this.planData.totalQuantity || 0);
|
||||||
const dispatched = this.calculateDispatchedQuantity();
|
const dispatched = this.calculateDispatchedQuantity();
|
||||||
|
if (total <= 0) {
|
||||||
|
return `已调度 ${dispatched.toFixed(2)}吨`;
|
||||||
|
}
|
||||||
const remaining = Math.max(total - dispatched, 0);
|
const remaining = Math.max(total - dispatched, 0);
|
||||||
return `共${total}吨 | 已调度 ${dispatched.toFixed(2)}吨,剩余${remaining.toFixed(2)}吨`;
|
return `共${total}吨 | 已调度 ${dispatched.toFixed(2)}吨,剩余${remaining.toFixed(2)}吨`;
|
||||||
}
|
}
|
||||||
@@ -264,6 +269,9 @@ export default {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const parts = Object.entries(summary).map(([unit, data]) => {
|
const parts = Object.entries(summary).map(([unit, data]) => {
|
||||||
|
if (data.total <= 0) {
|
||||||
|
return `已调度 ${data.dispatched.toFixed(2)}${unit}`;
|
||||||
|
}
|
||||||
const remaining = Math.max(data.total - data.dispatched, 0);
|
const remaining = Math.max(data.total - data.dispatched, 0);
|
||||||
return `${data.total}${unit} | 已调度 ${data.dispatched.toFixed(2)}${unit},剩余${remaining.toFixed(
|
return `${data.total}${unit} | 已调度 ${data.dispatched.toFixed(2)}${unit},剩余${remaining.toFixed(
|
||||||
2
|
2
|
||||||
@@ -276,13 +284,20 @@ export default {
|
|||||||
const goodsList = this.parseGoodsList(this.planData.goodsJson);
|
const goodsList = this.parseGoodsList(this.planData.goodsJson);
|
||||||
if (!goodsList.length) {
|
if (!goodsList.length) {
|
||||||
const total = Number(this.planData.totalQuantity || 0);
|
const total = Number(this.planData.totalQuantity || 0);
|
||||||
|
if (total <= 0) return true;
|
||||||
const dispatched = this.calculateDispatchedQuantity();
|
const dispatched = this.calculateDispatchedQuantity();
|
||||||
return dispatched < total;
|
return dispatched < total;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const hasPositiveTotal = goodsList.some(
|
||||||
|
goods => Number(goods.quantity || 0) > 0
|
||||||
|
);
|
||||||
|
if (!hasPositiveTotal) return true;
|
||||||
|
|
||||||
return goodsList.some(goods => {
|
return goodsList.some(goods => {
|
||||||
const unit = goods.quantityUnit || TRANSPORT_PLAN_QUANTITY_UNIT;
|
const unit = goods.quantityUnit || TRANSPORT_PLAN_QUANTITY_UNIT;
|
||||||
const totalQty = Number(goods.quantity || 0);
|
const totalQty = Number(goods.quantity || 0);
|
||||||
|
if (totalQty <= 0) return true;
|
||||||
const dispatchedQty = this.dispatchList
|
const dispatchedQty = this.dispatchList
|
||||||
.filter(item => item.quantityUnit === unit)
|
.filter(item => item.quantityUnit === unit)
|
||||||
.reduce((sum, item) => sum + Number(item.quantity || 0), 0);
|
.reduce((sum, item) => sum + Number(item.quantity || 0), 0);
|
||||||
@@ -364,15 +379,6 @@ export default {
|
|||||||
calculateDispatchedQuantity() {
|
calculateDispatchedQuantity() {
|
||||||
return this.dispatchList.reduce((sum, item) => sum + Number(item.quantity || 0), 0);
|
return this.dispatchList.reduce((sum, item) => sum + Number(item.quantity || 0), 0);
|
||||||
},
|
},
|
||||||
getStatusTagType(status) {
|
|
||||||
const statusMap = {
|
|
||||||
0: 'info',
|
|
||||||
1: 'warning',
|
|
||||||
2: 'success',
|
|
||||||
3: 'danger',
|
|
||||||
};
|
|
||||||
return statusMap[status] || 'info';
|
|
||||||
},
|
|
||||||
formatDateRange(startDate, endDate) {
|
formatDateRange(startDate, endDate) {
|
||||||
const dates = [startDate, endDate].filter(Boolean);
|
const dates = [startDate, endDate].filter(Boolean);
|
||||||
return dates.length ? dates.join(' ~ ') : '-';
|
return dates.length ? dates.join(' ~ ') : '-';
|
||||||
@@ -382,9 +388,30 @@ export default {
|
|||||||
const match = address.match(/^(.*?省)?(.*?市)?(.*?区|.*?县)?/);
|
const match = address.match(/^(.*?省)?(.*?市)?(.*?区|.*?县)?/);
|
||||||
return match ? match[0] || address : address;
|
return match ? match[0] || address : address;
|
||||||
},
|
},
|
||||||
formatContact(contact, phone) {
|
formatProvinceCityDistrict(value) {
|
||||||
const parts = [contact, phone].filter(Boolean);
|
const text = String(value || '').trim();
|
||||||
return parts.length ? parts.join(' / ') : '-';
|
if (!text) return '-';
|
||||||
|
const districtMatch = text.match(/(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)/);
|
||||||
|
if (districtMatch) {
|
||||||
|
return text.slice(0, districtMatch.index + districtMatch[0].length);
|
||||||
|
}
|
||||||
|
const cityMatch = text.match(/市/);
|
||||||
|
return cityMatch ? text.slice(0, cityMatch.index + 1) : text;
|
||||||
|
},
|
||||||
|
formatRouteCityDistrict(value) {
|
||||||
|
const text = String(value || '').trim();
|
||||||
|
if (!text) return '-';
|
||||||
|
const provinceMatch = text.match(/^.+?(?:省|自治区|特别行政区)/);
|
||||||
|
const cityRegion = provinceMatch ? text.slice(provinceMatch[0].length) : text;
|
||||||
|
const cityMatch = cityRegion.match(/^(.+?市)/);
|
||||||
|
if (!cityMatch) return this.formatProvinceCityDistrict(text);
|
||||||
|
const city = cityMatch[1];
|
||||||
|
const remainder = cityRegion.slice(city.length);
|
||||||
|
const districtMatch = remainder.match(
|
||||||
|
/^(.+?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗){1,2})/
|
||||||
|
);
|
||||||
|
const district = districtMatch ? districtMatch[1] : '';
|
||||||
|
return [city, district].filter(Boolean).join(' ');
|
||||||
},
|
},
|
||||||
formatDriver(row) {
|
formatDriver(row) {
|
||||||
const parts = [row.driverName, row.driverPhone].filter(Boolean);
|
const parts = [row.driverName, row.driverPhone].filter(Boolean);
|
||||||
@@ -419,32 +446,33 @@ export default {
|
|||||||
this.$message.warning('待调度列表货物总量已达到计划总量,不能新增调度明细');
|
this.$message.warning('待调度列表货物总量已达到计划总量,不能新增调度明细');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
this.openPageDispatchItemDialog(-1);
|
||||||
// 调用 transport-plan-page 组件的方法打开弹窗
|
|
||||||
this.$nextTick(() => {
|
|
||||||
const component = this.$refs.transportPlanPageRef;
|
|
||||||
if (component) {
|
|
||||||
// 设置调度数据
|
|
||||||
component.dispatchRow = this.planData;
|
|
||||||
component.dispatchRows = [...this.dispatchList];
|
|
||||||
// 打开新增弹窗
|
|
||||||
component.openDispatchItemDialog(-1);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
handleEdit(row, index) {
|
handleEdit(row, index) {
|
||||||
// 调用 transport-plan-page 组件的方法打开弹窗
|
this.openPageDispatchItemDialog(index, row);
|
||||||
|
},
|
||||||
|
openPageDispatchItemDialog(index = -1, row) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
const component = this.$refs.transportPlanPageRef;
|
const component = this.$refs.transportPlanPageRef;
|
||||||
if (component) {
|
if (!component) return;
|
||||||
// 设置调度数据
|
component.dispatchRow = this.planData;
|
||||||
component.dispatchRow = this.planData;
|
component.dispatchRows = [...this.dispatchList];
|
||||||
component.dispatchRows = [...this.dispatchList];
|
this.bindDispatchItemSaveSync(component);
|
||||||
// 打开编辑弹窗
|
if (index >= 0) component.openDispatchItemDialog(index, row);
|
||||||
component.openDispatchItemDialog(index, row);
|
else component.openDispatchItemDialog(-1);
|
||||||
}
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
bindDispatchItemSaveSync(component) {
|
||||||
|
if (component.__dispatchListSaveSynced) return;
|
||||||
|
const originalSave = component.saveDispatchItem;
|
||||||
|
component.saveDispatchItem = (...args) => {
|
||||||
|
originalSave.apply(component, args);
|
||||||
|
if (!component.dispatchItemBox) {
|
||||||
|
this.dispatchList = [...(component.dispatchRows || [])];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
component.__dispatchListSaveSynced = true;
|
||||||
|
},
|
||||||
handleDelete(index) {
|
handleDelete(index) {
|
||||||
this.$confirm('确定删除该调度明细?', '提示', {
|
this.$confirm('确定删除该调度明细?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
@@ -551,126 +579,189 @@ export default {
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__top {
|
&__summary {
|
||||||
display: flex;
|
:deep(.el-card__body) {
|
||||||
flex-direction: column;
|
padding: 18px 22px;
|
||||||
gap: 16px;
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&__heading {
|
&__heading {
|
||||||
padding: 16px;
|
|
||||||
background: #fff;
|
|
||||||
border-radius: 4px;
|
|
||||||
|
|
||||||
&-title {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 12px;
|
|
||||||
font-size: 18px;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
&-name {
|
|
||||||
font-size: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&-no {
|
|
||||||
font-size: 14px;
|
|
||||||
color: #606266;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&__summary {
|
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 16px;
|
align-items: center;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 12px;
|
||||||
|
margin-bottom: 18px;
|
||||||
|
|
||||||
&-card {
|
strong {
|
||||||
flex: 1;
|
font-size: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-grid {
|
.detail-status-text {
|
||||||
display: grid;
|
display: inline-flex;
|
||||||
grid-template-columns: repeat(2, 1fr);
|
align-items: center;
|
||||||
gap: 16px;
|
height: 28px;
|
||||||
|
padding: 0 12px;
|
||||||
|
border-radius: 8px;
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 28px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-item {
|
.status-text-success,
|
||||||
display: flex;
|
.is-dispatching {
|
||||||
flex-direction: column;
|
color: #67c23a;
|
||||||
gap: 8px;
|
background: #e1f3d8;
|
||||||
|
|
||||||
&.is-wide {
|
|
||||||
grid-column: 1 / -1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&-label {
|
.detail-transport-type {
|
||||||
font-size: 14px;
|
color: #409eff;
|
||||||
|
background: #ecf5ff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.is-danger {
|
||||||
|
color: #f56c6c;
|
||||||
|
background: #fef0f0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.is-info {
|
||||||
color: #909399;
|
color: #909399;
|
||||||
}
|
background: #f4f4f5;
|
||||||
|
|
||||||
&-value {
|
|
||||||
font-size: 14px;
|
|
||||||
color: #303133;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&__route-card {
|
&__summary-grid {
|
||||||
flex: 1;
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, minmax(120px, 1fr)) minmax(360px, 1.5fr);
|
||||||
|
gap: 16px 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__summary-item {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
min-width: 0;
|
||||||
|
|
||||||
|
&.is-goods {
|
||||||
|
grid-column: 1 / 5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__summary-label {
|
||||||
|
color: #909399;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__summary-value {
|
||||||
|
overflow: hidden;
|
||||||
|
color: #303133;
|
||||||
|
font-weight: 500;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
|
||||||
|
&.is-link {
|
||||||
|
color: #409eff;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.is-wrap {
|
||||||
|
white-space: normal;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&__route {
|
&__route {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(100px, 1fr) minmax(36px, 0.7fr) minmax(100px, 1fr);
|
||||||
|
grid-row: 1 / span 3;
|
||||||
|
grid-column: 5;
|
||||||
|
align-items: start;
|
||||||
|
min-width: 0;
|
||||||
|
padding: 4px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__route-item {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
min-width: 0;
|
||||||
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 24px;
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
&-item {
|
&__route-marker {
|
||||||
flex: 1;
|
display: inline-flex;
|
||||||
|
width: 36px;
|
||||||
|
height: 36px;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
color: #fff;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #409eff;
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 600;
|
||||||
|
|
||||||
|
.is-end & {
|
||||||
|
background: #67c23a;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__route-line {
|
||||||
|
width: 100%;
|
||||||
|
height: 6px;
|
||||||
|
margin-top: 15px;
|
||||||
|
border-radius: 1px;
|
||||||
|
background: #e4e7ed;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__route-detail {
|
||||||
|
display: flex;
|
||||||
|
min-width: 0;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 5px;
|
||||||
|
margin-top: 8px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__route-name {
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
color: #303133;
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 600;
|
||||||
|
line-height: 1.35;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__route-addr {
|
||||||
|
display: block;
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
color: #606266;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.5;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__route-contact {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 2px 8px;
|
||||||
|
max-width: 100%;
|
||||||
|
color: #909399;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__attachments {
|
||||||
|
grid-column: 1 / 5;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
|
||||||
|
div {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 12px;
|
flex-wrap: wrap;
|
||||||
}
|
gap: 16px;
|
||||||
|
|
||||||
&-badge {
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
border-radius: 50%;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
color: #fff;
|
|
||||||
font-size: 14px;
|
|
||||||
flex-shrink: 0;
|
|
||||||
|
|
||||||
&.is-start {
|
|
||||||
background: #67c23a;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.is-end {
|
|
||||||
background: #409eff;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&-body {
|
|
||||||
flex: 1;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&-title {
|
|
||||||
font-size: 16px;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
&-address,
|
|
||||||
&-contact {
|
|
||||||
font-size: 14px;
|
|
||||||
color: #606266;
|
|
||||||
}
|
|
||||||
|
|
||||||
&-vehicle {
|
|
||||||
font-size: 24px;
|
|
||||||
color: #909399;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -706,12 +797,42 @@ export default {
|
|||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__attachment-link {
|
@media (max-width: 1200px) {
|
||||||
margin-right: 12px;
|
&__summary-grid {
|
||||||
|
grid-template-columns: repeat(4, minmax(130px, 1fr));
|
||||||
|
}
|
||||||
|
|
||||||
|
&__summary-item.is-goods,
|
||||||
|
&__attachments {
|
||||||
|
grid-column: 1 / -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__route {
|
||||||
|
grid-column: 1 / -1;
|
||||||
|
grid-row: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 800px) {
|
||||||
|
&__summary-grid {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__route {
|
||||||
|
grid-template-columns: minmax(0, 1fr);
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__route-line {
|
||||||
|
width: 10px;
|
||||||
|
height: 32px;
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__summary-item.is-goods,
|
||||||
|
&__attachments {
|
||||||
|
grid-column: auto;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.status-text {
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -16,7 +16,9 @@
|
|||||||
><el-select v-model="query.processStatus" clearable placeholder="全部"
|
><el-select v-model="query.processStatus" clearable placeholder="全部"
|
||||||
><el-option label="上传中" value="上传中" /><el-option
|
><el-option label="上传中" value="上传中" /><el-option
|
||||||
label="处理中"
|
label="处理中"
|
||||||
value="处理中" /><el-option label="处理完成" value="处理完成" /></el-select
|
value="处理中" /><el-option label="处理完成" value="处理完成" /><el-option
|
||||||
|
label="处理失败"
|
||||||
|
value="处理失败" /></el-select
|
||||||
></el-form-item>
|
></el-form-item>
|
||||||
<el-form-item label="运单批次号"
|
<el-form-item label="运单批次号"
|
||||||
><el-input v-model="query.waybillBatchNo" clearable placeholder="请输入"
|
><el-input v-model="query.waybillBatchNo" clearable placeholder="请输入"
|
||||||
@@ -84,7 +86,14 @@
|
|||||||
min-width="160"
|
min-width="160"
|
||||||
><template #default="{ row }">{{ row.carrierName || '-' }}</template></el-table-column
|
><template #default="{ row }">{{ row.carrierName || '-' }}</template></el-table-column
|
||||||
>
|
>
|
||||||
<el-table-column prop="processStatus" label="处理状态" width="120" /><el-table-column
|
<el-table-column prop="processStatus" label="处理状态" width="120"
|
||||||
|
><template #default="{ row }"
|
||||||
|
><span
|
||||||
|
:class="{ 'voucher-manage-page__process-failed': row.processStatus === '处理失败' }"
|
||||||
|
>{{ row.processStatus }}</span
|
||||||
|
></template
|
||||||
|
></el-table-column
|
||||||
|
><el-table-column
|
||||||
prop="voucherCount"
|
prop="voucherCount"
|
||||||
label="凭证数量"
|
label="凭证数量"
|
||||||
width="100"
|
width="100"
|
||||||
@@ -109,7 +118,7 @@
|
|||||||
placement="top"
|
placement="top"
|
||||||
><el-icon class="voucher-manage-page__audit-reject-icon"><WarnTriangleFilled /></el-icon
|
><el-icon class="voucher-manage-page__audit-reject-icon"><WarnTriangleFilled /></el-icon
|
||||||
></el-tooltip></span></template
|
></el-tooltip></span></template
|
||||||
></el-table-column><el-table-column label="操作" width="320" fixed="right" align="center"
|
></el-table-column><el-table-column label="操作" width="220" fixed="right" align="center"
|
||||||
><template #default="{ row }"
|
><template #default="{ row }"
|
||||||
><div class="voucher-manage-page__actions">
|
><div class="voucher-manage-page__actions">
|
||||||
<el-link
|
<el-link
|
||||||
@@ -130,7 +139,7 @@
|
|||||||
@click="download(row)"
|
@click="download(row)"
|
||||||
>下载</el-link
|
>下载</el-link
|
||||||
><el-link
|
><el-link
|
||||||
v-if="row.auditStatus === '审核驳回'"
|
v-if="row.auditStatus === '审核驳回' || row.processStatus === '处理失败'"
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="openUpload(row, 'reupload')"
|
@click="openUpload(row, 'reupload')"
|
||||||
>重新上传</el-link
|
>重新上传</el-link
|
||||||
@@ -145,7 +154,7 @@
|
|||||||
@click="openBatchDialog(row)"
|
@click="openBatchDialog(row)"
|
||||||
>更换运单批次</el-link
|
>更换运单批次</el-link
|
||||||
><el-link
|
><el-link
|
||||||
v-if="row.processStatus === '上传中' || row.auditStatus === '审核驳回'"
|
v-if="row.processStatus === '上传中' || row.processStatus === '处理失败' || row.auditStatus === '审核驳回'"
|
||||||
type="danger"
|
type="danger"
|
||||||
@click="removeRow(row)"
|
@click="removeRow(row)"
|
||||||
>删除</el-link
|
>删除</el-link
|
||||||
@@ -1238,7 +1247,15 @@ const view = async row => {
|
|||||||
query: { id: row.id, batchNo: row.voucherBatchNo },
|
query: { id: row.id, batchNo: row.voucherBatchNo },
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const download = row => window.open(row.fileUrl, '_blank');
|
const download = row => {
|
||||||
|
const url = row?.fileUrl;
|
||||||
|
if (!url) {
|
||||||
|
ElMessage.warning('附件地址为空,无法下载');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// 去掉 URL 中 ? 后的临时鉴权参数,避免签名过期导致无法下载
|
||||||
|
window.open(String(url).split('?')[0], '_blank');
|
||||||
|
};
|
||||||
const handleAuditPass = row =>
|
const handleAuditPass = row =>
|
||||||
ElMessageBox.confirm(`确认审核通过凭证批次"${row.voucherBatchNo}"吗?`, '提示', {
|
ElMessageBox.confirm(`确认审核通过凭证批次"${row.voucherBatchNo}"吗?`, '提示', {
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
@@ -1329,6 +1346,9 @@ load();
|
|||||||
color: #f56c6c;
|
color: #f56c6c;
|
||||||
cursor: help;
|
cursor: help;
|
||||||
}
|
}
|
||||||
|
&__process-failed {
|
||||||
|
color: #f56c6c;
|
||||||
|
}
|
||||||
&__actions {
|
&__actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<basic-container class="waybill-import-page-container">
|
<basic-container class="waybill-import-page-container">
|
||||||
<div class="waybill-import-page-title">导入运单</div>
|
|
||||||
<waybill-import-dialog standalone />
|
<waybill-import-dialog standalone />
|
||||||
</basic-container>
|
</basic-container>
|
||||||
</template>
|
</template>
|
||||||
@@ -11,28 +10,14 @@ import WaybillImportDialog from './components/waybill-import-dialog.vue';
|
|||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.waybill-import-page-container {
|
.waybill-import-page-container {
|
||||||
|
:deep(.basic-container__card) {
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
:deep(.basic-container__card > .el-card__body) {
|
:deep(.basic-container__card > .el-card__body) {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.waybill-import-page-title {
|
|
||||||
position: relative;
|
|
||||||
padding: 16px 24px 12px 36px;
|
|
||||||
border-bottom: 1px solid #eff1f7;
|
|
||||||
color: #303133;
|
|
||||||
font-size: 18px;
|
|
||||||
font-weight: 600;
|
|
||||||
|
|
||||||
&::before {
|
|
||||||
position: absolute;
|
|
||||||
top: 16px;
|
|
||||||
left: 24px;
|
|
||||||
width: 4px;
|
|
||||||
height: 22px;
|
|
||||||
border-radius: 2px;
|
|
||||||
background: #409eff;
|
|
||||||
content: '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -497,7 +497,6 @@ const emptyLine = () => ({
|
|||||||
localId: ++localId,
|
localId: ++localId,
|
||||||
goodsCategory: '',
|
goodsCategory: '',
|
||||||
goodsName: '',
|
goodsName: '',
|
||||||
taxClassificationCode: '',
|
|
||||||
unit: '吨',
|
unit: '吨',
|
||||||
quantity: 0,
|
quantity: 0,
|
||||||
unitPriceNoTax: 0,
|
unitPriceNoTax: 0,
|
||||||
@@ -725,11 +724,9 @@ export default {
|
|||||||
const item = this.findInvoiceItem(line);
|
const item = this.findInvoiceItem(line);
|
||||||
if (item) {
|
if (item) {
|
||||||
line.taxRate = Number(item.defaultTaxRate || 0);
|
line.taxRate = Number(item.defaultTaxRate || 0);
|
||||||
line.taxClassificationCode = item.taxClassificationCode || '';
|
|
||||||
} else if (clearInvalid) {
|
} else if (clearInvalid) {
|
||||||
line.goodsName = '';
|
line.goodsName = '';
|
||||||
line.taxRate = 0;
|
line.taxRate = 0;
|
||||||
line.taxClassificationCode = '';
|
|
||||||
}
|
}
|
||||||
this.recalculateLine(line);
|
this.recalculateLine(line);
|
||||||
},
|
},
|
||||||
@@ -737,7 +734,6 @@ export default {
|
|||||||
const names = this.invoiceItemNames(line.goodsCategory);
|
const names = this.invoiceItemNames(line.goodsCategory);
|
||||||
if (!names.some(item => item.shortName === line.goodsName)) line.goodsName = '';
|
if (!names.some(item => item.shortName === line.goodsName)) line.goodsName = '';
|
||||||
line.taxRate = 0;
|
line.taxRate = 0;
|
||||||
line.taxClassificationCode = this.findInvoiceItem(line)?.taxClassificationCode || '';
|
|
||||||
if (names.length === 1) {
|
if (names.length === 1) {
|
||||||
line.goodsName = names[0].shortName;
|
line.goodsName = names[0].shortName;
|
||||||
this.handleGoodsNameChange(line);
|
this.handleGoodsNameChange(line);
|
||||||
@@ -747,11 +743,9 @@ export default {
|
|||||||
const item = this.findInvoiceItem(line);
|
const item = this.findInvoiceItem(line);
|
||||||
if (!item) {
|
if (!item) {
|
||||||
line.taxRate = 0;
|
line.taxRate = 0;
|
||||||
line.taxClassificationCode = '';
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
line.taxRate = Number(item.defaultTaxRate || 0);
|
line.taxRate = Number(item.defaultTaxRate || 0);
|
||||||
line.taxClassificationCode = item.taxClassificationCode || '';
|
|
||||||
this.recalculateLine(line);
|
this.recalculateLine(line);
|
||||||
},
|
},
|
||||||
validateSettlements(rule, value, callback) {
|
validateSettlements(rule, value, callback) {
|
||||||
@@ -1147,7 +1141,6 @@ export default {
|
|||||||
lines: sheet.lines.map(line => ({
|
lines: sheet.lines.map(line => ({
|
||||||
goodsCategory: line.goodsCategory,
|
goodsCategory: line.goodsCategory,
|
||||||
goodsName: line.goodsName,
|
goodsName: line.goodsName,
|
||||||
taxClassificationCode: line.taxClassificationCode,
|
|
||||||
unit: line.unit,
|
unit: line.unit,
|
||||||
quantity: line.quantity,
|
quantity: line.quantity,
|
||||||
unitPriceNoTax: line.unitPriceNoTax,
|
unitPriceNoTax: line.unitPriceNoTax,
|
||||||
|
|||||||
@@ -406,18 +406,7 @@ export default {
|
|||||||
}
|
}
|
||||||
await Promise.all(rows.map(row => api.syncKingdee(row.id)));
|
await Promise.all(rows.map(row => api.syncKingdee(row.id)));
|
||||||
this.$message.success(`已同步${rows.length}条开票申请`);
|
this.$message.success(`已同步${rows.length}条开票申请`);
|
||||||
await this.loadTable();
|
this.loadTable();
|
||||||
// 附件联带同步提示:同步成功但附件未全部上传时追加 warning,重推即自动补传
|
|
||||||
const idSet = new Set(rows.map(row => String(row.id)));
|
|
||||||
const pendingCount = (this.rows || []).filter(row => idSet.has(String(row.id))
|
|
||||||
&& ['pending', 'partial'].includes(row.attachmentSyncStatus)).length;
|
|
||||||
if (pendingCount) {
|
|
||||||
this.$message({
|
|
||||||
type: 'warning',
|
|
||||||
message: `其中${pendingCount}单附件未全部上传,可重推补传`,
|
|
||||||
duration: 8000,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
async handleExport() {
|
async handleExport() {
|
||||||
const data = this.unwrapData(await api.getList(1, 100000, this.query));
|
const data = this.unwrapData(await api.getList(1, 100000, this.query));
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="开票金额">
|
<el-form-item label="开票金额">
|
||||||
<el-input
|
<el-input
|
||||||
:model-value="form.invoiceNo ? formatMoney(form.invoiceAmount) : ''"
|
:model-value="form.kingdeeInvoicePoolId ? formatMoney(form.invoiceAmount) : ''"
|
||||||
disabled
|
disabled
|
||||||
placeholder="从金蝶票据池带出"
|
placeholder="从金蝶票据池带出"
|
||||||
/>
|
/>
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="税额">
|
<el-form-item label="税额">
|
||||||
<el-input
|
<el-input
|
||||||
:model-value="form.invoiceNo ? formatMoney(form.taxAmount) : ''"
|
:model-value="form.kingdeeInvoicePoolId ? formatMoney(form.taxAmount) : ''"
|
||||||
disabled
|
disabled
|
||||||
placeholder="从金蝶票据池带出"
|
placeholder="从金蝶票据池带出"
|
||||||
/>
|
/>
|
||||||
@@ -149,13 +149,62 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<kingdee-invoice-pool-dialog
|
<el-dialog v-model="invoiceDialog.visible" title="查询金蝶票据池" width="86%" append-to-body>
|
||||||
v-model="invoiceDialog.visible"
|
<div class="receipt-form-page__dialog-search">
|
||||||
title="查询金蝶票据池"
|
<el-input
|
||||||
:initial-invoice-no="form.invoiceNo"
|
v-model="invoiceDialog.keyword"
|
||||||
:query-api="apiQueryInvoicePool"
|
clearable
|
||||||
@confirm="handleInvoicePicked"
|
placeholder="发票号码、开票单位或受票单位"
|
||||||
/>
|
@keyup.enter="loadInvoicePool"
|
||||||
|
/>
|
||||||
|
<el-button type="primary" @click="loadInvoicePool">查询</el-button>
|
||||||
|
</div>
|
||||||
|
<el-table
|
||||||
|
v-loading="invoiceDialog.loading"
|
||||||
|
:data="invoiceDialog.rows"
|
||||||
|
border
|
||||||
|
empty-text="暂无票据数据"
|
||||||
|
highlight-current-row
|
||||||
|
@current-change="invoiceDialog.current = $event"
|
||||||
|
@row-dblclick="confirmInvoice"
|
||||||
|
>
|
||||||
|
<el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
|
||||||
|
<el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
|
||||||
|
<el-table-column prop="invoiceType" label="发票类型" min-width="130" />
|
||||||
|
<el-table-column prop="issuerName" label="开票单位" min-width="170" />
|
||||||
|
<el-table-column prop="receiverName" label="受票单位" min-width="170" />
|
||||||
|
<el-table-column label="开票金额" min-width="130" align="right">
|
||||||
|
<template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="税率" min-width="100" align="center">
|
||||||
|
<template #default="{ row }">{{ formatRate(row.taxRate) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="税额" min-width="120" align="right">
|
||||||
|
<template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="150" />
|
||||||
|
<el-table-column label="操作" width="100" fixed="right" align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-link type="primary" @click.stop="confirmInvoice(row)">选择</el-link>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<div class="receipt-form-page__dialog-pagination">
|
||||||
|
<el-pagination
|
||||||
|
v-model:current-page="invoiceDialog.page.current"
|
||||||
|
v-model:page-size="invoiceDialog.page.size"
|
||||||
|
:total="invoiceDialog.page.total"
|
||||||
|
:page-sizes="[10, 20, 50, 100]"
|
||||||
|
layout="total, sizes, prev, pager, next, jumper"
|
||||||
|
@current-change="refreshInvoicePoolPage"
|
||||||
|
@size-change="handleInvoicePoolSizeChange"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<el-button @click="invoiceDialog.visible = false">取消</el-button>
|
||||||
|
<el-button type="primary" @click="confirmInvoice()">确定</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog
|
<el-dialog
|
||||||
v-model="settlementDialog.visible"
|
v-model="settlementDialog.visible"
|
||||||
@@ -210,11 +259,80 @@
|
|||||||
import { Search } from '@element-plus/icons-vue';
|
import { Search } from '@element-plus/icons-vue';
|
||||||
import { mapGetters } from 'vuex';
|
import { mapGetters } from 'vuex';
|
||||||
import * as api from '@/api/payment/invoiceReceipt';
|
import * as api from '@/api/payment/invoiceReceipt';
|
||||||
import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
|
import { getList as getCustomerList } from '@/api/vehicle/customer-archive';
|
||||||
import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
|
import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
|
||||||
|
|
||||||
|
const mockInvoiceTypes = ['增值税专用发票', '增值税普通发票'];
|
||||||
|
const mockTaxRates = [3, 6, 9, 13];
|
||||||
|
const mockBankNames = ['中国工商银行', '中国农业银行', '中国银行', '中国建设银行', '招商银行'];
|
||||||
|
|
||||||
|
const randomDigits = length =>
|
||||||
|
Array.from({ length }, () => Math.floor(Math.random() * 10)).join('');
|
||||||
|
|
||||||
|
const formatMockDate = date => {
|
||||||
|
const year = date.getFullYear();
|
||||||
|
const month = String(date.getMonth() + 1).padStart(2, '0');
|
||||||
|
const day = String(date.getDate()).padStart(2, '0');
|
||||||
|
return `${year}-${month}-${day}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const customerName = customer =>
|
||||||
|
customer.fullName || customer.shortName || customer.customerCode || `客商${customer.id}`;
|
||||||
|
|
||||||
|
const customerEmail = (customer, index) => {
|
||||||
|
const prefix = String(customer.customerCode || customer.id || `customer${index + 1}`)
|
||||||
|
.replace(/[^a-zA-Z0-9_-]/g, '')
|
||||||
|
.toLowerCase();
|
||||||
|
return `finance@${prefix || `customer${index + 1}`}.example.com`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const createInvoicePoolMockRows = (customers, counterpartyName, departmentEmail) => {
|
||||||
|
const rows = [];
|
||||||
|
const baseId = Date.now();
|
||||||
|
customers.forEach((customer, customerIndex) => {
|
||||||
|
const name = customerName(customer);
|
||||||
|
['issuer', 'receiver'].forEach((role, roleIndex) => {
|
||||||
|
const count = 3 + Math.floor(Math.random() * 5);
|
||||||
|
for (let index = 0; index < count; index += 1) {
|
||||||
|
const rowIndex = rows.length;
|
||||||
|
const invoiceDateValue = new Date();
|
||||||
|
invoiceDateValue.setDate(invoiceDateValue.getDate() - Math.floor(Math.random() * 90));
|
||||||
|
const invoiceDate = formatMockDate(invoiceDateValue);
|
||||||
|
const taxRate = mockTaxRates[(customerIndex + roleIndex + index) % mockTaxRates.length];
|
||||||
|
const invoiceAmount = Math.floor(10000 + Math.random() * 190000);
|
||||||
|
const taxAmount = Number(
|
||||||
|
((invoiceAmount * Number(taxRate)) / (100 + Number(taxRate))).toFixed(2)
|
||||||
|
);
|
||||||
|
const bankName = mockBankNames[(customerIndex + index) % mockBankNames.length];
|
||||||
|
rows.push({
|
||||||
|
id: baseId + rowIndex,
|
||||||
|
invoiceNo: `25${randomDigits(18)}`,
|
||||||
|
invoiceDate,
|
||||||
|
invoiceType: mockInvoiceTypes[(customerIndex + index) % mockInvoiceTypes.length],
|
||||||
|
taxRate,
|
||||||
|
invoiceAmount,
|
||||||
|
taxAmount,
|
||||||
|
receiverName: role === 'receiver' ? name : counterpartyName,
|
||||||
|
issuerName: role === 'issuer' ? name : counterpartyName,
|
||||||
|
bankName,
|
||||||
|
bankAccount: randomDigits(19),
|
||||||
|
issuingBank: `${bankName}营业部`,
|
||||||
|
phone: customer.contactPhone || '',
|
||||||
|
customerEmails: customerEmail(customer, customerIndex),
|
||||||
|
departmentEmails: departmentEmail || '',
|
||||||
|
attachmentsJson: '[]',
|
||||||
|
kingdeeBillNo: `KD-FP-${invoiceDate.replaceAll('-', '')}${randomDigits(5)}`,
|
||||||
|
kingdeeStatus: 'unsynced',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return rows;
|
||||||
|
};
|
||||||
|
|
||||||
const emptyForm = () => ({
|
const emptyForm = () => ({
|
||||||
id: null,
|
id: null,
|
||||||
|
kingdeeInvoicePoolId: null,
|
||||||
invoiceNo: '',
|
invoiceNo: '',
|
||||||
invoiceDate: '',
|
invoiceDate: '',
|
||||||
invoiceType: '',
|
invoiceType: '',
|
||||||
@@ -226,6 +344,8 @@ const emptyForm = () => ({
|
|||||||
bankName: '',
|
bankName: '',
|
||||||
bankAccount: '',
|
bankAccount: '',
|
||||||
issuingBank: '',
|
issuingBank: '',
|
||||||
|
kingdeeBillNo: '',
|
||||||
|
kingdeeStatus: 'unsynced',
|
||||||
phone: '',
|
phone: '',
|
||||||
customerEmails: [],
|
customerEmails: [],
|
||||||
departmentEmails: [],
|
departmentEmails: [],
|
||||||
@@ -241,17 +361,24 @@ const emptyForm = () => ({
|
|||||||
export default {
|
export default {
|
||||||
name: 'InvoiceReceiptForm',
|
name: 'InvoiceReceiptForm',
|
||||||
components: {
|
components: {
|
||||||
KingdeeInvoicePoolDialog,
|
|
||||||
VehicleAttachmentTable,
|
VehicleAttachmentTable,
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
Search,
|
Search,
|
||||||
form: emptyForm(),
|
form: emptyForm(),
|
||||||
|
invoicePoolMockRows: [],
|
||||||
|
invoicePoolMockLoaded: false,
|
||||||
customerEmailOptions: [],
|
customerEmailOptions: [],
|
||||||
departmentEmailOptions: [],
|
departmentEmailOptions: [],
|
||||||
invoiceDialog: {
|
invoiceDialog: {
|
||||||
visible: false,
|
visible: false,
|
||||||
|
loading: false,
|
||||||
|
keyword: '',
|
||||||
|
sourceRows: [],
|
||||||
|
rows: [],
|
||||||
|
current: null,
|
||||||
|
page: { current: 1, size: 10, total: 0 },
|
||||||
},
|
},
|
||||||
settlementDialog: {
|
settlementDialog: {
|
||||||
visible: false,
|
visible: false,
|
||||||
@@ -294,12 +421,6 @@ export default {
|
|||||||
this.initialize();
|
this.initialize();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
apiQueryInvoicePool(params) {
|
|
||||||
return api.queryInvoicePool(params);
|
|
||||||
},
|
|
||||||
handleInvoicePicked(rows) {
|
|
||||||
this.confirmInvoice(rows[0]);
|
|
||||||
},
|
|
||||||
hasPermission(code) {
|
hasPermission(code) {
|
||||||
return this.permission?.[code] !== false;
|
return this.permission?.[code] !== false;
|
||||||
},
|
},
|
||||||
@@ -345,7 +466,7 @@ export default {
|
|||||||
if (this.settlementIds.length) await this.loadReferenceInformation();
|
if (this.settlementIds.length) await this.loadReferenceInformation();
|
||||||
},
|
},
|
||||||
validateInvoice(rule, value, callback) {
|
validateInvoice(rule, value, callback) {
|
||||||
if (!value) {
|
if (!value || !this.form.kingdeeInvoicePoolId) {
|
||||||
callback(new Error('请选择金蝶票据池发票'));
|
callback(new Error('请选择金蝶票据池发票'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -371,17 +492,99 @@ export default {
|
|||||||
}
|
}
|
||||||
callback();
|
callback();
|
||||||
},
|
},
|
||||||
openInvoiceDialog() {
|
async openInvoiceDialog() {
|
||||||
this.invoiceDialog.visible = true;
|
this.invoiceDialog.visible = true;
|
||||||
|
this.invoiceDialog.keyword = this.form.invoiceNo || '';
|
||||||
|
await this.loadInvoicePool();
|
||||||
|
},
|
||||||
|
async loadInvoicePool() {
|
||||||
|
this.invoiceDialog.loading = true;
|
||||||
|
this.invoiceDialog.page.current = 1;
|
||||||
|
this.invoiceDialog.current = null;
|
||||||
|
try {
|
||||||
|
if (!this.recordId) {
|
||||||
|
if (!this.invoicePoolMockLoaded) await this.loadInvoicePoolMockRows();
|
||||||
|
this.invoiceDialog.sourceRows = this.filterInvoicePoolMockRows(
|
||||||
|
this.invoiceDialog.keyword
|
||||||
|
);
|
||||||
|
this.refreshInvoicePoolPage();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const data = this.unwrapData(await api.getInvoicePool(this.invoiceDialog.keyword));
|
||||||
|
this.invoiceDialog.sourceRows = Array.isArray(data) ? data : data?.records || [];
|
||||||
|
this.refreshInvoicePoolPage();
|
||||||
|
} finally {
|
||||||
|
this.invoiceDialog.loading = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async loadInvoicePoolMockRows() {
|
||||||
|
const pageSize = 500;
|
||||||
|
const firstData = this.unwrapData(await getCustomerList(1, pageSize, {}));
|
||||||
|
const firstRows = Array.isArray(firstData) ? firstData : firstData?.records || [];
|
||||||
|
const total = Number(firstData?.total || firstRows.length);
|
||||||
|
const pageCount = Math.ceil(total / pageSize);
|
||||||
|
const remainingPages = await Promise.all(
|
||||||
|
Array.from({ length: Math.max(pageCount - 1, 0) }, (_, index) =>
|
||||||
|
getCustomerList(index + 2, pageSize, {})
|
||||||
|
)
|
||||||
|
);
|
||||||
|
const customers = [
|
||||||
|
...firstRows,
|
||||||
|
...remainingPages.flatMap(response => {
|
||||||
|
const data = this.unwrapData(response);
|
||||||
|
return Array.isArray(data) ? data : data?.records || [];
|
||||||
|
}),
|
||||||
|
].filter(
|
||||||
|
(customer, index, rows) =>
|
||||||
|
rows.findIndex(item => String(item.id) === String(customer.id)) === index
|
||||||
|
);
|
||||||
|
const userInfo = this.$store.getters.userInfo || {};
|
||||||
|
const counterpartyName = userInfo.deptName || userInfo.dept_name || '本企业';
|
||||||
|
this.invoicePoolMockRows = createInvoicePoolMockRows(
|
||||||
|
customers,
|
||||||
|
counterpartyName,
|
||||||
|
userInfo.email || ''
|
||||||
|
);
|
||||||
|
this.invoicePoolMockLoaded = true;
|
||||||
|
},
|
||||||
|
refreshInvoicePoolPage() {
|
||||||
|
const page = this.invoiceDialog.page;
|
||||||
|
const total = this.invoiceDialog.sourceRows.length;
|
||||||
|
const maxPage = Math.max(Math.ceil(total / page.size), 1);
|
||||||
|
if (page.current > maxPage) page.current = maxPage;
|
||||||
|
const start = (page.current - 1) * page.size;
|
||||||
|
page.total = total;
|
||||||
|
this.invoiceDialog.current = null;
|
||||||
|
this.invoiceDialog.rows = this.invoiceDialog.sourceRows.slice(start, start + page.size);
|
||||||
|
},
|
||||||
|
handleInvoicePoolSizeChange() {
|
||||||
|
this.invoiceDialog.page.current = 1;
|
||||||
|
this.refreshInvoicePoolPage();
|
||||||
|
},
|
||||||
|
filterInvoicePoolMockRows(keyword) {
|
||||||
|
const normalizedKeyword = String(keyword || '')
|
||||||
|
.trim()
|
||||||
|
.toLowerCase();
|
||||||
|
if (!normalizedKeyword) return this.invoicePoolMockRows.map(item => ({ ...item }));
|
||||||
|
return this.invoicePoolMockRows
|
||||||
|
.filter(item =>
|
||||||
|
[item.invoiceNo, item.issuerName, item.receiverName].some(value =>
|
||||||
|
String(value || '')
|
||||||
|
.toLowerCase()
|
||||||
|
.includes(normalizedKeyword)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.map(item => ({ ...item }));
|
||||||
},
|
},
|
||||||
confirmInvoice(row, options = {}) {
|
confirmInvoice(row, options = {}) {
|
||||||
const selected = row;
|
const selected = row?.id ? row : this.invoiceDialog.current;
|
||||||
if (!selected) {
|
if (!selected) {
|
||||||
this.$message.warning('请选择一张金蝶票据池发票');
|
this.$message.warning('请选择一张金蝶票据池发票');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const preserveUserInput = options.preserveUserInput === true;
|
const preserveUserInput = options.preserveUserInput === true;
|
||||||
Object.assign(this.form, {
|
Object.assign(this.form, {
|
||||||
|
kingdeeInvoicePoolId: selected.id,
|
||||||
invoiceNo: selected.invoiceNo,
|
invoiceNo: selected.invoiceNo,
|
||||||
invoiceDate: selected.invoiceDate,
|
invoiceDate: selected.invoiceDate,
|
||||||
invoiceType: selected.invoiceType,
|
invoiceType: selected.invoiceType,
|
||||||
@@ -393,6 +596,8 @@ export default {
|
|||||||
bankName: selected.bankName,
|
bankName: selected.bankName,
|
||||||
bankAccount: selected.bankAccount,
|
bankAccount: selected.bankAccount,
|
||||||
issuingBank: selected.issuingBank,
|
issuingBank: selected.issuingBank,
|
||||||
|
kingdeeBillNo: selected.kingdeeBillNo || '',
|
||||||
|
kingdeeStatus: selected.kingdeeStatus || 'unsynced',
|
||||||
phone: preserveUserInput ? this.form.phone : selected.phone || '',
|
phone: preserveUserInput ? this.form.phone : selected.phone || '',
|
||||||
customerEmails: preserveUserInput
|
customerEmails: preserveUserInput
|
||||||
? this.form.customerEmails
|
? this.form.customerEmails
|
||||||
@@ -503,6 +708,7 @@ export default {
|
|||||||
payload() {
|
payload() {
|
||||||
return {
|
return {
|
||||||
id: this.form.id,
|
id: this.form.id,
|
||||||
|
kingdeeInvoicePoolId: this.form.kingdeeInvoicePoolId,
|
||||||
invoiceNo: this.form.invoiceNo,
|
invoiceNo: this.form.invoiceNo,
|
||||||
invoiceDate: this.form.invoiceDate,
|
invoiceDate: this.form.invoiceDate,
|
||||||
invoiceType: this.form.invoiceType,
|
invoiceType: this.form.invoiceType,
|
||||||
@@ -514,6 +720,8 @@ export default {
|
|||||||
bankName: this.form.bankName,
|
bankName: this.form.bankName,
|
||||||
bankAccount: this.form.bankAccount,
|
bankAccount: this.form.bankAccount,
|
||||||
issuingBank: this.form.issuingBank,
|
issuingBank: this.form.issuingBank,
|
||||||
|
kingdeeBillNo: this.form.kingdeeBillNo,
|
||||||
|
kingdeeStatus: this.form.kingdeeStatus,
|
||||||
phone: this.form.phone,
|
phone: this.form.phone,
|
||||||
customerEmails: this.form.customerEmails.join(';'),
|
customerEmails: this.form.customerEmails.join(';'),
|
||||||
departmentEmails: this.form.departmentEmails.join(';'),
|
departmentEmails: this.form.departmentEmails.join(';'),
|
||||||
@@ -550,12 +758,13 @@ export default {
|
|||||||
this.$message.warning('请先选择金蝶票据池发票');
|
this.$message.warning('请先选择金蝶票据池发票');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const data = this.unwrapData(
|
const data = this.recordId
|
||||||
await api.queryInvoicePool({ current: 1, size: 1, invoiceNo: this.form.invoiceNo })
|
? this.unwrapData(await api.getInvoicePool(this.form.invoiceNo))
|
||||||
);
|
: this.filterInvoicePoolMockRows(this.form.invoiceNo);
|
||||||
const invoice = (data.records || []).find(item => item.invoiceNo === this.form.invoiceNo);
|
const rows = Array.isArray(data) ? data : data?.records || [];
|
||||||
|
const invoice = rows.find(item => item.invoiceNo === this.form.invoiceNo);
|
||||||
if (!invoice) {
|
if (!invoice) {
|
||||||
this.$message.warning('金蝶票池未查询到该发票');
|
this.$message.warning('金蝶票据池中未查询到该发票');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!this.confirmInvoice(invoice, { preserveUserInput: true })) return;
|
if (!this.confirmInvoice(invoice, { preserveUserInput: true })) return;
|
||||||
@@ -618,6 +827,11 @@ export default {
|
|||||||
.receipt-form-page__dialog-search .el-input {
|
.receipt-form-page__dialog-search .el-input {
|
||||||
width: 360px;
|
width: 360px;
|
||||||
}
|
}
|
||||||
|
.receipt-form-page__dialog-pagination {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
margin-top: 12px;
|
||||||
|
}
|
||||||
.receipt-form-page :deep(.el-table) {
|
.receipt-form-page :deep(.el-table) {
|
||||||
--el-table-border-color: #eff1f7;
|
--el-table-border-color: #eff1f7;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,10 +40,10 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-if="searchExpanded" label="金蝶状态">
|
<el-form-item v-if="searchExpanded" label="金蝶单据状态">
|
||||||
<el-select v-model="query.kingdeePushStatus" clearable placeholder="请选择">
|
<el-select v-model="query.kingdeeStatus" clearable placeholder="请选择">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in kingdeePushStatusOptions"
|
v-for="item in kingdeeStatusOptions"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
:label="item.label"
|
:label="item.label"
|
||||||
:value="item.value"
|
:value="item.value"
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
v-if="hasPermission('invoice_receipt_sync')"
|
v-if="hasPermission('invoice_receipt_sync')"
|
||||||
type="primary"
|
type="primary"
|
||||||
plain
|
plain
|
||||||
@click="handlePushKingdee"
|
@click="handleBatchSync"
|
||||||
>批量同步</el-button
|
>批量同步</el-button
|
||||||
>
|
>
|
||||||
<el-button v-if="hasPermission('invoice_receipt_add')" type="primary" @click="openCreate"
|
<el-button v-if="hasPermission('invoice_receipt_add')" type="primary" @click="openCreate"
|
||||||
@@ -244,7 +244,7 @@ const emptyQuery = () => ({
|
|||||||
deptName: '',
|
deptName: '',
|
||||||
deptPath: [],
|
deptPath: [],
|
||||||
approvalStatus: '',
|
approvalStatus: '',
|
||||||
kingdeePushStatus: '',
|
kingdeeStatus: '',
|
||||||
});
|
});
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -258,7 +258,7 @@ export default {
|
|||||||
query: emptyQuery(),
|
query: emptyQuery(),
|
||||||
searchExpanded: false,
|
searchExpanded: false,
|
||||||
approvalStatusOptions: api.approvalStatusOptions,
|
approvalStatusOptions: api.approvalStatusOptions,
|
||||||
kingdeePushStatusOptions: api.kingdeePushStatusOptions,
|
kingdeeStatusOptions: api.kingdeeStatusOptions,
|
||||||
columns: invoiceReceiptTableColumns,
|
columns: invoiceReceiptTableColumns,
|
||||||
rows: [],
|
rows: [],
|
||||||
selection: [],
|
selection: [],
|
||||||
@@ -363,23 +363,15 @@ export default {
|
|||||||
this.$message.success('作废成功');
|
this.$message.success('作废成功');
|
||||||
this.loadTable();
|
this.loadTable();
|
||||||
},
|
},
|
||||||
async handlePushKingdee() {
|
async handleBatchSync() {
|
||||||
const rows = this.selection.filter(row => row.approvalStatus === 'approved');
|
const rows = this.selection.filter(row => row.approvalStatus === 'approved');
|
||||||
if (!rows.length) {
|
if (!rows.length) {
|
||||||
this.$message.warning('请选择至少一条审批通过的收票登记');
|
this.$message.warning('请选择至少一条审批通过的收票登记');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await this.$confirm(`确认将选中的 ${rows.length} 条收票登记同步至金蝶?`, '提示', {
|
await Promise.all(rows.map(row => api.syncKingdee(row.id)));
|
||||||
type: 'warning',
|
this.$message.success(`已同步${rows.length}条收票登记`);
|
||||||
});
|
this.loadTable();
|
||||||
const summary = this.unwrapData(await api.pushKingdee(rows.map(row => row.id)));
|
|
||||||
await this.loadTable();
|
|
||||||
// 附件联带同步提示:推送成功但附件未全部上传时在结果弹窗追加说明,重推即自动补传
|
|
||||||
const idSet = new Set(rows.map(row => String(row.id)));
|
|
||||||
const pendingCount = (this.rows || []).filter(row => idSet.has(String(row.id))
|
|
||||||
&& ['pending', 'partial'].includes(row.attachmentSyncStatus)).length;
|
|
||||||
const attachmentTip = pendingCount ? `\n其中${pendingCount}单附件未全部上传,可重推补传` : '';
|
|
||||||
this.$alert((summary || '推送完成') + attachmentTip, '推送结果', { confirmButtonText: '知道了' });
|
|
||||||
},
|
},
|
||||||
async handleExport() {
|
async handleExport() {
|
||||||
const data = this.unwrapData(await api.getList(1, 100000, this.query));
|
const data = this.unwrapData(await api.getList(1, 100000, this.query));
|
||||||
@@ -396,9 +388,8 @@ export default {
|
|||||||
当前处理人: item.currentProcessor,
|
当前处理人: item.currentProcessor,
|
||||||
创建人: item.createUserName,
|
创建人: item.createUserName,
|
||||||
创建时间: item.createTime,
|
创建时间: item.createTime,
|
||||||
金蝶单据号: item.kingdeeReceivedInvoiceNo,
|
金蝶单据号: item.kingdeeBillNo,
|
||||||
金蝶状态: item.kingdeePushStatusName,
|
金蝶单据状态: item.kingdeeStatusName,
|
||||||
失败原因: item.kingdeePushMsg,
|
|
||||||
}));
|
}));
|
||||||
const workbook = XLSX.utils.book_new();
|
const workbook = XLSX.utils.book_new();
|
||||||
XLSX.utils.book_append_sheet(workbook, XLSX.utils.json_to_sheet(exportRows), '收票登记');
|
XLSX.utils.book_append_sheet(workbook, XLSX.utils.json_to_sheet(exportRows), '收票登记');
|
||||||
|
|||||||
@@ -237,18 +237,8 @@
|
|||||||
<el-table-column label="操作" width="220" fixed="right" align="center">
|
<el-table-column label="操作" width="220" fixed="right" align="center">
|
||||||
<template #default="{ row, $index }">
|
<template #default="{ row, $index }">
|
||||||
<div class="payment-form-page__invoice-actions">
|
<div class="payment-form-page__invoice-actions">
|
||||||
<el-link
|
<el-link type="primary" @click="viewInvoiceAttachment(row)">查看</el-link>
|
||||||
type="primary"
|
<el-link type="primary" @click="downloadInvoiceAttachment(row)">下载</el-link>
|
||||||
:disabled="kingdeeAttachmentBusy"
|
|
||||||
@click="viewInvoiceAttachment(row)"
|
|
||||||
>查看</el-link
|
|
||||||
>
|
|
||||||
<el-link
|
|
||||||
type="primary"
|
|
||||||
:disabled="kingdeeAttachmentBusy"
|
|
||||||
@click="downloadInvoiceAttachment(row)"
|
|
||||||
>下载</el-link
|
|
||||||
>
|
|
||||||
<el-link
|
<el-link
|
||||||
v-if="!readonly"
|
v-if="!readonly"
|
||||||
type="danger"
|
type="danger"
|
||||||
@@ -618,11 +608,6 @@ import {
|
|||||||
} from '@/api/vehicle/customer-archive';
|
} from '@/api/vehicle/customer-archive';
|
||||||
import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
|
import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
|
||||||
import { downloadFileByUrl } from '@/utils/util';
|
import { downloadFileByUrl } from '@/utils/util';
|
||||||
import {
|
|
||||||
downloadKingdeeInvoiceFile,
|
|
||||||
isKingdeePathAttachment,
|
|
||||||
viewKingdeeInvoiceFile,
|
|
||||||
} from '@/utils/kingdee-attachment';
|
|
||||||
import PdfPreview from '@/components/pdf-preview/main.vue';
|
import PdfPreview from '@/components/pdf-preview/main.vue';
|
||||||
|
|
||||||
const attachmentViewerPlugins = [
|
const attachmentViewerPlugins = [
|
||||||
@@ -703,8 +688,6 @@ export default {
|
|||||||
form: emptyForm(),
|
form: emptyForm(),
|
||||||
amountSyncing: false,
|
amountSyncing: false,
|
||||||
transferPayload: null,
|
transferPayload: null,
|
||||||
// 金蝶侧发票附件查看/下载进行中(行组级 loading 守卫)
|
|
||||||
kingdeeAttachmentBusy: false,
|
|
||||||
referenceRows: [],
|
referenceRows: [],
|
||||||
paymentRecords: [],
|
paymentRecords: [],
|
||||||
referenceVisible: false,
|
referenceVisible: false,
|
||||||
@@ -1407,19 +1390,8 @@ export default {
|
|||||||
this.attachmentFileName(this.invoiceAttachment(row)) || `${row.invoiceNo || '发票'}.pdf`
|
this.attachmentFileName(this.invoiceAttachment(row)) || `${row.invoiceNo || '发票'}.pdf`
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
async viewInvoiceAttachment(row) {
|
viewInvoiceAttachment(row) {
|
||||||
const attachment = this.invoiceAttachment(row);
|
const attachment = this.invoiceAttachment(row);
|
||||||
// 金蝶侧附件(path 型)经后端代理 A801-2 预览,OSS 直链维持本地预览组件
|
|
||||||
if (isKingdeePathAttachment(attachment)) {
|
|
||||||
if (this.kingdeeAttachmentBusy) return;
|
|
||||||
this.kingdeeAttachmentBusy = true;
|
|
||||||
try {
|
|
||||||
await viewKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
|
|
||||||
} finally {
|
|
||||||
this.kingdeeAttachmentBusy = false;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!this.attachmentFileUrl(attachment)) {
|
if (!this.attachmentFileUrl(attachment)) {
|
||||||
this.$message.warning('当前发票暂无可查看附件');
|
this.$message.warning('当前发票暂无可查看附件');
|
||||||
return;
|
return;
|
||||||
@@ -1429,20 +1401,8 @@ export default {
|
|||||||
[attachment]
|
[attachment]
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
async downloadInvoiceAttachment(row) {
|
downloadInvoiceAttachment(row) {
|
||||||
const attachment = this.invoiceAttachment(row);
|
const url = this.invoiceAttachmentUrl(row);
|
||||||
// 金蝶侧附件(path 型)经后端代理 A801-2 下载,OSS 直链维持前端直连下载
|
|
||||||
if (isKingdeePathAttachment(attachment)) {
|
|
||||||
if (this.kingdeeAttachmentBusy) return;
|
|
||||||
this.kingdeeAttachmentBusy = true;
|
|
||||||
try {
|
|
||||||
await downloadKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
|
|
||||||
} finally {
|
|
||||||
this.kingdeeAttachmentBusy = false;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const url = this.attachmentFileUrl(attachment);
|
|
||||||
if (!url) {
|
if (!url) {
|
||||||
this.$message.warning('当前发票暂无可下载附件');
|
this.$message.warning('当前发票暂无可下载附件');
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -84,13 +84,6 @@
|
|||||||
@click="handleSync"
|
@click="handleSync"
|
||||||
>批量同步</el-button
|
>批量同步</el-button
|
||||||
>
|
>
|
||||||
<el-button
|
|
||||||
v-if="hasPermission('payment_application_sync')"
|
|
||||||
type="primary"
|
|
||||||
plain
|
|
||||||
@click="handleSyncResult"
|
|
||||||
>同步付款结果</el-button
|
|
||||||
>
|
|
||||||
<el-button
|
<el-button
|
||||||
v-if="hasPermission('payment_application_add')"
|
v-if="hasPermission('payment_application_add')"
|
||||||
type="primary"
|
type="primary"
|
||||||
@@ -395,8 +388,7 @@ export default {
|
|||||||
async handleSyncRow(row) {
|
async handleSyncRow(row) {
|
||||||
const data = this.unwrapData(await api.syncKingdee(row.id));
|
const data = this.unwrapData(await api.syncKingdee(row.id));
|
||||||
this.$message.success(`已生成金蝶付款单:${data}`);
|
this.$message.success(`已生成金蝶付款单:${data}`);
|
||||||
await this.loadTable();
|
this.loadTable();
|
||||||
this.warnAttachmentNotUploaded([row.id]);
|
|
||||||
},
|
},
|
||||||
async handleSync() {
|
async handleSync() {
|
||||||
const rows = this.selection.filter(row => row.approvalStatus === 'approved');
|
const rows = this.selection.filter(row => row.approvalStatus === 'approved');
|
||||||
@@ -404,36 +396,8 @@ export default {
|
|||||||
this.$message.warning('请选择至少一条审批通过的付款申请');
|
this.$message.warning('请选择至少一条审批通过的付款申请');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const data = this.unwrapData(await api.syncKingdeeBatch(rows.map(row => row.id))) || [];
|
await api.syncKingdeeBatch(rows.map(row => row.id));
|
||||||
const failedList = data.filter(item => String(item).includes('同步失败'));
|
this.$message.success(`已同步${rows.length}条付款申请`);
|
||||||
if (failedList.length) {
|
|
||||||
this.$message({
|
|
||||||
type: 'warning',
|
|
||||||
message: `同步完成:成功${data.length - failedList.length}条,失败${failedList.length}条。${failedList.join(';')}`,
|
|
||||||
duration: 8000,
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
this.$message.success(`已同步${data.length}条付款申请`);
|
|
||||||
}
|
|
||||||
await this.loadTable();
|
|
||||||
this.warnAttachmentNotUploaded(rows.map(row => row.id));
|
|
||||||
},
|
|
||||||
// 附件联带同步提示:同步成功但附件未全部上传时追加 warning,重推即自动补传
|
|
||||||
warnAttachmentNotUploaded(ids) {
|
|
||||||
const idSet = new Set(ids.map(String));
|
|
||||||
const pendingCount = (this.rows || []).filter(row => idSet.has(String(row.id))
|
|
||||||
&& ['pending', 'partial'].includes(row.attachmentSyncStatus)).length;
|
|
||||||
if (pendingCount) {
|
|
||||||
this.$message({
|
|
||||||
type: 'warning',
|
|
||||||
message: `其中${pendingCount}单附件未全部上传,可重推补传`,
|
|
||||||
duration: 8000,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async handleSyncResult() {
|
|
||||||
const data = this.unwrapData(await api.syncKingdeeResult());
|
|
||||||
this.$message.success(data || '金蝶付款结果回写完成');
|
|
||||||
this.loadTable();
|
this.loadTable();
|
||||||
},
|
},
|
||||||
handleExport() {
|
handleExport() {
|
||||||
|
|||||||
@@ -22,7 +22,6 @@
|
|||||||
type="date"
|
type="date"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
placeholder="请选择"
|
placeholder="请选择"
|
||||||
@change="fetchBfiExchangeRate"
|
|
||||||
/>
|
/>
|
||||||
<el-select
|
<el-select
|
||||||
v-else-if="field.type === 'project' && editable"
|
v-else-if="field.type === 'project' && editable"
|
||||||
@@ -403,18 +402,8 @@
|
|||||||
<el-table-column label="操作" width="220" align="center">
|
<el-table-column label="操作" width="220" align="center">
|
||||||
<template #default="{ row, $index }">
|
<template #default="{ row, $index }">
|
||||||
<div class="formal-editor__links">
|
<div class="formal-editor__links">
|
||||||
<el-link
|
<el-link type="primary" @click="viewInvoiceAttachment(row)">查看</el-link>
|
||||||
type="primary"
|
<el-link type="primary" @click="downloadInvoiceAttachment(row)">下载</el-link>
|
||||||
:disabled="kingdeeAttachmentBusy"
|
|
||||||
@click="viewInvoiceAttachment(row)"
|
|
||||||
>查看</el-link
|
|
||||||
>
|
|
||||||
<el-link
|
|
||||||
type="primary"
|
|
||||||
:disabled="kingdeeAttachmentBusy"
|
|
||||||
@click="downloadInvoiceAttachment(row)"
|
|
||||||
>下载</el-link
|
|
||||||
>
|
|
||||||
<el-link v-if="editable" type="danger" @click="removeInvoice($index)">删除</el-link>
|
<el-link v-if="editable" type="danger" @click="removeInvoice($index)">删除</el-link>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -422,15 +411,66 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</section-card>
|
</section-card>
|
||||||
|
|
||||||
<kingdee-invoice-pool-dialog
|
<el-dialog
|
||||||
v-model="invoiceClaimDialog.visible"
|
v-model="invoiceClaimDialog.visible"
|
||||||
title="查询可认领发票"
|
title="查询可认领发票"
|
||||||
confirm-text="确认认领"
|
width="92%"
|
||||||
multiple
|
append-to-body
|
||||||
:initial-invoice-no="String(invoiceClaimNo || '').trim()"
|
destroy-on-close
|
||||||
:query-api="invoicePoolQueryApi"
|
>
|
||||||
@confirm="handleInvoiceClaimConfirm"
|
<el-table
|
||||||
/>
|
ref="invoiceClaimTable"
|
||||||
|
v-loading="invoiceClaimDialog.loading"
|
||||||
|
:data="invoiceClaimPagedRows"
|
||||||
|
row-key="invoiceNo"
|
||||||
|
border
|
||||||
|
height="520"
|
||||||
|
@selection-change="invoiceClaimDialog.selected = $event"
|
||||||
|
>
|
||||||
|
<el-table-column
|
||||||
|
type="selection"
|
||||||
|
width="52"
|
||||||
|
fixed="left"
|
||||||
|
align="center"
|
||||||
|
reserve-selection
|
||||||
|
/>
|
||||||
|
<el-table-column type="index" label="序号" width="64" align="center" />
|
||||||
|
<el-table-column prop="invoiceNo" label="发票号" min-width="180" align="center" />
|
||||||
|
<el-table-column prop="invoiceDate" label="开票日期" min-width="130" align="center" />
|
||||||
|
<el-table-column prop="invoiceType" label="发票类型" min-width="150" align="center" />
|
||||||
|
<el-table-column prop="issuerName" label="开票单位" min-width="180" align="center" />
|
||||||
|
<el-table-column prop="receiverName" label="受票单位" min-width="180" align="center" />
|
||||||
|
<el-table-column
|
||||||
|
prop="invoiceAmount"
|
||||||
|
label="发票金额(含税)"
|
||||||
|
min-width="160"
|
||||||
|
align="right"
|
||||||
|
>
|
||||||
|
<template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="matchedAmount" label="认领金额" min-width="140" align="right">
|
||||||
|
<template #default="{ row }">{{ formatMoney(row.matchedAmount) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<div class="formal-editor__pagination">
|
||||||
|
<el-pagination
|
||||||
|
v-model:current-page="invoiceClaimDialog.page.current"
|
||||||
|
v-model:page-size="invoiceClaimDialog.page.size"
|
||||||
|
:total="invoiceClaimDialog.page.total"
|
||||||
|
:page-sizes="[10, 20, 50, 100]"
|
||||||
|
layout="total, sizes, prev, pager, next, jumper"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<el-button @click="invoiceClaimDialog.visible = false">取消</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
:loading="invoiceClaimDialog.confirming"
|
||||||
|
@click="confirmInvoiceClaims"
|
||||||
|
>确认认领</el-button
|
||||||
|
>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
<section-card
|
<section-card
|
||||||
v-if="readonly"
|
v-if="readonly"
|
||||||
@@ -900,7 +940,6 @@ import {
|
|||||||
getNextNo,
|
getNextNo,
|
||||||
getReceiptClaims,
|
getReceiptClaims,
|
||||||
claimInvoices as claimInvoicesApi,
|
claimInvoices as claimInvoicesApi,
|
||||||
queryInvoicePool,
|
|
||||||
save,
|
save,
|
||||||
} from '@/api/settlement/formalSettlement';
|
} from '@/api/settlement/formalSettlement';
|
||||||
import {
|
import {
|
||||||
@@ -908,7 +947,6 @@ import {
|
|||||||
getDetailFees as getPreSettlementDetailFees,
|
getDetailFees as getPreSettlementDetailFees,
|
||||||
} from '@/api/settlement/preSettlement';
|
} from '@/api/settlement/preSettlement';
|
||||||
import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
|
import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
|
||||||
import { getBfiExchangeRate } from '@/api/base/currency';
|
|
||||||
import {
|
import {
|
||||||
createFormalSettlementForm,
|
createFormalSettlementForm,
|
||||||
formalSettlementFormFields,
|
formalSettlementFormFields,
|
||||||
@@ -925,17 +963,11 @@ import { h } from 'vue';
|
|||||||
import { InfoFilled } from '@element-plus/icons-vue';
|
import { InfoFilled } from '@element-plus/icons-vue';
|
||||||
import { mapGetters } from 'vuex';
|
import { mapGetters } from 'vuex';
|
||||||
import { downloadFileByUrl } from '@/utils/util';
|
import { downloadFileByUrl } from '@/utils/util';
|
||||||
import {
|
|
||||||
downloadKingdeeInvoiceFile,
|
|
||||||
isKingdeePathAttachment,
|
|
||||||
viewKingdeeInvoiceFile,
|
|
||||||
} from '@/utils/kingdee-attachment';
|
|
||||||
import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
|
|
||||||
import * as XLSX from 'xlsx';
|
import * as XLSX from 'xlsx';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'FormalSettlementEditor',
|
name: 'FormalSettlementEditor',
|
||||||
components: { InfoFilled, KingdeeInvoicePoolDialog },
|
components: { InfoFilled },
|
||||||
props: {
|
props: {
|
||||||
modelValue: Boolean,
|
modelValue: Boolean,
|
||||||
recordId: [String, Number],
|
recordId: [String, Number],
|
||||||
@@ -965,12 +997,13 @@ export default {
|
|||||||
invoices: [],
|
invoices: [],
|
||||||
invoiceClaimNo: '',
|
invoiceClaimNo: '',
|
||||||
invoiceClaimLoading: false,
|
invoiceClaimLoading: false,
|
||||||
// 金蝶侧发票附件查看/下载进行中(行组级 loading 守卫)
|
|
||||||
kingdeeAttachmentBusy: false,
|
|
||||||
invoiceClaimDialog: {
|
invoiceClaimDialog: {
|
||||||
visible: false,
|
visible: false,
|
||||||
selected: [],
|
loading: false,
|
||||||
confirming: false,
|
confirming: false,
|
||||||
|
rows: [],
|
||||||
|
selected: [],
|
||||||
|
page: { current: 1, size: 10, total: 0 },
|
||||||
},
|
},
|
||||||
attachmentUploadFiles: [],
|
attachmentUploadFiles: [],
|
||||||
attachmentTypeOptions: [],
|
attachmentTypeOptions: [],
|
||||||
@@ -1113,6 +1146,11 @@ export default {
|
|||||||
});
|
});
|
||||||
return Array.from(names);
|
return Array.from(names);
|
||||||
},
|
},
|
||||||
|
invoiceClaimPagedRows() {
|
||||||
|
const { current, size } = this.invoiceClaimDialog.page;
|
||||||
|
const start = (current - 1) * size;
|
||||||
|
return this.invoiceClaimDialog.rows.slice(start, start + size);
|
||||||
|
},
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
modelValue: {
|
modelValue: {
|
||||||
@@ -1191,6 +1229,7 @@ export default {
|
|||||||
this.invoices = [];
|
this.invoices = [];
|
||||||
this.invoiceClaimNo = '';
|
this.invoiceClaimNo = '';
|
||||||
this.invoiceClaimDialog.visible = false;
|
this.invoiceClaimDialog.visible = false;
|
||||||
|
this.invoiceClaimDialog.rows = [];
|
||||||
this.invoiceClaimDialog.selected = [];
|
this.invoiceClaimDialog.selected = [];
|
||||||
this.attachmentUploadFiles = [];
|
this.attachmentUploadFiles = [];
|
||||||
this.billingRuleDialog = {
|
this.billingRuleDialog = {
|
||||||
@@ -1211,7 +1250,6 @@ export default {
|
|||||||
if (this.initialData) await this.applyInitialData();
|
if (this.initialData) await this.applyInitialData();
|
||||||
Object.assign(this.form, newRecordAudit);
|
Object.assign(this.form, newRecordAudit);
|
||||||
await this.refreshFormalSettlementNo();
|
await this.refreshFormalSettlementNo();
|
||||||
await this.fetchBfiExchangeRate();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
@@ -1444,7 +1482,6 @@ export default {
|
|||||||
(settlementType === 'receivable' ? contract.partyA : contract.partyB),
|
(settlementType === 'receivable' ? contract.partyA : contract.partyB),
|
||||||
settlementType,
|
settlementType,
|
||||||
settlementTypeName: settlementType === 'receivable' ? '应收' : '应付',
|
settlementTypeName: settlementType === 'receivable' ? '应收' : '应付',
|
||||||
currency: contract.settlementCurrency || 'RMB',
|
|
||||||
});
|
});
|
||||||
this.sources = [];
|
this.sources = [];
|
||||||
this.details = [];
|
this.details = [];
|
||||||
@@ -1452,23 +1489,6 @@ export default {
|
|||||||
this.form.sourcePreSettlementIds = [];
|
this.form.sourcePreSettlementIds = [];
|
||||||
this.form.sourceDetailIds = [];
|
this.form.sourceDetailIds = [];
|
||||||
if (refreshSettlementNo) this.refreshFormalSettlementNo();
|
if (refreshSettlementNo) this.refreshFormalSettlementNo();
|
||||||
if (this.form.currency !== 'RMB') this.fetchBfiExchangeRate();
|
|
||||||
},
|
|
||||||
async fetchBfiExchangeRate() {
|
|
||||||
const currency = this.form.currency;
|
|
||||||
if (!currency || currency === 'RMB') return;
|
|
||||||
if (!this.form.exchangeRateDate) return;
|
|
||||||
try {
|
|
||||||
const { data } = await getBfiExchangeRate(currency, this.form.exchangeRateDate);
|
|
||||||
const rateData = data?.data;
|
|
||||||
if (rateData?.excval != null) {
|
|
||||||
this.form.exchangeRate = Number(rateData.excval);
|
|
||||||
} else {
|
|
||||||
this.$message.warning(`未查询到 ${currency} 的BFI汇率数据`);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
this.$message.warning('查询BFI汇率失败,请手动输入结算汇率');
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
openCandidateDialog() {
|
openCandidateDialog() {
|
||||||
this.candidate.visible = true;
|
this.candidate.visible = true;
|
||||||
@@ -2182,19 +2202,79 @@ export default {
|
|||||||
this.adjust.saving = false;
|
this.adjust.saving = false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
claimInvoices() {
|
||||||
|
this.invoiceClaimLoading = true;
|
||||||
|
try {
|
||||||
|
const keyword = String(this.invoiceClaimNo || '').trim();
|
||||||
|
const defaultNo = `MOCK${this.$dayjs().format('YYYYMMDD')}`;
|
||||||
|
const baseNo = (keyword || defaultNo).slice(0, 29);
|
||||||
|
const numbers = [baseNo, `${baseNo}-02`, `${baseNo}-03`];
|
||||||
|
const invoiceAmounts = [1000, 2000, 3000];
|
||||||
|
const availableAmounts = [1000, 1000, 3000];
|
||||||
|
const preferredMatchedAmounts = [1000, 1000, 2000];
|
||||||
|
let remainingAmount = Math.max(
|
||||||
|
Number(this.form.settlementAmount || this.summaryTotal || 0) -
|
||||||
|
this.invoices.reduce((total, item) => total + Number(item.matchedAmount || 0), 0),
|
||||||
|
0
|
||||||
|
);
|
||||||
|
const existingNumbers = new Set(this.invoices.map(item => String(item.invoiceNo)));
|
||||||
|
const mockRows = numbers
|
||||||
|
.map((invoiceNo, index) => {
|
||||||
|
const matchedAmount = Math.min(
|
||||||
|
preferredMatchedAmounts[index],
|
||||||
|
availableAmounts[index],
|
||||||
|
remainingAmount
|
||||||
|
);
|
||||||
|
remainingAmount = Number((remainingAmount - matchedAmount).toFixed(2));
|
||||||
|
return {
|
||||||
|
invoiceNo,
|
||||||
|
invoiceDate: this.$dayjs().subtract(index, 'day').format('YYYY-MM-DD'),
|
||||||
|
invoiceType: index === 1 ? '增值税普通发票' : '增值税专用发票',
|
||||||
|
taxRate: [3, 6, 9][index],
|
||||||
|
invoiceAmount: invoiceAmounts[index],
|
||||||
|
availableInvoiceAmount: availableAmounts[index],
|
||||||
|
matchedAmount,
|
||||||
|
attachmentJson: '',
|
||||||
|
mockData: true,
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.filter(item => !existingNumbers.has(item.invoiceNo));
|
||||||
|
if (!mockRows.length) {
|
||||||
|
this.$message.warning('当前发票号码的Mock数据已认领');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.invoices = [...this.invoices, ...mockRows];
|
||||||
|
this.$message.success(`已生成${mockRows.length}条Mock发票数据`);
|
||||||
|
} finally {
|
||||||
|
this.invoiceClaimLoading = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
openInvoiceClaimDialog() {
|
openInvoiceClaimDialog() {
|
||||||
|
const stamp = Date.now();
|
||||||
|
this.invoiceClaimDialog.loading = true;
|
||||||
|
this.invoiceClaimDialog.rows = Array.from({ length: 80 }, (_, index) => {
|
||||||
|
const amount = Math.floor(1000 + Math.random() * 49000);
|
||||||
|
return {
|
||||||
|
invoiceNo: `MOCK${stamp}${String(index + 1).padStart(3, '0')}`.slice(0, 32),
|
||||||
|
invoiceDate: this.$dayjs()
|
||||||
|
.subtract(Math.floor(Math.random() * 90), 'day')
|
||||||
|
.format('YYYY-MM-DD'),
|
||||||
|
invoiceType: index % 2 ? '增值税普通发票' : '增值税专用发票',
|
||||||
|
issuerName: this.form.payerName || 'Mock开票单位',
|
||||||
|
receiverName: this.form.payeeName || 'Mock受票单位',
|
||||||
|
invoiceAmount: amount,
|
||||||
|
availableInvoiceAmount: amount,
|
||||||
|
matchedAmount: amount,
|
||||||
|
taxRate: [3, 6, 9, 13][index % 4],
|
||||||
|
attachmentJson: '',
|
||||||
|
mockData: true,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
this.invoiceClaimDialog.selected = [];
|
||||||
|
this.invoiceClaimDialog.page.current = 1;
|
||||||
|
this.invoiceClaimDialog.page.total = 80;
|
||||||
this.invoiceClaimDialog.visible = true;
|
this.invoiceClaimDialog.visible = true;
|
||||||
},
|
this.invoiceClaimDialog.loading = false;
|
||||||
invoicePoolQueryApi(params) {
|
|
||||||
return queryInvoicePool(params);
|
|
||||||
},
|
|
||||||
async handleInvoiceClaimConfirm(rows) {
|
|
||||||
// 统一票池行附件字段为复数 attachmentsJson,认领请求契约是单数 attachmentJson,中转处归一
|
|
||||||
this.invoiceClaimDialog.selected = rows.map(row => ({
|
|
||||||
...row,
|
|
||||||
attachmentJson: row.attachmentJson || row.attachmentsJson,
|
|
||||||
}));
|
|
||||||
await this.confirmInvoiceClaims();
|
|
||||||
},
|
},
|
||||||
async confirmInvoiceClaims() {
|
async confirmInvoiceClaims() {
|
||||||
if (!this.invoiceClaimDialog.selected.length) {
|
if (!this.invoiceClaimDialog.selected.length) {
|
||||||
@@ -2220,11 +2300,7 @@ export default {
|
|||||||
if (Number(this.form.settlementAmount || 0) > 0) {
|
if (Number(this.form.settlementAmount || 0) > 0) {
|
||||||
remaining = Math.max(0, remaining - matchedAmount);
|
remaining = Math.max(0, remaining - matchedAmount);
|
||||||
}
|
}
|
||||||
return {
|
return { ...row, matchedAmount };
|
||||||
...row,
|
|
||||||
invoiceType: row.invoiceTypeName || row.invoiceType || '',
|
|
||||||
matchedAmount,
|
|
||||||
};
|
|
||||||
})
|
})
|
||||||
.filter(row => row.matchedAmount > 0);
|
.filter(row => row.matchedAmount > 0);
|
||||||
if (!invoices.length) {
|
if (!invoices.length) {
|
||||||
@@ -2310,38 +2386,14 @@ export default {
|
|||||||
const attachment = this.invoiceAttachment(row);
|
const attachment = this.invoiceAttachment(row);
|
||||||
return attachment.originalName || attachment.name || `${row.invoiceNo || '发票'}.pdf`;
|
return attachment.originalName || attachment.name || `${row.invoiceNo || '发票'}.pdf`;
|
||||||
},
|
},
|
||||||
async viewInvoiceAttachment(row) {
|
viewInvoiceAttachment(row) {
|
||||||
const attachment = this.invoiceAttachment(row);
|
|
||||||
// 金蝶侧附件(path 型)经后端代理 A801-2 预览,OSS 直链维持 window.open
|
|
||||||
if (isKingdeePathAttachment(attachment)) {
|
|
||||||
if (this.kingdeeAttachmentBusy) return;
|
|
||||||
this.kingdeeAttachmentBusy = true;
|
|
||||||
try {
|
|
||||||
await viewKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
|
|
||||||
} finally {
|
|
||||||
this.kingdeeAttachmentBusy = false;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const url = this.invoiceAttachmentUrl(row);
|
const url = this.invoiceAttachmentUrl(row);
|
||||||
if (!url) return this.$message.warning('当前发票暂无可查看附件');
|
if (!url) return this.$message.warning('当前Mock发票暂无可查看附件');
|
||||||
window.open(url, '_blank');
|
window.open(url, '_blank');
|
||||||
},
|
},
|
||||||
async downloadInvoiceAttachment(row) {
|
downloadInvoiceAttachment(row) {
|
||||||
const attachment = this.invoiceAttachment(row);
|
|
||||||
// 金蝶侧附件(path 型)经后端代理 A801-2 下载,OSS 直链维持前端直连下载
|
|
||||||
if (isKingdeePathAttachment(attachment)) {
|
|
||||||
if (this.kingdeeAttachmentBusy) return;
|
|
||||||
this.kingdeeAttachmentBusy = true;
|
|
||||||
try {
|
|
||||||
await downloadKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
|
|
||||||
} finally {
|
|
||||||
this.kingdeeAttachmentBusy = false;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const url = this.invoiceAttachmentUrl(row);
|
const url = this.invoiceAttachmentUrl(row);
|
||||||
if (!url) return this.$message.warning('当前发票暂无可下载附件');
|
if (!url) return this.$message.warning('当前Mock发票暂无可下载附件');
|
||||||
downloadFileByUrl(url, this.invoiceAttachmentName(row));
|
downloadFileByUrl(url, this.invoiceAttachmentName(row));
|
||||||
},
|
},
|
||||||
buildSavePayload() {
|
buildSavePayload() {
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
format="YYYY-MM-DD"
|
format="YYYY-MM-DD"
|
||||||
:disabled="!editable || form.currency === 'RMB'"
|
:disabled="!editable || form.currency === 'RMB'"
|
||||||
placeholder="请选择"
|
placeholder="请选择"
|
||||||
@change="handleExchangeRateDateChange"
|
@change="recalculateLocalAmount"
|
||||||
/>
|
/>
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-else-if="field.type === 'number'"
|
v-else-if="field.type === 'number'"
|
||||||
@@ -934,7 +934,6 @@ import {
|
|||||||
submit,
|
submit,
|
||||||
} from '@/api/settlement/preSettlement';
|
} from '@/api/settlement/preSettlement';
|
||||||
import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
|
import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
|
||||||
import { getBfiExchangeRate } from '@/api/base/currency';
|
|
||||||
import { getDictionary } from '@/api/system/dictbiz';
|
import { getDictionary } from '@/api/system/dictbiz';
|
||||||
import {
|
import {
|
||||||
emptyPreSettlementForm,
|
emptyPreSettlementForm,
|
||||||
@@ -1243,11 +1242,7 @@ export default {
|
|||||||
await this.loadFeeCategoryOptions();
|
await this.loadFeeCategoryOptions();
|
||||||
await this.loadTransportTypeOptions();
|
await this.loadTransportTypeOptions();
|
||||||
if (this.recordId) await this.loadDetail();
|
if (this.recordId) await this.loadDetail();
|
||||||
else if (this.initialData) {
|
else if (this.initialData) await this.applyInitialData();
|
||||||
await this.applyInitialData();
|
|
||||||
this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
|
|
||||||
await this.fetchBfiExchangeRate();
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
async applyInitialData() {
|
async applyInitialData() {
|
||||||
const rows = Array.isArray(this.initialData?.rows) ? this.initialData.rows : [];
|
const rows = Array.isArray(this.initialData?.rows) ? this.initialData.rows : [];
|
||||||
@@ -1532,12 +1527,7 @@ export default {
|
|||||||
this.form.settlementType = contract.settlementType || 'payable';
|
this.form.settlementType = contract.settlementType || 'payable';
|
||||||
this.form.payerName = contract.partyA;
|
this.form.payerName = contract.partyA;
|
||||||
this.form.payeeName = contract.partyB;
|
this.form.payeeName = contract.partyB;
|
||||||
this.form.currency = contract.settlementCurrency || 'RMB';
|
|
||||||
this.summaryFees = [];
|
this.summaryFees = [];
|
||||||
if (this.form.currency !== 'RMB') {
|
|
||||||
this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
|
|
||||||
this.fetchBfiExchangeRate();
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
async saveDraft(shouldSubmit) {
|
async saveDraft(shouldSubmit) {
|
||||||
await this.$refs.formRef?.validate();
|
await this.$refs.formRef?.validate();
|
||||||
@@ -1804,26 +1794,6 @@ export default {
|
|||||||
.toFixed(2)
|
.toFixed(2)
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
handleExchangeRateDateChange() {
|
|
||||||
this.fetchBfiExchangeRate();
|
|
||||||
this.recalculateLocalAmount();
|
|
||||||
},
|
|
||||||
async fetchBfiExchangeRate() {
|
|
||||||
if (!this.form.currency || this.form.currency === 'RMB') return;
|
|
||||||
if (!this.form.exchangeRateDate) return;
|
|
||||||
try {
|
|
||||||
const { data } = await getBfiExchangeRate(this.form.currency, this.form.exchangeRateDate);
|
|
||||||
const rateData = data?.data;
|
|
||||||
if (rateData?.excval != null) {
|
|
||||||
this.form.exchangeRate = Number(rateData.excval);
|
|
||||||
this.recalculateLocalAmount();
|
|
||||||
} else {
|
|
||||||
this.$message.warning(`未查询到 ${this.form.currency} 的BFI汇率数据`);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
this.$message.warning('查询BFI汇率失败,请手动输入结算汇率');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
recalculateLocalAmount() {
|
recalculateLocalAmount() {
|
||||||
const rate = this.form.currency === 'RMB' ? 1 : Number(this.form.exchangeRate || 0);
|
const rate = this.form.currency === 'RMB' ? 1 : Number(this.form.exchangeRate || 0);
|
||||||
this.form.localSettlementAmount = (Number(this.form.settlementAmount || 0) * rate).toFixed(2);
|
this.form.localSettlementAmount = (Number(this.form.settlementAmount || 0) * rate).toFixed(2);
|
||||||
|
|||||||
@@ -379,16 +379,7 @@ export default {
|
|||||||
const response = await api.syncKingdee(row.id);
|
const response = await api.syncKingdee(row.id);
|
||||||
const data = this.unwrapData(response);
|
const data = this.unwrapData(response);
|
||||||
this.$message.success(`同步成功,金蝶单据号:${data}`);
|
this.$message.success(`同步成功,金蝶单据号:${data}`);
|
||||||
await this.loadTable();
|
this.loadTable();
|
||||||
// 附件联带同步提示:同步成功但附件未全部上传时追加 warning,重推即自动补传
|
|
||||||
const freshRow = (this.rows || []).find(item => String(item.id) === String(row.id));
|
|
||||||
if (freshRow && ['pending', 'partial'].includes(freshRow.attachmentSyncStatus)) {
|
|
||||||
this.$message({
|
|
||||||
type: 'warning',
|
|
||||||
message: '该单附件未全部上传,可重推补传',
|
|
||||||
duration: 8000,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
async openPaymentDialog() {
|
async openPaymentDialog() {
|
||||||
if (!this.selection.length) return this.$message.warning('请至少选择一条正式结算单');
|
if (!this.selection.length) return this.$message.warning('请至少选择一条正式结算单');
|
||||||
|
|||||||
@@ -169,12 +169,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<div
|
|
||||||
v-if="!latestChangeLoading && !latestChangeRows.length"
|
|
||||||
class="settlement-detail-page__empty"
|
|
||||||
>
|
|
||||||
暂无变更记录
|
|
||||||
</div>
|
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
</div>
|
</div>
|
||||||
@@ -2734,12 +2728,6 @@ export default {
|
|||||||
padding: 16px 0;
|
padding: 16px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.settlement-detail-page__empty {
|
|
||||||
padding: 24px 0;
|
|
||||||
color: #909399;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.settlement-detail-page__dialog-form {
|
.settlement-detail-page__dialog-form {
|
||||||
padding: 16px 20px;
|
padding: 16px 20px;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
|
|||||||
@@ -22,6 +22,14 @@
|
|||||||
@tree-load="treeLoad"
|
@tree-load="treeLoad"
|
||||||
>
|
>
|
||||||
<template #menu-left>
|
<template #menu-left>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
plain
|
||||||
|
:loading="iamSyncLoading"
|
||||||
|
v-if="userInfo.authority.includes('admin')"
|
||||||
|
@click="handleIamOrganizationSync"
|
||||||
|
>同步组织
|
||||||
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="danger"
|
type="danger"
|
||||||
icon="el-icon-delete"
|
icon="el-icon-delete"
|
||||||
@@ -120,7 +128,15 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { getLazyList, remove, update, add, getDept, getDeptTree } from '@/api/system/dept';
|
import {
|
||||||
|
getLazyList,
|
||||||
|
remove,
|
||||||
|
update,
|
||||||
|
add,
|
||||||
|
getDept,
|
||||||
|
getDeptTree,
|
||||||
|
syncIamOrganizations,
|
||||||
|
} from '@/api/system/dept';
|
||||||
import { getLeaderList } from '@/api/system/user';
|
import { getLeaderList } from '@/api/system/user';
|
||||||
import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
|
import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
|
||||||
import { mapGetters } from 'vuex';
|
import { mapGetters } from 'vuex';
|
||||||
@@ -152,6 +168,7 @@ export default {
|
|||||||
selectionList: [],
|
selectionList: [],
|
||||||
query: {},
|
query: {},
|
||||||
loading: true,
|
loading: true,
|
||||||
|
iamSyncLoading: false,
|
||||||
parentId: 0,
|
parentId: 0,
|
||||||
page: {
|
page: {
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
@@ -691,6 +708,26 @@ export default {
|
|||||||
done(row);
|
done(row);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
handleIamOrganizationSync() {
|
||||||
|
this.$confirm('确定从IAM同步组织信息?', '提示', {
|
||||||
|
confirmButtonText: '确定',
|
||||||
|
cancelButtonText: '取消',
|
||||||
|
type: 'warning',
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
this.iamSyncLoading = true;
|
||||||
|
return syncIamOrganizations();
|
||||||
|
})
|
||||||
|
.then(res => {
|
||||||
|
const count = res?.data?.data ?? 0;
|
||||||
|
this.$message.success(`IAM组织同步完成,共处理${count}条`);
|
||||||
|
this.parentId = 0;
|
||||||
|
this.onLoad(this.page, this.query);
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
this.iamSyncLoading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
handleDelete() {
|
handleDelete() {
|
||||||
if (this.selectionList.length === 0) {
|
if (this.selectionList.length === 0) {
|
||||||
this.$message.warning('请选择至少一条数据');
|
this.$message.warning('请选择至少一条数据');
|
||||||
|
|||||||
@@ -56,6 +56,14 @@
|
|||||||
@click="handleAudit"
|
@click="handleAudit"
|
||||||
>审 核
|
>审 核
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
plain
|
||||||
|
:loading="iamSyncLoading"
|
||||||
|
v-if="userInfo.authority.includes('admin') && !auditMode"
|
||||||
|
@click="handleIamSync"
|
||||||
|
>同步人员
|
||||||
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="success"
|
type="success"
|
||||||
plain
|
plain
|
||||||
@@ -348,6 +356,7 @@ import {
|
|||||||
remove,
|
remove,
|
||||||
update,
|
update,
|
||||||
add,
|
add,
|
||||||
|
syncIamAccounts,
|
||||||
grant,
|
grant,
|
||||||
resetPassword,
|
resetPassword,
|
||||||
setPassword,
|
setPassword,
|
||||||
@@ -393,6 +402,7 @@ export default {
|
|||||||
selectionList: [],
|
selectionList: [],
|
||||||
query: {},
|
query: {},
|
||||||
loading: true,
|
loading: true,
|
||||||
|
iamSyncLoading: false,
|
||||||
page: {
|
page: {
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
currentPage: 1,
|
currentPage: 1,
|
||||||
@@ -553,6 +563,25 @@ export default {
|
|||||||
this.handleExport();
|
this.handleExport();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
handleIamSync() {
|
||||||
|
this.$confirm('确定从IAM同步人员信息?', '提示', {
|
||||||
|
confirmButtonText: '确定',
|
||||||
|
cancelButtonText: '取消',
|
||||||
|
type: 'warning',
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
this.iamSyncLoading = true;
|
||||||
|
return syncIamAccounts();
|
||||||
|
})
|
||||||
|
.then(res => {
|
||||||
|
const count = res?.data?.data ?? 0;
|
||||||
|
this.$message.success(`IAM人员同步完成,共处理${count}条`);
|
||||||
|
this.onLoad(this.page, this.query);
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
this.iamSyncLoading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
handleSetLeader(row) {
|
handleSetLeader(row) {
|
||||||
const tip = row.isLeader === 1 ? '确定取消用户的主管职务?' : '确定设置用户为主管职务?';
|
const tip = row.isLeader === 1 ? '确定取消用户的主管职务?' : '确定设置用户为主管职务?';
|
||||||
const message = row.isLeader === 1 ? '取消主管成功!' : '设置主管成功!';
|
const message = row.isLeader === 1 ? '取消主管成功!' : '设置主管成功!';
|
||||||
|
|||||||
@@ -109,12 +109,6 @@
|
|||||||
{{ row.status === 1 ? '启用' : '停用' }}
|
{{ row.status === 1 ? '启用' : '停用' }}
|
||||||
</el-tag>
|
</el-tag>
|
||||||
</template>
|
</template>
|
||||||
<template #kingdeeStatus="{ row }">
|
|
||||||
<el-tag v-if="row.kingdeeStatus === 'synced'" type="success">已推送</el-tag>
|
|
||||||
<el-tag v-else-if="row.kingdeeStatus === 'exist'" type="primary">金蝶已有</el-tag>
|
|
||||||
<el-tag v-else-if="row.kingdeeStatus === 'failed'" type="danger">推送失败</el-tag>
|
|
||||||
<el-tag v-else type="info">未推送</el-tag>
|
|
||||||
</template>
|
|
||||||
<template #menu="{ row }">
|
<template #menu="{ row }">
|
||||||
<el-link
|
<el-link
|
||||||
type="primary"
|
type="primary"
|
||||||
@@ -171,17 +165,6 @@
|
|||||||
>
|
>
|
||||||
{{ row.status === 1 ? '停用' : '启用' }}
|
{{ row.status === 1 ? '停用' : '启用' }}
|
||||||
</el-link>
|
</el-link>
|
||||||
<el-link
|
|
||||||
type="primary"
|
|
||||||
v-if="
|
|
||||||
hasPermission('customer_archive_sync') &&
|
|
||||||
row.approvalStatus === 'approved' &&
|
|
||||||
row.kingdeeStatus === 'failed'
|
|
||||||
"
|
|
||||||
@click="handleSyncKingdee(row)"
|
|
||||||
>
|
|
||||||
同步金蝶
|
|
||||||
</el-link>
|
|
||||||
<el-link
|
<el-link
|
||||||
type="danger"
|
type="danger"
|
||||||
v-if="hasPermission('customer_archive_delete') && row.approvalStatus === 'draft'"
|
v-if="hasPermission('customer_archive_delete') && row.approvalStatus === 'draft'"
|
||||||
@@ -283,7 +266,6 @@
|
|||||||
placeholder="请输入"
|
placeholder="请输入"
|
||||||
maxlength="18"
|
maxlength="18"
|
||||||
show-word-limit
|
show-word-limit
|
||||||
:disabled="kingdeeLocked && Boolean(archiveForm.id)"
|
|
||||||
@input="
|
@input="
|
||||||
archiveForm.unifiedCreditCode = String(
|
archiveForm.unifiedCreditCode = String(
|
||||||
archiveForm.unifiedCreditCode || ''
|
archiveForm.unifiedCreditCode || ''
|
||||||
@@ -299,7 +281,6 @@
|
|||||||
placeholder="请输入"
|
placeholder="请输入"
|
||||||
maxlength="100"
|
maxlength="100"
|
||||||
show-word-limit
|
show-word-limit
|
||||||
:disabled="kingdeeLocked"
|
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -323,22 +304,12 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="企业法人" prop="legalPerson">
|
<el-form-item label="企业法人" prop="legalPerson">
|
||||||
<el-input
|
<el-input v-model="archiveForm.legalPerson" maxlength="10" show-word-limit />
|
||||||
v-model="archiveForm.legalPerson"
|
|
||||||
maxlength="10"
|
|
||||||
show-word-limit
|
|
||||||
:disabled="kingdeeLocked"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="经营范围" prop="businessScope" required>
|
<el-form-item label="经营范围" prop="businessScope" required>
|
||||||
<el-select
|
<el-select v-model="archiveForm.businessScope" multiple filterable clearable>
|
||||||
v-model="archiveForm.businessScope"
|
|
||||||
multiple
|
|
||||||
filterable
|
|
||||||
clearable
|
|
||||||
>
|
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in businessScopeOptions"
|
v-for="item in businessScopeOptions"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
@@ -475,7 +446,6 @@
|
|||||||
<el-input
|
<el-input
|
||||||
v-model="archiveForm.registeredCapital"
|
v-model="archiveForm.registeredCapital"
|
||||||
maxlength="18"
|
maxlength="18"
|
||||||
:disabled="kingdeeLocked"
|
|
||||||
@input="value => handleDecimalInput('registeredCapital', value)"
|
@input="value => handleDecimalInput('registeredCapital', value)"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -1522,8 +1492,6 @@ import {
|
|||||||
remove,
|
remove,
|
||||||
getScoreTemplate,
|
getScoreTemplate,
|
||||||
recognizeBusinessLicenseOcr,
|
recognizeBusinessLicenseOcr,
|
||||||
queryKingdeeCustomer,
|
|
||||||
syncKingdee,
|
|
||||||
} from '@/api/vehicle/customer-archive';
|
} from '@/api/vehicle/customer-archive';
|
||||||
import {
|
import {
|
||||||
getList as getCreditScoreQuantificationList,
|
getList as getCreditScoreQuantificationList,
|
||||||
@@ -1597,13 +1565,23 @@ export default {
|
|||||||
const code = String(value || '')
|
const code = String(value || '')
|
||||||
.trim()
|
.trim()
|
||||||
.toUpperCase();
|
.toUpperCase();
|
||||||
|
const charset = '0123456789ABCDEFGHJKLMNPQRTUWXY';
|
||||||
|
const weights = [1, 3, 9, 27, 19, 26, 16, 17, 20, 29, 25, 13, 8, 24, 10, 30, 28];
|
||||||
if (!code) {
|
if (!code) {
|
||||||
callback();
|
callback();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const error = this.unifiedCreditCodeError(code);
|
if (code.length !== 18 || ![...code].every(char => charset.includes(char))) {
|
||||||
if (error) {
|
callback(new Error('统一社会信用代码必须为18位有效字符'));
|
||||||
callback(new Error(error));
|
return;
|
||||||
|
}
|
||||||
|
const sum = [...code.slice(0, 17)].reduce(
|
||||||
|
(total, char, index) => total + charset.indexOf(char) * weights[index],
|
||||||
|
0
|
||||||
|
);
|
||||||
|
const checkCode = charset[(31 - (sum % 31)) % 31];
|
||||||
|
if (code[17] !== checkCode) {
|
||||||
|
callback(new Error('统一社会信用代码校验码错误'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
callback();
|
callback();
|
||||||
@@ -1643,8 +1621,6 @@ export default {
|
|||||||
originalAccessType: '',
|
originalAccessType: '',
|
||||||
activeTab: 'scores',
|
activeTab: 'scores',
|
||||||
archiveForm: this.emptyArchive(),
|
archiveForm: this.emptyArchive(),
|
||||||
kingdeeBlocked: false,
|
|
||||||
kingdeeQueryTimer: null,
|
|
||||||
currentScore: { details: [] },
|
currentScore: { details: [] },
|
||||||
scoreRecordIndex: -1,
|
scoreRecordIndex: -1,
|
||||||
scoreAttachmentFiles: [],
|
scoreAttachmentFiles: [],
|
||||||
@@ -1991,12 +1967,6 @@ export default {
|
|||||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||||
minWidth: 170,
|
minWidth: 170,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: '金蝶同步状态',
|
|
||||||
prop: 'kingdeeStatus',
|
|
||||||
slot: true,
|
|
||||||
minWidth: 110,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: '状态',
|
label: '状态',
|
||||||
prop: 'status',
|
prop: 'status',
|
||||||
@@ -2034,9 +2004,6 @@ export default {
|
|||||||
const authority = this.userInfo.authority || '';
|
const authority = this.userInfo.authority || '';
|
||||||
return authority.includes('admin');
|
return authority.includes('admin');
|
||||||
},
|
},
|
||||||
kingdeeLocked() {
|
|
||||||
return this.archiveForm.kingdeeStatus === 'exist';
|
|
||||||
},
|
|
||||||
permissionList() {
|
permissionList() {
|
||||||
return {
|
return {
|
||||||
addBtn: false,
|
addBtn: false,
|
||||||
@@ -2212,9 +2179,6 @@ export default {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
'archiveForm.unifiedCreditCode'(val) {
|
|
||||||
this.handleKingdeeCreditCodeChange(val);
|
|
||||||
},
|
|
||||||
'archiveForm.registeredDetailAddress'() {
|
'archiveForm.registeredDetailAddress'() {
|
||||||
this.$nextTick(() => this.checkOverflow('registeredDetailInput', 'registeredDetailOverflow'));
|
this.$nextTick(() => this.checkOverflow('registeredDetailInput', 'registeredDetailOverflow'));
|
||||||
},
|
},
|
||||||
@@ -2226,119 +2190,6 @@ export default {
|
|||||||
hasPermission(code) {
|
hasPermission(code) {
|
||||||
return this.isAdmin || this.validData(this.permission[code], false);
|
return this.isAdmin || this.validData(this.permission[code], false);
|
||||||
},
|
},
|
||||||
unifiedCreditCodeError(value) {
|
|
||||||
const code = String(value || '')
|
|
||||||
.trim()
|
|
||||||
.toUpperCase();
|
|
||||||
const charset = '0123456789ABCDEFGHJKLMNPQRTUWXY';
|
|
||||||
const weights = [1, 3, 9, 27, 19, 26, 16, 17, 20, 29, 25, 13, 8, 24, 10, 30, 28];
|
|
||||||
if (code.length !== 18 || ![...code].every(char => charset.includes(char))) {
|
|
||||||
return '统一社会信用代码必须为18位有效字符';
|
|
||||||
}
|
|
||||||
const sum = [...code.slice(0, 17)].reduce(
|
|
||||||
(total, char, index) => total + charset.indexOf(char) * weights[index],
|
|
||||||
0
|
|
||||||
);
|
|
||||||
const checkCode = charset[(31 - (sum % 31)) % 31];
|
|
||||||
if (code[17] !== checkCode) {
|
|
||||||
return '统一社会信用代码校验码错误';
|
|
||||||
}
|
|
||||||
return '';
|
|
||||||
},
|
|
||||||
resetKingdeeQueryState() {
|
|
||||||
this.kingdeeBlocked = false;
|
|
||||||
clearTimeout(this.kingdeeQueryTimer);
|
|
||||||
this.kingdeeQueryTimer = null;
|
|
||||||
},
|
|
||||||
// 新增态下重新输入统一社会信用代码后,此前金蝶回填的数据即失效,重置回填状态并允许对新代码重新查询
|
|
||||||
resetKingdeeBackfill() {
|
|
||||||
const form = this.archiveForm;
|
|
||||||
form.kingdeeStatus = 'none';
|
|
||||||
form.fullName = '';
|
|
||||||
form.legalPerson = '';
|
|
||||||
form.registeredCapital = '';
|
|
||||||
form.registeredDetailAddress = '';
|
|
||||||
form.businessScope = [];
|
|
||||||
form.businessTermType = '固定期限';
|
|
||||||
form.businessEndDate = '';
|
|
||||||
},
|
|
||||||
// 新增态下统一社会信用代码录入完成后自动查询金蝶(A902-1),防抖 500ms;
|
|
||||||
// 代码一经变化即重新查询(含改回历史代码),不做同码去重
|
|
||||||
handleKingdeeCreditCodeChange(val) {
|
|
||||||
this.kingdeeBlocked = false;
|
|
||||||
if (this.readonly || this.archiveForm.id) return;
|
|
||||||
if (this.archiveForm.kingdeeStatus === 'exist') {
|
|
||||||
this.resetKingdeeBackfill();
|
|
||||||
}
|
|
||||||
const code = String(val || '')
|
|
||||||
.trim()
|
|
||||||
.toUpperCase();
|
|
||||||
if (code.length !== 18 || this.unifiedCreditCodeError(code)) return;
|
|
||||||
clearTimeout(this.kingdeeQueryTimer);
|
|
||||||
this.kingdeeQueryTimer = setTimeout(() => this.fetchKingdeeCustomer(code), 500);
|
|
||||||
},
|
|
||||||
async fetchKingdeeCustomer(code) {
|
|
||||||
let customer = null;
|
|
||||||
try {
|
|
||||||
const res = await queryKingdeeCustomer(code);
|
|
||||||
customer = res?.data?.data || null;
|
|
||||||
} catch (error) {
|
|
||||||
this.$message.warning('金蝶查询失败,可继续填写,审批通过后系统将自动复查');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// 防止响应返回时用户已修改代码
|
|
||||||
if (String(this.archiveForm.unifiedCreditCode || '').trim().toUpperCase() !== code) return;
|
|
||||||
// 金蝶不存在(rows 为空,data 为 null 或空对象):静默返回,正常填写,不做提示
|
|
||||||
if (!customer || !customer.status) return;
|
|
||||||
if (customer.status === 'C') {
|
|
||||||
this.applyKingdeeCustomer(customer);
|
|
||||||
this.$alert(
|
|
||||||
'金蝶已创建该客户,将获取金蝶的工商信息,相关字段已自动回填并锁定。如信用代码有误,可直接修改,系统将重新查询。',
|
|
||||||
'提示',
|
|
||||||
{
|
|
||||||
confirmButtonText: '确定',
|
|
||||||
}
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
this.kingdeeBlocked = true;
|
|
||||||
this.$alert('金蝶审核中,请稍后重新添加。', '提示', { confirmButtonText: '确定' });
|
|
||||||
}
|
|
||||||
},
|
|
||||||
applyKingdeeCustomer(customer) {
|
|
||||||
const form = this.archiveForm;
|
|
||||||
form.kingdeeStatus = 'exist';
|
|
||||||
// 工商信息以金蝶为准,直接覆盖(后续字段锁定)
|
|
||||||
if (customer.name) form.fullName = customer.name;
|
|
||||||
if (customer.artificialperson) form.legalPerson = customer.artificialperson;
|
|
||||||
if (customer.bizpartnerAddress) form.registeredDetailAddress = customer.bizpartnerAddress;
|
|
||||||
if (customer.regcapital) {
|
|
||||||
const capital = String(customer.regcapital).replace(/,/g, '').match(/\d+(?:\.\d+)?/);
|
|
||||||
if (capital) form.registeredCapital = capital[0];
|
|
||||||
}
|
|
||||||
if (customer.businessterm) this.applyBusinessTermRecognition(customer.businessterm);
|
|
||||||
if (customer.businessscope) {
|
|
||||||
const matchedScopes = this.businessScopeOptions
|
|
||||||
.filter(
|
|
||||||
item =>
|
|
||||||
customer.businessscope.includes(item.label) ||
|
|
||||||
customer.businessscope.includes(item.value)
|
|
||||||
)
|
|
||||||
.map(item => item.value);
|
|
||||||
if (matchedScopes.length) form.businessScope = matchedScopes;
|
|
||||||
}
|
|
||||||
if (!form.shortName && customer.simplename) form.shortName = customer.simplename;
|
|
||||||
this.$nextTick(() => {
|
|
||||||
[
|
|
||||||
'unifiedCreditCode',
|
|
||||||
'fullName',
|
|
||||||
'legalPerson',
|
|
||||||
'registeredCapital',
|
|
||||||
'businessEndDate',
|
|
||||||
'businessScope',
|
|
||||||
'registeredDetailAddress',
|
|
||||||
].forEach(prop => this.$refs.archiveForm?.validateField(prop));
|
|
||||||
});
|
|
||||||
},
|
|
||||||
// 检测输入框文本是否溢出,仅溢出时才允许 tooltip 显示完整地址
|
// 检测输入框文本是否溢出,仅溢出时才允许 tooltip 显示完整地址
|
||||||
checkOverflow(refName, flag) {
|
checkOverflow(refName, flag) {
|
||||||
const inst = this.$refs[refName];
|
const inst = this.$refs[refName];
|
||||||
@@ -2368,9 +2219,6 @@ export default {
|
|||||||
invoices: [],
|
invoices: [],
|
||||||
scores: [],
|
scores: [],
|
||||||
changeRecords: [],
|
changeRecords: [],
|
||||||
kingdeeStatus: 'none',
|
|
||||||
kingdeeFailReason: '',
|
|
||||||
kingdeeSyncTime: null,
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
getDetailList(type) {
|
getDetailList(type) {
|
||||||
@@ -4071,7 +3919,6 @@ export default {
|
|||||||
}
|
}
|
||||||
this.archiveForm = this.emptyArchive();
|
this.archiveForm = this.emptyArchive();
|
||||||
this.originalAccessType = '';
|
this.originalAccessType = '';
|
||||||
this.resetKingdeeQueryState();
|
|
||||||
this.qualificationFiles = [];
|
this.qualificationFiles = [];
|
||||||
this.qualificationUploadFiles = [];
|
this.qualificationUploadFiles = [];
|
||||||
this.ocrQualificationUploadFiles = [];
|
this.ocrQualificationUploadFiles = [];
|
||||||
@@ -4080,7 +3927,6 @@ export default {
|
|||||||
},
|
},
|
||||||
resetArchive() {
|
resetArchive() {
|
||||||
this.readonly = false;
|
this.readonly = false;
|
||||||
this.resetKingdeeQueryState();
|
|
||||||
this.changeRecordDetailVisible = false;
|
this.changeRecordDetailVisible = false;
|
||||||
this.changeRecordDetail = null;
|
this.changeRecordDetail = null;
|
||||||
this.changeRecordDetailRows = [];
|
this.changeRecordDetailRows = [];
|
||||||
@@ -4201,10 +4047,6 @@ export default {
|
|||||||
return archive;
|
return archive;
|
||||||
},
|
},
|
||||||
saveArchive() {
|
saveArchive() {
|
||||||
if (this.kingdeeBlocked) {
|
|
||||||
this.$message.warning('金蝶审核中,请稍后重新添加');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.$refs.archiveForm.validate(valid => {
|
this.$refs.archiveForm.validate(valid => {
|
||||||
if (!valid) {
|
if (!valid) {
|
||||||
this.$message.warning('请先完整填写必填项');
|
this.$message.warning('请先完整填写必填项');
|
||||||
@@ -4218,10 +4060,6 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
saveAndSubmitArchive() {
|
saveAndSubmitArchive() {
|
||||||
if (this.kingdeeBlocked) {
|
|
||||||
this.$message.warning('金蝶审核中,请稍后重新添加');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.$refs.archiveForm.validate(valid => {
|
this.$refs.archiveForm.validate(valid => {
|
||||||
if (!valid) {
|
if (!valid) {
|
||||||
this.$message.warning('请先完整填写必填项');
|
this.$message.warning('请先完整填写必填项');
|
||||||
@@ -4869,25 +4707,6 @@ export default {
|
|||||||
this.$message({ type: 'success', message: '审核通过!' });
|
this.$message({ type: 'success', message: '审核通过!' });
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleSyncKingdee(row) {
|
|
||||||
this.$confirm('是否确认推送金蝶?', '提示', {
|
|
||||||
confirmButtonText: '确定',
|
|
||||||
cancelButtonText: '取消',
|
|
||||||
type: 'warning',
|
|
||||||
})
|
|
||||||
.then(() => syncKingdee(row.id))
|
|
||||||
.then(res => {
|
|
||||||
const archive = res?.data?.data || {};
|
|
||||||
if (archive.kingdeeStatus === 'synced') {
|
|
||||||
this.$message.success('推送成功,金蝶客户编码与客商编号一致');
|
|
||||||
} else if (archive.kingdeeStatus === 'exist') {
|
|
||||||
this.$message.info('金蝶已有该客商档案,无需推送');
|
|
||||||
} else {
|
|
||||||
this.$message.warning(`推送失败:${archive.kingdeeFailReason || '未知原因'}`);
|
|
||||||
}
|
|
||||||
this.onLoad(this.page);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
handleReject(row) {
|
handleReject(row) {
|
||||||
this.$confirm('是否确认审核不通过?', '提示', {
|
this.$confirm('是否确认审核不通过?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
@@ -4939,7 +4758,7 @@ export default {
|
|||||||
},
|
},
|
||||||
selectionClear() {
|
selectionClear() {
|
||||||
this.selectionList = [];
|
this.selectionList = [];
|
||||||
this.$refs.crud.toggleSelection();
|
this.$refs.crud?.toggleSelection();
|
||||||
},
|
},
|
||||||
currentChange(currentPage) {
|
currentChange(currentPage) {
|
||||||
this.page.currentPage = currentPage;
|
this.page.currentPage = currentPage;
|
||||||
|
|||||||
Reference in New Issue
Block a user