From a1ff69f228b7a0d08959e6b25eff2dac6085df8d Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 21 九月 2023 17:59:23 +0800
Subject: [PATCH] 1、优化数据报表模块页面布局 2、修复因时间选择器的showTime属性导致的布局混乱 3、删除假期管理页面中重复的导出按钮组件

---
 src/mixins/JeecgListMixin.js |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index eb70391..c18cf87 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;
@@ -175,7 +172,11 @@
         return
       }
       if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+        // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+        this.$notification.warning({
+          message:'娑堟伅',
+          description:"璇烽�夋嫨涓�鏉¤褰�"
+        });
         return;
       } else {
         var ids = "";
@@ -192,11 +193,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 +224,18 @@
         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();
         } else {
-          that.$message.warning(res.message);
+          // that.$message.warning(res.message);
+          that.$notification.warning({
+            message:'娑堟伅',
+            description:res.message
+          });
         }
       });
     },
@@ -267,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(){
@@ -289,7 +314,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') {

--
Gitblit v1.9.3