diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue
index df2092e..e1ee40d 100644
--- a/src/views/modules/yieldReport/com_merge_roll.vue
+++ b/src/views/modules/yieldReport/com_merge_roll.vue
@@ -58,6 +58,7 @@ export default {
   data() {
     return {
       titleCon: '合并卷',
+      rollType: '',
       scheduleData: {
         site: this.$store.state.user.site,
         username: this.$store.state.user.name,
@@ -116,7 +117,8 @@ export default {
   },
   methods: {
     //初始化页面
-    init(scheduleData, operatorData) {
+    init(scheduleData, operatorData,rollType) {
+      this.rollType = rollType?1:0
       //初始化参数
       this.scheduleData = scheduleData;
       //初始化操作员对象
@@ -225,6 +227,7 @@ export default {
         'newRollQty': this.pageData.newRollQty,
         'username': this.pageData.username,
         'operatorId': this.pageData.operatorId,
+         parkFlag: this.rollType==1?'Y':'N' ,
         'newRollFlag': false
       };
       //先校验当前的卷
diff --git a/src/views/modules/yieldReport/otherReport/change_packaging.vue b/src/views/modules/yieldReport/otherReport/change_packaging.vue
index 9fd571c..3f40c46 100644
--- a/src/views/modules/yieldReport/otherReport/change_packaging.vue
+++ b/src/views/modules/yieldReport/otherReport/change_packaging.vue
@@ -3304,7 +3304,7 @@ export default {
       this.createRoll.seqNo = this.scheduleData.seqNo
       this.createRoll.rollNo = this.currentRollOps.rollNo
       this.createRoll.operatorId = this.operatorData.operatorId;
-      this.createRoll.rollCount = this.operatorData.rollNums;
+      this.createRoll.rollCount = this.createRoll.rollNums;
       this.createRoll.sFQCSlitFlag = 'N'
       otherCheckCreateSplitSfdcRoll(this.createRoll).then(({data}) => {
         //判断是否成功
@@ -3377,7 +3377,7 @@ export default {
       //打开合并卷的页面
       this.$nextTick(() => {
         this.showMergeFlag = true;
-        this.$refs.comMergeRoll.init(this.scheduleData, this.operatorData)
+        this.$refs.comMergeRoll.init(this.scheduleData, this.operatorData,1)
       });
     },