From 7a07fae8f96964561b09c8488ced31deb9ba8653 Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Thu, 20 Nov 2025 16:41:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(approve):=E4=BC=98=E5=8C=96=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E9=A1=B5=E9=9D=A2=E7=BB=93=E6=9E=84=E5=92=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整附件信息和流转过程标签页的位置
- 将审批页脚信息移入布局组件内
- 合并导入语句并调整API调用路径
- 更新订单详情弹窗标题生成逻辑
- 添加合同备份文件数据字段
-修复订单标题显示问题
---
 .../oms_vue/src/api/approve/order/index.js    |   7 +
 oms_web/oms_vue/src/api/project/order.js      |   2 +-
 .../src/views/approve/order/Approve.vue       | 129 +++++++++---------
 .../src/views/project/order/OrderDetail.vue   |  13 +-
 4 files changed, 81 insertions(+), 70 deletions(-)

diff --git a/oms_web/oms_vue/src/api/approve/order/index.js b/oms_web/oms_vue/src/api/approve/order/index.js
index 2d61f481..b2e3bc3a 100644
--- a/oms_web/oms_vue/src/api/approve/order/index.js
+++ b/oms_web/oms_vue/src/api/approve/order/index.js
@@ -18,3 +18,10 @@ export function approveOrder(data) {
     headers: { 'Content-Type': 'multipart/form-data' }
   })
 }
+// 查询订单管理详细信息
+export function getOrder(id) {
+  return request({
+    url: '/project/order/h5/approve/' + id,
+    method: 'get'
+  })
+}
diff --git a/oms_web/oms_vue/src/api/project/order.js b/oms_web/oms_vue/src/api/project/order.js
index 14fa0fa0..d139385c 100644
--- a/oms_web/oms_vue/src/api/project/order.js
+++ b/oms_web/oms_vue/src/api/project/order.js
@@ -12,7 +12,7 @@ export function listOrder(query) {
 // 查询订单管理详细信息
 export function getOrder(id) {
   return request({
-    url: '/project/order/h5/approve/' + id,
+    url: '/project/order/vue/' + id,
     method: 'get'
   })
 }
diff --git a/oms_web/oms_vue/src/views/approve/order/Approve.vue b/oms_web/oms_vue/src/views/approve/order/Approve.vue
index 52f5467f..453db984 100644
--- a/oms_web/oms_vue/src/views/approve/order/Approve.vue
+++ b/oms_web/oms_vue/src/views/approve/order/Approve.vue
@@ -24,76 +24,74 @@
           @tax-rate-change="handleTaxRateChange"
           class="mb20"
         />
-
-        <!-- Tab页：附件信息和流转过程 -->
-        <el-tabs v-model="activeTab" class="approve-tabs">
-          <el-tab-pane v-if="order.processTemplate !== '1'" label="附件信息" name="attachment">
-            <el-table :data="attachmentList" border>
-              <el-table-column label="附件类型" align="center" width="150">
-                <template slot-scope="scope">
-                  {{ getAttachmentType(scope.$index) }}
-                </template>
-              </el-table-column>
-              <el-table-column label="附件名称" align="center" prop="fileName" />
-              <el-table-column label="上传人" align="center" prop="uploadUserName" width="120" />
-              <el-table-column label="上传时间" align="center" width="180">
-                <template slot-scope="scope">
-                  {{ formatDate(scope.row.uploadTime) }}
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center" width="150">
-                <template slot-scope="scope">
-                  <el-button
-                    v-if="scope.row.id && scope.row.id !== -1"
-                    size="mini"
-                    type="text"
-                    @click="previewFile(scope.row)"
-                  >预览</el-button>
-                  <el-button
-                    v-if="scope.row.id && scope.row.id !== -1"
-                    size="mini"
-                    type="text"
-                    @click="downloadFile(scope.row)"
-                  >下载</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-tab-pane>
-
-          <el-tab-pane label="流转过程" name="process">
-            <div class="process-container">
-              <el-tabs v-model="activeVersionTab" type="card" v-if="uniqueVersions.length > 0">
-                <el-tab-pane
-                  v-for="version in uniqueVersions"
-                  :key="version"
-                  :label="'版本号Rev.' + version"
-                  :name="version">
-                  <el-timeline>
-                    <el-timeline-item
-                      v-for="log in groupedApproveLogs[version]"
-                      :key="log.id"
-                      :timestamp="log.approveTime"
-                      placement="top">
-                      <el-card>
-                        <h4>{{ log.approveOpinion }}</h4>
-                        <p><b>操作人:</b> {{ log.approveUserName }} ({{ log.roleName }})</p>
-                        <p><b>接收人:</b> {{ getReceiverName(log) }}</p>
-                        <p><b>审批状态:</b> <el-tag :type="getStatusTagType(log.approveStatus)" size="small">{{ getStatusText(log.approveStatus) }}</el-tag></p>
-                      </el-card>
-                    </el-timeline-item>
-                  </el-timeline>
-                </el-tab-pane>
-              </el-tabs>
-              <div v-else>暂无流转过程数据。</div>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
       </template>
       <template #footer>
         <p>{{ order.projectCode }}-{{ order.orderCode }}-Rev.{{ order.versionCode }}</p>
       </template>
     </ApproveLayout>
+    <!-- Tab页：附件信息和流转过程 -->
+    <el-tabs v-model="activeTab" class="approve-tabs">
+      <el-tab-pane v-if="order.processTemplate !== '1'" label="附件信息" name="attachment">
+        <el-table :data="attachmentList" border>
+          <el-table-column label="附件类型" align="center" width="150">
+            <template slot-scope="scope">
+              {{ getAttachmentType(scope.$index) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="附件名称" align="center" prop="fileName" />
+          <el-table-column label="上传人" align="center" prop="uploadUserName" width="120" />
+          <el-table-column label="上传时间" align="center" width="180">
+            <template slot-scope="scope">
+              {{ formatDate(scope.row.uploadTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="150">
+            <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.id && scope.row.id !== -1"
+                size="mini"
+                type="text"
+                @click="previewFile(scope.row)"
+              >预览</el-button>
+              <el-button
+                v-if="scope.row.id && scope.row.id !== -1"
+                size="mini"
+                type="text"
+                @click="downloadFile(scope.row)"
+              >下载</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
 
+      <el-tab-pane label="流转过程" name="process">
+        <div class="process-container">
+          <el-tabs v-model="activeVersionTab" type="card" v-if="uniqueVersions.length > 0">
+            <el-tab-pane
+              v-for="version in uniqueVersions"
+              :key="version"
+              :label="'版本号Rev.' + version"
+              :name="version">
+              <el-timeline>
+                <el-timeline-item
+                  v-for="log in groupedApproveLogs[version]"
+                  :key="log.id"
+                  :timestamp="log.approveTime"
+                  placement="top">
+                  <el-card>
+                    <h4>{{ log.approveOpinion }}</h4>
+                    <p><b>操作人:</b> {{ log.approveUserName }} ({{ log.roleName }})</p>
+                    <p><b>接收人:</b> {{ getReceiverName(log) }}</p>
+                    <p><b>审批状态:</b> <el-tag :type="getStatusTagType(log.approveStatus)" size="small">{{ getStatusText(log.approveStatus) }}</el-tag></p>
+                  </el-card>
+                </el-timeline-item>
+              </el-timeline>
+            </el-tab-pane>
+          </el-tabs>
+          <div v-else>暂无流转过程数据。</div>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
     <!-- 审批意见弹窗 -->
     <el-dialog
       :title="dialogTitle"
@@ -123,8 +121,7 @@
 </template>
 
 <script>
-import { getOrder } from "@/api/project/order";
-import { approveOrder } from "@/api/approve/order";
+import { approveOrder,getOrder } from "@/api/approve/order";
 import ConfigInfo from './ConfigInfo.vue';
 import ApproveLayout from '@/views/approve/ApproveLayout.vue';
 
diff --git a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
index 4077c03b..446575d2 100644
--- a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
+++ b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 添加或修改订单管理对话框 -->
-    <el-dialog :title="title" :visible.sync="internalVisible" width="1400px" append-to-body @close="handleClose">
+    <el-dialog :title="dialogTitle" :visible.sync="internalVisible" width="1400px" append-to-body @close="handleClose">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="isOrderApprovedOrInReview">
         <el-tabs v-model="activeTab">
           <el-tab-pane label="基础信息" name="basic">
@@ -205,6 +205,7 @@ export default {
       // 表单参数
       form: {},
       approveLogList: [],
+      orderBakFile: {}, // 合同备份文件数据
       activeVersionTab: null,
       activeContractVersionTab: null, // 当前激活的合同版本Tab
       showFileFlag: false, // 是否显示文件上传区域
@@ -251,6 +252,14 @@ export default {
     };
   },
   computed: {
+    dialogTitle() {
+      // If form has data, generate title from form data
+      if (this.form.projectName && this.form.versionCode) {
+        return this.form.projectName + "Rev." + this.form.versionCode;
+      }
+      // Otherwise use the prop value
+      return this.title;
+    },
     isEdit() {
       return this.orderId != null;
     },
@@ -345,7 +354,6 @@ export default {
       if (this.isEdit) {
         getOrder(this.orderId).then(response => {
           this.form = {...response.data.projectOrderInfo};
-          this.title = this.form.projectName + "Rev." + this.form.versionCode;
           this.isProjectSelected = true;
           if (!this.form.versionCode) this.form.versionCode = 1;
           this.approveLogList = response.data.approveLog;
@@ -432,7 +440,6 @@ export default {
         if (this.isEdit) {
           this.form.id = response.data.id;
           this.isEdit = true;
-          this.title = "修改订单";
           this.activeTab = 'contract';
           this.$emit('success');
         } else {