diff --git a/src/views/modules/yieldReport/otherReport/change_switch_roll.vue b/src/views/modules/yieldReport/otherReport/change_switch_roll.vue
index d68ce83..547bcd2 100644
--- a/src/views/modules/yieldReport/otherReport/change_switch_roll.vue
+++ b/src/views/modules/yieldReport/otherReport/change_switch_roll.vue
@@ -8,7 +8,7 @@
         <el-row>
           <el-col :span="24" style="margin-left: 0px;margin-top: -5px">
             <el-form-item :label="'产品卷号:'">
-              <el-input ref="newRollNo" v-model="pageData.newRollNo" style="width: 208px;" ></el-input>
+              <el-input ref="newRollNo" v-model="pageData.rollNo" style="width: 208px;" ></el-input>
             </el-form-item>
 
           </el-col>
@@ -35,7 +35,7 @@
 
       </el-form>
       <span style="margin-top: 20px" slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="switchRollBun">确 定</el-button>
+        <el-button type="primary" @click="switchRollOperation">确 定</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
     </el-dialog>
@@ -103,6 +103,7 @@ export default {
         userName: this.$store.state.user.name,
         seqNo: '',
         orderNo: '',
+        rollNo: '',
         itemNo: '',
         newRollNo: '',
         operatorId: '',
@@ -114,7 +115,7 @@ export default {
         resourceId: '',
         currentDate:'',
         directRepackageflag:true,
-        workcenterno: '',
+        workCenterNo: '',
         shiftNo: '',
         scheduledDate: ''
       },
@@ -196,7 +197,7 @@ export default {
       this.pageData.checkMultipleRoll = scheduleData.checkMultipleRoll;
       this.pageData.directPass = scheduleData.directPass;
       this.pageData.resourceId = scheduleData.resourceId;
-      this.pageData.workcenterno = scheduleData.workcenterno;
+      this.pageData.workCenterNo = scheduleData.workCenterNo;
       this.pageData.currentDate = this.dayjs().format("YYYY-MM-DD HH:mm:ss")
       this.currentDate = this.dayjs().format("YYYY-MM-DD  HH:mm:ss")
       this.scheduleDateShiftDto.resourceId = scheduleData.resourceId
@@ -226,9 +227,7 @@ export default {
         this.$message.warning('请先切换人员!');
         return false;
       }
-      //首先判断数值是否通过判断
-      let newRollNo = this.pageData.newRollNo;
-      if (newRollNo == null || newRollNo == '') {
+      if (!this.pageData.rollNo) {
         this.$message.warning('请输入产品卷号!');
         return false;
       }
@@ -239,16 +238,6 @@ export default {
           this.$message.warning(data.msg);
         } else if (data.code == 500){
           this.$message.error(data.msg);
-        } else if (data.resultMap.resultCode == '201') {
-          //打开异常原因录入的界面
-          this.$confirm(data.resultMap.resultMsg, '提示', {
-            confirmButtonText: '确认',
-            celButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            //执行切换卷的操作
-            this.switchRollOperation();
-          });
         } else { //执行切换卷的操作
           this.switchRollOperation();
         }
@@ -257,11 +246,21 @@ export default {
 
     /*执行切换卷的操作*/
     switchRollOperation() {
+      //人员判断
+      if (this.pageData.operatorId == '' || this.pageData.operatorId == null) {
+        this.$message.warning('请先切换人员!');
+        return false;
+      }
+      if (!this.pageData.rollNo) {
+        this.$message.warning('请输入产品卷号!');
+        return false;
+      }
       if (!this.currentDate){
         this.$message.warning('请选择排产日期');
         return;
       }
       this.pageData.scheduledDate =  this.currentDate
+      this.pageData.shiftNo = this.shiftNo
       switchrollRepackAction(this.pageData).then(({data}) => {
         //判断操作是否成功
         if (data.code == 400) {