From f1534ffc711a93779c3c40cb5bc9312a1c601826 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 2 Nov 2022 10:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppTaskReview/AppTaskReview.vue           |  2 +-
 .../tianfuxing/AppUserList/AppUserList.vue    | 60 +++++++++----------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/project/tianfuxing/AppTaskReview/AppTaskReview.vue b/project/tianfuxing/AppTaskReview/AppTaskReview.vue
index 7bd00a82..9cacef62 100644
--- a/project/tianfuxing/AppTaskReview/AppTaskReview.vue
+++ b/project/tianfuxing/AppTaskReview/AppTaskReview.vue
@@ -95,7 +95,7 @@ export default {
       this.$refs.form.validate((valid)=> {
         if(valid) {
           this.flag = true
-          this.instance.post(`/appwechatescalation/examine?id=${this.form.id}&pass=1&integral=${this.integral}`).then(res => {
+          this.instance.post(`/appwechatescalation/examine?id=${this.form.id}&pass=1&integral=${this.form.integral}`).then(res => {
             if(res?.code == 0) {
               this.$message.success('审核成功')
               setTimeout(() =>{
diff --git a/project/tianfuxing/AppUserList/AppUserList.vue b/project/tianfuxing/AppUserList/AppUserList.vue
index 913201cb..41786716 100644
--- a/project/tianfuxing/AppUserList/AppUserList.vue
+++ b/project/tianfuxing/AppUserList/AppUserList.vue
@@ -11,8 +11,6 @@
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size" @getList="getList" :col-configs="colConfigs" 
           :dict="dict" @sort-change="sortChange">
-          <el-table-column slot="chooseNumber" label="积分数量" align="center" sortable>
-          </el-table-column>
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{ row }">
               <el-button type="text" @click.native="changeIntegral(row)">调整积分</el-button>
@@ -27,8 +25,8 @@
           @onConfirm="onConfirm"
           @closed="form={}">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="类型" prop="integralCalcType">
-            <ai-select v-model="form.integralCalcType" :selectList="dict.getDict('integralCalcType')"/>
+          <el-form-item label="类型" prop="calcType">
+            <ai-select v-model="form.calcType" :selectList="dict.getDict('integralCalcType')"/>
           </el-form-item>
           <el-form-item label="积分" prop="integral">
             <el-input v-model.trim="form.integral" placeholder="请输入正数" size="small"></el-input>
@@ -41,6 +39,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: "AppUserList",
   label: "用户管理",
@@ -61,9 +60,10 @@ export default {
       tableData: [],
       dialog: false,
       form: {
-        integralCalcType: "",
+        calcType: '',
         integral: '',
       },
+      orderType: ''
     }
   },
   created () {
@@ -72,18 +72,19 @@ export default {
     })
   },
   computed: {
+    ...mapState(['user']),
     colConfigs() {
       return [
-        {prop: "title", label: "用户", align: "left"},
-        {prop: "organizationName", label: "手机号", align: "center"},
-        {prop: "electionMethod", label: "等级", align: "center",dict:"electionMethod"},
-        {prop: "chooseNumber", label: "积分数量", align: "center", sortable: "custom"},
+        {prop: "realName", label: "用户", align: "left"},
+        {prop: "phone", label: "手机号", align: "center"},
+        {prop: "levelTitle", label: "等级", align: "center"},
+        {prop: "integral", label: "积分数量", align: "center", sortable: "custom"},
         {slot: "options"},
       ]
     },
     rules() {
       return {
-        integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'}],
+        calcType: [{required: true, message: '请选择类型', trigger: 'change'}],
         integral: [{required: true, message: '请输入积分', trigger: 'blur' },
         {pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}],
       }
@@ -92,40 +93,36 @@ export default {
   methods: {
     sortChange(col) {
       console.log(col.order)
-      if(col.prop === 'chooseNumber') { // 剩余积分
-        // this.search.sortFiled = 0
-        // if(col.order === 'ascending') {
-        //   this.search.sortRule = true
-        // } else if(col.order === 'descending') {
-        //   this.search.sortRule = false
-        // } else if(col.order === null) {
-        //   this.search.sortRule = ''
-        // }
+      if(col.order === 'ascending') {
+        this.orderType = 0
+      } else if(col.order === 'descending') {
+        this.orderType = 1
+      } else if(col.order === null) {
+        this.orderType = ''
       }
+      this.page.current = 1
+      this.getList()
     },
     changeIntegral(row) {
       this.dialog = true
+      this.form = {...row}
     },
     onConfirm() {
       this.$refs.form.validate((valid)=> {
         if(valid) {
           this.flag = true
-          this.instance.post(`/app/appintegraluser/changeIntegral`,{
-            ids: this.form.ids,
-            eventDesc: this.form.eventDesc,
-            enclosure: this.form.enclosure,   // 附件
-            integralCalcType: this.form.integralCalcType,
+          this.instance.post(`/appwechatintegraldetail/addOrUpdate`, {
+            calcType: this.form.calcType,
             integral: this.form.integral,
+            openId: this.form.openId,
+            createUserId: this.user.info.id,
+            createUserName: this.user.info.name
           }).then(res => {
             if(res?.code == 0) {
-              this.$message.success('调整积分成功')
-              setTimeout(() =>{
-                this.dialog = false
-                this.getTableData()
-                this.flag = false
-              }, 600)
-            } else {
               this.flag = false
+              this.$message.success('调整积分成功')
+              this.dialog = false
+              this.getList()
             }
           })
         }
@@ -137,6 +134,7 @@ export default {
         params: {
           ...this.page,
           ...this.search,
+          orderType: this.orderType
         }
       }).then(res=> {
         if(res?.data) {