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/makeOutInvoice/index.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ui/admin-ui3/src/components/makeOutInvoice/index.vue b/ui/admin-ui3/src/components/makeOutInvoice/index.vue
index 0235fce..e100c94 100644
--- a/ui/admin-ui3/src/components/makeOutInvoice/index.vue
+++ b/ui/admin-ui3/src/components/makeOutInvoice/index.vue
@@ -16,7 +16,8 @@
<el-descriptions-item :label="type.includes('搴旀敹') ? '寰呮敹閲戦' : '寰呬粯閲戦'">
<span class="text-danger">{{ billInfo.pendingAmount }}</span>
</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="涓氬姟鏈熼棿">{{ billInfo.businessStartDate }} ~ {{ billInfo.businessEndDate
}}</el-descriptions-item>
<el-descriptions-item label="璐﹀崟鍛ㄦ湡">{{ billInfo.billingStartDate }} ~ {{ billInfo.billingEndDate
@@ -135,13 +136,15 @@
import invoiceManagementDialog from "../invoiceManagementDialog/index.vue";
const { proxy } = useCurrentInstance();
-const { sys_invoice_type } = proxy.useDict('sys_invoice_type');
+const { sys_invoice_type,sys_period_type } = proxy.useDict('sys_invoice_type','sys_period_type');
const props = defineProps<{
type: string, // '搴旀敹璐﹀崟寮�绁�' 绛�
InvoiceDetails: string // '鏈寮�绁ㄤ俊鎭�' 鎴� '寮�绁ㄦ槑缁�'
}>()
-
+const dictFormat = (dict: any, value: any) => {
+ return proxy.selectDictLabel(dict, value);
+}
const visible = ref(false)
const loading = ref(false)
const billInfo = ref<any>({})
--
Gitblit v1.8.0