Merge remote-tracking branch 'origin/master'

lyh

2025-07-04 2637821cb7466330f5c612be809531cb65790219

 src/mixins/JeecgListMixin.js

@@ -54,6 +54,9 @@
  created() {
      if(!this.disableMixinCreated){
        console.log(' -- mixin created -- ')
        // 此处需在loadData函数之前将参数设置为所需要的值，在组件中的created中无法设置，因为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} `
          });
        }
      }
    },