Merge branch 'milestone-20250728-金币前端三期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250728-金币前端三期

src/views/audit/gold/rechargeAudit.vue

@@ -97,7 +97,12 @@
       </el-table-column>
       <el-table-column prop="createTime" sortable="custom" label="提交时间" width="200px">
         <template #default="scope">
-          {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+<!--          {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}-->
+          {{
+            activeName === 'wait'
+                ? moment(scope.row.auditTime).format('YYYY-MM-DD HH:mm:ss')
+                : moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss')
+          }}
         </template>
       </el-table-column>
       <el-table-column v-if="activeName !== 'wait'" prop="auditTime" label="审核时间" width="200px">

src/views/audit/gold/refundAudit.vue

@@ -5,7 +5,8 @@
       <el-input v-model="searchForm.jwcode" placeholder="请输入精网号" style="width: 12vw;margin-right:1vw" clearable/>
 
       <el-text size="large">商品名：</el-text>
-      <el-select v-model="searchForm.goodsName" placeholder="请输入商品名" style="width: 12vw;margin-right:1vw" clearable>
+      <el-select v-model="searchForm.goodsName" placeholder="请输入商品名" style="width: 12vw;margin-right:1vw"
+                 clearable>
         <el-option v-for="item in refundGoodsOptions" :key="item" :label="item" :value="item"></el-option>
       </el-select>
 
@@ -16,12 +17,16 @@
       </el-select>
 
       <el-text size="large">所属地区：</el-text>
-      <el-cascader v-model="selectedMarketPath" :options="market" placeholder="请选择所属地区" clearable style="width:12vw"
+      <el-cascader v-model="selectedMarketPath" :options="market" placeholder="请选择所属地区" clearable
+                   style="width:12vw"
                    @change="handleMarketChange"/>
     </el-col>
     <el-col>
-        <el-text size="large">提交时间：</el-text>
-        <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="开始时间" class="time-controls"
+      <el-text size="large">
+        {{ activeName === 'wait' ? '提交时间：' : '审核时间：' }}
+      </el-text>
+      <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="开始时间"
+                      class="time-controls"
                       end-placeholder="结束时间" style="margin-right:1vw;width:25vw" @change="handleDatePickerChange"
                       :default-time="defaultTime"/>
       <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''">今</el-button>
@@ -87,7 +92,13 @@
       <el-table-column v-if="checkTab !== 'pending'" prop="auditName" label="审核人" width="120"/>
       <el-table-column prop="createTime" label="提交时间" width="180" sortable="custom">
         <template #default="{ row }">
-          {{ moment(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+          <!--          {{ moment(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}-->
+          {{
+            checkTab === 'pending'
+                ? moment(row.auditTime).format('YYYY-MM-DD HH:mm:ss')
+                : moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')
+          }}
+
         </template>
       </el-table-column>
       <el-table-column v-if="checkTab !== 'pending'" prop="auditTime" label="审核时间" width="180" sortable="custom">
@@ -114,7 +125,8 @@
       </el-table-column>
     </el-table>
     <el-pagination class="pagination" v-model:current-page="pagination.pageNum" v-model:page-size="pagination.pageSize"
-      layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" @size-change="handlePageSizeChange"
+                   layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
+                   @size-change="handlePageSizeChange"
                    @current-change="handleCurrentChange"></el-pagination>
   </el-card>
 
@@ -143,6 +155,7 @@ import { useAdminStore } from "@/store/index.js";
 import {storeToRefs} from "pinia";
 import {findMenuById, permissionMapping} from "@/utils/menuTreePermission.js"
 import dayjs from "dayjs";
+
 const adminStore = useAdminStore();
 const {adminData, menuTree} = storeToRefs(adminStore);
 const defaultTime = [