From ec9197c5fc1690036834b6d267beec55aabba18d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 06 八月 2025 11:06:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

---
 src/views/ServiceChargeManage/ServiceChargeManage.vue |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index 5041efb..1f00249 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -52,7 +52,18 @@
         </template>
         <template #btn>
           <el-button type="primary" link @click="handleDownloadTemplate()">缁撶畻鍗曟ā鏉�</el-button>
-          <el-button type="primary" @click="handleDownloadTemplate()">涓婁紶缁撶畻鍗�</el-button>
+          <BlFileUpload
+            :limitFileSize="10"
+            accept="xls,xlsx"
+            :showTip="false"
+            :show-file-list="false"
+            :on-success="handleUploadSuccess"
+            style="margin-right: 10px; margin-left: 10px"
+          >
+            <template #default>
+              <el-button type="primary">涓婁紶缁撶畻鍗�</el-button>
+            </template>
+          </BlFileUpload>
           <el-button type="primary" @click="handleDownloadTemplate()">瀵煎嚭</el-button>
         </template>
       </ProTableQueryFilterBar>
@@ -94,15 +105,15 @@
   FieldRadio,
   defineOperationBtns,
   BlFileUpload,
+  UploadUserFile,
 } from '@bole-core/components';
-import * as flexEnterpriseServices from '@/services/api/FlexEnterprise';
 import { ServiceChargeManageColumns } from './constants';
 import { FlexEnterpriseSettingStatus, Gender } from '@/constants';
 import { OrderInputType } from '@bole-core/core';
 import { downloadFileByUrl } from '@/utils';
 
 defineOptions({
-  name: 'ServiceChargeManage',
+  name: 'ServiceChargeManageList',
 });
 
 const operationBtns = defineOperationBtns([
@@ -195,7 +206,7 @@
 function goSettle(row) {
   router.push({
     name: 'ServiceChargeSettle',
-    query: {
+    params: {
       id: row.id,
     },
   });
@@ -204,12 +215,14 @@
 function goDetail(row) {
   router.push({
     name: 'ServiceChargeDetail',
-    query: {
+    params: {
       id: row.id,
     },
   });
 }
 
+function handleUploadSuccess(response: UploadUserFile) {}
+
 function handleUpload(val, row) {
   console.log('val: ', val);
 }

--
Gitblit v1.9.1