diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js
index 9c4e7d8..a8bf8bc 100644
--- a/src/api/qc/qc.js
+++ b/src/api/qc/qc.js
@@ -135,6 +135,7 @@ export const queryTemplateList = data => createAPI(`/pms/qc/queryTemplateList`,'
 export const getPartInformation = data => createAPI(`/pms/qc/getPartInformation`,'post',data)
 export const getSpecialOperationList = data => createAPI(`/pms/qc/getSpecialOperationList`,'post',data)
 export const getRollNo = data => createAPI(`/pms/qc/getRollNo`,'post',data)
+export const rollNoEnter = data => createAPI(`/pms/qc/rollNoEnter`,'post',data)
 
 // ===================================== IQC检验 =====================================
 export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data)
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 91cb0b2..acb959c 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -136,14 +136,16 @@
     <el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="标签号">
-          <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
-                           :fetch-suggestions="querySearchAsync" @select="handleSelect"
-                           placeholder="请输入标签号">
-          </el-autocomplete>
-          <el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
-                           :fetch-suggestions="querySearchAsync" @select="handleSelect"
-                           placeholder="请输入标签号">
-          </el-autocomplete>
+<!--          <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
+<!--                           :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
+<!--                           placeholder="请输入标签号">-->
+<!--          </el-autocomplete>-->
+<!--          <el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
+<!--                           :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
+<!--                           placeholder="请输入标签号">-->
+<!--          </el-autocomplete>-->
+          <el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 456px"></el-input>
+          <el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 456px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@@ -600,6 +602,7 @@
     InspectionTypeSearch, // 搜索所有检验类型
     disposalMeasuresSearch, // 获取处置措施列表
     getRollNo, // 模糊查询标签号
+    rollNoEnter // 标签号回车事件
   } from "@/api/qc/qc.js";
   import Chooselist from '@/views/modules/common/Chooselist_eam';
   import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@@ -1329,6 +1332,33 @@
     },
     methods: {
 
+      // 标签号回车事件
+      rollNoEnter () {
+        let tempData = {
+          site: this.$store.state.user.site,
+          rollNo: this.modalData.rollNo
+        }
+        rollNoEnter(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.operationList = data.rows
+            this.modalData.seqNo = data.rows[0].seqNo
+            this.modalData.orderNo = data.rows[0].orderNo
+            this.modalData.operationDesc = data.rows[0].operationDesc
+            this.modalData.workCenterNo = data.rows[0].workCenterNo
+            this.modalData.resourceId = data.rows[0].resourceId
+            this.modalData.resourceDesc = data.rows[0].resourceDesc
+            this.modalData.partNo = data.rows[0].partNo
+            this.modalData.partDesc = data.rows[0].partDesc
+            this.modalData.spec = data.rows[0].spec
+            this.modalData.sku = data.rows[0].sku
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
       querySearchAsync (queryString, cb) {
         clearTimeout(this.timeout)
         let results = []
@@ -1385,7 +1415,10 @@
 
       // 查询检验类型
       InspectionTypeSearch(){
-        InspectionTypeSearch().then(({data}) => {
+        let tempData = {
+          site: this.$store.state.user.site
+        }
+        InspectionTypeSearch(tempData).then(({data}) => {
           if (data.code === 0) {
             this.typeOptions = data.rows
           }
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index a9b78db..7e343bc 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -134,14 +134,16 @@
     <el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="标签号">
-          <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
-                           :fetch-suggestions="querySearchAsync" @select="handleSelect"
-                           placeholder="请输入标签号">
-          </el-autocomplete>
-          <el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
-                           :fetch-suggestions="querySearchAsync" @select="handleSelect"
-                           placeholder="请输入标签号">
-          </el-autocomplete>
+<!--          <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
+<!--                           :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
+<!--                           placeholder="请输入标签号">-->
+<!--          </el-autocomplete>-->
+<!--          <el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
+<!--                           :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
+<!--                           placeholder="请输入标签号">-->
+<!--          </el-autocomplete>-->
+          <el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 456px"></el-input>
+          <el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 456px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@@ -598,6 +600,7 @@
     InspectionTypeSearch, // 搜索所有检验类型
     disposalMeasuresSearch, // 获取处置措施列表
     getRollNo, // 模糊查询标签号
+    rollNoEnter // 标签号回车事件
   } from "@/api/qc/qc.js";
   import Chooselist from '@/views/modules/common/Chooselist_eam';
   import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@@ -1326,6 +1329,34 @@
       this.disposalMeasuresSearch()
     },
     methods: {
+
+      // 标签号回车事件
+      rollNoEnter () {
+        let tempData = {
+          site: this.$store.state.user.site,
+          rollNo: this.modalData.rollNo
+        }
+        rollNoEnter(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.operationList = data.rows
+            this.modalData.seqNo = data.rows[0].seqNo
+            this.modalData.orderNo = data.rows[0].orderNo
+            this.modalData.operationDesc = data.rows[0].operationDesc
+            this.modalData.workCenterNo = data.rows[0].workCenterNo
+            this.modalData.resourceId = data.rows[0].resourceId
+            this.modalData.resourceDesc = data.rows[0].resourceDesc
+            this.modalData.partNo = data.rows[0].partNo
+            this.modalData.partDesc = data.rows[0].partDesc
+            this.modalData.spec = data.rows[0].spec
+            this.modalData.sku = data.rows[0].sku
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
       querySearchAsync (queryString, cb) {
         clearTimeout(this.timeout)
         let results = []
@@ -1382,7 +1413,10 @@
 
       // 查询检验类型
       InspectionTypeSearch(){
-        InspectionTypeSearch().then(({data}) => {
+        let tempData = {
+          site: this.$store.state.user.site
+        }
+        InspectionTypeSearch(tempData).then(({data}) => {
           if (data.code === 0) {
             this.typeOptions = data.rows
           }
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 17201d0..301b1f1 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -144,14 +144,16 @@
     <el-dialog title="新增巡检记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="标签号">
-          <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
-                           :fetch-suggestions="querySearchAsync" @select="handleSelect"
-                           placeholder="请输入标签号">
-          </el-autocomplete>
-          <el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
-                           :fetch-suggestions="querySearchAsync" @select="handleSelect"
-                           placeholder="请输入标签号">
-          </el-autocomplete>
+<!--          <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
+<!--                           :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
+<!--                           placeholder="请输入标签号">-->
+<!--          </el-autocomplete>-->
+<!--          <el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
+<!--                           :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
+<!--                           placeholder="请输入标签号">-->
+<!--          </el-autocomplete>-->
+          <el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 456px"></el-input>
+          <el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 456px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@@ -617,7 +619,7 @@
     InspectionTypeSearch, // 搜索所有检验类型
     disposalMeasuresSearch, // 获取处置措施列表
     getRollNo, // 模糊查询标签号
-    getOrderNoList // 查询工单列表
+    rollNoEnter // 标签号回车事件
   } from "@/api/qc/qc.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'
@@ -1376,6 +1378,33 @@
     },
     methods: {
 
+      // 标签号回车事件
+      rollNoEnter () {
+        let tempData = {
+          site: this.$store.state.user.site,
+          rollNo: this.modalData.rollNo
+        }
+        rollNoEnter(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.operationList = data.rows
+            this.modalData.seqNo = data.rows[0].seqNo
+            this.modalData.orderNo = data.rows[0].orderNo
+            this.modalData.operationDesc = data.rows[0].operationDesc
+            this.modalData.workCenterNo = data.rows[0].workCenterNo
+            this.modalData.resourceId = data.rows[0].resourceId
+            this.modalData.resourceDesc = data.rows[0].resourceDesc
+            this.modalData.partNo = data.rows[0].partNo
+            this.modalData.partDesc = data.rows[0].partDesc
+            this.modalData.spec = data.rows[0].spec
+            this.modalData.sku = data.rows[0].sku
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
       // input 模糊搜索
       querySearchAsync (queryString, cb) {
         clearTimeout(this.timeout)
@@ -1433,7 +1462,10 @@
 
       // 查询检验类型
       InspectionTypeSearch(){
-        InspectionTypeSearch().then(({data}) => {
+        let tempData = {
+          site: this.$store.state.user.site
+        }
+        InspectionTypeSearch(tempData).then(({data}) => {
           if (data.code === 0) {
             this.typeOptions = data.rows
           }
@@ -1627,7 +1659,6 @@
           if (data && data.code === 0) {
             this.operationList = data.rows
             this.modalData.operationDesc = data.rows[0].operationDesc
-            //this.getResourceList()
             this.modalData.workCenterNo = data.rows[0].workCenterNo
             this.modalData.resourceId = data.rows[0].resourceId
             this.modalData.resourceDesc = data.rows[0].resourceDesc