From 402b86cfc8686b0d5995e6628ee3456373d11051 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 28 Jun 2024 17:55:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9C=9F=E7=9F=B3=E6=96=B9=E8=BF=90?=
 =?UTF-8?q?=E8=BE=93=E6=A8=A1=E5=9D=97BUG=E4=BF=AE=E6=94=B9=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=88=86=E9=83=A8=E5=88=86=E9=A1=B9=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transportationManage/index.vue                        | 7 ++++---
 .../progressManagementAg/divisionSubManage.vue            | 8 ++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/projectFront/earthworkTransportation/transportationManage/index.vue b/src/views/projectFront/earthworkTransportation/transportationManage/index.vue
index e463bb7d..f16c0605 100644
--- a/src/views/projectFront/earthworkTransportation/transportationManage/index.vue
+++ b/src/views/projectFront/earthworkTransportation/transportationManage/index.vue
@@ -56,7 +56,7 @@
         <el-table-column
           prop="totalWeight"
           align="center"
-          label="总重量"
+          label="总重量(kg)"
         ></el-table-column>
         <el-table-column
           prop="frequency"
@@ -163,7 +163,7 @@
                 placeholder="请输入"
               ></el-input>
             </el-form-item>
-            <el-form-item label="总重量" prop="totalWeight">
+            <el-form-item label="总重量(kg)" prop="totalWeight">
               <el-input
                 style="width: 90%"
                 v-model="addForm.totalWeight"
@@ -261,8 +261,9 @@ export default {
         totalWeight: [
           {
             required: true,
-            message: "请输入",
+            message: "只能输入数字或者小数且只能两位",
             trigger: "blur",
+            pattern: /^\d+(\.\d{1,2})?$/
           },
         ],
         frequency: [
diff --git a/src/views/projectFront/progressManagementAg/divisionSubManage.vue b/src/views/projectFront/progressManagementAg/divisionSubManage.vue
index 955ec134..05ae9710 100644
--- a/src/views/projectFront/progressManagementAg/divisionSubManage.vue
+++ b/src/views/projectFront/progressManagementAg/divisionSubManage.vue
@@ -113,10 +113,10 @@
             <vue-scroll>
               <el-table height="650" class="tables" :data="listData" lazy row-key="id" default-expand-all
                 :tree-props="{ children: 'children' }">
-                <el-table-column width="200" prop="taskName" label="分部分项工程名称">
+                <el-table-column width="200" prop="taskName" label="分部分项工程名称" style="display: flex;align-items: center;">
                   <template slot-scope="scope">
                     <span :title="scope.row.taskName"
-                      style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display: inline-block;width: 125px;vertical-align: middle;">
+                      style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display: inline-block;width: 60%;vertical-align: middle;">
                       {{ scope.row.taskName }}
                     </span>
                   </template>
@@ -1172,4 +1172,8 @@ export default {
 .el-select-dropdown__item:hover {
   background-color: transparent;
 }
+// /deep/.cell{
+//   display: flex;
+//   align-items: center;
+// }
 </style>