From 6b393f1b97e8cb0784cf559ba973a4e4df06c3bc Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 7 May 2020 15:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A7=AF=E5=88=86=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=85=8D=E7=BD=AE=E3=80=81=E7=A7=AF=E5=88=86=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E9=85=8D=E7=BD=AE=E3=80=81=E5=8A=A8=E4=BD=9C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B5=20=E5=9B=9E=E8=BD=A6=E6=8F=90=E4=BA=A4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/points/pointsbehavior-add-or-update.vue | 2 +-
 src/views/modules/points/pointsbehavior.vue               | 4 +++-
 src/views/modules/points/pointsrule-add-or-update.vue     | 2 +-
 src/views/modules/points/pointsrule.vue                   | 4 +++-
 src/views/modules/user/pointsgrade-add-or-update.vue      | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/points/pointsbehavior-add-or-update.vue b/src/views/modules/points/pointsbehavior-add-or-update.vue
index 2d78640..2f8fa19 100644
--- a/src/views/modules/points/pointsbehavior-add-or-update.vue
+++ b/src/views/modules/points/pointsbehavior-add-or-update.vue
@@ -1,6 +1,6 @@
 <template>
   <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' : '120px'">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
           <el-form-item label="动作编码" prop="behaviorCode">
           <el-input v-model="dataForm.behaviorCode" placeholder="请输入动作编码" show-word-limit maxlength="30" style="width: 98%"></el-input>
       </el-form-item>
diff --git a/src/views/modules/points/pointsbehavior.vue b/src/views/modules/points/pointsbehavior.vue
index 004a0a2..2e91181 100644
--- a/src/views/modules/points/pointsbehavior.vue
+++ b/src/views/modules/points/pointsbehavior.vue
@@ -75,10 +75,12 @@ export default {
     },
     // 点击查询按钮获取信息
     getDataListOnClickButton () {
+      // 点击查询按钮，重新初始化页数
+      this.page = 1
       var param = {
         'behaviorCode': this.dataForm.behaviorCode,
         'behaviorDesc': this.dataForm.behaviorDesc,
-        'page': 1,
+        'page': this.page,
         'limit': this.limit
       }
       this.$http.get(`/points/pointsbehavior/page`, { params: param }).then(({ data: res }) => {
diff --git a/src/views/modules/points/pointsrule-add-or-update.vue b/src/views/modules/points/pointsrule-add-or-update.vue
index 0e733ac..9946d94 100644
--- a/src/views/modules/points/pointsrule-add-or-update.vue
+++ b/src/views/modules/points/pointsrule-add-or-update.vue
@@ -1,6 +1,6 @@
 <template>
   <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' ? '200px' : '120px'">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '200px' : '120px'">
           <el-form-item label="积分规则编码" prop="ruleCode">
           <el-input v-model="dataForm.ruleCode" maxlength="10" placeholder="请输入积分规则编码" show-word-limit style="width: 98%"></el-input>
       </el-form-item>
diff --git a/src/views/modules/points/pointsrule.vue b/src/views/modules/points/pointsrule.vue
index f92aaf9..311baf1 100644
--- a/src/views/modules/points/pointsrule.vue
+++ b/src/views/modules/points/pointsrule.vue
@@ -141,12 +141,14 @@ export default {
     },
     // 点击查询按钮获取信息
     getDataListOnClickButton () {
+      // 点击查询按钮，重新初始化页数
+      this.page = 1
       var param = {
         'ruleCode': this.dataForm.ruleCode,
         'ruleDesc': this.dataForm.ruleDesc,
         'operationType': this.dataForm.operationType,
         'enableFlag': this.dataForm.enableFlag,
-        'page': 1,
+        'page': this.page,
         'limit': this.limit
       }
       this.$http.get(`/points/pointsrule/page`, { params: param }).then(({ data: res }) => {
diff --git a/src/views/modules/user/pointsgrade-add-or-update.vue b/src/views/modules/user/pointsgrade-add-or-update.vue
index f4a8b11..ce9d322 100644
--- a/src/views/modules/user/pointsgrade-add-or-update.vue
+++ b/src/views/modules/user/pointsgrade-add-or-update.vue
@@ -1,6 +1,6 @@
 <template>
   <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 :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="等级系数" prop="grade">
           <el-input-number v-model="dataForm.grade" :min="0" label="等级系数"></el-input-number>
       </el-form-item>