From 5e64e00f75f9fa8ff9d20bb24975cd02e47aa294 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Tue, 26 May 2026 17:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=B8=81=E6=94=B6=E6=94=AF=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=90=9C=E7=B4=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit d2be46cc0ae583e94824dcf88ed72c5eeaf3ee34)
---
 src/views/order/candy/running-water/index.vue | 71 +++++++++----------
 1 file changed, 32 insertions(+), 39 deletions(-)

diff --git a/src/views/order/candy/running-water/index.vue b/src/views/order/candy/running-water/index.vue
index aa7bba0..85febcb 100644
--- a/src/views/order/candy/running-water/index.vue
+++ b/src/views/order/candy/running-water/index.vue
@@ -70,27 +70,25 @@
           :value="item.id"
         />
       </el-select>
-      <div class="filter-item">
-        <el-autocomplete
-          v-model="listQuery.origin"
-          popper-class="my-autocomplete"
-          :fetch-suggestions="querySearch"
-          :placeholder="$t('pages.goldRunningWater.filter.origin')"
-          clearable
-          :disabled="!!(gameFilter.gameOrigin)"
-          @select="handleSelect"
-          @clear="handleSelect"
-        >
-          <i
-            slot="suffix"
-            class="el-icon-edit el-input__icon"
-          />
-          <template slot-scope="{ item }">
-            <span :label="getCurrencyOriginName(item)">{{ getCurrencyOriginName(item) }}</span>
-            <div :key="item.value" :value="item.value" style="font-size:12px; color:#d8d0d0">{{ item.value }}</div>
-          </template>
-        </el-autocomplete>
-      </div>
+      <el-select
+        v-model="listQuery.origin"
+        placeholder="来源(支持中英文搜索)"
+        clearable
+        filterable
+        style="width: 220px"
+        class="filter-item"
+        :disabled="!!(gameFilter.gameOrigin)"
+        :filter-method="originFilterMethod"
+        @change="handleSelect"
+        @clear="handleSelect"
+      >
+        <el-option
+          v-for="item in filteredOrigins"
+          :key="item.value"
+          :label="item.name !== item.value ? item.name + ' (' + item.value + ')' : item.value"
+          :value="item.value"
+        />
+      </el-select>
       <div class="filter-item">
         <account-input v-model="listQuery.userId" :sys-origin="sysOrigins && sysOrigins.length === 1? sysOrigins[0] : ''" :placeholder="$t('pages.goldRunningWater.filter.userId')" />
       </div>
@@ -244,6 +242,7 @@ export default {
       gameList: [],
       gameListLoading: false,
       gameIdError: false,
+      filteredOrigins: currencyOrigins,
       minDate: null,
       maxDate: null,
       pickerOptions: {
@@ -403,28 +402,22 @@ export default {
         this.$opsMessage.warn('请选择游戏ID')
         return
       }
-      if (this.listQuery.origin !== '') {
-        const origins = this.currencyOrigins.filter(this.createFilter(this.listQuery.origin))
-        this.listQuery.origin = origins.length > 0 ? origins[0].value : this.listQuery.origin
-      }
+      this.filteredOrigins = currencyOrigins
       this.renderData(true)
     },
-    querySearch(queryString, cb) {
-      var restaurants = currencyOrigins
-      var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
-      cb(results)
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        const keyword = queryString.toLowerCase()
-        return (
-          restaurant.value.toLowerCase().indexOf(keyword) >= 0 ||
-          restaurant.name.toLowerCase().indexOf(keyword) >= 0 ||
-          this.getCurrencyOriginName(restaurant).toLowerCase().indexOf(keyword) >= 0
-        )
+    originFilterMethod(query) {
+      if (!query) {
+        this.filteredOrigins = currencyOrigins
+        return
       }
+      const q = query.toLowerCase()
+      this.filteredOrigins = currencyOrigins.filter(item =>
+        item.value.toLowerCase().indexOf(q) >= 0 ||
+        item.name.toLowerCase().indexOf(q) >= 0
+      )
     },
-    handleSelect(item) {
+    handleSelect() {
+      this.filteredOrigins = currencyOrigins
       this.renderData(true)
     },
     clickLoadMore() {