Merge branch 'master' into feature/20261103-bfi-warehouse-web

# Conflicts:
#	src/option/settlement/formalSettlement.js
This commit is contained in:
刘泉佳
2026-11-04 17:18:51 +08:00
35 changed files with 2022 additions and 665 deletions
@@ -81,6 +81,15 @@
</el-tooltip>
</template>
<template #kingdeeWriteOffStatus="{ row }">
<el-tag
v-if="row.kingdeeSyncStatus === 'synced'"
:type="kingdeeWriteOffTagType(row.kingdeeWriteOffStatus)"
>{{ kingdeeWriteOffName(row.kingdeeWriteOffStatus) || '未校验' }}</el-tag
>
<span v-else>-</span>
</template>
<template #kingdeeLockStatus="{ row }">
<el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
<el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
@@ -119,8 +128,8 @@
<script>
import { invoiceStatusName } from '@/option/settlement/formalSettlementSearch';
import { kingdeeSyncName, paymentStatusName } from '@/option/settlement/formalSettlement';
import { kingdeeStatusType } from '@/utils/kingdee';
import { kingdeeSyncName, kingdeeWriteOffName, paymentStatusName } from '@/option/settlement/formalSettlement';
import { kingdeeStatusType, kingdeeWriteOffTagType } from '@/utils/kingdee';
export default {
name: 'FormalSettlementTablePanel',
@@ -233,6 +242,10 @@ export default {
kingdeeSyncName(value) {
return kingdeeSyncName(value);
},
kingdeeWriteOffName(value) {
return kingdeeWriteOffName(value);
},
kingdeeWriteOffTagType,
lockTag(row) {
if (row.kingdeeLockStatus === 'locked') {
return {