From aefe5216b01a0b71899d07a3bf0a13a1b4508b22 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 26 Mar 2026 14:46:11 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-26=20=E4=BA=A7=E7=BA=BF=E4=BA=A7?=
 =?UTF-8?q?=E9=87=8F=E9=87=87=E9=9B=86=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchProductionLineOutputReport.vue      | 69 +++++++++++--------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReport.vue b/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReport.vue
index 621dc21..34e68eb 100644
--- a/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReport.vue
+++ b/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReport.vue
@@ -41,12 +41,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item label="产成品编码">
+              <el-form-item label="物料编码">
                 <el-input v-model="searchData.partNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item label="产品名称">
+              <el-form-item label="物料名称">
                 <el-input v-model="searchData.partDescription" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
@@ -56,7 +56,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item label="操作员ID">
+              <el-form-item label="操作员">
                 <el-input v-model="searchData.operatorID" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
@@ -79,6 +79,11 @@
                 <el-input v-model="searchData.sResourceID" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="派工单号">
+                <el-input v-model="searchData.assJobSeqNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="报告日期">
                 <div style="display: flex; align-items: center;">
@@ -200,6 +205,7 @@ export default {
         partNo: '',
         partDescription: '',
         orderNo: '',
+        assJobSeqNo: '',
         operatorID: '',
         sResourceID: '',
         workCenterNo: '',
@@ -216,44 +222,45 @@ export default {
       tableHeight: 400,
       exportName: "产线产量报告" + this.dayjs().format('YYYYMMDDHHmmss'),
       columnList: [
-        { columnProp: "reportDate", columnLabel: "报告日期", columnWidth: 130, headerAlign: "center", align: "center" },
-        { columnProp: "workCenterNo", columnLabel: "加工中心", columnWidth: 80, headerAlign: "center", align: "left" },
-        { columnProp: "workCenterDesc", columnLabel: "加工中心名称", columnWidth: 120, headerAlign: "center", align: "left" },
-        { columnProp: "operatorID", columnLabel: "操作员", columnWidth: 80, headerAlign: "center", align: "left" },
-        { columnProp: "operatorName", columnLabel: "姓名", columnWidth: 80, headerAlign: "center", align: "left" },
         { columnProp: "orderNo", columnLabel: "订单号", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "assJobSeqNo", columnLabel: "派工单单号", columnWidth: 100, headerAlign: "center", align: "left" },
+        { columnProp: "qtyRequired", columnLabel: "派工单需求数量", columnWidth: 110, headerAlign: "center", align: "right" },
+        { columnProp: "itemNo", columnLabel: "工序号", columnWidth: 70, headerAlign: "center", align: "center" },
+        { columnProp: "operationDesc", columnLabel: "工序名称", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "sResourceID", columnLabel: "派工机台", columnWidth: 100, headerAlign: "center", align: "left" },
+        { columnProp: "partNo", columnLabel: "物料编码", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "partDescription", columnLabel: "物料名称", columnWidth: 200, headerAlign: "center", align: "left" },
+        { columnProp: "spec", columnLabel: "规格型号", columnWidth: 100, headerAlign: "center", align: "center" },
+        { columnProp: "rollNo", columnLabel: "卷号", columnWidth: 100, headerAlign: "center", align: "left" },
+        { columnProp: "seqNo", columnLabel: "报告次序", columnWidth: 80, headerAlign: "center", align: "center" },
+        { columnProp: "reportDate", columnLabel: "报告日期", columnWidth: 130, headerAlign: "center", align: "center" },
+        { columnProp: "direction", columnLabel: "方向", columnWidth: 80, headerAlign: "center", align: "center" },
         { columnProp: "reportQty", columnLabel: "报告数量", columnWidth: 80, headerAlign: "center", align: "right" },
         { columnProp: "approveQty", columnLabel: "合格数量", columnWidth: 80, headerAlign: "center", align: "right" },
         { columnProp: "defectQty", columnLabel: "不合格数量", columnWidth: 90, headerAlign: "center", align: "right" },
-        { columnProp: "reportedSetupTime", columnLabel: "准备时间", columnWidth: 80, headerAlign: "center", align: "right" },
         { columnProp: "reportedManfTime", columnLabel: "制造时间", columnWidth: 80, headerAlign: "center", align: "right" },
+        { columnProp: "reportedSetupTime", columnLabel: "准备时间", columnWidth: 80, headerAlign: "center", align: "right" },
+        { columnProp: "downtime", columnLabel: "停机时间", columnWidth: 80, headerAlign: "center", align: "right" },
         { columnProp: "reportedCleanupTime", columnLabel: "清理时间", columnWidth: 80, headerAlign: "center", align: "right" },
-        { columnProp: "scrapReason", columnLabel: "报废原因", columnWidth: 100, headerAlign: "center", align: "left" },
-        { columnProp: "downTimeReason", columnLabel: "停机原因", columnWidth: 100, headerAlign: "center", align: "left" },
-        { columnProp: "remark", columnLabel: "备注", columnWidth: 120, headerAlign: "center", align: "left" },
-        { columnProp: "itemNo", columnLabel: "工序号", columnWidth: 70, headerAlign: "center", align: "center" },
-        { columnProp: "seqNo", columnLabel: "报告次序", columnWidth: 80, headerAlign: "center", align: "center" },
-        { columnProp: "reverseflag", columnLabel: "取消", columnWidth: 60, headerAlign: "center", align: "center" },
-        { columnProp: "partNo", columnLabel: "物料编码", columnWidth: 120, headerAlign: "center", align: "left" },
-        { columnProp: "partDescription", columnLabel: "物料名称", columnWidth: 200, headerAlign: "center", align: "left" },
-        { columnProp: "spec", columnLabel: "规格型号", columnWidth: 100, headerAlign: "center", align: "center" },
+        { columnProp: "reportedSetupDowntime", columnLabel: "停机时间-调机", columnWidth: 110, headerAlign: "center", align: "right" },
+        { columnProp: "reportedManfDowntime", columnLabel: "停机时间-生产", columnWidth: 110, headerAlign: "center", align: "right" },
+        { columnProp: "actRunRate", columnLabel: "实际生产速度", columnWidth: 100, headerAlign: "center", align: "right" },
         { columnProp: "needDate", columnLabel: "要求完工日期", columnWidth: 110, headerAlign: "center", align: "center" },
-        { columnProp: "site", columnLabel: "工厂编号", columnWidth: 80, headerAlign: "center", align: "center" },
+        { columnProp: "scheduledDate", columnLabel: "排程日期", columnWidth: 100, headerAlign: "center", align: "center" },
         { columnProp: "starttime", columnLabel: "开工时间", columnWidth: 140, headerAlign: "center", align: "center" },
         { columnProp: "finishtime", columnLabel: "完工时间", columnWidth: 140, headerAlign: "center", align: "center" },
-        { columnProp: "downtime", columnLabel: "停机时间", columnWidth: 80, headerAlign: "center", align: "right" },
-        { columnProp: "assJobSeqNo", columnLabel: "派工单单号", columnWidth: 100, headerAlign: "center", align: "left" },
-        { columnProp: "qtyRequired", columnLabel: "派工单需求数量", columnWidth: 110, headerAlign: "center", align: "right" },
-        { columnProp: "sResourceID", columnLabel: "派工机台", columnWidth: 100, headerAlign: "center", align: "left" },
-        { columnProp: "operationDesc", columnLabel: "工序名称", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "workCenterNo", columnLabel: "加工中心", columnWidth: 80, headerAlign: "center", align: "left" },
+        { columnProp: "workCenterDesc", columnLabel: "加工中心名称", columnWidth: 120, headerAlign: "center", align: "left" },
         { columnProp: "customerName", columnLabel: "客户名称", columnWidth: 120, headerAlign: "center", align: "left" },
-        { columnProp: "custPartNo", columnLabel: "客户产品料号", columnWidth: 120, headerAlign: "center", align: "left" },
-        { columnProp: "actRunRate", columnLabel: "实际生产速度", columnWidth: 100, headerAlign: "center", align: "right" },
-        { columnProp: "scheduledDate", columnLabel: "排程日期", columnWidth: 100, headerAlign: "center", align: "center" },
+        { columnProp: "operatorID", columnLabel: "操作员", columnWidth: 80, headerAlign: "center", align: "left" },
+        { columnProp: "operatorName", columnLabel: "姓名", columnWidth: 80, headerAlign: "center", align: "left" },
         { columnProp: "scheduledShiftNo", columnLabel: "排程班次", columnWidth: 80, headerAlign: "center", align: "center" },
-        { columnProp: "firstReportFlag", columnLabel: "首次报告", columnWidth: 80, headerAlign: "center", align: "center" },
-        { columnProp: "reportedSetupDowntime", columnLabel: "停机时间-调机", columnWidth: 110, headerAlign: "center", align: "right" },
-        { columnProp: "reportedManfDowntime", columnLabel: "停机时间-生产", columnWidth: 110, headerAlign: "center", align: "right" }
+        { columnProp: "remark", columnLabel: "备注", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "scrapReason", columnLabel: "报废原因", columnWidth: 100, headerAlign: "center", align: "left" },
+        { columnProp: "downTimeReason", columnLabel: "停机原因", columnWidth: 100, headerAlign: "center", align: "left" },
+        { columnProp: "reverseflag", columnLabel: "取消", columnWidth: 60, headerAlign: "center", align: "center" },
+        { columnProp: "custPartNo", columnLabel: "客户产品料号", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "firstReportFlag", columnLabel: "首次报告", columnWidth: 80, headerAlign: "center", align: "center" }
       ]
     }
   },
@@ -263,6 +270,7 @@ export default {
       handler: function (newV) {
         this.searchData.partNo = this.searchData.partNo.toUpperCase()
         this.searchData.orderNo = this.searchData.orderNo.toUpperCase()
+        this.searchData.assJobSeqNo = this.searchData.assJobSeqNo.toUpperCase()
         this.searchData.operatorID = this.searchData.operatorID.toUpperCase()
         this.searchData.sResourceID = this.searchData.sResourceID.toUpperCase()
         this.searchData.workCenterNo = this.searchData.workCenterNo.toUpperCase()
@@ -344,6 +352,7 @@ export default {
         partNo: '',
         partDescription: '',
         orderNo: '',
+        assJobSeqNo: '',
         operatorID: '',
         sResourceID: '',
         workCenterNo: '',