修改问题

src/api/business/letter/letter-api.js

@@ -44,6 +44,13 @@ export const letterApi = {
       return getRequest(`/letter/isLetter/${userId}`);
   },
 
+  /**
+   * 检查用户是否已签署律所承诺书  @author  wzh
+   */
+  isLetterDept: (userId) => {
+      return getRequest(`/letter/isLetterDept/${userId}`);
+  },
+
   /**
    * 查询所有承诺书  @author  wzh
    */

src/components/system/service-count/excel-statistics-detail.vue

@@ -193,17 +193,16 @@ async function handleQuery() {
   queryLoading.value = true;
   try {
     const params = {
-      ...localQueryForm,
-      pageNum: 1,
-      pageSize: 500 // 查询所有数据
+      ...localQueryForm
+      // 去除分页参数，直接查询所有数据
     };
     
     // 调用律师统计接口
     const res = await serviceApplicationsApi.statistics(params);
     console.log('律师统计查询结果:', res);
     
-    if (res.data && res.data.list && Array.isArray(res.data.list)) {
-      tableData.value = res.data.list.map(item => ({
+    if (res.data && Array.isArray(res.data)) {
+      tableData.value = res.data.map(item => ({
         ...item,
         // 根据实际返回字段映射
         lawyerName: item.lawyerName || '-',

src/components/system/service-count/firm-statistics-detail.vue

@@ -225,9 +225,8 @@ async function handleExport() {
     const exportParams = {
       quarter: props.params.quarter,
       year: props.params.year,
-      firmId: props.params.firmId,
-      pageNum: 1,
-      pageSize: 500
+      firmId: props.params.firmId
+      // 去除分页参数，导出所有数据
     };
     
     await serviceApplicationsApi.exportLawyer(exportParams);

src/constants/system/review-const.js

@@ -44,6 +44,10 @@ export const QUARTER_ENUM = {
  * 服务审核状态
  */
 export const SERVICEC_REVIEW_ENUM = {
+  NOSUBMIT: {
+    value: 0,
+    desc: '未提交',
+  },
   APPROVAL: {
     value: 1,
     desc: '待审核',

src/views/business/erp/letter/letter-list.vue

@@ -319,7 +319,7 @@ import AgreementModal from '/@/views/system/home/components/agreement.vue';
     async function handleFirmUpload() {
       try {
         // 在点击上传按钮时立即检查用户是否已签署承诺书
-        const hasSigned = await checkUserSigned();
+        const hasSigned = await checkUserSigned('cto');
         if (hasSigned) {
           message.warning('您已经签署过律所承诺书，无需重复上传');
           return;
@@ -543,7 +543,7 @@ import AgreementModal from '/@/views/system/home/components/agreement.vue';
     }
 
     // 检查用户是否已签署承诺书
-    async function checkUserSigned() {
+    async function checkUserSigned(letterType = 'user') {
       try {
         // 先获取当前登录用户信息
         const loginRes = await loginApi.getLoginInfo();
@@ -554,8 +554,17 @@ import AgreementModal from '/@/views/system/home/components/agreement.vue';
           return false;
         }
         
-        // 使用正确的后端接口检查签约状态
-        const res = await letterApi.isLetter(loginInfo.employeeId);
+        // 根据承诺书类型调用不同的接口
+        let apiCall;
+        if (letterType === 'cto') {
+          // 律所承诺书
+          apiCall = letterApi.isLetterDept(loginInfo.employeeId);
+        } else {
+          // 律师承诺书（默认）
+          apiCall = letterApi.isLetter(loginInfo.employeeId);
+        }
+        
+        const res = await apiCall;
         if (res.code === 0 && res.data !== undefined) {
           // 接口返回true代表已签约，false代表未签约
           return res.data === true;

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

@@ -9,7 +9,7 @@
     <!---------- 查询表单form begin ----------->
     <a-form class="smart-query-form">
         <a-row class="smart-query-form-row">
-            <a-form-item label="申请人" class="smart-query-form-item">
+            <a-form-item label="申请人" class="smart-query-form-item" v-if="isCeo || isCto">
                 <a-input style="width: 150px" v-model:value="queryForm.userName" placeholder="请输入申请人" />
             </a-form-item>
             <a-form-item label="申请日期" class="smart-query-form-item">
@@ -45,11 +45,17 @@
         <!---------- 表格操作行 begin ----------->
         <a-row class="smart-table-btn-block">
             <div class="smart-table-operate-block">
-                <a-button @click="showForm" type="primary" v-if="!isCeo">
+                <a-button @click="() => showForm('user')" type="primary" v-if="!isCeo">
                     <template #icon>
                         <PlusOutlined />
                     </template>
-                    新建
+                    申请律师无处罚证明
+                </a-button>
+                <a-button @click="() => showForm('cto')" type="primary" v-if="isCto">
+                    <template #icon>
+                        <PlusOutlined />
+                    </template>
+                    申请律所无处罚证明
                 </a-button>
             </div>
             <div class="smart-table-setting-block">
@@ -249,6 +255,21 @@ import PenaltyApplyForm from './penalty-apply-form.vue';
             dataIndex: 'userName',
             ellipsis: true,
         },
+        {
+            title: '无处罚证明类型',
+            dataIndex: 'type',
+            ellipsis: true,
+            customRender: ({ text, record }) => {
+                // 根据type字段值显示对应的证明类型
+                if (text === 'cto') {
+                    return '律所无处罚证明';
+                } else if (text === 'user') {
+                    return '律师无处罚证明';
+                } else {
+                    return text || '未知类型';
+                }
+            },
+        },
         {
             title: '申请日期',
             dataIndex: 'applyDate',
@@ -403,8 +424,10 @@ import PenaltyApplyForm from './penalty-apply-form.vue';
     // ---------------------------- 添加/修改 ----------------------------
     const formRef = ref();
 
-    function showForm(data) {
-        formRef.value.show(data);
+    function showForm(type, data) {
+        // 将type参数传递给表单组件
+        const formData = data ? { ...data, type } : { type };
+        formRef.value.show(formData);
     }
 
     // ---------------------------- 单个删除 ----------------------------

src/views/business/erp/service/service-applications-list.vue

@@ -644,6 +644,12 @@ import AgreementModal from '/@/views/system/home/components/agreement-modal.vue'
         return;
       }
       
+      // 检查律所承诺书签署状态
+      if (loginInfo.value && loginInfo.value.lawFirmAgreementSignFlag === false) {
+        message.warning('您尚未签署律所承诺书，无法进行服务上报。请先签署律所承诺书。');
+        return;
+      }
+      
       // 检查选中的记录是否符合上报条件
       const canReportRecords = tableData.value.filter(record => 
         selectedRowKeyList.value.includes(record.applicationId) && canReportRecord(record)

src/views/business/erp/service/service-applications-report-list.vue

@@ -775,7 +775,7 @@ onMounted(async () => {
             // 未签约，提示用户下载承诺书并签约
             Modal.warning({
                 title: '提示',
-                content: '您尚未签署承诺书，无法进行服务申报。请先下载承诺书进行签约并上传。',
+                content: '您尚未签署律师承诺书，无法进行服务申报。请先下载承诺书进行签约并上传。',
                 okText: '知道了',
             });
         }

src/views/mobile/service/create.vue

@@ -716,13 +716,13 @@ function removeFile(fileId) {
 async function handleSave() {
   // 再次检查用户是否已签约承诺书（双重保险）
 if (!agreementSigned.value) {
-  message.warning('您尚未签署承诺书，无法进行服务申报。请先签署承诺书。')
+  message.warning('您尚未签署律师承诺书，无法进行服务申报。请先签署承诺书。')
   return
 }
 
   // 再次检查用户是否已签约承诺书（双重保险）
 if (!agreementSigned.value) {
-  message.warning('您尚未签署承诺书，无法进行服务申报。请先签署承诺书。')
+  message.warning('您尚未签署律师承诺书，无法进行服务申报。请先签署承诺书。')
   return
 }
 
@@ -1054,13 +1054,7 @@ async function loadDraftData(applicationId) {
             currentActivity.value = selectedActivity
             currentActivityType.value = selectedActivity.timeType || ''
             form.serviceType = selectedActivity.timeType || ''
-            console.log('更新后的活动类型:', currentActivityType.value)
-            console.log('更新后的活动信息:', currentActivity.value)
-            console.log('表单中的服务时长:', form.serviceDuration)
-            console.log('表单中的案件编号:', form.recordNo)
           } else {
-            console.log('未找到对应的活动，活动名称ID:', form.activityNameId)
-            console.log('活动列表:', activityList.value)
           }
         } else {
           console.log('活动名称ID或活动列表为空:', form.activityNameId, activityList.value.length)
@@ -1091,7 +1085,7 @@ onMounted(async () => {
   // 首先检查用户签约状态
   const isSigned = await getUserInfo()
   if (!isSigned) {
-    message.warning('您尚未签署承诺书，无法进行服务申报。请先签署承诺书。')
+    message.warning('您尚未签署律师承诺书，无法进行服务申报。请先签署承诺书。')
     // 延迟后返回上一页
     setTimeout(() => {
       router.back()

src/views/mobile/service/detail.vue

@@ -825,13 +825,13 @@ async function handleSave() {
   
   // 检查用户是否已签约承诺书
   if (!agreementSigned.value) {
-    message.warning('您尚未签署承诺书，无法进行操作。请先签署承诺书。')
+    message.warning('您尚未签署律师承诺书，无法进行操作。请先签署承诺书。')
     return
   }
 
   // 检查用户是否已签约承诺书
   if (!agreementSigned.value) {
-    message.warning('您尚未签署承诺书，无法进行操作。请先签署承诺书。')
+    message.warning('您尚未签署律师承诺书，无法进行操作。请先签署承诺书。')
     return
   }