From dda4c08d41693d2495a13e7db230c3e9747540de Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 02 九月 2025 10:33:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue b/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
index 4cb5738..e76662d 100644
--- a/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
@@ -218,6 +218,7 @@
// },
billSystemNo: {
label: '璐﹀崟绯荤粺缂栧彿',
+ showOverflowTooltip: true,
search: true,
rules: [
{
@@ -228,6 +229,8 @@
},
billName: {
label: '璐﹀崟鍚嶇О',
+ minWidth: 200,
+ showOverflowTooltip: true,
rules: [
{
required: true,
@@ -241,6 +244,7 @@
search: true,
minWidth: 220,
search: true,
+ showOverflowTooltip: true,
type: 'select', // 璁剧疆涓轰笅鎷夋绫诲瀷
dicData: [], // 浣跨敤 selectCustomName 浣滀负鏁版嵁婧�
disabled: false // 鏍规嵁闇�瑕佽缃槸鍚︾鐢�
@@ -452,7 +456,17 @@
billId: newForm.value.id,
fileName: newForm.value.attachment
}
- addEstimatedReceivableLog(data).then((res1) => {
+ if (newForm.value.attachment == null || newForm.value.attachment === '' || newForm.value.attachment === undefined) {
+ estimatedReceivableBillSettlement(newForm.value).then((res) => {
+ if (res.code === 200) {
+ onLoad(page.value);
+ proxy.$message.success('鎿嶄綔鎴愬姛');
+ dialog.visible = false;
+ newForm.value = {};
+ }
+ })
+ }else{
+ addEstimatedReceivableLog(data).then((res1) => {
if (res1.code === 200) {
estimatedReceivableBillSettlement(newForm.value).then((res) => {
if (res.code === 200) {
@@ -464,6 +478,9 @@
})
}
})
+ }
+
+
} else {
// 琛ㄥ崟楠岃瘉澶辫触
return false;
@@ -579,4 +596,11 @@
padding: 8px 11px;
width: 200px;
}
-</style>
\ No newline at end of file
+:deep(.avue-crud__table) {
+ overflow-y: auto;
+}
+
+:deep(.el-scrollbar__bar.is-horizontal) {
+ pointer-events: auto;
+}
+</style>
--
Gitblit v1.8.0