diff --git a/src/views/modules/rawMaterials/expirationTimeModification.vue b/src/views/modules/rawMaterials/expirationTimeModification.vue
index c56cedb..e43db19 100644
--- a/src/views/modules/rawMaterials/expirationTimeModification.vue
+++ b/src/views/modules/rawMaterials/expirationTimeModification.vue
@@ -110,7 +110,7 @@ export default {
       functionId: this.$route.meta.menuId,
       tableId: "105001002ETM",
       languageCode: this.$i18n.locale,
-      showDefault: true,
+      showDefault: false,
       query:{
 
       },
diff --git a/src/views/modules/yieldReport/com_finish_part_roll.vue b/src/views/modules/yieldReport/com_finish_part_roll.vue
index be89b60..2cee370 100644
--- a/src/views/modules/yieldReport/com_finish_part_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_part_roll.vue
@@ -25,7 +25,7 @@
             </el-form-item>
             <el-form-item class="customer-button">
               <el-button type="primary" @click="finishRollBun"  style="margin-left: 10px; margin-bottom: 5px;">
-              结束卷</el-button>
+              保存</el-button>
             </el-form-item>
             <el-form-item class="customer-button">
               <el-button type="primary" @click="closeDialog" style="margin-left: 10px; margin-bottom: 5px;">
@@ -243,7 +243,7 @@ export default {
   name: "com_finish_roll",
   data() {
     return {
-      titleCon: '结束卷',
+      titleCon: '产量报告',
       showExceptionFlag: false,
       sfdcTimeList: [],
       scheduleData: {
@@ -518,7 +518,7 @@ export default {
       //初始化操作员对象
       this.operatorData = JSON.parse(JSON.stringify(operatorData));
       //初始化标题
-      this.titleCon = '结束卷操作 \
+      this.titleCon = '产量报告 \
        派工单号:'+scheduleData.seqNo;
       //处理异常的原因
       this.pageData.exceptionFlag = 'N';
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index e67a9e6..d5b5068 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -432,6 +432,26 @@
                 产量报告
               </el-button>
             </el-form-item>
+            <el-form-item style="margin-top: 20px ; margin-left: 10px">
+              <el-popover
+                placement="right"
+                width="80"
+                trigger="click">
+                <el-button  type="primary"  @click="bulkInspection"
+                            style=" width: 80px; margin-bottom: 5px;    margin-left: 10px; ">
+                  其它操作
+                </el-button>
+                <el-button  type="primary"  @click="bulkInspection"
+                            style=" width: 80px; margin-bottom: 5px; ">
+                  其它操作
+                </el-button>
+                <el-button  type="primary"  @click="bulkInspection"
+                            style=" width: 80px; margin-bottom: 5px; ">
+                  其它操作
+                </el-button>
+                <el-button  type="primary" style=" width: 80px; margin-bottom: 5px; "  slot="reference">其它操作</el-button>
+              </el-popover>
+            </el-form-item>
           </el-form>
         </fieldset>
       </el-form>
@@ -535,6 +555,8 @@
 
     </comFinishSchedule>
 
+    <notOverFinishRoll ref="notOverFinishRoll"  :visible.sync="showNotOverFlag"  @refreshPageData="refreshPageData"> </notOverFinishRoll>
+
   </div>
 
 </template>
@@ -577,12 +599,14 @@ import comReplaceMaterial from "./com_replace_material"/*换料组件*/
 import comCuttingMaterial from "./com_cutting_material"/*材料下料*/
 import comProduceDown from "./com_produce_down";/*停机组件*/
 import comFinishSchedule from "./com_finish_schedule";/*结束派工单组件*/
+import notOverFinishRoll from "./not_over_finish_roll";/*结束派工单组件*/
 /*生产过程的停机组件*/
 export default {
   name: "com_produce_report_normal",
   data() {
     return {
       titleCon: '',
+      showNotOverFlag:false,
       showOperatorFlag: false,
       showSwitchFlag: false,
       showSeparateFlag: false,
@@ -2844,8 +2868,16 @@ export default {
     comCuttingMaterial,/*材料下料的功能*/
     comProduceDown,/*生产过程的停机组件*/
     comFinishSchedule,/*结束派工单的组件*/
+    notOverFinishRoll,/*异常下级报工*/
   },
   methods: {
+    // 异常下机报工
+    notOverFinishRollModal(){
+      this.$nextTick(() => {
+        this.showNotOverFlag = true;
+        this.$refs.notOverFinishRoll.init(this.scheduleData, this.operatorData)
+      });
+    },
     // 获取派工单的信息
     getScheduleDataBySeqNo() {
       getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
@@ -2882,55 +2914,47 @@ export default {
         this.searchData = JSON.parse(JSON.stringify(this.scheduleData));
       });
     },
-
     //列表表格选择替换
     tabClick(tab, event) {
       //刷新列表数据
       this.refreshCurrentTabTable();
     },
-
     //刷新派工单的时间的记录
     async getSfdcTimeList() {
      await getSfdcTimeByCon(this.searchData).then(({data}) => {
         this.sfdcTimeList = data.rows;
       });
     },
-
     //刷新工单的工具信息
     getOrderToolList() {
       getOrderToolByCon(this.searchData).then(({data}) => {
         this.orderToolList = data.rows;
       });
     },
-
     //刷新派工单的刀模板的记录
     getSfdcToolList() {
       getSfdcToolByCon(this.searchData).then(({data}) => {
         this.sfdcToolList = data.rows;
       });
     },
-
     //刷新工单的bom信息
     getOrderBomList() {
       getOrderBomByCon(this.searchData).then(({data}) => {
         this.orderBomList = data.rows;
       });
     },
-
     //刷新派工单的材料表的记录
     getSfdcMaterialList() {
       getSfdcMaterialByCon(this.searchData).then(({data}) => {
         this.sfdcMaterialList = data.rows;
       });
     },
-
     //刷新派工单的下机卷的记录
     getSfdcRollOpsList() {
       getSfdcRollOpsByCon(this.searchData).then(({data}) => {
         this.sfdcRollOpsList = data.rows;
       });
     },
-
     //刷新派工单的不良标的记录
     getSfdcDefectList() {
       getSfdcDefectByCon(this.searchData).then(({data}) => {
diff --git a/src/views/modules/yieldReport/not_over_finish_roll.vue b/src/views/modules/yieldReport/not_over_finish_roll.vue
new file mode 100644
index 0000000..3ffc4dd
--- /dev/null
+++ b/src/views/modules/yieldReport/not_over_finish_roll.vue
@@ -0,0 +1,899 @@
+<template>
+  <div class="customer-css">
+    <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
+               width="920px" style="height: 680px;" class="customer-dialog">
+      <el-form :inline="true" label-position="top" style="height: 495px;"
+               label-width="80px">
+        <!-- 菜单信息 -->
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="'当前时间'">
+              <el-date-picker disabled="disabled" style="width: 145px;"
+                              v-model="pageData.reportedTime"
+                              format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              placeholder="">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item class="customer-button">
+              <el-button class="customer-bun-min" type="primary" :disabled="buttonTags.createRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
+                列表</el-button>
+            </el-form-item>
+            <el-form-item class="customer-button">
+              <el-button class="customer-bun-min" type="primary" @click="refreshPageData" style="margin-left: 10px; margin-bottom: 5px;">
+              刷新</el-button>
+            </el-form-item>
+            <el-form-item class="customer-button">
+              <el-button  class="customer-bun-min" type="primary" @click="finishRollBun"  style="margin-left: 10px; margin-bottom: 5px;">
+              结束卷</el-button>
+            </el-form-item>
+            <el-form-item class="customer-button">
+              <el-button  class="customer-bun-min" type="primary" @click="closeDialog" style="margin-left: 10px; margin-bottom: 5px;">
+              关闭</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!--  卷数量统计 班次信息  -->
+        <el-form>
+          <fieldset class="customer-fieldset" style="width: 505px;">
+            <legend>卷数量统计</legend>
+            <el-form-item class="customer-item">
+              <el-checkbox disabled="disabled" style="margin-top: 15px;" true-label="Y" false-label="N"
+                           v-model="pageData.reportedFlag">是否报告产量</el-checkbox>
+            </el-form-item>
+            <el-form-item class="customer-item" label="总良品数量:" style="margin-top: -10px;">
+              <!--<el-input v-model="pageData.approvedQty" type="number"  @blur="checkValidApprovedQty"-->
+              <el-input v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
+            </el-form-item>
+            <el-form-item class="customer-item" label="总不良品数量:" style="margin-top: -10px;">
+              <el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+            </el-form-item>
+            <el-form-item class="customer-item" label="总数量" style="margin-top: -10px;">
+              <el-input v-model="pageData.totalQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+            </el-form-item>
+            <el-form-item class="customer-item" label="其他卷数量:" style="margin-top: -10px;">
+              <el-input v-model="pageData.otherRollQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+            </el-form-item>
+          </fieldset>
+          <!-- 操作员信息和班次信息 -->
+          <fieldset class="customer-fieldset"
+                    style="margin-left: 510px; margin-top: -70px; ;width: 390px;">
+            <legend>人员排程班次信息</legend>
+            <el-form-item class="customer-item" label="操作员:">
+              <el-input v-model="operatorData.operatorId" disabled="disabled" style="width: 80px;" ></el-input>
+            </el-form-item>
+            <el-form-item class="customer-item" label="操作员姓名:">
+              <el-input v-model="operatorData.operatorName" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+            </el-form-item>
+            <el-form-item class="customer-item" label="排产日期:">
+              <el-input v-model="pageData.scheduledDate" disabled="disabled" style="width: 80px;" ></el-input>
+            </el-form-item>
+            <el-form-item class="customer-item" label="班次:">
+              <el-input v-model="pageData.shiftDesc" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+            </el-form-item>
+          </fieldset>
+        </el-form>
+        <!-- 卷生产时间统计产量报告 -->
+        <el-form style="margin-top: 5px;">
+            <fieldset class="customer-fieldset" style="width: 320px;">
+              <legend>卷生产时间统计</legend>
+              <!-- 调机时间 -->
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item  label="总调机时间:">
+                    <el-input v-model="pageData.totalSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;" ></el-input>
+                  </el-form-item>
+                  <el-form-item  label="总调机过程停机时间:">
+                    <el-input v-model="pageData.totalDowntimeTimeSetup" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="净调机时间:" >
+                    <el-input v-model="pageData.totalPureSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <!-- 生产时间 -->
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item  label="总生产时间">
+                    <el-input v-model="pageData.totalProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="总生产过程停机时间:">
+                    <el-input v-model="pageData.totalDowntimeTimeProd" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="净生产时间:" >
+                    <el-input v-model="pageData.totalPureProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <!-- 制造时间 -->
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item  label="总制造时间:">
+                    <el-input v-model="pageData.totalManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="总制造过程停机时间:">
+                    <el-input v-model="pageData.totalManufactureDowntimeTime" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="净制造时间:" >
+                    <el-input v-model="pageData.totalPureManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </fieldset>
+            <!-- 产量报告 -->
+            <fieldset class="customer-fieldset"
+                      style="margin-left: 325px; margin-top: -165px; width: 575px;">
+
+              <legend>产量报告</legend>
+              <!-- 开工时间 -->
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item  label="开工时间">
+                    <el-input v-model="pageData.eventTime" disabled="disabled" style="width: 130px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="完工时间">
+                    <el-input v-model="pageData.tillTime" disabled="disabled" style="width: 130px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="生产时间" >
+                    <el-input v-model="pageData.sfdcProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="调机时间" >
+                    <el-input v-model="pageData.sfdcSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="制造时间" >
+                    <el-input v-model="pageData.sfdcManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <!-- 合格数量 -->
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item  label="合格数量">
+                    <el-input v-model="pageData.sfdcApprovedQty" class="customer-input-color-red" readonly="readonly" style="width: 130px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="不合格数量">
+                    <el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly" style="width: 130px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="报告数量" >
+                    <el-input v-model="pageData.sfdcReportedQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="调机停机">
+                    <el-input v-model="pageData.sfdcSetupDownTime" style="width: 80px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="生产调机" >
+                    <el-input v-model="pageData.sfdcProdSetupTime" style="width: 80px;"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <!-- 备注 -->
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item  label="备注">
+                    <el-input v-model="pageData.remark"  style="width: 430px;"></el-input>
+                  </el-form-item>
+                  <el-form-item  label="停机时间">
+                    <el-input v-model="pageData.sfdcDownTime" style="width: 80px;"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </fieldset>
+        </el-form>
+        <!-- 主材料 -->
+        <el-form>
+          <fieldset class="customer-fieldset" style="width: 830px;">
+            <legend>主材料</legend>
+            <el-table
+              height="180"
+              :data="sfdcMaterialList"
+              :cell-style="customerCellStyle" :cell-class-name="customerCellClassName"
+              border
+              v-loading="dataListLoading"
+              style="width: 100%; margin-top: -5px;">
+              <el-table-column
+                v-for="(item,index) in columnMaterialArray" :key="index"
+                :sortable="item.columnSortable"
+                :prop="item.columnProp"
+                :header-align="item.headerAlign"
+                :show-overflow-tooltip="item.showOverflowTooltip"
+                :align="item.align"
+                :fixed="item.fixed"
+                :width="item.columnWidth"
+                :label="item.columnLabel">
+                <template slot-scope="scope">
+                  <!--<el-input type="number" class="table-input" align="right" @blur="checkValidQty(scope.row)"-->
+                  <el-input type="number" class="table-input" align="right" v-if="item.columnHidden"
+                            v-model="scope.row[item.columnProp]"></el-input>
+                  <span v-else>{{scope.row[item.columnProp]}}</span>
+                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                     style="width: 100px; height: 80px"/></span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </fieldset>
+        </el-form>
+      </el-form>
+
+
+    </el-dialog>
+
+    <!-- 异常原因录入的组件 -->
+    <comExceptionReason ref="comExceptionReason" :close-on-click-modal="false"
+                    :visible.sync="showExceptionFlag"
+                    @initExceptionReason = "initExceptionReason">
+
+    </comExceptionReason>
+  </div>
+
+</template>
+
+<script>
+  /*添加组件*/
+  import comExceptionReason from "./com_exception_reason";//异常远远
+import {
+  getCurrentRollReportedQty,
+  countSfdcTimeQty,
+  getScheduleShiftData,
+  getSfdcTimeMaxAndMinTime,
+  getSfdcTimeData,
+  getSfdcReportedData,
+  getSfdcMaterialByRollNo,
+  checkFinishRollWithNoFqc,
+  finishRollWithNoFqc
+} from '@/api/yieldReport/com_finish_roll.js';
+export default {
+  data() {
+    return {
+      titleCon: '结束卷',
+      showExceptionFlag: false,
+      sfdcTimeList: [],
+      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: '',
+        reportedTime: this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+        reportedFlag: 'N',
+        approvedQty: 0,
+        defectedQty: 0,
+        totalQty: 0,
+        editNewRollQty: 0,
+        otherRollQty: '',
+        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,
+        remark: '',
+        exceptionFlag: 'N',
+        exceptionReason: '',
+        operatorId: '',
+        operatorName: '',
+      },
+      operatorData: {
+        site: this.$store.state.user.site,
+        username: this.$store.state.user.name,
+        operatorId: '',
+        operatorName: '',
+        status: '',
+        seqNo: '',
+        showFlag: false
+      },
+      sfdcMaterialList: [],
+      columnMaterialArray: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303MaterialReportDate',
+          tableId: "5303Material",
+          tableName: "派工单材料",
+          columnProp: "reportDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "报告时间",
+          columnWidth: 125,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303MaterialReportedBy',
+          tableId: "5303Material",
+          tableName: "派工单材料",
+          columnProp: "reportedBy",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "报告人",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303MaterialRmRollNo',
+          tableId: "5303Material",
+          tableName: "派工单材料",
+          columnProp: "rmRollNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "材料卷号",
+          columnWidth: 100,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303MaterialPartNo',
+          tableId: "5303Material",
+          tableName: "派工单材料",
+          columnProp: "partNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "零部件编码",
+          columnWidth: 100,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303MaterialStartDate',
+          tableId: "5303Material",
+          tableName: "派工单材料",
+          columnProp: "startDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "开始使用时间",
+          columnWidth: 125,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303MaterialTransQty',
+          tableId: "5303Material",
+          tableName: "派工单材料",
+          columnProp: "transQty",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "数量",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303MaterialNetIssueQty',
+          tableId: "5303Material",
+          tableName: "派工单材料",
+          columnProp: "netIssueQty",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "本卷耗用数量",
+          columnWidth: 100,
+          columnHidden: true,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303MaterialKeyRMFlag',
+          tableId: "5303Material",
+          tableName: "派工单材料",
+          columnProp: "keyRMFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "是否主材",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303MaterialSAPBOMItemNo',
+          tableId: "5303Material",
+          tableName: "派工单材料",
+          columnProp: "sAPBOMItemNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "SAP BOM序号",
+          columnWidth: 100,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          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,
+    }
+  },
+  components: {
+    comExceptionReason,/*异常原因的组件*/
+  },
+  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.operatorName = operatorData.operatorName;
+      //重置时间
+      this.pageData.reportedTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
+      //初始化操作员对象
+      this.operatorData = JSON.parse(JSON.stringify(operatorData));
+      //初始化标题
+      this.titleCon = '结束卷操作 \
+       派工单号:'+scheduleData.seqNo;
+      //处理异常的原因
+      this.pageData.exceptionFlag = 'N';
+      this.pageData.exceptionReason =  '';
+      //刷新当前派工单的信息
+      this.refreshPageData();
+    },
+    /*关闭modal*/
+    closeDialog(){
+      //刷新报工的页面
+      this.$emit('refreshPageData');
+      //关闭当前的页面
+      this.$emit('update:visible', false);
+    },
+
+    /*生产过程的停机组件*/
+    exceptionReasonModal() {
+      //1.首先调用菜单判断方式  打开生产过程的停机的页面
+      //checkProduceButton('produceDownFlag');
+      //打开生产过程的工具的页面
+      this.$nextTick(() => {
+        this.show = true;
+        this.$refs.comProduceDown.init(this.scheduleData, this.operatorData)
+      });
+    },
+
+    /*刷新当前的页面参数*/
+    async 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}) => {
+           //区分是否存在班次
+          if(data.code == 500){
+            this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+            this.pageData.scheduledDate = '';//重置排产日期
+            this.pageData.shiftNo = '';
+          }else{
+            this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+            this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
+            this.pageData.shiftNo = data.row.shiftNo;
+          }
+        });
+        //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}) => {
+        //区分是否存在班次
+        if(data.code == 500){
+          this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+          this.pageData.scheduledDate = '';//重置排产日期
+          this.pageData.shiftNo = '';
+        }else{
+          this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+          this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
+          this.pageData.shiftNo = data.row.shiftNo;
+        }
+      });
+    },
+
+    //刷新当前卷的时间信息
+    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;
+      });
+    },
+
+
+
+    /*检查数据是否有效*/
+    checkValidQty(row){
+      //判断当前是否为空
+      if(row.netIssueQty == ''){
+        this.$message.error('材料上本卷耗用数量不能为空!');
+        row.netIssueQty = 0;//重新赋值
+        return false;
+      }
+      //判断当前是否有效
+      if(row.netIssueQty <= 0){
+        this.$message.error('材料耗用数量必须大于0!');
+        return false;
+      }
+      //判断是否超限
+      if(row.netIssueQty > row.transQty){
+        this.$message.error('材料耗用数量大于发料数量!');
+        row.netIssueQty = 0;//重新赋值
+        return false;
+      }
+
+    },
+
+    /*添加定制的css类*/
+    customerCellClassName({row, column, rowIndex, columnIndex}) {
+      if(column.property == 'netIssueQty'){
+        return 'customer-number-cell';
+      }
+    },
+
+    /*添加定制的cess样式*/
+    customerCellStyle({row, column, rowIndex, columnIndex}) {
+      if(column.property == 'netIssueQty'){
+        return 'padding: 0px 0px;';
+      }
+    },
+
+    /*检验良品的总数量*/
+    checkValidApprovedQty(){
+      //调用刷新的方法
+      this.refreshSfdcData();
+      this.pageData.totalQty = parseFloat(this.pageData.approvedQty) + parseFloat(this.pageData.defectedQty);
+    },
+
+    /*结束当前的操作*/
+    finishRollBun(){
+      //首先判断数值是否通过判断
+      let approvedQty = this.pageData.approvedQty;
+      if(approvedQty == null || approvedQty == ''){
+        this.$message.error('请输入良品总数量!');
+        this.pageData.approvedQty = 0;//重新赋值
+        return false;
+      }
+      if(approvedQty <= 0){
+        this.$message.error('良品总数量必须大于0!');
+        this.pageData.approvedQty = 0;//重新赋值
+        return false;
+      }
+      //班次判断
+      if(this.pageData.shiftDesc == '无班次'){
+        this.$message.error('该时间段内没有匹配的班次信息,请联系相关人员！!');
+        return false;
+      }
+
+      //验证通过提交到后台
+      let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)};
+
+      //先调用检查方法
+      checkFinishRollWithNoFqc(postData).then(({data}) => {
+        //判断是否成功
+        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.showExceptionReasonModal();
+          });
+        }else{
+          //执行结束卷操作
+          this.finishRollOperation();
+        }
+      });
+
+    },
+
+    /*结束卷的具体操作*/
+    finishRollOperation(){
+      //验证通过提交到后台
+      let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)};
+      //处理信息
+      finishRollWithNoFqc(postData).then(({data}) => {
+        //判断操作是否成功
+        if(data.code == 500){
+          this.$message.error(data.msg);
+        }else{
+          //关闭当前的页面
+          this.closeDialog();
+        }
+      })
+    },
+
+    /*打开异常原因录入页面*/
+    showExceptionReasonModal(){
+      //1.首先调用菜单判断方式  打开生产过程的材料的页面
+      //checkProduceButton('produceMaterialFlag');
+      //打开生产过程的工具的页面
+      this.$nextTick(() => {
+        this.showExceptionFlag = true;
+        this.$refs.comExceptionReason.init();
+      });
+    },
+
+    /*处理异常的原因*/
+    initExceptionReason(exceptionReason){
+      //处理异常的原因
+      this.pageData.exceptionFlag = 'Y';
+      this.pageData.exceptionReason =  exceptionReason;
+      //然后提交结束卷的数据
+      this.finishRollOperation();
+    }
+  },
+  created() {
+    // this.factoryList()
+    // this.getLanguageList()
+  }
+}
+
+</script>
+
+<style scoped lang="scss">
+/*调节页面button和input的上下间距*/
+.customer-css .customer-button{
+  margin-top: 25px;
+}
+
+/*调节样式*/
+.customer-item{
+  margin-top: -10px;
+}
+/*fieldset下table的样式*/
+.customer-fieldset /deep/ .el-table__header th.is-leaf{
+  line-height: 16px;
+}
+
+/deep/ .customer-tab .el-tabs__content{
+  padding: 0px !important;
+}
+
+/*table中input*/
+div.table-input /deep/ input.el-input__inner{
+  text-align: right;
+}
+
+/*当前按钮的通用样式*/
+.customer-css .customer-bun-mid{
+  width: 65px;
+  text-align: center;
+}
+
+.customer-css .customer-bun-min{
+  width: 50px;
+  text-align: center;
+}
+
+.customer-css .customer-bun-max{
+  width: 80px;
+  text-align: center;
+}
+/*当前按钮的通用样式*/
+.customer-css .el-button--medium {
+  padding: 5px 5px;
+}
+
+/*统一的input内容颜色样式*/
+.customer-input-color-red /deep/ .el-input__inner {
+  color: red;
+}
+
+</style>
diff --git a/src/views/modules/yieldReport/otherReport/bulk_inspection.vue b/src/views/modules/yieldReport/otherReport/bulk_inspection.vue
index 3d94233..9c4ef04 100644
--- a/src/views/modules/yieldReport/otherReport/bulk_inspection.vue
+++ b/src/views/modules/yieldReport/otherReport/bulk_inspection.vue
@@ -1,6 +1,8 @@
 <template>
   <el-dialog
-    width="800px"
+    v-drag
+    @close="closeDialog"
+    width="600px"
     title="批量直接送检"
     :close-on-click-modal="false"
     :visible.sync="visible">
@@ -17,7 +19,7 @@
         </el-form>
       </el-col>
       <el-col :span="24">
-        <fieldset class="customer-fieldset" style="width: 400px; height: 60px">
+        <fieldset class="customer-fieldset" style="width: 350px; height: 60px">
           <legend class="customer-legend">排程班次信息</legend>
           <el-form style="margin-top: -10px" :inline="true" label-position="top">
             <el-form-item label="排产日期:">
@@ -39,7 +41,7 @@
 
       <el-col :span="24">
         <el-table
-          height="450"
+          height="300"
           :data="dataList"
           border
           v-loading="dataListLoading"
@@ -48,6 +50,7 @@
             v-for="(item,index) in languageColumnList" :key="index"
             :sortable="item.columnSortable"
             :prop="item.columnProp"
+            :align="item.align"
             :width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
@@ -136,7 +139,6 @@ export default {
     init(val,val2) {
       this.visible = true
       this.repairOrderFlag = val2
-      console.log(this.repairOrderFlag)
       this.sfdcRolls.site = val.site
       this.sfdcRolls.orderNo = val.orderNo
       this.sfdcRolls.itemNo = val.itemNo
@@ -191,10 +193,20 @@ export default {
         type: 'warning'
       }).then(() => {
         workbenchPostinspection(paramData).then(({data}) =>{
-
+            if (data.code == 0){
+              this.$message.success(data.msg)
+            }
+            if (data.code == 400){
+              this.$message.warning(data.msg)
+            }
+          if (data.code == 500){
+            this.$message.error(data.msg)
+          }
         })
       })
-
+    },
+    closeDialog(){
+      Object.assign(this.$data.sfdcRolls, this.$options.data.call(this).sfdcRolls);
     }
   },
   created() {
diff --git a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
index edae0e3..af85922 100644
--- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="produce-report customer-css">
     <el-dialog v-drag
+               @close="closeDialog"
                width="900px" class="customer-dialog"
                :title="titleCon" v-bind="$attrs" v-on="$listeners">
       <el-form :inline="true" label-position="top" style="height: 507px;"
@@ -297,6 +298,26 @@
                 批量直接送检
               </el-button>
             </el-form-item>
+            <el-form-item style="margin-top: 20px ; margin-left: 10px">
+              <el-popover
+                placement="right"
+              width="80"
+                trigger="click">
+                <el-button  type="primary"  @click="bulkInspection"
+                           style=" width: 80px; margin-bottom: 5px;    margin-left: 10px; ">
+                  其它操作
+                </el-button>
+                <el-button  type="primary"  @click="bulkInspection"
+                           style=" width: 80px; margin-bottom: 5px; ">
+                  其它操作
+                </el-button>
+                <el-button  type="primary"  @click="bulkInspection"
+                           style=" width: 80px; margin-bottom: 5px; ">
+                  其它操作
+                </el-button>
+                <el-button  type="primary" style=" width: 80px; margin-bottom: 5px; "  slot="reference">其它操作</el-button>
+              </el-popover>
+            </el-form-item>
           </el-form>
         </fieldset>
       </el-form>
@@ -466,7 +487,6 @@ import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
 
 /*生产过程的停机组件*/
 export default {
-  name: "com_produce_report_normal",
   data() {
     return {
       titleCon: '',
@@ -2795,6 +2815,7 @@ export default {
     },
     // 批量直接送检
     bulkInspection(){
+      this.scheduleData.operatorId = this.operatorData.operatorId
       this.$nextTick(() => {
         this.$refs.bulkInspection.init(this.scheduleData,'N')
       });
@@ -3526,8 +3547,11 @@ export default {
         }
       });
     },
-
+    closeDialog(){
+      Object.assign(this.$data, this.$options.data.call(this));
+    }
   },
+
   created() {
     // this.factoryList()
     // this.getLanguageList()
diff --git a/src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue b/src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue
index 32da032..d14d75d 100644
--- a/src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue
+++ b/src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue
@@ -2704,6 +2704,7 @@ export default {
 
     // 批量直接送检
     bulkInspection(){
+      this.scheduleData.operatorId = this.operatorData.operatorId
       this.$nextTick(() => {
         this.$refs.bulkInspection.init(this.scheduleData,'N')
       });