diff --git a/src/views/modules/production/reworkRecord.vue b/src/views/modules/production/reworkRecord.vue
index 1dc7331..761432f 100644
--- a/src/views/modules/production/reworkRecord.vue
+++ b/src/views/modules/production/reworkRecord.vue
@@ -21,6 +21,7 @@ export default {
         operatorName:undefined,
         resourceId:undefined,
         shiftNo:"",
+        type:"",
       },
       tagNo:undefined,
       type:undefined,
@@ -29,6 +30,7 @@ export default {
       saveRework:{
         seqNo:undefined,
         site:this.$store.state.user.site,
+        type:undefined,
       },
       reportWorkDialog:false,
       saveType:undefined,
@@ -88,6 +90,7 @@ export default {
       this.saveRework = {
         seqNo: undefined,
         site:this.$store.state.user.site,
+        type:undefined,
       }
       this.saveType = undefined;
       this.numberOrWeight = undefined;
@@ -229,6 +232,23 @@ export default {
           confirmButtonText: '确定'
         })
       })
+    },
+    openDialog(){
+      this.saveRework = {
+        seqNo: undefined,
+        site:this.$store.state.user.site,
+        type:"修边返工",
+      }
+      if (this.startReworkRecordDialog === true){
+        this.$nextTick(()=>{
+          this.$refs.seqNo.focus()
+        })
+      }
+      if (this.seqNoReworkRecordDialog === true){
+        this.$nextTick(()=>{
+          this.$refs.seqNoR.focus()
+        })
+      }
     }
   },
   created () {
@@ -240,10 +260,18 @@ export default {
 <template>
 <div>
   <choose-list ref="baseList"  @getBaseData="getBaseData"></choose-list>
-  <el-dialog title="返工返修" @close="closeStartReworkRecordDialog" :visible.sync="startReworkRecordDialog" :close-on-click-modal="false" width="13%">
+  <el-dialog title="返工返修" @close="closeStartReworkRecordDialog" @open="openDialog" :visible.sync="startReworkRecordDialog" :close-on-click-modal="false" width="13%">
     <el-form :model="saveRework" label-position="top" @submit.native.prevent>
       <el-form-item label="派工单号" prop="seqNo">
-        <el-input type="number" v-model="saveRework.seqNo" @keydown.native.enter="startRework"></el-input>
+        <el-input ref="seqNo" type="number" v-model="saveRework.seqNo" @keydown.native.enter="startRework"></el-input>
+      </el-form-item>
+      <el-form-item label="返修类型" prop="type">
+        <el-select v-model="saveRework.type">
+          <el-option value="修边返工" label="修边返工"></el-option>
+          <el-option value="检验返工" label="检验返工"></el-option>
+          <el-option value="包装返工" label="包装返工"></el-option>
+          <el-option value="外协返工" label="外协返工"></el-option>
+        </el-select>
       </el-form-item>
     </el-form>
     <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -251,10 +279,10 @@ export default {
       <el-button type="primary" @click="startReworkRecordDialog = false">取消</el-button>
     </el-footer>
   </el-dialog>
-  <el-dialog title="返修报工" :visible.sync="seqNoReworkRecordDialog" @close="closeStartReworkRecordDialog" :close-on-click-modal="false" width="13%">
+  <el-dialog title="返修报工" :visible.sync="seqNoReworkRecordDialog" @open="openDialog" @close="closeStartReworkRecordDialog" :close-on-click-modal="false" width="13%">
     <el-form :model="saveRework" label-position="top" @submit.native.prevent>
       <el-form-item label="派工单号" prop="seqNo">
-        <el-input type="number" v-model="saveRework.seqNo" @keydown.native.enter="getRework"></el-input>
+        <el-input ref="seqNoR" type="number" v-model="saveRework.seqNo" @keydown.native.enter="getRework"></el-input>
       </el-form-item>
     </el-form>
     <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -430,92 +458,105 @@ export default {
     </span>
   </el-dialog>
 
-  <el-form v-model="searchData" label-position="top">
-    <el-row :gutter="10">
-      <el-col :span="2">
-        <el-form-item label="工厂编码">
-          <el-input v-model="searchData.site"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="2">
-        <el-form-item label="生产订单号">
-          <el-input v-model="searchData.orderNo"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="2">
-        <el-form-item label="派工单号">
-          <el-input v-model="searchData.seqNo" type="number"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="2">
-        <el-form-item label="加工中心编码">
-          <span slot="label" style="" @click="getBaseList(24)"><a>加工中心编码</a></span>
-          <el-input v-model="searchData.workCenterNo"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="2">
-        <el-form-item label="产品编码">
-          <span slot="label" style="" @click="getBaseList(5)"><a>产品编码</a></span>
-          <el-input v-model="searchData.partNo"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="2">
-        <el-form-item label="规格型号">
-          <el-input v-model="searchData.partDesc"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="10">
-      <el-col :span="2">
-        <el-form-item label="返修日期：">
-          <el-date-picker
-            style="width: 100%"
-            v-model="searchData.reworkStartDate"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col :span="2">
-        <el-form-item label="至: ">
-          <el-date-picker
-            style="width: 100%"
-            v-model="searchData.reworkEndDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col :span="2">
-        <el-form-item label="操作员姓名">
-          <span slot="label" style="" @click="getBaseList(26,3)"><a>操作员姓名</a></span>
-          <el-input v-model="searchData.operatorName"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="2" v-if="false">
-        <el-form-item label="机台ID">
-          <span slot="label" style="" @click="getBaseList(88)"><a>机台ID</a></span>
-          <el-input v-model="searchData.resourceId"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="2" v-if="false">
-        <el-form-item label="班次">
-          <el-select v-model="searchData.shiftNo">
-            <el-option label="全部" value=""></el-option>
-            <el-option label="白班" value="白班"></el-option>
-            <el-option label="晚班" value="晚班"></el-option>
-            <el-option label="加班" value="加班"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="4">
-        <el-form-item label=" ">
-          <el-button type="primary" @click="selectRework">查 询</el-button>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
+  <div style="width: 800px">
+    <el-form v-model="searchData" label-position="top">
+      <el-row :gutter="10">
+        <el-col :span="4">
+          <el-form-item label="工厂编码">
+            <el-input v-model="searchData.site"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="生产订单号">
+            <el-input v-model="searchData.orderNo"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="派工单号">
+            <el-input v-model="searchData.seqNo" type="number"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="加工中心编码">
+            <span slot="label" style="" @click="getBaseList(24)"><a>加工中心编码</a></span>
+            <el-input v-model="searchData.workCenterNo"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="产品编码">
+            <span slot="label" style="" @click="getBaseList(5)"><a>产品编码</a></span>
+            <el-input v-model="searchData.partNo"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="规格型号">
+            <el-input v-model="searchData.partDesc"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10">
+        <el-col :span="4">
+          <el-form-item label="返修日期：">
+            <el-date-picker
+              style="width: 100%"
+              v-model="searchData.reworkStartDate"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="至: ">
+            <el-date-picker
+              style="width: 100%"
+              v-model="searchData.reworkEndDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="操作员姓名">
+            <span slot="label" style="" @click="getBaseList(26,3)"><a>操作员姓名</a></span>
+            <el-input v-model="searchData.operatorName"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4" v-if="false">
+          <el-form-item label="机台ID">
+            <span slot="label" style="" @click="getBaseList(88)"><a>机台ID</a></span>
+            <el-input v-model="searchData.resourceId"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4" v-if="false">
+          <el-form-item label="班次">
+            <el-select v-model="searchData.shiftNo">
+              <el-option label="全部" value=""></el-option>
+              <el-option label="白班" value="白班"></el-option>
+              <el-option label="晚班" value="晚班"></el-option>
+              <el-option label="加班" value="加班"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="返修类型" prop="type">
+            <el-select v-model="searchData.type">
+              <el-option value="" label="全部"></el-option>
+              <el-option value="修边返工" label="修边返工"></el-option>
+              <el-option value="检验返工" label="检验返工"></el-option>
+              <el-option value="包装返工" label="包装返工"></el-option>
+              <el-option value="外协返工" label="外协返工"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label=" ">
+            <el-button type="primary" @click="selectRework">查 询</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
   <div style="margin: 8px 0">
     <el-button size="small" icon="el-icon-edit" style="height: 24px" type="primary" @click="startReworkRecordDialog = true"> 开 始 返 修</el-button>
     <el-button size="small" type="primary" @click="seqNoReworkRecordDialog = true">返修报工</el-button>
@@ -549,6 +590,13 @@ export default {
       prop="seqNo"
       label="派工单号">
     </el-table-column>
+    <el-table-column
+      header-align="center"
+      align="center"
+      min-width="100"
+      prop="type"
+      label="返修类型">
+    </el-table-column>
     <el-table-column
       header-align="center"
       align="left"
diff --git a/src/views/modules/production/scanForm.vue b/src/views/modules/production/scanForm.vue
index 7c34e8f..831fe7d 100644
--- a/src/views/modules/production/scanForm.vue
+++ b/src/views/modules/production/scanForm.vue
@@ -72,7 +72,9 @@ export default {
         "产品编码": "partNo",
         "数量": "scanQty",
         "类型": "scanType",
-        "操作时间": "createData",
+        "JOB NO.": "seqNo",
+        "操作员": "createBy",
+        "扫描时间": "createData",
       },
       exportName: "发货扫描"+dayjs().format("YYYYMMDDHHmmss"),
     }