diff --git a/src/views/modules/qc/DoInspectionBySeqNo.vue b/src/views/modules/qc/DoInspectionBySeqNo.vue
index d1b82bf..d2e37e7 100644
--- a/src/views/modules/qc/DoInspectionBySeqNo.vue
+++ b/src/views/modules/qc/DoInspectionBySeqNo.vue
@@ -39,16 +39,24 @@
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
       <el-form-item label="车间编码">
-        <el-input v-model="searchData.departmentID" clearable style="width: 150px"></el-input>
+        <el-input v-model="searchData.departmentID" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item label="加工中心">
-        <el-input v-model="searchData.workCenterNo" clearable style="width: 150px"></el-input>
+        <el-input v-model="searchData.workCenterNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item label="工序">
-        <el-input v-model="searchData.operationDesc" clearable style="width: 150px"></el-input>
+        <el-input v-model="searchData.operationDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item label="派工单创建人">
-        <el-input v-model="searchData.operatorName" clearable style="width: 150px"></el-input>
+        <el-input v-model="searchData.operatorName" clearable style="width: 100px"></el-input>
+      </el-form-item>
+      <el-form-item label="检验类型">
+        <el-select v-model="searchData.inspectionTypeNo" style="width: 100px" clearable placeholder="请选择">
+          <el-option label="IPQC首检" value="首件检"></el-option>
+          <el-option label="IPQC自检" value="自检"></el-option>
+          <el-option label="IPQC巡检" value="巡检"></el-option>
+          <el-option label="IPQC末件检" value="末件检"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="'派工日期'">
         <el-date-picker style="width: 125px" v-model="searchData.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
@@ -152,7 +160,7 @@
         <el-form-item label="物料编码" prop="partNo" :rules="rules.partNoType">
           <el-input v-model="modalData.partNo" readonly style="width: 221px"></el-input>
         </el-form-item>
-        <el-form-item label="物料类别">
+        <el-form-item label="规格型号">
           <el-input v-model="modalData.spec" readonly style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
@@ -292,6 +300,7 @@
           workCenterNo: '',
           operatorName: '',
           departmentID: '',
+          inspectionTypeNo: '',
           page: 1,
           limit: 10
         },
@@ -705,6 +714,78 @@
             status: true,
             columnWidth: 150,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 3010005001,
+            serialNumber: '3010005001Table1TypeFlag1',
+            tableId: "3010005001Table1",
+            tableName: "派工单号表",
+            fixed: '',
+            columnProp: 'typeFlag1',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'IPQC首检',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 3010005001,
+            serialNumber: '3010005001Table1TypeFlag2',
+            tableId: "3010005001Table1",
+            tableName: "派工单号表",
+            fixed: '',
+            columnProp: 'typeFlag2',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'IPQC自检',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 3010005001,
+            serialNumber: '3010005001Table1TypeFlag3',
+            tableId: "3010005001Table1",
+            tableName: "派工单号表",
+            fixed: '',
+            columnProp: 'typeFlag3',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'IPQC巡检',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 3010005001,
+            serialNumber: '3010005001Table1TypeFlag4',
+            tableId: "3010005001Table1",
+            tableName: "派工单号表",
+            fixed: '',
+            columnProp: 'typeFlag4',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'IPQC末件检',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 80,
+          },
         ],
         templateDetailList: [
           {
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 61a8b40..4e8e3b5 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -273,7 +273,7 @@
         <el-form-item v-else label="物料编码" prop="partNo" :rules="rules.partNoType">
           <el-input v-model="modalData.partNo" readonly style="width: 221px"></el-input>
         </el-form-item>
-        <el-form-item label="物料类别">
+        <el-form-item label="规格型号">
           <el-input v-model="modalData.spec" readonly style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
@@ -338,31 +338,34 @@
         <el-form-item :label="'物料编码'">
           <el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
         </el-form-item>
-        <el-form-item :label="'物料类别'">
+        <el-form-item :label="'规格型号'">
           <el-input v-model="detailData.spec" readonly style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item :label="'物料名称'">
           <el-input v-model="detailData.partDesc" readonly style="width: 200px"></el-input>
         </el-form-item>
+        <el-form-item :label="'班次'">
+          <el-input v-model="detailData.shiftDesc" disabled style="width: 80px"></el-input>
+        </el-form-item>
         <el-form-item :label="'送检数量'">
-          <el-input class="inlineNumber numInput" v-model="detailData.rollQty" type="number" style="width: 80px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="detailData.rollQty" type="number" style="width: 70px"></el-input>
         </el-form-item>
         <el-form-item :label="'抽样数量'">
-          <el-input class="inlineNumber numInput" v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="detailData.samplingQty" type="number" style="width: 70px"></el-input>
         </el-form-item>
         <el-form-item :label="'单位'">
-          <el-input v-model="detailData.umName" readonly style="width: 80px"></el-input>
+          <el-input v-model="detailData.umName" readonly style="width: 70px"></el-input>
         </el-form-item>
         <el-form-item :label="'不合格项目数量'">
           <el-input class="inlineNumber numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
           <el-input class="inlineNumber numInput" v-else @input="handleInput(detailData.unqualifiedQty,1)" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
         </el-form-item>
         <el-form-item :label="'合格数量'">
-          <el-input class="inlineNumber numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled type="number" style="width: 80px"></el-input>
-          <el-input class="inlineNumber numInput" v-else @input="handleInput(detailData.passQty,2)" v-model="detailData.passQty" type="number" style="width: 80px"></el-input>
+          <el-input class="inlineNumber numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled type="number" style="width: 70px"></el-input>
+          <el-input class="inlineNumber numInput" v-else @input="handleInput(detailData.passQty,2)" v-model="detailData.passQty" type="number" style="width: 70px"></el-input>
         </el-form-item>
         <el-form-item :label="'不合格数量'">
-          <el-input class="inlineNumber numInput" v-model="detailData.notPassQty" type="number" disabled style="width: 80px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="detailData.notPassQty" type="number" disabled style="width: 70px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList">
@@ -381,15 +384,15 @@
           <el-input v-else v-model="detailData.inspectionRemark" style="width: 303px"></el-input>
         </el-form-item>
         <el-form-item label="检验员">
-          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
-            <el-option
-              v-for = "i in options"
-              :key = "i.inspectorNo"
-              :label = "i.inspectorName"
-              :value = "i.inspectorNo">
-            </el-option>
-          </el-select>
-          <el-select v-else v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
+<!--          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled style="width: 100px">-->
+<!--            <el-option-->
+<!--              v-for = "i in options"-->
+<!--              :key = "i.inspectorNo"-->
+<!--              :label = "i.inspectorName"-->
+<!--              :value = "i.inspectorNo">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+          <el-select v-model="detailData.inspectorNo" disabled style="width: 100px">
             <el-option
               v-for = "i in options"
               :key = "i.inspectorNo"
@@ -1668,7 +1671,8 @@
           responsiblePerson: '',
           responsiblePersonName: '',
           passQty: '',
-          notPassQty: ''
+          notPassQty: '',
+          shiftDesc: ''
         },
         detailInformationFlag: false,
         detailList: [],
@@ -3598,7 +3602,6 @@
               })
             }
           })
-        }).catch(() => {
         })
       },
 
@@ -3727,6 +3730,7 @@
         this.detailData.operatorName = row.operatorName
         this.detailData.responsiblePerson = row.responsiblePerson
         this.detailData.responsiblePersonName = row.responsiblePersonName
+        this.detailData.shiftDesc = row.shiftDesc
         if (row.state === '待检验') {
           this.detailData.passQty = row.samplingQty
         } else {