From 69631371008500e92f73fd3534f416121ec501b3 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 29 Nov 2021 10:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/volunteerteam-add-or-update.vue      |  9 ++++++++-
 src/views/modules/heart/volunteerteam.vue              |  1 +
 .../modules/heart/volunteerunion-add-or-update.vue     | 10 ++++++++--
 src/views/modules/heart/volunteerunion.vue             |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/heart/volunteerteam-add-or-update.vue b/src/views/modules/heart/volunteerteam-add-or-update.vue
index 7f29226..f18ca8d 100644
--- a/src/views/modules/heart/volunteerteam-add-or-update.vue
+++ b/src/views/modules/heart/volunteerteam-add-or-update.vue
@@ -16,6 +16,9 @@
           <el-form-item label="联系电话" prop="phone">
           <el-input v-model="dataForm.phone" placeholder="联系电话" style="width: 260px"></el-input>
       </el-form-item>
+        <el-form-item label="排序" prop="sort">
+            <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序" style="width: 260px"></el-input-number>
+        </el-form-item>
         <el-form-item prop="content"
                       label="团队介绍">
             <el-row style="height: 400px;">
@@ -44,6 +47,7 @@ export default {
         contacts: '',
         phone: '',
         content: '',
+        sort: '',
         revision: '',
         createdBy: '',
         createdTime: '',
@@ -89,7 +93,10 @@ export default {
         ],
         delFlag: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
+        ],
+          sort: [
+              { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          ],
       }
     }
   },
diff --git a/src/views/modules/heart/volunteerteam.vue b/src/views/modules/heart/volunteerteam.vue
index 024bd09..fb5139e 100644
--- a/src/views/modules/heart/volunteerteam.vue
+++ b/src/views/modules/heart/volunteerteam.vue
@@ -36,6 +36,7 @@
         <el-table-column prop="typeName" 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="sort" label="排序" header-align="center" width="100px" align="center"></el-table-column>
         <el-table-column prop="createdTime" 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">
diff --git a/src/views/modules/heart/volunteerunion-add-or-update.vue b/src/views/modules/heart/volunteerunion-add-or-update.vue
index 5322fc0..af8d6b2 100644
--- a/src/views/modules/heart/volunteerunion-add-or-update.vue
+++ b/src/views/modules/heart/volunteerunion-add-or-update.vue
@@ -10,6 +10,9 @@
           <el-form-item label="联系电话" prop="phone">
           <el-input v-model="dataForm.phone" placeholder="联系电话" style="width: 260px"></el-input>
       </el-form-item>
+        <el-form-item label="排序" prop="sort">
+            <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序" style="width: 260px"></el-input-number>
+        </el-form-item>
         <el-form-item prop="content"
                       label="团队介绍">
             <el-row style="height: 400px;">
@@ -37,6 +40,7 @@ export default {
         contacts: '',
         phone: '',
         content: '',
+        sort: '',
         revision: '',
         createdBy: '',
         createdTime: '',
@@ -57,10 +61,12 @@ export default {
         ],
         phone: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        content: [
+        ], content: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+          sort: [
+              { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          ],
       }
     }
   },
diff --git a/src/views/modules/heart/volunteerunion.vue b/src/views/modules/heart/volunteerunion.vue
index 759473e..615a1c5 100644
--- a/src/views/modules/heart/volunteerunion.vue
+++ b/src/views/modules/heart/volunteerunion.vue
@@ -36,6 +36,7 @@
         <el-table-column prop="unionName" 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="sort" 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>-->