From 167c4105bb8b34a8e1be5300f46827bf2d30f43b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 26 Mar 2026 16:19:23 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-26=20=E8=AE=A2=E5=8D=95=E4=BA=A7?=
 =?UTF-8?q?=E5=87=BA=E6=A0=87=E7=AD=BE=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E2=80=9C=E7=94=9F=E4=BA=A7=E6=9C=BA=E5=8F=B0=E2=80=9D=20?=
 =?UTF-8?q?=E2=80=9C=E6=B6=88=E8=80=97=E6=9C=BA=E5=8F=B0=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchSfdcRollsReport.vue                 | 65 ++++++++++++++++++-
 1 file changed, 63 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue b/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue
index 23e5fcf..e37ae62 100644
--- a/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue
+++ b/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue
@@ -99,8 +99,28 @@
             </el-col>
           </el-row>
 
-          <!-- 第三行：创建日期 -->
+          <!-- 第三行：创建日期及其他 -->
           <el-row :gutter="16">
+            <el-col :span="4">
+              <el-form-item label="生产机台">
+                <el-input v-model="searchData.productionResourceID" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="消耗机台">
+                <el-input v-model="searchData.consumptionResourceID" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="状态">
+                <el-select v-model="searchData.finalStatus" placeholder="请选择" clearable style="width: 100%">
+                  <el-option label="待入库" value="待入库"></el-option>
+                  <el-option label="未消耗" value="未消耗"></el-option>
+                  <el-option label="已消耗" value="已消耗"></el-option>
+                  <el-option label="删除卷" value="删除卷"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="创建日期">
                 <div style="display: flex; align-items: center;">
@@ -501,6 +521,8 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
           this.searchData.operatorID = this.searchData.operatorID.toUpperCase()
           this.searchData.sResourceID = this.searchData.sResourceID.toUpperCase()
           this.searchData.workCenterNo = this.searchData.workCenterNo.toUpperCase()
+          this.searchData.productionResourceID = this.searchData.productionResourceID.toUpperCase()
+          this.searchData.consumptionResourceID = this.searchData.consumptionResourceID.toUpperCase()
         }
       }
     },
@@ -595,7 +617,10 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
           consumeItemNo: '',
           rollNo: '',
           rollType: '',
-          createdby: ''
+          createdby: '',
+          productionResourceID: '',
+          consumptionResourceID: '',
+          finalStatus: ''
         },
         dataList:[],
         dataListLoading: false,
@@ -925,6 +950,24 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
             fixed: '',
             columnWidth: 100
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104003007,
+            serialNumber: '104003007TableSfdcRollsProductionResourceID',
+            tableId: "104003007Table",
+            tableName: "订单产出标签报表",
+            columnProp: "productionResourceID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "生产机台",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 104003007,
@@ -1015,6 +1058,24 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
             fixed: '',
             columnWidth: 100
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104003007,
+            serialNumber: '104003007TableSfdcRollsConsumptionResourceID',
+            tableId: "104003007Table",
+            tableName: "订单产出标签报表",
+            columnProp: "consumptionResourceID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "消耗机台",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 104003007,