From 93b8f5b2cd99e735567b6cd5732111297f9f8088 Mon Sep 17 00:00:00 2001 From: Yangk Date: Mon, 30 Mar 2026 15:15:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=9B=B4=E6=96=B0=E5=87=BA?= =?UTF-8?q?=E5=B7=AE=E7=94=B3=E8=AF=B7=E8=A1=A8=E5=8D=95=E5=92=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=8F=B0=E8=B4=A6=E6=8A=A5=E8=A1=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将商务出行申请中的交流目的字段从输入框改为下拉选择框,并添加字典数据支持 - 在项目台账报表中增加部门、项目类型、项目阶段筛选条件 - 调整项目台账报表列显示,更新预计验收时间、异常启动信息和成本收入比例计算 - 重构项目台账报表中采购发货、开发、实施等环节的时间显示逻辑 - 移除项目台账报表中部分原因说明列并优化表格结构 --- src/api/oa/erp/projectLedgerReport.ts | 3 + src/views/oa/crm/businessTripApply/edit.vue | 12 +- src/views/oa/crm/businessTripApply/index.vue | 36 ++-- .../oa/erp/contractLedgerReport/index.vue | 2 +- .../oa/erp/projectLedgerReport/index.vue | 182 +++++++++++------- 5 files changed, 145 insertions(+), 90 deletions(-) diff --git a/src/api/oa/erp/projectLedgerReport.ts b/src/api/oa/erp/projectLedgerReport.ts index 5d6cb12..094d5cc 100644 --- a/src/api/oa/erp/projectLedgerReport.ts +++ b/src/api/oa/erp/projectLedgerReport.ts @@ -10,6 +10,9 @@ export interface ProjectLedgerReportQuery { projectName?: string; businessDirection?: string; projectStatus?: string; + deptId?: number | string; + projectTypeId?: number | string; + projectPhases?: string; } /** diff --git a/src/views/oa/crm/businessTripApply/edit.vue b/src/views/oa/crm/businessTripApply/edit.vue index a53d382..4e1cac8 100644 --- a/src/views/oa/crm/businessTripApply/edit.vue +++ b/src/views/oa/crm/businessTripApply/edit.vue @@ -215,7 +215,9 @@ - + + + @@ -375,7 +377,7 @@ const route = useRoute(); const router = useRouter(); // 字典加载 -const { trip_type, business_direction } = toRefs(proxy?.useDict('trip_type', 'business_direction')); +const { trip_type, business_direction, exchange_purpose } = toRefs(proxy?.useDict('trip_type', 'business_direction', 'exchange_purpose')); // 路由参数 const routeParams = ref>({}); @@ -451,7 +453,7 @@ const data = reactive({ exchangeObject: [{ required: true, message: '交流对象不能为空', trigger: 'blur' }], customerId: [{ required: true, message: '请选择交流对象(客户)', trigger: 'change' }], businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'change' }], - exchangePurpose: [{ required: true, message: '交流目的不能为空', trigger: 'blur' }], + exchangePurpose: [{ required: true, message: '交流目的不能为空', trigger: 'change' }], exchangeFeedback: [{ required: true, message: '交流过程与反馈不能为空', trigger: 'blur' }], meetingName: [{ required: true, message: '会议/展会名称不能为空', trigger: 'blur' }], 'variables.approverId': [ @@ -466,7 +468,9 @@ const data = reactive({ }, trigger: 'change' } - ] + ], + startTime: [] as any[], + endTime: [] as any[] } }); diff --git a/src/views/oa/crm/businessTripApply/index.vue b/src/views/oa/crm/businessTripApply/index.vue index c8c25da..502bc3c 100644 --- a/src/views/oa/crm/businessTripApply/index.vue +++ b/src/views/oa/crm/businessTripApply/index.vue @@ -118,7 +118,11 @@ - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -226,7 +230,9 @@ const canViewRowFeedback = (row: BusinessTripApplyVO): boolean => { if (row.createBy && currentUserId === String(row.createBy)) return true; return false; }; -const { trip_status, trip_type, business_direction } = toRefs(proxy?.useDict('trip_status', 'trip_type', 'business_direction')); +const { trip_status, trip_type, business_direction, exchange_purpose } = toRefs( + proxy?.useDict('trip_status', 'trip_type', 'business_direction', 'exchange_purpose') +); const businessTripApplyList = ref([]); const loading = ref(true); diff --git a/src/views/oa/erp/contractLedgerReport/index.vue b/src/views/oa/erp/contractLedgerReport/index.vue index 08253fa..a073b2d 100644 --- a/src/views/oa/erp/contractLedgerReport/index.vue +++ b/src/views/oa/erp/contractLedgerReport/index.vue @@ -152,7 +152,7 @@ const queryFormRef = ref(); const queryParams = reactive({ pageNum: 1, - pageSize: 20, + pageSize: 30, customerContractCode: undefined, internalContractCode: undefined, projectCode: undefined, diff --git a/src/views/oa/erp/projectLedgerReport/index.vue b/src/views/oa/erp/projectLedgerReport/index.vue index fe79e1c..85bac3f 100644 --- a/src/views/oa/erp/projectLedgerReport/index.vue +++ b/src/views/oa/erp/projectLedgerReport/index.vue @@ -17,6 +17,21 @@ + + + + + + + + + + + + + + + 搜索 重置 @@ -39,13 +54,8 @@ - - - - + - + - + - + @@ -133,7 +145,13 @@ - + @@ -153,9 +171,6 @@ - - - @@ -171,98 +186,107 @@ - - - - - + + - + - + - + - - - - + + - - + + - + - + - + - - - - + - - + + - + - + - + - - - - + - - + + - + - + - + - - - - + - - + + - + - + - + - - - - + @@ -276,12 +300,12 @@ - + + - - - @@ -297,9 +321,6 @@ - - - @@ -310,6 +331,8 @@