From d0dc3fe1a127bf457a56111668c8ba52e5ed466e Mon Sep 17 00:00:00 2001
From: libing <showmeth_3839@qq.com>
Date: Sun, 24 Dec 2023 13:29:19 +0800
Subject: [PATCH] 11

---
 src/views/emis/emisBrand/index.vue  | 16 ++++------------
 src/views/emis/emisRegion/index.vue | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/views/emis/emisBrand/index.vue b/src/views/emis/emisBrand/index.vue
index 7ca38bef..f103c89d 100644
--- a/src/views/emis/emisBrand/index.vue
+++ b/src/views/emis/emisBrand/index.vue
@@ -102,7 +102,6 @@
 
       <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="logo1" align="center" prop="brandImg" 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="status" min-width="100" >
@@ -160,20 +159,16 @@
               <el-input v-model="form.nameEn" placeholder="请输入英文名称" />
             </el-form-item>
           </el-col>
+          <!-- 
           <el-col :span="24">
             <el-form-item label="logo" prop="logo">
               <el-input v-model="form.logo" placeholder="请输入logo" />
             </el-form-item>
           </el-col>
-          
+           -->
           <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
                 :headers="imgUploadHeaders"
                 action="none"  
@@ -334,9 +329,6 @@ export default {
         status: [
           { required: true, message: "0-未开放不能为空", trigger: "blur" }
         ],
-        brandImg: [
-          { required: true, message: "品牌图片不能为空", trigger: "blur" }
-        ],
       }
     };
   },
@@ -423,7 +415,7 @@ export default {
     },
     handleChange(file, fileList) {
        console.log(file);
-       this.form.brandImg = file;
+       this.form.logo = file;
       console.log(11);
       const isLt2M = file.size / 1024 / 1024 < 2;
       console.log(isLt2M)
diff --git a/src/views/emis/emisRegion/index.vue b/src/views/emis/emisRegion/index.vue
index ea9bb134..fd4231c2 100644
--- a/src/views/emis/emisRegion/index.vue
+++ b/src/views/emis/emisRegion/index.vue
@@ -173,7 +173,7 @@
       <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="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">
             <dict-tag :options="dict.type.emis_region_level_type" :value="scope.row.regionType"/>
           </template>
@@ -189,6 +189,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['emis:emisRegion:edit']"
           >修改</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
             size="mini"
@@ -221,8 +228,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="父区域" prop="parentId">
-              <el-input v-model="form.parentId" placeholder="请输入父区域" />
+            <el-form-item label="上级区域" prop="parentId">
+              <el-input v-model="form.parentId" placeholder="请输入上级区域" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -255,8 +262,8 @@
             </el-form-item>
           </el-col>
         <el-col :span="8">
-            <el-form-item label="类型" prop="regionType">
-              <el-select v-model="form.regionType" placeholder="请选择类型">
+            <el-form-item label="行政级别" prop="regionType">
+              <el-select v-model="form.regionType" placeholder="请选择">
                 <el-option
                   v-for="dict in dict.type.emis_region_level_type"
                   :key="dict.value"
@@ -392,7 +399,7 @@ export default {
           { required: true, message: "英文名称不能为空", trigger: "blur" }
         ],
         parentId: [
-          { required: true, message: "父区域不能为空", trigger: "blur" }
+          { required: true, message: "上级区域不能为空", trigger: "blur" }
         ],
       }
     };