diff --git a/src/views/modules/yieldReport/com_finish_schedule.vue b/src/views/modules/yieldReport/com_finish_schedule.vue
index 4cc7e35..193bc44 100644
--- a/src/views/modules/yieldReport/com_finish_schedule.vue
+++ b/src/views/modules/yieldReport/com_finish_schedule.vue
@@ -4,18 +4,18 @@
                width="875px" style="height: 770px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" style="height: 635px;"
                label-width="80px">
-        <!--  卷数量统计 班次信息  -->
+        <!--  数量统计 班次信息  -->
         <fieldset class="customer-fieldset" style="margin-top: -10px; width: 260px;">
           <legend>数量</legend>
           <el-col :span="9" style="margin-left: 35px; margin-top: -8px;">
           <el-form-item class="customer-item" label="总良品数量(PCS):" style="margin-top: -10px;">
-            <el-input v-model="pageData.approvedQty" type="number"  @blur="checkValidApprovedQty"
+            <el-input v-model="pageData.totalApprovedQty" type="number"  @blur="checkValidApprovedQty"
                       style="width: 80px;" ></el-input>
           </el-form-item>
           </el-col>
           <el-col :span="9" style="margin-top: -8px;">
           <el-form-item class="customer-item" label="总不良品数量(PCS):" style="margin-top: -10px;">
-            <el-input v-model="pageData.defectedQty" disabled="disabled" style="width: 100px;"></el-input>
+            <el-input v-model="pageData.totalDefectedQty" disabled="disabled" style="width: 100px;"></el-input>
           </el-form-item>
           </el-col>
         </fieldset>
@@ -42,7 +42,7 @@
             </el-form-item>
           </el-col>
         </fieldset>
-          <!-- 操作员信息和班次信息 -->
+          <!-- 生产时间的统计信息 -->
         <fieldset class="customer-fieldset"
                   style="width: 666px;">
           <legend>生产时间(只有结束的记录才会被统计)</legend>
@@ -95,7 +95,7 @@
             <el-row style="margin-top: 18px; height: 55px;">
               <el-col style="text-align: center">
                 <el-form-item>
-                  <el-button type="primary" @click="createNewRollFun" :disabled="buttonTags.createNewRollFlag"
+                  <el-button type="primary" @click="createNewRollFun"
                              style="margin-left: 10px; margin-bottom: 5px;">
                     接单关闭
                   </el-button>
@@ -105,8 +105,7 @@
             <el-row style="height: 55px;">
               <el-col style="text-align: center">
                 <el-form-item>
-                  <el-button type="primary" @click="switchRollModal" :disabled="buttonTags.switchRollFlag"
-                             style="margin-left: 10px; margin-bottom: 5px;">
+                  <el-button type="primary" @click="switchRollModal" style="margin-left: 10px; margin-bottom: 5px;">
                     关闭
                   </el-button>
                 </el-form-item>
@@ -115,8 +114,7 @@
             <el-row style="height: 55px;">
               <el-col style="text-align: center">
                 <el-form-item>
-                  <el-button type="primary" @click="separateRollModal" :disabled="buttonTags.separateRollFlag"
-                             style="margin-left: 10px; margin-bottom: 5px;">
+                  <el-button type="primary" @click="separateRollModal" style="margin-left: 10px; margin-bottom: 5px;">
                     刷新数据
                   </el-button>
                 </el-form-item>
@@ -130,15 +128,15 @@
           <el-row style="margin-top: -35px; width: 280px;">
             <el-col :span="6">
               <el-form-item :label="''" style="margin-left: 15px;">
-                <el-checkbox style="margin-top: 28px;" true-label="true" false-label="false"
-                             v-model="pageData.currentRollFlag">有记录未结束
+                <el-checkbox style="margin-top: 28px;" true-label="Y" false-label="N"
+                             v-model="pageData.timeFinishedFlag">有记录未结束
                 </el-checkbox>
               </el-form-item>
             </el-col>
             <el-col  :span="6">
               <el-form-item :label="''" style="margin-left: 65px;">
-                <el-checkbox style="margin-top: 28px;" true-label="true" false-label="false"
-                             v-model="pageData.currentRollFlag">仅显示未结束记录
+                <el-checkbox style="margin-top: 28px;" true-label="true" false-label="N"
+                             v-model="pageData.showNoFinishedTimeFlag">仅显示未结束记录
                 </el-checkbox>
               </el-form-item>
             </el-col>
@@ -173,15 +171,15 @@
           <el-row style="margin-top: -35px; width: 280px;">
             <el-col :span="6">
               <el-form-item :label="''" style="margin-left: 15px;">
-                <el-checkbox style="margin-top: 28px;" true-label="true" false-label="false"
-                             v-model="pageData.currentRollFlag">有记录未结束
+                <el-checkbox style="margin-top: 28px;" true-label="Y" false-label="N"
+                             v-model="pageData.toolFinishedFlag">有记录未结束
                 </el-checkbox>
               </el-form-item>
             </el-col>
             <el-col  :span="6">
               <el-form-item :label="''" style="margin-left: 65px;">
-                <el-checkbox style="margin-top: 28px;" true-label="true" false-label="false"
-                             v-model="pageData.currentRollFlag">仅显示未结束使用刀模记录
+                <el-checkbox style="margin-top: 28px;" true-label="Y" false-label="N"
+                             v-model="pageData.showNoFinishedTollFlag">仅显示未结束使用刀模记录
                 </el-checkbox>
               </el-form-item>
             </el-col>
@@ -216,15 +214,15 @@
           <el-row style="margin-top: -35px; width: 280px;">
             <el-col :span="6">
               <el-form-item :label="''" style="margin-left: 15px;">
-                <el-checkbox style="margin-top: 28px;" true-label="true" false-label="false"
-                             v-model="pageData.currentRollFlag">有记录未结束
+                <el-checkbox style="margin-top: 28px;" true-label="Y" false-label="N"
+                             v-model="pageData.materialFinishedFlag">有记录未结束
                 </el-checkbox>
               </el-form-item>
             </el-col>
             <el-col  :span="6">
               <el-form-item :label="''" style="margin-left: 65px;">
-                <el-checkbox style="margin-top: 28px;" true-label="true" false-label="false"
-                             v-model="pageData.currentRollFlag">仅显示未结束使用材料记录
+                <el-checkbox style="margin-top: 28px;" true-label="Y" false-label="N"
+                             v-model="pageData.showNoFinishedMaterialFlag">仅显示未结束使用材料记录
                 </el-checkbox>
               </el-form-item>
             </el-col>
@@ -288,68 +286,33 @@ export default {
     return {
       titleCon: '',
       showExceptionFlag: false,
-      scheduleData: {
-        site: this.$store.state.user.site,
-        userName: this.$store.state.user.name,
-        seqNo: '',
-        orderNo: '',
-        itemNo: 0,
-        partNo: '',
-        workCenterNo: '',
-        workCenterDesc: '',
-        resourceDesc: '',
-        rollNo: '',
-        partDesc: '',
-        planStartTime: '',
-        planFinishTime: '',
-        qtyRequiredOriginal: 0,
-        scheduledDate: '',
-        shiftNo: '',
-        preItemDesc: '',
-        nextItemDesc: '',
-        nextItemNo: 0,
-        operatorId: '',
-        functionName: '',
-        currentRollFlag: false
-      },
       pageData: {
         site: this.$store.state.user.site,
         userName: this.$store.state.user.name,
         orderNo: '',
         itemNo: 0,
         seqNo: '',
-        rollNo: '',
-        resourceId: '',
-        scheduledDate: '',
-        shiftNo: '',
+        operatorId: '',
+        totalApprovedQty: 0,
+        totalDefectedQty: 0,
         reportedTime: this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
-        reportedFlag: 'N',
-        approvedQty: 0,
-        defectedQty: 0,
-        totalQty: 0,
-        editNewRollQty: 0,
-        otherRollQty: '',
+        scheduledDate: '',
         shiftDesc: '',
-        totalSetupTime: 0,
-        totalDowntimeTimeSetup: 0,
-        totalPureSetupTime: 0,
-        totalProdTime: 0,
-        totalDowntimeTimeProd: 0,
-        totalPureProdTime: 0,
-        totalManufactureTime: 0,
-        totalManufactureDowntimeTime: 0,
-        totalPureManufactureTime: 0,
-        sfdcProdTime: 0,//生产时间
-        sfdcSetupTime: 0,//调机时间
-        sfdcManufactureTime: 0,//制造时间
-        sfdcSetupDownTime: 0,//调机停机时间
-        sfdcProdSetupTime: 0,//生产调机时间
-        sfdcDownTime: 0,//停机时间
-        eventTime: '',
-        tillTime: '',
-        sfdcApprovedQty: 0,
-        sfdcDefectedQty: 0,
-        sfdcReportedQty: 0,
+        totalSetupTime: 0,//总调机时间
+        totalDowntimeTimeSetup: 0,//总调机过程停机时间
+        totalPureSetupTime: 0,//净调机时间
+        totalProdTime: 0,//总生产时间
+        totalDowntimeTimeProd: '',//总生产过程停机时间
+        totalPureProdTime: 0,//净生产时间
+        totalManufactureTime: 0,//总制造时间
+        totalManufactureDowntimeTime: 0,//总制造过程停机时间
+        totalPureManufactureTime: 0,//净制造时间
+        timeFinishedFlag: 'Y',//时间结束的标记
+        showNoFinishedTimeFlag: 'Y',//显示未结束的时间记录标记
+        toolFinishedFlag: 'Y',//时间结束的标记
+        showNoFinishedTollFlag: 'Y',//显示未结束的时间记录标记
+        materialFinishedFlag: 'Y',//时间结束的标记
+        showNoFinishedMaterialFlag: 'Y',//显示未结束的时间记录标记
         remark: '',
         exceptionFlag: 'N',
         exceptionReason: '',
@@ -912,19 +875,6 @@ export default {
           fixed: false
         }
       ],
-      buttonTags:{
-        createNewRollFlag: true,
-        switchRollFlag: true,
-        separatorRollFlag: true,
-        finishRollFlag: true,
-        mergeRollFlag: true,
-        tuningFlag: true,
-        produceFlag: true,
-        defectFlag: true,
-        toolFlag: true,
-        materialFlag: true,
-        downTimeFlag: true
-      },
       dataListLoading: false,
     }
   },
@@ -934,16 +884,10 @@ export default {
   methods: {
     /*初始化页面参数*/
     init(scheduleData, operatorData) {
-      //初始化参数
-      this.scheduleData = scheduleData;
       //初始化参数
       this.pageData.orderNo = scheduleData.orderNo;
       this.pageData.itemNo = scheduleData.itemNo;
       this.pageData.seqNo = scheduleData.seqNo;
-      this.pageData.rollNo = scheduleData.rollNo;
-      this.pageData.scheduledDate = scheduleData.scheduledDate;
-      this.pageData.shiftNo = scheduleData.shiftNo;
-      this.pageData.resourceId = scheduleData.resourceId;
       this.pageData.operatorId = operatorData.operatorId;
       //重置时间
       this.pageData.reportedTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
@@ -958,6 +902,7 @@ export default {
       //刷新当前派工单的信息
       this.refreshPageData();
     },
+
     /*关闭modal*/
     closeDialog(){
       this.$emit('update:visible', false);
@@ -975,146 +920,9 @@ export default {
     },
 
     /*刷新当前的页面参数*/
-    async refreshPageData(){
+    refreshPageData(){
       //1.刷新当前卷的报工数据
-      await getCurrentRollReportedQty(this.scheduleData).then(({data}) => {
-        this.pageData.approvedQty = data.row.approvedQty;
-        this.pageData.defectedQty = data.row.defectedQty;
-        this.pageData.totalQty = data.row.totalQty;
-        this.pageData.otherRollQty = data.row.otherRollQty;
-      })
-      //2.刷新当前卷的时间信息
-      await countSfdcTimeQty(this.scheduleData).then(({data}) => {
-        this.pageData.totalSetupTime = data.row.totalSetupTime;
-        this.pageData.totalDowntimeTimeSetup = data.row.totalDowntimeTimeSetup;
-        this.pageData.totalPureSetupTime = data.row.totalPureSetupTime;
-        this.pageData.totalProdTime = data.row.totalProdTime;
-        this.pageData.totalDowntimeTimeProd = data.row.totalDowntimeTimeProd;
-        this.pageData.totalPureProdTime = data.row.totalPureProdTime;
-        this.pageData.totalManufactureTime = data.row.totalManufactureTime;
-        this.pageData.totalManufactureDowntimeTime = data.row.totalManufactureDowntimeTime;
-        this.pageData.totalPureManufactureTime = data.row.totalPureManufactureTime;
-        //先预设一些参数  后期方法再计算
-        //生产时间=总生产时间
-        this.pageData.sfdcProdTime = this.pageData.totalProdTime;
-        //调机时间=总调机时间
-        this.pageData.sfdcSetupTime = this.pageData.totalSetupTime;
-        //制造时间=总制造时间
-        this.pageData.sfdcManufactureTime = this.pageData.totalManufactureTime;
-        //调机停机=总调机过程停机时间
-        this.pageData.sfdcSetupDownTime = this.pageData.totalDowntimeTimeSetup;
-        //生产调机=总生产过程停机时间
-        this.pageData.sfdcProdSetupTime = this.pageData.totalDowntimeTimeProd;
-        //停机时间=总制造过程停机时间
-        this.pageData.sfdcDownTime = this.pageData.totalManufactureDowntimeTime;
-      });
-        //3.刷新派工单的班次信息
-      await getScheduleShiftData(this.scheduleData).then(({data}) => {
-          this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
-          this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
-        });
-        //4.刷新当前卷的最早和最晚时间
-       await getSfdcTimeMaxAndMinTime(this.scheduleData).then(({data}) => {
-          this.pageData.eventTime = data.row.eventTime;
-          this.pageData.tillTime = data.row.tillTime;
-        });
-        //5.刷新当前卷的Sfdc表的时间
-       await getSfdcTimeData(this.scheduleData).then(({data}) => {
-          //先判断是否成功查询
-          if(data.resultCode == 200){
-            //判断是否操作成功
-            this.pageData.eventTime = data.row.finishTime;
-            this.pageData.sfdcProdTime = data.row.sfdcProdTime;
-            this.pageData.sfdcSetupTime = data.row.sfdcSetupTime;
-            this.pageData.sfdcManufactureTime = data.row.sfdcManufactureTime;
-            this.pageData.sfdcDownTime = data.row.sfdcDownTime;
-            this.pageData.sfdcSetupDownTime = data.row.sfdcSetupDownTime;
-            this.pageData.sfdcProdSetupTime = data.row.sfdcProdSetupTime;
-          }else{
-            //暂时不处理数据
-          }
-        });
-        //6.刷新当前卷的报工数据
-        await getSfdcReportedData(this.scheduleData).then(({data}) => {
-          this.pageData.sfdcApprovedQty = this.pageData.approvedQty - data.row.approveQty;
-          this.pageData.sfdcDefectedQty = this.pageData.defectedQty - data.row.defectQty;
-          this.pageData.sfdcReportedQty = this.pageData.sfdcApprovedQty + this.pageData.sfdcDefectedQty;
-        });
-        //刷新当前卷的时间数据
-        await getSfdcMaterialByRollNo(this.scheduleData).then(({data}) => {
-          this.sfdcMaterialList = data.rows;
-        });
-    },
 
-    /*刷新当前卷的报工数据汇总*/
-    refreshCurrentRollReportedQty(){
-      getCurrentRollReportedQty(this.scheduleData).then(({data}) => {
-        this.pageData.approvedQty = data.row.approvedQty;
-        this.pageData.defectedQty = data.row.defectedQty;
-        this.pageData.totalQty = data.row.totalQty;
-        this.pageData.otherRollQty = data.row.otherRollQty;
-      })
-    },
-
-    //刷新当前卷的时间信息
-    refreshCurrentRollTimeQty(){
-      countSfdcTimeQty(this.scheduleData).then(({data}) => {
-        this.pageData.totalSetupTime = data.row.totalSetupTime;
-        this.pageData.totalDowntimeTimeSetup = data.row.totalDowntimeTimeSetup;
-        this.pageData.totalPureSetupTime = data.row.totalPureSetupTime;
-        this.pageData.totalProdTime = data.row.totalProdTime;
-        this.pageData.totalDowntimeTimeProd = data.row.totalDowntimeTimeProd;
-        this.pageData.totalPureProdTime = data.row.totalPureProdTime;
-        this.pageData.totalManufactureTime = data.row.totalManufactureTime;
-        this.pageData.totalManufactureDowntimeTime = data.row.totalManufactureDowntimeTime;
-        this.pageData.totalPureManufactureTime = data.row.totalPureManufactureTime;
-      });
-    },
-
-    //刷新派工单的班次信息
-    refreshScheduleShiftData(){
-      getScheduleShiftData(this.scheduleData).then(({data}) => {
-        this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
-        this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
-      });
-    },
-
-    //刷新当前卷的时间信息
-    refreshCurrentRollMaxAndMinTime(){
-      getSfdcTimeMaxAndMinTime(this.scheduleData).then(({data}) => {
-        this.pageData.eventTime = data.row.eventTime;
-        this.pageData.tillTime = data.row.tillTime;
-      });
-    },
-
-    //刷新当前卷的Sfdc的信息
-    refreshSfdcTimeData(){
-      getSfdcTimeData(this.scheduleData).then(({data}) => {
-        //判断是否操作成功
-        this.pageData.eventTime = data.row.finishTime;
-        this.pageData.sfdcProdTime = data.row.sfdcProdTime;
-        this.pageData.sfdcSetupTime = data.row.sfdcSetupTime;
-        this.pageData.sfdcManufactureTime = data.row.sfdcManufactureTime;
-        this.pageData.sfdcDownTime = data.row.sfdcDownTime;
-        this.pageData.sfdcSetupDownTime = data.row.sfdcSetupDownTime;
-        this.pageData.sfdcProdSetupTime = data.row.sfdcProdSetupTime;
-      });
-    },
-
-    //刷新当前卷的报工数据
-    refreshSfdcData(){
-      getSfdcReportedData(this.scheduleData).then(({data}) => {
-        this.pageData.sfdcApprovedQty = this.pageData.approvedQty - data.row.approveQty;
-        this.pageData.sfdcDefectedQty = this.pageData.defectedQty - data.row.defectQty;
-        this.pageData.sfdcReportedQty = this.pageData.sfdcApprovedQty + this.pageData.sfdcDefectedQty;
-      });
-    },
-
-    //刷新当前卷的时间数据
-    refreshSfdcMaterialTable(){
-      getSfdcMaterialByRollNo(this.scheduleData).then(({data}) => {
-        this.sfdcMaterialList = data.rows;
-      });
     },