提交 e4de6f27 authored 作者: hejie's avatar hejie

style: 🎨 合并代码

......@@ -153,26 +153,25 @@
</el-upload>
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row>
<div class="flex flex-row-reverse w-full">
<el-form-item>
<!-- 搜索按钮,点击触发搜索操作 -->
<el-button
type="primary"
:icon="useRenderIcon('ri/search-line')"
:icon="useRenderIcon(Check)"
:loading="loading"
@click="onSearch"
>
搜索
确定
</el-button>
<!-- 重置按钮,点击触发重置表单并重新搜索 -->
<el-button
:icon="useRenderIcon(Refresh)"
@click="resetForm(formRef)"
>
重置
<el-button :icon="useRenderIcon(Close)" @click="resetForm(formRef)">
取消
</el-button>
</el-form-item>
</el-col>
</div>
</el-row>
</el-form>
</div>
......
......@@ -26,7 +26,7 @@ export function useFacForm() {
]
});
const tagName = ref("厂商信息");
const loading = ref(true);
const loading = ref(false);
async function onSearch() {
loading.value = true;
// const { data } = await getRoleList(toRaw(form));
......@@ -54,11 +54,11 @@ export function useFacForm() {
const beforeAvatarUpload: UploadProps["beforeUpload"] = rawFile => {
console.log("rawFile", rawFile);
if (rawFile.type !== "image/jpeg") {
ElMessage.error("Avatar picture must be JPG format!");
if (rawFile.type !== "xlsx/xls") {
ElMessage.error("文件上传类型只支持xlsx/xls!");
return false;
} else if (rawFile.size / 1024 / 1024 > 2) {
ElMessage.error("Avatar picture size can not exceed 2MB!");
ElMessage.error("文件不能超过2MB!");
return false;
}
return true;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论