From cb301fbafc5c7c99eb11c6384e6adca686055014 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 23 Jul 2026 15:38:55 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-23=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchWorkOrderDetailsAlloc.vue           | 63 +++++++++----------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/src/views/modules/shopOrder/workOrderAlloc/searchWorkOrderDetailsAlloc.vue b/src/views/modules/shopOrder/workOrderAlloc/searchWorkOrderDetailsAlloc.vue
index 389f7ab..f40efd8 100644
--- a/src/views/modules/shopOrder/workOrderAlloc/searchWorkOrderDetailsAlloc.vue
+++ b/src/views/modules/shopOrder/workOrderAlloc/searchWorkOrderDetailsAlloc.vue
@@ -26,7 +26,7 @@
         @keyup.enter.native="getData">
         <template v-if="searchExpanded">
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="2">
               <el-form-item label="工厂编码">
                 <el-select v-model="searchData.site" placeholder="请选择工厂编码" clearable style="width: 100%">
                   <el-option
@@ -38,12 +38,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="3">
               <el-form-item label="工单号">
                 <el-input v-model="searchData.orderNo" placeholder="请输入工单号" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="3">
               <el-form-item label="订单状态">
                 <el-select v-model="searchData.orderStatus" placeholder="请选择状态" clearable style="width: 100%">
                   <el-option label="全部" value=""></el-option>
@@ -58,43 +58,40 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="3">
               <el-form-item label="物料编码">
                 <el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="3">
               <el-form-item label="物料名称">
                 <el-input v-model="searchData.partDesc" placeholder="请输入物料名称" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="3">
               <el-form-item label="报工人">
                 <el-input v-model="searchData.userName" placeholder="请输入报工人" clearable></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-
-          <el-row :gutter="16">
-            <el-col :span="8">
-              <el-form-item label="报工时间">
-                <el-date-picker
-                  v-model="searchData.reportStartDate"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="开始日期"
-                  style="width: 45%">
-                </el-date-picker>
-                <span style="margin: 0 6px; color: #DCDFE6;">~</span>
-                <el-date-picker
-                  v-model="searchData.reportEndDate"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="结束日期"
-                  style="width: 45%">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
+              <el-col :span="7">
+                  <el-form-item label="报工时间">
+                      <el-date-picker
+                              v-model="searchData.reportStartDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="开始日期"
+                              style="width: 45%">
+                      </el-date-picker>
+                      <span style="margin: 0 6px; color: #DCDFE6;">~</span>
+                      <el-date-picker
+                              v-model="searchData.reportEndDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="结束日期"
+                              style="width: 45%">
+                      </el-date-picker>
+                  </el-form-item>
+              </el-col>
           </el-row>
         </template>
 
@@ -197,7 +194,7 @@
     <el-tabs v-model="activeTab" type="border-card" @tab-click="handleTabClick" class="customer-tab" :style="{height: allocTableHeight + 60 + 'px'}">
       <el-tab-pane label="产量未传输记录" name="产量未传输">
         <el-table
-          :height="allocTableHeight"
+          :height="allocTableHeight+10"
           :data="allocList"
           border
           v-loading="allocListLoading"
@@ -216,7 +213,7 @@
       </el-tab-pane>
       <el-tab-pane label="产量已传输记录" name="产量已传输">
         <el-table
-          :height="allocTableHeight"
+          :height="allocTableHeight+10"
           :data="allocList"
           border
           v-loading="allocListLoading"
@@ -235,7 +232,7 @@
       </el-tab-pane>
       <el-tab-pane label="工时未传输记录" name="工时未传输">
         <el-table
-          :height="allocTableHeight"
+          :height="allocTableHeight+10"
           :data="allocList"
           border
           v-loading="allocListLoading"
@@ -254,7 +251,7 @@
       </el-tab-pane>
       <el-tab-pane label="工时已传输记录" name="工时已传输">
         <el-table
-          :height="allocTableHeight"
+          :height="allocTableHeight+10"
           :data="allocList"
           border
           v-loading="allocListLoading"
@@ -444,7 +441,7 @@ export default {
     calculateTableHeight () {
       this.$nextTick(() => {
         const windowHeight = window.innerHeight
-        const headerHeight = this.searchExpanded ? 414 : 294
+        const headerHeight = this.searchExpanded ? 364 : 296
         this.orderTableHeight = (windowHeight - headerHeight - 85) / 2
         this.allocTableHeight = (windowHeight - headerHeight - 85) / 2
       })