From 9b5a856a2cfe378f5ca7304a0af17b3d7b06ff69 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期一, 07 七月 2025 11:41:17 +0800 Subject: [PATCH] 1、工厂建模和维修班组页面新增机构编码必填校验 --- src/mixins/JeecgListMixin.js | 79 +++++++++++++++++++++++++++++++-------- 1 files changed, 62 insertions(+), 17 deletions(-) diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js index 9067c9c..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(); @@ -81,11 +84,10 @@ this.ipagination.current = 1; } var params = this.getQueryParams();//鏌ヨ鏉′欢 - + console.log('params',params) if(!params){ return false; } - this.loading = true; getAction(this.url.list, params).then((res) => { if (res.success) { @@ -129,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; //鑾峰彇鐢ㄦ埛瀹氬埗鐨勫弬鏁板睘鎬� @@ -139,7 +141,6 @@ return false; } } - return filterObj(param); }, getQueryField() { @@ -150,7 +151,6 @@ }); return str; }, - onSelectChange(selectedRowKeys, selectionRows) { this.selectedRowKeys = selectedRowKeys; this.selectionRows = selectionRows; @@ -175,7 +175,11 @@ return } if (this.selectedRowKeys.length <= 0) { - this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒'); + // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒'); + this.$notification.warning({ + message:'娑堟伅', + description:"璇烽�夋嫨涓�鏉¤褰�" + }); return; } else { var ids = ""; @@ -192,11 +196,19 @@ if (res.success) { //閲嶆柊璁$畻鍒嗛〉闂 that.reCalculatePage(that.selectedRowKeys.length) - that.$message.success(res.message); + // that.$message.success(res.message); + that.$notification.success({ + message:'娑堟伅', + description:res.message + }); that.loadData(); that.onClearSelected(); } else { - that.$message.warning(res.message); + // that.$message.warning(res.message); + that.$notification.warning({ + message:'娑堟伅', + description:res.message + }); } }).finally(() => { that.loading = false; @@ -215,10 +227,19 @@ if (res.success) { //閲嶆柊璁$畻鍒嗛〉闂 that.reCalculatePage(1) - that.$message.success(res.message); + // that.$message.success(res.message); + that.$notification.success({ + message:'娑堟伅', + description:res.message + }); that.loadData(); + that.clearSelected() } else { - that.$message.warning(res.message); + // that.$message.warning(res.message); + that.$notification.warning({ + message:'娑堟伅', + description:res.message + }); } }); }, @@ -267,10 +288,18 @@ //娓呯┖鍒楄〃閫変腑 this.onClearSelected() }, + /** + * 鐐瑰嚮琛ㄦ牸涓鎯呮寜閽簨浠� + * @param record 閫変腑鐨勫綋鍓嶈鏁版嵁 + */ handleDetail:function(record){ this.$refs.modalForm.edit(record); this.$refs.modalForm.title="璇︽儏"; this.$refs.modalForm.disableSubmit = true; + // 鎵撳紑璇︽儏鎶藉眽鏃剁鐢ㄨ澶囩紪鐮併�佽澶囧悕绉拌緭鍏ユ + this.$refs.modalForm.disSeach = true; + // 璋冪敤鎶藉眽琛ㄥ崟缁勪欢涓殑娓呴櫎琛ㄥ崟楠岃瘉鏂规硶 + this.$refs.modalForm.removeValidate() }, /* 瀵煎嚭 */ handleExportXls2(){ @@ -289,7 +318,11 @@ console.log("瀵煎嚭鍙傛暟",param) downFile(this.url.exportXlsUrl,param).then((data)=>{ if (!data) { - this.$message.warning("鏂囦欢涓嬭浇澶辫触") + // this.$message.warning("鏂囦欢涓嬭浇澶辫触") + this.$notification.warning({ + message:'娑堟伅', + description:"鏂囦欢涓嬭浇澶辫触" + }); return } if (typeof window.navigator.msSaveBlob !== 'undefined') { @@ -323,17 +356,25 @@ this.$warning({ title: message, content: (<div> - <span>{msg}</span><br/> - <span>鍏蜂綋璇︽儏璇� <a href={href} target="_blank" download={fileName}>鐐瑰嚮涓嬭浇</a> </span> - </div> + <span>{msg}</span><br/> + <span>鍏蜂綋璇︽儏璇� <a href={href} target="_blank" download={fileName}>鐐瑰嚮涓嬭浇</a> </span> + </div> ) }) } 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; @@ -355,7 +396,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