From 79d6bd9d8bc32e1dba42f466e7a98f1da2422762 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 18 Nov 2021 10:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E5=9B=A2=E9=98=9F=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heart/volunteerteam-add-or-update.vue     | 31 ++++++----------
 src/views/modules/heart/volunteerteam.vue     | 13 +++----
 .../heart/volunteerteamtype-add-or-update.vue | 36 ++++++++-----------
 src/views/modules/heart/volunteerteamtype.vue | 33 ++++++++---------
 4 files changed, 42 insertions(+), 71 deletions(-)

diff --git a/src/views/modules/heart/volunteerteam-add-or-update.vue b/src/views/modules/heart/volunteerteam-add-or-update.vue
index f6750ae..4e01b16 100644
--- a/src/views/modules/heart/volunteerteam-add-or-update.vue
+++ b/src/views/modules/heart/volunteerteam-add-or-update.vue
@@ -13,27 +13,12 @@
           <el-form-item label="联系电话" prop="phone">
           <el-input v-model="dataForm.phone" placeholder="联系电话"></el-input>
       </el-form-item>
-          <el-form-item label="团队介绍" prop="content">
-          <el-input v-model="dataForm.content" placeholder="团队介绍"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识"></el-input>
-      </el-form-item>
+        <el-form-item prop="content"
+                      label="团队介绍">
+            <el-row style="height: 550px;">
+                <tinymce-editor v-model="dataForm.content"></tinymce-editor>
+            </el-row>
+        </el-form-item>
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -44,6 +29,7 @@
 
 <script>
 import debounce from 'lodash/debounce'
+import TinymceEditor from '@/components/tinymce-editor'
 export default {
   data () {
     return {
@@ -103,6 +89,9 @@ export default {
       }
     }
   },
+    components: {
+        TinymceEditor
+    },
   methods: {
     init () {
       this.visible = true
diff --git a/src/views/modules/heart/volunteerteam.vue b/src/views/modules/heart/volunteerteam.vue
index 5f0e66e..56a1326 100644
--- a/src/views/modules/heart/volunteerteam.vue
+++ b/src/views/modules/heart/volunteerteam.vue
@@ -9,26 +9,21 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('heart:volunteerteam:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('heart:volunteerteam:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column>
         <el-table-column prop="teamName" label="团队名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="teamType" label="团队类别" header-align="center" align="center"></el-table-column>
         <el-table-column prop="contacts" label="联系人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="phone" label="联系电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="content" label="团队介绍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标识" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('heart:volunteerteam:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
diff --git a/src/views/modules/heart/volunteerteamtype-add-or-update.vue b/src/views/modules/heart/volunteerteamtype-add-or-update.vue
index b3cbadb..8717de0 100644
--- a/src/views/modules/heart/volunteerteamtype-add-or-update.vue
+++ b/src/views/modules/heart/volunteerteamtype-add-or-update.vue
@@ -2,31 +2,19 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="类别名称" prop="typeName">
-          <el-input v-model="dataForm.typeName" placeholder="类别名称"></el-input>
+          <el-input v-model="dataForm.typeName" placeholder="类别名称" style="width: 260px"></el-input>
       </el-form-item>
           <el-form-item label="类别编码" prop="typeCode">
-          <el-input v-model="dataForm.typeCode" placeholder="类别编码"></el-input>
+          <el-input v-model="dataForm.typeCode" placeholder="类别编码" style="width: 260px"></el-input>
       </el-form-item>
           <el-form-item label="排序" prop="sort">
-          <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
+              <el-input-number v-model="dataForm.sort"  style="width: 260px" controls-position="right" :min="0" label="排序"></el-input-number>
       </el-form-item>
-          <el-form-item label="启用标识 0-启用，1-未启用" prop="bannerFlag">
-          <el-input v-model="dataForm.bannerFlag" placeholder="启用标识 0-启用，1-未启用"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识  0：未删除    1：删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识  0：未删除    1：删除"></el-input>
-      </el-form-item>
-          <el-form-item label="创建者" prop="creator">
-          <el-input v-model="dataForm.creator" placeholder="创建者"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新者" prop="updater">
-          <el-input v-model="dataForm.updater" placeholder="更新者"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updateDate">
-          <el-input v-model="dataForm.updateDate" placeholder="更新时间"></el-input>
+          <el-form-item label="启用标识" prop="bannerFlag">
+              <el-select v-model="dataForm.bannerFlag" clearable placeholder="启用标识"  style="width: 260px">
+                  <el-option v-for="item in bannerFlagList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                  </el-option>
+              </el-select>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -47,13 +35,17 @@ export default {
         typeName: '',
         typeCode: '',
         sort: '',
-        bannerFlag: '',
+        bannerFlag: '0',
         delFlag: '',
         creator: '',
         createDate: '',
         updater: '',
         updateDate: ''
-      }
+      },
+        bannerFlagList: [
+            {dictValue: '0', dictName: '启用'},
+            {dictValue: '1', dictName: '未启用'},
+        ]
     }
   },
   computed: {
diff --git a/src/views/modules/heart/volunteerteamtype.vue b/src/views/modules/heart/volunteerteamtype.vue
index d989bcc..9bd1b8e 100644
--- a/src/views/modules/heart/volunteerteamtype.vue
+++ b/src/views/modules/heart/volunteerteamtype.vue
@@ -3,34 +3,29 @@
     <div class="mod-heart__volunteerteamtype}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('heart:volunteerteamtype:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('heart:volunteerteamtype:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="标识号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="typeName" label="类别名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="typeCode" label="类别编码" header-align="center" align="center"></el-table-column>
+        <el-table-column type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column>
+        <el-table-column prop="typeName" label="名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="typeCode" label="编码" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="bannerFlag" label="启用标识 0-启用，1-未启用" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标识  0：未删除    1：删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="creator" label="创建者" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updater" label="更新者" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="bannerFlag" label="启用标识 0-启用，1-未启用" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="delFlag" label="删除标识  0：未删除    1：删除" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="creator" label="创建者" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="updater" label="更新者" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>-->
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('heart:volunteerteamtype:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('heart:volunteerteamtype:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+<!--            <el-button v-if="$hasPermission('heart:volunteerteamtype:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
           </template>
         </el-table-column>
       </el-table>