From 0ace1f32f6736f3cf68f6e59d5afed9e3b38833b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 13 Apr 2026 16:25:37 +0800
Subject: [PATCH] =?UTF-8?q?2026-04-13=201=E3=80=81=E6=9C=BA=E5=8F=B0?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E5=B7=A5=E5=BA=8F=E2=80=9D=E3=80=81=E2=80=9C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=A4=87=E6=B3=A8=E2=80=9D=E5=AD=97=E6=AE=B5=EF=BC=9B?=
 =?UTF-8?q?=202=E3=80=81=E8=AE=A2=E5=8D=95=E6=8E=92=E4=BA=A7=EF=BC=88?=
 =?UTF-8?q?=E6=97=A0=E9=99=90=E4=BA=A7=E8=83=BD=EF=BC=89=E7=9A=84=20?=
 =?UTF-8?q?=E6=9C=AC=E6=AC=A1=E6=8E=92=E4=BA=A7=E6=98=8E=E7=BB=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E2=80=9C=E4=BB=BB=E5=8A=A1=E5=A4=87=E6=B3=A8=E2=80=9D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/com_schedule_order_expand.vue    | 16 +++++++-
 .../yieldReport/com_produce_report_normal.vue | 37 ++++++++++++++-----
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/schedule/com_schedule_order_expand.vue b/src/views/modules/schedule/com_schedule_order_expand.vue
index dffbb74..00a5994 100644
--- a/src/views/modules/schedule/com_schedule_order_expand.vue
+++ b/src/views/modules/schedule/com_schedule_order_expand.vue
@@ -181,9 +181,19 @@
                 <el-input-number :controls="false" :step="0" v-model="scope.row.rollCount"></el-input-number>
               </template>
             </el-table-column>
+            <el-table-column
+              prop="remark"
+              label="任务备注"
+              min-width="150"
+              align="center">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remark" placeholder="请输入任务备注"></el-input>
+              </template>
+            </el-table-column>
             <el-table-column
               label="操作"
               width="80"
+              fixed="right"
               align="center">
               <template slot-scope="scope">
                 <el-button type="text" size="small" @click="deleteScheduleDetail(scope.$index)">删除</el-button>
@@ -1455,7 +1465,8 @@ export default {
         qtyRequired: 0,
         carrierNo: '',  // 固定载具
         rowCount: 1,
-        rollCount: 1
+        rollCount: 1,
+        remark: '' // 任务备注
       });
     },
 
@@ -1616,7 +1627,8 @@ export default {
         checkFlag: true,
         rowCount: item.rowCount,
         rollCount: item.rollCount,
-        carrierNo: item.carrierNo  // 固定载具
+        carrierNo: item.carrierNo,  // 固定载具
+        remark: item.remark // 任务备注
       };
 
       // 调用排产接口
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index d42bf65..42fde30 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="produce-report customer-css">
     <el-dialog v-drag width="1120px" custom-class="machine-workbench-dialog" :title="titleCon" v-bind="$attrs" v-on="$listeners">
-      <el-form :inline="true" label-position="top" style="position: relative; height: 810px;" label-width="80px">
+      <el-form :inline="true" label-position="top" style="position: relative; height: 860px;" label-width="80px">
         <!-- 订单信息卡片 -->
         <div class="info-card-container">
           <div class="info-card">
@@ -16,13 +16,13 @@
                   <el-input v-model="scheduleData.orderNo" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="5">
                 <div class="info-item-modern">
                   <label>物料编码</label>
                   <el-input v-model="scheduleData.partNo" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
-              <el-col :span="9">
+              <el-col :span="10">
                 <div class="info-item-modern">
                   <label>物料名称/规格</label>
                   <el-input v-model="scheduleData.partDesc" :readonly="true" size="small"></el-input>
@@ -38,13 +38,13 @@
             <el-row :gutter="12" class="info-row">
               <el-col :span="4">
                 <div class="info-item-modern">
-                  <label>要求完工日期</label>
+                  <label>要求完工时间</label>
                   <el-input v-model="scheduleData.planFinishTime" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
               <el-col :span="4">
                 <div class="info-item-modern">
-                  <label>要求开工日期</label>
+                  <label>要求开工时间</label>
                   <el-input v-model="scheduleData.planStartTime" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
@@ -92,7 +92,7 @@
                   <el-input v-model="scheduleData.scheduledDate" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
-              <el-col :span="3">
+              <el-col :span="2">
                 <div class="info-item-modern">
                   <label>班次</label>
                   <el-input v-model="scheduleData.shiftNo" :readonly="true" size="small"></el-input>
@@ -104,6 +104,12 @@
                   <el-input v-model="scheduleData.preItemDesc" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
+              <el-col :span="3">
+                <div class="info-item-modern">
+                  <label>当前工序</label>
+                  <el-input v-model="scheduleData.operationDesc" :readonly="true" size="small"></el-input>
+                </div>
+              </el-col>
               <el-col :span="3">
                 <div class="info-item-modern">
                   <label>后道工序</label>
@@ -116,7 +122,7 @@
                   <el-input v-model="scheduleData.soRemark" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="4">
                 <div class="info-item-modern" style="margin-top: 24px;">
                   <el-checkbox true-label="true" false-label="false" v-model="scheduleData.currentRollFlag">
                     仅显示当前卷信息
@@ -124,6 +130,15 @@
                 </div>
               </el-col>
             </el-row>
+            <!-- 第四行：任务备注 -->
+            <el-row :gutter="20" class="info-row">
+              <el-col :span="24">
+                <div class="info-item-modern">
+                  <label>任务备注</label>
+                  <el-input v-model="scheduleData.remark" :readonly="true" size="small"></el-input>
+                </div>
+              </el-col>
+            </el-row>
           </div>
         </div>
 
@@ -604,7 +619,7 @@
             </el-tab-pane>
             <el-tab-pane label="机器下机卷" name="sfdc_roll">
               <el-table
-                height="353"
+                height="343"
                 :data="sfdcRollList.slice((sfdcRollPage - 1) * sfdcRollLimit, sfdcRollPage * sfdcRollLimit)"
                 border
                 show-summary
@@ -3368,6 +3383,8 @@ export default {
         productionRollQty: '',   // 产出卷数
         qtyApprove: '',          // 产出数量
         soRemark: '',            // 工艺备注
+        operationDesc: '',       // 当前工序
+        remark: '',              // 任务备注
         preItemNo: '',
         preItemDesc: '',
         nextItemDesc: '',
@@ -4499,6 +4516,7 @@ export default {
         this.scheduleData.scheduledDate = data.row.scheduledDate;
         this.scheduleData.shiftNo = data.row.shiftNo;
         this.scheduleData.preItemDesc = data.row.preItemDesc;
+        this.scheduleData.operationDesc = data.row.itemDesc;
         this.scheduleData.nextItemDesc = data.row.nextItemDesc;
         this.scheduleData.workCenterNo = data.row.workCenterNo;
         this.scheduleData.workCenterDesc = data.row.workCenterDesc;
@@ -4510,6 +4528,7 @@ export default {
         this.scheduleData.carrierNo = data.row.carrierNo;
         this.scheduleData.batchNo = data.row.batchNo;
         this.scheduleData.parkFlag = data.row.parkFlag;
+        this.scheduleData.remark = data.row.remark;
         //设置弹窗的标题
         this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' '
           + data.row.resourceDesc + ' （' + this.operatorData.operatorName + '）';
@@ -5644,7 +5663,7 @@ export default {
 
 /*定制组件的样式*/
 .customer-css /deep/ .el-dialog {
-  top: 6vh !important;
+  top: 3vh !important;
   margin-top: 0px !important;
   margin-bottom: 10px;
 }