From 46b495a86a49051633dcbd657ed25cd5ffc6efd3 Mon Sep 17 00:00:00 2001
From: Yangk <yangk@menace.com>
Date: Thu, 12 Mar 2026 09:43:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(projectLedgerReport):=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E6=8A=A5=E8=A1=A8=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E4=BF=A1=E6=81=AF=E8=A1=A8=E6=A0=BC=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa/crm/flightBooking/index.vue      |   6 +-
 .../oa/erp/projectLedgerReport/index.vue      | 166 ++++++++++++++++++
 2 files changed, 169 insertions(+), 3 deletions(-)

diff --git a/src/views/oa/crm/flightBooking/index.vue b/src/views/oa/crm/flightBooking/index.vue
index 61169fa..dbd511f 100644
--- a/src/views/oa/crm/flightBooking/index.vue
+++ b/src/views/oa/crm/flightBooking/index.vue
@@ -333,7 +333,7 @@ const handleSelectionChange = (selection: FlightBookingVO[]) => {
 const handleAdd = () => {
   proxy.$tab.closePage(route);
   router.push({
-    path: '/crm/flightBooking/edit',
+    path: '/flight/flightBooking/edit',
     query: {
       type: 'add'
     }
@@ -344,7 +344,7 @@ const handleView = (row?: FlightBookingVO) => {
   const _bookingId = row?.bookingId || ids.value[0];
   proxy.$tab.closePage(route);
   router.push({
-    path: '/crm/flightBooking/edit',
+    path: '/flight/flightBooking/edit',
     query: {
       id: _bookingId,
       type: 'view'
@@ -357,7 +357,7 @@ const handleUpdate = async (row?: FlightBookingVO) => {
   const _bookingId = row?.bookingId || ids.value[0];
   proxy.$tab.closePage(route);
   router.push({
-    path: '/crm/flightBooking/edit',
+    path: '/flight/flightBooking/edit',
     query: {
       id: _bookingId,
       type: 'update'
diff --git a/src/views/oa/erp/projectLedgerReport/index.vue b/src/views/oa/erp/projectLedgerReport/index.vue
index 7f4dbec..8ef5f4d 100644
--- a/src/views/oa/erp/projectLedgerReport/index.vue
+++ b/src/views/oa/erp/projectLedgerReport/index.vue
@@ -135,6 +135,172 @@
           <template #default>-</template>
         </el-table-column>
       </el-table-column>
+
+      <!-- ========== 进度信息 ========== -->
+      <el-table-column label="进度信息" align="center">
+        <!-- 启动 -->
+        <el-table-column label="启动" align="center">
+          <el-table-column label="计划开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.startupPlanStartTime ? scope.row.startupPlanStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="计划结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.startupPlanEndTime ? scope.row.startupPlanEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.startupRealStartTime ? scope.row.startupRealStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.startupRealEndTime ? scope.row.startupRealEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="原因说明" width="150" align="center" show-overflow-tooltip>
+            <template #default="scope">{{ scope.row.startupReasonsExplanation || '-' }}</template>
+          </el-table-column>
+        </el-table-column>
+        <!-- 设计 -->
+        <el-table-column label="设计" align="center">
+          <el-table-column label="计划开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.designPlanStartTime ? scope.row.designPlanStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="计划结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.designPlanEndTime ? scope.row.designPlanEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.designRealStartTime ? scope.row.designRealStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.designRealEndTime ? scope.row.designRealEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="原因说明" width="150" align="center" show-overflow-tooltip>
+            <template #default="scope">{{ scope.row.designReasonsExplanation || '-' }}</template>
+          </el-table-column>
+        </el-table-column>
+        <!-- 采购 -->
+        <el-table-column label="采购" align="center">
+          <el-table-column label="计划开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.purchasePlanStartTime ? scope.row.purchasePlanStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="计划结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.purchasePlanEndTime ? scope.row.purchasePlanEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.purchaseRealStartTime ? scope.row.purchaseRealStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.purchaseRealEndTime ? scope.row.purchaseRealEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="原因说明" width="150" align="center" show-overflow-tooltip>
+            <template #default="scope">{{ scope.row.purchaseReasonsExplanation || '-' }}</template>
+          </el-table-column>
+        </el-table-column>
+        <!-- 发货 -->
+        <el-table-column label="发货" align="center">
+          <el-table-column label="计划开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.shipmentPlanStartTime ? scope.row.shipmentPlanStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="计划结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.shipmentPlanEndTime ? scope.row.shipmentPlanEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.shipmentRealStartTime ? scope.row.shipmentRealStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.shipmentRealEndTime ? scope.row.shipmentRealEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="原因说明" width="150" align="center" show-overflow-tooltip>
+            <template #default="scope">{{ scope.row.shipmentReasonsExplanation || '-' }}</template>
+          </el-table-column>
+        </el-table-column>
+        <!-- 实施 -->
+        <el-table-column label="实施" align="center">
+          <el-table-column label="计划开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.implementPlanStartTime ? scope.row.implementPlanStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="计划结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.implementPlanEndTime ? scope.row.implementPlanEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.implementRealStartTime ? scope.row.implementRealStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.implementRealEndTime ? scope.row.implementRealEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="原因说明" width="150" align="center" show-overflow-tooltip>
+            <template #default="scope">{{ scope.row.implementReasonsExplanation || '-' }}</template>
+          </el-table-column>
+        </el-table-column>
+        <!-- 调试 -->
+        <el-table-column label="调试" align="center">
+          <el-table-column label="计划开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.debugPlanStartTime ? scope.row.debugPlanStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="计划结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.debugPlanEndTime ? scope.row.debugPlanEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.debugRealStartTime ? scope.row.debugRealStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.debugRealEndTime ? scope.row.debugRealEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="原因说明" width="150" align="center" show-overflow-tooltip>
+            <template #default="scope">{{ scope.row.debugReasonsExplanation || '-' }}</template>
+          </el-table-column>
+        </el-table-column>
+        <!-- 试运行 -->
+        <el-table-column label="试运行" align="center">
+          <el-table-column label="计划开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.pilotRunPlanStartTime ? scope.row.pilotRunPlanStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="计划结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.pilotRunPlanEndTime ? scope.row.pilotRunPlanEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.pilotRunRealStartTime ? scope.row.pilotRunRealStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.pilotRunRealEndTime ? scope.row.pilotRunRealEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="原因说明" width="150" align="center" show-overflow-tooltip>
+            <template #default="scope">{{ scope.row.pilotRunReasonsExplanation || '-' }}</template>
+          </el-table-column>
+        </el-table-column>
+        <!-- 验收 -->
+        <el-table-column label="验收" align="center">
+          <el-table-column label="计划开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.acceptancePlanStartTime ? scope.row.acceptancePlanStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="计划结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.acceptancePlanEndTime ? scope.row.acceptancePlanEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.acceptanceRealStartTime ? scope.row.acceptanceRealStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.acceptanceRealEndTime ? scope.row.acceptanceRealEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="原因说明" width="150" align="center" show-overflow-tooltip>
+            <template #default="scope">{{ scope.row.acceptanceReasonsExplanation || '-' }}</template>
+          </el-table-column>
+        </el-table-column>
+        <!-- 质保 -->
+        <el-table-column label="质保" align="center">
+          <el-table-column label="计划开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.warrantyPlanStartTime ? scope.row.warrantyPlanStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="计划结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.warrantyPlanEndTime ? scope.row.warrantyPlanEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际开始时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.warrantyRealStartTime ? scope.row.warrantyRealStartTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="实际结束时间" width="110" align="center">
+            <template #default="scope">{{ scope.row.warrantyRealEndTime ? scope.row.warrantyRealEndTime.substring(0, 10) : '-' }}</template>
+          </el-table-column>
+          <el-table-column label="原因说明" width="150" align="center" show-overflow-tooltip>
+            <template #default="scope">{{ scope.row.warrantyReasonsExplanation || '-' }}</template>
+          </el-table-column>
+        </el-table-column>
+      </el-table-column>
     </el-table>
 
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />