From 789752087c123e74312974c126d0dfe68897f0e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com>
Date: Tue, 6 May 2025 15:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/TmsIogisticsPriceForm.vue          |  3 ++-
 .../vehicleproduct/TmsVehicleProductList.vue   | 10 +++++-----
 .../modules/TmsVehicleProductForm.vue          | 17 ++++++++++-------
 .../vehicledemand/VehicleDemandList.vue        | 18 +++++++++---------
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/tms/basicdata/iogisticsprice/modules/TmsIogisticsPriceForm.vue b/ant-design-vue-jeecg/src/views/tms/basicdata/iogisticsprice/modules/TmsIogisticsPriceForm.vue
index 6b086ff..285743d 100644
--- a/ant-design-vue-jeecg/src/views/tms/basicdata/iogisticsprice/modules/TmsIogisticsPriceForm.vue
+++ b/ant-design-vue-jeecg/src/views/tms/basicdata/iogisticsprice/modules/TmsIogisticsPriceForm.vue
@@ -68,7 +68,7 @@
           </a-col>
           <a-col :span="8">
             <a-form-model-item label="时效" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="validity">
-              <a-input v-model="model.validity" placeholder="请输入时效"  ></a-input>
+              <a-input-number v-model="model.validity" placeholder="请输入时效" style="width: 100%" ></a-input-number>
             </a-form-model-item>
           </a-col>
           <a-col :span="8">
@@ -139,6 +139,7 @@
           supplierCode :[{required: true, message: '请输入供应商编码!'}],
           effectiveDate :[{required: true, message: '请选择生效日期!'}],
           validity :[{required: true, message: '请输入时效!'}],
+          tandardPrice :[{required: true, message: '请输入定标价格!'}],
         },
         url: {
           add: "/iogisticsprice/tmsIogisticsPrice/add",
diff --git a/ant-design-vue-jeecg/src/views/tms/basicdata/vehicleproduct/TmsVehicleProductList.vue b/ant-design-vue-jeecg/src/views/tms/basicdata/vehicleproduct/TmsVehicleProductList.vue
index 41ecd40..6ea60ea 100644
--- a/ant-design-vue-jeecg/src/views/tms/basicdata/vehicleproduct/TmsVehicleProductList.vue
+++ b/ant-design-vue-jeecg/src/views/tms/basicdata/vehicleproduct/TmsVehicleProductList.vue
@@ -141,11 +141,6 @@
             align:"center",
             dataIndex: 'pn'
           },
-          {
-            title:'描述',
-            align:"center",
-            dataIndex: 'describes'
-          },
           {
             title:'规格',
             align:"center",
@@ -156,6 +151,11 @@
             align:"center",
             dataIndex: 'qtyPerTon'
           },
+          {
+            title:'描述',
+            align:"center",
+            dataIndex: 'describes'
+          },
           {
             title: '操作',
             dataIndex: 'action',
diff --git a/ant-design-vue-jeecg/src/views/tms/basicdata/vehicleproduct/modules/TmsVehicleProductForm.vue b/ant-design-vue-jeecg/src/views/tms/basicdata/vehicleproduct/modules/TmsVehicleProductForm.vue
index 4a55ecc..37ff744 100644
--- a/ant-design-vue-jeecg/src/views/tms/basicdata/vehicleproduct/modules/TmsVehicleProductForm.vue
+++ b/ant-design-vue-jeecg/src/views/tms/basicdata/vehicleproduct/modules/TmsVehicleProductForm.vue
@@ -5,17 +5,12 @@
         <a-row>
           <a-col :span="12">
             <a-form-model-item label="料号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pn">
-              <a-input v-model="model.pn" placeholder="请输入料号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="describes">
-              <a-input v-model="model.describes" placeholder="请输入描述"  ></a-input>
+              <a-input v-model.trim="model.pn" placeholder="请输入料号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spec">
-              <a-input v-model="model.spec" placeholder="请输入规格"  ></a-input>
+              <a-input v-model.trim="model.spec" placeholder="请输入规格"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -23,6 +18,11 @@
               <a-input-number v-model="model.qtyPerTon" placeholder="请输入每托的产品支数" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="describes">
+              <a-input v-model="model.describes" placeholder="请输入描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -60,6 +60,9 @@
         },
         confirmLoading: false,
         validatorRules: {
+          pn :[{required: true, message: '请输入料号!'}],
+          spec :[{required: true, message: '请输入规格!'}],
+          qtyPerTon :[{required: true, message: '请输入产品支数!'}],
         },
         url: {
           add: "/vehicleproduct/tmsVehicleProduct/add",
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 c4618e0..b839f16 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
@@ -80,7 +80,7 @@
       <a-table
         ref="table"
         size="middle"
-        :scroll="{ y: 200, x:'max-content' }"
+        :scroll="{ y: 200, x:1332 }"
         bordered
         rowKey="id"
         :columns="columns"
@@ -194,7 +194,7 @@
             title:'发货日期',
             align:"center",
             dataIndex: 'shipDate',
-            width: 120,
+            // width: 120,
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
@@ -203,25 +203,25 @@
             title:'发货类型',
             align:"center",
             dataIndex: 'shipType_dictText',
-            width: 100,
+            // width: 100,
           },
           {
             title:'料号',
             align:"center",
             dataIndex: 'pn',
-            width: 100,
+            // width: 100,
           },
           {
             title:'预计装车总托数',
             align:"center",
             dataIndex: 'totalPallets',
-            width: 120,
+            // width: 120,
           },
           {
             title:'总发货数量',
             align:"center",
             dataIndex: 'totalShips',
-            width: 100,
+            // width: 100,
           },
           // {
           //   title:'送货区域',
@@ -232,19 +232,19 @@
             title:'送货地点',
             align:"center",
             dataIndex: 'deliveryAddress',
-            width: 80,
+            // width: 80,
           },
           {
             title:'取货仓库',
             align:"center",
             dataIndex: 'pickUpHub',
-            width: 80,
+            // width: 80,
           },
           {
             title:'用车需求编号',
             align:"center",
             dataIndex: 'vdNo',
-            width: 120,
+            // width: 120,
           },
           {
             title: '操作',