优化修复等

src/views/ordersManage/tabs/refundList/excelTitle.ts

@@ -14,7 +14,6 @@ export default {
     推广名称: 'promotion_name',
     档位类型: 'tip_text',
     支付方式: 'pay_name',
-    订单状态: 'status_txt',
     平台审核: 'pt_verify_status_text',
     平台审核备注: 'pt_verify_remark',
     商户审核: 'sh_verify_status_text',
@@ -36,77 +35,6 @@ export default {
     支付方式: 'pay_name',
     退款时间: 'pay_at',
     退款单号: 'refund_no',
-    订单状态: 'status_txt'
+    订单状态: 'status_text'
   }
 };
-
-/**
- * 
- *   <el-table-column prop="company_name" label="商户名称" min-width="200px">
-          <template #default="scope">
-            <div>{{ scope.row.company_name }}</div>
-            <div>ID:{{ scope.row.puser_id }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="username" label="优化师" show-overflow-tooltip min-width="200px">
-        </el-table-column>
-        <el-table-column prop="play_name" show-overflow-tooltip label="小程序" min-width="200px">
-        </el-table-column>
-        <el-table-column prop="uid" label="用户ID" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="trade_no" label="订单号" show-overflow-tooltip min-width="200px">
-        </el-table-column>
-        <el-table-column prop="created_at" label="订单时间" show-overflow-tooltip min-width="200px" />
-        <el-table-column prop="ranse_created_at" label="染色注册时间" show-overflow-tooltip min-width="200px" />
-        <el-table-column prop="refund_price" label="申退金额" show-overflow-tooltip min-width="200px" />
-        <el-table-column prop="order_price" label="充值金额" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="promotion_name" label="推广名称" show-overflow-tooltip min-width="200px">
-        </el-table-column>
-        <el-table-column prop="tip_text" label="档位类型" show-overflow-tooltip min-width="150px">
-        </el-table-column>
-        <el-table-column prop="pay_name" label="支付方式" show-overflow-tooltip min-width="150px">
-        </el-table-column>
-        <el-table-column prop="pay_at" label="退款时间" v-if="query.refund_status == 1" show-overflow-tooltip
-          min-width="180px">
-        </el-table-column>
-        <el-table-column prop="refund_no" label="退款单号" v-if="query.refund_status == 1" show-overflow-tooltip
-          min-width="150px">
-        </el-table-column>
-        <el-table-column v-if="query.refund_status == 1" prop="pay_name" label="订单状态" show-overflow-tooltip
-          min-width="150px">
-          <template #default="scope">
-            <div class="wrapper">
-              <span class="text-lg font-bold content">
-                <el-text class="mx-1" type="info">{{ scope.row.status_text }}</el-text>
-              </span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="query.refund_status == 0" prop="pt_verify_status_text" label="平台审核" show-overflow-tooltip
-          min-width="150px">
-          <template #default="scope">
-            <div class="wrapper">
-              <span class="text-lg font-bold content">
-                <el-text class="mx-1" :type="colorType(scope.row)">{{ scope.row.pt_verify_status_text }}</el-text>
-              </span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="query.refund_status == 0" prop="pt_verify_remark" label="平台审核备注" show-overflow-tooltip
-          min-width="150px">
-        </el-table-column>
-        <el-table-column v-if="query.refund_status == 0" prop="sh_verify_status_text" label="商户审核" show-overflow-tooltip
-          min-width="150px">
-          <template #default="scope">
-            <div class="wrapper">
-              <span class="text-lg font-bold content">
-                <el-text class="mx-1" :type="colorType(scope.row)">{{ scope.row.sh_verify_status_text }}</el-text>
-              </span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="query.refund_status == 0" prop="sh_verify_remark" label="商户审核备注" show-overflow-tooltip
-          min-width="150px">
-        </el-table-column>
- */

src/views/ordersManage/tabs/refundList/index.vue

@@ -47,7 +47,7 @@
           </el-form-item>
         </template>
         <template v-slot:extra_button>
-          <exportExcel api="channel/order_list" sheet_name="订单列表" :title_obj="titleObj[query.refund_status]"
+          <exportExcel api="orderRefund/order_list" sheet_name="订单列表" :title_obj="titleObj[query.refund_status]"
             :extro_params="{ is_all: true, ...query }">
           </exportExcel>
         </template>
@@ -86,7 +86,7 @@
         <el-table-column prop="refund_no" label="退款单号" v-if="query.refund_status == 1" show-overflow-tooltip
           min-width="150px">
         </el-table-column>
-        <el-table-column v-if="query.refund_status == 1" prop="pay_name" label="订单状态" show-overflow-tooltip
+        <el-table-column v-if="query.refund_status == 1" prop="status_text" label="订单状态" show-overflow-tooltip
           min-width="150px">
           <template #default="scope">
             <div class="wrapper">
@@ -231,6 +231,7 @@ const noapproveChange = () => {
   api({ refund_id: current.value.id, ...form.value }).then(res => {
     console.log(res, 'apiapiapiapi');
     ElMessage.success(res.message)
+    noapprovedVisible.value = false;
     search()
   })
 }

src/views/settleManage/financialControl/tabs/rechargeSettle/withdrawDetail/tables/withdrawalRecord/index.vue

@@ -51,6 +51,7 @@
 </template>
 
 <script lang="ts" setup>
+import { shortcuts } from '@/utils/shortcuts'
 import { InfoFilled } from '@element-plus/icons-vue';
 import { useGetList } from '@/hook/curd/useGetList';
 const api = 'jiesuanManage/jiesuan/listTixian';

src/views/settleManage/settlementCenter/tabs/rechargeSettle/orderDetail/tabs/rechargeList/index.vue

@@ -29,8 +29,9 @@ const { data, query, search, reset, loading } = useGetList(api);
 
 const tableData = computed(() => data.value?.data);
 if (props.primary) {
-  query.value.id = props.primary.id
-  console.log(props.primary, 'props.primaryprops.primary');
+  query.value.puser_id = props.primary.company_uid
+  query.value.created_at_start = props.primary.jiesuan_date + ' 00:00:00'
+  query.value.created_at_end = props.primary.jiesuan_date + ' 23:59:59'
 }
 onMounted(() => {
   search();

src/views/settleManage/settlementCenter/tabs/rechargeSettle/withdrawalRecord/index.vue

@@ -51,6 +51,7 @@
 </template>
 
 <script lang="ts" setup>
+import { shortcuts } from '@/utils/shortcuts'
 import { InfoFilled } from '@element-plus/icons-vue';
 import { useGetList } from '@/hook/curd/useGetList';
 const api = 'jiesuanManage/jiesuan/listTixian';