diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index fd12092..73d5dbf 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -170,7 +170,7 @@
             <el-button type="primary" size="small" @click="refreshPageData" icon="el-icon-refresh">
               刷新
             </el-button>
-            <el-button type="primary" size="small" @click="switchOperatorModal" icon="el-icon-user">
+            <el-button type="primary" size="small" @click="switchOperatorModal" :disabled="buttonTags.switchUser" icon="el-icon-user">
               切换用户
             </el-button>
           </div>
@@ -3313,7 +3313,8 @@ export default {
         otherBunFlag: true,
         materialMalformedFlag: true,
         malformedMaterialFlag: true,
-        processInspectionFlag: true
+        processInspectionFlag: true,
+        switchUser: true
       },
       dataListLoading: false,
       productionStatusLoading: false, // 暂停生产/继续生产按钮 loading
@@ -4383,10 +4384,11 @@ export default {
         this.buttonTags.malformedMaterialFlag = true
         this.buttonTags.malformedMaterialButtonFlag = true
         this.buttonTags.processInspectionFlag = true
+        this.buttonTags.switchUser = true
       } else {
         //存在人员既可以合并卷
-        this.buttonTags.mergeRollFlag = false;
-        this.buttonTags.finishScheduleFlag = false;
+        // this.buttonTags.mergeRollFlag = false;
+        // this.buttonTags.finishScheduleFlag = false;
         this.buttonTags.otherBunFlag = false;
         this.buttonTags.materialMalformedFlag = false
         this.buttonTags.malformedMaterialFlag = false
@@ -4448,6 +4450,22 @@ export default {
           } else {
             this.buttonTags.processInspectionFlag = true;
           }
+
+          if (data.resultMap.combineRoll == 'Y') {
+            this.buttonTags.mergeRollFlag = false;
+          } else {
+            this.buttonTags.mergeRollFlag = true;
+          }
+          if (data.resultMap.finishOrder == 'Y') {
+            this.buttonTags.finishScheduleFlag = false;
+          } else {
+            this.buttonTags.finishScheduleFlag = true;
+          }
+          if (data.resultMap.switchUser == 'Y') {
+            this.buttonTags.switchUser = false;
+          } else {
+            this.buttonTags.switchUser = true;
+          }
         });
 
         let dto = {