From a1fc533b3f517854281cdf42ecc51d428131264d Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Tue, 21 Oct 2025 15:43:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F+=E6=97=B6=E9=97=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/executor/executor.vue        | 52 ++++++++++++-
 .../moneyManage/refundDetail/refundCharge.vue      | 50 ++++++++++---
 .../moneyManage/refundDetail/refundFinance.vue     | 50 ++++++++++---
 .../moneyManage/refundDetail/refundHeader.vue      | 50 ++++++++++---
 .../moneyManage/refundDetail/refundService.vue     | 87 +++-------------------
 5 files changed, 180 insertions(+), 109 deletions(-)

diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index bbb2f99..a4e500a 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-card style="margin-bottom: 0.5vh;">
+    <el-card style="margin-bottom: 0.5vh;background-color: rgb(243,250,254);">
         <div class="condition1">
             <div class="search">
                 <el-text size="large" style="width:4vw;">姓名</el-text>
@@ -11,7 +11,8 @@
             </div>
             <div class="search">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-input v-model="searchForm.marketName" placeholder="请输入所属地区" style="width:9vw;" clearable />
+                <el-cascader style="width: 9vw;" v-model="searchForm.marketName" :options="market" 
+                placeholder="请选择所属地区" clearable />
             </div>
             <div class="search">
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
@@ -53,8 +54,8 @@
         </div>
     </el-card>
 
-    <el-card>
-        <el-table :data="tableData" style="height:60vh;width:82vw">
+    <el-card style="background-color: rgb(231,244,253);">
+        <el-table :data="tableData" style="height:60vh;width:82vw;">
             <el-table-column type="index" label="序号" width="60" fixed="left" />
             <el-table-column prop="name" label="Homily ID" width="120" fixed="left" />
             <el-table-column prop="jwcode" label="姓名" width="120" fixed="left" show-overflow-tooltip />
@@ -231,6 +232,7 @@ const pagination = ref({
     pageSize: 50,
     total: 0
 })
+const market = ref([])
 const uploadRef = ref(null)
 const searchForm = ref({
     jwcode: ''
@@ -306,6 +308,35 @@ const submitRefund = async function () {
         ElMessage.error(error.message || '提交失败')
     }
 }
+const getMarket = async function () {
+  try {
+    const result = await API({
+
+      url: '/market/selectMarket',
+    })
+    console.log('看看地区树', result)
+
+    const transformTree = (nodes) => {
+      const allChildren = nodes.flatMap(node => node.children || []);
+
+      return allChildren.map(child => {
+        const grandchildren = child.children && child.children.length
+          ? transformTree([child])
+          : null;
+
+        return {
+          value: child.name,
+          label: child.name,
+          children: grandchildren
+        };
+      });
+    };
+    market.value = transformTree(result.data)
+    console.log('转换后的地区树==============', market.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
 const showEditDialog = (row) => {
     editRow.value = row
     showEdit.value = true
@@ -587,9 +618,22 @@ const productList = [
 onMounted(() => {
     console.log('???????????????????', adminData.value)
     getRefund()
+    getMarket()
 })
 </script>
 <style scoped>
+:deep(.el-table__header-wrapper),
+:deep(.el-table__body-wrapper),
+:deep(.el-table__cell),
+:deep(.el-table__body td) {
+    background-color: #F3FAFE !important;
+}
+
+:deep(.el-table__header th) {
+    background-color: #F3FAFE !important;
+}
+
+
 .condition1 {
     width: 82vw;
     display: flex;
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index bb3eb2a..9fc13d1 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -12,15 +12,16 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-input v-model="searchForm.markets" placeholder="请输入所属地区" style="width:9vw;" clearable />
+                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" 
+                placeholder="请选择所属地区" clearable @change="handleMarketChange" />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
-                <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" />
+                <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" placeholder="请选择产品名称" clearable />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
-                <el-select v-model="searchForm.statuses" style="width:9vw;">
+                <el-select v-model="searchForm.statuses" style="width:9vw;" placeholder="请选择订单状态" clearable>
                     <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
@@ -28,13 +29,13 @@
         <div class="condition">
             <div class="item2">
                 <el-text size="large" style="width:4vw;">付款币种</el-text>
-                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;">
+                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" placeholder="请选择付款币种" clearable>
                     <el-option v-for="item in currencies" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
             <div class="item2">
                 <el-text size="large" style="width:4vw;">支付方式</el-text>
-                <el-select v-model="searchForm.payType" style="width:9vw;">
+                <el-select v-model="searchForm.payType" style="width:9vw;" placeholder="请选择支付方式" clearable>
                     <el-option v-for="item in channelOptions" :key="item.value" :label="item.label"
                         :value="item.value" />
                 </el-select>
@@ -42,7 +43,7 @@
             <div class="item2" style="width: 28.5vw;">
                 <el-text size="large" style="width:4vw;">付款时间</el-text>
                 <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-                    end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange"
+                    end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange" clearable
                     :disabled-date="disabledDate" />
             </div>
             <div>
@@ -321,6 +322,7 @@ const pagination = ref({
     pageSize: 50,
     total: 0
 })
+const market = ref([])
 const showAudit2 = ref(false)
 const tableData = ref([])
 const showSteps = ref(false)
@@ -455,15 +457,15 @@ const getRefund = async function () {
                 jwcode: searchForm.value.jwcode,//精网号
                 name: searchForm.value.name,//姓名
                 markets: searchForm.value.markets,//地区
-                goodsName: searchForm.value.goodsName,//商品名
+                goodsNames: searchForm.value.goodsName,//商品名
                 statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；
                 // 30：总部财务待审核；32：总部财务驳回；
                 // 40：执行人待处理；41：执行人已处理，退款完成；
                 paymentCurrency: searchForm.value.paymentCurrency,//付款币种
                 payType: searchForm.value.payType,//支付方式
-                startTime: dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
-                endtime: dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
+                startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
+                endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
                 adminId: adminData.value.id
             }
         }
@@ -697,6 +699,35 @@ const productList = [
     },
 
 ]
+const getMarket = async function () {
+  try {
+    const result = await API({
+
+      url: '/market/selectMarket',
+    })
+    console.log('看看地区树', result)
+
+    const transformTree = (nodes) => {
+      const allChildren = nodes.flatMap(node => node.children || []);
+
+      return allChildren.map(child => {
+        const grandchildren = child.children && child.children.length
+          ? transformTree([child])
+          : null;
+
+        return {
+          value: child.name,
+          label: child.name,
+          children: grandchildren
+        };
+      });
+    };
+    market.value = transformTree(result.data)
+    console.log('转换后的地区树==============', market.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
 const hideReject = function () {
     showReject.value = false
     addForm.value.remark = ''
@@ -715,6 +746,7 @@ const showAudit = function (row) {
 onMounted(() => {
     console.log('???????????????????', adminData.value)
     getRefund()
+    getMarket()
 })
 </script>
 <style scoped lang="scss">
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 701157f..49f363b 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -12,15 +12,16 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-input v-model="searchForm.markets" placeholder="请输入所属地区" style="width:9vw;" clearable />
+                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" 
+                placeholder="请选择所属地区" clearable @change="handleMarketChange" />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
-                <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" />
+                <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" clearable />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
-                <el-select v-model="searchForm.statuses" style="width:9vw;">
+                <el-select v-model="searchForm.statuses" style="width:9vw;" clearable>
                     <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
@@ -28,13 +29,13 @@
         <div class="condition">
             <div class="item2">
                 <el-text size="large" style="width:4vw;">付款币种</el-text>
-                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;">
+                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" clearable>
                     <el-option v-for="item in currencies" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
             <div class="item2">
                 <el-text size="large" style="width:4vw;">支付方式</el-text>
-                <el-select v-model="searchForm.payType" style="width:9vw;">
+                <el-select v-model="searchForm.payType" style="width:9vw;" clearable>
                     <el-option v-for="item in channelOptions" :key="item.value" :label="item.label"
                         :value="item.value" />
                 </el-select>
@@ -42,7 +43,7 @@
             <div class="item2" style="width: 28.5vw;">
                 <el-text size="large" style="width:4vw;">付款时间</el-text>
                 <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-                    end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange"
+                    end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange" clearable
                     :disabled-date="disabledDate" />
             </div>
             <div>
@@ -329,6 +330,7 @@ const pagination = ref({
     pageSize: 50,
     total: 0
 })
+const market = ref([])
 const tableData = ref([])
 const showAudit = ref(false)
 const auditRow = ref({})// 审核回显
@@ -437,15 +439,15 @@ const getRefund = async function () {
                 jwcode: searchForm.value.jwcode,//精网号
                 name: searchForm.value.name,//姓名
                 markets: searchForm.value.markets,//地区
-                goodsName: searchForm.value.goodsName,//商品名
+                goodsNames: searchForm.value.goodsName,//商品名
                 statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；
                 // 30：总部财务待审核；32：总部财务驳回；
                 // 40：执行人待处理；41：执行人已处理，退款完成；
                 paymentCurrency: searchForm.value.paymentCurrency,//付款币种
                 payType: searchForm.value.payType,//支付方式
-                startTime: dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
-                endtime: dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
+                startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
+                endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
                 adminId: adminData.value.id
             }
         }
@@ -730,6 +732,35 @@ const productList = [
     },
 
 ]
+const getMarket = async function () {
+  try {
+    const result = await API({
+
+      url: '/market/selectMarket',
+    })
+    console.log('看看地区树', result)
+
+    const transformTree = (nodes) => {
+      const allChildren = nodes.flatMap(node => node.children || []);
+
+      return allChildren.map(child => {
+        const grandchildren = child.children && child.children.length
+          ? transformTree([child])
+          : null;
+
+        return {
+          value: child.name,
+          label: child.name,
+          children: grandchildren
+        };
+      });
+    };
+    market.value = transformTree(result.data)
+    console.log('转换后的地区树==============', market.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
 const showStep = function (row) {
     if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) {
         ElMessage.error('无此权限');
@@ -784,6 +815,7 @@ const hideReject = function () {
 onMounted(() => {
     console.log('???????????????????', adminData.value)
     getRefund()
+    getMarket()
 })
 </script>
 <style scoped lang="scss">
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index c031acd..608ea9d 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -12,15 +12,16 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-input v-model="searchForm.markets" placeholder="请输入所属地区" style="width:9vw;" clearable />
+                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" 
+                placeholder="请选择所属地区" clearable @change="handleMarketChange" />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
-                <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" />
+                <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" placeholder="请选择产品名称" clearable />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
-                <el-select v-model="searchForm.statuses" style="width:9vw;">
+                <el-select v-model="searchForm.statuses" style="width:9vw;" placeholder="请选择订单状态" clearable>
                     <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
@@ -28,13 +29,13 @@
         <div class="condition">
             <div class="item2">
                 <el-text size="large" style="width:4vw;">付款币种</el-text>
-                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;">
+                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" placeholder="请选择付款币种" clearable>
                     <el-option v-for="item in currencies" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
             <div class="item2">
                 <el-text size="large" style="width:4vw;">支付方式</el-text>
-                <el-select v-model="searchForm.payType" style="width:9vw;">
+                <el-select v-model="searchForm.payType" style="width:9vw;" placeholder="请选择支付方式" clearable>
                     <el-option v-for="item in channelOptions" :key="item.value" :label="item.label"
                         :value="item.value" />
                 </el-select>
@@ -42,7 +43,7 @@
             <div class="item2" style="width: 28.5vw;">
                 <el-text size="large" style="width:4vw;">付款时间</el-text>
                 <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-                    end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange"
+                    end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange" clearable
                     :disabled-date="disabledDate" />
             </div>
             <div>
@@ -324,6 +325,7 @@ const searchForm = ref({
 const addForm = ref({
     remark: ''
 })
+const market = ref([])
 const showReject = ref(false)
 const showExecutor = ref(false)
 const auditRow = ref({})// 审核回显
@@ -485,15 +487,15 @@ const getRefund = async function () {
                 jwcode: searchForm.value.jwcode,
                 name: searchForm.value.name,
                 markets: searchForm.value.markets,
-                goodsName: searchForm.value.goodsName,
+                goodsNames: searchForm.value.goodsName,
                 statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；
                 // 30：总部财务待审核；32：总部财务驳回；
                 // 40：执行人待处理；41：执行人已处理，退款完成；
                 paymentCurrency: searchForm.value.paymentCurrency,
                 payType: searchForm.value.payType,
-                startTime: dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
-                endtime: dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
+                startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
+                endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
                 adminId: adminData.value.id
             }
         }
@@ -563,6 +565,35 @@ const handleReject = async function () {
         ElMessage.error(error.message || '审核失败')
     }
 }
+const getMarket = async function () {
+  try {
+    const result = await API({
+
+      url: '/market/selectMarket',
+    })
+    console.log('看看地区树', result)
+
+    const transformTree = (nodes) => {
+      const allChildren = nodes.flatMap(node => node.children || []);
+
+      return allChildren.map(child => {
+        const grandchildren = child.children && child.children.length
+          ? transformTree([child])
+          : null;
+
+        return {
+          value: child.name,
+          label: child.name,
+          children: grandchildren
+        };
+      });
+    };
+    market.value = transformTree(result.data)
+    console.log('转换后的地区树==============', market.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
 const hideReject = function () {
     showReject.value = false
     addForm.value.remark = ''
@@ -745,6 +776,7 @@ const showAudit = function (row) {
 onMounted(() => {
     console.log('???????????????????', adminData.value)
     getRefund()
+    getMarket()
 })
 </script>
 <style scoped lang="scss">
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index 5e4031d..2380a13 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -12,16 +12,16 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-cascader style="width: 9vw;" v-model="searchForm.market" :options="market"
+                <el-cascader style="width: 9vw;" v-model="searchForm.market" :options="market" 
                 placeholder="请选择所属地区" clearable @change="handleMarketChange" />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
-                <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" />
+                <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" clearable />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;" multiple>订单状态</el-text>
-                <el-select v-model="searchForm.statuses" style="width:9vw;">
+                <el-select v-model="searchForm.statuses" style="width:9vw;" clearable>
                     <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
@@ -29,20 +29,20 @@
         <div class="condition">
             <div class="item2">
                 <el-text size="large" style="width:4vw;">付款币种</el-text>
-                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;">
+                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" clearable>
                     <el-option v-for="item in currencies" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
             <div class="item2">
                 <el-text size="large" style="width:4vw;">支付方式</el-text>
-                <el-select v-model="searchForm.payType" style="width:9vw;">
+                <el-select v-model="searchForm.payType" style="width:9vw;" clearable>
                     <el-option v-for="item in channelOptions" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
             <div class="item2" style="width: 28.5vw;">
                 <el-text size="large" style="width:4vw;">付款时间</el-text>
                 <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-                    end-placeholder="结束时间" style="width:22vw;" :disabled-date="disabledDate" />
+                    end-placeholder="结束时间" style="width:22vw;" :disabled-date="disabledDate" clearable />
             </div>
             <div>
                 <el-button type="primary" @click="getRefund">查询</el-button>
@@ -183,49 +183,6 @@
         </div>
     </el-dialog>
 
-    <el-dialog v-model="showSteps" overflow draggable width="1206px" :style="{
-        backgroundImage: 'url(/src/assets/images/背景图.png)',
-        backgroundSize: 'cover',
-        backgroundPosition: 'center'
-    }">
-        <div class="steps">
-            <div class="steps-content">
-                <el-steps style="min-width: 60vw" :active="1" align-center>
-                    <el-step> <template #title>
-                            <div>提交人<br>你是死的</div>
-                        </template>
-                        <template #icon>
-                            <img src="@/assets/images/已审核.png" alt="已审核图标">
-                        </template>
-                    </el-step>
-                    <el-step title="地区财务">
-                        <template #icon>
-                            <img src="@/assets/images/待审核.png" alt="待审核图标">
-                        </template>
-                    </el-step>
-                    <el-step title="地区负责人">
-                        <template #icon>
-                            <img src="@/assets/images/还没传到.png" alt="还没传到图标">
-                        </template>
-                    </el-step>
-                    <el-step title="总部财务">
-                        <template #icon>
-                            <img src="@/assets/images/还没传到.png" alt="还没传到图标">
-                        </template>
-                    </el-step>
-                    <el-step title="指定执行人">
-                        <template #icon>
-                            <img src="@/assets/images/还没传到.png" alt="还没传到图标">
-                        </template>
-                    </el-step>
-                </el-steps>
-            </div>
-            <div class="steps-btn">
-                <el-button type="primary" @click="showSteps = false">确定</el-button>
-            </div>
-        </div>
-    </el-dialog>
-
     <el-dialog v-model="showBack" title="撤回退款" overflow draggable class="back-dialog" :style="{
         backgroundImage: 'url(/src/assets/images/撤回.png)',
         backgroundSize: 'cover',
@@ -285,8 +242,6 @@ const pagination = ref({
 })
 const tableData = ref([])
 const showEdit = ref(false)
-const currentRow = ref({})// 审核进度行信息
-const showSteps = ref(false)
 const uploadRef = ref(null)
 const showBack = ref(false)
 const showError = ref(false)
@@ -326,15 +281,15 @@ const getRefund = async function () {
                 jwcode: searchForm.value.jwcode,//精网号
                 name: searchForm.value.name,//姓名
                 markets: searchForm.value.market,//地区
-                goodsName: searchForm.value.goodsName,//商品名
+                goodsNames: searchForm.value.goodsName,//商品名
                 statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；
                 // 30：总部财务待审核；32：总部财务驳回；
                 // 40：执行人待处理；41：执行人已处理，退款完成；
                 paymentCurrency: searchForm.value.paymentCurrency,//付款币种
                 payType: searchForm.value.payType,//支付方式
-                startTime: dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
-                endtime: dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
+                startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
+                endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
                 submitterId: isKF ? adminData.value.id : null
             }
         }
@@ -760,30 +715,6 @@ onMounted(() => {
     }
 }
 
-.steps {
-    .steps-content {
-        width: 45vw;
-        height: 15vh;
-        display: flex;
-        justify-content: center;
-        padding-top: 15vw;
-        padding-left: 8vw;
-    }
-
-    .steps-status {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
-
-    .steps-btn {
-        height: 15vh;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-    }
-}
-
 .back-dialog {
     width: 700px;
     height: auto;