From bb95abf7d71834f2caab412955dcaa712fa624f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 29 Jul 2020 17:01:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/volunteerinfo-detail.vue     | 89 +++++++++++++------
 src/views/modules/user/volunteerinfo.vue      | 23 +++--
 2 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/src/views/modules/user/volunteerinfo-detail.vue b/src/views/modules/user/volunteerinfo-detail.vue
index f1dd08e..4ce28a4 100644
--- a/src/views/modules/user/volunteerinfo-detail.vue
+++ b/src/views/modules/user/volunteerinfo-detail.vue
@@ -1,49 +1,66 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    title="用户详情"
-    :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' : '130px'"
-    >
-      <el-form-item label="姓名 :" prop="realName" v-if="dataForm.realName">
+  <el-dialog :visible.sync="visible"
+             title="修改"
+             :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' : '130px'">
+      <el-form-item label="姓名 :"
+                    prop="realName"
+                    v-if="dataForm.realName">
         <span>{{dataForm.realName}}</span>
       </el-form-item>
-      <el-form-item label="性别 :" prop="sex">
+      <el-form-item label="性别 :"
+                    prop="sex">
         <div v-if="dataForm.sex === '1'">男</div>
         <div v-if="dataForm.sex === '0'">女</div>
         <div v-if="dataForm.sex !=='0' && dataForm.sex !=='1'">未知</div>
       </el-form-item>
-      <el-form-item label="出生日期 :" prop="birthdayString">
+      <el-form-item label="出生日期 :"
+                    prop="birthdayString">
         <span>{{dataForm.birthdayString}}</span>
       </el-form-item>
-      <el-form-item label="手机号 :" prop="mobile">
+      <el-form-item label="手机号 :"
+                    prop="mobile">
         <span>{{dataForm.mobile}}</span>
       </el-form-item>
-      <el-form-item label="身份证号 :" prop="identityNo">
+      <el-form-item label="身份证号 :"
+                    prop="identityNo">
         <span>{{dataForm.identityNo}}</span>
       </el-form-item>
-      <el-form-item label="地址 :" prop="address">
+      <el-form-item label="地址 :"
+                    prop="address">
         <span>{{dataForm.address}}</span>
       </el-form-item>
-      <el-form-item label="自我介绍 :" prop="introduce">
+      <el-form-item label="自我介绍 :"
+                    prop="introduce">
         <span>{{dataForm.introduce}}</span>
       </el-form-item>
-      <el-form-item label="积分 :" prop="points">
+      <el-form-item label="积分 :"
+                    prop="points">
         <span>{{dataForm.points}}</span>
       </el-form-item>
-      <el-form-item label="成为志愿者时间 :" prop="registTimeString">
+      <el-form-item label="成为志愿者时间 :"
+                    prop="registTimeString">
         <span>{{dataForm.registTimeString}}</span>
       </el-form-item>
+      <el-form-item label="排序"
+                    prop="volunteerOrder">
+        <template>
+          <el-input-number v-model="dataForm.volunteerOrder"
+                           @change="handleChange"
+                           :min="0"
+                           label="描述文字"></el-input-number>
+        </template>
+      </el-form-item>
     </el-form>
     <template slot="footer">
-      <el-button @click="visible = false" type="primary">{{ $t('confirm') }}</el-button>
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button @click="dataFormSubmitHandle()"
+                 type="primary">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
@@ -101,7 +118,7 @@ export default {
             }
             this.dataForm.tagIds = []
           })
-          .catch(() => {})
+          .catch(() => { })
       },
       1000,
       { leading: true, trailing: false }
@@ -112,7 +129,29 @@ export default {
       } else {
         return '否'
       }
-    }
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/volunteerinfo/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
   }
 }
 </script>
diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
index 4e87be6..eae9b21 100644
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -76,6 +76,10 @@
                          label="积分"
                          header-align="center"
                          align="center"></el-table-column>
+        <el-table-column prop="volunteerOrder"
+                         label="排序"
+                         header-align="center"
+                         align="center"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
@@ -84,20 +88,20 @@
           <template slot-scope="scope">
             <div>
               <el-button type="text"
-                        size="small"
-                        @click="userDetailHandle(scope.row.id)">查看</el-button>
+                         size="small"
+                         @click="userDetailHandle(scope.row.id)">修改</el-button>
               <el-button type="text"
-                        size="small"
-                        @click="pointsAdjustHandle(scope.row.id)">积分调整</el-button>
+                         size="small"
+                         @click="pointsAdjustHandle(scope.row.id)">积分调整</el-button>
             </div>
             <div>
               <el-button type="text"
-                        size="small"
-                        @click="checkHandle(scope.row.id,1)">审批</el-button>
+                         size="small"
+                         @click="checkHandle(scope.row.id,1)">审批</el-button>
               <!-- <el-button type="text" size="small" @click="checkHandle(scope.row.id, 2)">拉入黑名单</el-button> -->
               <el-button type="text"
-                        size="small"
-                        @click="pointsLogs(scope.row.userId)">积分记录</el-button>
+                         size="small"
+                         @click="pointsLogs(scope.row.userId)">积分记录</el-button>
             </div>
           </template>
         </el-table-column>
@@ -169,7 +173,8 @@ export default {
         streetId: null,
         communityId: null,
         gridId: null,
-        leaderFlag: '0'
+        leaderFlag: '0',
+        volunteerOrder: ''
       },
       auditStatusType: 0,
       deptIdList: [],