Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/vehicle/customer-archive.vue

src/views/business/components/business-crud-page.vue

@@ -261,7 +261,7 @@
         <div
           class="dialog-section-title dialog-section-title--action business-crud-page__shipping-title"
         >
-          <span>收发货信息</span>
+          <span>收发货信息1</span>
           <el-link
             v-if="!dialogReadonly"
             type="primary"
@@ -2153,7 +2153,7 @@
           </el-descriptions>
         </section-card>
         <section-card v-if="config.enableTransportPlanForm" title="货物信息">
-          <el-table :data="transportCargoRows" border empty-text="暂无货物信息">
+          <el-table :data="transportCargoRows" empty-text="暂无货物信息">
             <el-table-column type="index" label="序号" width="70" align="center" />
             <el-table-column prop="cargoName" label="货物名称" min-width="180" />
             <el-table-column prop="cargoType" label="货物类型" min-width="150" />
@@ -2169,7 +2169,7 @@
           </el-table>
         </section-card>
         <section-card v-if="config.enableAttachmentTable" :title="config.attachmentTitle || '附件'">
-          <el-table :data="attachmentRows" border empty-text="暂无附件">
+          <el-table :data="attachmentRows" empty-text="暂无附件">
             <el-table-column type="index" label="序号" width="70" align="center" />
             <el-table-column label="文件名" min-width="260">
               <template #default="{ row }">{{ row.originalName || row.name || '-' }}</template>
@@ -10674,10 +10674,6 @@ export default {
         white-space: pre-wrap;
         word-break: break-word;
       }
-
-      :deep(.el-table) {
-        border-color: #eff1f7;
-      }
     }
   }