zwgczx/JGJS2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
wintsa 2026-03-10 17:16:45 +08:00
parent 5614e315b0
commit bbc8777b74
11 changed files with 197 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/common/HtFeeMethodGrid.vue
View File

@ -610,13 +610,12 @@ watch(
)
watch(
() => pricingPaneReloadStore.seq,
() => pricingPaneReloadStore.persistedSeq,
(nextVersion, prevVersion) => {
if (nextVersion === prevVersion || nextVersion === 0) return
const contractId = String(props.contractId || '').trim()
if (!contractId) return
if (!matchPricingPaneReload(pricingPaneReloadStore.lastEvent, contractId, ZXFW_RELOAD_SERVICE_KEY)) return
if (!matchPricingPaneReload(pricingPaneReloadStore.lastPersistedEvent, contractId, ZXFW_RELOAD_SERVICE_KEY)) return
void loadFromIndexedDB()
}
)

18
src/components/common/XmFactorGrid.vue
View File

@ -117,6 +117,14 @@ const buildDefaultRows = (): FactorRow[] => {
}
type SourceRow = Pick<FactorRow, 'id'> & Partial<Pick<FactorRow, 'budgetValue' | 'remark'>>
const hasMeaningfulFactorValue = (rows: SourceRow[] | undefined) =>
Array.isArray(rows) &&
rows.some(row => {
const hasBudgetValue = typeof row?.budgetValue === 'number' && Number.isFinite(row.budgetValue)
const hasRemark = typeof row?.remark === 'string' && row.remark.trim() !== ''
return hasBudgetValue || hasRemark
})
const mergeWithDictRows = (rowsFromDb: SourceRow[] | undefined): FactorRow[] => {
const dbValueMap = new Map<string, SourceRow>()
for (const row of rowsFromDb || []) {
@ -235,7 +243,7 @@ const loadGridState = async (storageKey: string): Promise<GridState | null> => {
const loadFromIndexedDB = async () => {
try {
const data = await loadGridState(props.storageKey)
if (data) {
if (data && hasMeaningfulFactorValue(data.detailRows)) {
detailRows.value = mergeWithDictRows(data.detailRows)
return
}
@ -243,14 +251,20 @@ const loadFromIndexedDB = async () => {
const parentStorageKey = props.parentStorageKey?.trim()
if (parentStorageKey) {
const parentData = await loadGridState(parentStorageKey)
if (parentData) {
if (parentData && hasMeaningfulFactorValue(parentData.detailRows)) {
detailRows.value = mergeWithDictRows(parentData.detailRows)
await saveToIndexedDB()
return
}
}
if (data) {
detailRows.value = mergeWithDictRows(data.detailRows)
return
}
detailRows.value = buildDefaultRows()
await saveToIndexedDB()
} catch (error) {
console.error('loadFromIndexedDB failed:', error)
detailRows.value = buildDefaultRows()

30
src/components/common/xmCommonAgGrid.vue
View File

@ -179,8 +179,26 @@ const loadFromIndexedDB = async (api: GridApi<DetailRow>) => {
roughCalcEnabled.value = Boolean(contractData?.roughCalcEnabled)
applyPinnedTotalAmount(api, contractData?.totalAmount)
if (contractData?.detailRows) {
detailRows.value = mergeWithDictRows(contractData.detailRows)
const contractRows = Array.isArray(contractData?.detailRows) ? contractData.detailRows : []
const hasContractRows = contractRows.length > 0
const hasContractScaleValue = hasContractRows
? contractRows.some(row => {
const amount = row?.amount
const landArea = row?.landArea
return (
(typeof amount === 'number' && Number.isFinite(amount)) ||
(typeof landArea === 'number' && Number.isFinite(landArea))
)
})
: false
const isLegacyEmptyScaleRows =
hasContractRows &&
!hasContractScaleValue &&
!roughCalcEnabled.value &&
typeof contractData?.totalAmount === 'number' &&
Number.isFinite(contractData.totalAmount)
if (hasContractRows && !isLegacyEmptyScaleRows) {
detailRows.value = mergeWithDictRows(contractRows)
return
}
@ -190,12 +208,8 @@ const loadFromIndexedDB = async (api: GridApi<DetailRow>) => {
roughCalcEnabled.value = Boolean(xmData?.roughCalcEnabled)
applyPinnedTotalAmount(api, xmData?.totalAmount)
if (xmData?.detailRows) {
detailRows.value = mergeWithDictRows(xmData.detailRows.map(e => ({...e,
amount: null,
landArea: null
})))
if (Array.isArray(xmData?.detailRows) && xmData.detailRows.length > 0) {
detailRows.value = mergeWithDictRows(xmData.detailRows)
return
}
}

1
src/components/views/HtConsultCategoryFactor.vue
View File

@ -60,5 +60,6 @@ onActivated(() => {
:dict="filteredServiceDict"
:disable-budget-edit-when-standard-null="true"
:exclude-notshow-by-zxflxs="true"
:init-budget-value-from-standard="true"
/>
</template>

67
src/components/views/HtFeeRateMethodForm.vue
View File

@ -51,6 +51,7 @@ const formatAmount = (value: number | null) =>
value == null ? '' : formatThousandsFlexible(value, 3)
const loadBase = async () => {
const contractId = String(props.contractId || '').trim()
if (!contractId) {
base.value = null
@ -112,14 +113,10 @@ const applyRateInput = () => {
rateInput.value = next == null ? '' : String(next)
}
let saveTimer: ReturnType<typeof setTimeout> | null = null
let basePollTimer: ReturnType<typeof setInterval> | null = null
watch([rate, remark, budgetFee], () => {
if (saveTimer) clearTimeout(saveTimer)
saveTimer = setTimeout(() => {
void saveForm()
}, 250)
})
watch(
@ -130,41 +127,28 @@ watch(
)
watch(
() => pricingPaneReloadStore.seq,
() => pricingPaneReloadStore.persistedSeq,
(nextVersion, prevVersion) => {
console.log(pricingPaneReloadStore.seq)
if (nextVersion === prevVersion || nextVersion === 0) return
const contractId = String(props.contractId || '').trim()
if (!contractId) return
if (!matchPricingPaneReload(pricingPaneReloadStore.lastEvent, contractId, ZXFW_RELOAD_SERVICE_KEY)) return
if (!matchPricingPaneReload(pricingPaneReloadStore.lastPersistedEvent, contractId, ZXFW_RELOAD_SERVICE_KEY)) return
void loadBase()
}
)
onMounted(async () => {
await Promise.all([loadBase(), loadForm()])
if (!basePollTimer) {
basePollTimer = setInterval(() => {
void loadBase()
}, 1000)
}
})
onActivated(async () => {
await Promise.all([loadBase(), loadForm()])
if (!basePollTimer) {
basePollTimer = setInterval(() => {
void loadBase()
}, 1000)
}
})
onBeforeUnmount(() => {
if (saveTimer) clearTimeout(saveTimer)
if (basePollTimer) {
clearInterval(basePollTimer)
basePollTimer = null
}
void saveForm()
})
</script>
@ -175,48 +159,27 @@ onBeforeUnmount(() => {
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
<label class="space-y-1.5">
<div class="text-xs text-muted-foreground">基数（所有服务费预算合计）</div>
<input
type="text"
:value="formatAmount(base)"
readonly
disabled
tabindex="-1"
class="h-9 w-full cursor-not-allowed rounded-md border bg-muted/40 px-3 text-sm text-foreground select-none"
/>
<input type="text" :value="base" readonly disabled tabindex="-1"
class="h-9 w-full cursor-not-allowed rounded-md border bg-muted/40 px-3 text-sm text-foreground select-none" />
</label>
<label class="space-y-1.5">
<div class="text-xs text-muted-foreground">费率（可编辑，三位小数）</div>
<input
v-model="rateInput"
type="text"
inputmode="decimal"
placeholder="请输入费率，建议0.01 ~ 0.05"
<input v-model="rateInput" type="text" inputmode="decimal" placeholder="请输入费率，建议0.01 ~ 0.05"
class="h-9 w-full rounded-md border bg-background px-3 text-sm text-foreground outline-none focus:ring-2 focus:ring-primary/30"
@blur="applyRateInput"
/>
@blur="applyRateInput" />
</label>
<label class="space-y-1.5">
<div class="text-xs text-muted-foreground">预算费用（自动计算）</div>
<input
type="text"
:value="formatAmount(budgetFee)"
readonly
disabled
tabindex="-1"
class="h-9 w-full cursor-not-allowed rounded-md border bg-muted/40 px-3 text-sm text-foreground select-none"
/>
<input type="text" :value="formatAmount(budgetFee)" readonly disabled tabindex="-1"
class="h-9 w-full cursor-not-allowed rounded-md border bg-muted/40 px-3 text-sm text-foreground select-none" />
</label>
<label class="space-y-1.5 md:col-span-2">
<div class="text-xs text-muted-foreground">说明</div>
<textarea
v-model="remark"
rows="4"
placeholder="请输入说明"
class="w-full rounded-md border bg-background px-3 py-2 text-sm text-foreground outline-none focus:ring-2 focus:ring-primary/30"
/>
<textarea v-model="remark" rows="4" placeholder="请输入说明"
class="w-full rounded-md border bg-background px-3 py-2 text-sm text-foreground outline-none focus:ring-2 focus:ring-primary/30" />
</label>
</div>
</div>

1
src/components/views/HtMajorFactor.vue
View File

@ -60,5 +60,6 @@ onActivated(() => {
:dict="filteredMajorDict"
:disable-budget-edit-when-standard-null="true"
:exclude-notshow-by-zxflxs="true"
:init-budget-value-from-standard="true"
/>
</template>

10
src/components/views/HtReserveFee.vue
View File

@ -4,11 +4,19 @@ import HtFeeMethodGrid from '@/components/common/HtFeeMethodGrid.vue'
const props = defineProps<{
contractId: string
contractName?: string
}>()
const STORAGE_KEY = computed(() => `htExtraFee-${props.contractId}-reserve`)
const reserveFeeNames = computed(() => ['预算费'])
</script>
<template>
<HtFeeMethodGrid title="预备费" :storageKey="STORAGE_KEY" :contract-id="props.contractId" />
<HtFeeMethodGrid
title="预备费"
:storageKey="STORAGE_KEY"
:contract-id="props.contractId"
:contract-name="props.contractName"
:fixed-names="reserveFeeNames"
/>
</template>

2
src/components/views/htCard.vue
View File

@ -114,7 +114,7 @@ const reserveFeeView = markRaw(
console.error('加载 HtReserveFee 组件失败：', err);
}
});
return () => h(AsyncHtReserveFee, { contractId: props.contractId });
return () => h(AsyncHtReserveFee, { contractId: props.contractId, contractName: props.contractName });
}
})
);

65
src/components/views/zxFw.vue
View File

@ -918,24 +918,53 @@ const startDragSelect = (event: MouseEvent, code: string) => {
window.addEventListener('mousemove', onDragSelectingMove)
window.addEventListener('mouseup', stopDragSelect)
}
const handleDragHover = (_code: string) => {
if (!dragSelecting.value || !dragMoved.value) return
applyDragSelectionByRect()
}
const buildPersistDetailRows = () => {
const rows = detailRows.value.map(row => ({ ...row }))
const nextInvestScale = getMethodTotalFromRows(rows, 'investScale')
const nextLandScale = getMethodTotalFromRows(rows, 'landScale')
const nextWorkload = getMethodTotalFromRows(rows, 'workload')
const nextHourly = getMethodTotalFromRows(rows, 'hourly')
const fixedSubtotal = addNumbers(nextInvestScale, nextLandScale, nextWorkload, nextHourly)
return rows.map(row =>
isFixedRow(row)
? {
...row,
investScale: nextInvestScale,
landScale: nextLandScale,
workload: nextWorkload,
hourly: nextHourly,
subtotal: fixedSubtotal
}
: {
...row,
subtotal: addNumbers(
valueOrZero(row.investScale),
valueOrZero(row.landScale),
valueOrZero(row.workload),
valueOrZero(row.hourly)
)
}
)
}
const saveToIndexedDB = async () => {
try {
const payload: ZxFwState = {
selectedIds: [...selectedIds.value],
detailRows: JSON.parse(JSON.stringify(detailRows.value))
detailRows: JSON.parse(JSON.stringify(buildPersistDetailRows()))
}
await localforage.setItem(DB_KEY.value, payload)
pricingPaneReloadStore.emitPersisted(props.contractId, ZXFW_RELOAD_SERVICE_KEY)
} catch (error) {
console.error('saveToIndexedDB failed:', error)
}
}
const loadFromIndexedDB = async () => {
try {
const data = await localforage.getItem<ZxFwState>(DB_KEY.value)
@ -1000,7 +1029,10 @@ watch(
() => reloadSignal.value,
(nextVersion, prevVersion) => {
if (nextVersion === prevVersion || nextVersion === 0) return
void loadFromIndexedDB()
void (async () => {
await loadFromIndexedDB()
await saveToIndexedDB()
})()
}
)
@ -1043,15 +1075,10 @@ onBeforeUnmount(() => {
<div class="h-full min-h-0 flex flex-col gap-2">
<!-- 原“浏览框选择服务”实现已抽离并停用，改为直接复选框勾选 -->
<!-- <DialogRoot v-model:open="pickerOpen" @update:open="handlePickerOpenChange" /> -->
<ServiceCheckboxSelector
:services="serviceDict"
:model-value="selectedIds"
@update:model-value="handleServiceSelectionChange"
/>
<ServiceCheckboxSelector :services="serviceDict" :model-value="selectedIds"
@update:model-value="handleServiceSelectionChange" />
<div
class="rounded-lg border bg-card xmMx flex min-h-0 flex-1 flex-col overflow-hidden"
>
<div class="rounded-lg border bg-card xmMx flex min-h-0 flex-1 flex-col overflow-hidden">
<div class="flex items-center justify-between border-b px-3 py-2">
<h3 class="text-xs font-semibold text-foreground leading-none">
咨询服务明细
@ -1060,17 +1087,18 @@ onBeforeUnmount(() => {
</div>
<div class="ag-theme-quartz w-full flex-1 min-h-0">
<AgGridVue :style="{ height: '100%' }" :rowData="detailRows" :columnDefs="columnDefs" :gridOptions="detailGridOptions"
:theme="myTheme" @cell-value-changed="handleCellValueChanged" :enableClipboard="true"
:localeText="AG_GRID_LOCALE_CN" :tooltipShowDelay="500" :headerHeight="30" :undoRedoCellEditing="true"
:undoRedoCellEditingLimit="20" />
<AgGridVue :style="{ height: '100%' }" :rowData="detailRows" :columnDefs="columnDefs"
:gridOptions="detailGridOptions" :theme="myTheme" @cell-value-changed="handleCellValueChanged"
:enableClipboard="true" :localeText="AG_GRID_LOCALE_CN" :tooltipShowDelay="500" :headerHeight="30"
:undoRedoCellEditing="true" :undoRedoCellEditingLimit="20" />
</div>
</div>
<AlertDialogRoot :open="clearConfirmOpen" @update:open="handleClearConfirmOpenChange">
<AlertDialogPortal>
<AlertDialogOverlay class="fixed inset-0 z-50 bg-black/45" />
<AlertDialogContent class="fixed left-1/2 top-1/2 z-[70] w-[92vw] max-w-md -translate-x-1/2 -translate-y-1/2 rounded-lg border bg-background p-5 shadow-xl">
<AlertDialogContent
class="fixed left-1/2 top-1/2 z-[70] w-[92vw] max-w-md -translate-x-1/2 -translate-y-1/2 rounded-lg border bg-background p-5 shadow-xl">
<AlertDialogTitle class="text-base font-semibold">确认恢复默认数据</AlertDialogTitle>
<AlertDialogDescription class="mt-2 text-sm text-muted-foreground">
会使用合同卡片里面最新填写的规模信息以及系数，自动计算默认数据，覆盖“{{ pendingClearServiceName }}”当前数据，是否继续？
@ -1090,7 +1118,8 @@ onBeforeUnmount(() => {
<AlertDialogRoot :open="deleteConfirmOpen" @update:open="handleDeleteConfirmOpenChange">
<AlertDialogPortal>
<AlertDialogOverlay class="fixed inset-0 z-50 bg-black/45" />
<AlertDialogContent class="fixed left-1/2 top-1/2 z-[70] w-[92vw] max-w-md -translate-x-1/2 -translate-y-1/2 rounded-lg border bg-background p-5 shadow-xl">
<AlertDialogContent
class="fixed left-1/2 top-1/2 z-[70] w-[92vw] max-w-md -translate-x-1/2 -translate-y-1/2 rounded-lg border bg-background p-5 shadow-xl">
<AlertDialogTitle class="text-base font-semibold">确认删除服务</AlertDialogTitle>
<AlertDialogDescription class="mt-2 text-sm text-muted-foreground">
将逻辑删除“{{ pendingDeleteServiceName }}”，已填写的数据不会清楚，重新勾选后会恢复，是否继续？

16
src/pinia/pricingPaneReload.ts
View File

@ -9,6 +9,8 @@ export interface PricingPaneReloadDetail {
interface PricingPaneReloadState {
seq: number
lastEvent: PricingPaneReloadDetail | null
persistedSeq: number
lastPersistedEvent: PricingPaneReloadDetail | null
}
const toKey = (value: string | number) => String(value)
@ -16,7 +18,9 @@ const toKey = (value: string | number) => String(value)
export const usePricingPaneReloadStore = defineStore('pricingPaneReload', {
state: (): PricingPaneReloadState => ({
seq: 0,
lastEvent: null
lastEvent: null,
persistedSeq: 0,
lastPersistedEvent: null
}),
actions: {
emit(contractId: string, serviceId: string | number) {
@ -26,7 +30,14 @@ export const usePricingPaneReloadStore = defineStore('pricingPaneReload', {
at: Date.now()
}
this.seq += 1
console.log(this.seq)
},
emitPersisted(contractId: string, serviceId: string | number) {
this.lastPersistedEvent = {
contractId: toKey(contractId),
serviceId: toKey(serviceId),
at: Date.now()
}
this.persistedSeq += 1
}
}
})
@ -39,4 +50,3 @@ export const matchPricingPaneReload = (
if (!detail) return false
return detail.contractId === toKey(contractId) && detail.serviceId === toKey(serviceId)
}

2
tsconfig.tsbuildinfo
View File

@ -1 +1 @@
{"root":["./src/main.ts","./src/sql.ts","./src/components/ui/button/index.ts","./src/components/ui/card/index.ts","./src/components/ui/scroll-area/index.ts","./src/components/ui/tooltip/index.ts","./src/lib/decimal.ts","./src/lib/diyaggridoptions.ts","./src/lib/number.ts","./src/lib/numberformat.ts","./src/lib/pricingmethodtotals.ts","./src/lib/pricingscalefee.ts","./src/lib/utils.ts","./src/lib/xmfactordefaults.ts","./src/lib/zwarchive.ts","./src/lib/zxfwpricingsync.ts","./src/pinia/pricingpanereload.ts","./src/pinia/tab.ts","./src/app.vue","./src/components/common/htfeegrid.vue","./src/components/common/htfeemethodgrid.vue","./src/components/common/methodunavailablenotice.vue","./src/components/common/xmfactorgrid.vue","./src/components/common/xmcommonaggrid.vue","./src/components/ui/button/button.vue","./src/components/ui/card/card.vue","./src/components/ui/card/cardaction.vue","./src/components/ui/card/cardcontent.vue","./src/components/ui/card/carddescription.vue","./src/components/ui/card/cardfooter.vue","./src/components/ui/card/cardheader.vue","./src/components/ui/card/cardtitle.vue","./src/components/ui/scroll-area/scrollarea.vue","./src/components/ui/scroll-area/scrollbar.vue","./src/components/ui/tooltip/tooltipcontent.vue","./src/components/views/ht.vue","./src/components/views/htadditionalworkfee.vue","./src/components/views/htconsultcategoryfactor.vue","./src/components/views/htfeemethodtypelineview.vue","./src/components/views/htmajorfactor.vue","./src/components/views/htreservefee.vue","./src/components/views/servicecheckboxselector.vue","./src/components/views/xmconsultcategoryfactor.vue","./src/components/views/xmmajorfactor.vue","./src/components/views/zxfwview.vue","./src/components/views/htcard.vue","./src/components/views/htinfo.vue","./src/components/views/info.vue","./src/components/views/xmcard.vue","./src/components/views/xminfo.vue","./src/components/views/zxfw.vue","./src/components/views/pricingview/hourlypricingpane.vue","./src/components/views/pricingview/investmentscalepricingpane.vue","./src/components/views/pricingview/landscalepricingpane.vue","./src/components/views/pricingview/workloadpricingpane.vue","./src/layout/tab.vue","./src/layout/typeline.vue"],"version":"5.9.3"}
{"root":["./src/main.ts","./src/sql.ts","./src/components/ui/button/index.ts","./src/components/ui/card/index.ts","./src/components/ui/scroll-area/index.ts","./src/components/ui/tooltip/index.ts","./src/lib/decimal.ts","./src/lib/diyaggridoptions.ts","./src/lib/number.ts","./src/lib/numberformat.ts","./src/lib/pricingmethodtotals.ts","./src/lib/pricingscalefee.ts","./src/lib/utils.ts","./src/lib/xmfactordefaults.ts","./src/lib/zwarchive.ts","./src/lib/zxfwpricingsync.ts","./src/pinia/htfeemethodreload.ts","./src/pinia/pricingpanereload.ts","./src/pinia/tab.ts","./src/app.vue","./src/components/common/hourlyfeegrid.vue","./src/components/common/htfeegrid.vue","./src/components/common/htfeemethodgrid.vue","./src/components/common/methodunavailablenotice.vue","./src/components/common/xmfactorgrid.vue","./src/components/common/xmcommonaggrid.vue","./src/components/ui/button/button.vue","./src/components/ui/card/card.vue","./src/components/ui/card/cardaction.vue","./src/components/ui/card/cardcontent.vue","./src/components/ui/card/carddescription.vue","./src/components/ui/card/cardfooter.vue","./src/components/ui/card/cardheader.vue","./src/components/ui/card/cardtitle.vue","./src/components/ui/scroll-area/scrollarea.vue","./src/components/ui/scroll-area/scrollbar.vue","./src/components/ui/tooltip/tooltipcontent.vue","./src/components/views/ht.vue","./src/components/views/htadditionalworkfee.vue","./src/components/views/htconsultcategoryfactor.vue","./src/components/views/htfeemethodtypelineview.vue","./src/components/views/htfeeratemethodform.vue","./src/components/views/htmajorfactor.vue","./src/components/views/htreservefee.vue","./src/components/views/servicecheckboxselector.vue","./src/components/views/xmconsultcategoryfactor.vue","./src/components/views/xmmajorfactor.vue","./src/components/views/zxfwview.vue","./src/components/views/htcard.vue","./src/components/views/htinfo.vue","./src/components/views/info.vue","./src/components/views/xmcard.vue","./src/components/views/xminfo.vue","./src/components/views/zxfw.vue","./src/components/views/pricingview/hourlypricingpane.vue","./src/components/views/pricingview/investmentscalepricingpane.vue","./src/components/views/pricingview/landscalepricingpane.vue","./src/components/views/pricingview/workloadpricingpane.vue","./src/layout/tab.vue","./src/layout/typeline.vue"],"version":"5.9.3"}