From 2637821cb7466330f5c612be809531cb65790219 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 04 七月 2025 20:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/mixins/JeecgListMixin.js | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index b5986e5..686383d 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -54,6 +54,9 @@
created() {
if(!this.disableMixinCreated){
console.log(' -- mixin created -- ')
+ // 姝ゅ闇�鍦╨oadData鍑芥暟涔嬪墠灏嗗弬鏁拌缃负鎵�闇�瑕佺殑鍊硷紝鍦ㄧ粍浠朵腑鐨刢reated涓棤娉曡缃紝鍥犱负mixin鐨勭敓鍛藉懆鏈熷嚱鏁版墽琛岄『搴忎紭鍏堜簬缁勪欢鐨勭敓鍛藉懆鏈熷嚱鏁�
+ const { equipmentId } = this.$route.params
+ if(equipmentId) this.$set(this.queryParam,'equipmentNum',equipmentId)
this.loadData();
//鍒濆鍖栧瓧鍏搁厤缃� 鍦ㄨ嚜宸遍〉闈㈠畾涔�
this.initDictConfig();
@@ -128,7 +131,7 @@
sqp['superQueryMatchType'] = this.superQueryMatchType
}
var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
- param.field = this.getQueryField();
+ if(this.columns) param.field = this.getQueryField();
param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize;
//鑾峰彇鐢ㄦ埛瀹氬埗鐨勫弬鏁板睘鎬�
@@ -230,6 +233,7 @@
description:res.message
});
that.loadData();
+ that.clearSelected()
} else {
// that.$message.warning(res.message);
that.$notification.warning({
--
Gitblit v1.9.3