From 89fd2cf7202c321512c2ea699a3a220a7138ed44 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
ui/admin-ui3/src/components/NestedDetailDialog/index.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ui/admin-ui3/src/components/NestedDetailDialog/index.vue b/ui/admin-ui3/src/components/NestedDetailDialog/index.vue
index ddc24d1..8f98ba3 100644
--- a/ui/admin-ui3/src/components/NestedDetailDialog/index.vue
+++ b/ui/admin-ui3/src/components/NestedDetailDialog/index.vue
@@ -24,7 +24,9 @@
<span class="text-danger">{{ billInfo.pendingAmount }}</span>
</el-descriptions-item>
- <el-descriptions-item label="鍛ㄦ湡绫诲瀷">{{ billInfo.periodType }}</el-descriptions-item>
+ <!-- <el-descriptions-item label="鍛ㄦ湡绫诲瀷">{{ billInfo.periodType }}</el-descriptions-item> -->
+ <el-descriptions-item label="鍛ㄦ湡绫诲瀷">{{ dictFormat(sys_period_type,billInfo.periodType) }}</el-descriptions-item>
+
<el-descriptions-item label="涓氬姟鏈熼棿">
<span v-if="billInfo.businessStartDate">{{ billInfo.businessStartDate }}</span>
<span v-if="billInfo.businessStartDate && billInfo.businessEndDate"> ~ </span>
@@ -74,7 +76,7 @@
<div v-html="formatAmountStr(scope.row.receivableAmountStr)"></div>
</template>
</el-table-column>
- <el-table-column v-if="type == 'payable'" label="'搴斾粯閲戦" align="center">
+ <el-table-column v-if="type == 'payable'" label="搴斾粯閲戦" align="center">
<template #default="scope">
<div v-html="formatAmountStr(scope.row.payableAmountStr)"></div>
</template>
@@ -115,12 +117,12 @@
import { getPayableBillManagement, } from "@/api/cwgl/payableBillManagement";
const { proxy } = useCurrentInstance()
-const { sys_system, sys_business, sys_receipts, sys_supplier, sys_whether_type, sys_currency } = proxy.useDict(
+const { sys_system, sys_business, sys_receipts, sys_supplier, sys_whether_type, sys_currency,sys_period_type } = proxy.useDict(
'sys_system',
'sys_business',
'sys_receipts',
'sys_supplier',
- 'sys_whether_type', 'sys_currency'
+ 'sys_whether_type', 'sys_currency','sys_period_type'
)
const dictFormat = (dict: any, value: any) => {
return proxy.selectDictLabel(dict, value);
--
Gitblit v1.8.0