Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 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 {