From ad2cf964f6f6deb48e364b330bf9d734d520852b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com>
Date: Mon, 28 Apr 2025 15:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E8=BD=A6=E9=9C=80=E6=B1=82=EF=BC=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/layouts/TabLayout.vue      |  2 +-
 .../vehicledemand/VehicleDemandList.vue       | 41 ++++++++++++-------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue b/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue
index 8905a0b..3ff2d11 100644
--- a/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue
+++ b/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue
@@ -8,7 +8,7 @@
       v-if="multipage"
       :active-key="activePage"
       class="tab-layout-tabs"
-      style="height:52px"
+      style="height:42px; margin-top: -5px;"
       :hide-add="true"
       type="editable-card"
       @change="changePage"
diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue
index a42b09e..6582c35 100644
--- a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue
+++ b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue
@@ -56,7 +56,7 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
+    <!-- <div class="table-operator"> -->
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload> -->
@@ -68,7 +68,7 @@
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown> -->
-    </div>
+    <!-- </div> -->
 
     <!-- table区域-begin -->
     <div>
@@ -80,12 +80,12 @@
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:'max-content'}"
+        :scroll="{ y: 200, x:'max-content' }"
         bordered
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
-        :pagination="ipagination"
+        :pagination="false"
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio'}"
         class="j-table-force-nowrap"
@@ -134,7 +134,7 @@
 
       </a-table>
     </div>
-    <a-row :gutter="24">
+    <a-row :gutter="24" style="margin-top: 15px;">
       <a-col :span="12">
         <div class="bordered-container">
           <div class="title">用车需求物料明细</div>
@@ -158,6 +158,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { postAction } from '@/api/manage'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import moment from 'moment'
   import VehicleDemandModal from './modules/VehicleDemandModal'
   import DeliveryDemand from '../deliverydemand/DeliveryDemand.vue';
   import VehicleDemandCountList from '../vehicledemandcount/VehicleDemandCountList.vue'
@@ -173,13 +174,17 @@
     data () {
       return {
         description: '用车需求管理页面',
+        queryParam: {
+          shipDate_begin: moment().format('YYYY-MM-DD'),
+          shipDate_end: moment().format('YYYY-MM-DD'),
+        },
         // 表头
         columns: [
           {
             title: '#',
             dataIndex: '',
             key:'rowIndex',
-            width:60,
+            width:40,
             align:"center",
             customRender:function (t,r,index) {
               return parseInt(index)+1;
@@ -189,6 +194,7 @@
             title:'发货日期',
             align:"center",
             dataIndex: 'shipDate',
+            width: 100,
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
@@ -196,22 +202,26 @@
           {
             title:'发货类型',
             align:"center",
-            dataIndex: 'shipType_dictText'
+            dataIndex: 'shipType_dictText',
+            width: 70,
           },
           {
             title:'料号',
             align:"center",
-            dataIndex: 'pn'
+            dataIndex: 'pn',
+            width: 100,
           },
           {
             title:'预计装车总托数',
             align:"center",
-            dataIndex: 'totalPallets'
+            dataIndex: 'totalPallets',
+            width: 105,
           },
           {
             title:'总发货数量',
             align:"center",
-            dataIndex: 'totalShips'
+            dataIndex: 'totalShips',
+            width: 90,
           },
           // {
           //   title:'送货区域',
@@ -221,24 +231,27 @@
           {
             title:'送货地点',
             align:"center",
-            dataIndex: 'deliveryAddress_dictText'
+            dataIndex: 'deliveryAddress',
+            width: 70,
           },
           {
             title:'取货仓库',
             align:"center",
-            dataIndex: 'pickUpHub_dictText'
+            dataIndex: 'pickUpHub',
+            width: 70,
           },
           {
             title:'用车需求编号',
             align:"center",
-            dataIndex: 'vdNo'
+            dataIndex: 'vdNo',
+            width: 110,
           },
           {
             title: '操作',
             dataIndex: 'action',
             align:"center",
             fixed:"right",
-            width:147,
+            width:170,
             scopedSlots: { customRender: 'action' }
           }
         ],