From fe18d440586a5cbd8ab98237a395a281fda1a738 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期三, 17 十二月 2025 09:42:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue | 4 ++--
ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue | 2 +-
ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue | 5 +++--
ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue | 2 +-
ui/admin-ui3/src/views/cwgl/estimatedReceivableLog/index.vue | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue b/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
index 742acea..bd6f351 100644
--- a/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
@@ -426,7 +426,7 @@
newParams.feeType = 0;
newParams = proxy.addDateRangeNew(newParams, newParams?.orderDateArray, 'orderDate') || [];
delete newParams.orderDateArray;
-
+ queryParams.value = newParams;
return newParams
}
diff --git a/ui/admin-ui3/src/views/cwgl/estimatedReceivableLog/index.vue b/ui/admin-ui3/src/views/cwgl/estimatedReceivableLog/index.vue
index a1b301e..ebb65fc 100644
--- a/ui/admin-ui3/src/views/cwgl/estimatedReceivableLog/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/estimatedReceivableLog/index.vue
@@ -120,7 +120,7 @@
},
handleSelectionChangeFunc:(selection:any)=>{
selectionList.value = selection;
- }
+ },
})
diff --git a/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue b/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue
index e92f1fe..be53247 100644
--- a/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue
@@ -250,7 +250,7 @@
delete newParams.orderTimeArray;
delete newParams.orderCreatedTimeArray;
delete newParams.dispatchCreatedTimeArray;
-
+ queryParams.value = newParams;
return newParams;
}
diff --git a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
index 38ded24..c9a840a 100644
--- a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
@@ -486,9 +486,10 @@
getBeginListFunc: (params = {}) => {
// 鍒涘缓鏂板弬鏁板璞�
let newParams = { ...params };
- newParams = proxy.addDateRangeNew(newParams, newParams?.createdTimeArray, 'createdTime') || [];
+
+ newParams = proxy.addDateRangeNew(newParams, newParams?.createdTimeArray, 'createdTime') || [];
delete newParams.createdTimeArray;
-
+ queryParams.value = newParams;
return newParams;
}
diff --git a/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue b/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue
index 2c5a3a5..69c36f9 100644
--- a/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue
@@ -180,7 +180,7 @@
// 鍒ゆ柇 itemType 鏄惁涓� '0'锛屽苟涓� itemName 鏈夊��
if (form.value.itemType === '0' && val) {
// 鍦ㄨ繖閲屾坊鍔犱綘鐨勮姹傛帴鍙ｉ�昏緫
- debouncedItemNameChange(val.value);
+ debouncedItemNameChange(val);
// 绀轰緥璇锋眰璋冪敤锛堥渶瑕佹浛鎹负瀹為檯鐨凙PI璋冪敤锛�
// yourApiRequestFunction(val).then(response => {
// // 澶勭悊鍝嶅簲
@@ -363,7 +363,7 @@
// 鍒ゆ柇 itemType 鏄惁涓� '0'锛屽苟涓� itemName 鏈夊��
if (form.value.itemType == 0 && val) {
// 鍦ㄨ繖閲屾坊鍔犱綘鐨勮姹傛帴鍙ｉ�昏緫
- smartLockerApplicationQuery({ licensePlateNumber: val }).then(response => {
+ smartLockerApplicationQuery({ licensePlateNumber: form.value.itemName }).then(response => {
if (response.code == 200) {
form.value.lockerPort = response.data || '';
}
--
Gitblit v1.8.0