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/OperationLogModal/index.vue | 90 ++++++++++++--------------------------------
1 files changed, 25 insertions(+), 65 deletions(-)
diff --git a/ui/admin-ui3/src/components/OperationLogModal/index.vue b/ui/admin-ui3/src/components/OperationLogModal/index.vue
index 64677c0..cc1cc97 100644
--- a/ui/admin-ui3/src/components/OperationLogModal/index.vue
+++ b/ui/admin-ui3/src/components/OperationLogModal/index.vue
@@ -1,13 +1,17 @@
<template>
- <el-dialog v-model="visible" title="鎿嶄綔鏃ュ織" width="1100px" destroy-on-close>
+ <el-dialog v-model="visible" title="鎿嶄綔鏃ュ織" width="1000px" destroy-on-close>
<div class="log-container">
- <avue-crud ref="crudRef" :data="tableData" :option="tableOption" :table-loading="loading">
- <!-- <template #type="{ row }">
- <el-tag :type="getTypeTag(row.type)">
- {{ row.typeDesc || row.type }}
- </el-tag>
- </template> -->
- </avue-crud>
+ <el-table v-if="logModalRef == 'receivable'" v-loading="loading" :data="tableData" border stripe style="width: 100%" max-height="500px">
+ <el-table-column prop="operator" label="鎿嶄綔浜�" width="120" />
+ <el-table-column prop="createTime" label="鎿嶄綔鏃堕棿" width="180" />
+ <el-table-column prop="operationDesc" label="鎿嶄綔鎻忚堪" show-overflow-tooltip />
+ </el-table>
+ <el-table v-if="logModalRef == 'payable'" v-loading="loading" :data="tableData" border stripe style="width: 100%" max-height="500px">
+ <el-table-column prop="createBy" label="鎿嶄綔浜�" width="120" />
+ <el-table-column prop="createTime" label="鎿嶄綔鏃堕棿" width="180" />
+ <el-table-column prop="operation" label="鎿嶄綔鎻忚堪" show-overflow-tooltip />
+ </el-table>
+
</div>
<template #footer>
<el-button @click="visible = false">鍏� 闂�</el-button>
@@ -17,70 +21,21 @@
<script setup lang="ts">
import { ref } from 'vue';
- import { listReceivableFeeManagementLog} from "@/api/cwgl/receivableFeeManagementLog";
-
+// 濡傛灉闇�瑕佽皟鐢ㄦ帴鍙ｈ幏鍙栨暟鎹紝淇濈暀姝ゅ紩鍏�
+// import { listReceivableFeeManagementLog } from "@/api/cwgl/receivableFeeManagementLog";
const visible = ref(false);
const loading = ref(false);
const tableData = ref([]);
-
-const tableOption = {
- header: false,
- tip: false, // 闅愯棌鈥滃綋鍓嶅凡閫夋嫨鈥濇彁绀�
- addBtn: false,
-
- editBtn: false,
- delBtn: false,
- menu: false, // 闅愯棌鎿嶄綔鍒�
- border: true,
- stripe: true,
- column: [
- {
- label: '鎿嶄綔浜�',
- prop: 'operator',
- width: 120
- },
- {
- label: '鎿嶄綔鏃堕棿',
- prop: 'operationTime',
- width: 180
- },
- // {
- // label: '鎿嶄綔绫诲瀷',
- // prop: 'type',
- // slot: true, // 寮�鍚嚜瀹氫箟鎻掓Ы鐢ㄤ簬灞曠ず Tag
- // width: 120
- // },
- {
- label: '鎿嶄綔鎻忚堪',
- prop: 'operationDesc',
- overHidden: true // 鍐呭杩囬暱鏃舵樉绀虹渷鐣ュ彿
- },
- {
- label: '璁板綍鍒涘缓鏃堕棿',
- prop: 'createTime',
- overHidden: true // 鍐呭杩囬暱鏃舵樉绀虹渷鐣ュ彿
- }
- ]
-};
-
-// 鏍规嵁绫诲瀷杩斿洖涓嶅悓鐨� Tag 棰滆壊
-const getTypeTag = (type: string) => {
- const map: Record<string, string> = {
- 'add': 'success',
- 'edit': 'warning',
- 'del': 'danger',
- 'import': 'info',
- 'export': 'primary'
- };
- return map[type] || '';
-};
-
+const logModalRef = ref();
// 鏆撮湶缁欏閮ㄨ皟鐢ㄧ殑鎵撳紑鏂规硶
-const open = (logs: any[]) => {
+const open = (logs: any[],apiString: string) => {
visible.value = true;
loading.value = true;
- // 妯℃嫙寮傛鍔犺浇
+ console.log(apiString);
+
+ logModalRef.value = apiString;
+ // 妯℃嫙鍔犺浇鍔ㄧ敾
setTimeout(() => {
tableData.value = logs || [];
loading.value = false;
@@ -94,4 +49,9 @@
.log-container {
padding: 10px 0;
}
+
+/* 璋冩暣琛ㄦ牸鍐呰竟璺濓紝浣垮叾鏇寸編瑙� */
+:deep(.el-table) {
+ margin-top: 10px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0