From 0b53d1e5768313b183af374baa273191d5717265 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 11 Dec 2025 14:28:45 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-11=20=E8=BF=87=E7=AB=99=E9=87=87?=
 =?UTF-8?q?=E9=9B=86-=E3=80=8B=E8=BD=A6=E9=97=B4=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9A=84=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=B7=A5=E8=89=BA=E7=9A=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_produce_material.vue      | 20 ++++-
 .../yieldReport/com_produce_report_normal.vue | 87 +++++++++++++++----
 2 files changed, 90 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/yieldReport/com_produce_material.vue b/src/views/modules/yieldReport/com_produce_material.vue
index 146d59c..b2d610b 100644
--- a/src/views/modules/yieldReport/com_produce_material.vue
+++ b/src/views/modules/yieldReport/com_produce_material.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="520px" class="material-dialog">
+               width="520px" class="material-dialog" :before-close="handleDialogClose">
       <div class="material-content">
         <el-form ref="materialForm" :model="pageData" label-position="top" label-width="100px">
           <!-- 材料卷号和BOM序号在同一行 -->
@@ -296,6 +296,24 @@ export default {
       this.$emit('update:visible', false);
     },
 
+    /*右上角X按钮关闭时的处理*/
+    handleDialogClose(done) {
+      // 清空物料信息
+      this.materialInfo = {
+        partNo: '',
+        partDesc: ''
+      };
+      // 清空输入框
+      this.pageData.scanRmRollNo = '';
+      this.pageData.rmRollNo = '';
+      this.pageData.bomItemNo = '';
+      
+      //刷新报工的页面
+      this.$emit('refreshPageData');
+      //关闭对话框
+      done();
+    },
+
     /*清空物料信息*/
     clearMaterialInfo(){
       this.materialInfo = {
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 2bc618e..ae486ee 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -36,51 +36,87 @@
               </el-col>
             </el-row>
             <el-row :gutter="12" class="info-row">
-              <el-col :span="6">
+              <el-col :span="4">
                 <div class="info-item-modern">
                   <label>要求完工日期</label>
                   <el-input v-model="scheduleData.planFinishTime" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="4">
                 <div class="info-item-modern">
                   <label>要求开工日期</label>
                   <el-input v-model="scheduleData.planStartTime" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
-              <el-col :span="4">
+              <el-col :span="3">
                 <div class="info-item-modern">
                   <label>派工需求数量</label>
                   <el-input v-model="scheduleData.qtyRequiredOriginal" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
-              <el-col :span="4">
+              <el-col :span="3">
+                <div class="info-item-modern">
+                  <label>生产总数</label>
+                  <el-input v-model="scheduleData.productionQty" :readonly="true" size="small"></el-input>
+                </div>
+              </el-col>
+              <el-col :span="2">
+                <div class="info-item-modern">
+                  <label>总卷数</label>
+                  <el-input v-model="scheduleData.totalRollQty" :readonly="true" size="small"></el-input>
+                </div>
+              </el-col>
+              <el-col :span="2">
+                <div class="info-item-modern">
+                  <label>每卷总数</label>
+                  <el-input v-model="scheduleData.totalPerVolume" :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.productionRollQty" :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.qtyApprove" :readonly="true" size="small"></el-input>
+                </div>
+              </el-col>
+            </el-row>
+            <el-row :gutter="12" class="info-row">
+              <el-col :span="3">
                 <div class="info-item-modern">
                   <label>排产日期</label>
                   <el-input v-model="scheduleData.scheduledDate" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
-              <el-col :span="4">
+              <el-col :span="3">
                 <div class="info-item-modern">
                   <label>班次</label>
                   <el-input v-model="scheduleData.shiftNo" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
-            </el-row>
-            <el-row :gutter="12" class="info-row">
-              <el-col :span="8">
+              <el-col :span="3">
                 <div class="info-item-modern">
                   <label>前道工序</label>
                   <el-input v-model="scheduleData.preItemDesc" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="3">
                 <div class="info-item-modern">
                   <label>后道工序</label>
                   <el-input v-model="scheduleData.nextItemDesc" :readonly="true" size="small"></el-input>
                 </div>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
+                <div class="info-item-modern">
+                  <label>工艺备注</label>
+                  <el-input v-model="scheduleData.soRemark" :readonly="true" size="small"></el-input>
+                </div>
+              </el-col>
+              <el-col :span="6">
                 <div class="info-item-modern" style="margin-top: 24px;">
                   <el-checkbox true-label="true" false-label="false" v-model="scheduleData.currentRollFlag">
                     仅显示当前卷信息
@@ -3156,6 +3192,12 @@ export default {
         planStartTime: '',
         planFinishTime: '',
         qtyRequiredOriginal: 0,
+        productionQty: '',       // 生产总数
+        totalRollQty: '',        // 总卷数
+        totalPerVolume: '',      // 每卷总数
+        productionRollQty: '',   // 产出卷数
+        qtyApprove: '',          // 产出数量
+        soRemark: '',            // 工艺备注
         preItemNo: '',
         preItemDesc: '',
         nextItemDesc: '',
@@ -3167,7 +3209,7 @@ export default {
         checkMultipleRoll: '',
         rowCount: '',
         rollCount: '',
-        carrierNo: ''
+        carrierNo: '',
       },
       currentRollOps: {
         site: this.$store.state.user.site,
@@ -3962,6 +4004,12 @@ export default {
         this.scheduleData.planStartTime = data.row.planStartTime;
         this.scheduleData.planFinishTime = data.row.planFinishTime;
         this.scheduleData.qtyRequiredOriginal = data.row.qtyRequiredOriginal;
+        this.scheduleData.productionQty = data.row.productionQty;
+        this.scheduleData.totalRollQty = data.row.totalRollQty;
+        this.scheduleData.totalPerVolume = data.row.totalPerVolume;
+        this.scheduleData.productionRollQty = data.row.productionRollQty;
+        this.scheduleData.qtyApprove = data.row.qtyApprove;
+        this.scheduleData.soRemark = data.row.soRemark;
         this.scheduleData.scheduledDate = data.row.scheduledDate;
         this.scheduleData.shiftNo = data.row.shiftNo;
         this.scheduleData.preItemDesc = data.row.preItemDesc;
@@ -3974,6 +4022,7 @@ export default {
         this.scheduleData.rowCount = data.row.rowCount;
         this.scheduleData.rollCount = data.row.rollCount;
         this.scheduleData.carrierNo = data.row.carrierNo;
+
       });
     },
     // 获取当前卷的信息
@@ -4133,6 +4182,12 @@ export default {
         this.scheduleData.planStartTime = data.row.planStartTime;
         this.scheduleData.planFinishTime = data.row.planFinishTime;
         this.scheduleData.qtyRequiredOriginal = data.row.qtyRequiredOriginal;
+        this.scheduleData.productionQty = data.row.productionQty;
+        this.scheduleData.totalRollQty = data.row.totalRollQty;
+        this.scheduleData.totalPerVolume = data.row.totalPerVolume;
+        this.scheduleData.productionRollQty = data.row.productionRollQty;
+        this.scheduleData.qtyApprove = data.row.qtyApprove;
+        this.scheduleData.soRemark = data.row.soRemark;
         this.scheduleData.scheduledDate = data.row.scheduledDate;
         this.scheduleData.shiftNo = data.row.shiftNo;
         this.scheduleData.preItemDesc = data.row.preItemDesc;
@@ -5017,27 +5072,27 @@ export default {
         this.$message.warning('该文件暂无预览路径');
         return;
       }
-      
+
       // 获取文件后缀
       const fileName = row.sopName || row.sopUrl;
       let fileSuffix = '';
       if (fileName.includes('.')) {
         fileSuffix = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
       }
-      
+
       // 判断文件类型
       const imageTypes = ['jpg', 'jpeg', 'png', 'gif', 'bmp'];
       const videoTypes = ['mp4', 'avi', 'mov', 'wmv', 'flv'];
       const pdfTypes = ['pdf'];
       const txtTypes = ['txt'];
       const officeTypes = ['doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx'];
-      
+
       // 不支持的文件类型
       if (officeTypes.includes(fileSuffix)) {
         this.$message.warning(`暂不支持在线预览${fileSuffix.toUpperCase()}文件，请使用下载功能`);
         return;
       }
-      
+
       // 设置MIME类型
       let mimeType = 'application/octet-stream';
       if (imageTypes.includes(fileSuffix)) {
@@ -5049,7 +5104,7 @@ export default {
       } else if (txtTypes.includes(fileSuffix)) {
         mimeType = 'text/plain';
       }
-      
+
       // 调用下载API并创建Blob预览
       downloadSopFile(row.sopUrl).then(({ data }) => {
         const blob = new Blob([data], { type: mimeType });