diff --git a/src/views/modules/yieldReport/com_finish_schedule.vue b/src/views/modules/yieldReport/com_finish_schedule.vue
new file mode 100644
index 0000000..c14e26f
--- /dev/null
+++ b/src/views/modules/yieldReport/com_finish_schedule.vue
@@ -0,0 +1,1244 @@
+<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: 550px;"
+               label-width="80px">
+        <!--  卷数量统计 班次信息  -->
+        <fieldset class="customer-fieldset" style="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"
+                      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-form-item>
+          </el-col>
+        </fieldset>
+        <fieldset class="customer-fieldset" style="margin-left: 266px; margin-top: -57px; width: 450px;">
+          <legend>排程班次</legend>
+          <el-col :span="8" style="margin-left: 60px; margin-top: -18px;">
+            <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-col>
+          <el-col :span="4" style="margin-left: 20px; margin-top: -8px;">
+            <el-form-item class="customer-item" label="排产日期:">
+              <el-input v-model="pageData.scheduledDate" disabled="disabled" style="width: 80px;" ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" style="margin-left: 20px; margin-top: -8px;">
+            <el-form-item class="customer-item" label="班次:">
+              <el-input v-model="pageData.shiftDesc" disabled="disabled" style="width: 80px;"></el-input>
+            </el-form-item>
+          </el-col>
+        </fieldset>
+          <!-- 操作员信息和班次信息 -->
+        <fieldset class="customer-fieldset"
+                  style="width: 714px;">
+          <legend>生产时间(只有结束的记录才会被统计)</legend>
+          <!-- 调机时间 -->
+          <el-row style="margin-top: -10px;">
+            <el-col :span="24">
+              <el-form-item  label="总调机时间(A1):">
+                <el-input v-model="pageData.totalSetupTime" disabled="disabled" style="width: 200px;" ></el-input>
+              </el-form-item>
+              <el-form-item  label="总调机过程停机时间(A2):">
+                <el-input v-model="pageData.totalDowntimeTimeSetup" disabled="disabled" style="width: 200px;"></el-input>
+              </el-form-item>
+              <el-form-item  label="净调机时间(A3 = A1 - A2):" >
+                <el-input v-model="pageData.totalPureSetupTime" disabled="disabled" style="width: 200px;"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!-- 生产时间 -->
+          <el-row>
+            <el-col :span="24">
+              <el-form-item  label="总生产时间(B1)">
+                <el-input v-model="pageData.totalProdTime" disabled="disabled" style="width: 200px;"></el-input>
+              </el-form-item>
+              <el-form-item  label="总生产过程停机时间(B2):">
+                <el-input v-model="pageData.totalDowntimeTimeProd" disabled="disabled" style="width: 200px;"></el-input>
+              </el-form-item>
+              <el-form-item  label="净生产时间(B3 = B1 - B2):" >
+                <el-input v-model="pageData.totalPureProdTime" disabled="disabled" style="width: 200px;"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!-- 制造时间 -->
+          <el-row>
+            <el-col :span="24">
+              <el-form-item  label="总制造时间(C1 = A1 + B1):">
+                <el-input v-model="pageData.totalManufactureTime" disabled="disabled" style="width: 200px;"></el-input>
+              </el-form-item>
+              <el-form-item  label="总制造过程停机时间(C2 = A2 + B2):">
+                <el-input v-model="pageData.totalManufactureDowntimeTime" disabled="disabled" style="width: 200px;"></el-input>
+              </el-form-item>
+              <el-form-item  label="净制造时间(C3 = A3 + B3):" >
+                <el-input v-model="pageData.totalPureManufactureTime" disabled="disabled" style="width: 200px;"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </fieldset>
+        <!--时间记录的数据-->
+        <fieldset class="customer-fieldset" style="width: 900px;">
+          <legend>时间记录</legend>
+          <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>
+              </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>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table
+            height="100"
+            :data="sfdcTimeList"
+            border
+            v-loading="dataListLoading"
+            style="width: 890px; margin-top: 20px;">
+            <el-table-column
+              v-for="(item,index) in columnTimeArray" :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">
+                <span v-if="!item.columnHidden"> {{ 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>
+        <!--刀模的使用记录-->
+        <fieldset class="customer-fieldset" style="width: 100%;">
+          <legend>刀模使用</legend>
+          <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>
+              </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>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table
+            height="100"
+            :data="sfdcToolList"
+            border
+            v-loading="dataListLoading"
+            style="width: 890px; margin-top: 20px;">
+            <el-table-column
+              v-for="(item,index) in columnToolArray" :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">
+                <span v-if="!item.columnHidden"> {{ 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>
+        <!--材料的使用记录-->
+        <fieldset class="customer-fieldset" style="width: 100%;">
+          <legend>材料使用</legend>
+          <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>
+              </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>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table
+            height="100"
+            :data="sfdcMaterialList"
+            border
+            v-loading="dataListLoading"
+            style="width: 890px; margin-top: 20px;">
+            <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">
+                <span v-if="!item.columnHidden"> {{ 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-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 {
+  name: "com_finish_roll",
+  data() {
+    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: '',
+        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: '',
+      },
+      operatorData: {
+        site: this.$store.state.user.site,
+        username: this.$store.state.user.name,
+        operatorId: '',
+        operatorName: '',
+        status: '',
+        seqNo: '',
+        showFlag: false
+      },
+      sfdcTimeList: [],
+      columnTimeArray: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5307TimeHistSeqNo',
+          tableId: "5307Time",
+          tableName: "时间记录表",
+          columnProp: "histSeqNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "记录号",
+          columnWidth: 55,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5307TimeEventDesc',
+          tableId: "5307Time",
+          tableName: "时间记录表",
+          columnProp: "eventDesc",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "事件",
+          columnWidth: 120,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5307TimeDowntimeCode',
+          tableId: "5307Time",
+          tableName: "时间记录表",
+          columnProp: "downtimeCode",
+          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: 5307,
+          serialNumber: '5307TimeEventTime',
+          tableId: "5307Time",
+          tableName: "时间记录表",
+          columnProp: "eventTime",
+          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: 5307,
+          serialNumber: '5307TimeEnteredby',
+          tableId: "5307Time",
+          tableName: "时间记录表",
+          columnProp: "enteredby",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "录入人",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5307TimeTillTime',
+          tableId: "5307Time",
+          tableName: "时间记录表",
+          columnProp: "tillTime",
+          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: 5307,
+          serialNumber: '5307TimeTillEnteredBy',
+          tableId: "5307Time",
+          tableName: "时间记录表",
+          columnProp: "tillEnteredBy",
+          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: 5307,
+          serialNumber: '5307TimeCompletedFlag',
+          tableId: "5307Time",
+          tableName: "时间记录表",
+          columnProp: "completedFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "结束",
+          columnWidth: 35,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5307TimeTotalTime',
+          tableId: "5307Time",
+          tableName: "时间记录表",
+          columnProp: "totalTime",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "总时长",
+          columnWidth: 55,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5307TimeDowntimePhaseIn',
+          tableId: "5307Time",
+          tableName: "时间记录表",
+          columnProp: "downtimePhaseIn",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "停机所处时段",
+          columnWidth: 90,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        }
+      ],
+      sfdcToolList: [],
+      columnToolArray: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5301ToolHistSeqNo',
+          tableId: "5307Tool",
+          tableName: "工具记录表",
+          columnProp: "histSeqNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "序号",
+          columnWidth: 35,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5301ToolRollNo',
+          tableId: "5307Tool",
+          tableName: "工单表",
+          columnProp: "rollNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "卷号",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5301ToolReportedDate',
+          tableId: "5307Tool",
+          tableName: "工单表",
+          columnProp: "reportedDate",
+          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: 5307,
+          serialNumber: '5301ToolReportedBy',
+          tableId: "5307Tool",
+          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: 5307,
+          serialNumber: '5301ToolToolInstanceId',
+          tableId: "5307Tool",
+          tableName: "工单表",
+          columnProp: "toolInstanceId",
+          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: 5307,
+          serialNumber: '5301ToolStartDate',
+          tableId: "5307Tool",
+          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: 5307,
+          serialNumber: '5301ToolFinishedDate',
+          tableId: "5307Tool",
+          tableName: "工单表",
+          columnProp: "finishedDate",
+          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: 5307,
+          serialNumber: '5301ToolFinishedFlag',
+          tableId: "5307Tool",
+          tableName: "工单表",
+          columnProp: "finishedFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "使用结束",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5301ToolRemark',
+          tableId: "5307Tool",
+          tableName: "工单表",
+          columnProp: "remark",
+          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: 5307,
+          serialNumber: '5301ToolStartFromRollNo',
+          tableId: "5307Tool",
+          tableName: "工单表",
+          columnProp: "startFromRollNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "上机时的半成品卷号",
+          columnWidth: 120,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5301ToolFinishQty',
+          tableId: "5307Tool",
+          tableName: "工单表",
+          columnProp: "finishQty",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "生产数量",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        }
+      ],
+      sfdcMaterialList: [],
+      columnMaterialArray: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5307,
+          serialNumber: '5307MaterialReportDate',
+          tableId: "5307Material",
+          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: 5307,
+          serialNumber: '5307MaterialReportedBy',
+          tableId: "5307Material",
+          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: 5307,
+          serialNumber: '5307MaterialRmRollNo',
+          tableId: "5307Material",
+          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: 5307,
+          serialNumber: '5307MaterialPartNo',
+          tableId: "5307Material",
+          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: 5307,
+          serialNumber: '5307MaterialStartDate',
+          tableId: "5307Material",
+          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: 5307,
+          serialNumber: '5307MaterialTransQty',
+          tableId: "5307Material",
+          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: 5307,
+          serialNumber: '5307MaterialNetIssueQty',
+          tableId: "5307Material",
+          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: 5307,
+          serialNumber: '5307MaterialKeyRMFlag',
+          tableId: "5307Material",
+          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: 5307,
+          serialNumber: '5307MaterialSAPBOMItemNo',
+          tableId: "5307Material",
+          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.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('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}) => {
+          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;
+      });
+    },
+
+
+
+    /*检查数据是否有效*/
+    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();
+    },
+
+    /*结束当前的操作*/
+    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}) => {
+        this.$message.error('qty_reported找不到!');
+        //判断操作是否成功
+        if(data.code == 500){
+          this.$message.error(data.msg);
+        }else{
+          //刷新报工的页面
+          this.$emit('refreshPageData');
+          //关闭当前的页面
+          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;
+}
+
+</style>
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 31a7815..16190d1 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -2809,7 +2809,6 @@ export default {
         }
         //设置查询的数据
         this.searchData = JSON.parse(JSON.stringify(this.scheduleData));
-        console.log(123)
       });
     },
 
@@ -2877,7 +2876,6 @@ export default {
 
     //刷新页签的table数据
     async refreshCurrentTabTable() {
-      console.log(456)
       //设置查询的数据
       this.searchData = JSON.parse(JSON.stringify(this.scheduleData));
       //判断是否按照当前卷来查询
@@ -2918,7 +2916,6 @@ export default {
     //刷新页面的数据
     async refreshPageData() {
       await getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
-        console.log(12)
         this.scheduleData.seqNo = data.row.seqNo;
         this.scheduleData.orderNo = data.row.orderNo;
         this.scheduleData.itemNo = data.row.itemNo;
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 5c1c43d..f4f1af0 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -8,7 +8,7 @@
           <el-button type="primary" style="margin-left: 10px;  margin-bottom: 5px;">列表</el-button>
         </el-form-item>
         <el-form-item :label="''">
-          <el-button type="primary" style="margin-left: 10px;  margin-bottom: 5px;">关闭</el-button>
+          <el-button type="primary" @click="showFinishScheduleModal" style="margin-left: 10px;  margin-bottom: 5px;">结单</el-button>
         </el-form-item>
         <el-form-item :label="''">
           <el-button type="primary" @click="refreshPageTables()"
@@ -119,6 +119,12 @@
 
     </comProduceReportNormal>
 
+    <!-- 正常报工的组件 -->
+    <comFinishSchedule :close-on-click-modal="false"
+                            :visible.sync="showFinishScheduleFlag" ref="comFinishSchedule">
+
+    </comFinishSchedule>
+
   </div>
 </template>
 
@@ -127,10 +133,11 @@
 import {
   getProduceScheduleList,
 } from '@/api/yieldReport/produce_order.js';
+
 /*引入组件*/
 import comSwitchOperator from "./com_switch_operator";/*切换操作员*/
 import comProduceReportNormal from "./com_produce_report_normal";/* 报工的组件*/
-import comFinishRoll from "./com_finish_roll";/*结束卷的组件*/
+import comFinishSchedule from "./com_finish_schedule";/*结束派工的组件*/
 
 export default {
   data() {
@@ -138,7 +145,7 @@ export default {
       height: 800,
       showOperatorFlag: false,
       showReportFlag: false,
-      showFinishFlag:false,
+      showFinishScheduleFlag:false,
       searchData: {
         site: this.$store.state.user.site,
         resourceId: '',
@@ -946,7 +953,7 @@ export default {
   components: {
     comSwitchOperator,/*切换用户的组件*/
     comProduceReportNormal,/*报工页面的组件*/
-    comFinishRoll,/*结束卷的组件*/
+    comFinishSchedule,/*结束派工单的组件*/
   },
   mounted() {
     this.$nextTick(() => {
@@ -1017,6 +1024,20 @@ export default {
       });
     },
 
+    //打开结束派工单的modal
+    showFinishScheduleModal() {
+      //首先判断是否选择好派工单
+      if (JSON.stringify(this.currentRow) == '{}') {
+        this.$message.error('请先选择派工单!');
+        return false;
+      }
+      //打开操作员切换功能
+      this.showFinishScheduleFlag = true;
+      this.$nextTick(() => {
+        this.$refs.comFinishSchedule.init(this.currentRow, this.operatorData);
+      });
+    },
+
     //保存操作员的信息
     saveOperatorData() {
       //查询操作员信息