diff --git a/src/views/modules/production/closeSchedule.vue b/src/views/modules/production/closeSchedule.vue
new file mode 100644
index 0000000..2afaccc
--- /dev/null
+++ b/src/views/modules/production/closeSchedule.vue
@@ -0,0 +1,456 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: -20px;">
+      <el-form-item :label="'生产订单号'">
+        <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item >
+        <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
+        <el-input v-model="searchData.sWorkCenterNo" style="width: 130px"></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-input v-model="searchData.itemNo" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'派工单类型'">
+        <el-select v-model="searchData.scheduleType" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="生产订单派工单" value="生产订单派工单"></el-option>
+          <el-option label="日计划派工单" value="日计划派工单"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="'是否报工完成'">
+        <el-select v-model="searchData.reportFlag" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="是" value="QtyReported>=QtyRequired"></el-option>
+          <el-option label="否" value="QtyRequired>QtyReported"></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
+      <el-form-item :label="'派工日期：'">
+        <el-date-picker
+          style="width: 130px"
+          v-model="searchData.startDate"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="'至: '">
+        <el-date-picker
+          style="width: 130px"
+          v-model="searchData.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item >
+        <span slot="label" style="" @click="getBaseList(26)"><a herf="#">操作员姓名</a></span>
+        <el-input v-model="searchData.operatorName" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item >
+        <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台ID</a></span>
+        <el-input v-model="searchData.sResourceID" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'班次'">
+        <el-select v-model="searchData.sShiftNo" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="白班" value="白班"></el-option>
+          <el-option label="晚班" value="晚班"></el-option>
+        </el-select>
+      </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="160"
+        label="操作">
+        <template slot-scope="scope" class="foo_container">
+          <a type="text" size="small" @click="circulation(scope.row)">流转</a>
+          <a type="text" size="small" @click="closeSchedule(scope.row)">关闭派工单</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="seqNo"
+        header-align="center"
+        align="left"
+        min-width="70"
+        label="派工单号">
+      </el-table-column>
+      <el-table-column
+        prop="orderNo"
+        header-align="center"
+        align="left"
+        min-width="100"
+        label="关联单号">
+      </el-table-column>
+      <el-table-column
+        prop="scheduleType"
+        header-align="center"
+        align="left"
+        min-width="100"
+        label="关联单号类型">
+      </el-table-column>
+      <el-table-column
+        prop="itemNo"
+        header-align="center"
+        align="left"
+        min-width="70"
+        label="工序号">
+      </el-table-column>
+      <el-table-column
+        prop="itemDesc"
+        header-align="center"
+        align="left"
+        min-width="160"
+        label="工序名称">
+      </el-table-column>
+      <el-table-column
+        prop="qtyRequired"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="派工数量">
+      </el-table-column>
+      <el-table-column
+        prop="qtyReported"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="报工数量">
+      </el-table-column>
+      <el-table-column
+        prop="qtyApprove"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="合格数量">
+      </el-table-column>
+      <el-table-column
+        prop="timeRequired"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="需求时间">
+      </el-table-column>
+      <el-table-column
+        prop="sScheduledDate"
+        header-align="center"
+        align="left"
+        min-width="80"
+        label="派工日期">
+      </el-table-column>
+      <el-table-column
+        prop="operatorName"
+        header-align="center"
+        align="left"
+        min-width="80"
+        label="操作员姓名">
+      </el-table-column>
+      <el-table-column
+        prop="partNo"
+        header-align="center"
+        align="left"
+        min-width="80"
+        label="产品编码">
+      </el-table-column>
+      <el-table-column
+        prop="partDesc"
+        header-align="center"
+        align="left"
+        min-width="200"
+        label="产品名称">
+      </el-table-column>
+      <el-table-column
+        prop="sResourceID"
+        header-align="center"
+        align="left"
+        min-width="70"
+        label="机台ID">
+      </el-table-column>
+      <el-table-column
+        prop="sShiftNo"
+        header-align="center"
+        align="left"
+        min-width="70"
+        label="班次">
+      </el-table-column>
+      <el-table-column
+        prop="sWorkCenterNo"
+        header-align="center"
+        align="left"
+        min-width="100"
+        label="加工中心编码">
+      </el-table-column>
+    </el-table>
+
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    getSOScheduleRoutingData
+    , cancelJob
+  } from '@/api/production/generateReport.js'
+  import Chooselist from '@/views/modules/common/Chooselist'
+  import {
+    printSeqNoLabel,
+  } from "@/views/modules/production/print_seqNo_label.js"
+  export default {
+    name: 'closeSchedule',
+    components: {
+      Chooselist
+    },
+    data () {
+      return {
+        setUp: {
+          reviewFlag: false,
+          saveButton: false,
+          readonlyFlag: false,
+          disabled: false
+        },
+        saveHeaderData: {
+          site: '',
+          seqNo: '',
+          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: '',
+          orderRef1:'',
+          scheduleType:'',
+          userId:'',
+        },
+        sopFlag:false,
+        site: this.$store.state.user.site,
+        operatorType: 0,
+        // 导出 start
+        exportData: [],
+        exportDataStandard: {
+          '派工单号': 'seqNo',
+          '关联单号': 'orderNo',
+          '关联单号类型': 'scheduleType',
+          '工序号': 'itemNo',
+          '工序名称': 'itemDesc',
+          '派工数量': 'qtyRequired',
+          '报工数量': 'qtyReported',
+          '合格数量': 'qtyApprove',
+          '需求时间': 'timeRequired',
+          '派工日期': 'sScheduledDate',
+          '操作员姓名': 'operatorName',
+          '产品编码': 'partNo',
+          '产品名称': 'partDesc',
+          '机台ID': 'sResourceID',
+          '班次': 'sShiftNo',
+          '加工中心': 'sWorkCenterNo',
+
+        },
+        exportName: '派工单列表' + this.getStrDate(),
+        exportHeader: ['派工单列表'],
+        exportFooter: [],
+        exportDefaultValue: '这一行这一列没有数据',
+        // 导出 end
+        height: 200,
+        tableData: [],
+        date1: '',
+        searchData: {
+          orderNo: '',
+          sWorkCenterNo: '',
+          partNo: '',
+          site: this.$store.state.user.site,
+          itemNo:'',
+          scheduleType:'',
+          reportFlag:'QtyRequired>QtyReported',
+          startDate:'',
+          endDate:'',
+          operatorName:'',
+          sResourceID:'',
+          sShiftNo:'',
+        },
+        photoUrl:'',
+        sopData:{
+          site:'',
+          partNo:'',
+        },
+        partDescription:'',
+        fileTitle:'',
+        fileName:'',
+        num:1,
+        currentData:'',
+        photoDatas:[],
+        uploadImg:[],
+        showviewer: false,
+        url: '',
+        height2:600,
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+        this.height2 = window.innerHeight -100
+      })
+    },
+    methods: {
+      // 获取基础数据列表S
+      getBaseList (val, type) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 24) {
+            strVal = this.searchData.sWorkCenterNo
+          }
+          if (val === 5) {
+            strVal = this.searchData.partNo
+          }
+          if (val === 26) {
+            strVal = this.searchData.operatorName
+          }
+          if (val === 88) {
+            strVal = this.searchData.sResourceID
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 24) {
+          this.searchData.sWorkCenterNo = val.WorkCenterNo
+        }  else if (this.tagNo === 5) {
+          this.searchData.partNo = val.PartNo
+        }
+        if (this.tagNo === 26) {
+          this.searchData.operatorName = val.OperatorName
+        }
+        if (this.tagNo === 88) {
+          this.searchData.sResourceID = val.ResourceID
+        }
+      },
+
+      search () {
+        getSOScheduleRoutingData(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
+      },
+      circulation(row){
+
+      },
+      cancelJob(row){
+        if(row.qtyReported>0){
+          this.$alert('该派工单已经有报工无法取消！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        this.$confirm(`确定取消此派工单`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          cancelJob(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.search ();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            }
+          })
+        })
+      },
+      toPrint(row){
+        let array=[];
+        let data={
+          seqNo:row.seqNo,
+        }
+        array.push(data)
+        printSeqNoLabel(array)
+      },
+    },
+    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/generateReport.vue b/src/views/modules/production/generateReport.vue
index 3970262..ed2240a 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -669,46 +669,49 @@
         }
       },
       initReportModal (row) {
-        this.setUp.reviewFlag = true;
-        this.setUp.disabled = true;
-        let currentData = JSON.parse(JSON.stringify(row));
-        this.KGReported=0
-        this.KGApprove=0
-        this.KGRework=0
-        this.saveHeaderData.qtyApprove=0
-        this.saveHeaderData.qtyReported=0
-        this.saveHeaderData.qtyRework=0
-        this.saveHeaderData.site = currentData.site;
-        this.saveHeaderData.seqNo = currentData.seqNo;
-        this.saveHeaderData.itemNo = currentData.itemNo;
-        this.saveHeaderData.operationDesc = currentData.itemDesc;
-        this.saveHeaderData.partNo = currentData.partNo;
-        this.saveHeaderData.partDescription = currentData.partSpec;
-        this.saveHeaderData.workCenterNo = currentData.sWorkCenterNo;
-        this.saveHeaderData.workCenterDesc = currentData.workCenterDesc;
-        this.saveHeaderData.orderRef1=currentData.orderRef1;
-        this.saveHeaderData.orderNo=currentData.orderNo;
-        this.saveHeaderData.scheduleType=currentData.scheduleType;
-        this.saveHeaderData.operatorId=currentData.operatorId;
-        this.saveHeaderData.operatorName=currentData.operatorName;
-        this.saveHeaderData.userId=this.$store.state.user.name;
-        this.qty1='';
-        this.qty2 ='';
-        this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
-        searchReportedQty(this.saveHeaderData).then(({data}) => {
-          this.qty1 = data.row.qtyReported;
-          this.qty2 =data.row.lastApproveQty;
-          if(data.row.weightFactor==-1){
-            this.qty3 ="erp未维护数据"
-            this.KGReported=''
-            this.KGApprove=''
-            this.KGRework=''
-            this.factorFlag=true;
-          }else {
-            this.qty3 =data.row.weightFactor
-            this.factorFlag=false;
-          }
-        })
+        this.scanSeqNo=row.seqNo
+        this.searchSeqNo()
+        // this.setUp.reviewFlag = true;
+        // this.setUp.disabled = true;
+        // let currentData = JSON.parse(JSON.stringify(row));
+        // this.KGReported=0
+        // this.KGApprove=0
+        // this.KGRework=0
+        // this.saveHeaderData.qtyApprove=0
+        // this.saveHeaderData.qtyReported=0
+        // this.saveHeaderData.qtyRework=0
+        // this.saveHeaderData.site = currentData.site;
+        // this.saveHeaderData.seqNo = currentData.seqNo;
+        // this.saveHeaderData.itemNo = currentData.itemNo;
+        // this.saveHeaderData.operationDesc = currentData.itemDesc;
+        // this.saveHeaderData.partNo = currentData.partNo;
+        // this.saveHeaderData.partDescription = currentData.partSpec;
+        // this.saveHeaderData.workCenterNo = currentData.sWorkCenterNo;
+        // this.saveHeaderData.workCenterDesc = currentData.workCenterDesc;
+        // this.saveHeaderData.orderRef1=currentData.orderRef1;
+        // this.saveHeaderData.orderNo=currentData.orderNo;
+        // this.saveHeaderData.scheduleType=currentData.scheduleType;
+        // this.saveHeaderData.operatorId=currentData.operatorId;
+        // this.saveHeaderData.operatorName=currentData.operatorName;
+        // this.saveHeaderData.userId=this.$store.state.user.name;
+        // this.qty1='';
+        // this.qty2 ='';
+        // this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
+        // searchReportedQty(this.saveHeaderData).then(({data}) => {
+        //   this.qty1 = data.row.qtyReported;
+        //   this.qty2 =data.row.lastApproveQty;
+        //   this.saveHeaderData.manufacturingTime=data.row.timeReported;
+        //   if(data.row.weightFactor==-1){
+        //     this.qty3 ="erp未维护数据"
+        //     this.KGReported=''
+        //     this.KGApprove=''
+        //     this.KGRework=''
+        //     this.factorFlag=true;
+        //   }else {
+        //     this.qty3 =data.row.weightFactor
+        //     this.factorFlag=false;
+        //   }
+        // })
       },
       closeDialog () {
         Object.assign(this.$data.saveHeaderData, this.$options.data.call(this).saveHeaderData)
@@ -852,9 +855,6 @@
             this.saveHeaderData.qtyApprove=0
             this.saveHeaderData.qtyReported=0
             this.saveHeaderData.qtyRework=0
-            this.scanModalFlag=false;
-            this.setUp.reviewFlag = true;
-            this.setUp.disabled = true;
             this.saveHeaderData.site = currentData.site;
             this.saveHeaderData.seqNo = currentData.seqNo;
             this.saveHeaderData.itemNo = currentData.itemNo;
@@ -873,21 +873,31 @@
             this.qty2 ='';
             this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
             searchReportedQty(this.saveHeaderData).then(({data}) => {
-              this.qty1 = data.row.qtyReported;
-              this.qty2 =data.row.lastApproveQty;
-              if(data.row.weightFactor==-1){
-                this.qty3 ="erp未维护数据"
-                this.KGReported=''
-                this.KGApprove=''
-                this.KGRework=''
-                this.factorFlag=true;
+              if(data.code===0) {
+                this.qty1 = data.row.qtyReported;
+                this.qty2 = data.row.lastApproveQty;
+                this.saveHeaderData.manufacturingTime = data.row.timeReported;
+                if (data.row.weightFactor == -1) {
+                  this.qty3 = "erp未维护数据"
+                  this.KGReported = ''
+                  this.KGApprove = ''
+                  this.KGRework = ''
+                  this.factorFlag = true;
+                } else {
+                  this.qty3 = data.row.weightFactor
+                  this.factorFlag = false;
+                }
               }else {
-                this.qty3 =data.row.weightFactor
-                this.factorFlag=false;
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
+                return false;
               }
             })
 
-
+            this.scanModalFlag=false;
+            this.setUp.reviewFlag = true;
+            this.setUp.disabled = true;
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'