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/views/cwgl/voucherSubjectSetting/index.vue | 163 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 125 insertions(+), 38 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/voucherSubjectSetting/index.vue b/ui/admin-ui3/src/views/cwgl/voucherSubjectSetting/index.vue
index 4210196..1234ff4 100644
--- a/ui/admin-ui3/src/views/cwgl/voucherSubjectSetting/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/voucherSubjectSetting/index.vue
@@ -10,30 +10,39 @@
@search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
@size-change="sizeChange" @on-load="onLoad">
<template #menu-left>
- <el-button type="success" icon="Edit" :disabled="pageF.single" v-hasPermi="['cwgl:voucherSubjectSetting:edit']"
+ <!-- <el-button type="success" icon="Edit" :disabled="pageF.single" v-hasPermi="['cwgl:voucherSubjectSetting:edit']"
@click="handleUpdate">淇敼
</el-button>
<el-button type="danger" icon="Delete" :disabled="pageF.multiple" @click="handleDelete"
v-hasPermi="['cwgl:voucherSubjectSetting:remove']">鍒犻櫎
- </el-button>
+ </el-button> -->
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['cwgl:voucherSubjectSetting:export']">瀵煎嚭
</el-button>
</template>
<template #menu="{ row, index, size }">
- <el-button type="primary" text icon="Plus" @click="handleRowAdd(row)">鏂板瀛愰」</el-button>
+ <el-button type="primary" text icon="Plus" v-hasPermi="['cwgl:voucherSubjectSetting:addz']"
+ @click="handleRowAdd(row)">鏂板瀛愰」</el-button>
+ <el-button type="text" icon="View" @click="handleFlow(row)"
+ v-hasPermi="['cwgl:voucherSubjectSetting:flow']">鏃ュ織</el-button>
</template>
</avue-crud>
</basicContainer>
+
+ <OperationLogModal ref="logModalRef" />
+
</template>
<script setup name="voucherSubjectSetting" lang="ts">
+import { listVoucherSubjectSettingLog, } from "@/api/cwgl/voucherSubjectSettingLog";
+
import { VoucherSubjectSettingI, addVoucherSubjectSetting, delVoucherSubjectSetting, exportVoucherSubjectSetting, getVoucherSubjectSetting, listVoucherSubjectSetting, updateVoucherSubjectSetting } from "@/api/cwgl/voucherSubjectSetting";
import useCurrentInstance from "@/utils/useCurrentInstance";
import { computed, reactive, ref, toRefs } from "vue";
import { PagesInterface, PageQueryInterface } from "@/utils/globalInterface";
import { usePagePlus } from "@/hooks/usePagePlus";
import { hasPermission } from "@/utils/permissionUtils";
+import OperationLogModal from '@/components/OperationLogModal/index.vue';
const { proxy } = useCurrentInstance();
const crudRef = ref();
@@ -66,6 +75,10 @@
const option = ref({
pageKey: 'VoucherSubjectSetting',
rowKey: 'id',
+ tree: true, // 寮�鍚爲褰㈣〃鏍兼ā寮�
+ childrenHandler: 'children', // 鎸囧畾瀛愯妭鐐瑰瓧娈靛悕锛岄粯璁や负 children
+ expandAll: true, // 鏄惁榛樿灞曞紑鎵�鏈夎
+ viewBtn: false,
searchSpan: 5,
labelWidth: 150,
searchLabelWidth: 120,
@@ -92,10 +105,10 @@
// }
// ],
// },
- accountSet: {
+
+ type: {
label: '璐﹀',
- search: true,
- minWidth: 120,
+ minWidth: 220,
addDisabled: true,
editDisabled: true,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/sys_accounting_type',
@@ -143,8 +156,7 @@
parentSubjectCode: {
label: '涓婄骇绉戠洰浠ｇ爜',
minWidth: 150,
-
- search: true,
+ hide: true,
// rules: [
// {
// required: true,
@@ -169,16 +181,21 @@
// // }
// // ],
// },
+ // 鍦� option.value.column 涓壘鍒� subjectName
+ // 鎵惧埌 option 閲岀殑 subjectName 鍒�
subjectName: {
label: '绉戠洰鍚嶇О',
- minWidth: 150,
-
+ prop: 'subjectName', // 淇濇寔鍘熷 prop锛岃繖鏍峰脊绐楅噷鐨勮緭鍏ユ鎵嶆槸骞插噣鐨勫悕绉�
+ minWidth: 250, // 鎷兼帴鍚庝細寰堥暱锛屽缓璁皟澶у搴�
search: true,
+ overHidden: true,
+ // --- 浣跨敤 formatter 鏉ユ帶鍒惰〃鏍肩晫闈㈢殑鏄剧ず ---
+ formatter: (row: any) => {
+ // 浼樺厛鏄剧ず鎴戜滑閫掑綊鐢熸垚鐨勬嫾鎺ュ瓧娈碉紝濡傛灉娌℃湁锛堟瘮濡傚垰鏂板杩樻病鍒锋柊鐨勬暟鎹級锛屾樉绀哄師濮嬪悕绉�
+ return row.subjectNameWithParent || row.subjectName;
+ },
rules: [
- {
- required: true,
- message: "绉戠洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur"
- }
+ { required: true, message: "绉戠洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
},
subjectCode: {
@@ -224,7 +241,7 @@
editDisplay: false,
},
accountingItemsContains: {
- label: '鏍哥畻椤圭洰1',
+ label: '鏍哥畻椤圭洰',
minWidth: 150,
search: true,
type: 'select', // 纭繚绫诲瀷涓� select
@@ -241,7 +258,7 @@
}
},
accountingItems: {
- label: '鏍哥畻椤圭洰2',
+ label: '鏍哥畻椤圭洰',
minWidth: 150,
type: 'select',
multiple: true,
@@ -391,8 +408,13 @@
// 銆愬叧閿慨澶嶇偣銆戯細鎷︽埅璇︽儏鎺ュ彛锛屽湪鏁版嵁杩涘叆 form 涔嬪墠瀹屾垚鏍煎紡鍖�
getDetailApi: (id: any) => {
return getVoucherSubjectSetting(id).then((res: any) => {
+ console.log(res);
+
if (res.code === 200 && res.data) {
// 1. 澶勭悊 accountingItems 鏁板瓧杞暟缁�
+ // 1. 濡傛灉 accountSet 鏄暟瀛楋紝杞负瀛楃涓�
+ res.data.accountSet = res.data.accountSet ? String(res.data.accountSet) : "0";
+
if (typeof res.data.accountingItems === 'number') {
res.data.accountingItems = decomposeAccountingItems(res.data.accountingItems);
} else if (!res.data.accountingItems) {
@@ -413,6 +435,47 @@
deleteApi: delVoucherSubjectSetting,
addApi: addVoucherSubjectSetting,
updateApi: updateVoucherSubjectSetting,
+ getListFunc: (res: any) => {
+ // 1. 杞崲鏍戠粨鏋�
+ const tree = proxy.handleTree(res.rows, "id");
+
+ // 2. 閫掑綊鎷兼帴鍚嶇О鍑芥暟 (鏍稿績淇敼)
+ const recursionFormatName = (list: any[], pName = '') => {
+ list.forEach(item => {
+ // 杩欓噷鐨勯�昏緫锛氬鏋滄湁鐖剁骇鍚嶇О锛屾嫾鍦ㄤ竴璧凤紱鍚﹀垯鍙樉绀鸿嚜宸�
+ item.subjectNameWithParent = pName ? `${pName} / ${item.subjectName}` : item.subjectName;
+
+ // 濡傛灉鏈夊瓙鑺傜偣锛岀户缁�掑綊锛屾妸褰撳墠鐨勬嫾鎺ョ粨鏋滀紶缁欏瓙鑺傜偣浣滀负 pName
+ if (item.children && item.children.length > 0) {
+ recursionFormatName(item.children, item.subjectNameWithParent);
+ }
+ });
+ };
+
+ // 鎵ц閫掑綊
+ recursionFormatName(tree);
+
+ // 3. 璧嬪�肩粰琛ㄦ牸鏁版嵁
+ tableData.value = tree;
+
+ // 4. 閫掑綊灞曞紑鎵�鏈夊眰绾� (浣犲師鏈夌殑閫昏緫)
+ nextTick(() => {
+ if (crudRef.value) {
+ const tableMethods = crudRef.value.$refs.table;
+ if (tableMethods && tableData.value) {
+ const expandAllNodes = (list: any[]) => {
+ list.forEach(row => {
+ if (row.children && row.children.length > 0) {
+ tableMethods.toggleRowExpansion(row, true);
+ expandAllNodes(row.children);
+ }
+ });
+ };
+ expandAllNodes(tableData.value);
+ }
+ }
+ });
+ },
handleUpdateFunc: () => {
isFromRow.value = true; // 淇敼鎿嶄綔涔熻涓虹鐢ㄤ笂绾х鐩�
crudRef.value.rowEdit(selectionList.value[0]);
@@ -549,11 +612,23 @@
rowSaveBegin: (row: any, done: any, loading: any) => {
processAccountingItems(row);
delete row.accountingItemsContains;
- // 濡傛灉 row 瀵硅薄閲屽甫浜� id锛屾柊澧炴帴鍙ｅ彲鑳戒細鎶ラ敊鎴栧彉鎴愪慨鏀癸紝濡傛灉鏄《閮ㄦ柊澧烇紝纭繚娌℃湁 id
+
+ // --- 鏍稿績閫昏緫寮�濮� ---
if (!isFromRow.value) {
+ // 1. 纭繚娌℃湁 ID锛堥槻姝㈣鎿嶄綔锛�
delete row.id;
+
+ // 2. 濡傛灉鏄《绾х鐩紙parentId 涓� 0 鎴� 鏃狅級
+ if (row.parentId === 0 || !row.parentId) {
+ // 灏嗕笂绾х鐩唬鐮佽缃负褰撳墠濉啓鐨勭鐩唬鐮�
+ row.parentSubjectCode = row.subjectCode;
+ }
+ } else {
+ // 濡傛灉鏄鍐呮柊澧烇紝parentId 宸茬粡鏄埗鑺傜偣鐨� ID
}
- done(row); // 蹇呴』璋冪敤 done 骞朵紶鍏ュ鐞嗗悗鐨� row 鎵嶄細缁х画璇锋眰鎺ュ彛
+ // --- 鏍稿績閫昏緫缁撴潫 ---
+
+ done(row);
},
// 淇敼淇濆瓨鍓嶇殑閫昏緫
@@ -561,7 +636,7 @@
processAccountingItems(row);
delete row.accountingItemsContains;
if (row.parentSubjectCode == "椤剁骇绉戠洰浠ｇ爜") {
- row.parentSubjectCode = row.subjectCode;
+ row.parentSubjectCode = row.subjectCode;
}
done(row); // 鍚岀悊
},
@@ -593,17 +668,14 @@
};
const handleTabClick = (tab: any) => {
const selectedTabName = tab.props.name;
- console.log("Tab鐐瑰嚮鐨勫��:", selectedTabName);
activeAccountSet.value = selectedTabName;
- queryParams.value.type = selectedTabName;
- const nextParams = {
- ...queryParams.value,
- type: selectedTabName
- };
- // 4. 閲嶇疆鍒嗛〉骞跺姞杞�
+ // 鍏堟竻绌哄綋鍓嶆暟鎹紝闃叉鏃ф暟鎹殑鏍戠粨鏋勫奖鍝嶆柊鏁版嵁鐨勬覆鏌�
+ tableData.value = [];
+
+ queryParams.value.type = selectedTabName;
page.value.currentPage = 1;
- onLoad(page.value, nextParams);
+ onLoad(page.value, { type: selectedTabName });
}
/**
@@ -621,22 +693,37 @@
return result;
}
+
/**
- * 澶勭悊琛屽唴鈥滄柊澧炩�濈偣鍑�
+ * 澶勭悊琛屽唴鈥滄柊澧炲瓙椤光�濈偣鍑�
*/
const handleRowAdd = (row: any) => {
isFromRow.value = true;
- getVoucherSubjectSetting(row.id).then((res: any) => {
+
+ // 1. 鍏堣Е鍙戞柊澧炲姩浣滐紝杩欎細寮瑰嚭绐楀彛骞跺垵濮嬪寲 form
+ crudRef.value.rowAdd();
+
+ // 2. 鍦� DOM 鏇存柊鍚庣殑涓嬩竴娆″惊鐜腑寮哄埗璧嬪��
+ nextTick(() => {
+ // 纭繚璧嬪�肩粰 data 鍝嶅簲寮忓璞′腑鐨� form
+ form.value.parentId = row.id;
+ form.value.parentSubjectCode = row.subjectCode;
+ form.value.accountSet = row.accountSet;
+ form.value.type = row.accountSet;
+ form.value.enabled = "1";
+ form.value.accountingItems = [];
+ });
+};
+
+const logModalRef = ref(null);
+const handleFlow = (row: any) => {
+ // 杩欓噷鍙互浠� row 涓洿鎺ヨ幏鍙栨棩蹇楋紝鎴栬�呰皟鐢ㄥ悗绔帴鍙ｆ煡璇�
+ // 绀轰緥妯℃嫙鏁版嵁
+ listVoucherSubjectSettingLog({ subjectId: row.id }).then((res) => {
if (res.code == 200) {
- form.value = res.data;
- form.value.parentId = form.value.id;
- const num = form.value.accountingItems;
- form.value.accountingItems = decomposeAccountingItems(num);
- // 瑙﹀彂 Avue 鐨勫唴缃柊澧炲脊绐�
- crudRef.value.rowAdd();
+ logModalRef.value.open(res.rows, 'payable');
+
}
});
-
-
-};
+}
</script>
--
Gitblit v1.8.0