diff --git a/src/views/modules/yieldReport/com_produce_material.vue b/src/views/modules/yieldReport/com_produce_material.vue
index e083517..1165298 100644
--- a/src/views/modules/yieldReport/com_produce_material.vue
+++ b/src/views/modules/yieldReport/com_produce_material.vue
@@ -1,29 +1,39 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="225px" style="height: 680px;" class="customer-dialog">
-      <el-container style="height: 125px;">
+               width="205px" style="height: 580px;" class="customer-dialog">
+      <el-container style="height: 105px;">
         <el-form :inline="true" label-position="top" label-width="80px">
             <!-- 材料卷号和BOM序号 -->
             <el-row>
               <el-col :span="16">
                 <el-form-item :label="'材料卷号:'">
-                  <el-input v-model="scheduleData.seqNo" style="width: 120px"></el-input>
+                  <el-input ref="rmRollNo" @keyup.native="recordTime"
+                            @keyup.enter.native="checkRmRollNo"
+                            v-model="pageData.rmRollNo"
+                            style="width: 120px">
+                  </el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
             <el-col :span="16">
               <el-form-item :label="'BOM 序号:'">
-                <el-input v-model="scheduleData.seqNo" style="width: 120px"></el-input>
+                <el-select v-model="pageData.bomItemNo" style="width: 120px">
+                  <el-option
+                    v-for="item in bomList"
+                    :key="item.itemNo"
+                    :label="item.itemNo"
+                    :value="item.itemNo">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           </el-form>
       </el-container>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary">列表</el-button>
-        <el-button type="primary">确 定</el-button>
+        <el-button type="primary">确定</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
     </el-dialog>
@@ -42,23 +52,41 @@ export default {
         userName: this.$store.state.user.name,
         seqNo: '',
         orderNo: '',
+        itemNo: 0,
         partNo: '',
+        workCenterNo: '',
+        workCenterDesc: '',
+        resourceDesc: '',
         rollNo: '',
         partDesc: '',
-        reportedFlag: 'N',
+        planStartTime: '',
+        planFinishTime: '',
         qtyRequiredOriginal: 0,
         scheduledDate: '',
         shiftNo: '',
         preItemDesc: '',
         nextItemDesc: '',
         nextItemNo: 0,
+        operatorId: '',
+        functionName: '',
         currentRollFlag: false
       },
-      currentRollOps: {
+      timeArray: [],
+      bomList: [],
+      pageData: {
         site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
         seqNo: '',
+        orderNo: '',
+        itemNo: 0,
+        partNo: '',
+        workCenterNo: '',
         rollNo: '',
-        finishedFlag: '',
+        rmRollNo: '',
+        bomItemNo: 0,
+        shiftNo: '',
+        nextItemNo: 0,
+        operatorId: ''
       },
       operatorData: {
         site: this.$store.state.user.site,
@@ -74,11 +102,53 @@ export default {
   },
   methods: {
 
+    //初始化页面的参数
+    init(scheduleData, operatorData) {
+      //初始化参数
+      this.scheduleData = scheduleData;
+      //初始化操作员对象
+      this.operatorData = JSON.parse(JSON.stringify(operatorData));
+      //设置页面的参数
+      this.pageData.orderNo = scheduleData.orderNo;
+      this.pageData.itemNo = scheduleData.itemNo;
+      this.pageData.seqNo = scheduleData.seqNo;
+      this.pageData.rollNo = scheduleData.rollNo;
+      this.pageData.rmRollNo = '';
+      this.pageData.bomItemNo = 0;
+      //自动获取焦点
+      this.$nextTick(() => {
+        this.$refs.rmRollNo.focus();
+      });
+    },
+
     /*关闭modal*/
     closeDialog(){
       this.$emit('update:visible', false);
     },
 
+    /*记录每一次录入字符串的时间*/
+    recordTime(){
+      this.timeArray.push(new Date().getTime());
+    },
+
+    /*检查材料卷号的数据*/
+    checkRmRollNo(){
+      //首先判断时间是否超过100毫秒
+      let len = this.timeArray.length;
+      let timeDiff = this.timeArray[len-1] - this.timeArray[0];
+      //判断时间是否在范围之内
+      /*if(timeDiff > 1000){
+        this.$message.error('请扫码输入!');
+      }*/
+      //判断null和空字符串
+      if(this.pageData.rmRollNo == null || this.pageData.rmRollNo == ''){
+        this.$message.error('材料卷号不能为空!');
+      }
+      //处理扫描材料卷号
+      debugger;
+    },
+
+
 
 
 
@@ -89,16 +159,6 @@ export default {
 
 
 
-    init(seqNo, operatorData) {
-      //初始化参数
-      this.scheduleData.seqNo = seqNo;
-      //初始化操作员对象
-      this.operatorData = JSON.parse(JSON.stringify(operatorData));
-      // this.currentRollOps.seqNo = seqNo;
-      // this.currentRollOps.rollNo = rollNo;
-      //刷新当前派工单的信息
-      //this.refreshPageData();
-    },
 
   },
   created() {
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index c6f1737..685e06e 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -3064,7 +3064,7 @@ export default {
       //打开生产过程的工具的页面
       this.$nextTick(() => {
         this.showMaterialFlag = true;
-        this.$refs.comProduceMaterial.init(this.scheduleData.seqNo, this.operatorData)
+        this.$refs.comProduceMaterial.init(this.scheduleData, this.operatorData)
       });
     },
 
diff --git a/src/views/modules/yieldReport/com_switch_operator.vue b/src/views/modules/yieldReport/com_switch_operator.vue
index fafa02a..d8c24f4 100644
--- a/src/views/modules/yieldReport/com_switch_operator.vue
+++ b/src/views/modules/yieldReport/com_switch_operator.vue
@@ -3,7 +3,10 @@
   <el-dialog :title="titleCon" v-bind="$attrs" v-on="$listeners"  width="300px">
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
         <el-form-item :label="'操作员:'">
-          <el-input ref="operatorId" v-model="operatorData.operatorId" style="width: 110px"></el-input>
+          <el-input ref="operatorId" @keyup.enter.native="saveOperatorData"
+                    v-model="operatorData.operatorId"
+                    style="width: 110px">
+          </el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
@@ -17,7 +20,7 @@
           <el-button type="primary">列表</el-button>
         </el-form-item>
         <el-form-item label="" style="margin-top: 10px; margin-bottom: 0px;">
-          <el-button type="primary" @click="saveOperatorData()">保存</el-button>
+          <el-button type="primary" @click="saveOperatorData">保存</el-button>
         </el-form-item>
         <el-form-item label="" style="margin-top: 15px; margin-bottom: 5px;">
           <el-button type="primary" @click="closeDialog">关闭</el-button>
@@ -62,7 +65,9 @@ export default {
       this.operatorData.operatorName = '';
       this.operatorData.operatorId = '';
       //自动获取焦点
-      this.$refs.operatorId.focus();
+      this.$nextTick(() => {
+        this.$refs.operatorId.focus();
+      });
       //刷新当前派工单的信息
       //this.refreshPageData();
     },
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 2699ef4..5c1c43d 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -139,7 +139,6 @@ export default {
       showOperatorFlag: false,
       showReportFlag: false,
       showFinishFlag:false,
-      selectList: [],
       searchData: {
         site: this.$store.state.user.site,
         resourceId: '',