Merge remote-tracking branch 'origin/dev' into dev

src/views/material/basicFile/index.vue

@@ -99,7 +99,7 @@
         <el-col :span="1.5">
           <el-button-group>
             <el-button size="small" @click="handleImport" v-hasPermi="['system:material:import']">批量导入</el-button>
-            <el-button size="small" @click="handleExport" v-hasPermi="['system:material:export']">批量导出</el-button>
+            <el-button size="small" @click="handleQueryExport" v-hasPermi="['system:material:export']">批量导出</el-button>
           </el-button-group>
         </el-col>
 
@@ -458,8 +458,14 @@
       handleChangeFile(file, fileList) {
         this.importData.list = fileList;
       },
-      // 批量导出
-      handleExport() {
+
+      // 查询条件导出
+      handleQueryExport(){
+        console.log(this.params,'this.params');
+        this.download('/system/material/export', this.params, `物料基本信息${new Date().getTime()}.xlsx`);
+      },
+      // 多选批量导出
+      handleSelectExport() {
 
         let ids = this.checkedList.length ? this.checkedList.map(i => i.id) : [];