From d9b20efa8bdb66f5e2cb1793314f57ed66e846b3 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 14 一月 2026 15:37:45 +0800
Subject: [PATCH] 新增字段
---
ui/admin-ui3/src/views/cwgl/receivableFeeManagement/index.vue | 89 +++++++++++++++++++++++++++++---------------
1 files changed, 58 insertions(+), 31 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..f7c7232 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']"> 缂栬緫
@@ -46,7 +46,7 @@
<GenerateBillDialog ref="billDialogRef" @confirm="onBillConfirm" />
<DetailModal ref="detailModalRef" />
<OperationLogModal ref="logModalRef" />
- <XlsFileImport title="搴旀敹淇℃伅瀵煎叆" uploadUrl="/asset/management/importData" templateUrl="asset/management/importTemplate"
+ <XlsFileImport title="搴旀敹淇℃伅瀵煎叆" uploadUrl="/cwgl/receivableFeeManagement/importTemplate" templateUrl="/cwgl/receivableFeeManagement/importTemplate"
:open="pageF.importOpen" @submit="importSubmit" @cancel="pageF.importOpen = false" />
</template>
@@ -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";
@@ -131,6 +131,17 @@
// }
// ],
},
+ documentNo: {
+ label: '鍗曟嵁缂栧彿',
+ minWidth: 150,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "鍗曟嵁缂栧彿涓嶈兘涓虹┖", trigger: "blur"
+ }
+ ],
+ },
sourceSystem: {
label: '鏉ユ簮绯荤粺',
minWidth: 120,
@@ -167,18 +178,25 @@
}
],
},
- documentNo: {
- label: '鍗曟嵁缂栧彿',
+ receivableAmountStr: {
+ label: '搴旀敹閲戦',
+ // label: '搴旀敹閲戦鎻忚堪',
+
minWidth: 150,
search: true,
- rules: [
- {
- required: true,
- message: "鍗曟嵁缂栧彿涓嶈兘涓虹┖", trigger: "blur"
- }
- ],
+ formatter: (row) => {
+ if (!row.receivableAmountStr) return '-';
+ // 灏嗙┖鏍兼浛鎹负鎹㈣绗︺�傚鏋滃悗绔繑鍥炵殑鏄� "0娓竵 2420浜烘皯甯�"
+ // 鎴戜滑灏嗗叾杞崲涓� "0娓竵\n2420浜烘皯甯�"
+ return row.receivableAmountStr.replace(/\s+/g, '\n');
+ },
+ styles: {
+ whiteSpace: 'pre-wrap',
+ lineHeight: '1.5'
+ },
},
- isInternalSettlement: {
+
+ isInternalSettlement: {
label: '鏄惁鍐呴儴缁撶畻',
search: true,
minWidth: 120,
@@ -193,7 +211,7 @@
internalSettlementUnit: {
label: '鍐呴儴缁撶畻鍗曚綅',
minWidth: 150,
- search: true,
+ search: true,
},
customerName: {
label: '瀹㈡埛鍚嶇О',
@@ -258,15 +276,15 @@
valueFormat: 'YYYY-MM-DD',
hide: true
},
- receivableAmount: {
- label: '搴旀敹閲戦',
- rules: [
- {
- required: true,
- message: "搴旀敹閲戦涓嶈兘涓虹┖", trigger: "blur"
- }
- ],
- },
+ // receivableAmount: {
+ // label: '搴旀敹閲戦',
+ // rules: [
+ // {
+ // required: true,
+ // message: "搴旀敹閲戦涓嶈兘涓虹┖", trigger: "blur"
+ // }
+ // ],
+ // },
// remark: {
// label: '澶囨敞',
@@ -319,7 +337,6 @@
search: true,
label: '鐘舵��',
fixed: 'right',
- search: true,
minWidth: 120,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/sys_charge',
},
@@ -435,7 +452,8 @@
getStatistics(ids).then((res) => {
if (res.code === 200) {
// 鎵撳紑寮圭獥骞朵紶鍏ユ暟鎹�
- billDialogRef.value.open(res.data, selectionList.value);
+ console.log(selectionList.valu);
+ billDialogRef.value.open(res.data, selectionList.value, 'receivable');
}
});
// // 鎵撳紑寮圭獥骞朵紶鍏ユ暟鎹�
@@ -446,15 +464,17 @@
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) => {
if (res.code === 200) {
proxy.$message.success(res.msg);
billDialogRef.value.cancel();
+ onLoad(page.value);
+
}
});
@@ -487,9 +507,9 @@
const handleFlow = (row: any) => {
// 杩欓噷鍙互浠� row 涓洿鎺ヨ幏鍙栨棩蹇楋紝鎴栬�呰皟鐢ㄥ悗绔帴鍙f煡璇�
// 绀轰緥妯℃嫙鏁版嵁
- 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,'receivable');
}
});
@@ -504,3 +524,10 @@
};
</script>
+<style scoped>
+/* 纭繚 el-table 鑳藉璇嗗埆鎹㈣绗� */
+:deep(.el-table .cell) {
+ white-space: pre-wrap !important;
+ word-break: break-all;
+}
+</style>
--
Gitblit v1.8.0