From 07e3e588a730569b8f1cd3227c8649208337e4b0 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期二, 19 十二月 2023 13:35:36 +0800 Subject: [PATCH] 1、调整网站标题为MDC智慧车间 2、设备管理页面新增弹窗中统一编码选择弹窗中的查询区域样式调整 3、设备参数阈值管理页面添加参数阈值弹窗中原默认驱动类型为空,现调整为首位数据,且无参数时显示请选择参数 4、加工数量管理页面新增弹窗中选择标准加工时间弹窗中的查询区域样式调整 5、加班管理页面新增弹窗中班次选择弹窗中的查询区域样式调整 --- src/mixins/JeecgListMixin.js | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js index 375daf9..841a3e7 100644 --- a/src/mixins/JeecgListMixin.js +++ b/src/mixins/JeecgListMixin.js @@ -81,11 +81,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) { @@ -139,7 +138,6 @@ return false; } } - return filterObj(param); }, getQueryField() { @@ -150,7 +148,6 @@ }); return str; }, - onSelectChange(selectedRowKeys, selectionRows) { this.selectedRowKeys = selectedRowKeys; this.selectionRows = selectionRows; @@ -287,10 +284,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(){ @@ -347,9 +352,9 @@ 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 { -- Gitblit v1.9.3