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 | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue b/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue
index 49b5bed..27716e4 100644
--- a/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue
+++ b/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue
@@ -1,35 +1,25 @@
<template>
<zt-dialog ref="dialog" @confirm="formSubmit">
<el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
- <zt-form-item label="绫诲瀷" prop="type">
- <el-input v-model="dataForm.type"></el-input>
- </zt-form-item>
- <zt-form-item label="瀛愮被鍨�" prop="subType">
- <el-input v-model="dataForm.subType"></el-input>
- </zt-form-item>
+
<zt-form-item label="鍥剧墖鍚嶇О" prop="name" rules="required">
<el-input v-model="dataForm.name"></el-input>
+ </zt-form-item>
+ <zt-form-item label="浜у搧绫诲瀷" prop="productType" rules="required">
+ <zt-dict v-model="dataForm.productType" dict="product"></zt-dict>
+ </zt-form-item>
+ <zt-form-item label="鏄惁榛樿" prop="isDefault" rules="required">
+ <zt-dict v-model="dataForm.isDefault" dict="is_or_not"></zt-dict>
</zt-form-item>
<zt-form-item label="妫�绱㈠叧閿瓧" prop="contentType">
<el-input v-model="dataForm.contentType"></el-input>
</zt-form-item>
- <zt-form-item label="绯荤粺鏍囪瘑" prop="systemMark">
- <zt-dict v-model="dataForm.systemMark" dict="product"></zt-dict>
- </zt-form-item>
- <zt-form-item label="鎺掑簭" prop="sortNo">
- <el-input v-model="dataForm.sortNo" :readonly="readonly" @input=""></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>
@@ -44,12 +34,10 @@
fileList: [],
dataForm: {
id: '',
- type: '',
- subType: '',
+ isDefault: '',
name: '',
contentType: '',
- systemMark: '',
- sortNo: '',
+ productType: '',
remark: ''
},
readonly: {
@@ -70,6 +58,10 @@
//澶т簬5M锛屼笉鍏佽涓婁紶
if (fileSize > FIVE_M) {
this.$message.error("鏈�澶т笂浼�5M")
+ return false
+ }
+ if (fileSize = 0) {
+ this.$message.error("鏈笂浼犲浘鐗�")
return false
}
},
@@ -96,13 +88,15 @@
params.append('file', x.file)
});
// 灏嗚緭鍏ヨ〃鍗曟暟鎹坊鍔犲埌params琛ㄥ崟涓�
+ if (!this.dataForm.id){
+ this.dataForm.id = 0
+ }
params.append('id', this.dataForm.id)
- params.append('type', this.dataForm.type)
- params.append('subType', this.dataForm.subType)
+ params.append('isDefault', this.dataForm.isDefault)
params.append('name', this.dataForm.name)
params.append('contentType', this.dataForm.contentType)
- params.append('systemMark', this.dataForm.systemMark)
- params.append('sortNo', this.dataForm.sortNo)
+ params.append('productType', this.dataForm.productType)
+ params.append('remark', this.dataForm.remark)
console.log(params, 'async formSubmit()')
let res = await this.$http.post('/sysPictureBase/save', params)
if (res.success) {
@@ -123,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