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 @@