From eb73ff57181638f34a24a5d445231b9e4f7e9c53 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 7 May 2020 13:39:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=AE=A1=E7=90=86--=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C=E7=AE=A1=E7=90=86=E3=80=81=E7=A7=AF=E5=88=86=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=A6=96=E9=A1=B5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/points/pointsbehavior.vue | 20 +++++++++++++++++--
 src/views/modules/points/pointsrule.vue     | 22 +++++++++++++++++++--
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/points/pointsbehavior.vue b/src/views/modules/points/pointsbehavior.vue
index 96bb4cf..004a0a2 100644
--- a/src/views/modules/points/pointsbehavior.vue
+++ b/src/views/modules/points/pointsbehavior.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__pointsbehavior}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListOnClickButton()">
         <el-form-item label="动作编码">
           <el-input v-model="dataForm.behaviorCode" placeholder="请输入动作编码" clearable></el-input>
         </el-form-item>
@@ -9,7 +9,7 @@
           <el-input v-model="dataForm.behaviorDesc" placeholder="请输入动作描述" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListOnClickButton()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('points:pointsbehavior:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -72,6 +72,22 @@ export default {
       if (row.behaviorRecordingTime === '1') {
         return '方法执行后'
       }
+    },
+    // 点击查询按钮获取信息
+    getDataListOnClickButton () {
+      var param = {
+        'behaviorCode': this.dataForm.behaviorCode,
+        'behaviorDesc': this.dataForm.behaviorDesc,
+        'page': 1,
+        'limit': this.limit
+      }
+      this.$http.get(`/points/pointsbehavior/page`, { params: param }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataList = res.data.list
+        this.total = res.data.total
+      }).catch(() => {})
     }
   }
 }
diff --git a/src/views/modules/points/pointsrule.vue b/src/views/modules/points/pointsrule.vue
index d163e36..f92aaf9 100644
--- a/src/views/modules/points/pointsrule.vue
+++ b/src/views/modules/points/pointsrule.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__pointsrule}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListOnClickButton()">
         <el-form-item label="积分编码">
           <el-input v-model="dataForm.ruleCode" placeholder="请输入积分编码" clearable></el-input>
         </el-form-item>
@@ -29,7 +29,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListOnClickButton()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('points:pointsrule:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -138,6 +138,24 @@ export default {
       if (row.enableFlag === '1') {
         return '是'
       }
+    },
+    // 点击查询按钮获取信息
+    getDataListOnClickButton () {
+      var param = {
+        'ruleCode': this.dataForm.ruleCode,
+        'ruleDesc': this.dataForm.ruleDesc,
+        'operationType': this.dataForm.operationType,
+        'enableFlag': this.dataForm.enableFlag,
+        'page': 1,
+        'limit': this.limit
+      }
+      this.$http.get(`/points/pointsrule/page`, { params: param }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataList = res.data.list
+        this.total = res.data.total
+      }).catch(() => {})
     }
   }
 }