aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
libing 2023-12-24 13:29:19 +08:00
parent 175289d1d4
commit d0dc3fe1a1
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/emis/emisBrand/index.vue
View File

@ -102,7 +102,6 @@
<el-table-column label="名称" align="center" prop="name" min-width="100" /> <el-table-column label="名称" align="center" prop="name" min-width="100" />
<el-table-column label="英文名称" align="center" prop="nameEn" min-width="100" /> <el-table-column label="英文名称" align="center" prop="nameEn" min-width="100" />
<el-table-column label="logo1" align="center" prop="brandImg" min-width="100" />
<el-table-column label="logo" align="center" prop="logo" min-width="100" /> <el-table-column label="logo" align="center" prop="logo" min-width="100" />
<el-table-column label="备注" align="center" prop="remark" min-width="100" /> <el-table-column label="备注" align="center" prop="remark" min-width="100" />
<el-table-column label="启用" align="center" prop="status" min-width="100" > <el-table-column label="启用" align="center" prop="status" min-width="100" >
@ -160,20 +159,16 @@
<el-input v-model="form.nameEn" placeholder="请输入英文名称" /> <el-input v-model="form.nameEn" placeholder="请输入英文名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--
<el-col :span="24"> <el-col :span="24">
<el-form-item label="logo" prop="logo"> <el-form-item label="logo" prop="logo">
<el-input v-model="form.logo" placeholder="请输入logo" /> <el-input v-model="form.logo" placeholder="请输入logo" />
</el-form-item> </el-form-item>
</el-col> </el-col>
-->
<el-col :span="24"> <el-col :span="24">
<!--
<el-form-item label="品牌图片(多图;号隔开)" prop="brandImg">
<el-input v-model="form.brandImg" placeholder="请输入品牌图片(多图;号隔开)" />
</el-form-item>
-->
<!-- 图片 --> <!-- 图片 -->
<el-form-item label="品牌图片" prop="brandImg"> <el-form-item label="logo" prop="logo">
<el-upload <el-upload
:headers="imgUploadHeaders" :headers="imgUploadHeaders"
action="none" action="none"
@ -334,9 +329,6 @@ export default {
status: [ status: [
{ required: true, message: "0-未开放不能为空", trigger: "blur" } { required: true, message: "0-未开放不能为空", trigger: "blur" }
], ],
brandImg: [
{ required: true, message: "品牌图片不能为空", trigger: "blur" }
],
} }
}; };
}, },
@ -423,7 +415,7 @@ export default {
}, },
handleChange(file, fileList) { handleChange(file, fileList) {
console.log(file); console.log(file);
this.form.brandImg = file; this.form.logo = file;
console.log(11); console.log(11);
const isLt2M = file.size / 1024 / 1024 < 2; const isLt2M = file.size / 1024 / 1024 < 2;
console.log(isLt2M) console.log(isLt2M)

19
src/views/emis/emisRegion/index.vue
View File

@ -173,7 +173,7 @@
<el-table-column label="区域编码" align="left" prop="code" min-width="100" /> <el-table-column label="区域编码" align="left" prop="code" min-width="100" />
<!-- <el-table-column label="英文名称" align="center" prop="regionNameEn" min-width="100" /> --> <!-- <el-table-column label="英文名称" align="center" prop="regionNameEn" min-width="100" /> -->
<!-- <el-table-column label="简称" align="center" prop="shortName" min-width="100" /> --> <!-- <el-table-column label="简称" align="center" prop="shortName" min-width="100" /> -->
<el-table-column label="类型" align="center" prop="regionType" min-width="100" > <el-table-column label="行政级别" align="center" prop="regionType" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.emis_region_level_type" :value="scope.row.regionType"/> <dict-tag :options="dict.type.emis_region_level_type" :value="scope.row.regionType"/>
</template> </template>
@ -189,6 +189,13 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisRegion:edit']" v-hasPermi="['emis:emisRegion:edit']"
>修改</el-button> >修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['emis:emisRegion:edit']"
>添加</el-button>
<!-- <!--
<el-button <el-button
size="mini" size="mini"
@ -221,8 +228,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="父区域" prop="parentId"> <el-form-item label="上级区域" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入父区域" /> <el-input v-model="form.parentId" placeholder="请输入上级区域" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -255,8 +262,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="类型" prop="regionType"> <el-form-item label="行政级别" prop="regionType">
<el-select v-model="form.regionType" placeholder="请选择类型"> <el-select v-model="form.regionType" placeholder="请选择">
<el-option <el-option
v-for="dict in dict.type.emis_region_level_type" v-for="dict in dict.type.emis_region_level_type"
:key="dict.value" :key="dict.value"
@ -392,7 +399,7 @@ export default {
{ required: true, message: "英文名称不能为空", trigger: "blur" } { required: true, message: "英文名称不能为空", trigger: "blur" }
], ],
parentId: [ parentId: [
{ required: true, message: "父区域不能为空", trigger: "blur" } { required: true, message: "上级区域不能为空", trigger: "blur" }
], ],
} }
}; };