Merge branch 'hrx0627'

src/views/warehouse/suppliesManage/index.vue

@@ -31,9 +31,9 @@
                     <el-col :span="1.5">
                         <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['warehouse:suppliesManage:add']">新增耗材</el-button>
                     </el-col>
-                    <!-- <el-col :span="1.5">
+                    <el-col :span="1.5">
                         <el-button type="warning" plain @click="handleImport" v-hasPermi="['warehouse:suppliesManage:import']">导入</el-button>
-                    </el-col> -->
+                    </el-col>
                     <el-col :span="1.5">
                         <el-button type="warning" plain @click="handleExport" v-hasPermi="['warehouse:suppliesManage:export']">导出</el-button>
                     </el-col>