diff --git a/index.html b/index.html
index d17600a6..dc388ab9 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
     />
     <title><%= title %></title>
     <link rel="icon" href="/favicon.ico" />
-    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_wqiwqo0ahpj.css" />
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_m8j7ejplfs.css" />
   </head>
   <body>
     <script>
diff --git a/src/assets/icons/renwu1.png b/src/assets/icons/renwu1.png
new file mode 100644
index 00000000..e3c03f20
Binary files /dev/null and b/src/assets/icons/renwu1.png differ
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 5e587711..0bd3371c 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -81,4 +81,5 @@ code {
 
 .vben-basic-modal-close {
   margin-right: 0!important;
-}
\ No newline at end of file
+}
+
diff --git a/src/views/operation/bill/index.vue b/src/views/operation/bill/index.vue
index e4a28d77..6bb0c54e 100644
--- a/src/views/operation/bill/index.vue
+++ b/src/views/operation/bill/index.vue
@@ -1,27 +1,19 @@
 <template>
   <div class="main">
-    <div class="top" style="padding-left: 14px;">
-      <BasicTable :rowClassName="rowClassName" @row-click="handleClick" class="examine-table" @register="registerTable">
+    <div class="top p20">
+      <BasicTable :rowClassName="rowClassName" @row-click="handleClick" class="ds-table" @register="registerTable">
         <template #tableTitle>
-          <div class="ds-h-aciton-btns-fee">
-            <a-tooltip placement="top" :mouseEnterDelay="0.5">
-              <template #title>
-                <span>打印</span>
-              </template>
-              <span class="ds-action-svg-btn">
-                <img src="../../../assets/svg/print.svg" class="SvgImg" />
-              </span>
-            </a-tooltip>
-            <a-tooltip placement="top" :mouseEnterDelay="0.5">
-              <template #title>
-                <span>导出</span>
-              </template>
-              <span class="ds-action-svg-btn">
-                <img @click="exportExcel" src="../../../assets/icons/export.svg" class="SvgImg" />
-              </span>
-            </a-tooltip>
+          <div style="flex: 2; background: #f5f6f7; padding: 2px 11px;margin-right: 20px">
+            <a-radio-group @change="radioChange" v-model:value="queryTabCode">
+              <a-radio value="BLQuery">提单查询</a-radio>
+              <a-radio value="CheckInQuery">可签入</a-radio>
+              <a-radio value="CheckOutQuery">可签出</a-radio>
+              <a-radio value="HasCheckOutQuery">已签出</a-radio>
+              <a-radio value="BLModifyQuery">改签</a-radio>
+              <a-radio value="BLSeizeQuery">已扣单</a-radio>
+            </a-radio-group>
           </div>
-          <div>
+          <TableButton :show="{}">
             <a-dropdown>
               <template #overlay>
                 <a-menu>
@@ -29,11 +21,7 @@
                   <a-menu-item @click="cancelCheckIn(1)">取消签入</a-menu-item>
                 </a-menu>
               </template>
-              <a-button type="link">
-                <span class="iconfont icon-tidanqianru"></span>
-                提单签入
-                <span class="iconfont icon-30jiantouxiangxiafill"></span>
-              </a-button>
+              <span class="iconfont icon-tidanqianru">提单签入</span>
             </a-dropdown>
             <a-dropdown>
               <template #overlay>
@@ -42,11 +30,7 @@
                   <a-menu-item @click="cancelCheckIn(2)">取消签出</a-menu-item>
                 </a-menu>
               </template>
-              <a-button type="link">
-                <span class="iconfont icon-tidanqianchu"></span>
-                提单签出
-                <span class="iconfont icon-30jiantouxiangxiafill"></span>
-              </a-button>
+              <span class="iconfont icon-tidanqianchu">提单签出</span>
             </a-dropdown>
             <a-dropdown>
               <template #overlay>
@@ -55,11 +39,7 @@
                   <a-menu-item @click="cancelCheckIn(3)">取消船证签入</a-menu-item>
                 </a-menu>
               </template>
-              <a-button type="link">
-                <span class="iconfont icon-chuanzhengqianru"></span>
-                船证签入
-                <span class="iconfont icon-30jiantouxiangxiafill"></span>
-              </a-button>
+              <span class="iconfont icon-chuanzhengqianru">船证签入</span>
             </a-dropdown>
             <a-dropdown>
               <template #overlay>
@@ -68,11 +48,7 @@
                   <a-menu-item @click="cancelCheckIn(4)">取消换签(背书)</a-menu-item>
                 </a-menu>
               </template>
-              <a-button type="link">
-                <span class="iconfont icon-a-chehuiquxiao"></span>
-                换签(背书)
-                <span class="iconfont icon-30jiantouxiangxiafill"></span>
-              </a-button>
+              <span class="iconfont icon-a-chehuiquxiao"> 换签(背书)</span>
             </a-dropdown>
             <a-dropdown>
               <template #overlay>
@@ -80,11 +56,7 @@
                   <a-menu-item @click="cancelCheckIn(5)">驳回放单通知</a-menu-item>
                 </a-menu>
               </template>
-              <a-button type="link">
-                <span class="iconfont icon-bohui"></span>
-                驳回放单通知
-                <span class="iconfont icon-30jiantouxiangxiafill"></span>
-              </a-button>
+              <span class="iconfont icon-bohui">驳回放单通知</span>
             </a-dropdown>
             <a-dropdown>
               <template #overlay>
@@ -93,22 +65,28 @@
                   <a-menu-item @click="cancelCheckIn(7)">状态更改</a-menu-item>
                 </a-menu>
               </template>
-              <a-button type="link">
-                <span class="iconfont icon-liebiao1"></span>
-                其他
-                <span class="iconfont icon-30jiantouxiangxiafill"></span>
-              </a-button>
+              <span class="iconfont icon-liebiao1">其他</span>
             </a-dropdown>
+          </TableButton>
+          <div class="ds-h-aciton-btns-fee">
+            <a-tooltip placement="top" :mouseEnterDelay="0.5">
+              <template #title>
+                <span>打印</span>
+              </template>
+              <span class="ds-action-svg-btn">
+                <img src="../../../assets/svg/print.svg" class="SvgImg" />
+              </span>
+            </a-tooltip>
+            <a-tooltip placement="top" :mouseEnterDelay="0.5">
+              <template #title>
+                <span>导出</span>
+              </template>
+              <span class="ds-action-svg-btn">
+                <img @click="exportExcel" src="../../../assets/icons/export.svg" class="SvgImg" />
+              </span>
+            </a-tooltip>
           </div>
-          <div style="flex: 2; background: #f5f6f7; padding: 5px 11px;">
-            <a-radio-group @change="radioChange" v-model:value="queryTabCode">
-              <a-radio value="BLQuery">提单查询</a-radio>
-              <a-radio value="CheckInQuery">可签入</a-radio>
-              <a-radio value="CheckOutQuery">可签出</a-radio>
-              <a-radio value="HasCheckOutQuery">已签出</a-radio>
-              <a-radio value="BLModifyQuery">改签</a-radio>
-              <a-radio value="BLSeizeQuery">已扣单</a-radio>
-            </a-radio-group>
+          <div>
           </div>
         </template>
         <template v-slot:bodyCell="{ column, record }">
@@ -136,54 +114,57 @@
         </template>
       </BasicTable>
     </div>
-    <div style="padding-left: 20px;height: 250px">
-      <div style="display: flex;height: 100%;">
-        <div class="left">
-          <div class="title-bold">日志</div>
-          <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable2">
+    <div style="padding: 0 20px;">
+      <a-spin :spinning="loading">
+        <div style="display: flex;height: 100%;">
+          <div class="left card-box">
+            <div class="title-bold">日志</div>
+            <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable2">
 
-          </BasicTable>
-        </div>
-        <div class="middle">
-          <div style="display: flex;width: 100%;">
-            <div style="width: 63%;margin-right: 2%">
-              <div class="title-bold">欠费信息</div>
-              <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable3">
-              </BasicTable>
-            </div>
-            <div style="width: 35%">
-              <div class="title-bold" style="display: flex;line-height: 18.84px;height: 18.84px">
-                <span>附件</span>
-                <DsFile @handleSuccess="fileSuccess" ref="dsFile" :showFileList="false" :id="bookid" :show="false"
-                  height="300">
-                  <i style="margin-left: 15px;color: #257afa;cursor: pointer;" @click="addFile"
-                    class="iconfont icon-fujian"></i>
-                </DsFile>
+            </BasicTable>
+          </div>
+          <div class="middle">
+            <div style="display: flex;width: 100%;">
+              <div style="width: 63%;margin-right: 2%" class="card-box">
+                <div class="title-bold">欠费信息</div>
+                <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable3">
+                </BasicTable>
               </div>
-              <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable5">
-                <template v-slot:bodyCell="{ column, record }">
-                  <template v-if="column.dataIndex == 'fileName'">
-                    <a @click="download(record)">{{ record.fileName }}</a>
+              <div style="width: 35%" class="card-box">
+                <div class="title-bold" style="display: flex;line-height: 18.84px;height: 18.84px">
+                  <span>附件</span>
+                  <DsFile @handleSuccess="fileSuccess" ref="dsFile" :showFileList="false" :id="bookid" :show="false"
+                    height="300">
+                    <i style="margin-left: 15px;color: #257afa;cursor: pointer;" @click="addFile"
+                      class="iconfont icon-fujian"></i>
+                  </DsFile>
+                </div>
+                <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable5">
+                  <template v-slot:bodyCell="{ column, record }">
+                    <template v-if="column.dataIndex == 'fileName'">
+                      <a @click="download(record)">{{ record.fileName }}</a>
+                    </template>
                   </template>
-                </template>
-              </BasicTable>
+                </BasicTable>
+              </div>
             </div>
           </div>
-        </div>
-        <div class="right">
-          <div style="font-size: 12px;color: black;font-weight: bold;margin-bottom: 10px">相关信息</div>
-          <div>
-            客户结费类型为：{{ checkInfo.stlTypeName }} 结算日期：{{ checkInfo.stlDate }}
-          </div>
-          <div>
-            未结算费用：USD{{ checkInfo.noPayAmountUSD }} RMB{{ checkInfo.noPayAmountCNY }} 合计{{
-              checkInfo.noPayAmountTotal }}
-          </div>
-          <div>
-            信用额度：{{ checkInfo.allowAmount }}
+          <div class="right card-box">
+            <div style="font-size: 14px;color: black;font-weight: bold;margin-bottom: 13px">相关信息</div>
+            <div>
+              客户结费类型为：{{ checkInfo.stlTypeName }} 结算日期：{{ checkInfo.stlDate }}
+            </div>
+            <div>
+              未结算费用：USD{{ checkInfo.noPayAmountUSD }} RMB{{ checkInfo.noPayAmountCNY }} 合计{{
+                checkInfo.noPayAmountTotal }}
+            </div>
+            <div>
+              信用额度：{{ checkInfo.allowAmount }}
+            </div>
           </div>
         </div>
-      </div>
+      </a-spin>
+
     </div>
     <a-modal width="600px" @cancel="checkFlag = false" @ok="sureCheckIn" :visible="checkFlag"
       :title="checkType == 2 ? '签出' : '签入'">
@@ -231,7 +212,7 @@ import { useMessage } from '/@/hooks/web/useMessage'
 const { createMessage } = useMessage()
 const queryData = ref({})
 const [registerTable, { reload, setLoading, getSelectRows, getForm, getColumns }] = useTable({
-  maxHeight: 380,
+  maxHeight: 300,
   api: async (p) => {
     const res: API.DataResult = await GetList(p)
     return new Promise((resolve) => {
@@ -311,7 +292,7 @@ const [registerTable2, { getSelectRows: getSelectRows2, setTableData }] = useTab
   isTreeTable: false,
   pagination: false,
   showIndexColumn: false,
-  maxHeight: 450,
+  maxHeight: 350,
   bordered: true,
   striped: true,
   rowKey: 'id',
@@ -322,7 +303,7 @@ const [registerTable3, { setTableData: setTableDataFee }] = useTable({
   columns: feeColumns,
   useSearchForm: false,
   showIndexColumn: false,
-  maxHeight: 450,
+  maxHeight: 350,
   pagination: false,
   showTableSetting: false,
   striped: true,
@@ -336,7 +317,7 @@ const [registerTable5, { setTableData: setTableDataFile }] = useTable({
   columns: columnsFile,
   useSearchForm: false,
   showIndexColumn: false,
-  maxHeight: 450,
+  maxHeight: 350,
   pagination: false,
   showTableSetting: false,
   striped: true,
@@ -646,12 +627,20 @@ function cancelCheckIn(type) {
   padding-bottom: 10px;
 }
 
-.main {}
+.main {
+  background-color: rgba(240, 242, 245, 1);
+  height: 100%
+}
 
 .left {
   width: 29%;
-  padding-right: 10px;
-  border-right: 1px solid #ebebeb;
+}
+
+.card-box {
+  background-color: white;
+  border-radius: 6px;
+  border: 1px solid rgba(204, 214, 223, 1);
+  padding: 14px 20px;
 }
 
 .middle {
@@ -663,8 +652,8 @@ function cancelCheckIn(type) {
 }
 
 .right {
-  width: 14%;
   font-size: 12px;
+  flex: 1;
 }
 
 .left-fee {
@@ -738,6 +727,10 @@ function cancelCheckIn(type) {
   padding: 0px 10px !important;
 }
 
+:deep(.vben-basic-table) {
+  height: auto !important;
+}
+
 .SvgImg {
   width: 18px;
   height: 18px;
@@ -784,8 +777,8 @@ function cancelCheckIn(type) {
 
 .title-bold {
   font-weight: bold;
-  font-size: 12px;
-  margin-bottom: 10px;
+  font-size: 14px;
+  margin-bottom: 13px;
 }
 
 :deep(.active-row) {
diff --git a/src/views/taskmanage/columns.tsx b/src/views/taskmanage/columns.tsx
index c659afca..45e38764 100644
--- a/src/views/taskmanage/columns.tsx
+++ b/src/views/taskmanage/columns.tsx
@@ -242,109 +242,109 @@ export const searchFormSchema: FormSchema[] = [
 export const columns: BasicColumn[] = [
   {
     title: '订舱号',
-    align: 'center',
+    align: 'left',
     width: 100,
     dataIndex: 'bookingReference'
   },
   {
     title: '类别',
-    align: 'center',
+    align: 'left',
     width: 60,
     dataIndex: 'bookingChannelTypeName'
   },
   {
     title: '起运港',
-    align: 'center',
+    align: 'left',
     width: 100,
     dataIndex: 'placeReceiptCity'
   },
   {
     title: '目的港',
-    align: 'center',
+    align: 'left',
     width: 100,
     dataIndex: 'placeDeliveryCity'
   },
   {
     title: '箱型箱量',
-    align: 'center',
+    align: 'left',
     width: 80,
     dataIndex: 'ctnStat'
   },
   {
     title: '船名/航次',
-    align: 'center',
+    align: 'left',
     width: 200,
     dataIndex: 'vessel'
   },
   {
     title: 'ETD',
-    align: 'center',
+    align: 'left',
     width: 100,
     dataIndex: 'etd'
   },
   {
     title: '总重（KGS）',
-    align: 'center',
+    align: 'left',
     width: 130,
     dataIndex: 'totalCargoWeight'
   },
   {
     title: '合约号',
-    align: 'center',
+    align: 'left',
     width: 160,
     dataIndex: 'priceReference'
   },
   {
     title: '船公司',
-    align: 'center',
+    align: 'left',
     width: 100,
     dataIndex: 'carrierCode'
   },
   {
     title: 'BC',
-    align: 'center',
+    align: 'left',
     width: 50,
     dataIndex: 'isRecvBC'
   },
   {
     title: 'Cancellation',
-    align: 'center',
+    align: 'left',
     width: 100,
     dataIndex: 'isRecvBKCancel'
   },
   {
     title: '状态',
-    align: 'center',
+    align: 'left',
     width: 130,
     dataIndex: 'statusName'
   },
   {
     title: 'SOC',
-    align: 'center',
+    align: 'left',
     width: 50,
     dataIndex: 'isShipperOwned'
   },
   {
     title: '订舱人',
-    align: 'center',
+    align: 'left',
     width: 130,
     dataIndex: 'createdUserName'
   },
   {
     title: '订舱日期',
-    align: 'center',
+    align: 'left',
     width: 150,
     dataIndex: 'createdTime'
   },
   {
     title: '金额',
-    align: 'center',
+    align: 'left',
     width: 100,
     dataIndex: 'shipRateTotalAmount'
   },
   {
     title: '发送结果',
-    align: 'center',
+    align: 'left',
     width: 150,
     dataIndex: 'notes',
     ellipsis: true
diff --git a/src/views/taskmanage/index.vue b/src/views/taskmanage/index.vue
index 2d84e26a..81f7e59c 100644
--- a/src/views/taskmanage/index.vue
+++ b/src/views/taskmanage/index.vue
@@ -1,350 +1,284 @@
 <template>
   <div class="main">
-    <div style="width: 100%">
-      <BasicTable @expand="expand" :expandIcon="expandIcon" class="ds-table-detail" @register="registerTable"
-        @row-dbClick="handledbclick">
-        <template #left>
-          <div class="nav-box">
-            <div class="nav-bottom">
-              <a-button type="link" size="small" @click="getCurrentTotalStat('refsh')">
-                <i class="icon-refresh-1-copy iconfont"></i>刷新任务单</a-button>
+    <div class="main-box">
+      <div class="nav-box">
+        <div class="nav-bottom">
+          <span>任务单</span>
+          <i @click="getCurrentTotalStat('refsh')" class="icon-shuaxin20x20 iconfont icon"></i>
+        </div>
+        <a-spin :spinning="levelLoading" tip="加载中...">
+          <div class="bottom-box">
+            <div class="nav-title" v-if="levelTop.length > 0">
+              <a-radio-group v-model:value="activeTopKey" @change="changeTopLevel">
+                <a-radio-button v-for="(item, index) in levelTop" :value="item.key" :key="index">
+                  <span class="nav-top">{{ item.name }}<span class="nav-top-tip">({{ item.total }})</span></span>
+                </a-radio-button>
+              </a-radio-group>
+            </div>
+            <div class="nav-no-data" v-else><i class="iconfont icon-guanli"></i><span>暂无导航数据</span>
             </div>
-            <a-spin :spinning="levelLoading" tip="加载中...">
-              <div class="bottom-box">
-                <div class="nav-title" v-if="levelTop.length > 0">
-                  <a-radio-group button-style="solid" v-model:value="activeTopKey"
-                    style="margin-bottom: 16px; display: flex" @change="changeTopLevel">
-                    <a-radio-button v-for="(item, index) in levelTop" :value="item.key" :key="index">
-                      <span class="nav-top">{{ item.name }}<span class="nav-top-tip">({{ item.total }})</span></span>
-                    </a-radio-button>
-                  </a-radio-group>
-                </div>
-                <div class="nav-no-data" v-else><i class="iconfont icon-guanli"></i><span>暂无导航数据</span>
-                </div>
-                <div style="padding: 0 20px">
-                  <a-tabs tab-position="top" v-model:activeKey="activeNextKey" hide-add size="small"
-                    @change="changeNextLevel" v-if="levelNext.length > 0">
-                    <a-tab-pane v-for="level in levelNext" :key="level.key" :tab="level.name" style="margin-right: 6px">
-                      <div>
-                        <div v-for="(item, index) in levelTree" @click="handleClickTree(item, index)"
-                          :class="{ active: item.active, redColor: item.key == 'CAUTION_NOTICE' }" class="box-item">
-                          <div class="box-text">
-                            <i v-if="item.key != 'CAUTION_NOTICE'" class="icon-touzijilu iconfont"></i>
-                            <i v-if="item.key == 'CAUTION_NOTICE'" class="icon-jinggao iconfont"></i>
-                            {{ item.name }}
-                          </div>
-                          <div class="box-number">{{ item.total }}</div>
-                        </div>
+            <div style="padding: 0 20px">
+              <a-tabs tab-position="top" v-model:activeKey="activeNextKey" hide-add size="small"
+                @change="changeNextLevel" v-if="levelNext.length > 0">
+                <a-tab-pane v-for="level in levelNext" :key="level.key" :tab="level.name" style="margin-right: 6px">
+                  <div>
+                    <div v-for="(item, index) in levelTree" @click="handleClickTree(item, index)"
+                      :class="{ active: item.active, redColor: item.key == 'CAUTION_NOTICE' }" class="box-item">
+                      <div class="box-text">
+                        <img v-if="item.key != 'CAUTION_NOTICE'" src="../../assets/icons/renwu1.png" alt="">
+                        <i v-if="item.key == 'CAUTION_NOTICE'" class="icon-zhongyaotixing iconfont"></i>
+                        {{ item.name }}
                       </div>
-                    </a-tab-pane>
-                  </a-tabs>
-                </div>
-              </div>
-            </a-spin>
+                      <div class="box-number">{{ item.total }}</div>
+                    </div>
+                  </div>
+                </a-tab-pane>
+              </a-tabs>
+            </div>
           </div>
-        </template>
-        <template #tableTitle>
-          <a-popconfirm title="是否取消当前选择项？" ok-text="是" cancel-text="否" @confirm="removeFun">
-            <a-button type="link"> <i class="icon-weiwancheng iconfont"></i> 取消</a-button>
-          </a-popconfirm>
-          <!-- <a-popconfirm title="确定完成当前选择项？" ok-text="是" cancel-text="否" @confirm="submitFun">
-            <a-button type="link"><i class="icon-yiwancheng2 iconfont"></i>完成</a-button>
-          </a-popconfirm> -->
-          <a-button type="link" @click="openUser"><i class="icon-zhuanfa iconfont"></i>任务转交</a-button>
-          <a-popconfirm title="确定任务领取吗？" ok-text="是" cancel-text="否" @confirm="handlePull">
-            <a-button type="link"><i class="icon-shangchuanziliao iconfont"></i>任务领取</a-button>
-          </a-popconfirm>
-          <!-- <a-button type="link" @click="FnPrint"><i class="icon-weibiaoti-- iconfont"></i>打印</a-button> -->
-          <!-- <a-button type="link" @click="FnSendCar"><i class="icon-chezaikucun iconfont"></i>派车</a-button>
-                    <a-button type="link" @click="CancelSendCar"><i
-                            class="icon-weiwancheng iconfont"></i>取消派车</a-button> -->
-          <template v-if="taskType === 'BC'">
-            <a-popconfirm title="确定批量下载当前选择项？" ok-text="是" cancel-text="否" @confirm="downloadFun">
-              <a-button type="link"><i class="icon-xiazai-wenjianxiazai-16 iconfont"></i>批量下载</a-button>
-            </a-popconfirm>
-            <a-popconfirm title="确定重新比对当前选择项？" ok-text="是" cancel-text="否" @confirm="reComparisonFun">
-              <a-button type="link"><i class="iconfont icon-duibi"></i>重新比对</a-button>
-            </a-popconfirm>
-          </template>
-          <template v-if="taskType === 'DRAFT' || taskType === 'SEAWAY BILL'">
-            <a-popconfirm title="确定批量转发当前选择项？" ok-text="是" cancel-text="否" @confirm="SendEmailFun">
-              <a-button type="link"><i class="iconfont icon-31zhuanfa"></i>批量转发</a-button>
-            </a-popconfirm>
-            <a-popconfirm title="确定批量下载当前选择项？" ok-text="是" cancel-text="否" @confirm="downloadFun">
-              <a-button type="link"><i class="icon-xiazai-wenjianxiazai-16 iconfont"></i>批量下载</a-button>
-            </a-popconfirm>
-          </template>
-          <template v-if="taskType === 'DRAFT'">
-            <a-popconfirm title="确定计算当前选择项？" ok-text="是" cancel-text="否" @confirm="laraPaperCalc">
-              <a-button type="link"><i class="iconfont icon-52"></i>页数计算</a-button>
-            </a-popconfirm>
-          </template>
-          <template v-if="taskType === 'WAIT_BC'">
-            <a-button @click="openFile" type="link"><i class="iconfont icon-52"></i>上传BC并放舱</a-button>
-          </template>
-          <template v-if="taskType === 'ORIGINAL_DOWN'">
-            <a-popconfirm title="确定COPY打印当前选择项？" ok-text="是" cancel-text="否" @confirm="copyPrintFun">
-              <a-button type="link"><i class="iconfont icon-weibiaoti--"></i>COPY打印</a-button>
-            </a-popconfirm>
-            <a-popconfirm title="确定COPY打印当前选择项？" ok-text="是" cancel-text="否" @confirm="copyDownloadFun">
-              <a-button type="link"><i class="iconfont icon-xiazai-wenjianxiazai-13"></i>COPY下载</a-button>
-            </a-popconfirm>
-            <a-popconfirm title="确定正本下载当前选择项？" ok-text="是" cancel-text="否" @confirm="printBatchFun">
-              <a-button type="link"><i class="iconfont icon-xiazai"></i>正本下载</a-button>
-            </a-popconfirm>
-            <a-popconfirm title="确定登记当前选择项？" ok-text="是" cancel-text="否" @confirm="laraPaperRegistFun">
-              <a-button type="link"><i class="iconfont icon-dengjizongshu"></i>LARA登记</a-button>
-            </a-popconfirm>
-            <a-button type="link" @click="laraRecordFun"><i class="iconfont icon-touzijilu"></i>LARA记录</a-button>
-          </template>
-        </template>
-        <template #toolbar>
-          <a-button type="link" @click="openCustom"><i class="icon-shuliebiao iconfont"></i>列设置</a-button>
-        </template>
-        <template v-slot:bodyCell="{ column, record }">
-          <template v-if="column.key === 'iS_EXCEPT'">
-            <span v-if="record.iS_EXCEPT == 1">异常</span>
-            <span v-if="record.iS_EXCEPT == 0">未异常</span>
-          </template>
-          <template v-if="column.key === 'iS_COMPLETE'">
-            <span v-if="record.iS_COMPLETE == 1">已完成</span>
-            <span v-if="record.iS_COMPLETE == 0">未完成</span>
-          </template>
-          <template v-if="column.key === 'iS_PUBLIC'">
-            <span v-if="record.iS_PUBLIC == 1">公共</span>
-            <span v-if="record.iS_PUBLIC == 0">非公共</span>
-          </template>
-          <template v-if="column.key === 'iS_SET_AUTO_EMAIL'">
-            <span v-if="record.iS_SET_AUTO_EMAIL == 1">是</span>
-            <span v-if="record.iS_SET_AUTO_EMAIL == 0">否</span>
-          </template>
-          <template v-if="column.key === 'iS_DONGSH_RECV'">
-            <span v-if="record.iS_DONGSH_RECV == 1">是</span>
-            <span v-if="record.iS_DONGSH_RECV == 0">否</span>
-          </template>
-          <template v-if="column.key === 'iS_DONGSH_RESULT'">
-            <span v-if="record.iS_DONGSH_RESULT == 1">是</span>
-            <span v-if="record.iS_DONGSH_RESULT == 0">否</span>
-          </template>
-          <template v-if="column.key === 'iS_WEEK_DIFF'">
-            <span v-if="record.iS_WEEK_DIFF == 1">是</span>
-            <span v-if="record.iS_WEEK_DIFF == 0">否</span>
-          </template>
-          <template v-if="column.key === 'iS_PRICE_DATE_DIFF'">
-            <span v-if="record.iS_PRICE_DATE_DIFF == 1">是</span>
-            <span v-if="record.iS_PRICE_DATE_DIFF == 0">否</span>
-          </template>
-          <template v-if="column.key === 'iS_TRANSFER'">
-            <span v-if="record.iS_TRANSFER == 1">是</span>
-            <span v-if="record.iS_TRANSFER == 0">否</span>
-          </template>
-          <template v-if="column.key === 'iS_CUT_DATE_ADVANCED'">
-            <span v-if="record.iS_CUT_DATE_ADVANCED == 1">是</span>
-            <span v-if="record.iS_CUT_DATE_ADVANCED == 0">否</span>
-          </template>
-          <template v-if="column.key === 'iS_UPDATE_BOOKING'">
-            <span v-if="record.iS_UPDATE_BOOKING == 1">是</span>
-            <span v-if="record.iS_UPDATE_BOOKING == 0">否</span>
-          </template>
-          <template v-if="column.key === 'iS_SEND_EMAIL'">
-            <span v-if="record.iS_SEND_EMAIL == 1">已发送</span>
-            <span v-if="record.iS_SEND_EMAIL == 0">未发送</span>
-          </template>
-          <template v-if="column.key === 'iS_CHANGE'">
-            <span v-if="record.iS_CHANGE == 1">已发送</span>
-            <span v-if="record.iS_CHANGE == 0">未发送</span>
-          </template>
-          <template v-if="column.key === 'iS_EMAIL_SEND'">
-            <span v-if="record.iS_EMAIL_SEND == 1">已推送</span>
-            <span v-if="record.iS_EMAIL_SEND == 0">未推送</span>
-          </template>
-          <template v-if="column.key === 'procesS_STATUS'">
-            <span v-if="record.procesS_STATUS == 'TEMP'">待处理</span>
-            <span v-if="record.procesS_STATUS == 'SUCC'">处理成功</span>
-            <span v-if="record.procesS_STATUS == 'FAILURE'">失败</span>
-          </template>
-          <template v-if="column.key === 'cautioN_NOTICE_TYPE'">
-            <span v-if="record.cautioN_NOTICE_TYPE == 'WeekAt'">计费周差异</span>
-            <span v-if="record.cautioN_NOTICE_TYPE == 'PriceCalcDate'">计费日期差异</span>
-            <span v-if="record.cautioN_NOTICE_TYPE == 'ChangeTransfer'">直达转为中转</span>
-            <span v-if="record.cautioN_NOTICE_TYPE == 'ChangeVesselVoyno'">船名航次变化</span>
-            <span v-if="record.cautioN_NOTICE_TYPE == 'VGMCutDateAdvanced'">VGM截止时间提前</span>
-            <span v-if="record.cautioN_NOTICE_TYPE == 'SICutDateAdvanced'">SI截止时间提前</span>
-          </template>
-          <template v-if="column.key === 'ouT_BUSI_TYPE'">
-            <span v-if="record.ouT_BUSI_TYPE == ' SPLIT'">已拆单</span>
-            <span v-else>未拆单</span>
+        </a-spin>
+      </div>
+      <div class="p20">
+        <BasicTable :expand-column-width="25" @expand="expand" :expandIconAsCell="false" :expandIconColumnIndex="2" class="ds-table"
+          @register="registerTable" @row-dbClick="handledbclick">
+          <template #tableTitle>
+            <TableButton :show="{}">
+              <a-popconfirm title="是否取消当前选择项？" ok-text="是" cancel-text="否" @confirm="removeFun">
+                <span class="iconfont icon-weiwancheng-copy">取消</span>
+              </a-popconfirm>
+              <span @click="openUser" class="iconfont icon-renwuzhuanjiao-danse">任务转交</span>
+              <a-popconfirm title="确定任务领取吗？" ok-text="是" cancel-text="否" @confirm="handlePull">
+                <span class="iconfont icon-renwulingqu-danse">任务领取</span>
+              </a-popconfirm>
+              <template v-if="taskType === 'WAIT_BC'">
+                <span @click="openFile" class="iconfont icon-shangchuanBCbingfangcang-danse">上传BC并放舱</span>
+              </template>
+            </TableButton>
           </template>
-          <template v-if="column.key === 'sI_SUBTYPE'">
-            <span v-if="record.sI_SUBTYPE == 'BOOK_ORDER'">订舱</span>
-            <span v-if="record.sI_SUBTYPE == 'MAIL_RECV'">邮件接受</span>
+          <template #toolbar>
+            <a-button type="link" @click="openCustom"><i class="icon-lieshezhi1 iconfont"></i></a-button>
           </template>
-          <template v-if="column.key === 'plaN_TYPE'">
-            <span v-if="record.plaN_TYPE == 'Rolling'">预甩货</span>
-            <span v-if="record.plaN_TYPE == 'Transfer'">中专预甩</span>
+          <template v-slot:bodyCell="{ column, record }">
+            <template v-if="column.key === 'iS_EXCEPT'">
+              <span v-if="record.iS_EXCEPT == 1">异常</span>
+              <span v-if="record.iS_EXCEPT == 0">未异常</span>
+            </template>
+            <template v-if="column.key === 'iS_COMPLETE'">
+              <span v-if="record.iS_COMPLETE == 1">已完成</span>
+              <span v-if="record.iS_COMPLETE == 0">未完成</span>
+            </template>
+            <template v-if="column.key === 'iS_PUBLIC'">
+              <span v-if="record.iS_PUBLIC == 1">公共</span>
+              <span v-if="record.iS_PUBLIC == 0">非公共</span>
+            </template>
+            <template v-if="column.key === 'iS_SET_AUTO_EMAIL'">
+              <span v-if="record.iS_SET_AUTO_EMAIL == 1">是</span>
+              <span v-if="record.iS_SET_AUTO_EMAIL == 0">否</span>
+            </template>
+            <template v-if="column.key === 'iS_DONGSH_RECV'">
+              <span v-if="record.iS_DONGSH_RECV == 1">是</span>
+              <span v-if="record.iS_DONGSH_RECV == 0">否</span>
+            </template>
+            <template v-if="column.key === 'iS_DONGSH_RESULT'">
+              <span v-if="record.iS_DONGSH_RESULT == 1">是</span>
+              <span v-if="record.iS_DONGSH_RESULT == 0">否</span>
+            </template>
+            <template v-if="column.key === 'iS_WEEK_DIFF'">
+              <span v-if="record.iS_WEEK_DIFF == 1">是</span>
+              <span v-if="record.iS_WEEK_DIFF == 0">否</span>
+            </template>
+            <template v-if="column.key === 'iS_PRICE_DATE_DIFF'">
+              <span v-if="record.iS_PRICE_DATE_DIFF == 1">是</span>
+              <span v-if="record.iS_PRICE_DATE_DIFF == 0">否</span>
+            </template>
+            <template v-if="column.key === 'iS_TRANSFER'">
+              <span v-if="record.iS_TRANSFER == 1">是</span>
+              <span v-if="record.iS_TRANSFER == 0">否</span>
+            </template>
+            <template v-if="column.key === 'iS_CUT_DATE_ADVANCED'">
+              <span v-if="record.iS_CUT_DATE_ADVANCED == 1">是</span>
+              <span v-if="record.iS_CUT_DATE_ADVANCED == 0">否</span>
+            </template>
+            <template v-if="column.key === 'iS_UPDATE_BOOKING'">
+              <span v-if="record.iS_UPDATE_BOOKING == 1">是</span>
+              <span v-if="record.iS_UPDATE_BOOKING == 0">否</span>
+            </template>
+            <template v-if="column.key === 'iS_SEND_EMAIL'">
+              <span v-if="record.iS_SEND_EMAIL == 1">已发送</span>
+              <span v-if="record.iS_SEND_EMAIL == 0">未发送</span>
+            </template>
+            <template v-if="column.key === 'iS_CHANGE'">
+              <span v-if="record.iS_CHANGE == 1">已发送</span>
+              <span v-if="record.iS_CHANGE == 0">未发送</span>
+            </template>
+            <template v-if="column.key === 'iS_EMAIL_SEND'">
+              <span v-if="record.iS_EMAIL_SEND == 1">已推送</span>
+              <span v-if="record.iS_EMAIL_SEND == 0">未推送</span>
+            </template>
+            <template v-if="column.key === 'procesS_STATUS'">
+              <span v-if="record.procesS_STATUS == 'TEMP'">待处理</span>
+              <span v-if="record.procesS_STATUS == 'SUCC'">处理成功</span>
+              <span v-if="record.procesS_STATUS == 'FAILURE'">失败</span>
+            </template>
+            <template v-if="column.key === 'cautioN_NOTICE_TYPE'">
+              <span v-if="record.cautioN_NOTICE_TYPE == 'WeekAt'">计费周差异</span>
+              <span v-if="record.cautioN_NOTICE_TYPE == 'PriceCalcDate'">计费日期差异</span>
+              <span v-if="record.cautioN_NOTICE_TYPE == 'ChangeTransfer'">直达转为中转</span>
+              <span v-if="record.cautioN_NOTICE_TYPE == 'ChangeVesselVoyno'">船名航次变化</span>
+              <span v-if="record.cautioN_NOTICE_TYPE == 'VGMCutDateAdvanced'">VGM截止时间提前</span>
+              <span v-if="record.cautioN_NOTICE_TYPE == 'SICutDateAdvanced'">SI截止时间提前</span>
+            </template>
+            <template v-if="column.key === 'ouT_BUSI_TYPE'">
+              <span v-if="record.ouT_BUSI_TYPE == ' SPLIT'">已拆单</span>
+              <span v-else>未拆单</span>
+            </template>
+            <template v-if="column.key === 'sI_SUBTYPE'">
+              <span v-if="record.sI_SUBTYPE == 'BOOK_ORDER'">订舱</span>
+              <span v-if="record.sI_SUBTYPE == 'MAIL_RECV'">邮件接受</span>
+            </template>
+            <template v-if="column.key === 'plaN_TYPE'">
+              <span v-if="record.plaN_TYPE == 'Rolling'">预甩货</span>
+              <span v-if="record.plaN_TYPE == 'Transfer'">中专预甩</span>
+            </template>
+            <template v-if="column.key === 'recvUserList'">
+              <a-popover :overlayStyle="{ width: '330px' }" trigger="click">
+                <template #content>
+                  <div style="width: 300px">
+                    <a-table size="small" :pagination="false" :data-source="record.recvUserList">
+                      <a-table-column width="100" data-index="recvUserName" title="接收人" />
+                      <a-table-column width="100" data-index="recvUserStatusName" title="状态" />
+                      <a-table-column width="100" data-index="recvUserStatusTime" title="状态时间" />
+                    </a-table>
+                  </div>
+                </template>
+                <span style="cursor: pointer; color: #257afa">{{ record.recvUserListName }}</span>
+              </a-popover>
+            </template>
+            <template v-if="column.key === 'busI_TYPE'">
+              <span v-if="record.busI_TYPE == 'BookingConfirmation'">订舱</span>
+              <span v-if="record.busI_TYPE == 'BookingAmendment'">订舱变更</span>
+              <span v-if="record.busI_TYPE == 'BookingCancellation'">订舱取消</span>
+            </template>
           </template>
-          <template v-if="column.key === 'recvUserList'">
-            <a-popover :overlayStyle="{ width: '330px' }" trigger="click">
-              <template #content>
-                <div style="width: 300px">
-                  <a-table size="small" :pagination="false" :data-source="record.recvUserList">
-                    <a-table-column width="100" data-index="recvUserName" title="接收人" />
-                    <a-table-column width="100" data-index="recvUserStatusName" title="状态" />
-                    <a-table-column width="100" data-index="recvUserStatusTime" title="状态时间" />
-                  </a-table>
-                </div>
+          <template #expandedRowRender="{ record }">
+            <BasicTable @register="registerTable1">
+              <template v-slot:bodyCell="{ column, record }">
+                <template v-if="column.key === 'iS_EXCEPT'">
+                  <span v-if="record.iS_EXCEPT == 1">异常</span>
+                  <span v-if="record.iS_EXCEPT == 0">未异常</span>
+                </template>
+                <template v-if="column.key === 'iS_COMPLETE'">
+                  <span v-if="record.iS_COMPLETE == 1">已完成</span>
+                  <span v-if="record.iS_COMPLETE == 0">未完成</span>
+                </template>
+                <template v-if="column.key === 'iS_PUBLIC'">
+                  <span v-if="record.iS_PUBLIC == 1">公共</span>
+                  <span v-if="record.iS_PUBLIC == 0">非公共</span>
+                </template>
+                <template v-if="column.key === 'iS_SET_AUTO_EMAIL'">
+                  <span v-if="record.iS_SET_AUTO_EMAIL == 1">是</span>
+                  <span v-if="record.iS_SET_AUTO_EMAIL == 0">否</span>
+                </template>
+                <template v-if="column.key === 'iS_DONGSH_RECV'">
+                  <span v-if="record.iS_DONGSH_RECV == 1">是</span>
+                  <span v-if="record.iS_DONGSH_RECV == 0">否</span>
+                </template>
+                <template v-if="column.key === 'iS_DONGSH_RESULT'">
+                  <span v-if="record.iS_DONGSH_RESULT == 1">是</span>
+                  <span v-if="record.iS_DONGSH_RESULT == 0">否</span>
+                </template>
+                <template v-if="column.key === 'iS_WEEK_DIFF'">
+                  <span v-if="record.iS_WEEK_DIFF == 1">是</span>
+                  <span v-if="record.iS_WEEK_DIFF == 0">否</span>
+                </template>
+                <template v-if="column.key === 'iS_PRICE_DATE_DIFF'">
+                  <span v-if="record.iS_PRICE_DATE_DIFF == 1">是</span>
+                  <span v-if="record.iS_PRICE_DATE_DIFF == 0">否</span>
+                </template>
+                <template v-if="column.key === 'iS_TRANSFER'">
+                  <span v-if="record.iS_TRANSFER == 1">是</span>
+                  <span v-if="record.iS_TRANSFER == 0">否</span>
+                </template>
+                <template v-if="column.key === 'iS_CUT_DATE_ADVANCED'">
+                  <span v-if="record.iS_CUT_DATE_ADVANCED == 1">是</span>
+                  <span v-if="record.iS_CUT_DATE_ADVANCED == 0">否</span>
+                </template>
+                <template v-if="column.key === 'iS_UPDATE_BOOKING'">
+                  <span v-if="record.iS_UPDATE_BOOKING == 1">是</span>
+                  <span v-if="record.iS_UPDATE_BOOKING == 0">否</span>
+                </template>
+                <template v-if="column.key === 'iS_SEND_EMAIL'">
+                  <span v-if="record.iS_SEND_EMAIL == 1">已发送</span>
+                  <span v-if="record.iS_SEND_EMAIL == 0">未发送</span>
+                </template>
+                <template v-if="column.key === 'iS_CHANGE'">
+                  <span v-if="record.iS_CHANGE == 1">已发送</span>
+                  <span v-if="record.iS_CHANGE == 0">未发送</span>
+                </template>
+                <template v-if="column.key === 'iS_EMAIL_SEND'">
+                  <span v-if="record.iS_EMAIL_SEND == 1">已推送</span>
+                  <span v-if="record.iS_EMAIL_SEND == 0">未推送</span>
+                </template>
+                <template v-if="column.key === 'procesS_STATUS'">
+                  <span v-if="record.procesS_STATUS == 'TEMP'">待处理</span>
+                  <span v-if="record.procesS_STATUS == 'SUCC'">处理成功</span>
+                  <span v-if="record.procesS_STATUS == 'FAILURE'">失败</span>
+                </template>
+                <template v-if="column.key === 'cautioN_NOTICE_TYPE'">
+                  <span v-if="record.cautioN_NOTICE_TYPE == 'WeekAt'">计费周差异</span>
+                  <span v-if="record.cautioN_NOTICE_TYPE == 'PriceCalcDate'">计费日期差异</span>
+                  <span v-if="record.cautioN_NOTICE_TYPE == 'ChangeTransfer'">直达转为中转</span>
+                  <span v-if="record.cautioN_NOTICE_TYPE == 'ChangeVesselVoyno'">船名航次变化</span>
+                  <span v-if="record.cautioN_NOTICE_TYPE == 'VGMCutDateAdvanced'">VGM截止时间提前</span>
+                  <span v-if="record.cautioN_NOTICE_TYPE == 'SICutDateAdvanced'">SI截止时间提前</span>
+                </template>
+                <template v-if="column.key === 'ouT_BUSI_TYPE'">
+                  <span v-if="record.ouT_BUSI_TYPE == ' SPLIT'">已拆单</span>
+                  <span v-else>未拆单</span>
+                </template>
+                <template v-if="column.key === 'sI_SUBTYPE'">
+                  <span v-if="record.sI_SUBTYPE == 'BOOK_ORDER'">订舱</span>
+                  <span v-if="record.sI_SUBTYPE == 'MAIL_RECV'">邮件接受</span>
+                </template>
+                <template v-if="column.key === 'plaN_TYPE'">
+                  <span v-if="record.plaN_TYPE == 'Rolling'">预甩货</span>
+                  <span v-if="record.plaN_TYPE == 'Transfer'">中专预甩</span>
+                </template>
+                <template v-if="column.key === 'recvUserList'">
+                  <a-popover :overlayStyle="{ width: '330px' }" trigger="click">
+                    <template #content>
+                      <div style="width: 300px">
+                        <a-table size="small" :pagination="false" :data-source="record.recvUserList">
+                          <a-table-column width="100" data-index="recvUserName" title="接收人" />
+                          <a-table-column width="100" data-index="recvUserStatusName" title="状态" />
+                          <a-table-column width="100" data-index="recvUserStatusTime" title="状态时间" />
+                        </a-table>
+                      </div>
+                    </template>
+                    <span style="cursor: pointer; color: #257afa">{{ record.recvUserListName }}</span>
+                  </a-popover>
+                </template>
+                <template v-if="column.key === 'busI_TYPE'">
+                  <span v-if="record.busI_TYPE == 'BookingConfirmation'">订舱</span>
+                  <span v-if="record.busI_TYPE == 'BookingAmendment'">订舱变更</span>
+                  <span v-if="record.busI_TYPE == 'BookingCancellation'">订舱取消</span>
+                </template>
               </template>
-              <span style="cursor: pointer; color: #257afa">{{ record.recvUserListName }}</span>
-            </a-popover>
-          </template>
-          <template v-if="column.key === 'busI_TYPE'">
-            <span v-if="record.busI_TYPE == 'BookingConfirmation'">订舱</span>
-            <span v-if="record.busI_TYPE == 'BookingAmendment'">订舱变更</span>
-            <span v-if="record.busI_TYPE == 'BookingCancellation'">订舱取消</span>
+            </BasicTable>
           </template>
-          <!-- <template #truckName="{ record }">
-                        <a-icon @click="handleOpen(record)" style="cursor: pointer;" type="edit" />
-                        {{ record.trucK_NAME }}
-                    </template>
-                    <template #taskType="{ record }">
-                        <span>{{ filterType(record.tasK_TYPE) }}</span>
-                    </template>
-                    <template #taskScource="{ record }">
-                        <span>{{ filterScource(record.tasK_SOURCE) }}</span>
-                    </template>
-                    <template #taskTitle="{ record }">
-                        <span class="task-tit" @click="changePage(record)">{{ record.tasK_TITLE }}</span>
-                    </template> -->
-          <template v-if="column.key === 'action'">
-            <TableAction :actions="[
-              {
-                icon: 'clarity:note-edit-line',
-                tooltip: '编辑',
-                onClick: () => {
-                  handleEdit(record)
-                },
-              },
-            ]" />
+          <template #expandIcon="props">
+            <div v-if="props.record.childTaskCount > 0" class="task-icon" >
+              <span v-if="props.expanded" @click="(e) => props.onExpand(props.record, e)" >
+                <i class="iconfont icon-jian" ></i>
+              </span>
+              <span v-if="!props.expanded" @click="(e) => props.onExpand(props.record, e)">
+                <i class="iconfont icon-jia"  ></i>
+              </span>
+            </div>
           </template>
-        </template>
-        <template #expandedRowRender="{ record }">
-          <BasicTable :rowClassName="rowClassName" class="childTabel" @register="registerTable1">
-            <template v-slot:bodyCell="{ column, record }">
-              <template v-if="column.key === 'iS_EXCEPT'">
-                <span v-if="record.iS_EXCEPT == 1">异常</span>
-                <span v-if="record.iS_EXCEPT == 0">未异常</span>
-              </template>
-              <template v-if="column.key === 'iS_COMPLETE'">
-                <span v-if="record.iS_COMPLETE == 1">已完成</span>
-                <span v-if="record.iS_COMPLETE == 0">未完成</span>
-              </template>
-              <template v-if="column.key === 'iS_PUBLIC'">
-                <span v-if="record.iS_PUBLIC == 1">公共</span>
-                <span v-if="record.iS_PUBLIC == 0">非公共</span>
-              </template>
-              <template v-if="column.key === 'iS_SET_AUTO_EMAIL'">
-                <span v-if="record.iS_SET_AUTO_EMAIL == 1">是</span>
-                <span v-if="record.iS_SET_AUTO_EMAIL == 0">否</span>
-              </template>
-              <template v-if="column.key === 'iS_DONGSH_RECV'">
-                <span v-if="record.iS_DONGSH_RECV == 1">是</span>
-                <span v-if="record.iS_DONGSH_RECV == 0">否</span>
-              </template>
-              <template v-if="column.key === 'iS_DONGSH_RESULT'">
-                <span v-if="record.iS_DONGSH_RESULT == 1">是</span>
-                <span v-if="record.iS_DONGSH_RESULT == 0">否</span>
-              </template>
-              <template v-if="column.key === 'iS_WEEK_DIFF'">
-                <span v-if="record.iS_WEEK_DIFF == 1">是</span>
-                <span v-if="record.iS_WEEK_DIFF == 0">否</span>
-              </template>
-              <template v-if="column.key === 'iS_PRICE_DATE_DIFF'">
-                <span v-if="record.iS_PRICE_DATE_DIFF == 1">是</span>
-                <span v-if="record.iS_PRICE_DATE_DIFF == 0">否</span>
-              </template>
-              <template v-if="column.key === 'iS_TRANSFER'">
-                <span v-if="record.iS_TRANSFER == 1">是</span>
-                <span v-if="record.iS_TRANSFER == 0">否</span>
-              </template>
-              <template v-if="column.key === 'iS_CUT_DATE_ADVANCED'">
-                <span v-if="record.iS_CUT_DATE_ADVANCED == 1">是</span>
-                <span v-if="record.iS_CUT_DATE_ADVANCED == 0">否</span>
-              </template>
-              <template v-if="column.key === 'iS_UPDATE_BOOKING'">
-                <span v-if="record.iS_UPDATE_BOOKING == 1">是</span>
-                <span v-if="record.iS_UPDATE_BOOKING == 0">否</span>
-              </template>
-              <template v-if="column.key === 'iS_SEND_EMAIL'">
-                <span v-if="record.iS_SEND_EMAIL == 1">已发送</span>
-                <span v-if="record.iS_SEND_EMAIL == 0">未发送</span>
-              </template>
-              <template v-if="column.key === 'iS_CHANGE'">
-                <span v-if="record.iS_CHANGE == 1">已发送</span>
-                <span v-if="record.iS_CHANGE == 0">未发送</span>
-              </template>
-              <template v-if="column.key === 'iS_EMAIL_SEND'">
-                <span v-if="record.iS_EMAIL_SEND == 1">已推送</span>
-                <span v-if="record.iS_EMAIL_SEND == 0">未推送</span>
-              </template>
-              <template v-if="column.key === 'procesS_STATUS'">
-                <span v-if="record.procesS_STATUS == 'TEMP'">待处理</span>
-                <span v-if="record.procesS_STATUS == 'SUCC'">处理成功</span>
-                <span v-if="record.procesS_STATUS == 'FAILURE'">失败</span>
-              </template>
-              <template v-if="column.key === 'cautioN_NOTICE_TYPE'">
-                <span v-if="record.cautioN_NOTICE_TYPE == 'WeekAt'">计费周差异</span>
-                <span v-if="record.cautioN_NOTICE_TYPE == 'PriceCalcDate'">计费日期差异</span>
-                <span v-if="record.cautioN_NOTICE_TYPE == 'ChangeTransfer'">直达转为中转</span>
-                <span v-if="record.cautioN_NOTICE_TYPE == 'ChangeVesselVoyno'">船名航次变化</span>
-                <span v-if="record.cautioN_NOTICE_TYPE == 'VGMCutDateAdvanced'">VGM截止时间提前</span>
-                <span v-if="record.cautioN_NOTICE_TYPE == 'SICutDateAdvanced'">SI截止时间提前</span>
-              </template>
-              <template v-if="column.key === 'ouT_BUSI_TYPE'">
-                <span v-if="record.ouT_BUSI_TYPE == ' SPLIT'">已拆单</span>
-                <span v-else>未拆单</span>
-              </template>
-              <template v-if="column.key === 'sI_SUBTYPE'">
-                <span v-if="record.sI_SUBTYPE == 'BOOK_ORDER'">订舱</span>
-                <span v-if="record.sI_SUBTYPE == 'MAIL_RECV'">邮件接受</span>
-              </template>
-              <template v-if="column.key === 'plaN_TYPE'">
-                <span v-if="record.plaN_TYPE == 'Rolling'">预甩货</span>
-                <span v-if="record.plaN_TYPE == 'Transfer'">中专预甩</span>
-              </template>
-              <template v-if="column.key === 'recvUserList'">
-                <a-popover :overlayStyle="{ width: '330px' }" trigger="click">
-                  <template #content>
-                    <div style="width: 300px">
-                      <a-table size="small" :pagination="false" :data-source="record.recvUserList">
-                        <a-table-column width="100" data-index="recvUserName" title="接收人" />
-                        <a-table-column width="100" data-index="recvUserStatusName" title="状态" />
-                        <a-table-column width="100" data-index="recvUserStatusTime" title="状态时间" />
-                      </a-table>
-                    </div>
-                  </template>
-                  <span style="cursor: pointer; color: #257afa">{{ record.recvUserListName }}</span>
-                </a-popover>
-              </template>
-              <template v-if="column.key === 'busI_TYPE'">
-                <span v-if="record.busI_TYPE == 'BookingConfirmation'">订舱</span>
-                <span v-if="record.busI_TYPE == 'BookingAmendment'">订舱变更</span>
-                <span v-if="record.busI_TYPE == 'BookingCancellation'">订舱取消</span>
-              </template>
-              <template v-if="column.key === 'action'">
-                <TableAction :actions="[
-                  {
-                    icon: 'clarity:note-edit-line',
-                    tooltip: '编辑',
-                    onClick: () => {
-                      handleEdit(record)
-                    },
-                  },
-                ]" />
-              </template>
-            </template>
-          </BasicTable>
-        </template>
-      </BasicTable>
+        </BasicTable>
+      </div>
+
     </div>
     <a-modal title="提示信息" width="900px" :visible="bcFileFlag" :footer="null" @cancel="bcFileFlag = false">
       <div class="bcfile-title" style="margin-top: 20px">
@@ -941,20 +875,16 @@ const [registerTable, { reload, setProps, getForm, getSelectRows, setColumns, se
     width: 60,
   },
   canResize: true,
-  resizeHeightOffset: 35,
-  actionColumn: {
-    width: 80,
-    title: '操作',
-    dataIndex: 'action',
-    fixed: 'right',
-  },
+  resizeHeightOffset: 45,
+  id: '0',
+  autoHeight: window.innerHeight - 330.5,
 })
 const [registerTable1, { setTableData }] = useTable({
   immediate: false,
   columns,
   isTreeTable: false,
   pagination: false,
-  striped: true,
+  striped: false,
   useSearchForm: false,
   bordered: true,
   showIndexColumn: true,
@@ -963,13 +893,7 @@ const [registerTable1, { setTableData }] = useTable({
   },
   canResize: true,
   maxHeight: 200,
-  resizeHeightOffset: 35,
-  // actionColumn: {
-  //   width: 80,
-  //   title: '操作',
-  //   dataIndex: 'action',
-  //   fixed: 'right',
-  // },
+  id: '1',
 })
 function handleSearch(val) {
   GetUserListAll({ queryKey: val }).then((res) => {
@@ -1603,10 +1527,9 @@ function laraRecordFun() {
 }
 
 function expandIcon(props) {
+  console.log('props', props)
   if (props.record.childTaskCount > 0) {
-    return h('div', { class: 'expDiv', onClick: (e) => props.onExpand(props.record, e) },
-      [h('i', { class: 'iconfont icon-zirenwu iconExp' }),
-      h('div', { class: 'expNum' }, props.record.childTaskCount)])
+    return true
   }
 }
 
@@ -1669,60 +1592,41 @@ function handleClickTree(row, index) {
 }
 </script>
 <style lang="less" scoped>
-:deep(.ant-popover-placement-top) {
-  width: 330px !important;
-}
-
-:deep(.ant-tabs-bar) {
-  margin-bottom: 0 !important;
+:deep(.ant-tabs-nav-list) {
+  display: flex;
+  width: 100%;
 }
 
-:deep(.ant-table.ant-table-bordered>.ant-table-container) {
-  border-left: none !important;
+:deep(.ant-tabs-tab + .ant-tabs-tab) {
+  margin: 0px !important;
 }
 
-:deep(.ant-tabs-tab) {
-  padding: 8px !important;
-  margin-right: 8px !important;
+:deep(.ant-tabs-ink-bar) {
+  height: 3px !important;
 }
 
-:deep(.ant-form-item) {
-  display: flex;
-}
 
-:deep(.ant-radio-button-wrapper-checked) {
-  background: white;
-  color: black;
-  border: none;
-  font-weight: 700;
-}
-
-:deep(.ant-radio-button-wrapper) {
-  background: rgba(245, 249, 252, 1);
-  border: none !important;
+:deep(.ant-tabs-tab) {
+  display: inline-block;
+  flex-grow: 1;
+  text-align: center;
+  width: 100%;
 }
 
-:deep(.ant-tabs-tab+.ant-tabs-tab) {
-  margin: 0 0 0 12px;
-}
 
-:deep(.ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)) {
-  background: white;
-  color: black;
-  font-weight: 700;
-}
 
 :deep(.nav-title .ant-radio-button-wrapper) {
-  padding: 0px;
   flex-grow: 1;
+  text-align: center;
+  font-size: 12px;
+  padding: 0px;
 }
 
-:deep(.ant-radio-button-wrapper:not(:first-child)::before) {
-  width: 0px;
-}
+
 
 :deep(.ant-radio-group) {
   width: 100%;
+  display: flex;
 }
 
 .box-item {
@@ -1787,10 +1691,17 @@ function handleClickTree(row, index) {
   line-height: 14px;
   flex: 1;
   margin-right: 10px;
+
+  img {
+    height: 16px;
+    display: inline-block;
+    width: 16px;
+    margin-right: 6px;
+  }
 }
 
 .bottom-box {
-  border: 1px solid rgba(232, 235, 237, 1);
+  padding: 0 20px;
 }
 
 .nav-title {
@@ -1805,6 +1716,10 @@ function handleClickTree(row, index) {
   display: flex;
 }
 
+.p20 {
+  width: calc(100% - 300px);
+}
+
 .table-page-search-submitButtons {
   width: 100%;
   display: block;
@@ -1814,9 +1729,21 @@ function handleClickTree(row, index) {
 .nav-bottom {
   width: 100%;
   margin-bottom: 14px;
+  display: flex;
+  padding: 0 20px;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 2px solid rgba(204, 214, 223, 1);
+  padding-bottom: 14px;
+
+  span {
+    font-size: 14px;
+    font-weight: bold;
+  }
 
   .icon {
-    font-size: 12px;
+    font-size: 14px;
+    color: rgba(122, 137, 150, 1);
   }
 }
 
@@ -1860,10 +1787,10 @@ function handleClickTree(row, index) {
 }
 
 .nav-title {
-  .ant-radio-button-wrapper {
-    padding: 0 4px;
-    text-align: center;
-  }
+  // .ant-radio-button-wrapper {
+  //   padding: 0 4px;
+  //   text-align: center;
+  // }
 }
 
 .nav-top {
@@ -1879,10 +1806,10 @@ function handleClickTree(row, index) {
 }
 
 .nav-box {
-  padding: 5px 14px;
+  padding: 5px 0px;
   background: #fff;
   border-radius: 2px;
-  width: 20%;
+  width: 300px;
   flex-shrink: 0;
   margin-top: 4px;
 }
@@ -1961,6 +1888,11 @@ function handleClickTree(row, index) {
   }
 }
 
+.main-box {
+  display: flex;
+  width: 100%;
+}
+
 .bcfile-title {
   border-bottom: 1px dashed black;
   padding-bottom: 5px;
@@ -2012,8 +1944,25 @@ function handleClickTree(row, index) {
   width: 15px;
 }
 
-:deep(.ant-table-tbody .ant-table-row td) {
-  border-right: 1px solid #f0f0f0 !important;
-  text-align: center;
+
+
+.table-box {
+  background: rgba(240, 242, 245, 1)
+}
+.task-icon{
+  .iconfont{
+    font-size: 14px;
+    cursor: pointer;
+  }
+}
+:deep(.ant-table-cell){
+  text-align: left !important;
+}
+
+:deep(.ant-table.ant-table-small .ant-table-tbody .ant-table-wrapper:only-child .ant-table){
+  margin: 0px !important;
+}
+:deep(.ant-table-expanded-row-fixed){
+  padding: 0px !important;
 }
 </style>
diff --git a/src/views/taskmanage/taskList/taskAllocation.vue b/src/views/taskmanage/taskList/taskAllocation.vue
index 61aee628..59f692fc 100644
--- a/src/views/taskmanage/taskList/taskAllocation.vue
+++ b/src/views/taskmanage/taskList/taskAllocation.vue
@@ -12,7 +12,7 @@
                 <div style="padding-left: 20px;margin-top: 20px">
                     <div> 船公司</div>
                     <a-select size="small" @change="handleChangeSearch" v-model:value="carrierId"
-                        style="width: 180px;margin-right: 20px">
+                        style="width: 24%;margin-right: 20px">
                         <a-select-option v-for="item in carrierList" :key="item.carrierId" :value="item.carrierId">{{
                             item.carrier
                         }}</a-select-option>
@@ -21,8 +21,10 @@
                 <div class="list">
                     <div title="操作" class="card">
                         <div class="left">
-                            <div class="card-title"> 操作<i @click="handleEdit('Operator')"
-                                    class="icon-piliangbianji iconfont"></i>
+                            <div class="card-title"> 操作
+                                <TableButton :show="{}">
+                                    <span @click="handleEdit('Operator')" class="iconfont icon-piliangbianji">修改</span>
+                                </TableButton>
                             </div>
                             <div class="taskTypeList">
                                 <div class="taskType" v-for="(item, index) in roleTaskData.operatorTaskTypeList"
@@ -30,16 +32,14 @@
                                         item.taskTypeName }}
                                 </div>
                             </div>
-
-                        </div>
-                        <div class="right">
-                            <img src="../img/操作.png" alt="">
                         </div>
                     </div>
                     <div title="单证" class="card">
                         <div class="left">
-                            <div class="card-title"> 单证<i @click="handleEdit('VouchingClerk')"
-                                    class="icon-piliangbianji iconfont"></i>
+                            <div class="card-title"> 单证
+                                <TableButton :show="{}">
+                                    <span @click="handleEdit('VouchingClerk')" class="iconfont icon-piliangbianji">修改</span>
+                                </TableButton>
                             </div>
                             <div class="taskTypeList">
                                 <div class="taskType" v-for="(item, index) in roleTaskData.vouchingClerkTaskTypeList"
@@ -50,14 +50,13 @@
                             </div>
 
                         </div>
-                        <div class="right">
-                            <img src="../img/单证.png" alt="">
-                        </div>
                     </div>
                     <div title="销售" class="card">
                         <div class="left">
-                            <div class="card-title"> 销售<i @click="handleEdit('Sale')"
-                                    class="icon-piliangbianji iconfont"></i>
+                            <div class="card-title"> 销售
+                                <TableButton :show="{}">
+                                    <span @click="handleEdit('Sale')" class="iconfont icon-piliangbianji">修改</span>
+                                </TableButton>
                             </div>
                             <div class="taskTypeList">
                                 <div class="taskType" v-for="(item, index) in roleTaskData.saleTaskTypeList"
@@ -67,9 +66,6 @@
                             </div>
 
                         </div>
-                        <div class="right">
-                            <img src="../img/销售.png" alt="">
-                        </div>
                     </div>
                     <!-- <div title="报关员"  class="card">
                 <div class="card-title"> <i @click="handleEdit('Custom')" class="icon-piliangbianji iconfont"></i> </div>
@@ -85,8 +81,10 @@
             </div> -->
                     <div title="客服" class="card">
                         <div class="left">
-                            <div class="card-title"> 客服<i @click="handleEdit('CustomerService')"
-                                    class="icon-piliangbianji iconfont"></i>
+                            <div class="card-title"> 客服
+                                <TableButton :show="{}">
+                                    <span @click="handleEdit('CustomerService')" class="iconfont icon-piliangbianji">修改</span>
+                                </TableButton>
                             </div>
                             <div class="taskTypeList">
                                 <div class="taskType" v-for="(item, index) in roleTaskData.customerServiceTaskTypeList"
@@ -96,9 +94,6 @@
                             </div>
 
                         </div>
-                        <div class="right">
-                            <img src="../img/客服.png" alt="">
-                        </div>
                     </div>
                     <!-- <div title="司机"  class="card">
                 <div class="card-title"> <i @click="handleEdit('Driver')" class="icon-piliangbianji iconfont"></i> </div>
@@ -334,10 +329,11 @@ function searchInfo() {
 </script>
 <style lang="less" scoped>
 .main {
-    // padding: 20px;
+    background-color: rgba(240, 242, 245, 1);
+    height: calc(100vh - 60px);
 
     .title {
-        background: rgba(245, 249, 252, 1);
+        background: white;
         padding-left: 20px;
 
         div {
@@ -348,25 +344,29 @@ function searchInfo() {
 
     .iconfont {
         cursor: pointer;
-        color: rgba(22, 119, 255, 1);
         margin-left: 20px;
+        font-weight: 200;
+        font-size: 12px;
     }
 
     .card {
         border-radius: 2px;
-        background: rgba(245, 249, 252, 1);
+        background: white;
         padding: 8px 10px 8px 20px;
+        border-radius: 6px;
         display: flex;
         align-items: flex-start;
-        width: 32%;
-        flex-shrink: 0;
+        border: 1px solid rgba(204, 214, 223, 1);
+        width: 24%;
         min-height: 150px;
         justify-content: space-between;
 
         .card-title {
             font-weight: 700;
-            font-size: 12px;
-            margin-bottom: 10px
+            font-size: 14px;
+            margin-bottom: 10px;
+            display: flex;
+            align-items: center;
         }
     }
 
@@ -393,15 +393,11 @@ function searchInfo() {
         padding: 0 20px;
 
         .card {
-            margin-right: 20px;
-            margin-bottom: 20px;
+            margin-right: 1%;
         }
     }
 }
 
-:deep(.ant-tabs-top > .ant-tabs-nav) {
-    margin: 0px !important;
-}
 
 .type-list {
     display: flex;
@@ -419,4 +415,28 @@ function searchInfo() {
         margin-right: 10px;
     }
 }
+
+:deep(.ant-tabs-nav-list) {
+    display: flex;
+    width: 100%;
+}
+
+:deep(.ant-tabs-tab + .ant-tabs-tab) {
+    margin: 0px !important;
+}
+
+:deep(.ant-tabs-ink-bar) {
+    height: 3px !important;
+}
+
+
+:deep(.ant-tabs-tab) {
+    display: inline-block;
+    text-align: center;
+    width: 5%;
+}
+
+:deep(.ant-tabs-nav) {
+    margin: 0px !important;
+}
 </style>
\ No newline at end of file
