From ac94a0b72c1f0cfc93eebce6a83570c85e65ab7b Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 21 Jul 2022 10:41:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/volunteertag-add-or-update.vue        | 18 ++++++++++++++++--
 src/views/modules/user/volunteertag.vue        | 11 +++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/user/volunteertag-add-or-update.vue b/src/views/modules/user/volunteertag-add-or-update.vue
index 6b84759..c02ad9b 100644
--- a/src/views/modules/user/volunteertag-add-or-update.vue
+++ b/src/views/modules/user/volunteertag-add-or-update.vue
@@ -20,6 +20,12 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="类别" prop="categoryType">
+        <el-select v-model="dataForm.categoryType" clearable placeholder="类别">
+          <el-option v-for="item in categoryTypeList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -39,7 +45,8 @@ export default {
         tagName: '',
         description: '',
         sort: '',
-        enableFlag: ''
+        enableFlag: '',
+        categoryType:''
       },
       isEnableFlag: [{
         value: '0',
@@ -47,7 +54,11 @@ export default {
       }, {
         value: '1',
         label: '是'
-      }]
+      }],
+      categoryTypeList: [
+        {dictValue: '1', dictName: '服务团'},
+        {dictValue: '2', dictName: '服务队'},
+      ]
     }
   },
   computed: {
@@ -61,6 +72,9 @@ export default {
         ],
         enableFlag: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        categoryType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
diff --git a/src/views/modules/user/volunteertag.vue b/src/views/modules/user/volunteertag.vue
index 41c0018..9cd406e 100644
--- a/src/views/modules/user/volunteertag.vue
+++ b/src/views/modules/user/volunteertag.vue
@@ -13,6 +13,17 @@
                          align="center"
                          width="50"></el-table-column>
         <el-table-column prop="tagName" label="标签名称" header-align="center" align="center" width="200"></el-table-column>
+        <el-table-column prop="categoryType" label="类别" header-align="center" align="center" width="100">
+          <template slot-scope="scope">
+            {{
+            scope.row.categoryType == 1
+            ? "服务团"
+            : scope.row.categoryType == 2
+            ? "服务队"
+            : ""
+            }}
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip prop="description" label="描述" header-align="center" align="center" width="400"></el-table-column>
         <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
         <el-table-column prop="enableFlag" label="是否启用" header-align="center" align="center" :formatter="enableFlagFormat"></el-table-column>