作业端包装工序报工，“是否合并包装”属性需要默认赋值

mergePack等于1时默认“是”，否则为“否”

pages/mes/prodReport/index.vue

@@ -1816,6 +1816,7 @@ export default {
       } else {
         if (row.isPackage === '1') {
           row.packNum = items.usagePackNum ? items.usagePackNum : 0;
+          row.mergePack = items.mergePack ? items.mergePack : 0;
           row.encasementNum = items.usageEncasementNum ? items.usageEncasementNum : 0;
           this.getWorkorderDirectiveList(id, index);
         }
@@ -1929,6 +1930,7 @@ export default {
           if (item.isPackage === '1' && res.rows.length > 0) {
             item.workorderId = res.rows[0].workorderId;
             item.packNum = res.rows[0].usagePackNum ? res.rows[0].usagePackNum : 0;
+            item.mergePack = res.rows[0].mergePack ? res.rows[0].mergePack : 0;
             item.encasementNum = res.rows[0].usageEncasementNum ? res.rows[0].usageEncasementNum : 0;
             this.getWorkorderDirectiveList(res.rows[0].workorderId, index);
           }
@@ -1985,6 +1987,9 @@ export default {
 														sumheight += item.height
 													}
 												})
+                        // 当查找项高度不在当前窗口，需要滚动到指定高度
+                        // 当查找项目在当前窗口，则不滚动
+                        // 当查找项目只有一半部分在当前窗口，则滚动到当前项目之前叠加的高度
 												scrollTop = (sumheight > data1.height) ? sumheight : (res[1][currentIndex].height + sumheight) > data1.height ? sumheight : 0
 											} else {
 												const height = 80.8