From a5c5a0ec7edc0ae9a64fd21695732e0095df7deb Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 14 Apr 2026 10:02:49 +0800
Subject: [PATCH] =?UTF-8?q?2026-04-14=20=E6=A3=80=E9=AA=8C=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/FQCResultEntry.vue  |  12 +--
 src/views/modules/qc/IPQCResultEntry.vue |  16 ++--
 src/views/modules/qc/IQCResultEntry.vue  | 113 ++++++++++++-----------
 src/views/modules/qc/OQCResultEntry.vue  |  12 +--
 4 files changed, 80 insertions(+), 73 deletions(-)

diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 1dcb7e6..f545d47 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -30,7 +30,7 @@
         <template v-if="searchExpanded">
           <!-- 第一行：基础单据信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="BU">
                 <el-select v-model="searchData.buNo" placeholder="请选择" clearable>
                   <el-option
@@ -57,7 +57,7 @@
                 <el-input v-model="searchData.orderNo" placeholder="请输入工单号" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item label="派工单号">
                 <el-input v-model="searchData.seqNo" placeholder="请输入派工单号" clearable></el-input>
               </el-form-item>
@@ -66,7 +66,7 @@
 
           <!-- 第二行：物料信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="物料编码">
                 <el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable></el-input>
               </el-form-item>
@@ -92,7 +92,7 @@
 
           <!-- 第三行：检验相关信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="检验结论">
                 <el-select v-model="searchData.inspectionResult" clearable placeholder="请选择检验结论">
                   <el-option label="合格" value="合格">
@@ -135,7 +135,7 @@
 
           <!-- 第四行：日期信息 -->
           <el-row :gutter="16">
-            <el-col :span="9">
+            <el-col :span="7">
               <el-form-item label="送检日期">
                 <el-date-picker
                   v-model="searchData.startDate2"
@@ -156,7 +156,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="9">
+            <el-col :span="8">
               <el-form-item label="检验时间">
                 <el-date-picker
                   v-model="searchData.startDate"
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 82d1124..57ba724 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -30,7 +30,7 @@
         <template v-if="searchExpanded">
           <!-- 第一行：基础单据信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="BU">
                 <el-select v-model="searchData.buNo" placeholder="请选择" clearable>
                   <el-option
@@ -57,7 +57,7 @@
                 <el-input v-model="searchData.seqNo" placeholder="请输入派工单号" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item label="检验类型">
                 <el-select v-model="searchData.inspectionTypeNo" clearable placeholder="请选择检验类型">
                   <el-option label="IPQC首检" value="首件检"></el-option>
@@ -71,7 +71,7 @@
 
           <!-- 第二行：物料信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="物料编码">
                 <el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable></el-input>
               </el-form-item>
@@ -93,7 +93,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item label="机台">
                 <el-select v-model="searchData.resourceId" clearable filterable placeholder="请选择机台">
                   <el-option
@@ -109,7 +109,7 @@
 
           <!-- 第四行：检验相关信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="加工中心">
                 <el-select v-model="searchData.workCenterNo" clearable filterable placeholder="请选择加工中心">
                   <el-option
@@ -155,7 +155,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item label="质检员">
                 <el-input v-model="searchData.inspectorName" placeholder="请输入质检员姓名" clearable></el-input>
               </el-form-item>
@@ -164,7 +164,7 @@
 
           <!-- 第四行：日期信息 -->
           <el-row :gutter="16">
-            <el-col :span="9">
+            <el-col :span="7">
               <el-form-item label="送检日期">
                 <el-date-picker
                   v-model="searchData.startDate2"
@@ -185,7 +185,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="9">
+            <el-col :span="8">
               <el-form-item label="检验时间">
                 <el-date-picker
                   v-model="searchData.startDate"
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index dbd059a..c954684 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -30,7 +30,7 @@
         <template v-if="searchExpanded">
           <!-- 第一行：基础单据信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="BU">
                 <el-select v-model="searchData.buNo" placeholder="请选择" clearable>
                   <el-option
@@ -57,7 +57,7 @@
                 <el-input v-model="searchData.poItemNo" placeholder="请输入单据行号" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item label="采购类型">
                 <el-select v-model="searchData.orderType" clearable placeholder="请选择采购类型">
                   <el-option label="采购订单" value="采购订单"></el-option>
@@ -69,7 +69,7 @@
 
           <!-- 第二行：物料信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="物料编码">
                 <el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable>
                 </el-input>
@@ -90,7 +90,7 @@
                 <el-input v-model="searchData.invdefinetype" placeholder="请输入物料类别" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span=4>
               <el-form-item label="供应商">
                 <el-input v-model="searchData.supplierDesc" placeholder="请输入供应商" clearable></el-input>
               </el-form-item>
@@ -99,7 +99,7 @@
 
           <!-- 第三行：供应商及检验相关信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="质检员">
                 <el-input v-model="searchData.inspectorName" placeholder="请输入质检员姓名" clearable></el-input>
               </el-form-item>
@@ -138,7 +138,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item label="处置措施">
                 <el-select v-model="searchData.disposalMeasures" clearable placeholder="请选择处置措施">
                   <el-option
@@ -152,51 +152,56 @@
             </el-col>
           </el-row>
 
-          <!-- 第四行：检验结论及处置措施 -->
-          <el-row :gutter="16">
-            <el-col :span="9">
-              <el-form-item label="送检日期">
-                <el-date-picker
-                  v-model="searchData.startDate2"
-                  type="datetime"
-                  value-format='yyyy-MM-dd HH:mm'
-                  format='yyyy-MM-dd HH:mm'
-                  placeholder="开始日期"
-                  style="width: 44%">
-                </el-date-picker>
-                <span style="margin: 0 6px; color: #DCDFE6;">~</span>
-                <el-date-picker
-                  v-model="searchData.endDate2"
-                  type="datetime"
-                  value-format='yyyy-MM-dd HH:mm'
-                  format='yyyy-MM-dd HH:mm'
-                  placeholder="结束日期"
-                  style="width: 44%">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="9">
-              <el-form-item label="检验时间">
-                <el-date-picker
-                  v-model="searchData.startDate"
-                  type="datetime"
-                  value-format='yyyy-MM-dd HH:mm'
-                  format='yyyy-MM-dd HH:mm'
-                  placeholder="开始日期"
-                  style="width: 44%">
-                </el-date-picker>
-                <span style="margin: 0 6px; color: #DCDFE6;">~</span>
-                <el-date-picker
-                  v-model="searchData.endDate"
-                  type="datetime"
-                  value-format='yyyy-MM-dd HH:mm'
-                  format='yyyy-MM-dd HH:mm'
-                  placeholder="结束日期"
-                  style="width: 44%">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
+        <!-- 第四行：检验结论及处置措施 -->
+        <el-row :gutter="16">
+          <el-col :span="7">
+            <el-form-item label="送检日期">
+              <el-date-picker
+                v-model="searchData.startDate2"
+                type="datetime"
+                value-format='yyyy-MM-dd HH:mm'
+                format='yyyy-MM-dd HH:mm'
+                placeholder="开始日期"
+                style="width: 44%">
+              </el-date-picker>
+              <span style="margin: 0 6px; color: #DCDFE6;">~</span>
+              <el-date-picker
+                v-model="searchData.endDate2"
+                type="datetime"
+                value-format='yyyy-MM-dd HH:mm'
+                format='yyyy-MM-dd HH:mm'
+                placeholder="结束日期"
+                style="width: 44%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检验时间">
+              <el-date-picker
+                v-model="searchData.startDate"
+                type="datetime"
+                value-format='yyyy-MM-dd HH:mm'
+                format='yyyy-MM-dd HH:mm'
+                placeholder="开始日期"
+                style="width: 44%">
+              </el-date-picker>
+              <span style="margin: 0 6px; color: #DCDFE6;">~</span>
+              <el-date-picker
+                v-model="searchData.endDate"
+                type="datetime"
+                value-format='yyyy-MM-dd HH:mm'
+                format='yyyy-MM-dd HH:mm'
+                placeholder="结束日期"
+                style="width: 44%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="通知单号">
+              <el-input v-model="searchData.documentNo" placeholder="请输入通知单号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         </template>
 
         <!-- 操作按钮区域 -->
@@ -1277,7 +1282,8 @@
           orderType: '',
           states: ['未开始','待检验'],
           submissionType: '',
-          invdefinetype: ''
+          invdefinetype: '',
+          documentNo: ''
         },
         pageIndex: 1,
         pageSize: 20,
@@ -2423,7 +2429,8 @@
           orderType: '',
           states: ['未开始','待检验'],
           submissionType: '',
-          invdefinetype: ''
+          invdefinetype: '',
+          documentNo: ''
         }
       },
 
diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue
index dd8e8a2..6a8c8f0 100644
--- a/src/views/modules/qc/OQCResultEntry.vue
+++ b/src/views/modules/qc/OQCResultEntry.vue
@@ -31,7 +31,7 @@
         <template v-if="searchExpanded">
           <!-- 第一行：基础单据信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="BU">
                 <el-select v-model="searchData.buDesc" placeholder="请选择BU" clearable>
                   <el-option
@@ -58,7 +58,7 @@
                 <el-input v-model="searchData.customerNo" placeholder="请输入客户编码" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item label="客户名称">
                 <el-input v-model="searchData.customerName" placeholder="请输入客户名称" clearable></el-input>
               </el-form-item>
@@ -67,7 +67,7 @@
 
           <!-- 第二行：物料信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="物料编码">
                 <el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable></el-input>
               </el-form-item>
@@ -86,7 +86,7 @@
 
           <!-- 第三行：检验相关信息 -->
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item label="检验结论">
                 <el-select v-model="searchData.inspectionResult" placeholder="请选择" clearable>
                   <el-option label="合格" value="合格">
@@ -132,7 +132,7 @@
 
           <!-- 第四行：日期信息 -->
           <el-row :gutter="16">
-            <el-col :span="9">
+            <el-col :span="7">
               <el-form-item label="送检日期">
                 <el-date-picker
                   v-model="searchData.startDate2"
@@ -153,7 +153,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="9">
+            <el-col :span="8">
               <el-form-item label="检验日期">
                 <el-date-picker
                   v-model="searchData.startDate"