1、优化数据报表模块页面布局 2、修复因时间选择器的showTime属性导致的布局混乱 3、删除假期管理页面中重复的导出按钮组件

zhuzhuanzhuan

2023-09-21 a1ff69f228b7a0d08959e6b25eff2dac6085df8d

 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') {