From 3115fcc80036ec4bfe3a2cd1128c5fdc82a01f42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 28 四月 2026 16:38:27 +0800
Subject: [PATCH] limsTable表格自适应高度&手动下单调整

---
 src/views/business/rawMaterialInspection/index.vue |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index dfe0014..c3d95ed 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -34,9 +34,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="涓嬪彂鏃堕棿" prop="date" v-if="(tabIndex === 3 || tabIndex === 4) && more">
-            <el-date-picker v-model="componentData.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
-                            range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%;" type="daterange" @change="refreshTable()"
-                            value-format="yyyy-MM-dd">
+            <el-date-picker v-model="componentData.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鏃ユ湡"
+                            range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%;" type="datetimerange" @change="refreshTable()"
+                            :default-time="['00:00:00','23:59:59']"
+                            value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="濮旀墭缂栧彿" prop="entrustCode" v-if="(tabIndex === 3 || tabIndex === 4) && more">
@@ -81,13 +82,13 @@
       <!--寰呮姤妫�銆佸緟涓嬪崟-->
       <div class="table">
         <lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0 || tabIndex === 1" :isSelection="true"
-          :handleSelectionChange="selectMethod" @pagination="pagination" :height="'calc(100vh - 290px)'" :page="page"
+          :handleSelectionChange="selectMethod" @pagination="pagination" :height="50" :more="more"  :page="page"
           :tableLoading="tableLoading"></lims-table>
       </div>
       <!--宸插畬鎴愩�佸叏閮�-->
       <div class="table">
         <lims-table :tableData="tableData1" :column="column1" v-if="tabIndex === 3 || tabIndex === 4"
-          @pagination="pagination1" :height="'calc(100vh - 290px)'" :page="page1"
+          @pagination="pagination1" :page="page1" :height="50" :more="more"
           :tableLoading="tableLoading1"></lims-table>
       </div>
     </div>
@@ -323,12 +324,16 @@
 import { getDicts } from "@/api/system/dict/data";
 import limsTable from "@/components/Table/lims-table.vue";
 import {transformExcel} from '@/utils/file'
+import tab from "../../../plugins/tab";
 
 export default {
   name: 'RawMaterialInspection',
   // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
   components: { limsTable, DataLookVisible },
   computed:{
+    tab() {
+      return tab
+    },
     splitOrderAction(){
       return this.javaApi + '/rawMaterialOrder/importSplitOrderData'
     }

--
Gitblit v1.9.3