Merge branch 'master' of ssh://10.148.121.100:10022/SmartBench/RuoYi-WMS-VUE

This commit is contained in:
lixiaolong 2026-05-19 10:53:33 +08:00
commit 579085a186

View File

@ -63,7 +63,7 @@
<el-row :gutter="10" class="mb8" type="flex" justify="space-between"> <el-row :gutter="10" class="mb8" type="flex" justify="space-between">
<el-col :span="21"><span style="font-size: large">入库单</span></el-col> <el-col :span="21"><span style="font-size: large">入库单</span></el-col>
<el-col :span="1.5"> <el-col :span="1">
<el-upload <el-upload
ref="uploadRef" ref="uploadRef"
class="upload-demo" class="upload-demo"
@ -76,7 +76,7 @@
:http-request="customUpload" :http-request="customUpload"
accept=".xlsx,.xls" accept=".xlsx,.xls"
> >
<el-button type="primary">导入</el-button> <el-button plain icon="Upload" type="primary">导入</el-button>
</el-upload> </el-upload>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">