From dd49f4612dd6498c09d017edcb36475b0cb2f355 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Thu, 22 Jan 2026 14:40:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=BA=BA=EF=BC=8C=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E5=AE=A2=E6=9C=8D=E5=A4=9A=E9=80=89=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/executor/executor.vue          |  6 +++---
 src/views/moneyManage/refundDetail/refundService.vue | 14 ++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 990dcf0..a5d2f3e 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -11,7 +11,7 @@
       </div>
       <div class="search">
         <el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
-        <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" clearable />
+        <el-cascader v-model="searchForm.goodsName" :props="{ multiple: true, emitPath: false }" :show-all-levels="false" collapse-tags collapse-tags-tooltip :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
       </div>
       <div class="search" v-if="adminData.markets === t('common.markets.headquarter')">
         <el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
@@ -288,7 +288,7 @@ const getRefund = async function () {
     }
 
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
-      ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
+      ? searchForm.value.goodsName: []
 
     if (searchForm.value.jwcode) {
       const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
@@ -310,7 +310,7 @@ const getRefund = async function () {
         jwcode: searchForm.value.jwcode,
         name: searchForm.value.name,
         markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
-        goodsName: goodsName,
+        goodsNames: goodsName,
         statuses: statusesParam.value,//10：地区财务待审核；12：地区财务驳回；
         // 20：地区负责人待审核；22：地区负责人驳回；
         // 30：总部财务待审核；32：总部财务驳回；
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index 9cf83a9..76f8792 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -12,7 +12,7 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
-                <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
+                <el-cascader v-model="searchForm.goodsName" :props="{ multiple: true, emitPath: false }" :show-all-levels="false" collapse-tags collapse-tags-tooltip :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
             </div>
             <div class="item1" v-if="isHeadquarters">
                 <el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
@@ -139,7 +139,7 @@
                     <el-text style="width:4vw;">{{ t('common_add.productName') }}</el-text>
                     <el-input v-model="editRow.goodsName" style="width:10vw;" disabled />
                 </div>
-                <div class="add-item">
+                <div class="add-item" v-if="editRow.goodsName == t('common_add.coinRecharge')">
                     <el-text style="width:4vw;">{{ t('common_add.productNum') }}</el-text>
                     <el-input v-model="editRow.goodsNum" style="width:10vw;" disabled />
                     &nbsp;{{ t('cash.unit') }}
@@ -247,7 +247,8 @@ const dateRange = ref([])
 const searchForm = ref({
     jwcode: '',
     market: [],
-    statuses: []
+    statuses: [],
+    goodsName: []
 })
 const market = ref([])
 const backRow = ref({})// 撤回存数据
@@ -298,7 +299,7 @@ const getRefund = async function () {
         }
 
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
-            ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
+            ? searchForm.value.goodsName : []
 
         if (searchForm.value.jwcode) {
             const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
@@ -320,7 +321,7 @@ const getRefund = async function () {
                 jwcode: searchForm.value.jwcode,//精网号
                 name: searchForm.value.name,//姓名
                 markets: searchForm.value.market && searchForm.value.market.length > 0 ? [searchForm.value.market[searchForm.value.market.length - 1]] : [],
-                goodsName: goodsName,//商品名
+                goodsNames: goodsName,//商品名
                 statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；
                 // 30：总部财务待审核；32：总部财务驳回；
@@ -541,7 +542,8 @@ const reset = function () {
     searchForm.value = {
         jwcode: '',
         market: [],
-        statuses: []
+        statuses: [],
+        goodsName: []
     }
     // 重置页码
     pagination.value.pageNum = 1