diff --git a/dist.zip b/dist.zip
index 647accb..3c57242 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/api/business/letter/letter-api.js b/src/api/business/letter/letter-api.js
index 9d02b6a..729ea23 100644
--- a/src/api/business/letter/letter-api.js
+++ b/src/api/business/letter/letter-api.js
@@ -5,7 +5,7 @@
  * @Date:      2025-12-22 17:43:06
  * @Copyright  1
  */
-import { postRequest, getRequest } from '/@/lib/axios';
+import { postRequest, getRequest, getDownload } from '/@/lib/axios';
 
 export const letterApi = {
 
@@ -33,10 +33,40 @@ export const letterApi = {
   /**
    * 查看承诺书详情  @author  wzh
    */
-  isLetter: (letterId) => {
+  detail: (letterId) => {
       return getRequest(`/letter/detail/${letterId}`);
   },
 
+  /**
+   * 检查用户是否已签署承诺书  @author  wzh
+   */
+  isLetter: (userId) => {
+      return getRequest(`/letter/isLetter/${userId}`);
+  },
+
+  /**
+   * 查询所有承诺书  @author  wzh
+   */
+  queryAllBook: () => {
+      return getRequest('/letter/queryAllBook');
+  },
 
+  /**
+   * 下载承诺书文件  @author  wzh
+   */
+  downloadLetter: (letterId) => {
+      return getDownload(`/letter/download/${letterId}`);
+  },
+
+  /**
+   * 上传承诺书证明文件  @author  wzh
+   */
+  uploadProof: (formData) => {
+      return postRequest('/letter/uploadProof', formData, {
+          headers: {
+              'Content-Type': 'multipart/form-data'
+          }
+      });
+  },
 
 };
diff --git a/src/api/business/service-applications/service-applications-api.js b/src/api/business/service-applications/service-applications-api.js
index e3b3b27..76c17a5 100644
--- a/src/api/business/service-applications/service-applications-api.js
+++ b/src/api/business/service-applications/service-applications-api.js
@@ -9,13 +9,19 @@ import { postRequest, getRequest,getDownload, postDownload } from '/@/lib/axios'
 
 export const serviceApplicationsApi = {
 
+
   /**
-   * 分页查询  @author  wzh
+   * 服务申报页面报告查询  @author  wzh
+   */
+  queryPageReport : (param) => {
+    return postRequest('/serviceApplications/queryPageReport', param);
+  },
+ /**
+   * 服务审批分页查询  @author  wzh
    */
   queryPage : (param) => {
     return postRequest('/serviceApplications/queryPage', param);
   },
-
   /**
    * 增加  @author  wzh
    */
diff --git a/src/constants/support/file-const.js b/src/constants/support/file-const.js
index 6435b96..188da9e 100644
--- a/src/constants/support/file-const.js
+++ b/src/constants/support/file-const.js
@@ -23,7 +23,7 @@ export const FILE_FOLDER_TYPE_ENUM = {
   },
   FEEDBACK: {
     value: 4,
-    desc: '意见反馈',
+    desc: '承诺书',
   },
 };
 export default {
diff --git a/src/layout/components/side-help-doc/index.vue b/src/layout/components/side-help-doc/index.vue
index 5a78d44..b1e6b09 100644
--- a/src/layout/components/side-help-doc/index.vue
+++ b/src/layout/components/side-help-doc/index.vue
@@ -20,7 +20,7 @@
 
       <a href="http://8.148.67.92:9000/file/public/notice/c620241c460a4634afdb4b4cebf271d8_20260204121215.docx" target="_blank">
       <file-outlined style="margin-right: 5px;" />
-      合肥市律师公益法律服务管理系统 全角色操作手册.docx
+      合肥市律师公益法律服务管理系统操作手册.docx
     </a>
     </div>
 
diff --git a/src/views/business/erp/letter/letter-list.vue b/src/views/business/erp/letter/letter-list.vue
index ee56774..9896381 100644
--- a/src/views/business/erp/letter/letter-list.vue
+++ b/src/views/business/erp/letter/letter-list.vue
@@ -50,10 +50,46 @@
     </a-form>
     <!---------- 查询表单form end ----------->
 
+    <!---------- 承诺书列表显示区域 begin ----------->
+    <a-card v-if="!isCeo" size="small" :bordered="false" :hoverable="true" style="margin-bottom: 16px;">
+      <template #title>
+        <span>承诺书列表</span>
+      </template>
+      <div style="display: flex; flex-wrap: wrap; gap: 16px;">
+        <div 
+          v-for="item in noticeList" 
+          :key="item.bookId || item.noticeId || item.id"
+          style="display: flex; align-items: center; padding: 8px 12px; background: #f5f5f5; border-radius: 4px; cursor: pointer;"
+          @click="downloadNoticeAttachment(item)"
+          :title="hasAttachment(item) ? '点击下载' : '暂无附件'"
+        >
+          <FileTextOutlined style="font-size: 16px; color: #1890ff; margin-right: 8px;" />
+          <span style="color: #1890ff; font-size: 14px;">{{ item.bookName || item.title }}</span>
+          <DownloadOutlined v-if="hasAttachment(item)" style="font-size: 12px; color: #1890ff; margin-left: 4px;" />
+        </div>
+      </div>
+    </a-card>
+    <!---------- 承诺书列表显示区域 end ----------->
+
     <a-card size="small" :bordered="false" :hoverable="true">
         <!---------- 表格操作行 begin ----------->
         <a-row class="smart-table-btn-block">
             <div class="smart-table-operate-block">
+                <!-- user角色只显示律师承诺书按钮 -->
+                <a-button type="primary" @click="handleLawyerUpload" :loading="proofUploadLoading" v-if="isLawyerRole && !isFirmRole">
+                    <UploadOutlined />
+                    上传律师承诺书
+                </a-button>
+                
+                <!-- cto角色显示两个按钮 -->
+                <a-button type="primary" @click="handleLawyerUpload" :loading="proofUploadLoading" v-if="isFirmRole" style="margin-left: 8px;">
+                    <UploadOutlined />
+                    上传律师承诺书
+                </a-button>
+                <a-button type="primary" @click="handleFirmUpload" :loading="proofUploadLoading" v-if="isFirmRole" style="margin-left: 8px;">
+                    <UploadOutlined />
+                    上传律所承诺书
+                </a-button>
             </div>
             <div class="smart-table-setting-block">
                 <TableOperator v-model="columns" :tableId="null" :refresh="queryData" />
@@ -106,6 +142,43 @@
           @cancel="handleAgreementCancel" 
         />
 
+        <!-- 上传证明文件弹框 -->
+        <a-modal 
+          v-model:visible="showUploadModal" 
+          :title="letterType === 'user' ? '上传律师承诺书' : '上传律所承诺书'" 
+          @cancel="showUploadModal = false"
+          :confirm-loading="proofUploadLoading"
+          @ok="handleUpload"
+        >
+          <a-form layout="vertical">
+            <a-form-item label="上传文件" required>
+              <a-upload
+                :file-list="proofFileList"
+                :customRequest="handleCustomUpload"
+                :max-count="1"
+                accept=".jpg,.jpeg,.png"
+                @change="handleFileChange"
+              >
+                <a-button>
+                  <UploadOutlined />
+                  选择文件
+                </a-button>
+              </a-upload>
+              <div v-if="proofFileList.length > 0" style="margin-top: 8px; color: #52c41a; font-size: 12px;">
+                已选择文件: {{ proofFileList[0].name }}
+              </div>
+              <div style="margin-top: 8px; color: #999; font-size: 12px;">
+                支持格式：图片（JPG/PNG），文件大小不超过10MB
+              </div>
+            </a-form-item>
+          </a-form>
+        </a-modal>
+
+        <!-- 图片预览弹框 -->
+        <a-modal :footer="null" :open="previewVisible" @cancel="handleCancelPreview">
+          <img :src="previewUrl" alt="预览图片" style="width: 100%; max-height: 80vh; object-fit: contain;" />
+        </a-modal>
+
     </a-card>
 </template>
 <script setup>
@@ -114,8 +187,12 @@ import { message, Modal } from 'ant-design-vue';
 import { SmartLoading } from '/@/components/framework/smart-loading';
 import { letterApi } from '/@/api/business/letter/letter-api';
 import { employeeApi } from '/@/api/system/employee-api';
+import { noticeApi } from '/@/api/business/oa/notice-api';
+import { fileApi } from '/@/api/support/file-api';
 import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+import { loginApi } from '/@/api/system/login-api';
 import { smartSentry } from '/@/lib/smart-sentry';
+import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
 import TableOperator from '/@/components/support/table-operator/index.vue';
 import LetterForm from './letter-form.vue';
 import AgreementModal from '/@/views/system/home/components/agreement.vue';
@@ -124,13 +201,13 @@ import AgreementModal from '/@/views/system/home/components/agreement.vue';
 
     const columns = ref([
         {
-            title: '承诺书名称',
-            dataIndex: 'letterName',
+            title: '用户名称',
+            dataIndex: 'userName',
             ellipsis: true,
         },
         {
-            title: '用户名称',
-            dataIndex: 'userName',
+            title: '承诺书类型',
+            dataIndex: 'letterName',
             ellipsis: true,
         },
         {
@@ -153,18 +230,246 @@ import AgreementModal from '/@/views/system/home/components/agreement.vue';
     // 查看详情
     async function viewDetail(record) {
       try {
-        // 设置当前letterId并显示弹框
-        currentLetterId.value = record.letterId;
-        showAgreementModal.value = true;
+        // 检查是否有文件地址
+        if (!record.fileUrl) {
+          message.warning('该承诺书没有附件文件');
+          return;
+        }
+        
+        // 直接使用查询结果中的fileUrl进行预览
+        const fileUrl = record.fileUrl;
+        
+        // 根据文件名推断文件类型
+        const fileName = record.letterName || '';
+        const fileExtension = fileName.split('.').pop() || '';
+        
+        showImagePreview(fileUrl);
+
+        
+      } catch (error) {
+        console.error('预览承诺书失败:', error);
+        message.error('预览承诺书失败，请稍后重试');
+      }
+    }
+    
+    // 图片预览相关
+    const previewVisible = ref(false);
+    const previewUrl = ref('');
+    
+    function showImagePreview(url) {
+      previewUrl.value = url;
+      previewVisible.value = true;
+    }
+    
+    function handleCancelPreview() {
+      previewVisible.value = false;
+      previewUrl.value = '';
+    }
+
+    // ---------------------------- 上传证明功能 ----------------------------
+    
+    // 上传证明相关状态
+    const proofFileList = ref([]);
+    const proofUploadLoading = ref(false);
+    const letterType = ref('user'); // 默认为用户类型
+    const showUploadModal = ref(false);
+    const uploadedFileId = ref(null);
+
+    // 证明文件上传前验证
+    function beforeUploadProof(file) {
+      // 检查文件类型
+      const isImage = file.type === 'image/jpeg' || file.type === 'image/jpg' || file.type === 'image/png';
+      
+      if (!isImage) {
+        message.error('只能上传PDF、Word文档或图片文件!');
+        return false;
+      }
+      
+      // 检查文件大小（10MB）
+      const isLt10M = file.size / 1024 / 1024 < 10;
+      if (!isLt10M) {
+        message.error('文件大小不能超过10MB!');
+        return false;
+      }
+      
+      return true;
+    }
+
+    // 律师承诺书上传
+    async function handleLawyerUpload() {
+      try {
+        // 在点击上传按钮时立即检查用户是否已签署承诺书
+        const hasSigned = await checkUserSigned();
+        if (hasSigned) {
+          message.warning('您已经签署过律师承诺书，无需重复上传');
+          return;
+        }
         
+        // 只有未签约的用户才能打开上传弹框
+        letterType.value = 'user';
+        showUploadModal.value = true;
+        proofFileList.value = [];
       } catch (error) {
-        console.error('查看承诺书详情失败:', error);
-        // 如果出错，显示错误信息
-        Modal.error({
-          title: '错误',
-          content: '获取承诺书详情失败，请稍后重试',
-          okText: '确定',
+        console.error('检查签约状态失败:', error);
+        message.error('检查签约状态失败，请稍后重试');
+      }
+    }
+
+    // 律所承诺书上传
+    async function handleFirmUpload() {
+      try {
+        // 在点击上传按钮时立即检查用户是否已签署承诺书
+        const hasSigned = await checkUserSigned();
+        if (hasSigned) {
+          message.warning('您已经签署过律所承诺书，无需重复上传');
+          return;
+        }
+        
+        // 只有未签约的用户才能打开上传弹框
+        letterType.value = 'cto';
+        showUploadModal.value = true;
+        proofFileList.value = [];
+      } catch (error) {
+        console.error('检查签约状态失败:', error);
+        message.error('检查签约状态失败，请稍后重试');
+      }
+    }
+
+    // 处理文件选择变化
+    function handleFileChange(info) {
+      let fileList = [...info.fileList];
+      
+      // 限制只能上传一个文件
+      fileList = fileList.slice(-1);
+      
+      // 确保文件有正确的originFileObj
+      fileList = fileList.map(file => {
+        if (file.response) {
+          // 组件会将文件信息转换为包含response的对象
+          file.url = file.response.url;
+        }
+        return file;
+      });
+      
+      proofFileList.value = fileList;
+    }
+
+    // 自定义上传请求 - 参考公告中的正确实现
+    async function handleCustomUpload(options) {
+      try {
+        const formData = new FormData();
+        formData.append('file', options.file);
+        
+        const uploadResult = await fileApi.uploadFile(formData, FILE_FOLDER_TYPE_ENUM.FEEDBACK.value);
+        
+        if (uploadResult.code === 0 && uploadResult.data) {
+          // 上传成功，调用onSuccess回调，并将结果设置到file.response中
+          options.onSuccess(uploadResult.data);
+          
+          // 同时更新文件列表中的response数据，以便handleUpload函数能检测到
+          if (proofFileList.value.length > 0) {
+            proofFileList.value[0].response = uploadResult;
+          }
+        } else {
+          // 上传失败，调用onError回调
+          options.onError(new Error(uploadResult.msg || '上传失败'));
+        }
+      } catch (error) {
+        // 异常情况，调用onError回调
+        options.onError(error);
+      }
+    }
+
+    // 保存承诺书
+    async function handleUpload() {
+      if (proofFileList.value.length === 0) {
+        message.warning('请选择要上传的证明文件');
+        return;
+      }
+
+      try {
+        proofUploadLoading.value = true;
+        
+        // 检查文件是否已经上传成功（通过customRequest）
+        const file = proofFileList.value[0];
+        if (!file.response || !file.response.data) {
+          message.warning('文件尚未上传完成，请稍后重试');
+          return;
+        }
+        
+        // 获取已上传文件的ID - 根据接口返回的数据结构
+        const fileId = file.response.data.fileId;
+        
+        if (!fileId) {
+          message.error('获取文件ID失败，请重新上传文件');
+          return;
+        }
+        
+        // 调用承诺书保存接口，传递文件ID、类型和文件地址
+        const saveResult = await letterApi.add({
+          attachmentIds: fileId,
+          letterType: letterType.value,
+          fileUrl: file.response.data.fileUrl
         });
+        
+        if (saveResult.code === 0) {
+          // 直接显示接口返回的data内容
+          message.success(saveResult.data || '承诺书保存成功');
+        
+          // 清空文件列表
+          proofFileList.value = [];
+          
+          // 刷新列表
+          queryData();
+          
+          // 关闭弹框
+          showUploadModal.value = false;
+        } else {
+          message.error(saveResult.msg || '保存承诺书失败');
+        }
+      } catch (error) {
+        console.error('保存承诺书失败:', error);
+        message.error('保存失败，请稍后重试');
+      } finally {
+        proofUploadLoading.value = false;
+      }
+    }
+
+    // 检查公告是否有附件
+    function hasAttachment(notice) {
+      // 检查常见的附件字段
+      return !!(notice.attachment || notice.fileKey || notice.fileId || 
+                notice.attachmentId || notice.fileUrl || notice.attachmentUrl);
+    }
+
+    // 获取公告附件文件key
+    function getAttachmentFileKey(notice) {
+      // 根据常见的附件字段获取文件key
+      return notice.attachment || notice.fileKey || notice.fileId || 
+             notice.attachmentId || notice.fileUrl || notice.attachmentUrl;
+    }
+
+    // 下载公告附件
+    async function downloadNoticeAttachment(notice) {
+      try {
+        SmartLoading.show();
+        
+        // 获取附件文件key
+        let fileKey = getAttachmentFileKey(notice);
+        
+        if (!fileKey) {
+          message.warning('该公告没有附件文件');
+          return;
+        }
+        
+        // 使用file-api下载文件
+        await fileApi.downLoadFile(fileKey);
+        message.success('附件下载成功');
+      } catch (error) {
+        console.error('下载公告附件失败:', error);
+        message.error('下载附件失败，请稍后重试');
+      } finally {
+        SmartLoading.hide();
       }
     }
     
@@ -202,6 +507,96 @@ import AgreementModal from '/@/views/system/home/components/agreement.vue';
     // 总数
     const total = ref(0);
 
+    // ---------------------------- 角色判断相关 ----------------------------
+    
+    // 判断用户是否为CEO角色
+    const isCeo = ref(false);
+    // 判断用户是否为律师角色
+    const isLawyerRole = ref(false);
+    // 判断用户是否为律所角色
+    const isFirmRole = ref(false);
+    
+    // 获取登录信息并检查角色
+    async function getLoginInfo() {
+      try {
+        const res = await loginApi.getLoginInfo();
+        const loginInfo = res.data;
+        
+        // 根据用户角色判断角色类型
+        if (loginInfo) {
+          const roleCode = loginInfo.roleCode || '';
+          const userType = loginInfo.userType || '';
+          const departmentName = loginInfo.departmentName || '';
+          
+          // 根据roleCode、userType和部门名称判断角色
+          const roleLower = roleCode.toLowerCase();
+          isCeo.value = roleLower === 'ceo';
+          // 律师角色：user
+          isLawyerRole.value = roleLower === 'user' || userType === 'user';
+          // 律所角色：cto
+          isFirmRole.value = roleLower === 'cto' || userType === 'cto';
+          
+         }
+      } catch (e) {
+        console.error('获取登录信息失败:', e);
+      }
+    }
+
+    // 检查用户是否已签署承诺书
+    async function checkUserSigned() {
+      try {
+        // 先获取当前登录用户信息
+        const loginRes = await loginApi.getLoginInfo();
+        const loginInfo = loginRes.data;
+        
+        if (!loginInfo || !loginInfo.employeeId) {
+          console.error('无法获取当前用户ID');
+          return false;
+        }
+        
+        // 使用正确的后端接口检查签约状态
+        const res = await letterApi.isLetter(loginInfo.employeeId);
+        if (res.code === 0 && res.data !== undefined) {
+          // 接口返回true代表已签约，false代表未签约
+          return res.data === true;
+        }
+        return false;
+      } catch (error) {
+        console.error('检查用户签约状态失败:', error);
+        // 如果专用接口调用失败，回退到登录信息接口的agreementSignFlag字段
+        try {
+          const loginRes = await loginApi.getLoginInfo();
+          const loginInfo = loginRes.data;
+          if (loginInfo) {
+            const agreementSignFlag = loginInfo.agreementSignFlag;
+            return agreementSignFlag === true;
+          }
+        } catch (fallbackError) {
+          console.error('回退检查用户签约状态失败:', fallbackError);
+        }
+        return false;
+      }
+    }
+
+    // ---------------------------- 公告数据相关 ----------------------------
+    
+    // 公告列表数据
+    const noticeList = ref([]);
+    
+    // 查询承诺书数据
+    async function queryNoticeData() {
+      try {
+        // 使用新的承诺书接口查询数据
+        const result = await letterApi.queryAllBook();
+        
+        if (result.data) {
+          noticeList.value = result.data;
+        }
+      } catch (error) {
+        console.error('查询承诺书数据失败:', error);
+      }
+    }
+
     // 加载所有员工列表
     async function loadAllEmployees() {
         if (employeeList.value.length > 0) {
@@ -287,10 +682,18 @@ import AgreementModal from '/@/views/system/home/components/agreement.vue';
     }
 
 
-    onMounted(() => {
+    onMounted(async () => {
+        // 获取登录信息并检查角色
+        await getLoginInfo();
+        
         queryData();
         // 页面加载时自动加载员工列表
         loadAllEmployees();
+        
+        // 如果不是CEO角色，查询承诺书数据
+        if (!isCeo.value) {
+          queryNoticeData();
+        }
     });
 
     // 查看详情
diff --git a/src/views/business/erp/service/service-applications-form.vue b/src/views/business/erp/service/service-applications-form.vue
index 19b0da3..6dd2648 100644
--- a/src/views/business/erp/service/service-applications-form.vue
+++ b/src/views/business/erp/service/service-applications-form.vue
@@ -93,12 +93,12 @@
           <a-row :gutter="24">
              <a-col :span="8">
               <a-form-item label="服务开始时间"  name="serviceStart" label-align="left">
-                <a-date-picker show-time format="YYYY-MM-DD HH:00:00" valueFormat="YYYY-MM-DD HH:00:00" v-model:value="form.serviceStart" style="width: 100%" placeholder="服务开始时间" :disabled="readonlyMode" />
+                <a-date-picker show-time format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.serviceStart" style="width: 100%" placeholder="服务开始时间" :disabled="readonlyMode" />
               </a-form-item>
             </a-col>
             <a-col :span="8">
               <a-form-item label="服务结束时间"  name="serviceEnd" label-align="left">
-                <a-date-picker show-time format="YYYY-MM-DD HH:00:00" valueFormat="YYYY-MM-DD HH:00:00" v-model:value="form.serviceEnd" style="width: 100%" placeholder="服务结束时间" :disabled="readonlyMode" />
+                <a-date-picker show-time format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.serviceEnd" style="width: 100%" placeholder="服务结束时间" :disabled="readonlyMode" />
               </a-form-item>
             </a-col>
             <a-col :span="8">
@@ -107,9 +107,18 @@
                   <span>服务时长（小时）</span>
                   <span style="color: #999; font-size: 12px; margin-left: 4px;">可通过时间选择也可手动填写</span>
                 </template>
-                <a-input-number style="width: 100%" v-model:value="form.serviceDuration" placeholder="服务时长（小时）" :disabled="readonlyMode" />
+                <a-input-number 
+                  style="width: 100%" 
+                  v-model:value="form.serviceDuration" 
+                  placeholder="服务时长（小时）" 
+                  :disabled="readonlyMode"
+                  :min="0"
+                  :precision="1"
+                  :parser="value => value.replace(/[^\d.]/g, '')"
+                  @blur="handleServiceDurationBlur"
+                />
               </a-form-item>
-              <div style="font-size: 12px; color: #f00d0dff; margin-top: -12px; margin-bottom: 12px;">注:不足30分钟（不含本数）的，不计入时长，超过30分钟不足1个小时的（含本数），按照一个小时填报</div>
+              <div style="font-size: 12px; color: #f00d0dff; margin-top: -12px; margin-bottom: 12px;">注:不足30分钟（含30分钟）的，按照0.5小时填报，超过30分钟不足1小时的（含1小时），按照1小时填报。</div>
             </a-col>
           </a-row>
         </template>
@@ -130,7 +139,16 @@
                   <span>服务时长（小时）</span>
                   <span style="color: #999; font-size: 12px; margin-left: 4px;">请在{{ currentActivity.price }}范围内填写</span>
                 </template>
-                <a-input-number style="width: 100%" v-model:value="form.serviceDuration" placeholder="服务时长（小时）" :disabled="readonlyMode" />
+                <a-input-number 
+                  style="width: 100%" 
+                  v-model:value="form.serviceDuration" 
+                  placeholder="服务时长（小时）" 
+                  :disabled="readonlyMode"
+                  :min="0"
+                  :precision="2"
+                  :parser="value => value.replace(/[^\d.]/g, '')"
+                  @blur="handleServiceDurationBlur"
+                />
               </a-form-item>
             </a-col>
             
@@ -558,6 +576,40 @@
 
   let form = reactive({ ...formDefault });
 
+  // 服务时长格式化函数
+  function formatServiceDuration(minutes) {
+    if (minutes <= 30) {
+      return 0.5; // 30分钟及以下按0.5小时
+    } else if (minutes <= 60) {
+      return 1; // 超过30分钟但不超过60分钟按1小时
+    } else {
+      // 超过1小时的，按实际小时数计算，但遵循同样的分钟规则
+      const hours = Math.floor(minutes / 60);
+      const remainingMinutes = minutes % 60;
+      
+      if (remainingMinutes === 0) {
+        return hours; // 整小时，直接返回小时数
+      } else if (remainingMinutes <= 30) {
+        return hours + 0.5; // 剩余30分钟及以下加0.5小时
+      } else {
+        return hours + 1; // 剩余超过30分钟加1小时
+      }
+    }
+  }
+  
+  // 服务时长输入验证函数（用于手动输入）
+  function validateServiceDuration(hours) {
+    if (hours === undefined || hours === null || isNaN(hours) || hours < 0) {
+      return undefined;
+    }
+    
+    // 将小时转换为分钟
+    const totalMinutes = Math.round(hours * 60);
+    
+    // 使用格式化函数计算正确的值
+    return formatServiceDuration(totalMinutes);
+  }
+
   // 监听服务开始时间和结束时间变化，自动计算服务时长
   watch(
     () => [form.serviceStart, form.serviceEnd],
@@ -567,9 +619,11 @@
         const start = dayjs(startTime);
         const end = dayjs(endTime);
         if (end.isAfter(start)) {
-          // 计算时间差（分钟），然后转换为小时（保留2位小数）
+          // 计算时间差（分钟）
           const durationMinutes = end.diff(start, 'minute');
-          form.serviceDuration = parseFloat((durationMinutes / 60).toFixed(2));
+          
+          // 根据规则计算服务时长
+          form.serviceDuration = formatServiceDuration(durationMinutes);
         } else {
           form.serviceDuration = undefined;
           message.warning('服务结束时间必须晚于开始时间');
@@ -581,6 +635,20 @@
     },
     { immediate: true }
   );
+
+  // 监听手动输入的服务时长变化（仅用于清空处理）
+  watch(
+    () => form.serviceDuration,
+    (newValue, oldValue) => {
+      // 如果用户清空了服务时长（设置为undefined或null），允许清空
+      if (newValue === undefined || newValue === null) {
+        return;
+      }
+      
+      // 其他验证逻辑通过事件处理函数处理，避免重复
+    },
+    { immediate: true }
+  );
   
   // 监听活动名称变化，更新活动类型和设置默认服务时长
   watch(
@@ -700,6 +768,18 @@
                 return Promise.reject('你填写的此类公益活动时长超出该活动要求的100-200小时，请按规范要求填报具体时长');
               }
             }
+            
+            // 验证服务时长是否符合规则（适用于所有类型）
+            if (value !== undefined && value !== null) {
+              // 将小时转换为分钟进行验证
+              const inputMinutes = Math.round(value * 60);
+              const formattedDuration = formatServiceDuration(inputMinutes);
+              
+              // 检查是否符合规则
+              if (Math.abs(formattedDuration - value) > 0.01) {
+              }
+            }
+            
             return Promise.resolve();
           }
         }
@@ -823,6 +903,11 @@
       message.success('保存成功');
       emits('reloadList');
       onClose();
+      
+      // 保存成功后刷新页面
+      setTimeout(() => {
+        window.location.reload();
+      }, 1000);
     } catch (err) {
       smartSentry.captureError(err);
     } finally {
@@ -871,6 +956,46 @@
     show,
   });
 
+  // 服务时长输入框blur事件处理
+  function handleServiceDurationBlur() {
+    const value = form.serviceDuration;
+    
+    // 当用户删除输入时，value会是null或undefined，允许这种情况
+    if (value === null || value === undefined) {
+      return;
+    }
+    
+    // 验证输入值是否为有效数字，防止异常输入
+    if (isNaN(value) || value < 0) {
+      // 无效输入，清空并提示
+      form.serviceDuration = undefined;
+      message.warning('请输入有效的服务时长');
+      return;
+    }
+    
+    // 限制输入范围，防止异常值
+    if (value > 50) {
+      form.serviceDuration = 50;
+      message.warning('服务时长不能超过50小时');
+      return;
+    }
+    
+    // 无论是否有时间选择，都对用户手动输入进行格式化验证
+    // 将小时转换为分钟进行验证
+    const inputMinutes = Math.round(value * 60);
+    
+    // 使用相同的格式化规则
+    const formattedDuration = formatServiceDuration(inputMinutes);
+    
+    // 如果格式化后的值与输入值不同，说明用户输入了不符合规则的值
+    if (Math.abs(formattedDuration - value) > 0.01) {
+      // 提示用户并自动修正为符合规则的值
+      message.info(`服务时长已自动调整为符合规则的值：${formattedDuration}小时`);
+      
+      // 直接设置格式化后的值
+      form.serviceDuration = formattedDuration;
+    }
+  }
 
 // 获取文件URL
 function getFileUrl(file) {
diff --git a/src/views/business/erp/service/service-applications-list.vue b/src/views/business/erp/service/service-applications-list.vue
index c00cad6..5d19378 100644
--- a/src/views/business/erp/service/service-applications-list.vue
+++ b/src/views/business/erp/service/service-applications-list.vue
@@ -1,5 +1,5 @@
 <!--
-  * 服务申报表
+  * 服务审批表
   *
   * @Author:    wzh
   * @Date:      2025-12-20 14:44:06
@@ -45,12 +45,6 @@
                     </a-select-option>
                 </a-select>
             </a-form-item>
-            <a-form-item label="本人本所" v-if="isCtoRole" class="smart-query-form-item">
-                <a-select style="width: 150px" v-model:value="queryForm.selfFirmFilter" placeholder="请选择筛选条件">
-                    <a-select-option value="self">本人</a-select-option>
-                    <a-select-option value="firm">本所</a-select-option>
-                </a-select>
-            </a-form-item>
             <a-form-item label="协会审核状态" v-if="isCeo" class="smart-query-form-item">
                 <a-select style="width: 150px" v-model:value="queryForm.associationAuditStatus" placeholder="请选择审核状态">
                     <a-select-option v-for="status in Object.values(REVIEW_ENUM)" :key="status.value" :value="status.value">
@@ -81,13 +75,13 @@
         <a-row class="smart-table-btn-block">
             <div class="smart-table-operate-block">
          
-                <!-- 新建申报按钮：非协会角色且非CEO角色显示 -->
+                <!-- 新建申报按钮：非协会角色且非CEO角色显示 
                 <a-button v-if="!isAssociationRole && !isCeo" @click="showForm" type="primary">
                     <template #icon>
                         <PlusOutlined />
                     </template>
                     新建申报
-                </a-button>
+                </a-button>-->
                 
                 <!-- 批量提交按钮：非CEO角色显示 -->
                 <a-button v-if="!isCeo" @click="batchSubmit"  type="primary" :disabled="selectedRowKeyList.length == 0">
@@ -123,13 +117,13 @@
                     批量上报
                 </a-button>
                 
-                <a-button v-if="!isCeo" @click="confirmBatchDelete" type="primary" danger :disabled="!canBatchDelete()">
+                <!--<a-button v-if="!isCeo" @click="confirmBatchDelete" type="primary" danger :disabled="!canBatchDelete()">
                     <template #icon>
                         <DeleteOutlined />
                     </template>
                     批量删除
                 </a-button>
-                <!--<a-button @click="showImportModal" type="primary">
+                <a-button @click="showImportModal" type="primary">
                     <template #icon>
                         <ImportOutlined />
                     </template>
@@ -161,15 +155,12 @@
                         <a-button @click="showDetail(record)" type="link">详情</a-button>
                         <!-- 执业机构审核状态为拒绝时，只显示详情按钮 -->
                         <template v-if="record.firmAuditStatus !== 4">
-                            <a-button v-if="(record.firmAuditStatus === 0 || record.firmAuditStatus === 4) && record.userId === loginInfo?.userId" @click="showForm(record)" type="link">编辑</a-button>
-                            <a-button v-if="(record.firmAuditStatus === 0 && record.userId === loginInfo?.userId)" @click="onSubmit(record)" type="link">提交</a-button>
                             <a-button v-if="canAuditRecord(record)" @click="showAuditModal(record)" type="link">审核</a-button>
                             <a-button v-if="canRejectRecord(record)" @click="showRejectModal(record)" danger type="link">驳回</a-button>
-                            <a-button v-if="record.firmAuditStatus === 0 && record.userId === loginInfo?.userId" @click="onDelete(record)" danger type="link">删除</a-button>
                         </template>
                     </div>
                 </template>
-            </template>
+            </template> 
         </a-table>
         <!---------- 表格 end ----------->
 
diff --git a/src/views/business/erp/service/service-applications-report-list.vue b/src/views/business/erp/service/service-applications-report-list.vue
new file mode 100644
index 0000000..d24207c
--- /dev/null
+++ b/src/views/business/erp/service/service-applications-report-list.vue
@@ -0,0 +1,1276 @@
+<!--
+  * 服务申报表
+  *
+  * @Author:    wzh
+  * @Date:      2025-12-20 14:44:06
+  * @Copyright  1.0
+-->
+<template>
+    <!-- 默认直接显示服务记录列表，所有角色都显示 -->
+    <div>
+        <!---------- 查询表单form begin ----------->
+        <a-form class="smart-query-form">
+        <a-row class="smart-query-form-row">
+            <a-form-item label="执业机构" v-if="isAssociationRole || isCeo" class="smart-query-form-item">
+                <DepartmentTreeSelect style="width: 250px" v-model:value="queryForm.firmId" placeholder="请选择执业机构" />
+            </a-form-item>
+            <a-form-item label="律师名称" v-if="isAssociationRole || isFirmRole || isCeo" class="smart-query-form-item">
+                <a-select
+                    v-model:value="queryForm.userId"
+                    style="width: 150px"
+                    placeholder="请选择律师"
+                    :showSearch="true"
+                    :allowClear="true"
+                    @focus="loadAllEmployees"
+                >
+                    <a-select-option v-for="item in employeeList" :key="item.employeeId" :value="item.employeeId">
+                        {{ item.actualName }}
+                        <template v-if="item.departmentName"> （{{ item.departmentName }}） </template>
+                    </a-select-option>
+                </a-select>
+            </a-form-item>
+            <a-form-item label="服务开始时间" class="smart-query-form-item">
+                <a-date-picker style="width: 150px" v-model:value="queryForm.serviceStart" placeholder="开始时间" />
+            </a-form-item>
+            <a-form-item label="服务结束时间" class="smart-query-form-item">
+                <a-date-picker style="width: 150px" v-model:value="queryForm.serviceEnd" placeholder="结束时间" />
+            </a-form-item>
+            <a-form-item label="组织单位名称" class="smart-query-form-item">
+                <a-input style="width: 150px" v-model:value="queryForm.organizerName" placeholder="组织单位名称" />
+            </a-form-item>
+            <a-form-item label="执业机构审核状态" v-if="isCtoRole" class="smart-query-form-item">
+                <a-select style="width: 150px" v-model:value="queryForm.firmAuditStatus" placeholder="请选择审核状态">
+                    <a-select-option v-for="status in Object.values(REVIEW_ENUM)" :key="status.value" :value="status.value">
+                        {{ status.desc }}
+                    </a-select-option>
+                </a-select>
+            </a-form-item>
+            
+            <a-form-item label="协会审核状态" v-if="isCeo" class="smart-query-form-item">
+                <a-select style="width: 150px" v-model:value="queryForm.associationAuditStatus" placeholder="请选择审核状态">
+                    <a-select-option v-for="status in Object.values(REVIEW_ENUM)" :key="status.value" :value="status.value">
+                        {{ status.desc }}
+                    </a-select-option>
+                </a-select>
+            </a-form-item>
+            <a-form-item class="smart-query-form-item smart-margin-left10">
+                <a-button v-privilege="'serviceApplications:query'" type="primary" @click="onSearch">
+                    <template #icon>
+                        <SearchOutlined />
+                    </template>
+                    查询
+                </a-button>
+                <a-button @click="resetQuery" class="smart-margin-left10">
+                    <template #icon>
+                        <ReloadOutlined />
+                    </template>
+                    重置
+                </a-button>
+            </a-form-item>
+        </a-row>
+    </a-form>
+    <!---------- 查询表单form end ----------->
+
+    <a-card size="small" :bordered="false" :hoverable="true">
+        <!---------- 表格操作行 begin ----------->
+        <a-row class="smart-table-btn-block">
+            <div class="smart-table-operate-block">
+         
+                <!-- 新建申报按钮：非协会角色且非CEO角色显示 -->
+                <a-button v-if="!isAssociationRole && !isCeo" @click="showForm" type="primary">
+                    <template #icon>
+                        <PlusOutlined />
+                    </template>
+                    新建申报
+                </a-button>
+                
+                
+                <a-button v-if="!isCeo" @click="confirmBatchDelete" type="primary" danger :disabled="!canBatchDelete()">
+                    <template #icon>
+                        <DeleteOutlined />
+                    </template>
+                    批量删除
+                </a-button>
+                <!--<a-button @click="showImportModal" type="primary">
+                    <template #icon>
+                        <ImportOutlined />
+                    </template>
+                    导入
+                </a-button>-->
+
+            </div>
+            <div class="smart-table-setting-block">
+                <TableOperator v-model="columns" :tableId="null" :refresh="queryData" />
+            </div>
+        </a-row>
+        <!---------- 表格操作行 end ----------->
+
+        <!---------- 表格 begin ----------->
+        <a-table
+            size="small"
+            :scroll="{ x: 1800, y: 800 }"
+            :dataSource="tableData"
+            :columns="columns"
+            rowKey="applicationId"
+            bordered
+            :loading="tableLoading"
+            :pagination="false"
+            :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
+        >
+            <template #bodyCell="{ record, column }">
+                <template v-if="column.dataIndex === 'action'">
+                    <div class="smart-table-operate">
+                        <a-button @click="showDetail(record)" type="link">详情</a-button>
+                        <!-- 执业机构审核状态为拒绝时，只显示详情按钮 -->
+                        <template v-if="record.firmAuditStatus !== 4">
+                            <a-button v-if="(record.firmAuditStatus === 0 || record.firmAuditStatus === 4) && record.userId === loginInfo?.userId" @click="showForm(record)" type="link">编辑</a-button>
+                            <a-button v-if="(record.firmAuditStatus === 0 && record.userId === loginInfo?.userId)" @click="onSubmit(record)" type="link">提交</a-button>
+                            <a-button v-if="record.firmAuditStatus === 0 && record.userId === loginInfo?.userId" @click="onDelete(record)" danger type="link">删除</a-button>
+                        </template>
+                    </div>
+                </template>
+            </template>
+        </a-table>
+        <!---------- 表格 end ----------->
+
+    <!---------- 审核弹框 begin ----------->
+    <a-modal
+        v-model:visible="auditModalVisible"
+        title="服务申报审核"
+        :confirm-loading="auditLoading"
+        @ok="handleAudit"
+        @cancel="handleAuditCancel"
+        width="400px"
+    >
+        <div style="text-align: center; padding: 20px 0;">
+            <p style="margin-bottom: 20px; font-size: 16px;">请选择审核结果：</p>
+            <a-radio-group v-model:value="auditForm.auditResult" size="large">
+                <a-radio :value="3" style="margin-right: 30px;">
+                    <span style="font-size: 16px;">同意</span>
+                </a-radio>
+                <a-radio :value="4">
+                    <span style="font-size: 16px;">拒绝</span>
+                </a-radio>
+            </a-radio-group>
+        </div>
+    </a-modal>
+    <!---------- 审核弹框 end ----------->
+
+    <!---------- 批量审核弹框 begin ----------->
+    <a-modal
+        v-model:visible="batchAuditModalVisible"
+        title="批量审核服务申报"
+        :confirm-loading="batchAuditLoading"
+        @ok="handleBatchAudit"
+        @cancel="handleBatchAuditCancel"
+        width="500px"
+    >
+        <a-form :model="batchAuditForm" :label-col="{ span: 6 }" :wrapper-col="{ span: 16 }">
+            <a-form-item label="审核结果" required>
+                <a-radio-group v-model:value="batchAuditForm.auditResult">
+                    <a-radio :value="3">同意</a-radio>
+                    <a-radio :value="4">拒绝</a-radio>
+                </a-radio-group>
+            </a-form-item>
+            <a-form-item label="选中记录">
+                <span style="color: #1890ff;">{{ selectedRowKeyList.length }} 条记录</span>
+            </a-form-item>
+        </a-form>
+    </a-modal>
+    <!---------- 批量审核弹框 end ----------->
+
+    <!---------- 驳回弹框 begin ----------->
+    <a-modal
+        v-model:visible="rejectModalVisible"
+        title="驳回服务申报"
+        :confirm-loading="rejectLoading"
+        @ok="handleReject"
+        @cancel="handleRejectCancel"
+        width="500px"
+    >
+        <a-form :model="rejectForm" layout="vertical">
+            <a-form-item label="驳回原因" required>
+                <a-textarea 
+                    v-model:value="rejectForm.rejectReason" 
+                    placeholder="请输入驳回原因" 
+                    rows="4"
+                    :maxlength="200"
+                    show-count
+                    style="resize: vertical;"
+                />
+            </a-form-item>
+        </a-form>
+    </a-modal>
+    <!---------- 驳回弹框 end ----------->
+
+    <div class="smart-query-table-page">
+            <a-pagination
+                showSizeChanger
+                showQuickJumper
+                show-less-items
+                :pageSizeOptions="PAGE_SIZE_OPTIONS"
+                :defaultPageSize="queryForm.pageSize"
+                v-model:current="queryForm.pageNum"
+                v-model:pageSize="queryForm.pageSize"
+                :total="total"
+                @change="queryData"
+                @showSizeChange="queryData"
+                :show-total="(total) => `共${total}条`"
+            />
+        </div>
+
+        <ServiceApplicationsForm  ref="formRef" @reloadList="queryData"/>
+        <AgreementModal ref="agreementModalRef" @confirm="handleAgreementConfirm" />
+
+        <!-- 导入弹窗 -->
+        <a-modal v-model:open="importModalShowFlag" title="导入" @onCancel="hideImportModal" @ok="hideImportModal">
+            <div style="text-align: center; width: 400px; margin: 0 auto">
+                <a-button @click="downloadExcel">
+                    <DownloadOutlined />
+                    第一步：下载模板
+                </a-button>
+                <br />
+                <br />
+                <a-upload
+                    v-model:fileList="fileList"
+                    name="file"
+                    :multiple="false"
+                    action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
+                    accept=".xls,.xlsx"
+                    :before-upload="beforeUpload"
+                    @remove="handleRemove"
+                >
+                    <a-button>
+                        <UploadOutlined />
+                        第二步：选择文件
+                    </a-button>
+                </a-upload>
+
+                <br />
+                <a-button @click="onImport">
+                    <ImportOutlined />
+                    第三步：开始导入
+                </a-button>
+            </div>
+        </a-modal>
+
+        </a-card>
+    </div>
+</template>
+<script setup>
+    import { reactive, ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { message, Modal } from 'ant-design-vue';
+import { SmartLoading } from '/@/components/framework/smart-loading';
+import { serviceApplicationsApi } from '/@/api/business/service-applications/service-applications-api';
+import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+import { smartSentry } from '/@/lib/smart-sentry';
+import TableOperator from '/@/components/support/table-operator/index.vue';
+import ServiceApplicationsForm from './service-applications-form.vue';
+import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
+import { employeeApi } from '/@/api/system/employee-api';
+import { REVIEW_ENUM } from '/@/constants/system/review-const';
+import { PlusOutlined, DeleteOutlined, SendOutlined, ImportOutlined, ExportOutlined, DownloadOutlined, UploadOutlined, CheckCircleOutlined } from '@ant-design/icons-vue';
+import { loginApi } from '/@/api/system/login-api';
+import AgreementModal from '/@/views/system/home/components/agreement-modal.vue';
+    // ---------------------------- 表格列 ----------------------------
+
+    const columns = ref([
+                {
+            title: '执业机构',
+            dataIndex: 'departmentName',
+            ellipsis: true,
+            width: 180,
+        },
+        {
+            title: '律师名称',
+            dataIndex: 'userName',
+            ellipsis: true,
+        },
+        {
+            title: '职务名称',
+            dataIndex: 'positionName',
+            ellipsis: true,
+            width: 100,
+        },
+        {
+            title: '服务开始时间',
+            dataIndex: 'serviceStart',
+            ellipsis: true,
+             width: 100,
+        },
+        {
+            title: '服务结束时间',
+            dataIndex: 'serviceEnd',
+            ellipsis: true,
+             width: 100,
+        },
+        {
+            title: '服务时长（小时）',
+            dataIndex: 'serviceDuration',
+            ellipsis: true,
+        },
+        
+        {
+            title: '参加人数（受益人数）',
+            dataIndex: 'beneficiaryCount',
+            ellipsis: true,
+        },
+        {
+            title: '组织单位名称',
+            dataIndex: 'organizerName',
+            ellipsis: true,
+        },
+        {
+            title: '服务对象负责人/联系人姓名',
+            dataIndex: 'organizerContact',
+            ellipsis: true,
+        },
+        {
+            title: '联系方式',
+            dataIndex: 'organizerPhone',
+            ellipsis: true,
+        },
+        {
+            title: '执业机构审核状态',
+            dataIndex: 'firmAuditStatus',
+            ellipsis: true,
+            customRender: ({ text }) => {
+                const status = Object.values(REVIEW_ENUM).find(item => item.value === text);
+                return status ? status.desc : text;
+            },
+        },
+        {
+            title: '执业机构审核人',
+            dataIndex: 'firmAuditUserName',
+            ellipsis: true,
+        },
+        {
+            title: '执业机构审核时间',
+            dataIndex: 'firmAuditTime',
+            ellipsis: true,
+        },
+        {
+            title: '协会审核状态',
+            dataIndex: 'associationAuditStatus',
+            ellipsis: true,
+            customRender: ({ text }) => {
+                const status = Object.values(REVIEW_ENUM).find(item => item.value === text);
+                return status ? status.desc : text;
+            },
+        },
+        {
+            title: '协会审核意见',
+            dataIndex: 'associationAuditOpinion',
+            ellipsis: true,
+        },
+        {
+            title: '协会审核人',
+            dataIndex: 'associationAuditUserName',
+            ellipsis: true,
+        },
+        
+        {
+            title: '操作',
+            dataIndex: 'action',
+            fixed: 'right',
+            width: 150,
+        },
+    ]);
+
+    // ---------------------------- 查询数据表单和方法 ----------------------------
+
+    const queryFormState = {
+        pageNum: 1,
+        pageSize: 10,
+        firmId: undefined, // 执业机构ID
+        userId: undefined, // 律师ID
+        serviceStart: undefined, // 服务开始时间
+        serviceEnd: undefined, // 服务结束时间
+        organizerName: undefined, // 组织单位名称
+        managerName: undefined, // 负责人姓名
+        firmAuditStatus: undefined, // 执业机构审核状态
+        associationAuditStatus: undefined, // 协会审核状态
+    };
+    // 查询表单form
+    const queryForm = reactive({ ...queryFormState });
+    // 表格加载loading
+    const tableLoading = ref(false);
+    // 表格数据
+    const tableData = ref([]);
+
+    // 员工列表数据
+    const employeeList = ref([]);
+
+    // 审核相关状态
+    const auditModalVisible = ref(false);
+    const auditLoading = ref(false);
+    const currentAuditRecord = ref(null);
+    const auditForm = reactive({
+    });
+    
+    // 批量审核相关状态
+    const batchAuditModalVisible = ref(false);
+    const batchAuditLoading = ref(false);
+    const batchAuditForm = reactive({
+      applicationIds: '', // 选中的申请ID列表，用逗号分隔
+    });
+    
+    // 登录用户信息
+    const loginInfo = ref(null);
+    
+    // 判断用户是否为user角色（不是user则显示批量审核）
+    const isNotUser = ref(false);
+    
+    // 判断用户是否为cto角色（cto则额外显示批量上报）
+    const isCtoRole = ref(false);
+    
+    // 判断用户是否为协会角色（协会角色显示驳回按钮）
+    const isAssociationRole = ref(false);
+    
+    // 判断用户是否为CEO角色（CEO显示律所统计概览）
+    const isCeo = ref(false);
+    
+    // 判断用户是否为律所角色
+    const isFirmRole = ref(false);
+    
+    // 获取登录信息
+    async function getLoginInfo() {
+      try {
+        const res = await loginApi.getLoginInfo();
+        loginInfo.value = res.data;
+        checkUserRole(); // 获取登录信息后检查用户角色
+        console.log('登录信息:', res.data);
+      } catch (e) {
+        console.error('获取登录信息失败:', e);
+      }
+    }
+    
+    // 检查用户角色
+    function checkUserRole() {
+      if (loginInfo.value) {
+        // 根据用户角色判断权限
+        const userRole = loginInfo.value.roleCode || loginInfo.value.roleName || '';
+        const roleLower = userRole.toLowerCase();
+        
+        // 不是user角色则显示批量审核按钮
+        isNotUser.value = roleLower != 'user';
+        
+        // cto角色则额外显示批量上报按钮
+        isCtoRole.value = roleLower === 'cto';
+        
+        // 协会角色（协会角色显示驳回按钮）
+        isAssociationRole.value = roleLower.includes('协会') || 
+                                 roleLower.includes('association') || 
+                                 roleLower.includes('律协') || 
+                                 roleLower.includes('律师协会');
+        
+        // 律所角色判断
+        isFirmRole.value = roleLower.includes('律所') || 
+                          roleLower.includes('firm') || 
+                          roleLower.includes('lawyer') || 
+                          roleLower.includes('律师');
+        
+        // CEO角色判断（CEO不显示新建申报和批量提交按钮）
+        isCeo.value = roleLower === 'ceo';
+        
+        console.log('用户角色:', userRole, '不是user:', isNotUser.value, '是cto:', isCtoRole.value, '是协会角色:', isAssociationRole.value, '是CEO:', isCeo.value);
+      }
+    }
+
+    // 检查用户是否已签约
+    function checkUserSigned() {
+        if (!loginInfo.value) {
+            console.log('未获取到登录信息');
+            return false;
+        }
+        
+        // 从用户信息接口获取agreementSignFlag字段
+        const agreementSignFlag = loginInfo.value.agreementSignFlag;
+        console.log('用户签约状态 agreementSignFlag:', agreementSignFlag);
+        
+        // true代表已签约，不需要弹框
+        // false或undefined代表未签约，需要弹框
+        return agreementSignFlag === true;
+    }
+    
+    // 批量审核
+    function batchAudit() {
+      if (selectedRowKeyList.value.length === 0) {
+        message.warning('请选择要审核的记录');
+        return;
+      }
+      
+      // 检查选中的记录是否都有审核权限
+      const canAuditRecords = tableData.value.filter(record => 
+        selectedRowKeyList.value.includes(record.applicationId) && canAuditRecord(record)
+      );
+      
+      if (canAuditRecords.length === 0) {
+        message.warning('选中的记录不符合审核条件，请选择待审核状态的记录');
+        return;
+      }
+      
+      // 显示批量审核弹窗
+      batchAuditModalVisible.value = true;
+      batchAuditForm.applicationIds = selectedRowKeyList.value.join(',');
+    }
+    
+    // 判断用户是否有权限审核某条记录
+    function canAuditRecord(record) {
+      if (!loginInfo.value || !isNotUser.value) return false;
+      
+      const userRole = (loginInfo.value.roleCode || loginInfo.value.roleName || '').toLowerCase();
+      
+      // ceo角色：只能审核协会审核状态为待审核(1)的记录
+      if (userRole === 'ceo') {
+        return record.associationAuditStatus === 1;
+      }
+      
+      // cto角色：只能审核执业机构审核状态为待审核(1)的记录
+      if (userRole === 'cto') {
+        return record.firmAuditStatus === 1;
+      }
+      
+      return false;
+    }
+    
+    // 批量审核确认
+    async function handleBatchAudit() {
+      if (!batchAuditForm.auditResult) {
+        message.warning('请选择审核结果');
+        return;
+      }
+      
+      // 检查选中的记录是否都有审核权限
+      const canAuditRecords = tableData.value.filter(record => 
+        selectedRowKeyList.value.includes(record.applicationId) && canAuditRecord(record)
+      );
+      
+      if (canAuditRecords.length !== selectedRowKeyList.value.length) {
+        message.warning('部分选中的记录不符合审核条件，请重新选择');
+        return;
+      }
+      
+      batchAuditLoading.value = true;
+      try {
+        // 根据角色使用不同的审核状态字段
+        // 协会角色使用associationAuditStatus，其他角色使用firmAuditStatus
+        const auditData = {
+          ...batchAuditForm,
+          auditStatusField: isAssociationRole.value ? 'associationAuditStatus' : 'firmAuditStatus'
+        };
+        
+        await serviceApplicationsApi.batchReview(auditData);
+        message.success('批量审核成功');
+        batchAuditModalVisible.value = false;
+        queryData(); // 刷新数据
+        selectedRowKeyList.value = []; // 清空选中
+        
+        // 重置表单
+        batchAuditForm.auditResult = undefined;
+        batchAuditForm.auditRemark = '';
+        batchAuditForm.applicationIds = '';
+      } catch (error) {
+        console.error('批量审核失败:', error);
+        message.error('批量审核失败');
+      } finally {
+        batchAuditLoading.value = false;
+      }
+    }
+    
+    // 批量审核取消
+    function handleBatchAuditCancel() {
+      batchAuditModalVisible.value = false;
+      batchAuditForm.auditResult = undefined;
+      batchAuditForm.auditRemark = '';
+      batchAuditForm.applicationIds = '';
+    }
+    
+    // 批量上报
+    function batchReport() {
+      if (selectedRowKeyList.value.length === 0) {
+        message.warning('请选择要上报的记录');
+        return;
+      }
+      
+      // 检查选中的记录是否符合上报条件
+      const canReportRecords = tableData.value.filter(record => 
+        selectedRowKeyList.value.includes(record.applicationId) && canReportRecord(record)
+      );
+      
+      if (canReportRecords.length === 0) {
+        message.warning('选中的记录不符合上报条件');
+        return;
+      }
+      
+      // 确认上报
+      Modal.confirm({
+        title: '批量上报确认',
+        content: `确定要将选中的 ${canReportRecords.length} 条符合条件的记录上报到协会审核吗？`,
+        onOk: () => handleBatchReport(canReportRecords),
+        okText: '确定上报',
+        cancelText: '取消'
+      });
+    }
+    
+    // 判断记录是否符合上报条件
+    function canReportRecord(record) {
+      // 只能上报已通过执业机构审核的记录（状态为3：已通过）
+      // 且协会审核状态必须是未提交（0）
+      return record.firmAuditStatus === 3 && 
+             record.associationAuditStatus === 0;
+    }
+    
+    // 执行批量上报
+    async function handleBatchReport(validRecords) {
+      try {
+        SmartLoading.show();
+        
+        // 从符合条件的记录中提取ID列表
+        const idList = validRecords.map(record => record.applicationId).map(id => Number(id));
+        
+        if (idList.length === 0) {
+          message.warning('没有符合条件的记录可以上报');
+          SmartLoading.hide();
+          return;
+        }
+        
+        console.log('批量上报参数:', idList);
+        
+        const res = await serviceApplicationsApi.batchSubmitAsFirm(idList);
+
+        
+        // 清空选中状态
+        selectedRowKeyList.value = [];
+        // 刷新数据
+        queryData();  
+        
+      } catch (error) {
+        smartSentry.captureError(error);
+      } finally {
+        SmartLoading.hide();
+      }
+    }
+    
+    // 加载所有员工数据
+    async function loadAllEmployees() {
+        try {
+            if (employeeList.value.length === 0) {
+                let resp = await employeeApi.queryAll();
+                employeeList.value = resp.data;
+            }
+        } catch (e) {
+            console.error('加载员工数据失败:', e);
+        }
+    }
+    // 总数
+    const total = ref(0);
+
+    // 重置查询条件
+    function resetQuery() {
+        let pageSize = queryForm.pageSize;
+        Object.assign(queryForm, queryFormState);
+        queryForm.pageSize = pageSize;
+        queryData();
+    }
+    
+    // 处理查询参数，将时间范围转换为开始结束时间
+    function processQueryParams(params) {
+        const processedParams = { ...params };
+        
+        // 处理执业机构审核时间范围
+        if (params.firmAuditTimeRange && params.firmAuditTimeRange.length === 2) {
+            processedParams.firmAuditTimeStart = params.firmAuditTimeRange[0];
+            processedParams.firmAuditTimeEnd = params.firmAuditTimeRange[1];
+            delete processedParams.firmAuditTimeRange;
+        }
+        
+        // 处理协会审核时间范围
+        if (params.associationAuditTimeRange && params.associationAuditTimeRange.length === 2) {
+            processedParams.associationAuditTimeStart = params.associationAuditTimeRange[0];
+            processedParams.associationAuditTimeEnd = params.associationAuditTimeRange[1];
+            delete processedParams.associationAuditTimeRange;
+        }
+        
+        return processedParams;
+    }
+
+    // 搜索
+    function onSearch(){
+      queryForm.pageNum = 1;
+      queryData();
+    }
+
+    // 处理本人本所筛选条件
+    function processSelfFirmFilter(params) {
+        const processedParams = { ...params };
+        
+        // 如果有本人本所筛选条件
+        if (loginInfo.value && params.selfFirmFilter) {
+            if (params.selfFirmFilter === 'self') {
+                // 本人：只显示当前用户的数据
+                processedParams.userId = loginInfo.value.userId;
+            } else if (params.selfFirmFilter === 'firm') {
+                // 本所：显示当前用户所在律所的所有数据
+                processedParams.firmId = loginInfo.value.departmentId;
+            }
+            // 如果是'all'，则不需要特殊处理，显示全部数据
+        }
+        
+        // 删除筛选条件字段，避免传递给后端
+        delete processedParams.selfFirmFilter;
+        
+        return processedParams;
+    }
+
+    // 查询数据
+    async function queryData() {
+        tableLoading.value = true;
+        try {
+            // 处理查询参数
+            let query = processQueryParams({ ...queryForm });
+            // 处理本人本所筛选条件
+            query = processSelfFirmFilter(query);
+            let queryResult = await serviceApplicationsApi.queryPageReport(query);
+            tableData.value = queryResult.data.list;
+            total.value = queryResult.data.total;
+        } catch (e) {
+            smartSentry.captureError(e);
+        } finally {
+            tableLoading.value = false;
+        }
+    }
+
+
+    // 获取路由实例
+const route = useRoute();
+
+onMounted(async () => {
+        await getLoginInfo();
+        
+        // 检查URL查询参数中是否有firmId
+        const firmId = route.query.firmId;
+        if (firmId) {
+            // 如果有firmId，则设置查询条件
+            queryForm.firmId = firmId;
+        }
+        
+        // 查询数据
+        queryData();
+    });
+
+    // ---------------------------- 承诺书弹框 ----------------------------
+    const agreementModalRef = ref();
+    const pendingFormData = ref(null); // 暂存表单数据
+
+    // 显示承诺书弹框
+    function showAgreementModal(data) {
+        pendingFormData.value = data;
+        agreementModalRef.value.showDrawer();
+    }
+
+    // 承诺书确认回调
+    function handleAgreementConfirm() {
+        // 用户同意协议，继续显示表单
+        if (pendingFormData.value) {
+            formRef.value.show(pendingFormData.value);
+        } else {
+            formRef.value.show();
+        }
+        pendingFormData.value = null;
+    }
+
+    // ---------------------------- 添加/修改 ----------------------------
+    const formRef = ref();
+
+    function showForm(data) {
+        // 检查用户是否已签约
+        if (checkUserSigned()) {
+            // 已签约，直接显示表单
+            formRef.value.show(data);
+        } else {
+            // 未签约，提示用户下载承诺书并签约
+            Modal.warning({
+                title: '提示',
+                content: '您尚未签署承诺书，无法进行服务申报。请先下载承诺书进行签约并上传。',
+                okText: '知道了',
+            });
+        }
+    }
+    
+    // ---------------------------- 详情 ----------------------------
+    async function showDetail(record) {
+        try {
+            SmartLoading.show();
+            const detailResult = await serviceApplicationsApi.queryDetail(record.applicationId);
+            if (detailResult.data) {
+                formRef.value.show(detailResult.data, true);
+            }
+        } catch (error) {
+            smartSentry.captureError(error);
+            message.error('获取详情失败');
+        } finally {
+            SmartLoading.hide();
+        }
+    }
+
+    // ---------------------------- 单个提交 ----------------------------
+    //确认提交
+    function onSubmit(data){
+        Modal.confirm({
+            title: '提示',
+            content: '确定要提交该申报记录吗?',
+            okText: '提交',
+            okType: 'primary',
+            onOk() {
+                requestSubmit(data);
+            },
+            cancelText: '取消',
+            onCancel() {},
+        });
+    }
+
+    //请求提交
+    async function requestSubmit(data){
+        try {
+            SmartLoading.show();
+            // 传递完整的表单数据进行提交
+            await serviceApplicationsApi.submit(data);
+            message.success('提交成功');
+            queryData();
+        } catch (e) {
+            smartSentry.captureError(e);
+        } finally {
+            SmartLoading.hide();
+        }
+    }
+
+    // ---------------------------- 单个删除 ----------------------------
+    //确认删除
+    function onDelete(data){
+        Modal.confirm({
+            title: '提示',
+            content: '确定要删除选吗?',
+            okText: '删除',
+            okType: 'danger',
+            onOk() {
+                requestDelete(data);
+            },
+            cancelText: '取消',
+            onCancel() {},
+        });
+    }
+
+    //请求删除
+async function requestDelete(data){
+    SmartLoading.show();
+    try {
+        let deleteForm = {
+            goodsIdList: selectedRowKeyList.value,
+        };
+        await serviceApplicationsApi.delete(data.applicationId);
+        message.success('删除成功');
+        queryData();
+    } catch (e) {
+        smartSentry.captureError(e);
+    } finally {
+        SmartLoading.hide();
+    }
+}
+
+// 显示审核弹框
+function showAuditModal(record) {
+    currentAuditRecord.value = record;
+    auditForm.auditResult = 3; // 默认同意
+    auditForm.auditRemark = '';
+    auditModalVisible.value = true;
+}
+
+// 处理审核
+    async function handleAudit() {
+        if (!currentAuditRecord.value) {
+            message.error('未选择审核记录');
+            return;
+        }
+        
+        auditLoading.value = true;
+        
+        const auditData = {
+            applicationId: currentAuditRecord.value.applicationId,
+            firmAuditStatus: auditForm.auditResult
+        };
+        
+        try {
+            await serviceApplicationsApi.review(auditData);
+            message.success('审核成功');
+            auditModalVisible.value = false;
+            queryData();
+        } catch (error) {
+            message.error('审核失败');
+            console.error('审核失败:', error);
+        } finally {
+            auditLoading.value = false;
+        }
+    }
+
+// 取消审核
+        function handleAuditCancel() {
+            auditModalVisible.value = false;
+            currentAuditRecord.value = null;
+            auditForm.auditResult = 3;
+            auditForm.auditRemark = '';
+        }
+
+    // ---------------------------- 批量删除 ----------------------------
+
+    // 选择表格行
+    const selectedRowKeyList = ref([]);
+
+    function onSelectChange(selectedRowKeys) {
+        selectedRowKeyList.value = selectedRowKeys;
+    }
+
+    // 判断是否可以批量删除（所有选中记录的执业机构审核状态必须为未提交）
+    function canBatchDelete() {
+        if (selectedRowKeyList.value.length === 0) {
+            return false;
+        }
+        
+        // 获取选中的记录
+        const selectedRecords = tableData.value.filter(record => 
+            selectedRowKeyList.value.includes(record.applicationId)
+        );
+        
+        // 检查所有记录是否都是未提交状态
+        const allUnsubmitted = selectedRecords.every(record => 
+            record.firmAuditStatus === 0
+        );
+        
+        return allUnsubmitted;
+    }
+
+    // 批量删除
+    function confirmBatchDelete() {
+        if (selectedRowKeyList.value.length === 0) {
+            message.warning('请先选择要删除的数据');
+            return;
+        }
+        
+        // 获取选中的记录
+        const selectedRecords = tableData.value.filter(record => 
+            selectedRowKeyList.value.includes(record.applicationId)
+        );
+        
+        // 检查是否有不符合删除条件的记录（只能删除未提交状态的数据）
+        const invalidRecords = selectedRecords.filter(record => 
+            record.firmAuditStatus !== 0
+        );
+        
+        if (invalidRecords.length > 0) {
+            message.warning('只能删除未提交状态的数据');
+            return;
+        }
+        
+        Modal.confirm({
+            title: '提示',
+            content: '确定要批量删除这些未提交状态的数据吗?',
+            okText: '删除',
+            okType: 'danger',
+            onOk() {
+                requestBatchDelete();
+            },
+            cancelText: '取消',
+            onCancel() {},
+        });
+    }
+
+    //请求批量删除
+    async function requestBatchDelete() {
+        try {
+            SmartLoading.show();
+            await serviceApplicationsApi.batchDelete(selectedRowKeyList.value);
+            message.success('删除成功');
+            queryData();
+        } catch (e) {
+            smartSentry.captureError(e);
+        } finally {
+            SmartLoading.hide();
+        }
+    }
+
+    // ------------------------------- 导出和导入 ---------------------------------
+    // 导入弹窗
+    const importModalShowFlag = ref(false);
+
+    const fileList = ref([]);
+    // 显示导入
+    function showImportModal() {
+        fileList.value = [];
+        importModalShowFlag.value = true;
+    }
+
+    // 关闭 导入
+    function hideImportModal() {
+        importModalShowFlag.value = false;
+    }
+
+    function handleChange() {}
+
+    function handleDrop() {}
+
+    function handleRemove(file) {
+        const index = fileList.value.indexOf(file);
+        const newFileList = fileList.value.slice();
+        newFileList.splice(index, 1);
+        fileList.value = newFileList;
+    }
+    function beforeUpload(file) {
+        fileList.value = [...(fileList.value || []), file];
+        return false;
+    }
+
+    function downloadExcel() {
+        serviceApplicationsApi.downloadTemplate();
+    }
+
+    async function onImport() {
+        const formData = new FormData();
+        fileList.value.forEach((file) => {
+            formData.append('file', file.originFileObj);
+        });
+
+        SmartLoading.show();
+        try {
+            let res = await serviceApplicationsApi.importServiceApplications(formData);
+            message.success(res.msg);
+            hideImportModal();
+            queryData();
+        } catch (e) {
+            smartSentry.captureError(e);
+        } finally {
+            SmartLoading.hide();
+        }
+    }
+
+    async function onExport() {
+        await serviceApplicationsApi.exportServiceApplications();
+    }
+
+    // ---------------------------- 批量提交 ----------------------------
+
+    // 批量提交
+    function batchSubmit() {
+        // 检查所有选中的记录是否都是未提交状态
+        const selectedRecords = tableData.value.filter(record => 
+            selectedRowKeyList.value.includes(record.applicationId)
+        );
+        
+        const nonSubmitRecords = selectedRecords.filter(record => record.firmAuditStatus !== 0);
+        
+        if (nonSubmitRecords.length > 0) {
+            message.warning(`选中的记录中有 ${nonSubmitRecords.length} 条不是未提交状态，无法批量提交`);
+            return;
+        }
+        
+        Modal.confirm({
+            title: '提示',
+            content: `确定要批量提交选中的 ${selectedRowKeyList.value.length} 条申报记录吗？`,
+            okText: '提交',
+            okType: 'primary',
+            onOk() {
+                requestBatchSubmit();
+            },
+            cancelText: '取消',
+            onCancel() {},
+        });
+    }
+
+    // 请求批量提交
+    async function requestBatchSubmit() {
+        try {
+            SmartLoading.show();
+            await serviceApplicationsApi.batchSubmit(selectedRowKeyList.value);
+            message.success('批量提交成功');
+            queryData();
+        } catch (e) {
+            smartSentry.captureError(e);
+        } finally {
+            SmartLoading.hide();
+        }
+    }
+
+    // 提交
+    
+    // ---------------------------- CEO功能 ----------------------------
+    
+    // CEO角色相关状态
+    const showFirmStatistics = ref(true);
+    const selectedFirmData = ref(null);
+    
+    // 返回律所统计
+    function backToFirmStatistics() {
+        console.log('返回律所统计，当前showFirmStatistics值:', showFirmStatistics.value);
+        
+        showFirmStatistics.value = true;
+        selectedFirmData.value = null;
+        
+        // 重置查询条件
+        queryForm.firmId = undefined;
+        queryForm.year = undefined;
+        queryForm.quarter = undefined;
+        
+        // 重置分页
+        queryForm.pageNum = 1;
+        
+        console.log('返回后showFirmStatistics值:', showFirmStatistics.value);
+        
+        // 重新加载数据（显示所有数据）
+        queryData();
+    }
+    
+    // 处理律所选择
+    function handleFirmSelected(firmData) {
+        console.log('选择的律所:', firmData);
+        console.log('当前showFirmStatistics值:', showFirmStatistics.value);
+        
+        // 设置选中的律所信息
+        selectedFirmData.value = firmData;
+        
+        // 设置查询条件：只显示该律所的数据
+        queryForm.firmId = firmData.firmId;
+        
+        // 如果有年度和季度信息，也设置到查询条件中
+        if (firmData.year) {
+            queryForm.year = firmData.year;
+        }
+        if (firmData.quarter) {
+            queryForm.quarter = firmData.quarter;
+        }
+        
+        // 重置分页
+        queryForm.pageNum = 1;
+        
+        // 显示详细服务记录，隐藏统计概览
+        showFirmStatistics.value = false;
+        console.log('切换后showFirmStatistics值:', showFirmStatistics.value);
+        
+        // 重新加载数据
+        queryData();
+    }
+    
+    // ---------------------------- 驳回功能 ----------------------------
+    
+    // 驳回相关状态
+    const rejectModalVisible = ref(false);
+    const rejectLoading = ref(false);
+    const currentRejectRecord = ref(null);
+    const rejectForm = reactive({
+        rejectReason: '',
+        approvalRemark: ''
+    });
+    
+    // 判断记录是否可以驳回
+    function canRejectRecord(record) {
+        // 1. 必须是协会角色、CEO角色或CTO角色
+        if (!isAssociationRole.value && !isCeo.value && !isCtoRole.value) {
+            console.log('驳回按钮不显示：不是协会角色、CEO角色或CTO角色');
+            return false;
+        }
+        
+        // 2. 根据角色类型设置不同的驳回条件
+        if (isAssociationRole.value || isCeo.value) {
+            // 协会角色和CEO角色：协会审核状态必须是通过（3）且在18个月内
+            if (record.associationAuditStatus !== 3) {
+                console.log('驳回按钮不显示：协会审核状态不是通过', record.associationAuditStatus);
+                return false;
+            }
+            
+            // 必须有协会审核时间
+            if (!record.associationAuditTime) {
+                console.log('驳回按钮不显示：没有协会审核时间');
+                return false;
+            }
+            
+            // 判断协会审核时间距离当前时间是否在18个月内
+            const auditDate = new Date(record.associationAuditTime);
+            const now = new Date();
+            const monthsDiff = (now.getFullYear() - auditDate.getFullYear()) * 12 + (now.getMonth() - auditDate.getMonth());
+            
+            console.log('协会审核时间:', record.associationAuditTime, '月份差:', monthsDiff);
+            
+            const canReject = monthsDiff <= 18;
+            if (!canReject) {
+                console.log('驳回按钮不显示：超过18个月');
+            }
+            
+            return canReject;
+        } else if (isCtoRole.value) {
+            // CTO角色：协会审核状态必须是驳回（4）且执业机构审核状态不能是驳回（4）
+            if (record.associationAuditStatus !== 4) {
+                console.log('驳回按钮不显示：协会审核状态不是驳回', record.associationAuditStatus);
+                return false;
+            }
+            
+            // 执业机构审核状态不能是驳回（4）
+            if (record.firmAuditStatus === 4) {
+                console.log('驳回按钮不显示：执业机构审核状态是驳回', record.firmAuditStatus);
+                return false;
+            }
+            
+            return true;
+        }
+        
+        return false;
+    }
+    
+    // 显示驳回弹框
+    function showRejectModal(record) {
+        currentRejectRecord.value = record;
+        rejectForm.rejectReason = '';
+        rejectForm.approvalRemark = '';
+        rejectModalVisible.value = true;
+    }
+    
+    // 处理驳回
+    async function handleReject() {
+        if (!currentRejectRecord.value) {
+            message.error('未选择驳回记录');
+            return;
+        }
+        
+        if (!rejectForm.rejectReason.trim()) {
+            message.warning('请输入驳回原因');
+            return;
+        }
+        
+        rejectLoading.value = true;
+        
+        const rejectData = {
+            applicationId: currentRejectRecord.value.applicationId,
+            associationAuditStatus: 4, // 驳回状态
+            associationAuditOpinion: rejectForm.rejectReason,
+            approvalRemark: rejectForm.approvalRemark
+        };
+        
+        try {
+            await serviceApplicationsApi.review(rejectData);
+            message.success('驳回成功');
+            rejectModalVisible.value = false;
+            queryData();
+        } catch (error) {
+            message.error('驳回失败');
+            console.error('驳回失败:', error);
+        } finally {
+            rejectLoading.value = false;
+        }
+    }
+    
+    // 取消驳回
+    function handleRejectCancel() {
+        rejectModalVisible.value = false;
+        currentRejectRecord.value = null;
+        rejectForm.rejectReason = '';
+        rejectForm.approvalRemark = '';
+    }
+</script>
diff --git a/src/views/mobile/service/create.vue b/src/views/mobile/service/create.vue
index 4a5af76..c8dce34 100644
--- a/src/views/mobile/service/create.vue
+++ b/src/views/mobile/service/create.vue
@@ -150,7 +150,7 @@
               class="form-input" 
               placeholder="服务时长（小时）"
             />
-            <div style="font-size: 12px; color: #f00d0d; margin-top: 6px;">注:不足30分钟（不含本数）的，不计入时长，超过30分钟不足1个小时的（含本数），按照一个小时填报</div>
+            <div style="font-size: 12px; color: #f00d0d; margin-top: 6px;">注:不足30分钟（不含本数）的，按照0.5小时填报，超过30分钟不足1个小时的（含本数），按照一个小时填报</div>
           </div>
         </template>
         
@@ -195,25 +195,7 @@
             />
           </div>
           
-          <!-- 服务时长 -->
-          <div class="form-item">
-            <label class="form-label required">服务时长（小时）</label>
-            <input 
-              v-model="form.serviceDuration" 
-              class="form-input" 
-              placeholder="服务时长（小时）"
-            />
-            <div style="font-size: 12px; color: #f00d0d; margin-top: 6px;">注:服务时长必须在100-200小时范围内</div>
-          </div>
-        </template>
-        
-        <!-- 加载中状态 -->
-        <template v-else key="loading-template">
-          <div class="form-item">
-            <div style="text-align: center; padding: 20px; color: #999;">
-              加载中...
-            </div>
-          </div>
+          
         </template>
       </div>
 
diff --git a/src/views/mobile/service/detail.vue b/src/views/mobile/service/detail.vue
index 5e00bad..69a20c6 100644
--- a/src/views/mobile/service/detail.vue
+++ b/src/views/mobile/service/detail.vue
@@ -159,8 +159,8 @@
             <label class="form-label">服务开始时间</label>
             <a-date-picker 
               show-time 
-              format="YYYY-MM-DD HH:00:00" 
-              valueFormat="YYYY-MM-DD HH:00:00" 
+              format="YYYY-MM-DD HH:mm:ss" 
+              valueFormat="YYYY-MM-DD HH:mm:ss" 
               v-model:value="form.serviceStart" 
               class="form-input" 
               placeholder="服务开始时间"
@@ -173,8 +173,8 @@
             <label class="form-label">服务结束时间</label>
             <a-date-picker 
               show-time 
-              format="YYYY-MM-DD HH:00:00" 
-              valueFormat="YYYY-MM-DD HH:00:00" 
+              format="YYYY-MM-DD HH:mm:ss" 
+              valueFormat="YYYY-MM-DD HH:mm:ss" 
               v-model:value="form.serviceEnd" 
               class="form-input" 
               placeholder="服务结束时间"
@@ -194,7 +194,7 @@
               placeholder="服务时长（小时）"
               :readonly="readonlyMode"
             />
-            <div style="font-size: 12px; color: #f00d0d; margin-top: 6px;">注:不足30分钟（不含本数）的，不计入时长，超过30分钟不足1个小时的（含本数），按照一个小时填报</div>
+            <div style="font-size: 12px; color: #f00d0d; margin-top: 6px;">注:不足30分钟（不含本数）的，按照0.5小时填报，超过30分钟不足1个小时的（含本数），按照一个小时填报</div>
           </div>
         </template>
         
@@ -241,26 +241,6 @@
             />
           </div>
           
-          <!-- 服务时长 -->
-          <div class="form-item">
-            <label class="form-label">服务时长（小时）</label>
-            <input 
-              v-model="form.serviceDuration" 
-              class="form-input" 
-              placeholder="服务时长（小时）"
-              :readonly="readonlyMode"
-            />
-            <div style="font-size: 12px; color: #f00d0d; margin-top: 6px;">注:服务时长必须在100-200小时范围内</div>
-          </div>
-        </template>
-        
-        <!-- 加载中状态 -->
-        <template v-else>
-          <div class="form-item">
-            <div style="text-align: center; padding: 20px; color: #999;">
-              加载中...
-            </div>
-          </div>
         </template>
       </div>
 
diff --git a/src/views/system/home/components/agreement.vue b/src/views/system/home/components/agreement.vue
index 42c37ba..f9ad505 100644
--- a/src/views/system/home/components/agreement.vue
+++ b/src/views/system/home/components/agreement.vue
@@ -89,7 +89,7 @@ async function getLetterDetail(letterId) {
     loading.value = true;
     
     // 使用/letter/detail/{letterId}接口获取承诺书内容
-    const result = await letterApi.isLetter(letterId);
+    const result = await letterApi.detail(letterId);
     
     if (result.data) {
       Object.assign(noticeDetail, result.data);
diff --git a/vite.config.js b/vite.config.js
index e722064..b4a3246 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -35,20 +35,20 @@ export default {
     proxy: {
       // 代理API路径
       '/api': {
-        target: 'http://8.148.67.92:8080/', // 目标服务器地址
-        //target: 'http://127.0.0.1:8080/',
+        //target: 'http://8.148.67.92:8080/', // 目标服务器地址
+        target: 'http://127.0.0.1:8080/',
         changeOrigin: true, // 是否修改请求头中的 Origin 字段
         rewrite: (path) => path.replace(/^\/api/, ''), // 重写路径
       },
       '/login': {
-        target: 'http://8.148.67.92:8080/', // 目标服务器地址
-        //target: 'http://127.0.0.1:8080/',
+        //target: 'http://8.148.67.92:8080/', // 目标服务器地址
+        target: 'http://127.0.0.1:8080/',
         changeOrigin: true, // 是否修改请求头中的 Origin 字段
         rewrite: (path) => path.replace(/^\/api/, ''), // 重写路径
       },
       '/mobile/login': {
-        target: 'http://8.148.67.92:8080/', // 目标服务器地址
-        //target: 'http://127.0.0.1:8080/',
+        //target: 'http://8.148.67.92:8080/', // 目标服务器地址
+        target: 'http://127.0.0.1:8080/',
         changeOrigin: true, // 是否修改请求头中的 Origin 字段
         rewrite: (path) => path.replace(/^\/api/, ''), // 重写路径
       },