diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 901f857..8fab0d1 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -152,22 +152,22 @@
     <el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px">
       <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
         <el-form-item :label="'物料编码'">
-          <el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
+          <el-input v-model="detailData.partNo" disabled style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="'物料名称'">
-          <el-input v-model="detailData.partDesc" disabled style="width: 200px"></el-input>
+          <el-input v-model="detailData.partDesc" disabled style="width: 220px"></el-input>
         </el-form-item>
         <el-form-item :label="'计量单位'">
-          <el-input v-model="detailData.umId" disabled style="width: 200px"></el-input>
+          <el-input v-model="detailData.umId" disabled style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="'到货数量'">
-          <el-input class="numInput" v-model="detailData.rollQty" type="number" disabled style="width: 80px"></el-input>
+          <el-input class="numInput" v-model="detailData.rollQty" type="number" disabled style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="'送检数量'">
-          <el-input class="numInput" v-model="detailData.rollCount" type="number" disabled style="width: 80px"></el-input>
+          <el-input class="numInput" v-model="detailData.rollCount" type="number" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="'抽样数量'">
-          <el-input class="numInput" v-model="detailData.samplingQty" type="number" disabled style="width: 80px"></el-input>
+          <el-input class="numInput" v-model="detailData.samplingQty" type="number" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
@@ -290,6 +290,17 @@
               <el-button v-if="scope.row.subDetailRecordNum > 0" type="success" @click="subDetailModal(scope.row) ">点击输入</el-button>
             </template>
           </el-table-column>
+          <el-table-column
+            prop=""
+            header-align="center"
+            align="right"
+            min-width="80"
+            label="抽样数量">
+            <template slot-scope="scope">
+              <el-input class="numInput" v-if="detailData.submitFlag == 'Y'" v-model="scope.row.samplingQty" disabled type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+              <el-input class="numInput" :ref="`samplingQty${scope.$index}`" v-if="detailData.submitFlag != 'Y'" v-model="scope.row.samplingQty" type="number" @keyup.enter.native="focusNextInput(scope.$index, 'samplingQty')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column
             prop=""
             header-align="center"
@@ -1207,7 +1218,9 @@
           inspectorNo: '',
           inspectionRemark: '',
           itemList:[],
-          unqualifiedQty: ''
+          unqualifiedQty: '',
+          rollCount: '',
+          samplingQty: ''
         },
         // 子明细数据对象
         tableData: [],
@@ -1458,43 +1471,18 @@
         this.dataListSelections = val
       },
       // 查询检验类型
-      inspectorSearch(){
+      inspectorSearch () {
         inspectorSearch().then(({data}) => {
           if (data.code === 0) {
             this.options = data.rows
           }
         })
       },
-      async Transfer(){
+      async Transfer () {
         if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) {
           this.$message.warning('请选择检验结论！')
           return
         }
-        // let num = 0 // 记录结论为不合格的项目数
-        // for (let i = 0; i < this.detailList.length; i++) {
-        //   if(this.detailList[i].valueTypeDb === 'N') { // 如果检验值类型为数字
-        //     await checkIQCSubDetailValue(this.detailList[i]).then(({data}) => {
-        //       if (data.flag === 2 && this.detailList[i].itemResult === 'Y') { // 如果项目实测值超出范围且项目结论为合格
-        //         this.detailList[i].itemResult = 'N'
-        //         num = num + 1
-        //       }
-        //     })
-        //   }
-        //   if(this.detailList[i].itemResult === '' || this.detailList[i].itemResult == null){ // 默认结论为合格
-        //     this.detailList[i].itemResult = 'Y'
-        //   }
-        // }
-        // if (this.detailData.inspectionResult === '合格' && num > 0){
-        //   this.$confirm('存在不合格项目，是否将检验记录保存为合格', '提示', {
-        //     confirmButtonText: '确定',
-        //     cancelButtonText: '取消',
-        //     type: 'warning'
-        //   }).then(() => {
-        //     this.saveDetailInformation()
-        //   })
-        // }else {
-        //   this.saveDetailInformation()
-        // }
         this.saveDetailInformation()
       },
 
@@ -1506,6 +1494,8 @@
         this.saveInformationData.inspectorNo = this.$store.state.user.name
         this.saveInformationData.inspectionResult = this.detailData.inspectionResult
         this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark
+        this.saveInformationData.rollCount = this.detailData.rollCount
+        this.saveInformationData.samplingQty = this.detailData.samplingQty
         this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
         this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
         saveIQCDetailedRecord(this.saveInformationData).then(({data}) => {