diff --git a/src/views/modules/qc/FQASResultEntry.vue b/src/views/modules/qc/FQASResultEntry.vue
index 496e3ae..af738cd 100644
--- a/src/views/modules/qc/FQASResultEntry.vue
+++ b/src/views/modules/qc/FQASResultEntry.vue
@@ -2439,8 +2439,12 @@
         this.detailData.operatorName = row.operatorName
         this.detailData.responsiblePerson = row.responsiblePerson
         this.detailData.responsiblePersonName = row.responsiblePersonName
-        this.detailData.passQty = row.passQty
-        this.detailData.notPassQty = row.notPassQty
+        if (row.state === '待检验') {
+          this.detailData.passQty = row.samplingQty
+        } else {
+          this.detailData.passQty = row.passQty
+          this.detailData.notPassQty = row.notPassQty
+        }
         this.getInspectionFormData()
         this.inspectorSearch()
         // this.acquisitionList = []
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index a9d507e..e4a97d6 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -573,10 +573,13 @@
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="seqDetailData.status" style="width: 100px" placeholder="请选择">
+            <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-option label="已开工" value="已开工"></el-option>
             <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-form>
@@ -3401,8 +3404,12 @@
         this.detailData.operatorName = row.operatorName
         this.detailData.responsiblePerson = row.responsiblePerson
         this.detailData.responsiblePersonName = row.responsiblePersonName
-        this.detailData.passQty = row.passQty
-        this.detailData.notPassQty = row.notPassQty
+        if (row.state === '待检验') {
+          this.detailData.passQty = row.samplingQty
+        } else {
+          this.detailData.passQty = row.passQty
+          this.detailData.notPassQty = row.notPassQty
+        }
         this.getInspectionFormData()
         this.inspectorSearch()
         // this.acquisitionList = []
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index ef69bbf..929e029 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -2071,19 +2071,19 @@
             fixed: '',
             columnWidth: 80,
           },
-          {
-            columnProp: 'passQty',
-            headerAlign: "center",
-            align: "right",
-            columnLabel: '合格数量',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80,
-          },
+          // {
+          //   columnProp: 'passQty',
+          //   headerAlign: "center",
+          //   align: "right",
+          //   columnLabel: '合格数量',
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: false,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          //   columnWidth: 80,
+          // },
         ],
         batchIndex: '',
         currentRow: {},
@@ -2271,7 +2271,6 @@
             submitList: JSON.parse(JSON.stringify(this.IQCSelections)),
             itemList: JSON.parse(JSON.stringify(this.batchDetailList))
           }
-          console.log(tempData)
           batchSaveIQCDetailedRecord(tempData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
@@ -3064,8 +3063,12 @@
         this.detailData.operatorName = row.operatorName
         this.detailData.responsiblePerson = row.responsiblePerson
         this.detailData.responsiblePersonName = row.responsiblePersonName
-        this.detailData.passQty = row.passQty
-        this.detailData.notPassQty = row.notPassQty
+        if (row.state === '待检验') {
+          this.detailData.passQty = row.samplingQty
+        } else {
+          this.detailData.passQty = row.passQty
+          this.detailData.notPassQty = row.notPassQty
+        }
         this.getInspectionFormData()
         this.inspectorSearch()
         // this.acquisitionList = []
diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue
index b5e32cf..9e31854 100644
--- a/src/views/modules/qc/OQCResultEntry.vue
+++ b/src/views/modules/qc/OQCResultEntry.vue
@@ -2439,8 +2439,12 @@
         this.detailData.operatorName = row.operatorName
         this.detailData.responsiblePerson = row.responsiblePerson
         this.detailData.responsiblePersonName = row.responsiblePersonName
-        this.detailData.passQty = row.passQty
-        this.detailData.notPassQty = row.notPassQty
+        if (row.state === '待检验') {
+          this.detailData.passQty = row.samplingQty
+        } else {
+          this.detailData.passQty = row.passQty
+          this.detailData.notPassQty = row.notPassQty
+        }
         this.getInspectionFormData()
         this.inspectorSearch()
         // this.acquisitionList = []
diff --git a/src/views/modules/report/FQAS_report.vue b/src/views/modules/report/FQAS_report.vue
index b030e27..edfec4a 100644
--- a/src/views/modules/report/FQAS_report.vue
+++ b/src/views/modules/report/FQAS_report.vue
@@ -43,20 +43,23 @@
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'关联单号1'">
-        <el-input v-model="searchData.orderRef1" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef1" clearable style="width: 183px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号2'">
-        <el-input v-model="searchData.orderRef2" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef2" clearable style="width: 183px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号3'">
-        <el-input v-model="searchData.orderRef3" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef3" clearable style="width: 183px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号4'">
-        <el-input v-model="searchData.orderRef4" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef4" clearable style="width: 183px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号5'">
-        <el-input v-model="searchData.orderRef5" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef5" clearable style="width: 183px"></el-input>
       </el-form-item>
+
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'检验结论'">
         <el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
           <el-option label="合格" value="合格"></el-option>
@@ -64,6 +67,12 @@
           <el-option label="免检" value="免检"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'项目检验结论'">
+        <el-select v-model="searchData.itemResult" clearable style="width: 80px">
+          <el-option label="合格" value="Y"></el-option>
+          <el-option label="不合格" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'处置措施'">
         <el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
           <el-option
@@ -74,17 +83,15 @@
           </el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'送检日期'">
-        <el-date-picker style="width: 170px" v-model="searchData.startDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.startDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 170px" v-model="searchData.endDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.endDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="'检验日期'">
-        <el-date-picker style="width: 170px" v-model="searchData.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 170px" v-model="searchData.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList">查询</el-button>
@@ -242,6 +249,7 @@
           partDesc:'',
           state: '',
           inspectionResult: '',
+          itemResult: '',
           disposalMeasures: '',
           inspectorName: '',
           page: 1,
@@ -911,6 +919,24 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001003,
+            serialNumber: '107001003Table1ItemResultDesc',
+            tableId: "107001003Table1",
+            tableName: "FQAS报表",
+            columnProp: 'itemResultDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '项目检验结论',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
         ],
         SubDetailColumnList: [
           {
diff --git a/src/views/modules/report/IPQC_report.vue b/src/views/modules/report/IPQC_report.vue
index a65e791..ea5cfbf 100644
--- a/src/views/modules/report/IPQC_report.vue
+++ b/src/views/modules/report/IPQC_report.vue
@@ -24,11 +24,33 @@
         <el-input v-model="searchData.inspectionNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'物料编码'">
-        <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.partNo" clearable style="width: 150px"></el-input>
       </el-form-item>
       <el-form-item :label="'物料名称'">
-        <el-input v-model="searchData.partDesc" clearable style="width: 260px"></el-input>
+        <el-input v-model="searchData.partDesc" clearable style="width: 400px"></el-input>
       </el-form-item>
+
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+      <el-form-item :label="'工单号'">
+        <el-input v-model="searchData.orderNo" clearable style="width: 173px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'派工单号'">
+        <el-input v-model="searchData.seqNo" clearable style="width: 173px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工序'">
+        <el-input v-model="searchData.operationDesc" clearable style="width: 173px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'状态'">
+        <el-select v-model="searchData.states" multiple style="width: 365px">
+          <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-form>
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'检验类型'">
         <el-select v-model="searchData.inspectionTypeNo" clearable style="width: 100px">
           <el-option label="IPQC首检" value="101"></el-option>
@@ -43,6 +65,12 @@
           <el-option label="不合格" value="不合格"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'项目检验结论'">
+        <el-select v-model="searchData.itemResult" clearable style="width: 80px">
+          <el-option label="合格" value="Y"></el-option>
+          <el-option label="不合格" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'处置措施'">
         <el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
           <el-option
@@ -53,36 +81,15 @@
           </el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
-      <el-form-item :label="'工单号'">
-        <el-input v-model="searchData.orderNo" clearable style="width: 173px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'派工单号'">
-        <el-input v-model="searchData.seqNo" clearable style="width: 173px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'工序'">
-        <el-input v-model="searchData.operationDesc" clearable style="width: 173px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'状态'">
-        <el-select v-model="searchData.states" multiple style="width: 365px">
-          <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-form>
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'送检日期'">
-        <el-date-picker style="width: 180px" v-model="searchData.startDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 120px" v-model="searchData.startDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 180px" v-model="searchData.endDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 120px" v-model="searchData.endDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="'检验日期：'">
-        <el-date-picker style="width: 180px" v-model="searchData.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 120px" v-model="searchData.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 180px" v-model="searchData.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 120px" v-model="searchData.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList">查询</el-button>
@@ -225,6 +232,7 @@
           inspectionNo: '',
           state: '',
           inspectionResult: '',
+          itemResult: '',
           orderNo: '',
           operationDesc: '',
           buDesc: '',
@@ -845,6 +853,24 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001002,
+            serialNumber: '107001002Table1ItemResultDesc',
+            tableId: "107001002Table1",
+            tableName: "IPQC报表",
+            columnProp: 'itemResultDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '项目检验结论',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
         ],
         SubDetailColumnList: [
           {
diff --git a/src/views/modules/report/IQC_report.vue b/src/views/modules/report/IQC_report.vue
index 7fa32ff..6705b0b 100644
--- a/src/views/modules/report/IQC_report.vue
+++ b/src/views/modules/report/IQC_report.vue
@@ -88,6 +88,12 @@
           <el-option label="免检" value="免检"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'项目检验结论'">
+        <el-select v-model="searchData.itemResult" clearable style="width: 80px">
+          <el-option label="合格" value="Y"></el-option>
+          <el-option label="不合格" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'处置措施'">
         <el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
           <el-option
@@ -264,6 +270,7 @@
           partDesc:'',
           state: '',
           inspectionResult: '',
+          itemResult: '',
           supplierNo: '',
           disposalMeasures: '',
           inspectorName: '',
@@ -1012,6 +1019,24 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001001,
+            serialNumber: '107001001Table1ItemResultDesc',
+            tableId: "107001001Table1",
+            tableName: "IQC报表",
+            columnProp: 'itemResultDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '项目检验结论',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
         ],
         SubDetailColumnList: [
           {
diff --git a/src/views/modules/report/OQC_report.vue b/src/views/modules/report/OQC_report.vue
index 2d9191c..9340fbc 100644
--- a/src/views/modules/report/OQC_report.vue
+++ b/src/views/modules/report/OQC_report.vue
@@ -43,20 +43,22 @@
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'关联单号1'">
-        <el-input v-model="searchData.orderRef1" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef1" clearable style="width: 183px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号2'">
-        <el-input v-model="searchData.orderRef2" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef2" clearable style="width: 183px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号3'">
-        <el-input v-model="searchData.orderRef3" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef3" clearable style="width: 183px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号4'">
-        <el-input v-model="searchData.orderRef4" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef4" clearable style="width: 183px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号5'">
-        <el-input v-model="searchData.orderRef5" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef5" clearable style="width: 183px"></el-input>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'检验结论'">
         <el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
           <el-option label="合格" value="合格"></el-option>
@@ -64,6 +66,12 @@
           <el-option label="免检" value="免检"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'项目检验结论'">
+        <el-select v-model="searchData.itemResult" clearable style="width: 80px">
+          <el-option label="合格" value="Y"></el-option>
+          <el-option label="不合格" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'处置措施'">
         <el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
           <el-option
@@ -74,17 +82,15 @@
           </el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'送检日期'">
-        <el-date-picker style="width: 170px" v-model="searchData.startDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.startDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 170px" v-model="searchData.endDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.endDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="'检验日期'">
-        <el-date-picker style="width: 170px" v-model="searchData.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 170px" v-model="searchData.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList">查询</el-button>
@@ -242,6 +248,7 @@ export default {
         partDesc:'',
         state: '',
         inspectionResult: '',
+        itemResult: '',
         disposalMeasures: '',
         inspectorName: '',
         page: 1,
@@ -911,6 +918,24 @@ export default {
           fixed: '',
           columnWidth: 100,
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 107001004,
+          serialNumber: '107001004Table1ItemResultDesc',
+          tableId: "107001004Table1",
+          tableName: "OQC子明细",
+          columnProp: 'itemResultDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '项目检验结论',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
       ],
       SubDetailColumnList: [
         {