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 @@
-
- -
-
-
- {{ scope.row.productAmount != null ? scope.row.productAmount : '-' }}
-
+ -
@@ -62,7 +72,9 @@
- -
+
+ {{ scope.row.expectedAcceptanceTime ? scope.row.expectedAcceptanceTime.substring(0, 10) : '-' }}
+
@@ -70,10 +82,10 @@
- -
+ {{ scope.row.abnormalStartup || '-' }}
- -
+ {{ scope.row.abnormalStartupReason || '-' }}
@@ -133,7 +145,13 @@
- -
+
+ {{
+ scope.row.actualCost != null && scope.row.revenue != null && scope.row.revenue != 0
+ ? (Math.round((scope.row.actualCost / scope.row.revenue) * 10000) / 100).toFixed(2) + '%'
+ : '-'
+ }}
+
@@ -153,9 +171,6 @@
{{ scope.row.startupRealEndTime ? scope.row.startupRealEndTime.substring(0, 10) : '-' }}
-
- {{ scope.row.startupReasonsExplanation || '-' }}
-
@@ -171,98 +186,107 @@
{{ scope.row.designRealEndTime ? scope.row.designRealEndTime.substring(0, 10) : '-' }}
-
- {{ scope.row.designReasonsExplanation || '-' }}
-
-
-
+
+
- {{ scope.row.purchasePlanStartTime ? scope.row.purchasePlanStartTime.substring(0, 10) : '-' }}
+ {{
+ scope.row.purchaseShipmentPlanStartTime ? scope.row.purchaseShipmentPlanStartTime.substring(0, 10) : '-'
+ }}
- {{ scope.row.purchasePlanEndTime ? scope.row.purchasePlanEndTime.substring(0, 10) : '-' }}
+ {{
+ scope.row.purchaseShipmentPlanEndTime ? scope.row.purchaseShipmentPlanEndTime.substring(0, 10) : '-'
+ }}
- {{ scope.row.purchaseRealStartTime ? scope.row.purchaseRealStartTime.substring(0, 10) : '-' }}
+ {{
+ scope.row.purchaseShipmentRealStartTime ? scope.row.purchaseShipmentRealStartTime.substring(0, 10) : '-'
+ }}
- {{ scope.row.purchaseRealEndTime ? scope.row.purchaseRealEndTime.substring(0, 10) : '-' }}
-
-
- {{ scope.row.purchaseReasonsExplanation || '-' }}
+
+ 实际结束时间
+
+ {{
+ scope.row.purchaseShipmentRealEndTime ? scope.row.purchaseShipmentRealEndTime.substring(0, 10) : '-'
+ }}
-
-
+
+
- {{ scope.row.shipmentPlanStartTime ? scope.row.shipmentPlanStartTime.substring(0, 10) : '-' }}
+ {{ scope.row.developPlanStartTime ? scope.row.developPlanStartTime.substring(0, 10) : '-' }}
- {{ scope.row.shipmentPlanEndTime ? scope.row.shipmentPlanEndTime.substring(0, 10) : '-' }}
+ {{ scope.row.developPlanEndTime ? scope.row.developPlanEndTime.substring(0, 10) : '-' }}
- {{ scope.row.shipmentRealStartTime ? scope.row.shipmentRealStartTime.substring(0, 10) : '-' }}
+ {{ scope.row.developRealStartTime ? scope.row.developRealStartTime.substring(0, 10) : '-' }}
- {{ scope.row.shipmentRealEndTime ? scope.row.shipmentRealEndTime.substring(0, 10) : '-' }}
-
-
- {{ scope.row.shipmentReasonsExplanation || '-' }}
+ {{ scope.row.developRealEndTime ? scope.row.developRealEndTime.substring(0, 10) : '-' }}
-
-
+
+
- {{ scope.row.implementPlanStartTime ? scope.row.implementPlanStartTime.substring(0, 10) : '-' }}
+ {{
+ scope.row.assemblyDebugPlanStartTime ? scope.row.assemblyDebugPlanStartTime.substring(0, 10) : '-'
+ }}
- {{ scope.row.implementPlanEndTime ? scope.row.implementPlanEndTime.substring(0, 10) : '-' }}
+ {{ scope.row.assemblyDebugPlanEndTime ? scope.row.assemblyDebugPlanEndTime.substring(0, 10) : '-' }}
- {{ scope.row.implementRealStartTime ? scope.row.implementRealStartTime.substring(0, 10) : '-' }}
+ {{
+ scope.row.assemblyDebugRealStartTime ? scope.row.assemblyDebugRealStartTime.substring(0, 10) : '-'
+ }}
- {{ scope.row.implementRealEndTime ? scope.row.implementRealEndTime.substring(0, 10) : '-' }}
-
-
- {{ scope.row.implementReasonsExplanation || '-' }}
+ {{ scope.row.assemblyDebugRealEndTime ? scope.row.assemblyDebugRealEndTime.substring(0, 10) : '-' }}
-
-
+
+
- {{ scope.row.debugPlanStartTime ? scope.row.debugPlanStartTime.substring(0, 10) : '-' }}
+ {{
+ scope.row.implementDebugPlanStartTime ? scope.row.implementDebugPlanStartTime.substring(0, 10) : '-'
+ }}
- {{ scope.row.debugPlanEndTime ? scope.row.debugPlanEndTime.substring(0, 10) : '-' }}
+ {{
+ scope.row.implementDebugPlanEndTime ? scope.row.implementDebugPlanEndTime.substring(0, 10) : '-'
+ }}
- {{ scope.row.debugRealStartTime ? scope.row.debugRealStartTime.substring(0, 10) : '-' }}
+ {{
+ scope.row.implementDebugRealStartTime ? scope.row.implementDebugRealStartTime.substring(0, 10) : '-'
+ }}
- {{ scope.row.debugRealEndTime ? scope.row.debugRealEndTime.substring(0, 10) : '-' }}
-
-
- {{ scope.row.debugReasonsExplanation || '-' }}
+ {{
+ scope.row.implementDebugRealEndTime ? scope.row.implementDebugRealEndTime.substring(0, 10) : '-'
+ }}
-
-
+
+
- {{ scope.row.pilotRunPlanStartTime ? scope.row.pilotRunPlanStartTime.substring(0, 10) : '-' }}
+ {{
+ scope.row.testPilotRunPlanStartTime ? scope.row.testPilotRunPlanStartTime.substring(0, 10) : '-'
+ }}
- {{ scope.row.pilotRunPlanEndTime ? scope.row.pilotRunPlanEndTime.substring(0, 10) : '-' }}
+ {{ scope.row.testPilotRunPlanEndTime ? scope.row.testPilotRunPlanEndTime.substring(0, 10) : '-' }}
- {{ scope.row.pilotRunRealStartTime ? scope.row.pilotRunRealStartTime.substring(0, 10) : '-' }}
+ {{
+ scope.row.testPilotRunRealStartTime ? scope.row.testPilotRunRealStartTime.substring(0, 10) : '-'
+ }}
- {{ scope.row.pilotRunRealEndTime ? scope.row.pilotRunRealEndTime.substring(0, 10) : '-' }}
-
-
- {{ scope.row.pilotRunReasonsExplanation || '-' }}
+ {{ scope.row.testPilotRunRealEndTime ? scope.row.testPilotRunRealEndTime.substring(0, 10) : '-' }}
@@ -276,12 +300,12 @@
{{ scope.row.acceptanceRealStartTime ? scope.row.acceptanceRealStartTime.substring(0, 10) : '-' }}
-
+
+
+ 实际结束时间
+
{{ scope.row.acceptanceRealEndTime ? scope.row.acceptanceRealEndTime.substring(0, 10) : '-' }}
-
- {{ scope.row.acceptanceReasonsExplanation || '-' }}
-
@@ -297,9 +321,6 @@
{{ scope.row.warrantyRealEndTime ? scope.row.warrantyRealEndTime.substring(0, 10) : '-' }}
-
- {{ scope.row.warrantyReasonsExplanation || '-' }}
-
@@ -310,6 +331,8 @@