diff --git a/src/api/production/schedule.js b/src/api/production/schedule.js
index 0a94238..3be714c 100644
--- a/src/api/production/schedule.js
+++ b/src/api/production/schedule.js
@@ -16,3 +16,5 @@ export const openSchedule = data => createAPI(`/schedule/openSchedule`,'post',da
 export const cancelSchedule = data => createAPI(`/schedule/cancelSchedule`,'post',data)
 
 export const circulationSchedule = data => createAPI(`/schedule/circulationSchedule`,'post',data)
+export const getSfdcList = data => createAPI(`/schedule/getSfdcList`,'post',data)
+export const cancelSfdc = data => createAPI(`/schedule/cancelSfdc`,'post',data)
diff --git a/src/views/modules/schedule/cancelSfdc.vue b/src/views/modules/schedule/cancelSfdc.vue
new file mode 100644
index 0000000..d4d0fe3
--- /dev/null
+++ b/src/views/modules/schedule/cancelSfdc.vue
@@ -0,0 +1,405 @@
+<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: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'加工中心编码'">
+        <el-input v-model="searchData.workCenterNo" 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-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
+      </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.resourceId" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'班次'">
+        <el-select v-model="searchData.shiftNo" 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"
+        fixed="left"
+        align="center"
+        width="160"
+        label="操作">
+        <template slot-scope="scope" class="foo_container">
+          <a type="text" size="small" v-if="scope.row.reverseflag==='N'" @click="cancelSfdc(scope.row)">取消报工</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="site"
+        header-align="center"
+        align="left"
+        width="60"
+        label="工厂编号">
+      </el-table-column>
+      <el-table-column
+        prop="orderNo"
+        header-align="center"
+        align="left"
+        width="80"
+        label="生产订单号">
+      </el-table-column>
+      <el-table-column
+        prop="itemNo"
+        header-align="center"
+        align="right"
+        min-width="60"
+        label="工序号">
+      </el-table-column>
+      <el-table-column
+        prop="operationDesc"
+        header-align="center"
+        align="left"
+        min-width="120"
+        label="工序名称">
+      </el-table-column>
+      <el-table-column
+        prop="seqNo"
+        header-align="center"
+        align="right"
+        min-width="50"
+        label="次序号">
+      </el-table-column>
+      <el-table-column
+        prop="assJobSeqNo"
+        header-align="center"
+        align="left"
+        min-width="70"
+        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="workCenterNo"
+        header-align="center"
+        align="left"
+        min-width="70"
+        label="工厂编号">
+      </el-table-column>
+      <el-table-column
+        prop="reportDate"
+        header-align="center"
+        align="left"
+        min-width="130"
+        label="报工时间">
+      </el-table-column>
+      <el-table-column
+        prop="operatorId"
+        header-align="center"
+        align="left"
+        min-width="70"
+        label="操作员">
+      </el-table-column>
+      <el-table-column
+        prop="operatorName"
+        header-align="center"
+        align="left"
+        min-width="100"
+        label="操作员姓名">
+      </el-table-column>
+      <el-table-column
+        prop="reverseflag"
+        header-align="center"
+        align="left"
+        min-width="60"
+        label="是否取消">
+      </el-table-column>
+      <el-table-column
+        prop="reportQty"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="报告数量">
+      </el-table-column>
+      <el-table-column
+        prop="approveQty"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="合格数量">
+      </el-table-column>
+      <el-table-column
+        prop="reportedManfTime"
+        header-align="center"
+        align="right"
+        min-width="70"
+        label="生产时间">
+      </el-table-column>
+      <el-table-column
+        prop="batchNo"
+        header-align="center"
+        align="left"
+        min-width="100"
+        label="批次号">
+      </el-table-column>
+      <el-table-column
+        prop="shiftNo"
+        header-align="center"
+        align="left"
+        min-width="70"
+        label="班次编号">
+      </el-table-column>
+      <el-table-column
+        prop="shiftDesc"
+        header-align="center"
+        align="left"
+        min-width="100"
+        label="班次名称">
+      </el-table-column>
+      <el-table-column
+        prop="resourceId"
+        header-align="center"
+        align="left"
+        min-width="70"
+        label="机台编号">
+      </el-table-column>
+      <el-table-column
+        prop="resourceDesc"
+        header-align="center"
+        align="left"
+        min-width="100"
+        label="机台名称">
+      </el-table-column>
+    </el-table>
+
+   <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    getSfdcList,
+    cancelSfdc,
+  } from '@/api/production/schedule.js'
+  import Chooselist from '@/views/modules/common/Chooselist'
+  // import {
+  //   printSeqNoLabel,
+  // } from "@/views/modules/production/print_seqNo_label.js"
+
+  export default {
+    name: 'searchSOScheduleRouting',
+    components: {
+      Chooselist
+    },
+    data () {
+      return {
+        site: this.$store.state.user.site,
+        // 导出 start
+        exportData: [],
+        exportDataStandard: {
+          '派工单号': 'seqNo',
+          '关联单号': 'orderNo',
+          '工序号': 'itemNo',
+          '工序名称': 'itemDesc',
+          '派工数量': 'qtyRequired',
+          '报工数量': 'qtyReported',
+          '合格数量': 'qtyApprove',
+          '派工日期': 'sScheduledDate',
+          '操作员姓名': 'operatorName',
+          '产品编码': 'partNo',
+          '产品名称': 'partDesc',
+          '机台ID': 'resourceId',
+          '班次': 'shiftNo',
+          '加工中心': 'workCenterNo',
+
+        },
+        exportName: '派工单列表' + this.getStrDate(),
+        exportHeader: ['派工单列表'],
+        exportFooter: [],
+        exportDefaultValue: '这一行这一列没有数据',
+        // 导出 end
+        height: 200,
+        tableData: [],
+        searchData: {
+          orderNo: '',
+          workCenterNo: '',
+          partNo: '',
+          site: this.$store.state.user.site,
+          itemNo:'',
+          startDate:new Date(),
+          endDate:'',
+          operatorName:'',
+          resourceId:'',
+          shiftNo:'',
+        },
+      }
+    },
+    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.workCenterNo
+          }
+          if (val === 5) {
+            strVal = this.searchData.partNo
+          }
+          if (val === 26) {
+            strVal = this.searchData.operatorName
+          }
+          if (val === 88) {
+            strVal = this.searchData.resourceId
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 24) {
+          this.searchData.workCenterNo = 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.resourceId = val.ResourceID
+        }
+      },
+
+      search () {
+        getSfdcList(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
+      },
+      cancelSfdc(row){
+        this.$confirm(`确定取消此报工记录`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          cancelSfdc(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.search ();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            }else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+
+    },
+    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/schedule/schedule.vue b/src/views/modules/schedule/schedule.vue
index e82f2b7..1203ab1 100644
--- a/src/views/modules/schedule/schedule.vue
+++ b/src/views/modules/schedule/schedule.vue
@@ -47,6 +47,23 @@
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item :label="' '">
+        <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-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;">
         <el-form-item :label="'工序号：'">
@@ -70,24 +87,12 @@
             <el-option label="已派工完" value="ROUND(ISNULL(SL.QtyScheduled,0),3) >=ROUND(so.LotSize,3)"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="'加工中心编号：'">
+          <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
+        </el-form-item>
         <el-form-item :label="' '">
-          <el-button @click="search()" style="margin-left: 24px" 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-button @click="schedulesModal()" style="margin-left: 24px" type="primary">批量派工</el-button>
+          <el-button @click="search()" style="margin-left: 0px" type="primary">查询</el-button>
+          <el-button @click="schedulesModal()" style="margin-left: 14px" type="primary">批量派工</el-button>
         </el-form-item>
       </el-form>
     </el-form>
@@ -544,6 +549,7 @@
           site: this.$store.state.user.site,
           planStatus: 'ROUND(so.LotSize,3) >ROUND(ISNULL(SL.QtyScheduled,0),3)',
           itemNo:'',
+          workCenterNo:'',
         },
         schedulingModalData: {
           orderNo: '',
@@ -821,6 +827,7 @@
           sumQty: this.schedulingModalData.sumQty,
           scheduleDetail:this.schedulingModalTableData,
           efficiency:this.schedulingModalData.efficiency,
+          operationDesc:this.schedulingModalData.operationDesc,
         }
         scheduleForShopOrder(indata).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/schedule/searchSOScheduleRouting.vue b/src/views/modules/schedule/searchSOScheduleRouting.vue
index 168fd33..9b7bfa4 100644
--- a/src/views/modules/schedule/searchSOScheduleRouting.vue
+++ b/src/views/modules/schedule/searchSOScheduleRouting.vue
@@ -230,41 +230,7 @@
     },
     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: '',
-          userId:'',
-        },
-        sopFlag:false,
         site: this.$store.state.user.site,
-        operatorType: 0,
         // 导出 start
         exportData: [],
         exportDataStandard: {
@@ -291,7 +257,6 @@
         // 导出 end
         height: 200,
         tableData: [],
-        date1: '',
         searchData: {
           orderNo: '',
           sWorkCenterNo: '',
@@ -305,27 +270,11 @@
           sShiftNo:'',
           closedFlag:'N',
         },
-        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: {