调整基础数据、车船务、项目、合同

src/views/business/components/waybill-manage-page.vue

@@ -153,6 +153,15 @@
 
       <template v-if="config.enableProjectSelect" #projectName-label>项目</template>
 
+      <template #relationNo-label>
+        <span class="waybill-manage-page__label-with-info">
+          <span>关联单号</span>
+          <el-tooltip content="仅做关联标记，用于业务中子母单情况" placement="top">
+            <el-icon class="waybill-manage-page__info-icon"><InfoFilled /></el-icon>
+          </el-tooltip>
+        </span>
+      </template>
+
       <template #projectName-form>
         <el-select
           v-model="selectedProjectId"
@@ -353,10 +362,7 @@
       </template>
 
       <template #taskInfoTitle-form>
-        <div
-          class="dialog-section-title dialog-section-title--action waybill-manage-page__task-title"
-        >
-          <span>任务信息</span>
+        <div class="waybill-manage-page__task-mode-switch">
           <el-segmented
             v-model="form.taskEntryMode"
             :options="taskEntryModeOptions"
@@ -561,6 +567,7 @@
                 </el-table>
               </div>
             </div>
+            <div class="dialog-section-title waybill-manage-page__task-content-title">任务信息</div>
             <el-form
               :model="form"
               label-position="right"
@@ -1033,7 +1040,12 @@
             </el-form>
             <div class="waybill-manage-page__subsection">
               <div class="waybill-manage-page__subsection-head">
-                <span>运费信息</span>
+                <span class="waybill-manage-page__label-with-info">
+                  <span>运费信息</span>
+                  <el-tooltip content="可选填写，仅做记录，不影响应付结算" placement="top">
+                    <el-icon class="waybill-manage-page__info-icon"><InfoFilled /></el-icon>
+                  </el-tooltip>
+                </span>
               </div>
               <el-form
                 :model="form"
@@ -1042,7 +1054,7 @@
                 class="waybill-manage-page__freight-form waybill-manage-page__freight-form--road"
               >
                 <template v-for="(group, index) in taskFreightGroups" :key="group.key">
-                  <el-form-item :label="`单价${index + 1}`">
+                  <el-form-item label="单价">
                     <el-input
                       :model-value="taskFullFreightGroupUnitPrice(group)"
                       placeholder="请输入"
@@ -1072,7 +1084,7 @@
                       </template>
                     </el-input>
                   </el-form-item>
-                  <el-form-item :label="`数量合计${index + 1}`">
+                  <el-form-item label="数量合计">
                     <el-input :model-value="taskFullFreightGroupQuantity(group)" disabled>
                       <template #append>
                         <el-select
@@ -1089,7 +1101,7 @@
                       </template>
                     </el-input>
                   </el-form-item>
-                  <el-form-item :label="`运费${index + 1}`">
+                  <el-form-item label="运费">
                     <el-input
                       :model-value="taskFullFreightGroupAmount(group)"
                       placeholder="请输入运费"
@@ -1120,8 +1132,14 @@
               </el-form>
             </div>
           </div>
+          <div
+            v-if="!isTaskFullMode"
+            class="dialog-section-title waybill-manage-page__task-content-title"
+          >
+            任务信息
+          </div>
           <el-form
-            v-else
+            v-if="!isTaskFullMode"
             :model="form"
             label-position="right"
             label-width="auto"
@@ -2781,7 +2799,7 @@ import { openImportDialog } from '@/utils/import-excel';
 import { applyTableMenuWidth } from '@/utils/table-menu';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
-import { Location, OfficeBuilding, Rank, Search } from '@element-plus/icons-vue';
+import { InfoFilled, Location, OfficeBuilding, Rank, Search } from '@element-plus/icons-vue';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import {
@@ -2943,6 +2961,7 @@ export default {
   components: {
     WaybillImportDialog,
     PageAvueForm,
+    InfoFilled,
     Rank,
     ElImageViewer,
     OpenFileViewer,
@@ -7808,8 +7827,7 @@ export default {
   }
 
   &__shipping-title,
-  &__goods-title,
-  &__task-title {
+  &__goods-title {
     min-width: 100%;
   }
 
@@ -7833,6 +7851,20 @@ export default {
     width: 100%;
   }
 
+  &__task-mode-switch {
+    display: flex;
+    justify-content: flex-start;
+    width: 100%;
+  }
+
+  &__task-content-title {
+    margin-bottom: 16px;
+  }
+
+  &__task-full &__task-content-title {
+    margin-top: 16px;
+  }
+
   &__task-form {
     display: grid;
     grid-template-columns: repeat(4, minmax(0, 1fr));
@@ -7870,7 +7902,6 @@ export default {
 
   &__task-form--full {
     display: block;
-    margin-top: 16px;
   }
 
   &__task-row {
@@ -7909,6 +7940,18 @@ export default {
     grid-column: span 1;
   }
 
+  &__label-with-info {
+    display: inline-flex;
+    gap: 4px;
+    align-items: center;
+    white-space: nowrap;
+  }
+
+  &__info-icon {
+    color: #909399;
+    cursor: help;
+  }
+
   &__task-carrier-type {
     :deep(.el-form-item__content) {
       flex: 0 1 260px;
@@ -7949,16 +7992,6 @@ export default {
     }
   }
 
-  // 运单独立表单的任务信息：标题靠左，短字段保持与里程输入框一致的宽度。
-  :global(.waybill-manage-page--form-page .waybill-manage-page__task-title) {
-    justify-content: flex-start !important;
-    text-align: left;
-  }
-
-  :global(.waybill-manage-page--form-page .waybill-manage-page__task-title > .el-segmented) {
-    margin-left: auto;
-  }
-
   :global(
       .waybill-manage-page--form-page
         .waybill-manage-page__task-form