2026-03-20

1、创建分卷的【产量报告】调用存储过程时增加不良数参数
2、合并卷里的当前卷数量不允许修改

src/views/modules/boxManage/saleBoxManage.vue

@@ -189,8 +189,8 @@
         </el-form>
         <el-table
           ref="caseTable"
-          :data="casesList"
-          :height="height"
+          :data="casesPagedList"
+          :height="height - 32"
           border
           @selection-change="handleCaseSelectionChange"
           style="width: 100%;">
@@ -249,6 +249,16 @@
             label="创建人">
           </el-table-column>
         </el-table>
+        <el-pagination
+          style="margin-top: 0px"
+          @size-change="sizeChangeCasesHandle"
+          @current-change="currentChangeCasesHandle"
+          :current-page="casesPageIndex"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="casesPageSize"
+          :total="casesList.length"
+          layout="total, sizes, prev, pager, next, jumper">
+        </el-pagination>
       </el-tab-pane>
       <el-tab-pane label="扫描装箱" name="boxing">
         <boxing ref="boxing"></boxing>
@@ -524,6 +534,9 @@ export default {
         totalQty: 0
       },
       selectedCaseRecords: [],
+      // 扫描装盒分页
+      casesPageIndex: 1,
+      casesPageSize: 50,
       columnArray1: [
         {
           userId: this.$store.state.user.name,
@@ -871,6 +884,13 @@ export default {
       exportName: '销售出库单'+this.dayjs().format('YYYYMMDDHHmmss'),
     }
   },
+  computed: {
+    casesPagedList() {
+      const start = (this.casesPageIndex - 1) * this.casesPageSize
+      return this.casesList.slice(start, start + this.casesPageSize)
+    }
+  },
+
   /*组件*/
   components: {
     boxing,
@@ -1035,6 +1055,16 @@ export default {
       })
     },
 
+    // 扫描装盒分页 - 每页条数变更
+    sizeChangeCasesHandle(val) {
+      this.casesPageSize = val
+      this.casesPageIndex = 1
+    },
+    // 扫描装盒分页 - 当前页变更
+    currentChangeCasesHandle(val) {
+      this.casesPageIndex = val
+    },
+
     // ===== 盒清单相关方法 =====
     refreshCasesTable(){
       let templateData = {
@@ -1044,6 +1074,7 @@ export default {
       }
       searchSoReceiveCasesData(templateData).then(({data}) => {
         this.casesList = data.rows || []
+        this.casesPageIndex = 1
         // 更新统计数据 - 从列表第一条记录中获取
         if (data.rows && data.rows.length > 0) {
           const firstRecord = data.rows[0]

src/views/modules/yieldReport/com_merge_roll.vue

@@ -23,6 +23,7 @@
                       v-model="pageData.rollQty"
                       class="qty-input"
                       type="number"
+                      readonly
                       @blur="checkValidQty"
                       @input="calculateTotalQty"
                       style="width: 100%">

src/views/modules/yieldReport/com_separate_roll.vue

@@ -1431,7 +1431,7 @@ export default {
             ...this.pageData,
             rollQty: totalGoodQty,  // 该卷的良品总数
             rollNums: 1,            // 固定为1
-            totalDefectQty: totalDefectQty,  // 该卷的不良总数
+            defectQty: totalDefectQty,  // 该卷的不良总数
             rollRows: rollRows,     // 该卷包含的排数据
             remark: rollRemark      // 该卷的备注
           }