From e010e3c779f94d43a9790250bcbcaa5e5e9a97cb Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 24 Oct 2024 17:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/edittablehead/index.vue        |  5 ++++-
 src/option/waybill/WaybillOrderList.js        | 20 +++++++++++++++++++
 .../driverArtery/basicdataDriverArteryAdd.vue |  2 +-
 .../vehicle/basicdataVehicleAddForm.vue       |  2 +-
 .../distribution/artery/AddVehicleStowage.vue |  6 ++++++
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/components/edittablehead/index.vue b/src/components/edittablehead/index.vue
index 26aaa0f4..83fa232f 100644
--- a/src/components/edittablehead/index.vue
+++ b/src/components/edittablehead/index.vue
@@ -237,7 +237,10 @@ function close() {
 }
 
 function checkboxitem({ row }) {
-  functions.setStorage($route.fullPath + props.columnListName, columnRef.value);
+  postSaveTableSeting({
+    tableKey: $route.path + props.columnListName,
+    tableSetCongig: JSON.stringify(props.modelValue),
+  });
 }
 let headtop = ref<headtoptype[]>([
   {
diff --git a/src/option/waybill/WaybillOrderList.js b/src/option/waybill/WaybillOrderList.js
index c4db4059..2efc1418 100644
--- a/src/option/waybill/WaybillOrderList.js
+++ b/src/option/waybill/WaybillOrderList.js
@@ -198,6 +198,26 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'productNum',
+    label: '货物名称明细',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'productPrice',
+    label: '干线品类单价',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'costPiece',
     label: '按件分摊',
diff --git a/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue b/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
index a022710a..884efb06 100644
--- a/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
+++ b/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
@@ -13,7 +13,7 @@
           <!-- 输入框 -->
           <el-input
             clearable
-            v-model="form[item.prop]"
+            v-model.trim="form[item.prop]"
             @input="() => item.input && item.input(form[item.prop], item)"
             v-if="item.type == 'input'"
             :placeholder="item.placeholder || '请输入' + item.label"
diff --git a/src/views/basicdata/vehicle/basicdataVehicleAddForm.vue b/src/views/basicdata/vehicle/basicdataVehicleAddForm.vue
index 50832337..73a625ac 100644
--- a/src/views/basicdata/vehicle/basicdataVehicleAddForm.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicleAddForm.vue
@@ -20,7 +20,7 @@
             <el-input
               class="w100"
               :placeholder="`请输入${item.label}`"
-              v-model="details.form[item.prop]"
+              v-model.trim="details.form[item.prop]"
               clearable
             ></el-input>
           </template>
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 72c28c80..58c64a92 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -2628,6 +2628,12 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
   color: var(--el-color-primary);
 }
 
+:deep(.el-form) {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: start;
+}
+
 // 表单行
 .form_row {
   display: flex;