diff --git a/dist.zip b/dist.zip
index 11d57b7..d54d22c 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/constants/system/review-const.js b/src/constants/system/review-const.js
index a429c2b..a1c7bc9 100644
--- a/src/constants/system/review-const.js
+++ b/src/constants/system/review-const.js
@@ -1,5 +1,5 @@
/*
- * 审核状态
+ * 服务列表状态
*/
export const REVIEW_ENUM = {
NOSUBMIT: {
@@ -39,7 +39,27 @@ export const QUARTER_ENUM = {
desc: '第四季度',
},
};
+
+/*
+ * 服务审核状态
+ */
+export const SERVICEC_REVIEW_ENUM = {
+ APPROVAL: {
+ value: 1,
+ desc: '待审核',
+ },
+ PASS: {
+ value: 3,
+ desc: '已通过',
+ },
+ REFUSE: {
+ value: 4,
+ desc: '拒绝',
+ },
+
+};
export default {
REVIEW_ENUM,
QUARTER_ENUM,
+ SERVICEC_REVIEW_ENUM,
}
\ No newline at end of file
diff --git a/src/views/business/erp/cost/firm-reports-form.vue b/src/views/business/erp/cost/firm-reports-form.vue
index d4e5d4f..3d5fae8 100644
--- a/src/views/business/erp/cost/firm-reports-form.vue
+++ b/src/views/business/erp/cost/firm-reports-form.vue
@@ -321,7 +321,6 @@
await formRef.value.validateFields(['declareQuarter', 'declareYear', 'revenue', 'publicWelfareCost']);
form.approvalStatus = '0'; // 草稿状态
await save();
- message.success('保存草稿成功');
} catch (err) {
message.error('请填写必填字段后再保存草稿!');
}
diff --git a/src/views/business/erp/letter/letter-list.vue b/src/views/business/erp/letter/letter-list.vue
index f0c9822..1f2c029 100644
--- a/src/views/business/erp/letter/letter-list.vue
+++ b/src/views/business/erp/letter/letter-list.vue
@@ -167,8 +167,8 @@
已选择文件: {{ proofFileList[0].name }}
-
- 支持格式:图片(JPG/PNG),文件大小不超过10MB
+
+ 支持格式:图片(JPG/PNG/jepg),文件大小不超过10MB
@@ -281,7 +281,7 @@ import AgreementModal from '/@/views/system/home/components/agreement.vue';
const isImage = file.type === 'image/jpeg' || file.type === 'image/jpg' || file.type === 'image/png';
if (!isImage) {
- message.error('只能上传PDF、Word文档或图片文件!');
+ message.error('只能上传图片文件!');
return false;
}
diff --git a/src/views/business/erp/service/service-applications-list.vue b/src/views/business/erp/service/service-applications-list.vue
index bd8a312..6aab634 100644
--- a/src/views/business/erp/service/service-applications-list.vue
+++ b/src/views/business/erp/service/service-applications-list.vue
@@ -14,44 +14,51 @@
-
+
{{ item.actualName }}
- ({{ item.departmentName }})
+ ({{ item.departmentName }})
+ - {{ item.positionName }}
-
-
-
-
-
-
-
-
+
+
-
-
-
- {{ status.desc }}
-
+
+
+ 全部
+ 已审核
+ 未审核
+
-
-
-
- {{ status.desc }}
-
+
+
+
+ 全部
+ 已审核
+ 未审核
+
+
+
+
@@ -301,8 +308,9 @@ 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 PositionSelect from '/@/components/system/position-select/index.vue';
import { employeeApi } from '/@/api/system/employee-api';
-import { REVIEW_ENUM } from '/@/constants/system/review-const';
+import { REVIEW_ENUM, SERVICEC_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';
@@ -369,7 +377,7 @@ import AgreementModal from '/@/views/system/home/components/agreement-modal.vue'
dataIndex: 'firmAuditStatus',
ellipsis: true,
customRender: ({ text }) => {
- const status = Object.values(REVIEW_ENUM).find(item => item.value === text);
+ const status = Object.values(SERVICEC_REVIEW_ENUM).find(item => item.value === text);
return status ? status.desc : text;
},
},
@@ -388,7 +396,7 @@ import AgreementModal from '/@/views/system/home/components/agreement-modal.vue'
dataIndex: 'associationAuditStatus',
ellipsis: true,
customRender: ({ text }) => {
- const status = Object.values(REVIEW_ENUM).find(item => item.value === text);
+ const status = Object.values(SERVICEC_REVIEW_ENUM).find(item => item.value === text);
return status ? status.desc : text;
},
},
@@ -418,11 +426,11 @@ import AgreementModal from '/@/views/system/home/components/agreement-modal.vue'
pageSize: 10,
firmId: undefined, // 执业机构ID
userId: undefined, // 律师ID
- serviceStart: undefined, // 服务开始时间
- serviceEnd: undefined, // 服务结束时间
+ positionId: undefined, // 职务ID
organizerName: undefined, // 组织单位名称
managerName: undefined, // 负责人姓名
firmAuditStatus: undefined, // 执业机构审核状态
+ firmAuditTimeRange: undefined, // 执业机构审核时间范围
associationAuditStatus: undefined, // 协会审核状态
selfFirmFilter: undefined, // 本人本所筛选条件
};
@@ -568,6 +576,14 @@ import AgreementModal from '/@/views/system/home/components/agreement-modal.vue'
return false;
}
+
+ // 律师筛选过滤函数
+ function filterLawyerOption(input, option) {
+ const optionText = option.children.join('').toLowerCase();
+ return optionText.includes(input.toLowerCase());
+ }
+
+
// 批量审核确认
async function handleBatchAudit() {
diff --git a/src/views/business/erp/service/service-applications-report-list.vue b/src/views/business/erp/service/service-applications-report-list.vue
index 44ead45..d289f5c 100644
--- a/src/views/business/erp/service/service-applications-report-list.vue
+++ b/src/views/business/erp/service/service-applications-report-list.vue
@@ -14,44 +14,26 @@
-
-
-
- {{ item.actualName }}
- ({{ item.departmentName }})
-
+
+
+
+ 全部
+ 已审核
+ 未审核
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{ status.desc }}
-
+
+
+ 全部
+ 已审核
+ 未审核
+
-
-
-
-
- {{ status.desc }}
-
-
+
+
+
@@ -269,7 +251,7 @@ 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 { REVIEW_ENUM,SERVICEC_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';