From 242d318e85df66b916f554d64a026cfe0cb58e19 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 15 一月 2026 10:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
ui/admin-ui3/src/components/receivableBillManagementDialog/index.vue | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/ui/admin-ui3/src/components/receivableBillManagementDialog/index.vue b/ui/admin-ui3/src/components/receivableBillManagementDialog/index.vue
index 2c81f15..935799e 100644
--- a/ui/admin-ui3/src/components/receivableBillManagementDialog/index.vue
+++ b/ui/admin-ui3/src/components/receivableBillManagementDialog/index.vue
@@ -15,11 +15,11 @@
<el-input v-model="queryParams.customerName" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="width: 180px" clearable />
</el-form-item>
- <el-form-item label="鐘舵��:">
+ <!-- <el-form-item label="鐘舵��:">
<el-select v-model="queryParams.status" style="width: 150px;" placeholder="璇烽�夋嫨鐘舵��" clearable>
<el-option v-for="dict in sys_bill_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleSearch">鎼滅储</el-button>
@@ -79,7 +79,9 @@
const props = defineProps({
visible: { type: Boolean, default: false },
- defaultSelectedId: { type: [String, Number], default: '' }
+ defaultSelectedId: { type: [String, Number], default: '' },
+ // 鏂板锛氭帴鏀堕粯璁ょ姸鎬�
+ defaultStatus: { type: [String, Number], default: '' }
});
const emit = defineEmits(['confirm', 'close', 'update:visible']);
@@ -138,11 +140,18 @@
};
const handleReset = () => {
- // 閲嶇疆瀛楁蹇呴』涓� queryParams 瀹氫箟鐨勪竴鑷�
+ // 閲嶇疆鍏朵粬鎼滅储瀛楁
queryParams.systemNo = '';
queryParams.billName = '';
queryParams.customerName = '';
- queryParams.status = '';
+
+ // 鏍稿績澶勭悊锛氬鏋滄湁榛樿鐘舵�佸�煎氨鎭㈠榛樿鍊硷紝娌℃湁鎵嶈涓虹┖
+ if (props.defaultStatus !== undefined && props.defaultStatus !== null && props.defaultStatus !== '') {
+ queryParams.status = props.defaultStatus;
+ } else {
+ queryParams.status = '';
+ }
+
handleSearch();
};
@@ -173,6 +182,17 @@
watch(() => props.visible, (newVal) => {
dialogVisible.value = newVal;
if (newVal) {
+ // 鍏抽敭閫昏緫锛氬鏋� props 浼犱簡榛樿鐘舵�佸氨鐢ㄥ畠锛屽惁鍒欒缃负绌哄瓧绗︿覆
+ // 浣跨敤 queryParams.status = props.defaultStatus || '';
+ // 浣嗚�冭檻鍒� '0' 鍙兘鏄湁鏁堝�硷紝寤鸿鍒ゆ柇鏄惁涓� undefined 鎴� null
+ if (props.defaultStatus !== undefined && props.defaultStatus !== null) {
+ queryParams.status = props.defaultStatus;
+ } else {
+ queryParams.status = '';
+ }
+
+ // 閲嶇疆椤电爜涓虹涓�椤靛苟鍔犺浇鏁版嵁
+ queryParams.pageNum = 1;
getList();
}
});
--
Gitblit v1.8.0