From 8194a67f3b9248cc80137c78bd3e005949ec38dc Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 23 十二月 2025 17:48:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
ui/admin-ui3/src/views/cwgl/receivableFeeManagement/index.vue | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/receivableFeeManagement/index.vue b/ui/admin-ui3/src/views/cwgl/receivableFeeManagement/index.vue
index d51b095..3c252df 100644
--- a/ui/admin-ui3/src/views/cwgl/receivableFeeManagement/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/receivableFeeManagement/index.vue
@@ -26,8 +26,8 @@
</el-button>
</template>
<template #menu="{ size, row, index }">
- <el-link class="link-btn" type="primary" :underline="false" plain
- :size="size" icon="View" @click="handleExamine(row)" v-hasPermi="['cwgl:receivableFeeManagement:view']"> 鏌ョ湅
+ <el-link class="link-btn" type="primary" :underline="false" plain :size="size" icon="View"
+ @click="handleExamine(row)" v-hasPermi="['cwgl:receivableFeeManagement:view']"> 鏌ョ湅
</el-link>
<el-link class="link-btn" v-if="row.status == 0" type="primary" :underline="false" plain :size="size"
icon="el-icon-edit" @click="handleEdit(row)" v-hasPermi="['cwgl:receivableFeeManagement:edit']"> 缂栬緫
@@ -54,7 +54,7 @@
<script setup name="receivableFeeManagement" lang="ts">
import {
ReceivableFeeManagementI, addReceivableFeeManagement, delReceivableFeeManagement, exportReceivableFeeManagement, getReceivableFeeManagement, listReceivableFeeManagement, updateReceivableFeeManagement,
- getStatistics, addCreateBill,receivableFeeManagementVoid
+ getStatistics, addCreateBill, receivableFeeManagementVoid
} from "@/api/cwgl/receivableFeeManagement";
import useCurrentInstance from "@/utils/useCurrentInstance";
import { computed, reactive, ref, toRefs } from "vue";
@@ -65,7 +65,7 @@
import GenerateBillDialog from '@/components/GenerateBillDialog/index.vue';
import DetailModal from '@/components/DetailModal/index.vue';
import OperationLogModal from '@/components/OperationLogModal/index.vue';
- import { listReceivableFeeManagementLog} from "@/api/cwgl/receivableFeeManagementLog";
+import { listReceivableFeeManagementLog } from "@/api/cwgl/receivableFeeManagementLog";
@@ -167,6 +167,21 @@
}
],
},
+ receivableAmountStr: {
+ label: '搴旀敹閲戦鎻忚堪',
+ minWidth: 150,
+ search: true,
+ formatter: (row) => {
+ if (!row.receivableAmountStr) return '-';
+ // 灏嗙┖鏍兼浛鎹负鎹㈣绗︺�傚鏋滃悗绔繑鍥炵殑鏄� "0娓竵 2420浜烘皯甯�"
+ // 鎴戜滑灏嗗叾杞崲涓� "0娓竵\n2420浜烘皯甯�"
+ return row.receivableAmountStr.replace(/\s+/g, '\n');
+ },
+ styles: {
+ whiteSpace: 'pre-wrap',
+ lineHeight: '1.5'
+ },
+ },
documentNo: {
label: '鍗曟嵁缂栧彿',
minWidth: 150,
@@ -178,7 +193,7 @@
}
],
},
- isInternalSettlement: {
+ isInternalSettlement: {
label: '鏄惁鍐呴儴缁撶畻',
search: true,
minWidth: 120,
@@ -193,7 +208,7 @@
internalSettlementUnit: {
label: '鍐呴儴缁撶畻鍗曚綅',
minWidth: 150,
- search: true,
+ search: true,
},
customerName: {
label: '瀹㈡埛鍚嶇О',
@@ -319,7 +334,6 @@
search: true,
label: '鐘舵��',
fixed: 'right',
- search: true,
minWidth: 120,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/sys_charge',
},
@@ -435,6 +449,7 @@
getStatistics(ids).then((res) => {
if (res.code === 200) {
// 鎵撳紑寮圭獥骞朵紶鍏ユ暟鎹�
+ console.log(selectionList.valu);
billDialogRef.value.open(res.data, selectionList.value);
}
});
@@ -446,9 +461,9 @@
billType: obj.billType,
billName: obj.billName,
statisticsData: statisticsData,
- customerName: selectionList.value[0].customerName,
- isInternalSettlement: selectionList.value[0].isInternalSettlement,
- internalSettlementUnit: selectionList.value[0].internalSettlementUnit,
+ customerName: selectionList.value[0].customerName,
+ isInternalSettlement: selectionList.value[0].isInternalSettlement,
+ internalSettlementUnit: selectionList.value[0].internalSettlementUnit,
};
addCreateBill(payload).then((res) => {
@@ -487,9 +502,9 @@
const handleFlow = (row: any) => {
// 杩欓噷鍙互浠� row 涓洿鎺ヨ幏鍙栨棩蹇楋紝鎴栬�呰皟鐢ㄥ悗绔帴鍙ｆ煡璇�
// 绀轰緥妯℃嫙鏁版嵁
- listReceivableFeeManagementLog({receivableFeeId:row.id}).then((res) => {
+ listReceivableFeeManagementLog({ receivableFeeId: row.id }).then((res) => {
if (res.code == 200) {
- logModalRef.value.open(res.rows);
+ logModalRef.value.open(res.rows,'listReceivableFeeManagementLog');
}
});
@@ -504,3 +519,10 @@
};
</script>
+<style scoped>
+/* 纭繚 el-table 鑳藉璇嗗埆鎹㈣绗� */
+:deep(.el-table .cell) {
+ white-space: pre-wrap !important;
+ word-break: break-all;
+}
+</style>
--
Gitblit v1.8.0