From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/mixins/JeecgListMixin.js | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index 841a3e7..3ac2a01 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({
@@ -295,7 +299,9 @@
// 鎵撳紑璇︽儏鎶藉眽鏃剁鐢ㄨ澶囩紪鐮併�佽澶囧悕绉拌緭鍏ユ
this.$refs.modalForm.disSeach = true;
// 璋冪敤鎶藉眽琛ㄥ崟缁勪欢涓殑娓呴櫎琛ㄥ崟楠岃瘉鏂规硶
- this.$refs.modalForm.removeValidate()
+ this.$nextTick(()=>{
+ if(this.$refs.modalForm.$refs.form)this.$refs.modalForm.$refs.form.clearValidate()
+ })
},
/* 瀵煎嚭 */
handleExportXls2(){
@@ -358,11 +364,19 @@
)
})
} else {
- this.$message.success(info.file.response.message || `${info.file.name} 鏂囦欢涓婁紶鎴愬姛`)
+ // this.$message.success(info.file.response.message || `${info.file.name} 鏂囦欢涓婁紶鎴愬姛`)
+ this.$notification.success({
+ message:'娑堟伅',
+ description:info.file.response.message || `${info.file.name} 鏂囦欢涓婁紶鎴愬姛`
+ });
}
this.loadData()
} else {
- this.$message.error(`${info.file.name} ${info.file.response.message}.`);
+ // this.$message.error(`${info.file.name} ${info.file.response.message}.`);
+ this.$notification.error({
+ message:'娑堟伅',
+ description:`${info.file.name} ${info.file.response.message}.`
+ });
}
} else if (info.file.status === 'error') {
this.loading = false;
@@ -384,7 +398,11 @@
})
}
} else {
- this.$message.error(`鏂囦欢涓婁紶澶辫触: ${info.file.msg} `);
+ // this.$message.error(`鏂囦欢涓婁紶澶辫触: ${info.file.msg} `);
+ this.$notification.error({
+ message:'娑堟伅',
+ description:`鏂囦欢涓婁紶澶辫触: ${info.file.msg} `
+ });
}
}
},
--
Gitblit v1.9.3