2026-03-26

订单产出标签统计增加“生产机台” “消耗机台”

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,