Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 weicw
|
ad487b1e51 | ||
|
weicw
|
63722585c0 | ||
|
weicw
|
6bb1a91be8 | ||
 b2894lxlx
|
d3ba0ce38b | ||
|
b2894lxlx
|
f5be5245d6 | ||
|
b2894lxlx
|
baf54efb7b | ||
|
weicw
|
e7ba220b34 | ||
|
weicw
|
e79e50bf40 | ||
|
weicw
|
a6b4a7b2d1 | ||
|
weicw
|
2be6a559e7 | ||
|
weicw
|
523a042fa9 | ||
|
weicw
|
07af103ecb | ||
|
weicw
|
6e48fa50cf | ||
|
weicw
|
8734c27fd3 | ||
|
b2894lxlx
|
7ff2b3fe28 | ||
|
b2894lxlx
|
17d2766f82 | ||
|
weicw
|
32065b9c54 | ||
|
weicw
|
799a87641e | ||
|
weicw
|
28baa69e8f | ||
|
weicw
|
4ed80268b4 | ||
|
weicw
|
30c59c2acb | ||
|
weicw
|
39560bde79 |
@@ -95,3 +95,5 @@ export const exportImportFailures = data =>
|
||||
});
|
||||
export const confirmImport = data =>
|
||||
request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data, timeout: 120000 });
|
||||
export const checkImportDuplicates = data =>
|
||||
request({ url: `${baseUrl}/import-batch/duplicates`, method: 'post', data, timeout: 120000 });
|
||||
|
||||
@@ -91,3 +91,14 @@ export const recognizeBaiduOcr = (imageUrl, type, side = '') => {
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
export const recognizeQualificationCertificateOcr = imageUrl => {
|
||||
return request({
|
||||
url: '/blade-transport/baidu-ocr/qualification-certificate',
|
||||
method: 'post',
|
||||
timeout: 60000,
|
||||
params: {
|
||||
imageUrl,
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<el-dialog v-model="visible" :title="title" width="92%" append-to-body align-center destroy-on-close @open="handleOpen">
|
||||
<el-form class="kingdee-pool-dialog__form" :model="query" inline label-position="right" label-width="120px" @submit.prevent>
|
||||
<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 placeholder="请输入" @keyup.enter="handleQuery" />
|
||||
<el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="开票日期">
|
||||
<el-date-picker
|
||||
@@ -10,16 +10,15 @@
|
||||
type="daterange"
|
||||
value-format="YYYY-MM-DD"
|
||||
format="YYYY-MM-DD"
|
||||
range-separator="-"
|
||||
start-placeholder="请选择"
|
||||
end-placeholder="请选择"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="开票单位">
|
||||
<el-input v-model="query.salerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
|
||||
<el-input v-model="query.salerName" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="受票单位">
|
||||
<el-input v-model="query.buyerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
|
||||
<el-input v-model="query.buyerName" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="开票单位（销方）">
|
||||
<el-select
|
||||
@@ -94,9 +93,6 @@
|
||||
<el-form-item>
|
||||
<el-button :disabled="loading" @click="resetQuery">重置</el-button>
|
||||
<el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
|
||||
<el-tooltip content="按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找" placement="top">
|
||||
<el-icon class="kingdee-pool-dialog__query-tip"><QuestionFilled /></el-icon>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table
|
||||
@@ -105,7 +101,7 @@
|
||||
:data="rows"
|
||||
:row-key="rowKey"
|
||||
border
|
||||
max-height="50vh"
|
||||
height="520"
|
||||
:highlight-current-row="!multiple"
|
||||
@selection-change="selection => (selected = selection)"
|
||||
@row-dblclick="handleRowDblclick"
|
||||
@@ -122,7 +118,6 @@
|
||||
</el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column type="index" label="序号" width="70" align="center" :index="indexMethod" />
|
||||
<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" />
|
||||
@@ -177,8 +172,8 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="kingdee-pool-dialog__pagination">
|
||||
<span class="kingdee-pool-dialog__pagination-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
|
||||
<div class="kingdee-pool-dialog__pager">
|
||||
<span class="kingdee-pool-dialog__pager-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
|
||||
<el-pagination
|
||||
v-model:current-page="page.current"
|
||||
v-model:page-size="page.size"
|
||||
@@ -328,9 +323,6 @@ export default {
|
||||
this.page.current = 1;
|
||||
this.load();
|
||||
},
|
||||
indexMethod(index) {
|
||||
return (this.page.current - 1) * this.page.size + index + 1;
|
||||
},
|
||||
resetQuery() {
|
||||
this.query = this.emptyQuery();
|
||||
this.handleQuery();
|
||||
@@ -428,28 +420,15 @@ export default {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.kingdee-pool-dialog__form {
|
||||
margin-bottom: 16px;
|
||||
padding: 12px 12px 4px;
|
||||
background: #fff;
|
||||
border-radius: 6px;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
|
||||
}
|
||||
.kingdee-pool-dialog__pagination {
|
||||
.kingdee-pool-dialog__pager {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 16px 0;
|
||||
margin-top: 12px;
|
||||
gap: 16px;
|
||||
}
|
||||
.kingdee-pool-dialog__pagination-tip {
|
||||
.kingdee-pool-dialog__pager-tip {
|
||||
color: #909399;
|
||||
font-size: 12px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.kingdee-pool-dialog__query-tip {
|
||||
margin-left: 8px;
|
||||
color: #909399;
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getDeptTree } from '@/api/system/dept';
|
||||
import { getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
|
||||
import { ElCascader } from 'element-plus';
|
||||
import { h } from 'vue';
|
||||
|
||||
@@ -14,6 +14,10 @@ import { h } from 'vue';
|
||||
* 3. 在 created / 初始化时调用 this.loadOrganizationOptions()
|
||||
* 4. 需要「未分配组织」筛选项的页面在 data 里置 enableUnassignedOrgFilter: true；
|
||||
* 该项只追加进搜索树 organizationSearchTreeOptions，表单级联 organizationTreeOptions 不含哨兵
|
||||
* 5. 表单「所属组织」只允许选平台公司的页面（运力管理）在 data 里置
|
||||
* restrictFormOrgToPlatformCompany: true，表单级联样式改用
|
||||
* buildFormOrganizationTree(...) 的结果，并在打开表单时把回显的组织名写进
|
||||
* formOrganizationLegacyName；只影响表单，搜索栏仍是全量组织
|
||||
*
|
||||
* 说明：
|
||||
* - 自动识别 organizationName / deptName 两种 prop，并挂载 column.renderSearch
|
||||
@@ -34,6 +38,11 @@ const ORG_PROPS = ['organizationName', 'deptName'];
|
||||
// 后端换成空串会让整段组织条件不生效，筛选静默失效。前端与后端这几处必须同步修改。
|
||||
const UNASSIGNED_ORG_FILTER = '__UNASSIGNED_ORG__';
|
||||
|
||||
// 表单「所属组织」限定只能选平台公司时，存量记录里的旧组织名在组织树里已经找不到
|
||||
// （节点被删或改名），用这个 id 补一个只读节点，否则编辑老数据时所属组织显示为空、
|
||||
// 保存即把原值丢掉。
|
||||
const FORM_LEGACY_ORG_ID = '__LEGACY_ORG__';
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@@ -44,6 +53,14 @@ export default {
|
||||
organizationLoading: false,
|
||||
// 组织筛选是否追加「未分配组织」一项；页面在 data 里覆盖为 true 才生效
|
||||
enableUnassignedOrgFilter: false,
|
||||
// 表单「所属组织」是否只允许选平台公司；页面在 data 里覆盖为 true 才生效
|
||||
restrictFormOrgToPlatformCompany: false,
|
||||
// 平台公司部门 id（字符串），loadOrganizationOptions 时一并拉取
|
||||
platformCompanyOrgIds: [],
|
||||
// 表单当前回显的组织名，树里没有同名节点时用它补一个只读选项
|
||||
formOrganizationLegacyName: '',
|
||||
// 进行中的组织数据请求，并发调用共用（不是响应式状态，只做去重）
|
||||
organizationOptionsPromise: null,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@@ -54,9 +71,12 @@ export default {
|
||||
? [this.unassignedOrgOption(), ...this.organizationTreeOptions]
|
||||
: this.organizationTreeOptions;
|
||||
},
|
||||
// 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级
|
||||
// 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级。
|
||||
// 限定只能选平台公司时用 disabled 函数只放开平台公司：非平台公司的非末级节点
|
||||
// 在 checkStrictly 下仍可展开（el-cascader 的 expandable 判断），末级节点点击无效，
|
||||
// 两者都选不中。disabled 在节点渲染时求值，平台公司 id 到手后节点会自行重算。
|
||||
organizationCascaderProps() {
|
||||
return {
|
||||
const props = {
|
||||
value: 'id',
|
||||
label: 'label',
|
||||
children: 'children',
|
||||
@@ -64,15 +84,25 @@ export default {
|
||||
checkStrictly: true,
|
||||
expandTrigger: 'click',
|
||||
};
|
||||
if (this.restrictFormOrgToPlatformCompany) {
|
||||
props.disabled = data => this.platformCompanyOrgDisabled(data);
|
||||
}
|
||||
return props;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
loadOrganizationOptions() {
|
||||
if (this.organizationLoading) return;
|
||||
// 并发调用共用同一次请求，返回的 Promise 在数据就绪后才 resolve
|
||||
if (this.organizationOptionsPromise) return this.organizationOptionsPromise;
|
||||
this.organizationLoading = true;
|
||||
const tenantId = this.userInfo?.tenantId;
|
||||
getDeptTree(tenantId)
|
||||
.then(res => {
|
||||
// 平台公司下拉失败不能拖垮组织树，单独兜住，失败时保持上一次的可选范围
|
||||
const platformCompanyRequest = this.restrictFormOrgToPlatformCompany
|
||||
? getPlatformCompanySelect().catch(() => null)
|
||||
: Promise.resolve(null);
|
||||
this.organizationOptionsPromise = Promise.all([getDeptTree(tenantId), platformCompanyRequest])
|
||||
.then(([res, platformRes]) => {
|
||||
this.applyPlatformCompanyOptions(platformRes);
|
||||
const source = res.data?.data || res.data || [];
|
||||
const tree = this.excludeExternalOrganization
|
||||
? this.excludeExternalOrganization(source)
|
||||
@@ -90,7 +120,21 @@ export default {
|
||||
})
|
||||
.finally(() => {
|
||||
this.organizationLoading = false;
|
||||
this.organizationOptionsPromise = null;
|
||||
});
|
||||
return this.organizationOptionsPromise;
|
||||
},
|
||||
// 组织树与平台公司列表就绪后执行回调；已加载过则立即执行
|
||||
whenOrganizationOptionsReady(callback) {
|
||||
const pending = this.organizationTreeFlatOptions.length
|
||||
? Promise.resolve()
|
||||
: this.loadOrganizationOptions();
|
||||
return Promise.resolve(pending).then(callback, () => callback());
|
||||
},
|
||||
applyPlatformCompanyOptions(res) {
|
||||
if (!res) return;
|
||||
const list = res.data?.data || res.data || [];
|
||||
this.platformCompanyOrgIds = (Array.isArray(list) ? list : []).map(item => String(item.id));
|
||||
},
|
||||
// 默认排除「外部组织」节点；页面可覆盖
|
||||
excludeExternalOrganization(tree = []) {
|
||||
@@ -143,7 +187,9 @@ export default {
|
||||
for (const node of tree || []) {
|
||||
const path = [...parents, String(node.id)];
|
||||
if (String(node.id) === String(target)) return path;
|
||||
const matched = this.findOrgPath(target, node.children, path);
|
||||
// 必须显式传 node.children || []：叶节点的 children 是 undefined，
|
||||
// 传 undefined 会触发默认参数重新拿到整棵树，逐层重复扫描直到爆栈
|
||||
const matched = this.findOrgPath(target, node.children || [], path);
|
||||
if (matched) return matched;
|
||||
}
|
||||
return null;
|
||||
@@ -152,6 +198,52 @@ export default {
|
||||
findOrgName(id) {
|
||||
return this.findOrgById(id)?.rawLabel || '';
|
||||
},
|
||||
// 级联节点的 disabled 判定：只有平台公司可选。页面自建 props 时也复用它
|
||||
platformCompanyOrgDisabled(data) {
|
||||
return !this.platformCompanyOrgIds.includes(String(data?.id ?? ''));
|
||||
},
|
||||
// 组织名对应的节点是否为平台公司；名称在树里不存在时按「不是」处理
|
||||
isPlatformCompanyOrgName(name) {
|
||||
const value = String(name ?? '').trim();
|
||||
if (!value) return false;
|
||||
const node = this.organizationTreeFlatOptions.find(item => item.rawLabel === value);
|
||||
return !!node && this.platformCompanyOrgIds.includes(String(node.id));
|
||||
},
|
||||
// 新增表单的默认组织：只有落在平台公司上才预填，否则留空（不能让用户从默认值
|
||||
// 直接带出一个选不中的组织名）
|
||||
defaultFormOrganizationName(name) {
|
||||
return this.isPlatformCompanyOrgName(name) ? String(name).trim() : '';
|
||||
},
|
||||
// 表单级联的选项树：限定平台公司时，把回显的原组织名补成一个只读节点，
|
||||
// 否则存量记录的组织在树里找不到，编辑时显示为空、保存即丢原值
|
||||
buildFormOrganizationTree(tree = this.organizationTreeOptions) {
|
||||
const source = tree || [];
|
||||
if (!this.restrictFormOrgToPlatformCompany) return source;
|
||||
const name = String(this.formOrganizationLegacyName || '').trim();
|
||||
if (!name) return source;
|
||||
if (this.organizationTreeFlatOptions.some(item => item.rawLabel === name)) return source;
|
||||
return [...source, { id: FORM_LEGACY_ORG_ID, label: name, rawLabel: name }];
|
||||
},
|
||||
// 表单级联回显用的路径：树里有该组织就用真实路径，否则落到原组织兜底节点
|
||||
resolveFormOrgPath(name) {
|
||||
const path = this.resolveOrgPath(name);
|
||||
if (path.length) return path;
|
||||
const value = String(name ?? '').trim();
|
||||
if (!value) return [];
|
||||
return value === String(this.formOrganizationLegacyName || '').trim()
|
||||
? [FORM_LEGACY_ORG_ID]
|
||||
: [];
|
||||
},
|
||||
// 记录表单当前回显的组织名：能匹配真实节点（或已清空）就不需要兜底节点，
|
||||
// 否则记下来，由 buildFormOrganizationTree 补成只读选项
|
||||
syncFormOrganizationLegacy(name) {
|
||||
const value = String(name ?? '').trim();
|
||||
if (!value || this.organizationTreeFlatOptions.some(item => item.rawLabel === value)) {
|
||||
this.formOrganizationLegacyName = '';
|
||||
return;
|
||||
}
|
||||
this.formOrganizationLegacyName = value;
|
||||
},
|
||||
// 组织名称 → 级联路径（表单回显用；部门树异步加载完成后会自动重算）
|
||||
resolveOrgPath(name) {
|
||||
const value = String(name ?? '').trim();
|
||||
@@ -164,7 +256,13 @@ export default {
|
||||
const value = Array.isArray(path)
|
||||
? path.filter(item => item !== undefined && item !== null && item !== '')
|
||||
: [];
|
||||
return value.length ? this.findOrgById(value)?.rawLabel || '' : '';
|
||||
if (!value.length) return '';
|
||||
const node = this.findOrgById(value);
|
||||
if (node) return node.rawLabel || '';
|
||||
// 原组织兜底节点不在扁平表里，直接取它代表的历史名称
|
||||
return String(value[value.length - 1]) === FORM_LEGACY_ORG_ID
|
||||
? String(this.formOrganizationLegacyName || '').trim()
|
||||
: '';
|
||||
},
|
||||
// 搜索提交前把级联路径数组就地转成组织名称（后端按名称过滤）
|
||||
normalizeOrganizationSearch(params, prop = 'organizationName') {
|
||||
|
||||
@@ -253,16 +253,18 @@ export const option = createCrudOption([
|
||||
label: '客商',
|
||||
prop: 'partyName',
|
||||
search: true,
|
||||
searchOrder: 11,
|
||||
searchPlaceholder: '请输入',
|
||||
searchOrder: 14,
|
||||
searchPlaceholder: '请输入甲/乙方名称',
|
||||
hide: true,
|
||||
display: false,
|
||||
addDisplay: false,
|
||||
editDisplay: false,
|
||||
},
|
||||
{
|
||||
label: '合同编号',
|
||||
prop: 'contractNo',
|
||||
search: true,
|
||||
searchOrder: 6,
|
||||
searchOrder: 8,
|
||||
searchPlaceholder: '请输入',
|
||||
order: 185,
|
||||
maxlength: 100,
|
||||
@@ -287,7 +289,7 @@ export const option = createCrudOption([
|
||||
label: '所属项目',
|
||||
prop: 'projectName',
|
||||
search: true,
|
||||
searchOrder: 8,
|
||||
searchOrder: 11,
|
||||
searchType: 'select',
|
||||
searchPlaceholder: '请选择',
|
||||
formslot: true,
|
||||
@@ -334,7 +336,7 @@ export const option = createCrudOption([
|
||||
prop: 'contractCategory',
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchOrder: 9,
|
||||
searchOrder: 12,
|
||||
searchPlaceholder: '请选择',
|
||||
order: 170,
|
||||
dicData: contractCategoryOptions,
|
||||
@@ -346,7 +348,7 @@ export const option = createCrudOption([
|
||||
prop: 'signType',
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchOrder: 10,
|
||||
searchOrder: 13,
|
||||
searchPlaceholder: '请选择',
|
||||
span: 8,
|
||||
order: 190,
|
||||
@@ -359,7 +361,7 @@ export const option = createCrudOption([
|
||||
prop: 'effectiveType',
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchOrder: 5,
|
||||
searchOrder: 6,
|
||||
searchPlaceholder: '请选择',
|
||||
dicData: effectiveTypeOptions,
|
||||
hide: true,
|
||||
@@ -630,7 +632,7 @@ export const option = createCrudOption([
|
||||
prop: 'hcsSyncStatus',
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchOrder: 6,
|
||||
searchOrder: 7,
|
||||
searchPlaceholder: '请选择',
|
||||
slot: true,
|
||||
dicData: hcsSyncStatusOptions,
|
||||
@@ -660,7 +662,7 @@ export const option = createCrudOption([
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchPlaceholder: '请选择',
|
||||
searchOrder: 7,
|
||||
searchOrder: 9,
|
||||
dicData: yesNoOptions,
|
||||
hide: true,
|
||||
addDisplay: false,
|
||||
@@ -672,7 +674,7 @@ export const option = createCrudOption([
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchPlaceholder: '请选择',
|
||||
searchOrder: 8,
|
||||
searchOrder: 10,
|
||||
dicData: yesNoOptions,
|
||||
hide: true,
|
||||
addDisplay: false,
|
||||
|
||||
@@ -124,7 +124,8 @@ const formatGoodsInfo = row => {
|
||||
const text = Object.entries(groups)
|
||||
.map(([unit, group]) => {
|
||||
const quantity = formatGoodsQuantity(group.quantity);
|
||||
return `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`;
|
||||
const typeName = group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
|
||||
return `${typeName} | ${quantity}${unit ? ` ${unit}` : ''}`;
|
||||
})
|
||||
.join('； ');
|
||||
|
||||
@@ -207,6 +208,9 @@ export const config = {
|
||||
transportPlanImportTitle: '导入运输计划',
|
||||
transportPlanTemplateUrl: '/blade-transport/transport-plan/export-template',
|
||||
attachmentTitle: '附件',
|
||||
defaultForm: {
|
||||
transportType: 'road',
|
||||
},
|
||||
searchRangeMap: {
|
||||
planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
|
||||
createTimeRange: ['createTimeStart', 'createTimeEnd', '00:00:00', '23:59:59'],
|
||||
|
||||
@@ -12,7 +12,7 @@ export const invoiceReceiptTableColumns = [
|
||||
{ prop: 'createUserName', label: '创建人', minWidth: 110 },
|
||||
{ prop: 'createTime', label: '创建时间', minWidth: 170 },
|
||||
{ prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
|
||||
{ prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130, kingdeeStatus: true },
|
||||
{ prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
|
||||
{ prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
|
||||
{ prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
|
||||
];
|
||||
|
||||
@@ -14,17 +14,6 @@ export const KINGDEE_STATUS_TAG_TYPES = {
|
||||
/** 金蝶单据状态 → el-tag 颜色类型，未映射状态返回 info */
|
||||
export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';
|
||||
|
||||
/** 收票登记推送状态 → el-tag 颜色类型（已指定应付=绿、已保存收票单=黄、推送失败=红、未推送=灰） */
|
||||
export const KINGDEE_PUSH_STATUS_TAG_TYPES = {
|
||||
unsynced: 'info',
|
||||
pushed: 'warning',
|
||||
assigned: 'success',
|
||||
failed: 'danger',
|
||||
};
|
||||
|
||||
/** 收票登记推送状态 → el-tag 颜色类型，未映射状态返回 info */
|
||||
export const kingdeePushStatusType = status => KINGDEE_PUSH_STATUS_TAG_TYPES[status] || 'info';
|
||||
|
||||
/** 金蝶冲销状态 → el-tag 颜色类型（已冲销=绿、未冲销=黄） */
|
||||
export const KINGDEE_WRITEOFF_TAG_TYPES = {
|
||||
writtenoff: 'success',
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
:data="data"
|
||||
ref="crud"
|
||||
v-model="form"
|
||||
v-model:page="page"
|
||||
:permission="permissionList"
|
||||
:before-open="beforeOpen"
|
||||
@row-del="rowDel"
|
||||
@@ -729,7 +730,9 @@ export default {
|
||||
onLoad(page, params = {}) {
|
||||
this.loading = true;
|
||||
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
|
||||
this.data = res.data.data;
|
||||
const data = res.data.data || {};
|
||||
this.data = data.records || [];
|
||||
this.page.total = data.total || 0;
|
||||
this.loading = false;
|
||||
this.selectionClear();
|
||||
});
|
||||
|
||||
@@ -1861,7 +1861,7 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="司机" required>
|
||||
<el-form-item label="司机">
|
||||
<el-autocomplete
|
||||
v-model="dispatchItemForm.driverName"
|
||||
placeholder="请输入"
|
||||
@@ -1878,7 +1878,6 @@
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
:label="dispatchItemForm.carrierType === '承运商' ? '手机号' : '司机手机号'"
|
||||
required
|
||||
>
|
||||
<el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
|
||||
</el-form-item>
|
||||
@@ -2104,7 +2103,7 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="dispatchIsRoadTransport" label="司机" required>
|
||||
<el-form-item v-if="dispatchIsRoadTransport" label="司机">
|
||||
<el-autocomplete
|
||||
v-model="dispatchItemForm.driverName"
|
||||
placeholder="请输入"
|
||||
@@ -2115,7 +2114,7 @@
|
||||
@select="item => handleTaskDriverSelect('dispatch', item)"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="dispatchIsRoadTransport" label="手机号" required>
|
||||
<el-form-item v-if="dispatchIsRoadTransport" label="手机号">
|
||||
<el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
@@ -3949,9 +3948,9 @@ export default {
|
||||
return Object.values(groups)
|
||||
.map(group => {
|
||||
const quantity = this.formatDispatchQuantity(group.quantity);
|
||||
return `${group.typeName}等${group.count}种货物 | ${quantity}${
|
||||
group.unit ? ` ${group.unit}` : ''
|
||||
}`;
|
||||
const typeName =
|
||||
group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
|
||||
return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
|
||||
})
|
||||
.join('； ');
|
||||
},
|
||||
@@ -7549,12 +7548,13 @@ export default {
|
||||
}, {});
|
||||
|
||||
const cargoInfo = Object.values(groups)
|
||||
.map(
|
||||
group =>
|
||||
`${group.cargoType}等${group.count}种货物 | ${this.formatDispatchQuantity(
|
||||
group.quantity
|
||||
)}${group.unit ? ` ${group.unit}` : ''}`
|
||||
)
|
||||
.map(group => {
|
||||
const typeName =
|
||||
group.count > 1 ? `${group.cargoType}等${group.count}种货物` : group.cargoType;
|
||||
return `${typeName} | ${this.formatDispatchQuantity(group.quantity)}${
|
||||
group.unit ? ` ${group.unit}` : ''
|
||||
}`;
|
||||
})
|
||||
.join('； ');
|
||||
return cargoInfo || plan.goodsInfo || '';
|
||||
},
|
||||
@@ -8364,19 +8364,7 @@ export default {
|
||||
}
|
||||
const fullEntry = row.taskEntryMode === 'full';
|
||||
const roadTransport = this.resolveTransportMode(row.transportType) === 'road';
|
||||
if (fullEntry) {
|
||||
// 公路运输时司机/手机号一律必填（含承运类型为承运商）
|
||||
if (roadTransport && row.carrierType) {
|
||||
requiredFields.push(['driverName', '司机']);
|
||||
requiredFields.push(['driverPhone', '手机号']);
|
||||
}
|
||||
} else if (row.carrierType) {
|
||||
requiredFields.push(['driverName', '司机']);
|
||||
requiredFields.push([
|
||||
'driverPhone',
|
||||
row.carrierType === '承运商' ? '手机号' : '司机手机号',
|
||||
]);
|
||||
}
|
||||
// 司机与手机号对全部承运类型（承运商 / 自运 / 平台）都是选填，填了才校验格式与长度
|
||||
const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
|
||||
if (emptyField) return requiredMessage(emptyField[1]);
|
||||
|
||||
|
||||
@@ -484,20 +484,24 @@
|
||||
</div>
|
||||
<el-tabs v-model="previewTab"
|
||||
><el-tab-pane :label="`运单数（${rows.length}）`" name="all" /><el-tab-pane
|
||||
:label="`疑似重复（${duplicateRows.length}）`"
|
||||
name="duplicate" /></el-tabs
|
||||
:label="`Excel内重复（${duplicateRows.length}）`"
|
||||
name="duplicate" /><el-tab-pane
|
||||
:label="`与已有运单重复（${historyDuplicateRows.length}）`"
|
||||
name="history" /></el-tabs
|
||||
><el-table
|
||||
:data="previewRows"
|
||||
border
|
||||
max-height="440"
|
||||
:row-class-name="({ row }) => (row._duplicate ? 'is-duplicate-row' : '')"
|
||||
:row-class-name="
|
||||
({ row }) => (row._duplicate || row._historyWaybillNo ? 'is-duplicate-row' : '')
|
||||
"
|
||||
@selection-change="rowSelection = $event"
|
||||
><el-table-column type="selection" width="55" /><el-table-column
|
||||
type="index"
|
||||
label="序号"
|
||||
width="65"
|
||||
/><el-table-column
|
||||
v-for="column in detailColumns"
|
||||
v-for="column in previewColumns"
|
||||
:key="column.prop"
|
||||
:prop="column.prop"
|
||||
:label="column.label"
|
||||
@@ -583,8 +587,6 @@
|
||||
><el-link type="primary" @click="saveRow(row)">保存</el-link
|
||||
><el-link type="primary" @click="cancelRow(row)">取消</el-link></template
|
||||
><template v-else
|
||||
><el-link v-if="row._duplicate" type="primary" @click="confirmDuplicateRow(row)"
|
||||
>确认</el-link
|
||||
><el-link type="primary" @click="editRow(row)">编辑</el-link
|
||||
><el-link type="danger" @click="deleteRow(row)">删除</el-link></template
|
||||
></div
|
||||
@@ -716,9 +718,12 @@ const transportTypeOptions = ref([]),
|
||||
const rowSelection = ref([]),
|
||||
previewTab = ref('all');
|
||||
const duplicateRows = computed(() => rows.value.filter(row => row._duplicate));
|
||||
const previewRows = computed(() =>
|
||||
previewTab.value === 'duplicate' ? duplicateRows.value : rows.value
|
||||
);
|
||||
const historyDuplicateRows = computed(() => rows.value.filter(row => row._historyWaybillNo));
|
||||
const previewRows = computed(() => {
|
||||
if (previewTab.value === 'duplicate') return duplicateRows.value;
|
||||
if (previewTab.value === 'history') return historyDuplicateRows.value;
|
||||
return rows.value;
|
||||
});
|
||||
const carrierContractsLoaded = ref(false),
|
||||
hasCarrierContracts = ref(null);
|
||||
const carrierTypes = ['承运商', '自运'];
|
||||
@@ -795,6 +800,16 @@ const detailColumns = [
|
||||
{ prop: 'remark', label: '备注', editor: 'textarea', minWidth: 200 },
|
||||
{ prop: 'waybillIdentifier', label: '同一运单标识号', editor: 'input', minWidth: 150 },
|
||||
];
|
||||
// 与已有运单重复页签的列与明细一致，只在运单批次号后多一列已有运单号。
|
||||
const previewColumns = computed(() =>
|
||||
previewTab.value === 'history'
|
||||
? [
|
||||
detailColumns[0],
|
||||
{ prop: '_historyWaybillNo', label: '已有运单号', minWidth: 220 },
|
||||
...detailColumns.slice(1),
|
||||
]
|
||||
: detailColumns
|
||||
);
|
||||
const requiredDetailFields = [
|
||||
{ prop: 'vehicleNo', label: '车牌号/船班号/船次号/班次号' },
|
||||
{ prop: 'transportType', label: '运输方式' },
|
||||
@@ -1187,6 +1202,7 @@ const loadBatchRows = async batchId => {
|
||||
batchNo: item.batchNo || form.batchNo,
|
||||
}));
|
||||
refreshDuplicateFlags();
|
||||
await refreshHistoryDuplicates();
|
||||
rowSelection.value = [];
|
||||
previewTab.value = 'all';
|
||||
};
|
||||
@@ -1509,6 +1525,8 @@ const fileChange = async (file, list) => {
|
||||
if (isValid) {
|
||||
// 校验通过，填充表格数据
|
||||
rows.value = parsedRows;
|
||||
// 传 rows.value（响应式代理），否则后续写入不触发重新渲染
|
||||
await refreshHistoryDuplicates(rows.value);
|
||||
} else {
|
||||
// 校验失败，清空数据
|
||||
rows.value = [];
|
||||
@@ -1526,16 +1544,12 @@ const IMPORT_BATCH_SIZE = 100;
|
||||
|
||||
const importFieldText = value => String(value ?? '').trim();
|
||||
|
||||
/** 同一运单批次号下，全部导入字段一致时标记为疑似重复。已在线确认的行不再标为重复。 */
|
||||
/** 同一运单批次号下，全部导入字段一致时标记为 Excel 内重复。 */
|
||||
const refreshDuplicateFlags = (list = rows.value) => {
|
||||
const groups = new Map();
|
||||
list.forEach(row => {
|
||||
const signature = detailColumns.map(column => importFieldText(row[column.prop])).join('\u0001');
|
||||
const batchNo = importFieldText(row.batchNo || form.batchNo);
|
||||
if (row._duplicateConfirmed && row._duplicateSignature !== signature) {
|
||||
row._duplicateConfirmed = false;
|
||||
}
|
||||
row._duplicateSignature = signature;
|
||||
const groupKey = `${batchNo}\u0002${signature}`;
|
||||
const group = groups.get(groupKey) || [];
|
||||
group.push(row);
|
||||
@@ -1544,19 +1558,39 @@ const refreshDuplicateFlags = (list = rows.value) => {
|
||||
groups.forEach(group => {
|
||||
const duplicated = group.length > 1;
|
||||
group.forEach(row => {
|
||||
row._duplicate = duplicated && !row._duplicateConfirmed;
|
||||
row._duplicate = duplicated;
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
const confirmDuplicateRow = row => {
|
||||
row._duplicateConfirmed = true;
|
||||
refreshDuplicateFlags();
|
||||
ElMessage.success('已确认，该行将按正常数据导入');
|
||||
/** 逐行提交给后端与项目下已有运单比对，命中的行带上已有运单号。比对失败不影响导入。 */
|
||||
const refreshHistoryDuplicates = async (list = rows.value) => {
|
||||
if (!list.length || !form.projectId) {
|
||||
list.forEach(row => {
|
||||
row._historyWaybillNo = '';
|
||||
});
|
||||
return;
|
||||
}
|
||||
let duplicates = [];
|
||||
try {
|
||||
const res = await api.checkImportDuplicates(buildImportPayload(form.status, list));
|
||||
const data = res?.data?.data ?? res?.data ?? res;
|
||||
duplicates = Array.isArray(data) ? data : [];
|
||||
} catch (error) {
|
||||
console.error('与已有运单重复校验失败:', error);
|
||||
duplicates = [];
|
||||
}
|
||||
const numbersByRow = new Map(
|
||||
duplicates.map(item => [item.rowIndex, (item.waybillNos || []).filter(Boolean)])
|
||||
);
|
||||
list.forEach((row, index) => {
|
||||
row._historyWaybillNo = (numbersByRow.get(index) || []).join('、');
|
||||
});
|
||||
};
|
||||
|
||||
const stripInternalRowFields = row => {
|
||||
const { _key, _duplicate, _duplicateKey, _duplicateConfirmed, _duplicateSignature, _editing, _editSnapshot, ...data } = row;
|
||||
const { _key, _duplicate, _duplicateKey, _editing, _editSnapshot, _historyWaybillNo, ...data } =
|
||||
row;
|
||||
return data;
|
||||
};
|
||||
|
||||
@@ -1771,6 +1805,7 @@ const saveRow = row => {
|
||||
row._editing = false;
|
||||
delete row._editSnapshot;
|
||||
refreshDuplicateFlags();
|
||||
refreshHistoryDuplicates();
|
||||
};
|
||||
const cancelRow = row => {
|
||||
if (row._editSnapshot) Object.assign(row, row._editSnapshot);
|
||||
@@ -1780,12 +1815,14 @@ const cancelRow = row => {
|
||||
const deleteRow = row => {
|
||||
rows.value = rows.value.filter(item => item !== row);
|
||||
refreshDuplicateFlags();
|
||||
refreshHistoryDuplicates();
|
||||
};
|
||||
const removeSelectedRows = () => {
|
||||
const keys = new Set(rowSelection.value.map(row => row._key));
|
||||
rows.value = rows.value.filter(row => !keys.has(row._key));
|
||||
rowSelection.value = [];
|
||||
refreshDuplicateFlags();
|
||||
refreshHistoryDuplicates();
|
||||
};
|
||||
const normalizeOptionalPlanId = value => {
|
||||
if (value === undefined || value === null || value === '') return null;
|
||||
@@ -1849,7 +1886,11 @@ const confirmImport = async () => {
|
||||
await formRef.value?.validate();
|
||||
if (!validateImportRows()) return;
|
||||
const count = rows.value.filter(row => row._duplicate).length;
|
||||
if (count) await ElMessageBox.confirm(`当前导入有${count}条疑似重复数据，是否确认导入？`, '提示');
|
||||
if (count)
|
||||
await ElMessageBox.confirm(`当前导入有${count}条Excel内重复数据，是否确认导入？`, '提示');
|
||||
const historyCount = rows.value.filter(row => row._historyWaybillNo).length;
|
||||
if (historyCount)
|
||||
await ElMessageBox.confirm(`当前导入有${historyCount}条与已有运单重复，是否确认导入？`, '提示');
|
||||
if (form.importType === 'settlement' && form.status === 'completed')
|
||||
await ElMessageBox.confirm('确认后将同时生成运单、应收应付明细、计结算单，是否继续？', '提示');
|
||||
|
||||
|
||||
@@ -1337,7 +1337,7 @@
|
||||
<el-form-item label="规格">
|
||||
<el-input
|
||||
v-model="form.specification"
|
||||
placeholder="选择货物自动回填"
|
||||
placeholder="请填写规格"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
@@ -1345,7 +1345,7 @@
|
||||
<el-form-item label="型号">
|
||||
<el-input
|
||||
v-model="form.model"
|
||||
placeholder="选择货物自动回填"
|
||||
placeholder="请填写型号"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
@@ -5018,9 +5018,9 @@ export default {
|
||||
return Object.values(groups)
|
||||
.map(group => {
|
||||
const quantity = this.formatQuantity(group.quantity);
|
||||
return `${group.typeName}等${group.count}种货物 | ${quantity}${
|
||||
group.unit ? ` ${group.unit}` : ''
|
||||
}`;
|
||||
const typeName =
|
||||
group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
|
||||
return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
|
||||
})
|
||||
.join('； ');
|
||||
},
|
||||
@@ -8453,7 +8453,6 @@ export default {
|
||||
}
|
||||
if (!this.isTaskFullMode) {
|
||||
requiredFields.push(['cargoName', '货物名称']);
|
||||
requiredFields.push(['model', '型号']);
|
||||
requiredFields.push(['quantity', '数量']);
|
||||
}
|
||||
const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
|
||||
|
||||
@@ -2545,9 +2545,9 @@ export default {
|
||||
Object.values(groups)
|
||||
.map(group => {
|
||||
const quantity = this.formatGoodsQuantity(group.quantity);
|
||||
return `${group.typeName}等${group.count}种货物 | ${quantity}${
|
||||
group.unit ? ` ${group.unit}` : ''
|
||||
}`;
|
||||
const typeName =
|
||||
group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
|
||||
return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
|
||||
})
|
||||
.join('； ') || '-'
|
||||
);
|
||||
|
||||
@@ -489,6 +489,12 @@ const NODE_TEMPLATES = [
|
||||
},
|
||||
];
|
||||
|
||||
// 过程配置必须覆盖装货端与卸货端各一个节点；货量下限只看装货端——
|
||||
// 到场没有货量开关，不能拿它顶替货量采集
|
||||
const PICKUP_NODE_KEYS = ['arrive_scene', 'load', 'dispatch'];
|
||||
const DELIVERY_NODE_KEYS = ['unload', 'arrival', 'sign', 'return'];
|
||||
const CARGO_NODE_KEYS = ['load', 'dispatch'];
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@@ -916,8 +922,24 @@ export default {
|
||||
this.$message.warning('备注不能超过500个字符');
|
||||
return false;
|
||||
}
|
||||
if (!this.enabledNodes.length) {
|
||||
this.$message.warning('请至少选择一个过程节点');
|
||||
const isEnabledNode = key => this.nodeRows.some(item => item.key === key && item.enabled);
|
||||
if (!PICKUP_NODE_KEYS.some(isEnabledNode)) {
|
||||
this.$message.warning('发货、装货、到场至少选择一个');
|
||||
return false;
|
||||
}
|
||||
if (!DELIVERY_NODE_KEYS.some(isEnabledNode)) {
|
||||
this.$message.warning('卸货、到货、签收、回单至少选择一个');
|
||||
return false;
|
||||
}
|
||||
// 装货端没有节点采集货量时，整条配置在小程序侧等于不采集货量
|
||||
const collectsCargo = CARGO_NODE_KEYS.some(key =>
|
||||
this.nodeRows.some(
|
||||
item =>
|
||||
item.key === key && item.enabled && item.uploadCargo && (item.cargoTypes || []).length
|
||||
)
|
||||
);
|
||||
if (!collectsCargo) {
|
||||
this.$message.warning('发货或装货至少勾选一个货量类型');
|
||||
return false;
|
||||
}
|
||||
const transit = this.nodeRows.find(item => item.key === 'transit');
|
||||
|
||||
@@ -577,7 +577,7 @@ export default {
|
||||
this.$message.warning(`第${index + 1}条调度明细缺少承运商信息`);
|
||||
return;
|
||||
}
|
||||
// 司机是否必填由调度明细弹窗按承运类型判定（承运商承运时司机选填），此处不再重复校验
|
||||
// 司机与手机号对全部承运类型都是选填，由调度明细弹窗校验已填部分的格式，此处不重复校验
|
||||
if (!row.vehicleNo) {
|
||||
this.$message.warning(`第${index + 1}条调度明细缺少车牌号`);
|
||||
return;
|
||||
|
||||
@@ -389,6 +389,18 @@
|
||||
v-model="batchQuery.batchNo"
|
||||
clearable
|
||||
placeholder="请输入" /></el-form-item></el-col
|
||||
><el-col :span="12"
|
||||
><el-form-item label="项目"
|
||||
><el-select
|
||||
v-model="batchQuery.projectId"
|
||||
filterable
|
||||
clearable
|
||||
placeholder="请选择"
|
||||
><el-option
|
||||
v-for="item in projectOptions"
|
||||
:key="item.id"
|
||||
:label="item.projectName"
|
||||
:value="item.id" /></el-select></el-form-item></el-col
|
||||
><el-col :span="12"
|
||||
><el-form-item label="创建日期"
|
||||
><el-date-picker
|
||||
@@ -428,6 +440,10 @@
|
||||
prop="batchNo"
|
||||
label="运单批次号"
|
||||
min-width="240" /><el-table-column
|
||||
prop="projectName"
|
||||
label="项目"
|
||||
min-width="180"
|
||||
show-overflow-tooltip /><el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
min-width="180" /><el-table-column label="运单数" width="120"
|
||||
@@ -694,7 +710,12 @@ const selectedBatches = ref([]),
|
||||
batchRows = ref([]),
|
||||
batchSelection = ref([]),
|
||||
batchCreateRange = ref([]);
|
||||
const batchQuery = reactive({ batchNo: '', createUser: '', waybillCount: undefined });
|
||||
const batchQuery = reactive({
|
||||
batchNo: '',
|
||||
projectId: '',
|
||||
createUser: '',
|
||||
waybillCount: undefined,
|
||||
});
|
||||
const batchPage = reactive({ current: 1, size: 10, total: 0 });
|
||||
const progressQuery = reactive({ businessId: '', attachmentName: '', status: '' });
|
||||
const progressPage = reactive({ current: 1, size: 10, total: 0 });
|
||||
@@ -1023,7 +1044,12 @@ const openBatchDialog = async row => {
|
||||
batchDialogMode.value = voucher?.id ? 'change' : 'upload';
|
||||
batchTarget.value = voucher?.id ? voucher : undefined;
|
||||
batchSelection.value = [];
|
||||
// 弹窗内的搜索条件是模块级状态，不重置就会带着上一次的筛选条件打开。
|
||||
resetBatchSearch();
|
||||
batchRows.value = [];
|
||||
batchPage.total = 0;
|
||||
batchVisible.value = true;
|
||||
if (!projectOptions.value.length) await loadProjects();
|
||||
await loadBatches();
|
||||
if (voucher?.waybillBatchNo) {
|
||||
const currentBatch = batchRows.value.find(item => item.batchNo === voucher.waybillBatchNo);
|
||||
@@ -1033,6 +1059,7 @@ const openBatchDialog = async row => {
|
||||
const loadBatches = async () => {
|
||||
const res = await api.getWaybillBatches(batchPage.current, batchPage.size, {
|
||||
batchNo: batchQuery.batchNo,
|
||||
projectId: batchQuery.projectId,
|
||||
createUser: batchQuery.createUser,
|
||||
waybillCount: batchQuery.waybillCount,
|
||||
createTimeStart: batchCreateRange.value?.[0] ? `${batchCreateRange.value[0]} 00:00:00` : '',
|
||||
@@ -1053,10 +1080,18 @@ const handleWaybillCountInput = value => {
|
||||
batchQuery.waybillCount = filtered.replace(/^0+/, '');
|
||||
}
|
||||
};
|
||||
const resetBatchQuery = () => {
|
||||
Object.assign(batchQuery, { batchNo: '', createUser: '', waybillCount: undefined });
|
||||
const resetBatchSearch = () => {
|
||||
Object.assign(batchQuery, {
|
||||
batchNo: '',
|
||||
projectId: '',
|
||||
createUser: '',
|
||||
waybillCount: undefined,
|
||||
});
|
||||
batchCreateRange.value = [];
|
||||
batchPage.current = 1;
|
||||
};
|
||||
const resetBatchQuery = () => {
|
||||
resetBatchSearch();
|
||||
loadBatches();
|
||||
};
|
||||
const updateWaybillBatch = async (target, selected) => {
|
||||
|
||||
@@ -119,9 +119,6 @@
|
||||
<el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">
|
||||
{{ displayValue(row[column.prop]) }}
|
||||
</el-tag>
|
||||
<el-tag v-else-if="column.kingdeeStatus" :type="kingdeePushStatusType(row.kingdeePushStatus)">
|
||||
{{ displayValue(row[column.prop]) }}
|
||||
</el-tag>
|
||||
<span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
|
||||
<span v-else>{{ displayValue(row[column.prop]) }}</span>
|
||||
</template>
|
||||
@@ -225,7 +222,6 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue';
|
||||
import organizationSearch from '@/mixins/organization-search';
|
||||
import { getMKApprovalUrl } from '@/api/system/business-process';
|
||||
import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
|
||||
import { kingdeePushStatusType } from '@/utils/kingdee';
|
||||
|
||||
// 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
|
||||
const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
|
||||
@@ -484,7 +480,6 @@ export default {
|
||||
''
|
||||
);
|
||||
},
|
||||
kingdeePushStatusType,
|
||||
displayValue(value) {
|
||||
return value === null || value === undefined || value === '' ? '-' : value;
|
||||
},
|
||||
|
||||
@@ -74,7 +74,6 @@
|
||||
|
||||
<script>
|
||||
import { claimCandidates } from '@/api/payment/invoiceReceipt';
|
||||
import { kingdeePushStatusType } from '@/utils/kingdee';
|
||||
|
||||
export default {
|
||||
name: 'InvoiceReceiptCandidatesDialog',
|
||||
@@ -153,7 +152,7 @@ export default {
|
||||
);
|
||||
},
|
||||
pushStatusType(value) {
|
||||
return kingdeePushStatusType(value);
|
||||
return { pushed: 'warning', assigned: 'success', failed: 'danger', unsynced: 'info' }[value] || 'info';
|
||||
},
|
||||
formatMoney(value) {
|
||||
const number = Number(value);
|
||||
|
||||
@@ -145,10 +145,10 @@
|
||||
<el-descriptions-item label="创建时间">
|
||||
{{ invoiceRegisterDialog.row.createTime || '-' }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="金蝶同步状态">
|
||||
<el-descriptions-item label="金蝶同步状态" :span="2">
|
||||
{{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="备注">
|
||||
<el-descriptions-item label="备注" :span="2">
|
||||
{{ invoiceRegisterDialog.row.remark || '-' }}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
@@ -847,10 +847,6 @@ export default {
|
||||
settlementTypeName(value) {
|
||||
return { payable: '付款', receivable: '收款' }[value] || '-';
|
||||
},
|
||||
// 模板无法直接访问 script 顶部 import，包装成实例方法（与 formal-settlement-table-panel 同模式）
|
||||
kingdeeSyncName(value) {
|
||||
return kingdeeSyncName(value);
|
||||
},
|
||||
unwrapData(response) {
|
||||
const body = response?.data || response || {};
|
||||
return body?.data || body;
|
||||
|
||||
@@ -1067,7 +1067,8 @@ import { formatContractOptionLabel } from '@/utils/contract';
|
||||
import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
|
||||
import { downloadXls } from '@/utils/util';
|
||||
import { createSettlementTransfer } from '@/utils/settlement-transfer';
|
||||
import { settlementListPath } from '@/utils/settlement-menu';
|
||||
import { settlementBillLabel, settlementListPath } from '@/utils/settlement-menu';
|
||||
import { getList as getFormalSettlementList } from '@/api/settlement/formalSettlement';
|
||||
import {
|
||||
contractApprovalStatusOptions,
|
||||
contractCategoryOptions,
|
||||
@@ -1921,8 +1922,9 @@ export default {
|
||||
this.openSettlementDetail('/settlement/pre-settlement', row.preSettlementNo);
|
||||
return;
|
||||
}
|
||||
if (this.settlementType === 'payable' && column.prop === 'formalSettlementNo') {
|
||||
this.openSettlementDetail('/settlement/payment-settlement', row.formalSettlementNo);
|
||||
// 正式结算单号：跳转付款/收款结算单表单页并打开详情（与开票申请等入口一致）
|
||||
if (column.prop === 'formalSettlementNo') {
|
||||
this.openFormalSettlementDetail(row.formalSettlementNo);
|
||||
return;
|
||||
}
|
||||
this.openDetailDialog(row);
|
||||
@@ -1934,6 +1936,42 @@ export default {
|
||||
}
|
||||
this.$router.push({ path, query: { detailNo } });
|
||||
},
|
||||
async openFormalSettlementDetail(formalSettlementNo) {
|
||||
const normalizedNo = String(formalSettlementNo || '')
|
||||
.split(/[、,，]/)
|
||||
.map(item => item.trim())
|
||||
.find(Boolean);
|
||||
if (!normalizedNo) {
|
||||
this.$message.info('当前记录未关联结算单详情');
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const data = this.unwrapPage(
|
||||
await getFormalSettlementList(1, 10, { formalSettlementNo: normalizedNo })
|
||||
);
|
||||
const row = (data.records || []).find(
|
||||
item => String(item.formalSettlementNo || '').trim() === normalizedNo
|
||||
);
|
||||
if (!row?.id) {
|
||||
this.$message.warning('未找到对应的正式结算单');
|
||||
return;
|
||||
}
|
||||
const settlementType = row.settlementType || this.settlementType || 'payable';
|
||||
const listPath = settlementListPath(settlementType);
|
||||
await this.$router.push({
|
||||
path: `${listPath}/form`,
|
||||
query: {
|
||||
mode: 'view',
|
||||
id: row.id,
|
||||
settlementType,
|
||||
listPath,
|
||||
name: `查看${settlementBillLabel(settlementType)}`,
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
this.$message.error('正式结算单详情加载失败');
|
||||
}
|
||||
},
|
||||
async openRouteDetail(detailId = this.$route.query.detailId) {
|
||||
// 结算明细点「单据号」会带 detailId 跳到本页；只有当前停在应收/应付明细页时才自动展开详情
|
||||
const routePath =
|
||||
|
||||
@@ -66,17 +66,21 @@
|
||||
/>
|
||||
</template>
|
||||
<template #dataScopeDeptIds-form>
|
||||
<el-tree
|
||||
<!-- 与用户管理「数据管理权限」一致：组织多选级联，数据源同左侧组织树 -->
|
||||
<el-cascader
|
||||
v-if="Number(form.dataScopeRange) === 3"
|
||||
ref="dataScopeTree"
|
||||
:data="permissionDeptTree"
|
||||
show-checkbox
|
||||
node-key="id"
|
||||
:default-checked-keys="form.dataScopeDeptIds || []"
|
||||
:props="{ label: 'title', children: 'children' }"
|
||||
@check="handleDataScopeCheck"
|
||||
v-model="dataScopeCascaderValue"
|
||||
:options="permissionDeptTree"
|
||||
:props="deptCascaderProps"
|
||||
:disabled="isViewMode"
|
||||
clearable
|
||||
filterable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="请选择数据权限组织（可多选）"
|
||||
style="width: 100%"
|
||||
/>
|
||||
<span v-else class="form-tip">选择「自定义」后可勾选数据权限组织</span>
|
||||
<span v-else class="form-tip">选择「自定义」后可选择数据权限组织</span>
|
||||
</template>
|
||||
<template #menu="{ row, index }">
|
||||
<el-link
|
||||
@@ -193,6 +197,26 @@ export default {
|
||||
: [];
|
||||
},
|
||||
},
|
||||
// 自定义数据权限组织：与用户管理数据管理权限相同的多选级联
|
||||
dataScopeCascaderValue: {
|
||||
get() {
|
||||
const ids = Array.isArray(this.form.dataScopeDeptIds)
|
||||
? this.form.dataScopeDeptIds
|
||||
: this.form.dataScopeDeptIds
|
||||
? String(this.form.dataScopeDeptIds).split(',').filter(Boolean)
|
||||
: [];
|
||||
return ids
|
||||
.filter(item => item !== undefined && item !== null && item !== '')
|
||||
.map(item => (typeof item === 'number' ? item : String(item)));
|
||||
},
|
||||
set(value) {
|
||||
this.form.dataScopeDeptIds = Array.isArray(value)
|
||||
? value.filter(item => item !== undefined && item !== null && item !== '')
|
||||
: value
|
||||
? [value]
|
||||
: [];
|
||||
},
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.sensitiveManager = sensitive.create({
|
||||
@@ -228,12 +252,6 @@ export default {
|
||||
this.permissionDeptTree = res.data.data || [];
|
||||
});
|
||||
},
|
||||
handleDataScopeCheck(_, checked) {
|
||||
if (this.isViewMode) {
|
||||
return;
|
||||
}
|
||||
this.form.dataScopeDeptIds = checked.checkedKeys || [];
|
||||
},
|
||||
normalizeSubmitRow(row = {}, isUpdate = false) {
|
||||
let payload = { ...row };
|
||||
// 编辑时剔除未改动的脱敏字段，避免把 138****8000 写回库
|
||||
@@ -278,17 +296,19 @@ export default {
|
||||
detail.identities = detail.identities.split(',').filter(Boolean);
|
||||
}
|
||||
const deptIds = func.split(detail.deptId || '');
|
||||
const dataScopeDeptIds = Array.isArray(detail.dataScopeDeptIds)
|
||||
? detail.dataScopeDeptIds.map(item => String(item))
|
||||
: detail.dataScopeDeptIds
|
||||
? String(detail.dataScopeDeptIds).split(',').filter(Boolean)
|
||||
: [];
|
||||
this.form = {
|
||||
...detail,
|
||||
deptId: Array.isArray(deptIds) ? deptIds : [],
|
||||
dataScopeRange: detail.dataScopeRange || 1,
|
||||
dataLevelRange: detail.dataLevelRange || 1,
|
||||
dataScopeDeptIds: detail.dataScopeDeptIds || [],
|
||||
dataScopeDeptIds,
|
||||
};
|
||||
this.sensitiveManager?.saveInitialData(this.form);
|
||||
this.$nextTick(() => {
|
||||
this.$refs.dataScopeTree?.setCheckedKeys?.(this.form.dataScopeDeptIds || []);
|
||||
});
|
||||
done();
|
||||
});
|
||||
return;
|
||||
|
||||
@@ -589,7 +589,7 @@
|
||||
<el-form-item label="所属组织" prop="organizationName">
|
||||
<el-cascader
|
||||
v-model="organizationCascaderValue"
|
||||
:options="organizationTreeOptions"
|
||||
:options="formOrganizationTreeOptions"
|
||||
:props="organizationCascaderProps"
|
||||
filterable
|
||||
clearable
|
||||
@@ -689,6 +689,7 @@ import {
|
||||
recognitionIDCard,
|
||||
recognitionTransportCertificates,
|
||||
recognizeBaiduOcr,
|
||||
recognizeQualificationCertificateOcr,
|
||||
} from '@/api/transportCapacity/driver';
|
||||
import { getList as getVehicleList } from '@/api/transportCapacity/transport-vehicle';
|
||||
import { getDeptTree } from '@/api/system/dept';
|
||||
@@ -796,6 +797,8 @@ export default {
|
||||
driverBox: false,
|
||||
// 搜索栏组织级联追加「未分配组织」一项（哨兵值见 organization-search mixin）
|
||||
enableUnassignedOrgFilter: true,
|
||||
// 表单「所属组织」只允许选平台公司；搜索栏不受影响
|
||||
restrictFormOrgToPlatformCompany: true,
|
||||
vehicleSelectorVisible: false,
|
||||
vehicleSelectorLoading: false,
|
||||
vehicleSelectorOption,
|
||||
@@ -920,13 +923,19 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['permission', 'userInfo']),
|
||||
// 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点
|
||||
formOrganizationTreeOptions() {
|
||||
return this.buildFormOrganizationTree();
|
||||
},
|
||||
// 所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
|
||||
organizationCascaderValue: {
|
||||
get() {
|
||||
return this.resolveOrgPath(this.driverForm.organizationName);
|
||||
return this.resolveFormOrgPath(this.driverForm.organizationName);
|
||||
},
|
||||
set(path) {
|
||||
this.driverForm.organizationName = this.resolveOrgName(path);
|
||||
const name = this.resolveOrgName(path);
|
||||
this.driverForm.organizationName = name;
|
||||
this.syncFormOrganizationLegacy(name);
|
||||
},
|
||||
},
|
||||
isAdmin() {
|
||||
@@ -964,8 +973,8 @@ export default {
|
||||
},
|
||||
},
|
||||
created() {
|
||||
// initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
|
||||
this.initDeptTree();
|
||||
this.loadOrganizationOptions();
|
||||
this.initRegionOptions();
|
||||
this.initQualificationTypeOptions();
|
||||
},
|
||||
@@ -983,9 +992,7 @@ export default {
|
||||
'organizationName'
|
||||
);
|
||||
vehicleColumn.dicData = this.organizationOptions;
|
||||
if (this.driverBox && !this.driverForm.id && !this.driverForm.organizationName) {
|
||||
this.driverForm.organizationName = this.getCurrentOrganizationName();
|
||||
}
|
||||
return this.loadOrganizationOptions();
|
||||
});
|
||||
},
|
||||
initQualificationTypeOptions() {
|
||||
@@ -1015,6 +1022,11 @@ export default {
|
||||
});
|
||||
return result;
|
||||
},
|
||||
// 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空，
|
||||
// 不能让默认值带出一个在表单里选不中的组织名
|
||||
getDefaultOrganizationName() {
|
||||
return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
|
||||
},
|
||||
getCurrentOrganizationName() {
|
||||
const currentDeptId = this.userInfo.deptId || this.userInfo.dept_id;
|
||||
const currentDept = this.organizationOptions.find(
|
||||
@@ -1202,8 +1214,16 @@ export default {
|
||||
this.submitAttempted = false;
|
||||
if (!row?.id) {
|
||||
this.driverForm = emptyForm();
|
||||
this.driverForm.organizationName = this.getCurrentOrganizationName();
|
||||
// 组织树与平台公司列表异步加载，默认值要等两者都到位才能判定，这里先留空
|
||||
this.driverForm.organizationName = '';
|
||||
this.formOrganizationLegacyName = '';
|
||||
this.driverBox = true;
|
||||
this.whenOrganizationOptionsReady(() => {
|
||||
if (!this.driverBox || this.driverForm.id || this.driverForm.organizationName) return;
|
||||
const name = this.getDefaultOrganizationName();
|
||||
this.driverForm.organizationName = name;
|
||||
this.syncFormOrganizationLegacy(name);
|
||||
});
|
||||
return;
|
||||
}
|
||||
getDetail(row.id).then(res => {
|
||||
@@ -1217,11 +1237,13 @@ export default {
|
||||
postList: detail.posts ? detail.posts.split(',').filter(Boolean) : [],
|
||||
};
|
||||
this.syncAddressRegionPath();
|
||||
this.syncFormOrganizationLegacy(this.driverForm.organizationName);
|
||||
this.driverBox = true;
|
||||
});
|
||||
},
|
||||
resetDriver() {
|
||||
this.driverForm = emptyForm();
|
||||
this.formOrganizationLegacyName = '';
|
||||
this.drivingLicenseUploads = {};
|
||||
this.readonly = false;
|
||||
this.submitAttempted = false;
|
||||
@@ -1322,9 +1344,29 @@ export default {
|
||||
},
|
||||
handleQualificationUploadSuccess(prop, url) {
|
||||
this.setImage(prop, url);
|
||||
this.recognizeBaiduOcr(url, 'general', '', '从业资格证', data => {
|
||||
this.applyQualificationRecognition(data);
|
||||
this.recognizeQualificationCertificate(url);
|
||||
},
|
||||
recognizeQualificationCertificate(url) {
|
||||
if (!url) {
|
||||
this.$message.warning('从业资格证图片上传成功，未获取到图片地址，无法自动识别');
|
||||
return;
|
||||
}
|
||||
const loading = ElLoading.service({
|
||||
lock: true,
|
||||
text: '从业资格证识别中',
|
||||
background: 'rgba(255, 255, 255, 0.7)',
|
||||
});
|
||||
recognizeQualificationCertificateOcr(url)
|
||||
.then(res => {
|
||||
this.applyQualificationRecognition(res?.data?.data || {});
|
||||
this.$message.success('从业资格证识别完成');
|
||||
})
|
||||
.catch(() => {
|
||||
this.$message.warning('从业资格证图片上传成功，自动识别失败，请手动填写相关信息');
|
||||
})
|
||||
.finally(() => {
|
||||
loading.close();
|
||||
});
|
||||
},
|
||||
recognizeBaiduOcr(url, type, side, documentName, applyRecognition) {
|
||||
if (!url) {
|
||||
@@ -1614,25 +1656,43 @@ export default {
|
||||
return typeof value === 'object' ? value.words || value.value || '' : value || '';
|
||||
},
|
||||
applyQualificationRecognition(data = {}) {
|
||||
const qualificationType = this.getQualificationType(data);
|
||||
const qualificationNo = this.getQualificationNo(data);
|
||||
const fields = this.normalizeQualificationOcrFields(data);
|
||||
const qualificationType = this.getQualificationOcrValue(fields, [
|
||||
'qualification_category',
|
||||
'从业资格类别',
|
||||
'从业资格类型',
|
||||
]).replace(/[，,；;]+$/, '');
|
||||
const qualificationNo = this.getQualificationOcrValue(fields, [
|
||||
'certificate_no',
|
||||
'证号',
|
||||
'从业资格证号',
|
||||
'资格证号',
|
||||
'证书编号',
|
||||
]);
|
||||
const validFrom = this.getQualificationOcrValue(fields, ['valid_from', '有效起始日期']);
|
||||
const validUntil = this.getQualificationOcrValue(fields, ['valid_until', '有效期限', '有效期']);
|
||||
const matchedType = this.matchQualificationType(qualificationType);
|
||||
if (matchedType) {
|
||||
this.driverForm.qualificationType = matchedType;
|
||||
} else if (qualificationType && !this.qualificationTypeOptions.length) {
|
||||
this.driverForm.qualificationType = qualificationType;
|
||||
}
|
||||
if (qualificationNo && !this.driverForm.qualificationNo) {
|
||||
if (qualificationNo) {
|
||||
this.driverForm.qualificationNo = String(qualificationNo).replace(/\s/g, '');
|
||||
}
|
||||
const words = this.getBaiduOcrWords(data).join(' ');
|
||||
const dateList = words.match(/\d{4}[-/.年]\d{1,2}[-/.月]\d{1,2}日?/g) || [];
|
||||
if (/(长期|永久有效)/.test(words)) {
|
||||
const startDate = this.normalizeBirthday(validFrom);
|
||||
if (startDate) {
|
||||
this.driverForm.qualificationStartDate = startDate;
|
||||
}
|
||||
if (/(长期|永久)/.test(validUntil)) {
|
||||
this.driverForm.qualificationLongTerm = 1;
|
||||
this.driverForm.qualificationEndDate = '';
|
||||
} else if (dateList.length) {
|
||||
this.driverForm.qualificationEndDate = this.normalizeBirthday(dateList[dateList.length - 1]);
|
||||
this.driverForm.qualificationLongTerm = 0;
|
||||
} else {
|
||||
const endDate = this.normalizeBirthday(validUntil);
|
||||
if (endDate) {
|
||||
this.driverForm.qualificationEndDate = endDate;
|
||||
this.driverForm.qualificationLongTerm = 0;
|
||||
}
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
['qualificationType', 'qualificationNo', 'qualificationEndDate'].forEach(prop => {
|
||||
@@ -1640,22 +1700,25 @@ export default {
|
||||
});
|
||||
});
|
||||
},
|
||||
getQualificationType(data = {}) {
|
||||
const fieldValue = this.getOcrValue(data, ['从业资格类别', '从业资格类型']);
|
||||
if (fieldValue) return String(fieldValue).trim();
|
||||
const words = this.getBaiduOcrWords(data);
|
||||
const labelIndex = words.findIndex(word => /从业资格类别|从业资格类型/.test(word));
|
||||
if (labelIndex < 0) return '';
|
||||
const firstValue = words[labelIndex].replace(/^.*?(?:从业资格类别|从业资格类型)\s*[:：]?/, '').trim();
|
||||
const values = firstValue ? [firstValue] : [];
|
||||
for (let index = labelIndex + 1; index < words.length; index += 1) {
|
||||
const word = String(words[index] || '').trim();
|
||||
if (!word || /^(有效起始日期|有效期限|核发机关|继续教育信息|诚信考核信息)/.test(word)) {
|
||||
break;
|
||||
}
|
||||
values.push(word);
|
||||
normalizeQualificationOcrFields(result = {}) {
|
||||
if (result.fields && typeof result.fields === 'object' && !Array.isArray(result.fields)) {
|
||||
return result.fields;
|
||||
}
|
||||
return values.join('').replace(/[，,；;]+$/, '').trim();
|
||||
const keyInfos = result.key_info || result.keyInfo || result.keyInfos || [];
|
||||
if (!Array.isArray(keyInfos)) return {};
|
||||
return Object.fromEntries(
|
||||
keyInfos
|
||||
.filter(item => item && item.key)
|
||||
.map(item => [String(item.key).trim(), String(item.value ?? '').trim()])
|
||||
.filter(([, value]) => value)
|
||||
);
|
||||
},
|
||||
getQualificationOcrValue(fields = {}, keys = []) {
|
||||
const normalizedKeys = keys.map(key => String(key).toLowerCase());
|
||||
const entry = Object.entries(fields).find(([key]) =>
|
||||
normalizedKeys.includes(String(key).toLowerCase())
|
||||
);
|
||||
return entry ? String(entry[1] || '').trim() : '';
|
||||
},
|
||||
matchQualificationType(value = '') {
|
||||
const text = String(value || '').replace(/\s/g, '');
|
||||
@@ -1673,27 +1736,6 @@ export default {
|
||||
);
|
||||
return matched?.value || '';
|
||||
},
|
||||
getQualificationNo(data = {}) {
|
||||
const fieldValue = this.getOcrValue(data, ['从业资格证号', '资格证号', '证书编号']);
|
||||
if (fieldValue) return fieldValue;
|
||||
const words = this.getBaiduOcrWords(data);
|
||||
const labelIndex = words.findIndex(word => /^(?:(?:从业)?资格证号?|证书编号)[:：]?$/.test(word));
|
||||
if (labelIndex >= 0 && words[labelIndex + 1]) {
|
||||
return words[labelIndex + 1];
|
||||
}
|
||||
const certificateLine = words.find(word => /(?:从业)?资格证号?|证书编号/.test(word));
|
||||
const match = certificateLine?.match(/(?:(?:从业)?资格证号?|证书编号)\s*[:：]?\s*([A-Z0-9-]{6,})/i);
|
||||
return match?.[1] || '';
|
||||
},
|
||||
getBaiduOcrWords(data = {}) {
|
||||
const wordsResult = data.words_result || data.wordsResult || {};
|
||||
if (Array.isArray(wordsResult)) {
|
||||
return wordsResult.map(item => item.words || item.value || '').filter(Boolean);
|
||||
}
|
||||
return Object.values(wordsResult)
|
||||
.map(item => (typeof item === 'object' ? item.words || item.value || '' : item || ''))
|
||||
.filter(Boolean);
|
||||
},
|
||||
normalizeNation(value = '') {
|
||||
const nation = String(value || '').trim();
|
||||
if (!nation) return '';
|
||||
|
||||
@@ -147,7 +147,7 @@
|
||||
<el-form-item label="船舶所属组织" prop="organizationName">
|
||||
<el-cascader
|
||||
v-model="organizationCascaderValue"
|
||||
:options="organizationTreeOptions"
|
||||
:options="formOrganizationTreeOptions"
|
||||
:props="organizationCascaderProps"
|
||||
filterable
|
||||
clearable
|
||||
@@ -664,6 +664,8 @@ export default {
|
||||
shipForm: emptyForm(),
|
||||
uploadHeaders: getUploadHeaders(),
|
||||
organizationOptions: [],
|
||||
// 表单「船舶所属组织」只允许选平台公司；搜索栏不受影响
|
||||
restrictFormOrgToPlatformCompany: true,
|
||||
formRules: {
|
||||
organizationName: [{ required: true, message: '请选择船舶所属组织', trigger: 'change' }],
|
||||
shipName: [
|
||||
@@ -710,13 +712,19 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['permission', 'userInfo']),
|
||||
// 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点
|
||||
formOrganizationTreeOptions() {
|
||||
return this.buildFormOrganizationTree();
|
||||
},
|
||||
// 船舶所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
|
||||
organizationCascaderValue: {
|
||||
get() {
|
||||
return this.resolveOrgPath(this.shipForm.organizationName);
|
||||
return this.resolveFormOrgPath(this.shipForm.organizationName);
|
||||
},
|
||||
set(path) {
|
||||
this.shipForm.organizationName = this.resolveOrgName(path);
|
||||
const name = this.resolveOrgName(path);
|
||||
this.shipForm.organizationName = name;
|
||||
this.syncFormOrganizationLegacy(name);
|
||||
},
|
||||
},
|
||||
isAdmin() {
|
||||
@@ -744,8 +752,8 @@ export default {
|
||||
},
|
||||
},
|
||||
created() {
|
||||
// initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
|
||||
this.initDeptTree();
|
||||
this.loadOrganizationOptions();
|
||||
},
|
||||
methods: {
|
||||
hasPermission(code) {
|
||||
@@ -756,9 +764,7 @@ export default {
|
||||
this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
|
||||
const column = this.findColumn(this.option.column, 'organizationName');
|
||||
column.dicData = this.organizationOptions;
|
||||
if (this.shipBox && !this.shipForm.id && !this.shipForm.organizationName) {
|
||||
this.shipForm.organizationName = this.getCurrentOrganizationName();
|
||||
}
|
||||
return this.loadOrganizationOptions();
|
||||
});
|
||||
},
|
||||
flattenDeptOptions(tree = [], level = 0) {
|
||||
@@ -784,6 +790,10 @@ export default {
|
||||
);
|
||||
return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || '';
|
||||
},
|
||||
// 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空
|
||||
getDefaultOrganizationName() {
|
||||
return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
|
||||
},
|
||||
validateField(prop) {
|
||||
this.$refs.shipForm?.validateField(prop);
|
||||
},
|
||||
@@ -875,12 +885,19 @@ export default {
|
||||
this.readonly = readonly;
|
||||
if (!row?.id) {
|
||||
this.shipForm = emptyForm();
|
||||
this.shipForm.organizationName = this.getCurrentOrganizationName();
|
||||
// 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
|
||||
this.shipForm.organizationName = '';
|
||||
this.formOrganizationLegacyName = '';
|
||||
this.shipBox = true;
|
||||
this.whenOrganizationOptionsReady(() => {
|
||||
if (!this.shipBox || this.shipForm.id || this.shipForm.organizationName) return;
|
||||
this.shipForm.organizationName = this.getDefaultOrganizationName();
|
||||
});
|
||||
return;
|
||||
}
|
||||
getDetail(row.id).then(res => {
|
||||
this.shipForm = { ...emptyForm(), ...(res.data.data || {}) };
|
||||
this.syncFormOrganizationLegacy(this.shipForm.organizationName);
|
||||
this.shipBox = true;
|
||||
});
|
||||
},
|
||||
@@ -890,6 +907,7 @@ export default {
|
||||
},
|
||||
resetShip() {
|
||||
this.shipForm = emptyForm();
|
||||
this.formOrganizationLegacyName = '';
|
||||
this.readonly = false;
|
||||
this.submitLoading = false;
|
||||
this.$refs.shipForm?.clearValidate();
|
||||
|
||||
@@ -347,7 +347,7 @@
|
||||
<el-cascader
|
||||
v-model="organizationCascaderValue"
|
||||
:options="organizationFormTreeOptions"
|
||||
:props="formOrgCascaderProps"
|
||||
:props="organizationFormCascaderProps"
|
||||
filterable
|
||||
clearable
|
||||
placeholder="请选择"
|
||||
@@ -702,6 +702,8 @@ export default {
|
||||
// 表单两个级联各自维护路径，避免名称回写互相覆盖；不要与搜索栏共用同一棵树节点
|
||||
organizationCascaderPath: [],
|
||||
useDepartmentCascaderPath: [],
|
||||
// 表单「所属组织」只允许选平台公司，「使用部门」仍是全量组织
|
||||
restrictFormOrgToPlatformCompany: true,
|
||||
formOrgCascaderProps: {
|
||||
value: 'id',
|
||||
label: 'label',
|
||||
@@ -757,11 +759,17 @@ export default {
|
||||
},
|
||||
// 两个级联必须使用克隆后的独立树，否则 checkStrictly 会在节点上互相抢选中态
|
||||
organizationFormTreeOptions() {
|
||||
return this.cloneOrgTree(this.organizationTreeOptions);
|
||||
return this.cloneOrgTree(this.buildFormOrganizationTree());
|
||||
},
|
||||
useDepartmentFormTreeOptions() {
|
||||
return this.cloneOrgTree(this.organizationTreeOptions);
|
||||
},
|
||||
// 所属组织级联的可选范围：只放开平台公司；使用部门仍用 formOrgCascaderProps 全量可选
|
||||
organizationFormCascaderProps() {
|
||||
return this.restrictFormOrgToPlatformCompany
|
||||
? { ...this.formOrgCascaderProps, disabled: data => this.platformCompanyOrgDisabled(data) }
|
||||
: this.formOrgCascaderProps;
|
||||
},
|
||||
// 所属组织级联：本地保存 id 路径，名称同步到表单字段供后端使用
|
||||
organizationCascaderValue: {
|
||||
get() {
|
||||
@@ -769,7 +777,9 @@ export default {
|
||||
},
|
||||
set(path) {
|
||||
this.organizationCascaderPath = Array.isArray(path) ? [...path] : [];
|
||||
this.vehicleForm.organizationName = this.resolveOrgName(this.organizationCascaderPath);
|
||||
const name = this.resolveOrgName(this.organizationCascaderPath);
|
||||
this.vehicleForm.organizationName = name;
|
||||
this.syncFormOrganizationLegacy(name);
|
||||
},
|
||||
},
|
||||
// 使用部门级联：独立路径状态，避免与所属组织共用计算回写导致选不中
|
||||
@@ -810,7 +820,6 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.initDeptTree();
|
||||
this.loadOrganizationOptions();
|
||||
},
|
||||
watch: {
|
||||
organizationTreeOptions() {
|
||||
@@ -852,17 +861,15 @@ export default {
|
||||
}));
|
||||
},
|
||||
syncOrgCascaderPaths() {
|
||||
this.organizationCascaderPath = this.resolveOrgPath(this.vehicleForm.organizationName);
|
||||
this.organizationCascaderPath = this.resolveFormOrgPath(this.vehicleForm.organizationName);
|
||||
this.useDepartmentCascaderPath = this.resolveOrgPath(this.vehicleForm.useDepartment);
|
||||
},
|
||||
initDeptTree() {
|
||||
this.loadOrganizationOptions();
|
||||
getDeptTree(this.userInfo.tenantId).then(res => {
|
||||
this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
|
||||
const column = this.findColumn(this.option.column, 'organizationName');
|
||||
column.dicData = this.organizationOptions;
|
||||
if (this.vehicleBox && !this.vehicleForm.id && !this.vehicleForm.organizationName) {
|
||||
this.vehicleForm.organizationName = this.getCurrentOrganizationName();
|
||||
}
|
||||
if (this.vehicleBox && !this.vehicleForm.useDepartment) {
|
||||
this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
|
||||
}
|
||||
@@ -894,6 +901,10 @@ export default {
|
||||
);
|
||||
return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || '';
|
||||
},
|
||||
// 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空
|
||||
getDefaultOrganizationName() {
|
||||
return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
|
||||
},
|
||||
digitsOnly(value = '') {
|
||||
return String(value).replace(/\D/g, '');
|
||||
},
|
||||
@@ -961,11 +972,18 @@ export default {
|
||||
this.readonly = readonly;
|
||||
if (!row?.id) {
|
||||
this.vehicleForm = emptyForm();
|
||||
this.vehicleForm.organizationName = this.getCurrentOrganizationName();
|
||||
// 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
|
||||
this.vehicleForm.organizationName = '';
|
||||
this.formOrganizationLegacyName = '';
|
||||
this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
|
||||
this.syncOrgCascaderPaths();
|
||||
this.syncPlateNo(false);
|
||||
this.vehicleBox = true;
|
||||
this.whenOrganizationOptionsReady(() => {
|
||||
if (!this.vehicleBox || this.vehicleForm.id || this.vehicleForm.organizationName) return;
|
||||
this.vehicleForm.organizationName = this.getDefaultOrganizationName();
|
||||
this.syncOrgCascaderPaths();
|
||||
});
|
||||
return;
|
||||
}
|
||||
getDetail(row.id).then(res => {
|
||||
@@ -977,6 +995,7 @@ export default {
|
||||
if (!this.vehicleForm.useDepartment) {
|
||||
this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
|
||||
}
|
||||
this.syncFormOrganizationLegacy(this.vehicleForm.organizationName);
|
||||
this.syncOrgCascaderPaths();
|
||||
this.splitPlateNo();
|
||||
this.syncPlateNo(false);
|
||||
@@ -989,6 +1008,7 @@ export default {
|
||||
},
|
||||
resetVehicle() {
|
||||
this.vehicleForm = emptyForm();
|
||||
this.formOrganizationLegacyName = '';
|
||||
this.organizationCascaderPath = [];
|
||||
this.useDepartmentCascaderPath = [];
|
||||
this.vehicleCertificateUploads = {};
|
||||
@@ -1610,6 +1630,16 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
// 列表组织列超长时单行省略
|
||||
.org-cell-text {
|
||||
display: inline-block;
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
vertical-align: bottom;
|
||||
}
|
||||
|
||||
// 编辑弹窗：灰底 + section-card 白卡分组
|
||||
.vehicle-form {
|
||||
:deep(.el-form-item__label) {
|
||||
@@ -1641,18 +1671,7 @@ export default {
|
||||
flex: 0 0 calc(4em + 24px) !important;
|
||||
width: calc(4em + 24px) !important;
|
||||
}
|
||||
}
|
||||
|
||||
.org-cell-text {
|
||||
display: inline-block;
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
vertical-align: bottom;
|
||||
}
|
||||
|
||||
.vehicle-form {
|
||||
.org-cascader-tooltip {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@@ -1409,9 +1409,10 @@
|
||||
<el-form-item label="自评得分" :required="isOfflineScore">
|
||||
<el-input
|
||||
v-if="isOfflineScore"
|
||||
v-model="currentScore.selfScore"
|
||||
:model-value="formatScoreValue(currentScore.selfScore)"
|
||||
maxlength="10"
|
||||
:disabled="readonly"
|
||||
placeholder="请输入自评得分"
|
||||
@input="handleOfflineSelfScoreInput"
|
||||
@blur="recalculateOfflineScore"
|
||||
>
|
||||
@@ -2489,8 +2490,14 @@ export default {
|
||||
];
|
||||
const rows = categoryMap.map((category, index) => {
|
||||
const details = this.getScoreCategoryDetails(category.categoryCode);
|
||||
let selfScore = details.reduce((sum, item) => sum + Number(item.selfScore || 0), 0);
|
||||
let reviewScore = details.reduce((sum, item) => sum + Number(item.reviewScore || 0), 0);
|
||||
const sumCategoryScore = prop =>
|
||||
details.reduce((sum, item) => {
|
||||
if (this.isBlankScore(item[prop])) return sum;
|
||||
const value = Number(item[prop]);
|
||||
return sum + (Number.isFinite(value) ? value : 0);
|
||||
}, 0);
|
||||
let selfScore = sumCategoryScore('selfScore');
|
||||
let reviewScore = sumCategoryScore('reviewScore');
|
||||
// 暂定：加分/减分合计最高按 15 分计（分类汇总展示封顶后值）
|
||||
if (category.categoryCode === 'plus') {
|
||||
selfScore = Math.min(selfScore, HARDCODED_MAX_PLUS_SCORE);
|
||||
@@ -4552,6 +4559,9 @@ export default {
|
||||
quantificationId: score.quantificationId ? String(score.quantificationId) : '',
|
||||
evaluateMode: score.evaluateMode === 'offline' ? 'offline' : 'online',
|
||||
nextEvaluateDate: score.nextEvaluateDate || '',
|
||||
selfScore: this.normalizeScoreInputValue(score.selfScore),
|
||||
reviewScore: this.normalizeScoreInputValue(score.reviewScore),
|
||||
finalScore: this.normalizeScoreInputValue(score.finalScore),
|
||||
applyCreditLimit: this.normalizeOptionalAmount(
|
||||
score.applyCreditLimit === undefined
|
||||
? this.archiveForm.applyCreditLimit
|
||||
@@ -4565,6 +4575,8 @@ export default {
|
||||
details: (score.details || []).map(detail => ({
|
||||
...detail,
|
||||
scoreInput: this.normalizeScoreInputValue(detail.scoreInput),
|
||||
selfScore: this.normalizeScoreInputValue(detail.selfScore),
|
||||
reviewScore: this.normalizeScoreInputValue(detail.reviewScore),
|
||||
})),
|
||||
};
|
||||
},
|
||||
@@ -5345,7 +5357,9 @@ export default {
|
||||
return this.getScoreDetailCategoryCode(detail) === 'basic';
|
||||
},
|
||||
getSignedScore(detail, prop) {
|
||||
const score = Number(detail[prop] || 0);
|
||||
if (this.isBlankScore(detail[prop])) return '';
|
||||
const score = Number(detail[prop]);
|
||||
if (!Number.isFinite(score)) return '';
|
||||
return this.isMinusScoreDetail(detail) && score > 0 ? -score : score;
|
||||
},
|
||||
getScoreItemFullScore(detail = {}) {
|
||||
@@ -5419,7 +5433,12 @@ export default {
|
||||
const basicDetails = this.getScoreCategoryDetailsByList(details, 'basic');
|
||||
const plusDetails = this.getScoreCategoryDetailsByList(details, 'plus');
|
||||
const minusDetails = this.getScoreCategoryDetailsByList(details, 'minus');
|
||||
const sumScore = (list, prop) => list.reduce((sum, item) => sum + Number(item[prop] || 0), 0);
|
||||
const sumScore = (list, prop) =>
|
||||
list.reduce((sum, item) => {
|
||||
if (this.isBlankScore(item[prop])) return sum;
|
||||
const value = Number(item[prop]);
|
||||
return sum + (Number.isFinite(value) ? value : 0);
|
||||
}, 0);
|
||||
const rawPlusSelf = sumScore(plusDetails, 'selfScore');
|
||||
const rawPlusReview = sumScore(plusDetails, 'reviewScore');
|
||||
const rawMinusSelf = sumScore(minusDetails, 'selfScore');
|
||||
@@ -5434,33 +5453,51 @@ export default {
|
||||
const hasReviewScore = details.some(
|
||||
item => !this.isBlankScore(item.reviewScore)
|
||||
);
|
||||
// 线下模式允许手工改自评得分：有手工值时优先采用，否则回退明细合计
|
||||
// 线下模式允许手工改自评得分：有手工值时优先采用，否则回退明细合计；-1 视为未填
|
||||
const isOffline = String(score.evaluateMode || '') === 'offline';
|
||||
const hasManualSelfScore = isOffline && !this.isBlankScore(score.selfScore);
|
||||
const hasFilledDetail = details.some(item => {
|
||||
if (this.isScoreTypeDetail(item)) {
|
||||
const input = String(item.scoreInput ?? '').trim();
|
||||
return input !== '' && input !== '-' && input !== '.';
|
||||
}
|
||||
return !this.isBlankScore(item.selectedOption);
|
||||
});
|
||||
const manualSelfScore = Number(score.selfScore);
|
||||
const selfScore =
|
||||
isOffline && Number.isFinite(manualSelfScore) && String(score.selfScore ?? '').trim() !== ''
|
||||
? manualSelfScore
|
||||
: computedSelfScore;
|
||||
hasManualSelfScore && Number.isFinite(manualSelfScore) ? manualSelfScore : computedSelfScore;
|
||||
const finalScore = hasReviewScore ? reviewScore : selfScore;
|
||||
const fullMark = this.getScoreFullMark(details);
|
||||
const scoreRate =
|
||||
fullMark > 0 ? Math.max(0, Math.min(100, (finalScore / fullMark) * 100)) : 0;
|
||||
const standard = this.matchCreditStandard(score, scoreRate);
|
||||
const hasStandards = (score.standards || []).some(item => item && item.creditLevel);
|
||||
score.selfScore = Number(Number(selfScore).toFixed(2));
|
||||
// 线下未手工填写且明细未实际填报时保留空，避免默认写出 -1/0
|
||||
const keepOfflineScoreBlank = isOffline && !hasManualSelfScore && !hasFilledDetail;
|
||||
score.selfScore = keepOfflineScoreBlank ? '' : Number(Number(selfScore).toFixed(2));
|
||||
score.reviewScore = Number(reviewScore.toFixed(2));
|
||||
score.finalScore = Number(Number(finalScore).toFixed(2));
|
||||
score.scoreRate = Number(scoreRate.toFixed(2));
|
||||
score.finalScore =
|
||||
keepOfflineScoreBlank && !hasReviewScore ? '' : Number(Number(finalScore).toFixed(2));
|
||||
score.scoreRate = keepOfflineScoreBlank && !hasReviewScore ? '' : Number(scoreRate.toFixed(2));
|
||||
if (hasStandards) {
|
||||
score.creditLevel = standard?.creditLevel || '';
|
||||
score.maxCreditLimit = standard
|
||||
? this.calculateCreditLimitByStandard(standard, scoreRate)
|
||||
: '';
|
||||
score.creditLevel = keepOfflineScoreBlank && !hasReviewScore ? '' : standard?.creditLevel || '';
|
||||
score.maxCreditLimit =
|
||||
keepOfflineScoreBlank && !hasReviewScore
|
||||
? ''
|
||||
: standard
|
||||
? this.calculateCreditLimitByStandard(standard, scoreRate)
|
||||
: '';
|
||||
}
|
||||
return score;
|
||||
},
|
||||
isBlankScore(value) {
|
||||
return value === undefined || value === null || String(value).trim() === '';
|
||||
return (
|
||||
value === undefined ||
|
||||
value === null ||
|
||||
value === -1 ||
|
||||
value === '-1' ||
|
||||
String(value).trim() === ''
|
||||
);
|
||||
},
|
||||
hasIncompleteBasicScoreDetail(details = []) {
|
||||
return this.getScoreCategoryDetailsByList(details, 'basic').some(item => {
|
||||
@@ -5968,6 +6005,27 @@ export default {
|
||||
this.currentScore.evaluateMode = mode === 'offline' ? 'offline' : 'online';
|
||||
if (this.isOfflineScore) {
|
||||
this.expandedScoreCategoryKeys = [];
|
||||
// 切到线下且明细尚未实际填报时清空自评，避免沿用线上合计或 -1 哨兵值
|
||||
const hasFilledDetail = (this.currentScore.details || []).some(item => {
|
||||
if (this.isScoreTypeDetail(item)) {
|
||||
const input = String(item.scoreInput ?? '').trim();
|
||||
return input !== '' && input !== '-' && input !== '.';
|
||||
}
|
||||
return !this.isBlankScore(item.selectedOption);
|
||||
});
|
||||
if (!hasFilledDetail || this.isBlankScore(this.currentScore.selfScore)) {
|
||||
this.currentScore.selfScore = '';
|
||||
}
|
||||
if (!hasFilledDetail || this.isBlankScore(this.currentScore.finalScore)) {
|
||||
this.currentScore.finalScore = '';
|
||||
}
|
||||
if (!hasFilledDetail) {
|
||||
this.currentScore.scoreRate = '';
|
||||
this.currentScore.creditLevel = '';
|
||||
this.currentScore.maxCreditLimit = '';
|
||||
}
|
||||
} else {
|
||||
this.calculateScore(this.currentScore);
|
||||
}
|
||||
},
|
||||
handleOfflineSelfScoreInput(value) {
|
||||
@@ -5981,6 +6039,19 @@ export default {
|
||||
},
|
||||
recalculateOfflineScore() {
|
||||
if (!this.isOfflineScore) return;
|
||||
if (this.isBlankScore(this.currentScore.selfScore)) {
|
||||
this.currentScore.selfScore = '';
|
||||
const hasReviewScore = (this.currentScore.details || []).some(
|
||||
item => !this.isBlankScore(item.reviewScore)
|
||||
);
|
||||
if (!hasReviewScore) {
|
||||
this.currentScore.finalScore = '';
|
||||
}
|
||||
this.currentScore.scoreRate = '';
|
||||
this.currentScore.creditLevel = '';
|
||||
this.currentScore.maxCreditLimit = '';
|
||||
return;
|
||||
}
|
||||
const selfScore = Number(this.currentScore.selfScore);
|
||||
if (!Number.isFinite(selfScore)) return;
|
||||
this.currentScore.selfScore = Number(selfScore.toFixed(2));
|
||||
|
||||
Reference in New Issue
Block a user