From 94e7160e2c3d910218a72ae170f0fd003fe4782e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 2 Dec 2025 16:11:06 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-02=20=E6=9C=BA=E5=8F=B0=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yieldReport/produce_report_normal.js  |  3 +
 .../yieldReport/com_produce_report_normal.vue | 70 ++++++++++++++-----
 2 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js
index be205c0..cea1f33 100644
--- a/src/api/yieldReport/produce_report_normal.js
+++ b/src/api/yieldReport/produce_report_normal.js
@@ -103,3 +103,6 @@ export const deleteSfdcMaterialHist = data => createAPI('schedule/deleteSfdcMate
 
 // 查询过程检验待检验记录数量
 export const checkProcessInspectionPendingCount = data => createAPI('/pms/qc/checkProcessInspectionPendingCount', 'POST', data)
+
+// 查询工单的订单备注信息
+export const getOrderNotesByOrderNo = data => createAPI('schedule/getOrderNotesByOrderNo', 'POST', data)
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index dcbaca2..815163e 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -226,38 +226,46 @@
           <el-tabs v-model="activeTable" class="modern-tabs" type="border-card" @tab-click="tabClick">
               <el-tab-pane label="订单信息" name="order_info">
               <div style="height: 375px; padding: 10px;">
-                <!-- 技术注意事项 -->
-                <div style="margin-bottom: 10px;">
-                  <label style="font-weight: bold; margin-bottom: 5px; display: block;">技术注意事项</label>
+                <!-- 订单备注信息 -->
+                <div>
+                  <label style="font-weight: bold; margin-bottom: 5px; display: block;">订单备注信息</label>
                   <el-input
+                    class="order-notes-textarea"
                     type="textarea"
-                    :rows="3"
-                    v-model="orderInfo.technicalNotes"
+                    :rows="17"
+                    v-model="orderInfo.orderNotes"
+                    readonly
                     style="width: 100%;">
                   </el-input>
                 </div>
 
-                <!-- 客户特殊要求 -->
+                <!-- 技术注意事项 - 暂时注释 -->
+                <!--
                 <div style="margin-bottom: 10px;">
-                  <label style="font-weight: bold; margin-bottom: 5px; display: block;">客户特殊要求</label>
+                  <label style="font-weight: bold; margin-bottom: 5px; display: block;">技术注意事项</label>
                   <el-input
                     type="textarea"
                     :rows="3"
-                    v-model="orderInfo.customerRequirements"
+                    v-model="orderInfo.technicalNotes"
+                    readonly
                     style="width: 100%;">
                   </el-input>
                 </div>
+                -->
 
-                <!-- 订单备注信息 -->
-                <div>
-                  <label style="font-weight: bold; margin-bottom: 5px; display: block;">订单备注信息</label>
+                <!-- 客户特殊要求 - 暂时注释 -->
+                <!--
+                <div style="margin-bottom: 10px;">
+                  <label style="font-weight: bold; margin-bottom: 5px; display: block;">客户特殊要求</label>
                   <el-input
                     type="textarea"
                     :rows="3"
-                    v-model="orderInfo.orderNotes"
+                    v-model="orderInfo.customerRequirements"
+                    readonly
                     style="width: 100%;">
                   </el-input>
                 </div>
+                -->
               </div>
             </el-tab-pane>
             <el-tab-pane label="时间记录" name="sfdc_time">
@@ -780,7 +788,8 @@ import {
   getSfdcFlowLabelData,
   rollSplit,
   getOrderFirstItemNo,
-  checkProcessInspectionPendingCount
+  checkProcessInspectionPendingCount,
+  getOrderNotesByOrderNo // 新增
 } from "@/api/yieldReport/produce_report_normal.js";
 import {
   getUserSpecialSecurity,
@@ -3989,12 +3998,24 @@ export default {
     },
     //获取订单信息列表
     getOrderInfoList() {
-      // 获取订单相关的备注信息
-      this.orderInfo = {
-        technicalNotes: this.scheduleData.technicalNotes || '',
-        customerRequirements: this.scheduleData.customerRequirements || '',
-        orderNotes: this.scheduleData.orderNotes || ''
-      };
+      // 调用后端API查询订单备注信息
+      getOrderNotesByOrderNo(this.searchData).then(({data}) => {
+        if (data && data.code === 200 && data.row) {
+          this.orderInfo = {
+            orderNotes: data.row.orderNotes || ''
+            // technicalNotes: '', // 暂时注释
+            // customerRequirements: '' // 暂时注释
+          };
+        } else {
+          this.orderInfo = {
+            orderNotes: ''
+          };
+        }
+      }).catch(() => {
+        this.orderInfo = {
+          orderNotes: ''
+        };
+      });
     },
     //刷新派工单的时间的记录
     async getSfdcTimeList() {
@@ -5024,6 +5045,17 @@ export default {
   padding: 0px !important;
 }
 
+/* 订单备注信息文本域样式 - 与其他输入框字体保持一致 */
+.order-notes-textarea {
+  /deep/ .el-textarea__inner {
+    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+    font-size: 14px;
+    line-height: 1.5;
+    color: #606266;
+    letter-spacing: normal;
+  }
+}
+
 /*当前按钮的通用样式*/
 .customer-css .customer-bun-mid {
   width: 60px;