diff --git a/src/views/modules/print/print_transNo_label.js b/src/views/modules/print/print_transNo_label.js
index 8413c35..866357b 100644
--- a/src/views/modules/print/print_transNo_label.js
+++ b/src/views/modules/print/print_transNo_label.js
@@ -163,7 +163,72 @@ export function printTransNoLabel(printList) {
           LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
           LODOP.SET_PRINT_STYLEA(0,"Bold",1);
         }
-      else {
+      else if(printData.type=='reportData'){
+        LODOP.NewPage();
+        LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
+        // LODOP.ADD_PRINT_TEXT(95,208,173,46,'合格');
+        // LODOP.SET_PRINT_STYLEA(0,"FontSize",30);
+        // LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+        // LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(88,8,108,25,"Part:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(88,50,200,50,printData.partNo+'|'+printData.partDesc);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(153,8,128,24,"Operator:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(153,110,140,20,printData.operatorName);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(132,8,113,25,"Shift:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(132,110,139,25,printData.sShiftNo);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(41,8,98,25,"Job No:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(41,110,136,25,printData.seqNo);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(173,8,94,25,"Order No:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(173,110,141,25,printData.orderNo);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(64,8,96,25,"合格数量:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(64,70,188,24,printData.strQty+printData.umid+' | '+printData.weight+'公斤');
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(194,8,128,25,"MFG Date:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(194,110,170,25,printData.sScheduledDate);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(224,5,256,24,"Manufactured by A&M Polymer");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.ADD_PRINT_TEXT(224,212,156,25,"IATF:16949 Certified");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+        LODOP.ADD_PRINT_LINE(218,2,217,374,0,1);
+        LODOP.ADD_PRINT_TEXT(12,122,135,30,"派工单报工标签");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+        LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(175,265,110,20,"工序:"+printData.itemDesc);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      }else {
         LODOP.NewPage();
         LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
         LODOP.ADD_PRINT_TEXT(95,208,173,46,'合格');
@@ -236,56 +301,3 @@ export function printTransNoLabel(printList) {
     console.log("操作成功！")
   }
 }
-// LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
-// LODOP.ADD_PRINT_BARCODE(11,244,208,140,"QRCode",printData.transNo);
-// LODOP.ADD_PRINT_TEXT(58,8,108,25,"PartNo:");
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(58,110,140,25,printData.partNo);
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(111,8,77,24,"SeqNo:");
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(111,110,140,20,printData.seqNo);
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(84,8,113,25,"WorkCenterNo:");
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(84,110,139,25,printData.workCenterNo);
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(9,8,98,25,"TransNo:");
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(9,110,136,25,printData.transNo);
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(136,8,94,25,"OrderNo:");
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(136,110,141,25,printData.orderNo);
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(34,8,96,25,"TransQty:");
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(34,110,138,24,printData.transQty);
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(162,8,97,25,"TransDate:");
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(162,110,170,25,printData.transDate);
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-// LODOP.ADD_PRINT_TEXT(192,5,256,24,"Manufactured by A&M Polymer");
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.ADD_PRINT_TEXT(192,259,109,25,"vender Code:");
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.ADD_PRINT_TEXT(210,5,257,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China");
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.ADD_PRINT_TEXT(246,5,407,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com");
-// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-// LODOP.ADD_PRINT_LINE(186,2,187,374,0,1);
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 68a32a8..f82b302 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -911,6 +911,9 @@
               if(data.badData!=null){
                 inList.push(data.badData)
               }
+              if(data.reportData!=null){
+                inList.push(data.reportData)
+              }
               if(this.saveHeaderData.printQty>0){
                 for (let i = 0; i <this.saveHeaderData.printQty ; i++) {
                   inList.push(this.currentRow)
diff --git a/src/views/modules/production/generateReport_old.vue b/src/views/modules/production/generateReport_old.vue
deleted file mode 100644
index 79ee0bc..0000000
--- a/src/views/modules/production/generateReport_old.vue
+++ /dev/null
@@ -1,515 +0,0 @@
-<template>
-  <div class="mod-config">
-    <el-form :inline="true"  label-position="top" label-width="100px" >
-      <el-form-item :label="'生产订单号'">
-        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item >
-        <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
-        <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item >
-        <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
-        <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="' '">
-        <el-button @click="search()" style="margin-left: 0px;margin-top:0px" type="primary">查询</el-button>
-        <download-excel
-          :fields="exportDataStandard"
-          :data="tableData"
-          type="xlsx"
-          :name="exportName"
-          :header="exportHeader"
-          :footer="exportFooter"
-          :defaultValue="exportDefaultValue"
-          :fetch="createExportData"
-          :before-generate="startDownload"
-          :before-finish="finishDownload"
-          worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          {{'导出'}}
-        </download-excel>
-      </el-form-item>
-    </el-form>
-    <el-table
-      :height="height"
-      :data="tableData"
-      border
-      style="width: 100%">
-      <el-table-column
-        prop=""
-        header-align="center"
-        align="center"
-        min-width="50"
-        label="操作">
-        <template slot-scope="scope" class="foo_container">
-          <a type="text" size="small" @click="initReportModal(scope.row)">报告</a>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="orderNo"
-        header-align="center"
-        align="left"
-        min-width="100"
-        label="生产订单号">
-      </el-table-column>
-      <el-table-column
-        prop="itemNo"
-        header-align="center"
-        align="right"
-        min-width="50"
-        label="工序号">
-      </el-table-column>
-      <el-table-column
-        prop="operationDesc"
-        header-align="center"
-        align="left"
-        min-width="70"
-        label="工序名称">
-      </el-table-column>
-      <el-table-column
-        prop="workCenterNo"
-        header-align="center"
-        align="left"
-        min-width="70"
-        label="加工中心">
-      </el-table-column>
-      <el-table-column
-        prop="workCenterDesc"
-        header-align="center"
-        align="left"
-        min-width="100"
-        label="加工中心名称">
-      </el-table-column>
-      <el-table-column
-        prop="qtyRequired"
-        header-align="center"
-        align="right"
-        min-width="70"
-        label="需求数量">
-      </el-table-column>
-      <el-table-column
-        prop="qtyReported"
-        header-align="center"
-        align="right"
-        min-width="70"
-        label="报告数量">
-      </el-table-column>
-      <el-table-column
-        prop="qtyApprove"
-        header-align="center"
-        align="right"
-        min-width="70"
-        label="合格数量">
-      </el-table-column>
-      <el-table-column
-        prop="timeRequired"
-        header-align="center"
-        align="right"
-        min-width="70"
-        label="需求时间">
-      </el-table-column>
-      <el-table-column
-        prop="timeReported"
-        header-align="center"
-        align="right"
-        min-width="70"
-        label="报告时间">
-      </el-table-column>
-      <el-table-column
-        prop="partNo"
-        header-align="center"
-        align="left"
-        min-width="70"
-        label="产品编码">
-      </el-table-column>
-      <el-table-column
-        prop="partDescription"
-        header-align="center"
-        align="left"
-        min-width="100"
-        label="产品名称">
-      </el-table-column>
-      <el-table-column
-        prop="lotSize"
-        header-align="center"
-        align="right"
-        min-width="70"
-        label="订单数量">
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        header-align="center"
-        align="left"
-        min-width="70"
-        label="订单状态">
-      </el-table-column>
-    </el-table>
-
-    <el-dialog @close="closeDialog" :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="报告信息" :visible.sync="setUp.reviewFlag" width="615px">
-      <el-form :inline="true" label-position="top">
-        <el-form-item label="生产订单号">
-          <el-input style="width: 130px;" :disabled="setUp.disabled"  onkeyup="this.value = this.value.toUpperCase()"  v-model="saveHeaderData.orderNo"></el-input>
-        </el-form-item>
-        <el-form-item label="产品编码">
-          <el-input style="width: 130px;" :disabled="setUp.disabled" v-model="saveHeaderData.partNo"></el-input>
-        </el-form-item>
-        <el-form-item label="产品名称/规格型号">
-          <el-input style="width: 275px;" :disabled="setUp.disabled"  v-model="saveHeaderData.partDescription"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top">
-        <el-form-item label="工序号">
-          <el-input style="width: 130px;" :disabled="setUp.disabled"  v-model="saveHeaderData.itemNo"></el-input>
-        </el-form-item>
-        <el-form-item label="工序名称">
-          <el-input style="width: 130px;" :disabled="setUp.disabled"  v-model="saveHeaderData.operationDesc"></el-input>
-        </el-form-item>
-        <el-form-item label="加工中心编码">
-          <el-input style="width: 130px;" :disabled="setUp.disabled"  v-model="saveHeaderData.workCenterNo"></el-input>
-        </el-form-item>
-        <el-form-item label="加工中心名称">
-          <el-input style="width: 130px;" :disabled="setUp.disabled"  v-model="saveHeaderData.workCenterDesc"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top">
-        <el-form-item>
-          <span slot="label" style="" @click="getBaseList(26 ,1)"><a herf="#">操作员</a></span>
-          <el-input style="width: 130px;"  v-model="saveHeaderData.operatorId"></el-input>
-        </el-form-item>
-        <el-form-item label="操作员姓名">
-          <el-input style="width: 130px;"  v-model="saveHeaderData.operatorName"></el-input>
-        </el-form-item>
-        <el-form-item label="生产日期">
-          <el-date-picker
-            style="width: 130px"
-            v-model="saveHeaderData.planStartTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            format = "yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="报告日期">
-          <el-date-picker
-            style="width: 130px"
-            v-model="saveHeaderData.planFinishTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            format = "yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top">
-        <el-form-item label="报告数量">
-          <el-input type="number" oninput="value=value.replace(/[^\d]/g,'')" class="input_left" style="width: 178px;"  v-model="saveHeaderData.qtyReported"></el-input>
-<!--          <el-input-number style="width: 178px;text-align: right;"  v-model="saveHeaderData.qtyRework" size="medium" :min="0" :controls="false"></el-input-number>-->
-        </el-form-item>
-        <el-form-item label="合格数量">
-          <el-input type="number" style="width: 178px;" oninput="value=value.replace(/[^\d]/g,'')" class="input_reight"  v-model="saveHeaderData.qtyApprove"></el-input>
-<!--          <el-input-number style="width: 178px;text-align: right;"  v-model="saveHeaderData.qtyRework" size="medium" :min="0" :controls="false"></el-input-number>-->
-        </el-form-item>
-        <el-form-item label="返工数量">
-          <el-input type="number" style="width: 178px;" oninput="value=value.replace(/[^\d]/g,'')" v-model="saveHeaderData.qtyRework"></el-input>
-<!--          <el-input-number style="width: 178px;text-align: right;"  v-model="saveHeaderData.qtyRework" size="medium" :min="0" :controls="false"></el-input-number>-->
-        </el-form-item>
-      </el-form>
-      <fieldset class="customer-fieldset" style="width: 597px;margin-left: -10px;">
-        <legend class="customer-legend">不良品分析</legend>
-        <el-form :inline="true" label-position="top">
-          <el-form-item>
-            <span slot="label" style="" @click="getBaseList(26 ,2)"><a herf="#">操作员</a></span>
-            <el-input style="width: 178px;"  v-model="saveHeaderData.operatorId2"></el-input>
-          </el-form-item>
-          <el-form-item label="操作员姓名">
-            <el-input style="width: 178px;"  v-model="saveHeaderData.operatorIdName2"></el-input>
-          </el-form-item>
-          <el-form-item label="报废原因">
-            <el-input style="width: 178px;"  v-model="saveHeaderData.scrapReason"></el-input>
-          </el-form-item>
-        </el-form>
-      </fieldset>
-      <el-form :inline="true" label-position="top">
-        <el-form-item label="准备时间">
-          <el-input type="number" style="width: 178px;text-align: right;"   v-model="saveHeaderData.preparationTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
-<!--          <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.preparationTime" size="medium" :min="0" :controls="false"></el-input-number>-->
-        </el-form-item>
-        <el-form-item label="制造时间">
-          <el-input type="number" style="width: 178px;"  v-model="saveHeaderData.manufacturingTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
-<!--          <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.manufacturingTime" size="medium" :min="0" :controls="false"></el-input-number>-->
-        </el-form-item>
-        <el-form-item label="清理时间" label-width="0px">
-          <el-input type="number" style="width: 178px;"  v-model="saveHeaderData.cleaningTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
-          <!--            :min="0" 最小值  :controls="false" 隐藏减价按钮 -->
-<!--          <el-input-number style="width: 178px;text-align: right;"  v-model="saveHeaderData.cleaningTime" size="medium" :min="0" :controls="false"></el-input-number>-->
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top">
-        <el-form-item label="停机原因">
-          <el-input style="width: 560px;"  v-model="saveHeaderData.shutdownReason"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top">
-        <el-form-item label="备注">
-          <el-input style="width: 560px;"  v-model="saveHeaderData.remark"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-      <el-button @click="setUp.reviewFlag = false">取消</el-button>
-      <el-button type="primary" :disabled="setUp.saveButton" @click="saveReport()">确定</el-button>
-    </span>
-    </el-dialog>
-
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
-  </div>
-</template>
-
-<script>
-  import {
-    getGenerateReportList
-    , saveGenerateReport
-  } from '@/api/production/generateReport.js'
-  import Chooselist from '@/views/modules/common/Chooselist'
-
-  export default {
-    name: 'generateReport',
-    components: {
-      Chooselist
-    },
-    data () {
-      return {
-        setUp: {
-          reviewFlag: false,
-          saveButton: false,
-          readonlyFlag: false,
-          disabled: false
-        },
-        saveHeaderData: {
-          site: '',
-          orderNo: '',
-          itemNo: '',
-          partNo: '',
-          partDescription: '',
-          operationDesc: '',
-          workCenterNo: '',
-          workCenterDesc: '',
-          operatorId: '',
-          operatorName: '',
-          planStartTime: '',
-          planFinishTime: '',
-          qtyReported: 0,
-          qtyApprove: 0,
-          qtyRework: 0,
-          operatorId2: '',
-          operatorIdName2: '',
-          scrapReason: '',
-          preparationTime: 0,
-          manufacturingTime: 0,
-          cleaningTime: 0,
-          shutdownReason: '',
-          remark: ''
-        },
-        site: this.$store.state.user.site,
-        operatorType: 0,
-        // 导出 start
-        exportData: [],
-        exportDataStandard: {
-          '日计划单号': 'orderNo',
-          '计划日期': 'orderDate',
-          '订单号': 'orderRef1',
-          '物料编码': 'partNo',
-          '物料名称': 'partDescription',
-          '计划数量': 'orderQty',
-          '已完工数': 'qtyfinished',
-          '录入人': 'userName',
-          '录入时间': 'enterDate'
-        },
-        exportName: '日计划列表' + this.getStrDate(),
-        exportHeader: ['日计划列表'],
-        exportFooter: [],
-        exportDefaultValue: '这一行这一列没有数据',
-        // 导出 end
-        height: 200,
-        tableData: [],
-        date1: '',
-        searchData: {
-          orderNo: '',
-          workCenterNo: '',
-          partNo: '',
-          site: this.$store.state.user.site
-        }
-      }
-    },
-    mounted () {
-      this.$nextTick(() => {
-        this.height = window.innerHeight - 210
-      })
-    },
-    methods: {
-      saveReport () {
-        if (this.saveHeaderData.qtyReported == null || this.saveHeaderData.qtyReported <= 0) {
-          this.$alert('报告数量错误！', '错误信息', {
-            confirmButtonText: '确定'
-          })
-          return
-        }
-        if (this.saveHeaderData.qtyApprove == null || this.saveHeaderData.qtyApprove < 0) {
-          this.$alert('合格数量错误！', '错误信息', {
-            confirmButtonText: '确定'
-          })
-          return
-        }
-        if (this.saveHeaderData.qtyRework == null || this.saveHeaderData.qtyRework < 0) {
-          this.$alert('返工数量错误！', '错误信息', {
-            confirmButtonText: '确定'
-          })
-          return
-        }
-        if (this.saveHeaderData.preparationTime == null || this.saveHeaderData.preparationTime < 0) {
-          this.$alert('准备时间错误！', '错误信息', {
-            confirmButtonText: '确定'
-          })
-          return
-        }
-        if (this.saveHeaderData.manufacturingTime == null || this.saveHeaderData.manufacturingTime < 0) {
-          this.$alert('制造时间错误！', '错误信息', {
-            confirmButtonText: '确定'
-          })
-          return
-        }
-        if (this.saveHeaderData.cleaningTime == null || this.saveHeaderData.cleaningTime < 0) {
-          this.$alert('清理时间错误！', '错误信息', {
-            confirmButtonText: '确定'
-          })
-          return
-        }
-        if (parseFloat(this.saveHeaderData.qtyApprove) > parseFloat(this.saveHeaderData.qtyReported)) {
-          this.$alert('合格数量大于报告数量！', '错误信息', {
-            confirmButtonText: '确定'
-          })
-          return
-        }
-        if (this.saveHeaderData.planStartTime == null || this.saveHeaderData.planStartTime === '') {
-          this.$alert('请选择生产日期！', '错误信息', {
-            confirmButtonText: '确定'
-          })
-          return
-        }
-        if (this.saveHeaderData.planFinishTime == null || this.saveHeaderData.planFinishTime === '') {
-          this.$alert('请选择报告日期！', '错误信息', {
-            confirmButtonText: '确定'
-          })
-          return
-        }
-        saveGenerateReport(this.saveHeaderData).then(({data}) => {
-          if (data.code == 0) {
-            this.$message.success(data.msg)
-            this.setUp.reviewFlag = false
-            this.search()
-          } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
-            })
-          }
-        })
-      },
-      // 获取基础数据列表S
-      getBaseList (val, type) {
-        this.tagNo = val
-        this.$nextTick(() => {
-          let strVal = ''
-          if (val === 24) {
-            strVal = this.searchData.workCenterNo
-          } else if (val === 26) {
-            this.operatorType = type
-            if (type === 1) {
-              strVal = this.saveHeaderData.operatorId
-            } else if (type === 2) {
-              strVal = this.saveHeaderData.operatorId2
-            }
-          }
-          this.$refs.baseList.init(val, strVal)
-        })
-      },
-      /* 列表方法的回调 */
-      getBaseData (val) {
-        console.log(val)
-        if (this.tagNo === 24) {
-          this.searchData.workCenterNo = val.WorkCenterNo
-        } else if (this.tagNo === 26) {
-          if (this.operatorType === 1) {
-            this.saveHeaderData.operatorId = val.OperatorID
-            this.saveHeaderData.operatorName = val.OperatorName
-          } else if (this.operatorType === 2) {
-            this.saveHeaderData.operatorId2 = val.OperatorID
-            this.saveHeaderData.operatorIdName2 = val.OperatorName
-          }
-        } else if (this.tagNo === 5) {
-          this.searchData.partNo = val.PartNo
-        }
-      },
-      initReportModal (row) {
-        this.setUp.reviewFlag = true
-        this.setUp.disabled = true
-        let currentData = JSON.parse(JSON.stringify(row))
-        this.saveHeaderData.site = currentData.site
-        this.saveHeaderData.orderNo = currentData.orderNo
-        this.saveHeaderData.itemNo = currentData.itemNo
-        this.saveHeaderData.operationDesc = currentData.operationDesc
-        this.saveHeaderData.partNo = currentData.partNo
-        this.saveHeaderData.partDescription = currentData.partDescription + '/' + currentData.spec
-        this.saveHeaderData.workCenterNo = currentData.workCenterNo
-        this.saveHeaderData.workCenterDesc = currentData.workCenterDesc
-        this.saveHeaderData.planFinishTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
-        this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
-      },
-      closeDialog () {
-        Object.assign(this.$data.saveHeaderData, this.$options.data.call(this).saveHeaderData)
-      },
-      search () {
-        getGenerateReportList(this.searchData).then(({data}) => {
-          this.tableData = data.rows
-        })
-      },
-      createExportData () {
-        return this.tableData
-      },
-      startDownload () {
-        //  this.exportData = this.dataList
-
-      },
-      finishDownload () {
-
-      },
-      getStrDate () {
-        let dd = new Date()
-        let Y = dd.getFullYear()
-        let M = (dd.getMonth() + 1) < 10 ? '0' + (dd.getMonth() + 1) : (dd.getMonth() + 1)// 获取当前月份的日期，不足10补0
-        let D = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate()// 获取当前几号，不足10补0
-        let H = dd.getHours() < 10 ? '0' + dd.getHours() : dd.getHours()
-        let MM = dd.getMinutes() < 10 ? '0' + dd.getMinutes() : dd.getMinutes()
-        let S = dd.getSeconds() < 10 ? '0' + dd.getSeconds() : dd.getSeconds()
-        return Y + M + D + H + MM + S
-      }
-
-    },
-    created () {
-    }
-  }
-</script>
-
-<style scoped>
-  .input_left{
-    text-align: left;
-  }
-  .input_reight{
-    text-align: right;
-  }
-  /deep/ input::-webkit-inner-spin-button {
-    -webkit-appearance: none !important;
-  }
-  input[type='number'] {
-    -moz-appearance: textfield !important;
-  }
-</style>
diff --git a/src/views/modules/production/inspect.vue b/src/views/modules/production/inspect.vue
index 490f0e6..7665b5a 100644
--- a/src/views/modules/production/inspect.vue
+++ b/src/views/modules/production/inspect.vue
@@ -14,7 +14,7 @@
         <el-select v-model="searchData.toTypeFlagDb" style="width: 120px">
           <el-option label="全部" value=""></el-option>
           <el-option label="混炼胶入库" value="W"></el-option>
-          <el-option label="硫化检验单" value="I"></el-option>
+          <el-option label="开工检验单" value="I"></el-option>
           <el-option label="进料检验" value="Q"></el-option>
           <el-option label="物料过期送检" value="S"></el-option>
         </el-select>
diff --git a/src/views/modules/production/liuhuaProductView.vue b/src/views/modules/production/liuhuaProductView.vue
index d93cff1..cee266a 100644
--- a/src/views/modules/production/liuhuaProductView.vue
+++ b/src/views/modules/production/liuhuaProductView.vue
@@ -344,6 +344,23 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
+          }, {
+            tableId: "liuhuaView",
+            tableName: this.$route.meta.title,
+            columnProp: "liuhuahegelv",
+            columnLabel: "总完成率",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 60,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
           }
         ],
         visible:false,