From 7b02e5ed98cab7df7c52949c5bba298d1060329b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 09 五月 2024 14:50:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue b/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue
index 6ae2af8..27716e4 100644
--- a/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue
+++ b/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue
@@ -14,16 +14,12 @@
<zt-form-item label="妫�绱㈠叧閿瓧" prop="contentType">
<el-input v-model="dataForm.contentType"></el-input>
</zt-form-item>
- <div class="el-flex img-src" style="height: 20px">
- <el-form-item class="marginTopAndMarginBottom" style="width: 100%">
- <!--<config-uploader :lineHeight="true" busi-type="sys_picture" model-name="dataForm" :dataForm="dataForm"
- v-model="dataForm.files"/>-->
+ <zt-form-item>
<el-upload :limit="1" :http-request="httpRequest" :before-upload="beforeUpload" :on-exceed="handleExceed">
<el-button slot="trigger" size="small" type="primary">閫夊彇鏂囦欢</el-button>
</el-upload>
<el-image v-if="dataForm.id" :src="url+dataForm.id" style="height: 50px;width: 50px"></el-image>
- </el-form-item>
- </div>
+ </zt-form-item>
</el-form>
</zt-dialog>
</template>
@@ -62,6 +58,10 @@
//澶т簬5M锛屼笉鍏佽涓婁紶
if (fileSize > FIVE_M) {
this.$message.error("鏈�澶т笂浼�5M")
+ return false
+ }
+ if (fileSize = 0) {
+ this.$message.error("鏈笂浼犲浘鐗�")
return false
}
},
@@ -117,4 +117,7 @@
margin-top: 10px !important;
margin-bottom: 0 !important;
}
+ /*.zt .el-dialog .el-dialog__body .el-form {
+ min-height: 310px !important;
+ }*/
</style>
--
Gitblit v1.9.1