From 0b68691959ef522fb254cb168ec811b29ecc0c77 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Thu, 5 Jan 2023 17:57:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/business/process-completed.ftl | 14 +++++++++++---
 .../templates/admin/business/process-review.ftl    |  5 ++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/admin/business/process-completed.ftl b/src/main/resources/templates/admin/business/process-completed.ftl
index 9ca7205..b4d1897 100644
--- a/src/main/resources/templates/admin/business/process-completed.ftl
+++ b/src/main/resources/templates/admin/business/process-completed.ftl
@@ -38,7 +38,7 @@
 
       <div class="am-g" v-cloak>
         <div class="am-u-sm-12 am-u-md-12">
-          <el-form :inline="true" ref="queryForm" :model="queryForm" label-position="right" @change="resetPageParams">
+          <el-form :inline="true" ref="queryForm" :model="queryForm" label-position="right">
 
             <div>
               <el-form-item label="标题">
@@ -54,7 +54,8 @@
               </el-form-item>
 
               <el-form-item label="流程类型">
-                <el-select v-model="queryForm.processType" placeholder="请选择" clearable>
+                <el-select v-model="queryForm.processType" placeholder="请选择" clearable
+                           @clear="queryForm.processType=null">
                   <el-option label="全部" :value="null"></el-option>
                     <#list processTypes as processType>
                       <el-option label="${processType.description}"
@@ -68,7 +69,8 @@
               </el-form-item>
 
               <el-form-item label="审核状态">
-                <el-select v-model="queryForm.processStatus" placeholder="请选择" clearable>
+                <el-select v-model="queryForm.processStatus" placeholder="请选择"
+                           clearable @clear="queryForm.processStatus=null">
                   <el-option label="全部" :value="null"></el-option>
                     <#list processStatus as item>
                       <el-option label="${item.description}"
@@ -504,6 +506,12 @@
       mounted() {
         this.queryTable()
       },
+      watch: {
+        // 每当 question 改变时，这个函数就会执行
+        queryForm(newQueryForm, oldQueryForm) {
+          this.resetPageParams()
+        }
+      },
       filters: {
         ellipsis(value, limit = 5) {
           if (!value) return ''
diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl
index 74027be..8b7e131 100644
--- a/src/main/resources/templates/admin/business/process-review.ftl
+++ b/src/main/resources/templates/admin/business/process-review.ftl
@@ -54,7 +54,8 @@
               </el-form-item>
 
               <el-form-item label="流程类型">
-                <el-select v-model="queryForm.processType" placeholder="请选择" clearable>
+                <el-select v-model="queryForm.processType" placeholder="请选择" clearable
+                           @clear="queryForm.processType = null">
                   <el-option label="全部" :value="null"></el-option>
                     <#list processTypes as processType>
                       <el-option label="${processType.description}"
@@ -190,6 +191,7 @@
     function parseJSON(response) {
       return response.json()
     }
+
     /**
      * 给定一个数字，保留两位小数输出，格式化为包含分隔符
      * @param f
@@ -204,6 +206,7 @@
       f = Number(f).toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2, useGrouping: true });
       return f;
     }
+
     const data = () => {
       return {
         auditForm: {