fix:服务修改

src/views/business/erp/cost/firm-reports-list.vue

@@ -57,12 +57,12 @@
         <!---------- 表格操作行 begin ----------->
         <a-row class="smart-table-btn-block">
             <div class="smart-table-operate-block">
-                <a-button v-if="isCto" @click="showForm" type="primary" >
+               <!---------- <a-button v-if="isCeo" @click="showForm" type="primary" >
                     <template #icon>
                         <PlusOutlined />
                     </template>
                     新建
-                </a-button>
+                </a-button>----------->
                 <a-button v-if="isCto" @click="confirmBatchDelete" type="primary" danger  :disabled="selectedRowKeyList.length == 0">
                     <template #icon>
                         <DeleteOutlined />

src/views/business/erp/penalty-apply/penalty-apply-form.vue

@@ -15,6 +15,13 @@
       :destroyOnClose="true"
   >
     <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 6 }" >
+        <!-- 只有律所主任显示申请类型选择（个人/律所），行政人员只申请律所证明 -->
+        <a-form-item v-if="showApplyTypeSelect" label="申请类型" name="applyType">
+          <a-radio-group v-model:value="form.applyType" @change="onApplyTypeChange">
+            <a-radio value="PERSONAL">个人证明</a-radio>
+            <a-radio value="FIRM">律所证明</a-radio>
+          </a-radio-group>
+        </a-form-item>
         <a-form-item label="申请事由"  name="usePurpose">
           <a-textarea v-model:value="form.usePurpose" placeholder="请输入申请事由" :rows="4" />
         </a-form-item>
@@ -53,29 +60,89 @@
   const currentUser = computed(() => ({
     userId: userStore.userId,
     userName: userStore.actualName,
-    departmentName: userStore.departmentName
+    departmentName: userStore.departmentName,
+    roleCodeList: userStore.roleCodeList || []
   }));
 
-  function show(rowData) {
+  // 判断是否为律所主任（CTO角色）
+  const isFirmDirector = computed(() => {
+    return currentUser.value.roleCodeList.includes('CTO');
+  });
+
+  // 判断是否为行政人员（STAFF角色）
+  const isStaff = computed(() => {
+    return currentUser.value.roleCodeList.includes('STAFF');
+  });
+
+  // 判断是否为律师（USER角色）
+  const isLawyer = computed(() => {
+    return currentUser.value.roleCodeList.includes('USER');
+  });
+
+  // 判断是否显示申请类型选择（只有律所主任显示，行政人员不显示）
+  const showApplyTypeSelect = computed(() => {
+    return isFirmDirector.value;
+  });
+
+  function show(rowData, applyType) {
     Object.assign(form, formDefault);
-    
+
     // 设置默认值
     if (!rowData || _.isEmpty(rowData)) {
       // 新增时设置默认值
       form.userId = currentUser.value.userId;
       form.userName = currentUser.value.userName;
       form.status = 0; // 默认未提交状态
+
+      // 根据传入的 applyType 参数设置申请类型
+      if (applyType === 'personal') {
+        // 申请个人证明
+        form.applyType = 'PERSONAL';
+        form.type = 'cto'; // 主任申请个人证明
+      } else if (applyType === 'firm') {
+        // 申请律所证明
+        form.applyType = 'FIRM';
+        form.type = 'cto'; // 主任申请律所证明
+      } else if (applyType === 'user') {
+        // 律师申请个人证明
+        form.applyType = 'PERSONAL';
+        form.type = 'user';
+      } else if (isLawyer.value) {
+        // 律师默认申请个人证明
+        form.applyType = 'PERSONAL';
+        form.type = 'user';
+      } else if (isFirmDirector.value) {
+        // 律所主任默认申请律所证明（可切换个人/律所）
+        form.applyType = 'FIRM';
+        form.type = 'cto';
+      } else if (isStaff.value) {
+        // 行政人员只能申请律所证明
+        form.applyType = 'FIRM';
+        form.type = 'cto';
+      }
     } else {
       // 编辑时加载数据
       Object.assign(form, rowData);
     }
-    
+
     visibleFlag.value = true;
     nextTick(() => {
       formRef.value.clearValidate();
     });
   }
 
+  // 申请类型改变时更新type字段
+  function onApplyTypeChange(e) {
+    const applyType = e.target.value;
+    if (applyType === 'PERSONAL') {
+      // 个人证明
+      form.type = isLawyer.value ? 'USER' : 'CTO';
+    } else {
+      // 律所证明
+      form.type = 'CTO';
+    }
+  }
+
   function onClose() {
     Object.assign(form, formDefault);
     visibleFlag.value = false;
@@ -97,12 +164,15 @@
       approvalRemark: undefined, //审批意见
       createTime: undefined, //创建时间
       updateTime: undefined, //更新时间
+      type: undefined, // 类型（兼容旧数据）
+      applyType: undefined, // 申请类型：PERSONAL-个人证明，FIRM-律所证明
   };
 
   let form = reactive({ ...formDefault });
 
   const rules = {
       usePurpose: [{ required: true, message: '申请事由 必填' }],
+      applyType: [{ required: true, message: '申请类型 必填' }],
   };
 
   // ------------------------ 提交申请 ------------------------

src/views/business/erp/penalty-apply/penalty-apply-list.vue

@@ -45,15 +45,22 @@
         <!---------- 表格操作行 begin ----------->
         <a-row class="smart-table-btn-block">
             <div class="smart-table-operate-block">
-                <!-- 申请律师无处罚证明：只有user角色可以申请，行政人员不能申请 -->
+                <!-- 律师申请无处罚证明 -->
                 <a-button @click="() => showForm('user')" type="primary" v-if="isUser">
                     <template #icon>
                         <PlusOutlined />
                     </template>
-                    申请律师无处罚证明
+                    申请无处罚证明
                 </a-button>
-                <!-- 申请律所无处罚证明：cto和staff都可以申请 -->
+                <!-- 律所主任申请个人无处罚证明 -->
-                <a-button @click="() => showForm('cto')" type="primary" v-if="isCto || isFirmAdmin">
+                <a-button @click="() => showForm('personal')" type="primary" v-if="isCto || isFirmAdmin">
+                    <template #icon>
+                        <PlusOutlined />
+                    </template>
+                    申请个人无处罚证明
+                </a-button>
+                <!-- 律所主任申请律所无处罚证明 -->
+                <a-button @click="() => showForm('firm')" type="primary" v-if="isCto || isFirmAdmin">
                     <template #icon>
                         <PlusOutlined />
                     </template>
@@ -117,21 +124,22 @@
         <PenaltyApplyForm  ref="formRef" @reloadList="queryData"/>
         
         <!-- 图片预览弹框 -->
-        <a-modal 
+        <a-modal
-            :footer="null" 
+            :footer="null"
-            :open="previewVisible" 
+            :open="previewVisible"
-            @cancel="handleCancelPreview" 
+            @cancel="handleCancelPreview"
-            :width="null" 
+            :width="null"
             class="image-preview-modal"
             :centered="true"
             :closable="true"
             :maskClosable="true"
+            :title="previewTitle"
         >
             <div class="preview-container">
                 <div class="preview-content">
-                    <img 
+                    <img
-                        :src="previewUrl" 
+                        :src="previewUrl"
-                        alt="无处罚证明" 
+                        :alt="previewTitle"
                         class="preview-image"
                         @error="handleImageError"
                     />
@@ -257,18 +265,34 @@ import PenaltyApplyForm from './penalty-apply-form.vue';
             dataIndex: 'userName',
             ellipsis: true,
         },
+        {
+            title: '申请类型',
+            dataIndex: 'applyType',
+            ellipsis: true,
+            width: 120,
+            customRender: ({ text, record }) => {
+                // 根据 applyType 字段值显示对应的申请类型
+                if (text === 'PERSONAL') {
+                    return '个人证明';
+                } else if (text === 'FIRM') {
+                    return '律所证明';
+                } else {
+                    return record.applyTypeName || text || '未知类型';
+                }
+            },
+        },
         {
             title: '无处罚证明类型',
             dataIndex: 'type',
             ellipsis: true,
             customRender: ({ text, record }) => {
-                // 根据type字段值显示对应的证明类型
+                // 根据 applyType 字段值显示对应的证明类型
-                if (text === 'cto') {
+                if (record.applyType === 'PERSONAL') {
+                    return '个人无处罚证明';
+                } else if (record.applyType === 'FIRM') {
                     return '律所无处罚证明';
-                } else if (text === 'user') {
-                    return '律师无处罚证明';
                 } else {
-                    return text || '未知类型';
+                    return '未知类型';
                 }
             },
         },
@@ -409,23 +433,30 @@ import PenaltyApplyForm from './penalty-apply-form.vue';
     // 检查用户角色
     function checkUserRole() {
         if (loginInfo.value) {
-            // 根据用户角色判断权限
+            // 优先使用 roleCodeList 数组判断角色，如果没有则使用 roleCode 字符串
-            const userRole = loginInfo.value.roleCode || loginInfo.value.roleName || '';
+            let roleCodes = [];
-            const roleLower = userRole.toLowerCase();
-            
-            // CEO角色判断
-            isCeo.value = roleLower === 'ceo';
-            
-            // User角色判断
-            isUser.value = roleLower === 'user';
-            
-            // CTO角色判断（主任）
-            isCto.value = roleLower === 'cto';
             
+            if (loginInfo.value.roleCodeList && loginInfo.value.roleCodeList.length > 0) {
+                // 使用 roleCodeList 数组
+                roleCodes = loginInfo.value.roleCodeList.map(r => r.toLowerCase());
+            } else if (loginInfo.value.roleCode) {
+                // 使用 roleCode 字符串
+                roleCodes = [loginInfo.value.roleCode.toLowerCase()];
+            }
+
+            // CEO 角色判断
+            isCeo.value = roleCodes.includes('ceo');
+
+            // User 角色判断
+            isUser.value = roleCodes.includes('user');
+
+            // CTO 角色判断（主任）
+            isCto.value = roleCodes.includes('cto');
+
             // 行政人员角色判断
-            isFirmAdmin.value = roleLower === 'staff';
+            isFirmAdmin.value = roleCodes.includes('staff');
-            
+
-            console.log('用户角色:', userRole, 'isCeo:', isCeo.value, 'isUser:', isUser.value, 'isCto:', isCto.value, 'isFirmAdmin:', isFirmAdmin.value);
+            console.log('用户角色代码:', roleCodes, 'isCeo:', isCeo.value, 'isUser:', isUser.value, 'isCto:', isCto.value, 'isFirmAdmin:', isFirmAdmin.value);
         }
     }
 
@@ -433,9 +464,9 @@ import PenaltyApplyForm from './penalty-apply-form.vue';
     const formRef = ref();
 
     function showForm(type, data) {
-        // 将type参数传递给表单组件
+        // 将 type 参数作为第二个参数传递给表单组件的 show 方法
-        const formData = data ? { ...data, type } : { type };
+        // type: 'personal' - 申请个人证明，'firm' - 申请律所证明，'user' - 律师申请
-        formRef.value.show(formData);
+        formRef.value.show(data, type);
     }
 
     // ---------------------------- 单个删除 ----------------------------
@@ -588,9 +619,9 @@ import PenaltyApplyForm from './penalty-apply-form.vue';
                 const fileUrl = URL.createObjectURL(blob);
                 
                 console.log('创建的预览URL:', fileUrl);
-                
+
                 message.destroy();
-                showImagePreview(fileUrl);
+                showImagePreview(fileUrl, record);
             } else {
                 message.destroy();
                 // 尝试读取错误响应
@@ -629,10 +660,25 @@ import PenaltyApplyForm from './penalty-apply-form.vue';
     const previewVisible = ref(false);
     const previewUrl = ref('');
     const previewLoading = ref(false);
-    
+    const previewTitle = ref('无处罚证明预览');
+    const currentPreviewRecord = ref(null);
+
     // 显示图片预览
-    function showImagePreview(url) {
+    function showImagePreview(url, record) {
         previewUrl.value = url;
+        currentPreviewRecord.value = record;
+        // 根据申请类型设置预览标题
+        if (record) {
+            if (record.applyType === 'PERSONAL' || record.type === 'USER') {
+                previewTitle.value = '个人无处罚证明预览';
+            } else if (record.applyType === 'FIRM' || record.type === 'CTO') {
+                previewTitle.value = '律所无处罚证明预览';
+            } else {
+                previewTitle.value = '无处罚证明预览';
+            }
+        } else {
+            previewTitle.value = '无处罚证明预览';
+        }
         previewVisible.value = true;
     }
     
@@ -640,6 +686,8 @@ import PenaltyApplyForm from './penalty-apply-form.vue';
     function handleCancelPreview() {
         previewVisible.value = false;
         previewUrl.value = '';
+        previewTitle.value = '无处罚证明预览';
+        currentPreviewRecord.value = null;
     }
     
     // 图片加载错误处理

src/views/business/erp/service/firm-statistics-detail.vue

@@ -120,6 +120,20 @@
           <div class="report-cell">{{ formatCurrency(summaryData.totalAnnualCost) }}</div>
         </div>
       </div>
+      
+      <!-- 分页组件 -->
+      <div class="pagination-container">
+        <a-pagination
+          v-model:current="pagination.pageNum"
+          v-model:pageSize="pagination.pageSize"
+          :total="pagination.total"
+          :page-size-options="['10', '20', '50', '100']"
+          show-size-changer
+          show-total
+          @change="handlePageChange"
+          @showSizeChange="handlePageSizeChange"
+        />
+      </div>
     </div>
   </div>
 </template>
@@ -166,6 +180,13 @@ const exportLoading = ref(false);
 const tableData = ref([]);
 const loading = ref(false);
 
+// 分页配置
+const pagination = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  total: 0
+});
+
 // 查询表单
 const queryForm = reactive({
   year: new Date().getFullYear(),
@@ -183,9 +204,18 @@ const quarterOptions = ref([
   { value: 4, label: '第四季度' }
 ]);
 
-// 是否是CEO角色
+// 是否是 CEO 角色
 const isCeo = ref(false);
 
+// 获取当前季度
+function getCurrentQuarter() {
+  const month = new Date().getMonth() + 1;
+  if (month <= 3) return 1;
+  if (month <= 6) return 2;
+  if (month <= 9) return 3;
+  return 4;
+}
+
 // 初始化年度选项
 function initYearOptions() {
   const currentYear = new Date().getFullYear();
@@ -203,12 +233,20 @@ async function handleQuery() {
     const params = {
       year: queryForm.year,
       quarter: queryForm.quarter,
-      firmId: queryForm.firmId || props.params?.firmId
+      firmId: queryForm.firmId || props.params?.firmId,
+      pageNum: pagination.pageNum,
+      pageSize: pagination.pageSize
     };
-    
+
     const response = await serviceApplicationsApi.statisticsDepartment(params);
-    tableData.value = response.data || [];
+    if (response.data) {
-    
+      tableData.value = response.data.list || [];
+      pagination.total = response.data.total || 0;
+    } else {
+      tableData.value = [];
+      pagination.total = 0;
+    }
+
   } catch (error) {
     message.error('查询失败');
     console.error('查询失败:', error);
@@ -217,10 +255,26 @@ async function handleQuery() {
   }
 }
 
+// 分页变化事件
+function handlePageChange(page, pageSize) {
+  pagination.pageNum = page;
+  pagination.pageSize = pageSize;
+  handleQuery();
+}
+
+// 每页条数变化事件
+function handlePageSizeChange(current, size) {
+  pagination.pageNum = 1;
+  pagination.pageSize = size;
+  handleQuery();
+}
+
 // 重置查询条件
 function handleReset() {
   queryForm.quarter = null;
   queryForm.firmId = null;
+  pagination.pageNum = 1;
+  pagination.pageSize = 10;
   // 重置后自动查询
   handleQuery();
 }
@@ -274,19 +328,25 @@ async function fetchStatisticsData() {
     const params = {
       year: props.params.year,
       quarter: props.params.quarter,
-      firmId: props.params.firmId
+      firmId: props.params.firmId,
+      pageNum: pagination.pageNum,
+      pageSize: pagination.pageSize
     };
-    
+
     // 调用API获取统计数据
     const response = await serviceApplicationsApi.statisticsDepartment(params);
-    tableData.value = response.data || [];
+    if (response.data) {
+      tableData.value = response.data.list || [];
+      pagination.total = response.data.total || 0;
+    } else {
+      tableData.value = [];
+      pagination.total = 0;
+    }
     console.log('API返回的数据:', tableData.value);
-    // 检查是否有律师数据
-    tableData.value.forEach((item, index) => {
-    });
   } catch (error) {
     message.error('获取统计数据失败');
     tableData.value = [];
+    pagination.total = 0;
   } finally {
     loading.value = false;
   }
@@ -302,10 +362,11 @@ async function handleExport() {
   exportLoading.value = true;
   try {
     console.log('开始导出律所统计详情...');
+    // 使用 queryForm 作为导出参数，避免 props.params 为 null 时报错
     const exportParams = {
-      quarter: props.params.quarter,
+      quarter: queryForm.quarter,
-      year: props.params.year,
+      year: queryForm.year,
-      firmId: props.params.firmId
+      firmId: queryForm.firmId
       // 去除分页参数，导出所有数据
     };
     
@@ -518,4 +579,12 @@ onMounted(() => {
   font-weight: 600;
   border-bottom: 1px solid #ddd;
 }
+
+/* 分页容器样式 */
+.pagination-container {
+  padding: 16px;
+  text-align: right;
+  background: #fff;
+  border-top: 1px solid #ddd;
+}
 </style>

src/views/business/erp/service/law-firm-service-report-statistics.vue

@@ -170,7 +170,7 @@
   const queryFormState = {
     firmId: undefined,
     year: new Date().getFullYear(),
-    quarter: Math.ceil((new Date().getMonth() + 1) / 3),
+    quarter: null,
     pageNum: 1,
     pageSize: 10
   };
@@ -262,6 +262,7 @@
 
   function onSearch() {
     pagination.current = 1;
+    queryForm.pageNum = 1;
     queryData();
   }
 

src/views/business/erp/service/law-firm-statistics.vue

@@ -32,7 +32,7 @@
             />
           </a-form-item>
           <a-form-item>
-            <a-button type="primary" @click="handleQuery" :loading="loading">
+            <a-button type="primary" @click="onSearch" :loading="loading">
               <SearchOutlined />
               查询
             </a-button>
@@ -178,6 +178,12 @@ function initYearOptions() {
   yearOptions.value = years;
 }
 
+// 点击查询
+function onSearch() {
+  pagination.value.current = 1;
+  handleQuery();
+}
+
 // 查询数据
   async function handleQuery() {
     try {

src/views/business/erp/service/lawyer-service-report-statistics.vue

@@ -135,9 +135,10 @@
     { label: '第四季度', value: 4 }
   ]);
 
-  const queryFormState = {
+ const queryFormState = {
+    firmId: undefined,
     year: new Date().getFullYear(),
-    quarter: Math.ceil((new Date().getMonth() + 1) / 3),
+    quarter: null,
     pageNum: 1,
     pageSize: 10
   };
@@ -341,11 +342,8 @@
   // ---------------------------- 生命周期 ----------------------------
 
   onMounted(() => {
-    console.log('律师报表页面 onMounted 被调用');
     initYearOptions();
-    console.log('准备调用 queryData');
     queryData();
-    console.log('onMounted 完成');
   });
 </script>
 

src/views/business/erp/service/lawyer-statistics-detail.vue

@@ -127,6 +127,15 @@ const quarterOptions = ref([
   { value: 4, label: '第四季度' }
 ]);
 
+// 获取当前季度
+function getCurrentQuarter() {
+  const month = new Date().getMonth() + 1;
+  if (month <= 3) return 1;
+  if (month <= 6) return 2;
+  if (month <= 9) return 3;
+  return 4;
+}
+
 // 初始化年度选项
 function initYearOptions() {
   const currentYear = new Date().getFullYear();