From c6012e1516316437b44c0c4106632ce1a17d4acb Mon Sep 17 00:00:00 2001
From: sankeyangshu <1260323835@qq.com>
Date: Fri, 6 Dec 2024 20:51:41 +0800
Subject: [PATCH] feat: update

---
 src/views/Boat/components/BoatTable.vue       | 34 +++----
 src/views/Boat/components/HistoryTable.vue    | 91 +++++++++----------
 src/views/History/components/HistoryTable.vue | 91 +++++++++----------
 src/views/History/components/PublishTable.vue | 32 ++-----
 src/views/History/components/ReceiveTable.vue | 32 ++-----
 src/views/Login/index.vue                     |  1 +
 src/views/Send/components/BoatInfoSend.vue    | 19 +++-
 src/views/Send/components/HistoryTable.vue    | 91 +++++++++----------
 .../Send/components/ManifestDetailSend.vue    | 11 ++-
 src/views/Send/components/ManifestSend.vue    | 11 ++-
 src/views/Send/components/Send.vue            |  5 +-
 src/views/Send/components/SendTable.vue       | 32 ++-----
 .../Setting/components/EmployeeDialog.vue     | 24 ++---
 src/views/Setting/components/EmployeeRole.vue |  2 +-
 .../Setting/components/EmployeeTable.vue      | 27 ++----
 src/views/Setting/components/Wharf.vue        |  2 +-
 .../Subscription/components/PublishDialog.vue | 19 ++++
 .../Subscription/components/PublishTable.vue  | 22 ++---
 .../Subscription/components/ReceiveTable.vue  | 20 ++--
 19 files changed, 264 insertions(+), 302 deletions(-)

diff --git a/src/views/Boat/components/BoatTable.vue b/src/views/Boat/components/BoatTable.vue
index fa4dc36..ed04c2b 100644
--- a/src/views/Boat/components/BoatTable.vue
+++ b/src/views/Boat/components/BoatTable.vue
@@ -20,41 +20,29 @@
           :infinite-scroll-disabled="disabled"
           @row-click="onClickCellOpenDetail"
         >
-          <el-table-column prop="ship.name" label="船名" align="center" width="150" />
-          <el-table-column prop="voyage" label="航次" align="center" width="180" />
-          <el-table-column label="装货港 / 装货码头" align="center" width="300">
+          <el-table-column prop="ship.name" label="船名" align="center" />
+          <el-table-column prop="voyage" label="航次" align="center" />
+          <el-table-column label="装货港 / 装货码头" align="center">
             <template #default="scope">
               <div class="goods-name">
                 {{ scope.row.loadPort.name }} / {{ scope.row.loadWharf.name }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="卸货港 / 卸货码头" align="center" width="300">
+          <el-table-column label="卸货港 / 卸货码头" align="center">
             <template #default="scope">
               <div class="goods-name">
                 {{ scope.row.dischargePort.name }} / {{ scope.row.dischargeWharf.name }}
               </div>
             </template>
           </el-table-column>
-          <!-- <el-table-column prop="carNumPlan" label="计划商品车数量" align="center" width="180" /> -->
-          <el-table-column prop="carNumActual" label="商品车数量" align="center" width="180" />
-          <!-- <el-table-column prop="spareNumPlan" label="计划件杂货数量" align="center" width="180" /> -->
-          <el-table-column prop="spareNumActual" label="件杂货数量" align="center" width="180" />
-          <el-table-column
-            prop="departureDatePlan"
-            label="计划离港时间"
-            align="center"
-            width="200"
-          />
-          <el-table-column
-            prop="departureDateActual"
-            label="实际离港时间"
-            align="center"
-            width="200"
-          />
-          <el-table-column prop="tradeType" label="贸易类型" align="center" width="150" />
-          <el-table-column prop="shipStatus" label="当前状态" align="center" width="150" />
-          <el-table-column prop="operator" label="操作" width="200px" align="center" fixed="right">
+          <el-table-column prop="carNumActual" label="商品车数量" align="center" />
+          <el-table-column prop="spareNumActual" label="件杂货数量" align="center" />
+          <el-table-column prop="departureDatePlan" label="计划离港时间" align="center" />
+          <el-table-column prop="departureDateActual" label="实际离港时间" align="center" />
+          <el-table-column prop="tradeType" label="贸易类型" align="center" />
+          <el-table-column prop="shipStatus" label="当前状态" align="center" />
+          <el-table-column prop="operator" label="操作" align="center">
             <template #default="scope">
               <div class="update-btn">
                 <div class="btn" @click.stop="onClickOpenDetail(scope.row)">详细</div>
diff --git a/src/views/Boat/components/HistoryTable.vue b/src/views/Boat/components/HistoryTable.vue
index 569159c..a7915ce 100644
--- a/src/views/Boat/components/HistoryTable.vue
+++ b/src/views/Boat/components/HistoryTable.vue
@@ -17,15 +17,15 @@
     </div>
 
     <el-table :data="historyData">
-      <el-table-column prop="ship.name" label="船名" align="center" width="150" />
-      <el-table-column prop="voyage" label="航次" align="center" width="180" />
-      <el-table-column prop="loadPort.name" label="装货港" align="center" width="150" />
-      <el-table-column prop="dischargePort.name" label="卸货港" align="center" width="150" />
-      <el-table-column prop="carNumActual" label="商品车数量" align="center" width="180" />
-      <el-table-column prop="spareNumActual" label="件杂货数量" align="center" width="180" />
-      <el-table-column prop="departureDatePlan" label="计划离港时间" align="center" width="200" />
-      <el-table-column prop="departureDateActual" label="实际离港时间" align="center" width="200" />
-      <el-table-column prop="createDate" label="发布日期时间" align="center" width="200" />
+      <el-table-column prop="ship.name" label="船名" align="center" />
+      <el-table-column prop="voyage" label="航次" align="center" />
+      <el-table-column prop="loadPort.name" label="装货港" align="center" />
+      <el-table-column prop="dischargePort.name" label="卸货港" align="center" />
+      <el-table-column prop="carNumActual" label="商品车数量" align="center" />
+      <el-table-column prop="spareNumActual" label="件杂货数量" align="center" />
+      <el-table-column prop="departureDatePlan" label="计划离港时间" align="center" />
+      <el-table-column prop="departureDateActual" label="实际离港时间" align="center" />
+      <el-table-column prop="createDate" label="发布日期时间" align="center" />
     </el-table>
 
     <div class="table-content">
@@ -46,29 +46,29 @@
         max-height="400px"
         @row-click="onClickOpenManifestDetail"
       >
-        <el-table-column type="index" label="No." width="50" />
-        <el-table-column prop="schedule.ship.name" label="船名" align="center" width="120" />
-        <el-table-column prop="schedule.voyage" label="航次" align="center" width="120" />
-        <el-table-column prop="deck" label="舱层" align="center" width="80" />
-        <el-table-column prop="cabin" label="舱段" align="center" width="80" />
-        <el-table-column prop="billNo" label="贸易类型" align="center" width="160" />
-        <el-table-column prop="billNo" label="提单号" align="center" width="160" />
-        <el-table-column label="货名/品牌/型号" align="center" width="200">
+        <el-table-column type="index" label="No." />
+        <el-table-column prop="schedule.ship.name" label="船名" align="center" />
+        <el-table-column prop="schedule.voyage" label="航次" align="center" />
+        <el-table-column prop="deck" label="舱层" align="center" />
+        <el-table-column prop="cabin" label="舱段" align="center" />
+        <el-table-column prop="billNo" label="贸易类型" align="center" />
+        <el-table-column prop="billNo" label="提单号" align="center" />
+        <el-table-column label="货名/品牌/型号" align="center">
           <template #default="scope">
             <div class="goods-name">
               {{ scope.row.goodsName }}/{{ scope.row.brand.name }}/{{ scope.row.model }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="shippingMark" label="唛头" align="center" width="180" />
-        <el-table-column prop="carNum" label="商品车" align="center" width="100" />
-        <el-table-column prop="spareNum" label="件杂货" align="center" width="100" />
-        <el-table-column prop="weight" label="重量 (kg)" align="center" width="100" />
-        <el-table-column prop="volume" label="体积 (m3)" align="center" width="100" />
+        <el-table-column prop="shippingMark" label="唛头" align="center" />
+        <el-table-column prop="carNum" label="商品车" align="center" />
+        <el-table-column prop="spareNum" label="件杂货" align="center" />
+        <el-table-column prop="weight" label="重量 (kg)" align="center" />
+        <el-table-column prop="volume" label="体积 (m3)" align="center" />
         <!-- TODO:港口没有 -->
-        <el-table-column prop="consigner" label="发货人" align="center" width="180" />
-        <el-table-column prop="consignee" label="收货人" align="center" width="180" />
-        <el-table-column prop="goodsStatus" label="货物状态" align="center" width="150" />
+        <el-table-column prop="consigner" label="发货人" align="center" />
+        <el-table-column prop="consignee" label="收货人" align="center" />
+        <el-table-column prop="goodsStatus" label="货物状态" align="center" />
       </el-table>
     </div>
 
@@ -85,28 +85,23 @@
         <div style="width: 480px"></div>
       </div>
       <el-table v-loading="tableLoading" :data="manifestDetail" max-height="400px">
-        <el-table-column type="index" label="No." width="50" />
-        <el-table-column prop="billNo" label="提单号" align="center" width="150" />
-        <el-table-column prop="brand.name" label="品牌" align="center" width="150" />
-        <el-table-column prop="vehicleType.name" label="车型" align="center" width="150" />
-        <el-table-column
-          prop="vehicleTypeDetail.name"
-          label="车型明细"
-          align="center"
-          width="180"
-        />
-        <el-table-column prop="model" label="型号" align="center" width="150" />
-        <el-table-column prop="vin" label="VIN" align="center" width="200" />
-        <el-table-column prop="weight" label="重量(kg)" align="center" width="150" />
-        <el-table-column prop="volume" label="体积(m3)" align="center" width="150" />
-        <el-table-column prop="length" label="长 mm" align="center" width="150" />
-        <el-table-column prop="width" label="宽 mm" align="center" width="150" />
-        <el-table-column prop="height" label="高 mm" align="center" width="150" />
-        <el-table-column prop="bamm" label="BAmm" align="center" width="150" />
-        <el-table-column prop="lrmm" label="LRmm" align="center" width="150" />
-        <el-table-column prop="damage" label="有无质损" align="center" width="150" />
-        <el-table-column prop="damageDesc" label="质损描述" align="center" width="200" />
-        <el-table-column prop="updateDate" label="更新时间" align="center" width="180" />
+        <el-table-column type="index" label="No." />
+        <el-table-column prop="billNo" label="提单号" align="center" />
+        <el-table-column prop="brand.name" label="品牌" align="center" />
+        <el-table-column prop="vehicleType.name" label="车型" align="center" />
+        <el-table-column prop="vehicleTypeDetail.name" label="车型明细" align="center" />
+        <el-table-column prop="model" label="型号" align="center" />
+        <el-table-column prop="vin" label="VIN" align="center" />
+        <el-table-column prop="weight" label="重量(kg)" align="center" />
+        <el-table-column prop="volume" label="体积(m3)" align="center" />
+        <el-table-column prop="length" label="长 mm" align="center" />
+        <el-table-column prop="width" label="宽 mm" align="center" />
+        <el-table-column prop="height" label="高 mm" align="center" />
+        <el-table-column prop="bamm" label="BAmm" align="center" />
+        <el-table-column prop="lrmm" label="LRmm" align="center" />
+        <el-table-column prop="damage" label="有无质损" align="center" />
+        <el-table-column prop="damageDesc" label="质损描述" align="center" />
+        <el-table-column prop="updateDate" label="更新时间" align="center" />
       </el-table>
     </div>
   </div>
@@ -143,7 +138,7 @@ const manifestTable = ref<ManifestType[]>([]);
 
 // 获取舱单信息
 const getManifestTable = async () => {
-  const scheduleId = props.historyData[0].shipId;
+  const scheduleId = props.historyData[0].id;
   const { data } = await getManifestListAPI({
     scheduleId,
   });
diff --git a/src/views/History/components/HistoryTable.vue b/src/views/History/components/HistoryTable.vue
index a993883..6600dec 100644
--- a/src/views/History/components/HistoryTable.vue
+++ b/src/views/History/components/HistoryTable.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="historyTable">
     <el-table :data="historyData">
-      <el-table-column prop="ship.name" label="船名" align="center" width="150" />
-      <el-table-column prop="voyage" label="航次" align="center" width="180" />
-      <el-table-column prop="loadPort.name" label="装货港" align="center" width="150" />
-      <el-table-column prop="dischargePort.name" label="卸货港" align="center" width="150" />
-      <el-table-column prop="carNumActual" label="商品车数量" align="center" width="180" />
-      <el-table-column prop="spareNumActual" label="件杂货数量" align="center" width="180" />
-      <el-table-column prop="departureDatePlan" label="计划离港时间" align="center" width="200" />
-      <el-table-column prop="departureDateActual" label="实际离港时间" align="center" width="200" />
-      <el-table-column prop="createDate" label="发布日期时间" align="center" width="200" />
+      <el-table-column prop="ship.name" label="船名" align="center" />
+      <el-table-column prop="voyage" label="航次" align="center" />
+      <el-table-column prop="loadPort.name" label="装货港" align="center" />
+      <el-table-column prop="dischargePort.name" label="卸货港" align="center" />
+      <el-table-column prop="carNumActual" label="商品车数量" align="center" />
+      <el-table-column prop="spareNumActual" label="件杂货数量" align="center" />
+      <el-table-column prop="departureDatePlan" label="计划离港时间" align="center" />
+      <el-table-column prop="departureDateActual" label="实际离港时间" align="center" />
+      <el-table-column prop="createDate" label="发布日期时间" align="center" />
     </el-table>
 
     <div class="table-content">
@@ -24,29 +24,29 @@
         max-height="400px"
         @row-click="onClickOpenManifestDetail"
       >
-        <el-table-column type="index" label="No." width="50" />
-        <el-table-column prop="schedule.ship.name" label="船名" align="center" width="120" />
-        <el-table-column prop="schedule.voyage" label="航次" align="center" width="120" />
-        <el-table-column prop="deck" label="舱层" align="center" width="80" />
-        <el-table-column prop="cabin" label="舱段" align="center" width="80" />
-        <el-table-column prop="billNo" label="贸易类型" align="center" width="160" />
-        <el-table-column prop="billNo" label="提单号" align="center" width="160" />
-        <el-table-column label="货名/品牌/型号" align="center" width="200">
+        <el-table-column type="index" label="No." />
+        <el-table-column prop="schedule.ship.name" label="船名" align="center" />
+        <el-table-column prop="schedule.voyage" label="航次" align="center" />
+        <el-table-column prop="deck" label="舱层" align="center" />
+        <el-table-column prop="cabin" label="舱段" align="center" />
+        <el-table-column prop="billNo" label="贸易类型" align="center" />
+        <el-table-column prop="billNo" label="提单号" align="center" />
+        <el-table-column label="货名/品牌/型号" align="center">
           <template #default="scope">
             <div class="goods-name">
               {{ scope.row.goodsName }}/{{ scope.row.brand.name }}/{{ scope.row.model }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="shippingMark" label="唛头" align="center" width="180" />
-        <el-table-column prop="carNum" label="商品车" align="center" width="100" />
-        <el-table-column prop="spareNum" label="件杂货" align="center" width="100" />
-        <el-table-column prop="weight" label="重量 (kg)" align="center" width="100" />
-        <el-table-column prop="volume" label="体积 (m3)" align="center" width="100" />
+        <el-table-column prop="shippingMark" label="唛头" align="center" />
+        <el-table-column prop="carNum" label="商品车" align="center" />
+        <el-table-column prop="spareNum" label="件杂货" align="center" />
+        <el-table-column prop="weight" label="重量 (kg)" align="center" />
+        <el-table-column prop="volume" label="体积 (m3)" align="center" />
         <!-- TODO:港口没有 -->
-        <el-table-column prop="consigner" label="发货人" align="center" width="180" />
-        <el-table-column prop="consignee" label="收货人" align="center" width="180" />
-        <el-table-column prop="goodsStatus" label="货物状态" align="center" width="150" />
+        <el-table-column prop="consigner" label="发货人" align="center" />
+        <el-table-column prop="consignee" label="收货人" align="center" />
+        <el-table-column prop="goodsStatus" label="货物状态" align="center" />
       </el-table>
     </div>
 
@@ -57,28 +57,23 @@
         <div style="width: 320px"></div>
       </div>
       <el-table v-loading="tableLoading" :data="manifestDetail" max-height="400px">
-        <el-table-column type="index" label="No." width="50" />
-        <el-table-column prop="billNo" label="提单号" align="center" width="150" />
-        <el-table-column prop="brand.name" label="品牌" align="center" width="150" />
-        <el-table-column prop="vehicleType.name" label="车型" align="center" width="150" />
-        <el-table-column
-          prop="vehicleTypeDetail.name"
-          label="车型明细"
-          align="center"
-          width="180"
-        />
-        <el-table-column prop="model" label="型号" align="center" width="150" />
-        <el-table-column prop="vin" label="VIN" align="center" width="200" />
-        <el-table-column prop="weight" label="重量(kg)" align="center" width="150" />
-        <el-table-column prop="volume" label="体积(m3)" align="center" width="150" />
-        <el-table-column prop="length" label="长 mm" align="center" width="150" />
-        <el-table-column prop="width" label="宽 mm" align="center" width="150" />
-        <el-table-column prop="height" label="高 mm" align="center" width="150" />
-        <el-table-column prop="bamm" label="BAmm" align="center" width="150" />
-        <el-table-column prop="lrmm" label="LRmm" align="center" width="150" />
-        <el-table-column prop="damage" label="有无质损" align="center" width="150" />
-        <el-table-column prop="damageDesc" label="质损描述" align="center" width="200" />
-        <el-table-column prop="updateDate" label="更新时间" align="center" width="180" />
+        <el-table-column type="index" label="No." />
+        <el-table-column prop="billNo" label="提单号" align="center" />
+        <el-table-column prop="brand.name" label="品牌" align="center" />
+        <el-table-column prop="vehicleType.name" label="车型" align="center" />
+        <el-table-column prop="vehicleTypeDetail.name" label="车型明细" align="center" />
+        <el-table-column prop="model" label="型号" align="center" />
+        <el-table-column prop="vin" label="VIN" align="center" />
+        <el-table-column prop="weight" label="重量(kg)" align="center" />
+        <el-table-column prop="volume" label="体积(m3)" align="center" />
+        <el-table-column prop="length" label="长 mm" align="center" />
+        <el-table-column prop="width" label="宽 mm" align="center" />
+        <el-table-column prop="height" label="高 mm" align="center" />
+        <el-table-column prop="bamm" label="BAmm" align="center" />
+        <el-table-column prop="lrmm" label="LRmm" align="center" />
+        <el-table-column prop="damage" label="有无质损" align="center" />
+        <el-table-column prop="damageDesc" label="质损描述" align="center" />
+        <el-table-column prop="updateDate" label="更新时间" align="center" />
       </el-table>
     </div>
   </div>
@@ -102,7 +97,7 @@ const manifestTable = ref<ManifestType[]>([]);
 
 // 获取舱单信息
 const getManifestTable = async () => {
-  const scheduleId = props.historyData[0].shipId;
+  const scheduleId = props.historyData[0].id;
   const { data } = await getManifestListAPI({
     scheduleId,
   });
diff --git a/src/views/History/components/PublishTable.vue b/src/views/History/components/PublishTable.vue
index 718ad89..e8479bd 100644
--- a/src/views/History/components/PublishTable.vue
+++ b/src/views/History/components/PublishTable.vue
@@ -18,29 +18,15 @@
           :infinite-scroll-disabled="disabled"
           @row-click="onClickCellOpenDetail"
         >
-          <el-table-column prop="ship.name" label="船名" align="center" width="150" />
-          <el-table-column prop="voyage" label="航次" align="center" width="180" />
-          <el-table-column prop="loadPort.name" label="装货港" align="center" width="150" />
-          <!-- <el-table-column prop="loadWharf.name" label="装货码头" align="center" width="150" /> -->
-          <el-table-column prop="dischargePort.name" label="卸货港" align="center" width="150" />
-          <!-- <el-table-column prop="dischargeWharf.name" label="卸货码头" align="center" width="150" /> -->
-          <!-- <el-table-column prop="carNumPlan" label="计划商品车数量" align="center" width="180" /> -->
-          <el-table-column prop="carNumActual" label="商品车数量" align="center" width="180" />
-          <!-- <el-table-column prop="spareNumPlan" label="计划件杂货数量" align="center" width="180" /> -->
-          <el-table-column prop="spareNumActual" label="件杂货数量" align="center" width="180" />
-          <el-table-column
-            prop="departureDatePlan"
-            label="计划离港时间"
-            align="center"
-            width="200"
-          />
-          <el-table-column
-            prop="departureDateActual"
-            label="实际离港时间"
-            align="center"
-            width="200"
-          />
-          <el-table-column prop="createDate" label="发布日期时间" align="center" width="200" />
+          <el-table-column prop="ship.name" label="船名" align="center" />
+          <el-table-column prop="voyage" label="航次" align="center" />
+          <el-table-column prop="loadPort.name" label="装货港" align="center" />
+          <el-table-column prop="dischargePort.name" label="卸货港" align="center" />
+          <el-table-column prop="carNumActual" label="商品车数量" align="center" />
+          <el-table-column prop="spareNumActual" label="件杂货数量" align="center" />
+          <el-table-column prop="departureDatePlan" label="计划离港时间" align="center" />
+          <el-table-column prop="departureDateActual" label="实际离港时间" align="center" />
+          <el-table-column prop="createDate" label="发布日期时间" align="center" />
         </el-table>
       </div>
       <!-- 分页 -->
diff --git a/src/views/History/components/ReceiveTable.vue b/src/views/History/components/ReceiveTable.vue
index 7d3eab5..0f5bcdc 100644
--- a/src/views/History/components/ReceiveTable.vue
+++ b/src/views/History/components/ReceiveTable.vue
@@ -18,29 +18,15 @@
           :infinite-scroll-disabled="disabled"
           @row-click="onClickCellOpenDetail"
         >
-          <el-table-column prop="ship.name" label="船名" align="center" width="150" />
-          <el-table-column prop="voyage" label="航次" align="center" width="180" />
-          <el-table-column prop="loadPort.name" label="装货港" align="center" width="150" />
-          <!-- <el-table-column prop="loadWharf.name" label="装货码头" align="center" width="150" /> -->
-          <el-table-column prop="dischargePort.name" label="卸货港" align="center" width="150" />
-          <!-- <el-table-column prop="dischargeWharf.name" label="卸货码头" align="center" width="150" /> -->
-          <!-- <el-table-column prop="carNumPlan" label="计划商品车数量" align="center" width="180" /> -->
-          <el-table-column prop="carNumActual" label="商品车数量" align="center" width="180" />
-          <!-- <el-table-column prop="spareNumPlan" label="计划件杂货数量" align="center" width="180" /> -->
-          <el-table-column prop="spareNumActual" label="件杂货数量" align="center" width="180" />
-          <el-table-column
-            prop="departureDatePlan"
-            label="计划离港时间"
-            align="center"
-            width="200"
-          />
-          <el-table-column
-            prop="departureDateActual"
-            label="实际离港时间"
-            align="center"
-            width="200"
-          />
-          <el-table-column prop="createDate" label="发布日期时间" align="center" width="200" />
+          <el-table-column prop="ship.name" label="船名" align="center" />
+          <el-table-column prop="voyage" label="航次" align="center" />
+          <el-table-column prop="loadPort.name" label="装货港" align="center" />
+          <el-table-column prop="dischargePort.name" label="卸货港" align="center" />
+          <el-table-column prop="carNumActual" label="商品车数量" align="center" />
+          <el-table-column prop="spareNumActual" label="件杂货数量" align="center" />
+          <el-table-column prop="departureDatePlan" label="计划离港时间" align="center" />
+          <el-table-column prop="departureDateActual" label="实际离港时间" align="center" />
+          <el-table-column prop="createDate" label="发布日期时间" align="center" />
         </el-table>
       </div>
       <!-- 分页 -->
diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue
index 993e3cd..368eae0 100644
--- a/src/views/Login/index.vue
+++ b/src/views/Login/index.vue
@@ -364,6 +364,7 @@ const onClickSubmitRegister = (formEl: FormInstance | undefined) => {
       submitLoading.value = true; // 按钮进入加载状态
       // 通过验证
       await postEnterpriseRegAPI(ruleForm);
+      currentPage.value = 0; // 回到登录
 
       ElMessage({
         message: '企业注册成功',
diff --git a/src/views/Send/components/BoatInfoSend.vue b/src/views/Send/components/BoatInfoSend.vue
index e5db6a6..626320d 100644
--- a/src/views/Send/components/BoatInfoSend.vue
+++ b/src/views/Send/components/BoatInfoSend.vue
@@ -78,7 +78,7 @@
     </el-row>
 
     <el-row :gutter="20">
-      <el-col :span="12">
+      <el-col :span="8">
         <el-form-item label="计划装载" required>
           <div class="form-item">
             <el-form-item prop="carNumPlan" style="width: 100%">
@@ -99,7 +99,7 @@
           </div>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="8">
         <div class="form-item">
           <el-form-item label="实际装载" required>
             <el-form-item prop="carNumActual">
@@ -134,7 +134,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="实际离港时间" prop="departureDateActual">
+        <el-form-item label="实际离港时间">
           <el-date-picker
             v-model="boatForm.departureDateActual"
             type="datetime"
@@ -247,7 +247,7 @@ const formRules = reactive<FormRules>({
   carNumActual: [{ required: true, message: '请输入实际商品车数量', trigger: 'blur' }],
   spareNumActual: [{ required: true, message: '请输入实际件杂货数量', trigger: 'blur' }],
   departureDatePlan: [{ required: true, message: '请选择计划离泊时间', trigger: 'change' }],
-  departureDateActual: [{ required: true, message: '请选择实际离泊时间', trigger: 'change' }],
+  // departureDateActual: [{ required: true, message: '请选择实际离泊时间', trigger: 'change' }],
   shipStatus: [{ required: true, message: '请选择船舶状态', trigger: 'change' }],
   tradeType: [{ required: true, message: '请选择贸易类型', trigger: 'change' }],
   loadPortId: [{ required: true, message: '请输入装货港口', trigger: 'blur' }],
@@ -336,7 +336,16 @@ const onClickConfirm = (formEl: FormInstance | undefined) => {
 .form {
   width: 100%;
   height: 100%;
-  overflow-y: auto;
+  overflow: hidden;
+  :deep(.el-form-item__label) {
+    font-size: 21px;
+    font-style: normal;
+    font-weight: 700;
+    color: #333;
+  }
+  .el-row {
+    margin-bottom: 20px;
+  }
   .form-item {
     display: flex;
     flex-direction: row;
diff --git a/src/views/Send/components/HistoryTable.vue b/src/views/Send/components/HistoryTable.vue
index 5228742..355fce7 100644
--- a/src/views/Send/components/HistoryTable.vue
+++ b/src/views/Send/components/HistoryTable.vue
@@ -1,27 +1,27 @@
 <template>
   <div class="historyTable">
     <el-table :data="historyData">
-      <el-table-column prop="ship.name" label="船名" align="center" width="150" />
-      <el-table-column prop="voyage" label="航次" align="center" width="180" />
-      <el-table-column label="装货港 / 装货码头" align="center" width="300">
+      <el-table-column prop="ship.name" label="船名" align="center" />
+      <el-table-column prop="voyage" label="航次" align="center" />
+      <el-table-column label="装货港 / 装货码头" align="center">
         <template #default="scope">
           <div class="goods-name">
             {{ scope.row.loadPort.name }} / {{ scope.row.loadWharf.name }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="卸货港 / 卸货码头" align="center" width="300">
+      <el-table-column label="卸货港 / 卸货码头" align="center">
         <template #default="scope">
           <div class="goods-name">
             {{ scope.row.dischargePort.name }} / {{ scope.row.dischargeWharf.name }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="carNumActual" label="商品车数量" align="center" width="180" />
-      <el-table-column prop="spareNumActual" label="件杂货数量" align="center" width="180" />
-      <el-table-column prop="departureDatePlan" label="计划离港时间" align="center" width="200" />
-      <el-table-column prop="departureDateActual" label="实际离港时间" align="center" width="200" />
-      <el-table-column prop="shipStatus" label="当前状态" align="center" width="150" />
+      <el-table-column prop="carNumActual" label="商品车数量" align="center" />
+      <el-table-column prop="spareNumActual" label="件杂货数量" align="center" />
+      <el-table-column prop="departureDatePlan" label="计划离港时间" align="center" />
+      <el-table-column prop="departureDateActual" label="实际离港时间" align="center" />
+      <el-table-column prop="shipStatus" label="当前状态" align="center" />
     </el-table>
 
     <div class="table-content">
@@ -36,29 +36,29 @@
         max-height="400px"
         @row-click="onClickOpenManifestDetail"
       >
-        <el-table-column type="index" label="No." width="50" />
-        <el-table-column prop="schedule.ship.name" label="船名" align="center" width="120" />
-        <el-table-column prop="schedule.voyage" label="航次" align="center" width="120" />
-        <el-table-column prop="deck" label="舱层" align="center" width="80" />
-        <el-table-column prop="cabin" label="舱段" align="center" width="80" />
-        <el-table-column prop="billNo" label="贸易类型" align="center" width="160" />
-        <el-table-column prop="billNo" label="提单号" align="center" width="160" />
-        <el-table-column label="货名/品牌/型号" align="center" width="200">
+        <el-table-column type="index" label="No." />
+        <el-table-column prop="schedule.ship.name" label="船名" align="center" />
+        <el-table-column prop="schedule.voyage" label="航次" align="center" />
+        <el-table-column prop="deck" label="舱层" align="center" />
+        <el-table-column prop="cabin" label="舱段" align="center" />
+        <el-table-column prop="billNo" label="贸易类型" align="center" />
+        <el-table-column prop="billNo" label="提单号" align="center" />
+        <el-table-column label="货名/品牌/型号" align="center">
           <template #default="scope">
             <div class="goods-name">
               {{ scope.row.goodsName }}/{{ scope.row.brand.name }}/{{ scope.row.model }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="shippingMark" label="唛头" align="center" width="180" />
-        <el-table-column prop="carNum" label="商品车" align="center" width="100" />
-        <el-table-column prop="spareNum" label="件杂货" align="center" width="100" />
-        <el-table-column prop="weight" label="重量 (kg)" align="center" width="100" />
-        <el-table-column prop="volume" label="体积 (m3)" align="center" width="100" />
+        <el-table-column prop="shippingMark" label="唛头" align="center" />
+        <el-table-column prop="carNum" label="商品车" align="center" />
+        <el-table-column prop="spareNum" label="件杂货" align="center" />
+        <el-table-column prop="weight" label="重量 (kg)" align="center" />
+        <el-table-column prop="volume" label="体积 (m3)" align="center" />
         <!-- TODO:港口没有 -->
-        <el-table-column prop="consigner" label="发货人" align="center" width="180" />
-        <el-table-column prop="consignee" label="收货人" align="center" width="180" />
-        <el-table-column prop="goodsStatus" label="货物状态" align="center" width="150" />
+        <el-table-column prop="consigner" label="发货人" align="center" />
+        <el-table-column prop="consignee" label="收货人" align="center" />
+        <el-table-column prop="goodsStatus" label="货物状态" align="center" 、 />
       </el-table>
     </div>
 
@@ -69,28 +69,23 @@
         <div></div>
       </div>
       <el-table v-loading="tableLoading" :data="manifestDetail" max-height="400px">
-        <el-table-column type="index" label="No." width="50" />
-        <el-table-column prop="billNo" label="提单号" align="center" width="150" />
-        <el-table-column prop="brand.name" label="品牌" align="center" width="150" />
-        <el-table-column prop="vehicleType.name" label="车型" align="center" width="150" />
-        <el-table-column
-          prop="vehicleTypeDetail.name"
-          label="车型明细"
-          align="center"
-          width="180"
-        />
-        <el-table-column prop="model" label="型号" align="center" width="150" />
-        <el-table-column prop="vin" label="VIN" align="center" width="200" />
-        <el-table-column prop="weight" label="重量(kg)" align="center" width="150" />
-        <el-table-column prop="volume" label="体积(m3)" align="center" width="150" />
-        <el-table-column prop="length" label="长 mm" align="center" width="150" />
-        <el-table-column prop="width" label="宽 mm" align="center" width="150" />
-        <el-table-column prop="height" label="高 mm" align="center" width="150" />
-        <el-table-column prop="bamm" label="BAmm" align="center" width="150" />
-        <el-table-column prop="lrmm" label="LRmm" align="center" width="150" />
-        <el-table-column prop="damage" label="有无质损" align="center" width="150" />
-        <el-table-column prop="damageDesc" label="质损描述" align="center" width="200" />
-        <el-table-column prop="updateDate" label="更新时间" align="center" width="180" />
+        <el-table-column type="index" label="No." />
+        <el-table-column prop="billNo" label="提单号" align="center" />
+        <el-table-column prop="brand.name" label="品牌" align="center" />
+        <el-table-column prop="vehicleType.name" label="车型" align="center" />
+        <el-table-column prop="vehicleTypeDetail.name" label="车型明细" align="center" />
+        <el-table-column prop="model" label="型号" align="center" />
+        <el-table-column prop="vin" label="VIN" align="center" />
+        <el-table-column prop="weight" label="重量(kg)" align="center" />
+        <el-table-column prop="volume" label="体积(m3)" align="center" />
+        <el-table-column prop="length" label="长 mm" align="center" />
+        <el-table-column prop="width" label="宽 mm" align="center" />
+        <el-table-column prop="height" label="高 mm" align="center" />
+        <el-table-column prop="bamm" label="BAmm" align="center" />
+        <el-table-column prop="lrmm" label="LRmm" align="center" />
+        <el-table-column prop="damage" label="有无质损" align="center" />
+        <el-table-column prop="damageDesc" label="质损描述" align="center" />
+        <el-table-column prop="updateDate" label="更新时间" align="center" />
       </el-table>
     </div>
   </div>
@@ -114,7 +109,7 @@ const manifestTable = ref<ManifestType[]>([]);
 
 // 获取舱单信息
 const getManifestTable = async () => {
-  const scheduleId = props.historyData[0].shipId;
+  const scheduleId = props.historyData[0].id;
   const { data } = await getManifestListAPI({
     scheduleId,
   });
diff --git a/src/views/Send/components/ManifestDetailSend.vue b/src/views/Send/components/ManifestDetailSend.vue
index bf66a19..88b3738 100644
--- a/src/views/Send/components/ManifestDetailSend.vue
+++ b/src/views/Send/components/ManifestDetailSend.vue
@@ -279,7 +279,16 @@ const onClickConfirm = (formEl: FormInstance | undefined) => {
 .form {
   width: 100%;
   height: 100%;
-  overflow-y: auto;
+  overflow: hidden;
+  :deep(.el-form-item__label) {
+    font-size: 21px;
+    font-style: normal;
+    font-weight: 700;
+    color: #333;
+  }
+  .el-row {
+    margin-bottom: 20px;
+  }
   .form-item {
     display: flex;
     flex-direction: row;
diff --git a/src/views/Send/components/ManifestSend.vue b/src/views/Send/components/ManifestSend.vue
index 7153ea9..14d6090 100644
--- a/src/views/Send/components/ManifestSend.vue
+++ b/src/views/Send/components/ManifestSend.vue
@@ -320,7 +320,16 @@ const onClickConfirm = (formEl: FormInstance | undefined) => {
 .form {
   width: 100%;
   height: 100%;
-  overflow-y: auto;
+  overflow: hidden;
+  :deep(.el-form-item__label) {
+    font-size: 21px;
+    font-style: normal;
+    font-weight: 700;
+    color: #333;
+  }
+  .el-row {
+    margin-bottom: 20px;
+  }
   .form-item {
     display: flex;
     flex-direction: row;
diff --git a/src/views/Send/components/Send.vue b/src/views/Send/components/Send.vue
index 65f192c..fed1918 100644
--- a/src/views/Send/components/Send.vue
+++ b/src/views/Send/components/Send.vue
@@ -89,13 +89,11 @@ const onUpdateManifest = (params: manifestDetailPropsType) => {
     box-sizing: border-box;
     display: flex;
     width: 100%;
-    height: calc(100% - 70px);
     .content-left {
       box-sizing: border-box;
       display: flex;
       flex-direction: row;
       width: 380px;
-      height: 100%;
       padding: 40px 0 0 20px;
       background-color: #027db4;
       .left-icon {
@@ -121,8 +119,7 @@ const onUpdateManifest = (params: manifestDetailPropsType) => {
     .content-right {
       box-sizing: border-box;
       width: 70%;
-      height: 100%;
-      padding: 20px;
+      padding: 30px 100px;
       background-color: #fff;
     }
   }
diff --git a/src/views/Send/components/SendTable.vue b/src/views/Send/components/SendTable.vue
index 8f95fb7..f179951 100644
--- a/src/views/Send/components/SendTable.vue
+++ b/src/views/Send/components/SendTable.vue
@@ -14,40 +14,28 @@
           :infinite-scroll-disabled="disabled"
           @row-click="onClickCellOpenDetail"
         >
-          <el-table-column prop="ship.name" label="船名" align="center" width="150" />
-          <el-table-column prop="voyage" label="航次" align="center" width="180" />
-          <el-table-column label="装货港 / 装货码头" align="center" width="300">
+          <el-table-column prop="ship.name" label="船名" align="center" />
+          <el-table-column prop="voyage" label="航次" align="center" />
+          <el-table-column label="装货港 / 装货码头" align="center">
             <template #default="scope">
               <div class="goods-name">
                 {{ scope.row.loadPort.name }} / {{ scope.row.loadWharf.name }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="卸货港 / 卸货码头" align="center" width="300">
+          <el-table-column label="卸货港 / 卸货码头" align="center">
             <template #default="scope">
               <div class="goods-name">
                 {{ scope.row.dischargePort.name }} / {{ scope.row.dischargeWharf.name }}
               </div>
             </template>
           </el-table-column>
-          <!-- <el-table-column prop="carNumPlan" label="计划商品车数量" align="center" width="180" /> -->
-          <el-table-column prop="carNumActual" label="商品车数量" align="center" width="180" />
-          <!-- <el-table-column prop="spareNumPlan" label="计划件杂货数量" align="center" width="180" /> -->
-          <el-table-column prop="spareNumActual" label="件杂货数量" align="center" width="180" />
-          <el-table-column
-            prop="departureDatePlan"
-            label="计划离港时间"
-            align="center"
-            width="200"
-          />
-          <el-table-column
-            prop="departureDateActual"
-            label="实际离港时间"
-            align="center"
-            width="200"
-          />
-          <el-table-column prop="shipStatus" label="当前状态" align="center" width="150" />
-          <el-table-column prop="operator" label="操作" width="200px" align="center" fixed="right">
+          <el-table-column prop="carNumActual" label="商品车数量" align="center" />
+          <el-table-column prop="spareNumActual" label="件杂货数量" align="center" />
+          <el-table-column prop="departureDatePlan" label="计划离港时间" align="center" />
+          <el-table-column prop="departureDateActual" label="实际离港时间" align="center" />
+          <el-table-column prop="shipStatus" label="当前状态" align="center" />
+          <el-table-column prop="operator" label="操作" align="center">
             <template #default="scope">
               <div class="update-btn">
                 <div class="btn" @click.stop="onClickOpenDetail(scope.row)">更新状态</div>
diff --git a/src/views/Setting/components/EmployeeDialog.vue b/src/views/Setting/components/EmployeeDialog.vue
index 7065075..7d75607 100644
--- a/src/views/Setting/components/EmployeeDialog.vue
+++ b/src/views/Setting/components/EmployeeDialog.vue
@@ -2,7 +2,7 @@
   <el-dialog
     v-model="dialogVisible"
     :title="`${dialogProps.title}员工`"
-    width="80%"
+    width="50%"
     @close="onCloseDialog"
   >
     <el-form
@@ -13,19 +13,11 @@
       :model="dialogProps.row"
       :hide-required-asterisk="dialogProps.isView"
     >
-      <el-form-item label="企业" prop="enterpriseId" required>
-        <RemoteSelect
-          v-model:value="dialogProps.row!.enterpriseId"
-          placeholder="请选择企业"
-          :api="postEnterpriseListAPI"
-          :disabled="dialogProps.isView"
-        />
-      </el-form-item>
       <el-form-item label="码头" prop="wharfId" required>
         <RemoteSelect
           v-model:value="dialogProps.row!.wharfId"
           placeholder="请选择码头"
-          :api="postWharfListAPI"
+          :api="() => postWharfListAPI({ ref: userInfo.portId })"
           :disabled="dialogProps.isView"
         />
       </el-form-item>
@@ -47,9 +39,6 @@
       <el-form-item label="手机号" prop="phone">
         <el-input v-model="dialogProps.row!.phone" placeholder="请填写手机号码" />
       </el-form-item>
-      <!-- <el-form-item label="密码" prop="password">
-        <el-input v-model="dialogProps.row!.password" placeholder="请填写密码" show-password />
-      </el-form-item> -->
     </el-form>
     <template #footer>
       <span class="dialog-footer">
@@ -64,10 +53,11 @@
 
 <script lang="ts" setup>
 import { ElMessage, FormInstance, FormRules } from 'element-plus';
+import { storeToRefs } from 'pinia';
 import { reactive, ref } from 'vue';
-import { postEnterpriseListAPI } from '@/api/Enterprise/company';
 import { postWharfListAPI } from '@/api/Wharf';
 import RemoteSelect from '@/components/RemoteSelect/index.vue';
+import { useUserStore } from '@/store/modules/user';
 import { EmployeeType } from '@/types/Enterprise';
 
 interface DialogPropsType {
@@ -88,9 +78,14 @@ const dialogProps = ref<DialogPropsType>({
   row: {},
 });
 
+// 获取当前用户信息
+const userState = useUserStore();
+const { userInfo } = storeToRefs(userState);
+
 // 显示dialog，新增/编辑订阅
 const isShowDialog = (params: DialogPropsType) => {
   dialogProps.value = params;
+  dialogProps.value.row.enterpriseId = userInfo.value.enterpriseId as number;
   dialogVisible.value = true;
 };
 
@@ -101,7 +96,6 @@ defineExpose({ isShowDialog });
 const formRules = reactive<FormRules>({
   name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
   username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
-  enterpriseId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
   wharfId: [{ required: true, message: '请选择码头', trigger: 'blur' }],
   job: [{ required: true, message: '请输入职位', trigger: 'blur' }],
   dept: [{ required: true, message: '请输入部门', trigger: 'blur' }],
diff --git a/src/views/Setting/components/EmployeeRole.vue b/src/views/Setting/components/EmployeeRole.vue
index 11da638..ee0b256 100644
--- a/src/views/Setting/components/EmployeeRole.vue
+++ b/src/views/Setting/components/EmployeeRole.vue
@@ -149,7 +149,7 @@ const employeeListLoad = async () => {
     height: 100%;
     .list-left {
       box-sizing: border-box;
-      width: 266px;
+      flex: 1;
       .left-title {
         font-size: 20px;
         font-weight: 700;
diff --git a/src/views/Setting/components/EmployeeTable.vue b/src/views/Setting/components/EmployeeTable.vue
index d69ca83..91e1744 100644
--- a/src/views/Setting/components/EmployeeTable.vue
+++ b/src/views/Setting/components/EmployeeTable.vue
@@ -7,13 +7,13 @@
       <!-- 表格 -->
       <div class="footer-table">
         <el-table v-loading="tableLoading" :data="tableState.tableData" max-height="460">
-          <el-table-column prop="name" label="姓名" align="center" width="180" />
-          <el-table-column prop="dept" label="部门" align="center" width="180" />
-          <el-table-column prop="job" label="职位" align="center" width="180" />
-          <el-table-column prop="nickname" label="昵称" align="center" width="180" />
-          <el-table-column prop="username" label="用户名" align="center" width="180" />
-          <el-table-column prop="wharf.name" label="码头" align="center" width="180" />
-          <el-table-column prop="status" label="状态" align="center" width="120">
+          <el-table-column prop="name" label="姓名" align="center" />
+          <el-table-column prop="dept" label="部门" align="center" />
+          <el-table-column prop="job" label="职位" align="center" />
+          <el-table-column prop="nickname" label="昵称" align="center" />
+          <el-table-column prop="username" label="用户名" align="center" />
+          <el-table-column prop="wharf.name" label="码头" align="center" />
+          <el-table-column prop="status" label="状态" align="center">
             <template #default="scope">
               <el-tag v-if="scope.row.status === '正常'" type="success">
                 {{ scope.row.status }}
@@ -21,18 +21,9 @@
               <el-tag v-else type="info">{{ scope.row.status }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="phone" label="联系电话" align="center" width="120" />
-          <el-table-column prop="operator" label="操作" width="200px" align="center" fixed="right">
+          <el-table-column prop="phone" label="联系电话" align="center" />
+          <el-table-column prop="operator" label="操作" align="center">
             <template #default="scope">
-              <el-button
-                type="primary"
-                size="small"
-                icon="View"
-                link
-                @click="onClickOpenDialog('查看', scope.row)"
-              >
-                查看
-              </el-button>
               <el-button
                 type="primary"
                 size="small"
diff --git a/src/views/Setting/components/Wharf.vue b/src/views/Setting/components/Wharf.vue
index 66ca284..ef9853c 100644
--- a/src/views/Setting/components/Wharf.vue
+++ b/src/views/Setting/components/Wharf.vue
@@ -33,7 +33,7 @@ const getWharfInfo = async () => {
   const { data } = await postWharfInfoAPI();
   wharfInfo.value = data;
   // 获取码头图片
-  const { data: photo } = await getWharfPhotoAPI(data.portId);
+  const { data: photo } = await getWharfPhotoAPI(data.id);
 
   const arrayBufferToBase64 = (buffer: ArrayBuffer): string => {
     let binary = '';
diff --git a/src/views/Subscription/components/PublishDialog.vue b/src/views/Subscription/components/PublishDialog.vue
index 9b8938f..5237dfa 100644
--- a/src/views/Subscription/components/PublishDialog.vue
+++ b/src/views/Subscription/components/PublishDialog.vue
@@ -61,6 +61,7 @@
           placeholder="请选择起订日期"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD HH:mm"
+          :disabled-date="disabledDate"
         />
       </el-form-item>
       <el-form-item label="截止日期" prop="endDate">
@@ -70,6 +71,7 @@
           placeholder="请选择截止日期"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD HH:mm"
+          :disabled-date="disableEndDate"
         />
       </el-form-item>
     </el-form>
@@ -94,6 +96,23 @@ import RemoteSelect from '@/components/RemoteSelect/index.vue';
 import { useUserStore } from '@/store/modules/user';
 import { SubscriptionType } from '@/types/subscription';
 
+// 禁用时间
+const disabledDate = (time: Date) => {
+  return time.getTime() < Date.now() - 3600 * 1000 * 24;
+};
+const disableEndDate = (time: Date) => {
+  if (!dialogProps.value.row.beginDate) {
+    return time.getTime() < Date.now() - 3600 * 1000 * 24;
+  } else {
+    const beginDate = new Date(dialogProps.value.row.beginDate).getTime();
+    // 只允许选择开始时间之后的90天
+    return (
+      time.getTime() > beginDate + 3600 * 1000 * 24 * 90 ||
+      time.getTime() < beginDate - 3600 * 1000 * 24
+    );
+  }
+};
+
 interface DialogPropsType {
   title: string;
   isView: boolean;
diff --git a/src/views/Subscription/components/PublishTable.vue b/src/views/Subscription/components/PublishTable.vue
index 608cf6b..f81fe65 100644
--- a/src/views/Subscription/components/PublishTable.vue
+++ b/src/views/Subscription/components/PublishTable.vue
@@ -13,16 +13,16 @@
           v-el-table-infinite-scroll="tableDataLoad"
           :infinite-scroll-disabled="disabled"
         >
-          <el-table-column type="index" label="序号" width="60" />
-          <el-table-column prop="subPort.name" label="上游港口" align="center" width="150" />
-          <el-table-column prop="subWharf.name" label="装货码头" align="center" width="150" />
-          <el-table-column prop="subInfo" label="订阅信息" align="center" width="200" />
-          <el-table-column prop="beginDate" label="订阅日期" align="center" width="180" />
-          <el-table-column prop="endDate" label="截止日期" align="center" width="180" />
-          <el-table-column prop="scheduleNum" label="收到船期" align="center" width="150" />
-          <el-table-column prop="billNoNum" label="收到舱单" align="center" width="150" />
-          <el-table-column prop="billNoDetailNum" label="舱单明细" align="center" width="150" />
-          <el-table-column prop="subStatus" label="状态" align="center" width="150">
+          <el-table-column type="index" label="序号" />
+          <el-table-column prop="subPort.name" label="上游港口" align="center" />
+          <el-table-column prop="subWharf.name" label="装货码头" align="center" />
+          <el-table-column prop="subInfo" label="订阅信息" align="center" />
+          <el-table-column prop="beginDate" label="订阅日期" align="center" />
+          <el-table-column prop="endDate" label="截止日期" align="center" />
+          <el-table-column prop="scheduleNum" label="收到船期" align="center" />
+          <el-table-column prop="billNoNum" label="收到舱单" align="center" />
+          <el-table-column prop="billNoDetailNum" label="舱单明细" align="center" />
+          <el-table-column prop="subStatus" label="状态" align="center">
             <template #default="scope">
               <div style="color: #caf982" v-if="scope.row.subStatus === '待接受'">
                 {{ scope.row.subStatus }}
@@ -39,7 +39,7 @@
               <div v-else>{{ scope.row.subStatus }}</div>
             </template>
           </el-table-column>
-          <el-table-column prop="operator" label="操作" width="240px" align="center" fixed="right">
+          <el-table-column prop="operator" label="操作" width="240px" align="center">
             <template #default="scope">
               <div class="btn-wrap">
                 <div class="btn edit-btn" @click="onClickOpenDialog('编辑', scope.row)">修订</div>
diff --git a/src/views/Subscription/components/ReceiveTable.vue b/src/views/Subscription/components/ReceiveTable.vue
index 6d17784..bbfb9eb 100644
--- a/src/views/Subscription/components/ReceiveTable.vue
+++ b/src/views/Subscription/components/ReceiveTable.vue
@@ -13,15 +13,15 @@
           v-el-table-infinite-scroll="tableDataLoad"
           :infinite-scroll-disabled="disabled"
         >
-          <el-table-column prop="port.name" label="下游港口" align="center" width="150" />
-          <el-table-column prop="wharf.name" label="卸货码头" align="center" width="150" />
-          <el-table-column prop="subInfo" label="订阅信息" align="center" width="200" />
-          <el-table-column prop="beginDate" label="订阅日期" align="center" width="180" />
-          <el-table-column prop="endDate" label="截止日期" align="center" width="180" />
-          <el-table-column prop="scheduleNum" label="已发船期" align="center" width="150" />
-          <el-table-column prop="billNoNum" label="已发舱单" align="center" width="150" />
-          <el-table-column prop="billNoDetailNum" label="舱单明细" align="center" width="150" />
-          <el-table-column prop="subStatus" label="状态" align="center" width="150">
+          <el-table-column prop="port.name" label="下游港口" align="center" />
+          <el-table-column prop="wharf.name" label="卸货码头" align="center" />
+          <el-table-column prop="subInfo" label="订阅信息" align="center" />
+          <el-table-column prop="beginDate" label="订阅日期" align="center" />
+          <el-table-column prop="endDate" label="截止日期" align="center" />
+          <el-table-column prop="scheduleNum" label="已发船期" align="center" />
+          <el-table-column prop="billNoNum" label="已发舱单" align="center" />
+          <el-table-column prop="billNoDetailNum" label="舱单明细" align="center" />
+          <el-table-column prop="subStatus" label="状态" align="center">
             <template #default="scope">
               <div style="color: #caf982" v-if="scope.row.subStatus === '待接受'">
                 {{ scope.row.subStatus }}
@@ -38,7 +38,7 @@
               <div v-else>{{ scope.row.subStatus }}</div>
             </template>
           </el-table-column>
-          <el-table-column prop="operator" label="操作" width="240px" align="center" fixed="right">
+          <el-table-column prop="operator" label="操作" align="center" width="240px">
             <template #default="scope">
               <div class="btn-wrap">
                 <div>