diff --git a/src/views/bookingcabin/generation/api.ts b/src/views/bookingcabin/generation/api.ts
index 636810d2..01a30c7a 100644
--- a/src/views/bookingcabin/generation/api.ts
+++ b/src/views/bookingcabin/generation/api.ts
@@ -24,4 +24,12 @@ export function CreateBookingOrder(parameter) {
     method: 'post',
     data: parameter
   })
+}
+
+export function GetEnableProjectDictTreeList(parameter) {
+  return request<DataResult>({
+    url: '/opApi/DjyServiceStatus/GetEnableProjectDictTreeList',
+    method: 'get',
+    params: parameter
+  })
 }
\ No newline at end of file
diff --git a/src/views/bookingcabin/generation/columns.tsx b/src/views/bookingcabin/generation/columns.tsx
index 4f1f386b..3cce646b 100644
--- a/src/views/bookingcabin/generation/columns.tsx
+++ b/src/views/bookingcabin/generation/columns.tsx
@@ -60,6 +60,18 @@ export const formSchema: FormSchema[] = [
             }
             GetClientInfoWithContact(data).then(res=>{
               customerContactAllList.value = res.data.clientContactList
+              if(res.data.saleId){
+                formModel.saleId = res.data.saleId
+              }
+              if(res.data.op){
+                formModel.operatorId = res.data.op
+              }
+              if(res.data.doc){
+                formModel.docId = res.data.doc
+              }
+              if(res.data.customerService){
+                formModel.custserviceId = res.data.customerService
+              }
             })
           }
           if (!obj && !e) {
diff --git a/src/views/bookingcabin/generation/index.vue b/src/views/bookingcabin/generation/index.vue
index 56e01676..8d1a355f 100644
--- a/src/views/bookingcabin/generation/index.vue
+++ b/src/views/bookingcabin/generation/index.vue
@@ -1,18 +1,27 @@
 <template>
   <BasicModal width="800px" v-bind="$attrs" :use-wrapper="true" title="生成方式选择" @register="registerModal"
     @ok="handleSave">
-    <BasicForm @register="registerForm">
-      <template #slotNo="{ model, field }">
-        <span>{{ model[field] }}</span>
-      </template>
-      <template #customerContactList="{ model, field }">
-        <span v-for="item in model.customerContactList" :key="item.id" style="margin-right: 10px;">
-          {{ item.shortName }}{{ item.email }}
-        </span>
-      </template>
-    </BasicForm>
     <div class="ctn-box">
-      <div>选择箱型</div>
+      <BasicForm @register="registerForm">
+        <template #slotNo="{ model, field }">
+          <span>{{ model[field] }}</span>
+        </template>
+        <template #customerContactList="{ model, field }">
+          <span v-for="item in model.customerContactList" :key="item.id" style="margin-right: 10px;">
+            {{ item.shortName }}{{ item.email }}
+          </span>
+        </template>
+      </BasicForm>
+    </div>
+    <div class="ctn-box">
+      <div style="margin-bottom: 10px;" >服务项目</div>
+      <div class="project-list">
+        <div @click="handleClickPro(index)"  :class="{active:item.active}" class="project-item" v-for="(item, index) in projectList" :key="index">{{
+          item.name }}</div>
+      </div>
+    </div>
+    <div class="ctn-box">
+      <div style="margin-bottom: 10px;">选择箱型</div>
       <div class="list">
         <div class="item" v-for="item in CtnList" :key="item.gid">
           <a-input-number style="width: 100%;" :max="item.maxnum" v-model:value="item.ctnNum" :min="0">
@@ -38,10 +47,10 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-import { ref, watch } from 'vue'
+import { ref, watch, onMounted } from 'vue'
 import { BasicModal, useModalInner } from '/@/components/Modal'
 import { BasicForm, useForm } from '/@/components/Form/index'
-import { getAvailableCtnsBySlot, CreateBookingOrder } from './api'
+import { getAvailableCtnsBySlot, CreateBookingOrder, GetEnableProjectDictTreeList } from './api'
 import { formSchema } from './columns'
 import { useMessage } from '/@/hooks/web/useMessage'
 const { createMessage } = useMessage()
@@ -52,11 +61,29 @@ const [registerForm, { resetFields, setFieldsValue, getFieldsValue }] = useForm(
 })
 const [registerModal, { setModalProps, closeModal }] = useModalInner((data) => {
   if (data.type === 'init') {
+    console.log(1231233)
     setFieldsValue(data.row)
     init(data.row)
   }
 })
-
+const projectList = ref([]) as any
+onMounted(() => {
+  GetEnableProjectDictTreeList({ isAvoidCache: false }).then(res => {
+    if (res.success) {
+      if (res.data) {
+        projectList.value = res.data[0].children ? res.data[0].children : []
+        projectList.value.forEach(item => {
+          item.active = false
+        })
+      }
+    } else {
+      createMessage.error(res.message)
+    }
+  })
+})
+function handleClickPro(index) {
+  projectList.value[index].active = !projectList.value[index].active
+}
 const type = ref('')
 const CtnList = ref([]) as any
 const ctnListCopy = ref([]) as any
@@ -121,12 +148,12 @@ function handleSave() {
   }
 }
 function handleSaveCabin() {
-  const projectList = []
-  // this.bookingServiceItem.forEach(item => {
-  //   if (item.isYield) {
-  //     projectList.push(item.serviceProjectCode)
-  //   }
-  // })
+  const projectArr = [] as any
+  projectList.value.forEach(item => {
+    if (item.active) {
+      projectArr.push(item.code)
+    }
+  })
   if (CtnList.value.length > 0) {
     const arr = [] as any
     CtnList.value.forEach(item => {
@@ -144,7 +171,7 @@ function handleSaveCabin() {
   }
   const ApiData = {
     slotId: slotEdit.value.id,
-    projectList,
+    projectList:projectArr,
     ...getFieldsValue()
   }
   setModalProps({ loading: true })
@@ -203,4 +230,22 @@ function handleSaveCabin() {
   padding: 10px 20px 15px;
   margin-top: 15px;
 }
+
+.project-list {
+  display: flex;
+
+  .project-item {
+    background-color: rgb(255, 255, 255);
+    color: rgb(37, 122, 250);
+    padding: 3px 7px;
+    text-align: center;
+    margin-right: 8px;
+    font-size: 12px;
+    cursor: pointer;
+    &.active {
+      background-color: rgb(37, 122, 250);
+      color: white;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/taskmanage/api.ts b/src/views/taskmanage/api.ts
index ad41aa03..fd192859 100644
--- a/src/views/taskmanage/api.ts
+++ b/src/views/taskmanage/api.ts
@@ -4,16 +4,745 @@ import { DataResult, PageRequest } from '/@/api/model/baseModel'
 
 export function GetCurrentTotalStat(data) {
   return request<DataResult>({
-    url: '/opApi/BookingLabel/GetPage',
+    url: '/taskApi/TaskManage/GetCurrentTotalStat',
     method: 'post',
     data,
   })
 }
 
-export function mskGetPage(parameter) {
+export function GetPageAsync(parameter) {
   return request<DataResult>({
-    url: '/opApi/SpaceBookingMSKAPI/GetPageAsync',
+    url: '/taskApi/TaskManage/GetPageAsync',
     method: 'post',
     data: parameter
   })
-}
\ No newline at end of file
+}
+// 获取所有用户下拉
+export function GetUserListAll() {
+  return request<DataResult>({
+    url: '/mainApi/Common/GetUserList',
+    method: 'get'
+  })
+}
+
+export function TransferTask(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageBC/TransferTask',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function CompleteTask(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/CompleteTask',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function CancelTaskBC(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/CancelTaskBC',
+    method: 'get',
+    params: parameter
+  })
+}
+export function GetVGMCompareResult(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/GetVGMCompareResult',
+    method: 'get',
+    params: parameter
+  })
+}
+
+
+
+/**
+ * 查询台账
+ */
+export function GetTaskManagePage(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/GetPage',
+    method: 'post',
+    data: parameter
+  })
+}
+
+
+
+/**
+ * 获取查询参数
+ *  ParaType STATUS-任务状态;TASK_TYPE-任务类型;SOURCE-任务来源
+ */
+export function GetParaInfo(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/GetParaInfo',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 取消任务
+ */
+export function CancelTask(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/CancelTask',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 完成任务
+ */
+
+
+/**
+ * 下载
+ */
+export function DownloadTaskAttach(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/DownloadTaskAttach',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 转发电子邮件
+ */
+export function SendTelexEmail(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/SendTelexEmail',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 页数计算
+ */
+export function LaraPaperCalc(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/LaraPaperCalc?' + parameter,
+    method: 'post'
+  })
+}
+
+/**
+ * LARA提单纸登记
+ */
+export function LaraPaperRegist(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/LaraPaperRegist?' + parameter,
+    method: 'post'
+  })
+}
+
+/**
+ * 下载正本提单(可批量)
+ */
+export function DownloadOriginalTask(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/DownloadOriginalTask',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * copy 打印
+ */
+export function PrintBatch(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/PrintBatch',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * copy 下载
+ */
+export function DownloadAttach(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/DownloadAttach',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 获取详情
+ */
+export function GetBookingOrderInfo(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageSISubmitted/GetBookingOrderInfo',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * lara 记录
+ */
+export function LaraPaperRegistPost(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/LaraPaperRegistPost',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 发送SI
+ */
+export function SendShippingOrder(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/SendShippingOrder',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function GetSIFeedBackInfo(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageSISubmitted/GetSIFeedBackInfo',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function SaveBookingSI(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/SaveBookingSI',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function LaraPaperRecordExport(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/LaraPaperRecordExport',
+    method: 'get',
+    params: parameter
+  })
+}
+
+
+
+export function SaveBookingVGM(id) {
+  return request<DataResult>({
+    url: '/TaskManage/SaveBookingVGM?taskPKId=' + id,
+    method: 'post'
+  })
+}
+
+export function AcceptChangeShip(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/AcceptChangeShip',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function AcceptCancelChangeShip(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/AcceptCancelChangeShip',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function GetChangeShipInfo(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/GetChangeShipInfo',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function GetAbortChangeShipInfo(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/GetAbortChangeShipInfo',
+    method: 'get',
+    params: parameter
+  })
+}
+
+// 重新比对
+export function ManualReCompareBC(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/ManualReCompareBC?' + parameter,
+    method: 'post'
+  })
+}
+
+export function DownloadClosingEDI(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/DownloadClosingEDI',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function SendClosingEDI(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/SendClosingEDI',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function CalcLaraPageNumbers(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/CalcLaraPageNumbers',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function GetLaraPaperRecordPage(parameter) {
+  return request<DataResult>({
+    url: '/TaskManage/GetLaraPaperRecordPage',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function GetVGMSubmissionInfoByTaskId(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageVGM/GetVGMSubmissionInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function GetInfoByTaskId(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageBC/GetInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function DownloadFileByBC(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageBC/DownloadFile',
+    method: 'get',
+    params: parameter,
+    responseType: 'blob'
+  })
+}
+export function GetProjectList(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageBC/GetProjectList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function DownloadFile(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageBC/DownloadFile',
+    method: 'get',
+    params: parameter,
+    responseType: 'blob'
+  })
+}
+
+export function CreateBookingAndSlot(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageBC/CreateBookingAndSlot',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function TaskManageBCSendEmai1(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageBC/SendEmail',
+    method: 'get',
+    params: parameter
+  })
+}
+export function TaskTransPlanHasChange(parameter) {
+  return request<DataResult>({
+    url: '/TaskTransPlanHasChange/taskPKId',
+    method: 'get',
+    params: parameter
+  })
+}
+export function TaskManageBCGetCompareResult(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageBC/GetCompareResult',
+    method: 'get',
+    params: parameter
+  })
+}
+export function TaskManageRollingNominationGetInfoByTaskId(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/GetInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function GetLoadStatusDetailList(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/GetLoadStatusDetailList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function RefreshBookingorder(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/RefreshBookingorder',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function TaskManageRolingWominationGetUrl(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/GetUrl',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function TaskManageRolingWominationCancelsharelink(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/Cancelsharelink',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export function DispatchRollingNomination(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/DispatchRollingNomination',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function CreateShareLink(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/CreateShareLink',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function GetPreBillDetailList(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/GetPreBillDetailList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function SaveDetai1Container(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/SaveDetailContainer',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function GenShareLink(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/GenShareLink',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function PushShareLink(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/PushShareLink',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function shareGetinfo(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageShareLink/GetInfo',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function PushShareLinkFeedBack(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageShareLink/PushShareLinkFeedBack',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function GetUserFeedBack(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/GetUserFeedBack',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export function GetVGMMissingInfoByTaskId(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageVGM/GetVGMMissingInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function CutDateGetInfoByTaskId(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageCutDate/GetInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function PoddGetInfoByTaskId(parameter) {
+  return request<DataResult>({
+    url: '/PODDischargeGateoutFull/GetInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function SendInstantlessage(parameter) {
+  return request<DataResult>({
+    url: '/PODDischargeGateoutFull/SendInstantMessage',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function SearchAndConnectBookingInfo(parameter) {
+  return request<DataResult>({
+    url: '/PODDischargeGateoutFull/SearchAndConnectBookingInfo',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function DraftGetInfoByTaskId(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageDRAFT/GetInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function DraftDownloadFile(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageDRAFT/DownloadFile',
+    method: 'get',
+    responseType: 'arraybuffer',
+    params: parameter
+  })
+}
+
+export function DRAFTSendEmail(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageDRAFT/SendEmail',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function DRAFTSearchAndConnectBookingInfo(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageDRAFT/SearchAndConnectBookingInfo',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function BcSearchAndConnectBookingInfo(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageBC/ReCompareResult',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function ReCompareResult(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageBC/SearchAndConnectBookingInfo',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function GetBookingOrder(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageBC/GetBookingOrder',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function GetToShipSelect(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/GetToShipSelect',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function GetRollingNominationNoticeReview(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/GetRollingNominationNoticeReview',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function SendRollingNominationNotice(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageRollingNomination/SendRollingNominationNotice',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function GetInfoByTaskIdNotice(parameter) {
+  return request<DataResult>({
+    url: '/TaskCautionNotice/GetInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function GetInfoByTaskIdPlan(parameter) {
+  return request<DataResult>({
+    url: '/TaskTransPlanHasChange/GetInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function GetInfoByTaskIdRoute(parameter) {
+  return request<DataResult>({
+    url: '/RouteChangeAdvisory/GetInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function QueryVesselVoynoBookingOrder(parameter) {
+  return request<DataResult>({
+    url: '/RouteChangeAdvisory/QueryVesselVoynoBookingOrder',
+    method: 'get',
+    params: parameter
+  })
+}
+export function QueryBookingOrderPlan(parameter) {
+  return request<DataResult>({
+    url: '/TaskTransPlanHasChange/QueryBookingOrder',
+    method: 'get',
+    params: parameter
+  })
+}
+export function BatchSendEmailToCustomer(parameter) {
+  return request<DataResult>({
+    url: '/RouteChangeAdvisory/BatchSendEmailToCustomer',
+    method: 'post',
+    data: parameter
+  })
+}
+export function MergeCreateBookingOrder(parameter) {
+  return request<DataResult>({
+    url: '/BookingSlot/MergeCreateBookingOrder',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 通过任务主键获取派车详情
+ */
+export function TaskManageTruckGetInfoByTaskId(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageTruck/GetInfoByTaskId',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 获取订舱打印模板列表（带有当前用户打印历史排序）
+ *
+ * @author Myshipping
+ */
+export function TaskManageTruckPrintTemplateWithHistoryList(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageTruck/PrintTemplateWithHistoryList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 打印派车
+ *
+ * @author Myshipping
+ */
+export function TaskManageTruckPrint(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageTruck/Print',
+    method: 'get',
+    params: parameter
+  })
+}
+/**
+ * 批量派车通过任务ID
+ */
+export function TaskManageTruckSendDispatchBatchByTask(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageTruck/SendDispatchBatchByTask',
+    method: 'post',
+    data: parameter
+  })
+}
+/**
+ * 批量派车通过任务ID
+ */
+export function TaskManageTruckCancelDispatchBatchByTask(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageTruck/CancelDispatchBatchByTask',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 检索往来单位（包含车队）
+ *
+ * @author Myshipping
+ */
+export function DjyCustomerQuerytDjyCustomerInfo(parameter) {
+  return request<DataResult>({
+    url: '/DjyCustomer/QuerytDjyCustomerInfo',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function SaveTruckByPage(parameter) {
+  return request<DataResult>({
+    url: '/TaskManageTruck/SaveTruckByPage',
+    method: 'post',
+    data: parameter
+  })
+}
+
diff --git a/src/views/taskmanage/components/taskButton.vue b/src/views/taskmanage/components/taskButton.vue
new file mode 100644
index 00000000..a00a8886
--- /dev/null
+++ b/src/views/taskmanage/components/taskButton.vue
@@ -0,0 +1,104 @@
+<template>
+    <a-row type="flex" :gutter="16">
+        <a-col>
+            <a-button type="primary" @click="OpenUser">转移任务</a-button>
+        </a-col>
+        <a-col>
+            <a-button type="primary" @click="FnCompleteTask">完成任务</a-button>
+        </a-col>
+        <a-col>
+            <a-button type="primary" @click="OpenModal">生 成</a-button>
+        </a-col>
+        <a-col>
+            <a-button type="danger" @click="FnCancelTask">取消任务</a-button>
+        </a-col>
+        <a-col>
+            <a-button type="primary" @click="handleSendMail">发送邮件</a-button>
+        </a-col>
+    </a-row>
+    <a-modal @cancel="UserVisible = false" :visible="UserVisible" title="转移任务" @ok="UserhandleOk">
+        <div style="margin: 15px 0;">接收人</div>
+        <a-select show-search style="width: 200px;" :filter-option="filterOption" v-model:value="UserId">
+            <a-select-option v-for="item in UserList" :key="item.value" :value="item.value">
+                {{ item.label }}
+            </a-select-option>
+        </a-select>
+    </a-modal>
+</template>
+<script lang="ts" setup>
+import { number } from 'echarts';
+import { ref, onMounted, defineProps } from 'vue'
+import { GetUserListAll, TransferTask, CompleteTask, CancelTaskBC } from '../api'
+import { useMessage } from '/@/hooks/web/useMessage'
+const { createMessage } = useMessage()
+const props = defineProps({
+    id: {
+        type: String || Number
+    }
+});
+const UserVisible = ref(false);
+const UserList = ref([]) as any
+const UserId = ref('') //转移任务的用户id
+const emit = defineEmits(['loadingStart', 'loadingStop'])
+function OpenUser() {
+    UserVisible.value = true
+    GetUserListAll().then(res => {
+        UserList.value = res.data
+    })
+}
+function UserhandleOk() {
+    const ApiData = {
+        taskPKId: props.id,
+        userId: UserId.value
+    }
+    TransferTask(ApiData).then(res => {
+        if (res.data.succ) {
+            UserVisible.value = false
+            createMessage.success(res.data.msg)
+        } else {
+            createMessage.error(res.data.msg)
+        }
+    })
+}
+
+function filterOption(input, option) {
+    return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    );
+}
+// 完成任务
+function FnCompleteTask() {
+    const ApiData = [props.id]
+    emit('loadingStart')
+    CompleteTask(ApiData).then(res => {
+        if (res.data.succ) {
+            createMessage.success(res.data.msg)
+        } else {
+            createMessage.error(res.data.msg)
+        }
+        emit('loadingStop')
+    })
+}
+function OpenModal() {
+    console.log('OpenUser')
+}
+//取消任务
+function FnCancelTask() {
+    const ApiData = {
+        taskPKId: props.id
+    }
+    emit('loadingStart')
+    CancelTaskBC(ApiData).then(res => {
+        if (res.data.succ) {
+            createMessage.success(res.data.msg)
+        } else {
+            createMessage.error(res.data.msg)
+        }
+        emit('loadingStop')
+    })
+}
+function handleSendMail() {
+    console.log('OpenUser')
+}
+
+</script>
\ No newline at end of file
diff --git a/src/views/taskmanage/components/taskData.vue b/src/views/taskmanage/components/taskData.vue
new file mode 100644
index 00000000..15d9a8c6
--- /dev/null
+++ b/src/views/taskmanage/components/taskData.vue
@@ -0,0 +1,329 @@
+<template>
+    <a-form :label-col="labelCol" :wrapper-col="wrapperCol" :model="form">
+        <div class="box">
+            <div class="LeftHead">
+                <p class="title">
+                    {{ props.title }} ({{ form.carrierId }})
+                    <i @click="reload" class="icon-refresh-1-copy iconfont"></i>
+                </p>
+                <p>订舱时间：{{ form.bookingConfirmDate }}</p>
+            </div>
+            <a-row>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>提单号</div>
+                        <span class="text"> {{ form.mblNo }}</span>
+                        <i class="icon-fuzhi4 iconfont" @click="copyText(form.mblNo)" style="cursor: pointer;font-size: 13px;margin-left: 10px"></i>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>船名/航次</div>
+                        <span class="text"> {{ form.vessel }}/{{ form.voyNo }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>收货地</div>
+                        <span class="text"> {{ form.placeReceipt }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>ETD</div>
+                        <span class="text"> {{ form.etd ? form.etd.substring(0, 11) : '-' }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>交货地</div>
+                        <span class="text"> {{ form.placeDelivery }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>ETA</div>
+                        <span class="text"> {{ form.eta ? form.eta.substring(0, 11) : '-' }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>订舱人</div>
+                        <span class="text"> {{ form.bookingParty }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>合约号</div>
+                        <span class="text"> {{ form.contractNo }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>样单截止时间</div>
+                        <span class="text"> {{ form.siCutDate }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>箱使天数</div>
+                        <span class="text"> {{ form.detensionFreeDays }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>舱单截止时间</div>
+                        <span class="text"> {{ form.manifestCutDate }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>截港时间</div>
+                        <span class="text"> {{ form.cyCutoffTime }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>MDGF截止时间</div>
+                        <span class="text"> {{ form.mdgfCutDate }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>VGM截止时间</div>
+                        <span class="text"> {{ form.vgmCutoffTime }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>箱型箱量</div>
+                        <span class="text"> {{ form.ctnStat }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </div>
+
+
+        <div class="box">
+            <a-row>
+                <a-col :span="24">
+                    <p class="title">一程</p>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>船名/航次</div>
+                        <span class="text">{{ form.vessel }}/{{ form.voyNo }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>ETD</div>
+                        <span class="text">{{ form.etd ? form.etd.substring(0, 11) : '-' }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>装货港</div>
+                        <span class="text">{{ form.portload }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>ETA</div>
+                        <span class="text"> {{ form.eta ? form.eta.substring(0, 11) : '-' }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>卸货港</div>
+                        <span class="text">{{ form.portDischarge }}</span>
+                    </a-form-item>
+                </a-col>
+
+                <div v-if="form.carriageType == 'TRANSFER_SHIP'">
+                    <a-col :span="24">
+                        <p class="title">二程</p>
+                    </a-col>
+                    <a-col :span="8">
+                        <a-form-item label="">
+                            <div>船名/航次</div>
+                            <span class="text">{{ form.secondVessel }}/{{ form.secondVoyno }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="8">
+                        <a-form-item label="ETD：">
+                            <div>ETD</div>
+                            <span class="text"> {{ form.secondETD ? form.secondETD.substring(0, 11) : '-'
+                                }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="8">
+                        <a-form-item label="">
+                            <div>装货港</div>
+                            <span class="text"> {{ form.transferPort1 }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="8">
+                        <a-form-item label="">
+                            <div>ETA</div>
+                            <span class="text"> {{ form.secondETA ? form.secondETA.substring(0, 11) : '-'
+                                }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="8">
+                        <a-form-item label="">
+                            <div>卸货港</div>
+                            <span class="text"> {{ form.portDischarge }}</span>
+                        </a-form-item>
+                    </a-col>
+                </div>
+            </a-row>
+        </div>
+
+
+        <div class="box">
+            <a-row>
+                <a-col :span="24">
+                    <p class="title">关联详情</p>
+                </a-col>
+            </a-row>
+            <a-row>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>已生成舱位</div>
+                        <span class="text">
+                            {{ form.bookingSlotId ? '是' : '否' }}
+                            <span class="CsSee" v-if="form.bookingSlotId" @click="FnSee1">(查看)</span>
+                        </span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>已生成订舱</div>
+                        <span class="text">
+                            {{ form.bookingOrderId ? '是' : '否' }}
+                            <span class="CsSee" v-if="form.bookingOrderId" @click="FnSee">(查看)</span>
+                        </span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="8">
+                    <a-form-item label="">
+                        <div>任务状态</div>
+                        <span class="text"> {{ form.taskStatus == 'Complete' ? '已完成' : '-' }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </div>
+        <div class="box">
+            <a-col :span="24">
+                <p class="title">关键信息</p>
+            </a-col>
+            <div class="unitBox">
+                <p v-for="(item, index) in form.keywords" :key="index" class="unit" :style="{
+                    background: item.background,
+                    color: Rcolor(item.background),
+                }">
+                    <i :class="item.icon" class="iconfont"></i>{{ item.name }}
+                </p>
+            </div>
+        </div>
+    </a-form>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted } from 'vue'
+const wrapperCol = { span: 22 }
+const labelCol = { span: 0 }
+import { useRouter, useRoute } from 'vue-router'
+const props = defineProps({
+    title: {
+        type: String
+    }
+});
+const form = ref({}) as any
+function reload() {
+
+}
+const router = useRouter();
+function FnSee() {
+    router.push({ path: '/BookingDetail?id=' + this.form.bookingOrderId })
+}
+
+function FnSee1() {
+    router.push({ path: '/CabinManagementDetails?type=Edit&id=' + this.form.bookingSlotId })
+}
+function copyText(text) {
+    const inputDom = document.createElement('textarea')
+    document.body.appendChild(inputDom)
+    inputDom.value = text
+    inputDom.select()
+    inputDom.focus()
+    document.execCommand('copy')
+    document.body.removeChild(inputDom)
+    this.$message.success('复制成功')
+}
+function Rcolor(hexColor) {
+    const hex = hexColor.replace('#', '').toLowerCase()
+    const red = parseInt(hex.substring(0, 2), 16) - 90
+    const green = parseInt(hex.substring(2, 4), 16) - 90
+    const blue = parseInt(hex.substring(4, 6), 16) - 50
+    return `rgb(${red}, ${green}, ${blue})`
+}
+defineExpose({ init })
+function init(data){
+    form.value = data
+}
+</script>
+<style lang="less" scoped>
+.LeftHead {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+        font-size: 15px;
+        font-weight: 700;
+        color: black;
+    }
+}
+
+.text {
+    font-weight: 700;
+    color: black;
+}
+
+/deep/ .ant-form-item-control-input-content {
+    div {
+        color: rgba(122, 135, 152, 1);
+    }
+}
+
+.box {
+    border: 1px solid rgba(232, 235, 237, 1);
+    padding: 15px 20px;
+    margin-bottom: 16px;
+
+    .title {
+        font-size: 15px;
+        font-weight: 700;
+        color: black;
+    }
+}
+
+.CsSee {
+    color: rgb(104, 104, 228);
+    font-weight: 500;
+    cursor: pointer;
+}
+
+.unitBox {
+    display: flex;
+
+    .unit {
+        margin-right: 15px;
+        padding: 0 5px;
+    }
+}
+
+/deep/ .ant-form-item {
+    margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/taskmanage/index.vue b/src/views/taskmanage/index.vue
index e5bb8552..8d8d4f27 100644
--- a/src/views/taskmanage/index.vue
+++ b/src/views/taskmanage/index.vue
@@ -39,68 +39,157 @@
         </div>
         <div style="width: 84%;">
             <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handledbclick">
-                <!-- <template #tableTitle>
-                    <a-popconfirm title="是否取消当前选择项？" ok-text="是" cancel-text="否" @confirm="removeFun"
-                        @cancel="cancelFun">
-                        <a-button type="link">取消</a-button>
+                <template #tableTitle>
+                    <a-popconfirm title="是否取消当前选择项？" ok-text="是" cancel-text="否" @confirm="removeFun">
+                        <a-button type="link"> <i class="icon-chahao iconfont"></i> 取消</a-button>
                     </a-popconfirm>
-                    <a-popconfirm title="确定完成当前选择项？" ok-text="是" cancel-text="否" @confirm="submitFun"
-                        @cancel="cancelFun">
-                        <a-button type="link">完成</a-button>
+                    <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="FnPrint">打印</a-button>
-                    <a-button type="link" @click="FnSendCar">派车</a-button>
-                    <a-button type="link" @click="CancelSendCar">取消派车</a-button>
+                    <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"
-                            @cancel="cancelFun">
-                            <a-button type="link">批量下载</a-button>
+                        <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"
-                            @cancel="cancelFun">
+                        <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"
-                            @cancel="cancelFun">
+                    <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"
-                            @cancel="cancelFun">
-                            <a-button type="link">批量下载</a-button>
+                        <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"
-                            @cancel="cancelFun">
+                    <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 === 'ORIGINAL_DOWN'">
-                        <a-popconfirm title="确定COPY打印当前选择项？" ok-text="是" cancel-text="否" @confirm="copyPrintFun"
-                            @cancel="cancelFun">
+                    <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"
-                            @cancel="cancelFun">
+                        <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"
-                            @cancel="cancelFun">
+                        <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"
-                            @cancel="cancelFun">
+                        <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>
-                </template> -->
+                </template>
+                <template #toolbar>
+                </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>
+                    </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 === '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 #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="[
                             {
@@ -133,278 +222,29 @@ import { ref, onMounted } from 'vue'
 import { formatParams } from '/@/hooks/web/common'
 import { searchFormSchema } from './columns'
 import { BasicTable, useTable, TableAction } from '/@/components/Table'
-import { GetCurrentTotalStat, mskGetPage } from './api'
+import {
+    GetCurrentTotalStat, GetPageAsync, TaskManageTruckGetInfoByTaskId,
+    TaskManageTruckPrintTemplateWithHistoryList,
+    TaskManageTruckPrint,
+    TaskManageTruckSendDispatchBatchByTask,
+    TaskManageTruckCancelDispatchBatchByTask,
+    DjyCustomerQuerytDjyCustomerInfo,
+    SaveTruckByPage,
+    GetTaskManagePage,
+    GetParaInfo,
+    CancelTask,
+    CompleteTask,
+    DownloadTaskAttach,
+    SendTelexEmail,
+    LaraPaperCalc,
+    PrintBatch,
+    DownloadAttach,
+    DownloadOriginalTask,
+    ManualReCompareBC
+} from './api'
 import { useGo } from '/@/hooks/web/usePage'
 const go = useGo()
-const data = {
-    "levelTop": [
-        {
-            "sortNo": 1,
-            "key": "PERSON",
-            "name": "个人",
-            "total": 7418,
-            "actionKey": "PERSON"
-        },
-        {
-            "sortNo": 2,
-            "key": "PUBLIC",
-            "name": "公共",
-            "total": 18416,
-            "actionKey": "PUBLIC"
-        }
-    ],
-    "levelNext": [
-        {
-            "topKey": "PERSON",
-            "sortNo": 0,
-            "key": "Create",
-            "name": "待处理",
-            "total": 7413,
-            "actionKey": "PERSON#Create"
-        },
-        {
-            "topKey": "PERSON",
-            "sortNo": 2,
-            "key": "Complete",
-            "name": "已完成",
-            "total": 2,
-            "actionKey": "PERSON#Complete"
-        },
-        {
-            "topKey": "PERSON",
-            "sortNo": 3,
-            "key": "Cancel",
-            "name": "已取消",
-            "total": 3,
-            "actionKey": "PERSON#Cancel"
-        },
-        {
-            "topKey": "PUBLIC",
-            "sortNo": 0,
-            "key": "Create",
-            "name": "待处理",
-            "total": 18413,
-            "actionKey": "PUBLIC#Create"
-        },
-        {
-            "topKey": "PUBLIC",
-            "sortNo": 2,
-            "key": "Complete",
-            "name": "已完成",
-            "total": 3,
-            "actionKey": "PUBLIC#Complete"
-        }
-    ],
-    "levelTree": [
-        {
-            "nextKey": "Create",
-            "topKey": "PERSON",
-            "sortNo": 0,
-            "key": "CAUTION_NOTICE",
-            "name": "重要提醒",
-            "total": 5406,
-            "actionKey": "PERSON#Create#CAUTION_NOTICE"
-        },
-        {
-            "nextKey": "Complete",
-            "topKey": "PERSON",
-            "sortNo": 1,
-            "key": "BC",
-            "name": "BC",
-            "total": 2,
-            "actionKey": "PERSON#Complete#BC"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PERSON",
-            "sortNo": 1,
-            "key": "BC",
-            "name": "BC",
-            "total": 661,
-            "actionKey": "PERSON#Create#BC"
-        },
-        {
-            "nextKey": "Cancel",
-            "topKey": "PERSON",
-            "sortNo": 1,
-            "key": "BC",
-            "name": "BC",
-            "total": 2,
-            "actionKey": "PERSON#Cancel#BC"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 1,
-            "key": "BC",
-            "name": "BC",
-            "total": 2226,
-            "actionKey": "PUBLIC#Create#BC"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 2,
-            "key": "DRAFT",
-            "name": "DRAFT",
-            "total": 747,
-            "actionKey": "PUBLIC#Create#DRAFT"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 3,
-            "key": "CANCELLATION",
-            "name": "Cancellation",
-            "total": 1746,
-            "actionKey": "PUBLIC#Create#CANCELLATION"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PERSON",
-            "sortNo": 11,
-            "key": "SI_FEEDBACK",
-            "name": "SI详情",
-            "total": 758,
-            "actionKey": "PERSON#Create#SI_FEEDBACK"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 11,
-            "key": "SI_FEEDBACK",
-            "name": "SI详情",
-            "total": 1362,
-            "actionKey": "PUBLIC#Create#SI_FEEDBACK"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 22,
-            "key": "VGM_FEEDBACK",
-            "name": "VGM回执",
-            "total": 1714,
-            "actionKey": "PUBLIC#Create#VGM_FEEDBACK"
-        },
-        {
-            "nextKey": "Complete",
-            "topKey": "PUBLIC",
-            "sortNo": 22,
-            "key": "VGM_FEEDBACK",
-            "name": "VGM回执",
-            "total": 1,
-            "actionKey": "PUBLIC#Complete#VGM_FEEDBACK"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PERSON",
-            "sortNo": 25,
-            "key": "BC_MODIFY",
-            "name": "Amendment",
-            "total": 588,
-            "actionKey": "PERSON#Create#BC_MODIFY"
-        },
-        {
-            "nextKey": "Cancel",
-            "topKey": "PERSON",
-            "sortNo": 25,
-            "key": "BC_MODIFY",
-            "name": "Amendment",
-            "total": 1,
-            "actionKey": "PERSON#Cancel#BC_MODIFY"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 25,
-            "key": "BC_MODIFY",
-            "name": "Amendment",
-            "total": 4684,
-            "actionKey": "PUBLIC#Create#BC_MODIFY"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 26,
-            "key": "CUT_MODIFY",
-            "name": "截止时间变更",
-            "total": 1868,
-            "actionKey": "PUBLIC#Create#CUT_MODIFY"
-        },
-        {
-            "nextKey": "Complete",
-            "topKey": "PUBLIC",
-            "sortNo": 26,
-            "key": "CUT_MODIFY",
-            "name": "截止时间变更",
-            "total": 2,
-            "actionKey": "PUBLIC#Complete#CUT_MODIFY"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 27,
-            "key": "ROLLING_NOMINATION",
-            "name": "RollingNomination",
-            "total": 1498,
-            "actionKey": "PUBLIC#Create#ROLLING_NOMINATION"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 29,
-            "key": "VGM_MISSING",
-            "name": "VGM未提交",
-            "total": 493,
-            "actionKey": "PUBLIC#Create#VGM_MISSING"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 30,
-            "key": "POD_DISCHARGE_FULL",
-            "name": "目的港未提货",
-            "total": 5,
-            "actionKey": "PUBLIC#Create#POD_DISCHARGE_FULL"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 31,
-            "key": "POD_GATEOUT_FULL",
-            "name": "目的港未返空箱",
-            "total": 4,
-            "actionKey": "PUBLIC#Create#POD_GATEOUT_FULL"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 32,
-            "key": "ROUTE_CUT_CHANGE",
-            "name": "航线截止时间调整",
-            "total": 13,
-            "actionKey": "PUBLIC#Create#ROUTE_CUT_CHANGE"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 33,
-            "key": "POL_CTN_NOT_PICKUP",
-            "name": "装货港未提箱",
-            "total": 279,
-            "actionKey": "PUBLIC#Create#POL_CTN_NOT_PICKUP"
-        },
-        {
-            "nextKey": "Create",
-            "topKey": "PUBLIC",
-            "sortNo": 34,
-            "key": "TRNAS_PLAN_HAS_CHANGE",
-            "name": "运输计划已变更",
-            "total": 1774,
-            "actionKey": "PUBLIC#Create#TRNAS_PLAN_HAS_CHANGE"
-        }
-    ]
-}
+
 
 onMounted(() => {
     getCurrentTotalStat()
@@ -436,9 +276,9 @@ function getCurrentTotalStat() {
         .then(res => {
             levelLoading.value = false
             levelreLoading.value = false
-            levelTop.value = data.levelTop
-            levelNextAll.value = data.levelNext
-            levelTreeAll.value = data.levelTree
+            levelTop.value = res.data.levelTop
+            levelNextAll.value = res.data.levelNext
+            levelTreeAll.value = res.data.levelTree
             if (levelTop.value.length > 0) {
                 activeTopKey.value = levelTop.value[0].key
                 levelNext.value = selectNextLevel(levelNextAll.value, activeTopKey.value)
@@ -500,248 +340,52 @@ function selectTreeLevel(list, key, topKey) {
     return arr
 }
 const columns = [
-    { dataIndex: 'tasK_TYPE', width: 100, title: '任务类型', showHeaderOverflow: true, sortable: true, slots: { default: 'taskType' } },
-    { dataIndex: 'tasK_TITLE', width: 200, title: '任务标题', showHeaderOverflow: true, sortable: true, slots: { default: 'taskTitle' } },
-    { dataIndex: 'createdTime', width: 180, title: '接收时间', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'needArriveTime', width: 150, title: '要求送达时间', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'trucK_NAME', width: 100, title: '车队', showHeaderOverflow: true, sortable: true, slots: { default: 'truckName' } },
-    { dataIndex: 'customeR_NAME', width: 100, title: '委托单位', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'mbL_NO', width: 120, title: '提单号', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'tasK_REQ_USERNAME', width: 100, title: '操作名称', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'contA_INFO', width: 100, title: '箱型箱量', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'yarD_NAME', width: 100, title: '场站', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'etd', width: 180, title: '开船日期', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'status', width: 100, title: '任务状态', showHeaderOverflow: true, sortable: true, slots: { default: 'status' } },
-    { dataIndex: 'vesseL_VOYNO', width: 180, title: '船名/航次', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'carrieR_ID', width: 100, title: '船公司', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'tasK_NO', width: 150, title: '任务流水号', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'tasK_SOURCE', width: 100, title: '任务来源', showHeaderOverflow: true, sortable: true, slots: { default: 'taskScource' } },
-    { dataIndex: 'createdUserName', width: 100, title: '接收人', showHeaderOverflow: true, sortable: true },
-    { dataIndex: 'completE_DEAL_NAME', width: 100, title: '完成方式', showHeaderOverflow: true, sortable: true },
+    { dataIndex: 'tasK_TYPE', width: 100, title: '任务类型' },
+    { dataIndex: 'tasK_TITLE', width: 200, title: '任务标题' },
+    { dataIndex: 'createTime', width: 180, title: '接收时间' },
+    { dataIndex: 'needArriveTime', width: 150, title: '要求送达时间' },
+    { dataIndex: 'trucK_NAME', width: 100, title: '车队' },
+    { dataIndex: 'customeR_NAME', width: 100, title: '委托单位' },
+    { dataIndex: 'mbL_NO', width: 120, title: '提单号' },
+    { dataIndex: 'tasK_REQ_USERNAME', width: 100, title: '操作名称' },
+    { dataIndex: 'contA_INFO', width: 100, title: '箱型箱量' },
+    { dataIndex: 'yarD_NAME', width: 100, title: '场站' },
+    { dataIndex: 'etd', width: 180, title: '开船日期' },
+    { dataIndex: 'status', width: 100, title: '任务状态' },
+    { dataIndex: 'vesseL_VOYNO', width: 180, title: '船名/航次' },
+    { dataIndex: 'carrieR_ID', width: 100, title: '船公司' },
+    { dataIndex: 'tasK_NO', width: 150, title: '任务流水号' },
+    { dataIndex: 'tasK_SOURCE', width: 100, title: '任务来源' },
+    { dataIndex: 'createUserName', width: 100, title: '接收人' },
+    { dataIndex: 'completE_DEAL_NAME', width: 100, title: '完成方式' },
 ]
 const [registerTable, { reload, setLoading, getPaginationRef, getSelectRows, setProps }] = useTable({
     api: async (p) => {
-        const res: API.DataResult = await mskGetPage(p)
+        const res: API.DataResult = await GetPageAsync(p)
         return new Promise((resolve) => {
             resolve({
-                data: [
-                    {
-                        "pK_ID": "08dc4a56-2332-4137-8423-1f45ce1fc933",
-                        "tasK_NO": "TSK202403220081",
-                        "tasK_TYPE": "BC",
-                        "tasK_SOURCE": "MAIL_PARSE",
-                        "status": "Complete",
-                        "statuS_NAME": "已完成",
-                        "tasK_TITLE": "邮件-BC DUMMY BARGE/1234 ETD:2024-03-30 BLNo:237663466",
-                        "tasK_DESP": "邮件-BC DUMMY BARGE/1234 ETD:2024-03-30 BLNo:237663466",
-                        "ouT_BUSI_NO": "MailParseReceive_08dc4a56-22dc-4e1d-8f1b-a3a36050e394",
-                        "ouT_BUSI_TYPE": null,
-                        "tasK_BASE_TYPE": "BC",
-                        "carrieR_ID": "MSK",
-                        "mbL_NO": "237663466",
-                        "remark": null,
-                        "iS_EXCEPT": 0,
-                        "iS_PUBLIC": 0,
-                        "iS_COMPLETE": 1,
-                        "begiN_DATE": null,
-                        "completE_DATE": "2024-03-22 18:04:15",
-                        "booK_ORDER_NO": null,
-                        "resulT_NOTE": null,
-                        "etd": "2024-03-30 00:00:00",
-                        "completE_DEAL": "手工完成",
-                        "completE_DEAL_NAME": null,
-                        "issuE_TYPE": null,
-                        "issuE_TYPE_NAME": null,
-                        "sendeR_CODE": null,
-                        "sendeR_NAME": null,
-                        "tasK_REQ_USERID": 0,
-                        "tasK_REQ_USERNAME": null,
-                        "contA_INFO": "40HC*1",
-                        "vesseL_VOYNO": "DUMMY BARGE/1234",
-                        "yarD_NAME": null,
-                        "trucK_NAME": null,
-                        "customeR_ID": null,
-                        "customeR_NAME": null,
-                        "needArriveTime": null,
-                        "createdTime": "2024-03-22 17:55:00",
-                        "updatedTime": "2024-03-22 18:01:34",
-                        "createdUserId": 527361102848069,
-                        "createdUserName": "邮箱操作",
-                        "updatedUserId": 524224711450693,
-                        "updatedUserName": "石慧",
-                        "realUserId": 524224711450693,
-                        "realUserName": "石慧",
-                        "isDeleted": 0,
-                        "tenantId": 524224710131781,
-                        "tenantName": "青岛康乾国际物流有限公司",
-                        "batcH_STATIC": null,
-                        "djyUserId": null,
-                        "systeM_CODE": null,
-                        "systeM_NAME": null
-                    },
-                    {
-                        "pK_ID": "08dc4a4d-30b9-4d3c-811e-7c95ecd7328c",
-                        "tasK_NO": "TSK202403220064",
-                        "tasK_TYPE": "CUT_MODIFY",
-                        "tasK_SOURCE": "MAIL_PARSE",
-                        "status": "Complete",
-                        "statuS_NAME": "已完成",
-                        "tasK_TITLE": "邮件-CUT_MODIFY Vessel Voyno:ADAMS/413S",
-                        "tasK_DESP": "邮件-CUT_MODIFY Vessel Voyno:ADAMS/413S",
-                        "ouT_BUSI_NO": "MailParseReceive_08dc4a4d-306e-4e4e-8a21-7435a2a0678b",
-                        "ouT_BUSI_TYPE": null,
-                        "tasK_BASE_TYPE": "CUT_MODIFY",
-                        "carrieR_ID": "MSK",
-                        "mbL_NO": "237493699",
-                        "remark": null,
-                        "iS_EXCEPT": 0,
-                        "iS_PUBLIC": 1,
-                        "iS_COMPLETE": 1,
-                        "begiN_DATE": null,
-                        "completE_DATE": "2024-03-22 17:53:53",
-                        "booK_ORDER_NO": null,
-                        "resulT_NOTE": null,
-                        "etd": null,
-                        "completE_DEAL": "手工完成",
-                        "completE_DEAL_NAME": null,
-                        "issuE_TYPE": null,
-                        "issuE_TYPE_NAME": null,
-                        "sendeR_CODE": null,
-                        "sendeR_NAME": null,
-                        "tasK_REQ_USERID": 0,
-                        "tasK_REQ_USERNAME": null,
-                        "contA_INFO": "",
-                        "vesseL_VOYNO": null,
-                        "yarD_NAME": null,
-                        "trucK_NAME": null,
-                        "customeR_ID": null,
-                        "customeR_NAME": null,
-                        "needArriveTime": null,
-                        "createdTime": "2024-03-22 16:50:57",
-                        "updatedTime": "2024-03-22 16:50:57",
-                        "createdUserId": 527361102848069,
-                        "createdUserName": "邮箱操作",
-                        "updatedUserId": 0,
-                        "updatedUserName": null,
-                        "realUserId": null,
-                        "realUserName": null,
-                        "isDeleted": 0,
-                        "tenantId": 524224710131781,
-                        "tenantName": "青岛康乾国际物流有限公司",
-                        "batcH_STATIC": null,
-                        "djyUserId": null,
-                        "systeM_CODE": null,
-                        "systeM_NAME": null
-                    },
-                    {
-                        "pK_ID": "08dc4a4b-953d-43a2-88ea-e50860ec16b9",
-                        "tasK_NO": "TSK202403220063",
-                        "tasK_TYPE": "CUT_MODIFY",
-                        "tasK_SOURCE": "MAIL_PARSE",
-                        "status": "Complete",
-                        "statuS_NAME": "已完成",
-                        "tasK_TITLE": "邮件-CUT_MODIFY Vessel Voyno:ADAMS/413S",
-                        "tasK_DESP": "邮件-CUT_MODIFY Vessel Voyno:ADAMS/413S",
-                        "ouT_BUSI_NO": "MailParseReceive_08dc4a4b-94f1-471b-8afe-0b86f589d2d0",
-                        "ouT_BUSI_TYPE": null,
-                        "tasK_BASE_TYPE": "CUT_MODIFY",
-                        "carrieR_ID": "MSK",
-                        "mbL_NO": "237493699",
-                        "remark": null,
-                        "iS_EXCEPT": 0,
-                        "iS_PUBLIC": 1,
-                        "iS_COMPLETE": 1,
-                        "begiN_DATE": null,
-                        "completE_DATE": "2024-03-22 17:57:12",
-                        "booK_ORDER_NO": null,
-                        "resulT_NOTE": null,
-                        "etd": null,
-                        "completE_DEAL": "手工完成",
-                        "completE_DEAL_NAME": null,
-                        "issuE_TYPE": null,
-                        "issuE_TYPE_NAME": null,
-                        "sendeR_CODE": null,
-                        "sendeR_NAME": null,
-                        "tasK_REQ_USERID": 0,
-                        "tasK_REQ_USERNAME": null,
-                        "contA_INFO": "",
-                        "vesseL_VOYNO": null,
-                        "yarD_NAME": null,
-                        "trucK_NAME": null,
-                        "customeR_ID": null,
-                        "customeR_NAME": null,
-                        "needArriveTime": null,
-                        "createdTime": "2024-03-22 16:39:27",
-                        "updatedTime": "2024-03-22 16:39:27",
-                        "createdUserId": 527361102848069,
-                        "createdUserName": "邮箱操作",
-                        "updatedUserId": 0,
-                        "updatedUserName": null,
-                        "realUserId": null,
-                        "realUserName": null,
-                        "isDeleted": 0,
-                        "tenantId": 524224710131781,
-                        "tenantName": "青岛康乾国际物流有限公司",
-                        "batcH_STATIC": null,
-                        "djyUserId": null,
-                        "systeM_CODE": null,
-                        "systeM_NAME": null
-                    },
-                    {
-                        "pK_ID": "08dc4a1e-2f72-499b-883e-11a9f12677b8",
-                        "tasK_NO": "TSK202403220014",
-                        "tasK_TYPE": "VGM_FEEDBACK",
-                        "tasK_SOURCE": "MAIL_PARSE",
-                        "status": "Complete",
-                        "statuS_NAME": "已完成",
-                        "tasK_TITLE": "邮件-VGM_FEEDBACK BLNo:237492643",
-                        "tasK_DESP": "邮件-VGM_FEEDBACK BLNo:237492643",
-                        "ouT_BUSI_NO": "MailParseReceive_08dc4a1e-2e68-42e1-8f7e-7b30aa7d65f3",
-                        "ouT_BUSI_TYPE": null,
-                        "tasK_BASE_TYPE": "VGM_FEEDBACK",
-                        "carrieR_ID": "MSK",
-                        "mbL_NO": "237492643",
-                        "remark": null,
-                        "iS_EXCEPT": 0,
-                        "iS_PUBLIC": 1,
-                        "iS_COMPLETE": 1,
-                        "begiN_DATE": null,
-                        "completE_DATE": "2024-03-22 11:24:21",
-                        "booK_ORDER_NO": null,
-                        "resulT_NOTE": null,
-                        "etd": null,
-                        "completE_DEAL": "手工完成",
-                        "completE_DEAL_NAME": null,
-                        "issuE_TYPE": null,
-                        "issuE_TYPE_NAME": null,
-                        "sendeR_CODE": null,
-                        "sendeR_NAME": null,
-                        "tasK_REQ_USERID": 0,
-                        "tasK_REQ_USERNAME": null,
-                        "contA_INFO": "",
-                        "vesseL_VOYNO": null,
-                        "yarD_NAME": null,
-                        "trucK_NAME": null,
-                        "customeR_ID": null,
-                        "customeR_NAME": null,
-                        "needArriveTime": null,
-                        "createdTime": "2024-03-22 11:14:29",
-                        "updatedTime": "2024-03-22 11:14:29",
-                        "createdUserId": 527361102848069,
-                        "createdUserName": "邮箱操作",
-                        "updatedUserId": 0,
-                        "updatedUserName": null,
-                        "realUserId": null,
-                        "realUserName": null,
-                        "isDeleted": 0,
-                        "tenantId": 524224710131781,
-                        "tenantName": "青岛康乾国际物流有限公司",
-                        "batcH_STATIC": null,
-                        "djyUserId": null,
-                        "systeM_CODE": null,
-                        "systeM_NAME": null
-                    }
-                ], total: 10
+                data:
+                    [
+                        {tasK_BASE_TYPE: 'VGM_COMPARE', tasK_TITLE: 'VGM_COMPARE'},
+                        {tasK_BASE_TYPE: 'SI_FEEDBACK', tasK_TITLE: 'SI_FEEDBACK'},
+                        {tasK_BASE_TYPE: 'ORIGINAL_LOST', tasK_TITLE: 'ORIGINAL_LOST'},
+                        {tasK_BASE_TYPE: 'ABORT_CHANGE_SHIP', tasK_TITLE: 'ABORT_CHANGE_SHIP'},
+                        {tasK_BASE_TYPE: 'CHANGE_SHIP', tasK_TITLE: 'CHANGE_SHIP'},
+                        {tasK_BASE_TYPE: 'PER_BILL', tasK_TITLE: 'PER_BILL'},
+                        {tasK_BASE_TYPE: 'INVOICE_BILL_MAIL', tasK_TITLE: 'INVOICE_BILL_MAIL'},
+                        {tasK_BASE_TYPE: 'TRNAS_PLAN_HAS_CHANGE', tasK_TITLE: 'TRNAS_PLAN_HAS_CHANGE'},
+                        {tasK_BASE_TYPE: 'POD_DISCHARGE_FULL', tasK_TITLE: 'POD_DISCHARGE_FULL'},
+                        {tasK_BASE_TYPE: 'CUT_MODIFY', tasK_TITLE: 'CUT_MODIFY'},
+                        {tasK_BASE_TYPE: 'VGM_MISSING', tasK_TITLE: 'VGM_MISSING'},
+                        {tasK_BASE_TYPE: 'CAUTION_NOTICE', tasK_TITLE: 'CAUTION_NOTICE'},
+                        {tasK_BASE_TYPE: 'VGM_FEEDBACK', tasK_TITLE: 'VGM_FEEDBACK'},
+                        {tasK_BASE_TYPE: 'ROLLING_NOMINATION', tasK_TITLE: 'ROLLING_NOMINATION'},
+                        {tasK_BASE_TYPE: 'CANCELLATION', tasK_TITLE: 'CANCELLATION'},
+                        {tasK_BASE_TYPE: 'BC_MODIFY', tasK_TITLE: 'BC_MODIFY'},
+                        {tasK_BASE_TYPE: 'BC', tasK_TITLE: 'BC'},
+                        {tasK_BASE_TYPE: 'TRUCK_DISPATCH', tasK_TITLE: 'TRUCK_DISPATCH'},
+                    ]
+                , total: res.count
             })
         })
     },
@@ -775,171 +419,165 @@ const [registerTable, { reload, setLoading, getPaginationRef, getSelectRows, set
 })
 
 
-function handledbclick() {
-
+function handledbclick(row) {
+    handleEdit(row)
 }
 
 import { useRouter } from 'vue-router'
 const router = useRouter();
 function handleEdit(data) {
-    switch (data.tasK_TYPE) {
+    console.log(data)
+    switch (data.tasK_BASE_TYPE) {
         case 'VGM_COMPARE':
             // VGM比对查看页面
-            router.push({
-                path: '/commontaskmanage/TaskVgmContrast',
+            go({
+                path: '/commontaskmanage/vgmCompare',
                 query: { taskPKId: data.pK_ID, type: data.status }
             });
             break;
         case 'INVOICE_BILL_MAIL':
             // 航次账单查看
-            router.push({
-                path: '/commontaskmanage/VoyageBill',
+            go({
+                path: '/commontaskmanage/invoiceBillMail',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'PER_BILL':
             // 单票账单查看
-            router.push({
-                path: '/commontaskmanage/singleTicket',
+            go({
+                path: '/commontaskmanage/perBill',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'CHANGE_SHIP':
             // 换船通知查看
-            router.push({
-                path: '/commontaskmanage/TaskChangeShip',
+            go({
+                path: '/commontaskmanage/changeShip',
                 query: { taskPKId: data.pK_ID, type: 'change' }
             });
             break;
         case 'ABORT_CHANGE_SHIP':
             // 取消换船通知查看
-            router.push({
-                path: '/commontaskmanage/TaskChangeShip',
+            go({
+                path: '/commontaskmanage/changeShip',
                 query: { taskPKId: data.pK_ID, type: 'abortChange' }
             });
             break;
         case 'ORIGINAL_LOST':
             // 正本缺失查看
-            router.push({
-                path: '/commontaskmanage/TaskOriginalLost',
-                query: { taskPKId: data.pK_ID }
-            });
-            break;
-        case 'SHIPPING_ORDER':
-            // 订舱详情查看
-            router.push({
-                path: '/commontaskmanage/BookingDetails',
+            go({
+                path: '/commontaskmanage/originalLost',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'SI_FEEDBACK':
             // 订舱详情编辑
-            router.push({
+            go({
                 path: '/commontaskmanage/TaskmanageDetail',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'TRUCK_DISPATCH':
             // 派车编辑
-            router.push({
+            go({
                 name: 'SendCarAdd',
                 query: { type: 'Edit', taskPKId: data.pK_ID }
             });
             break;
         case 'BC':
             // BC编辑
-            router.push({
+            go({
                 path: '/commontaskmanage/BcEditing',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'BC_MODIFY':
-            // BC变更
-            router.push({
-                path: '/commontaskmanage/BCModify',
+            // BC变更 Amendment
+            go({
+                path: '/commontaskmanage/Amendment',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'CANCELLATION':
             // Cancellation
-            router.push({
+            go({
                 path: '/commontaskmanage/Cancellation',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'ROLLING_NOMINATION':
             // ROLLING_NOMINATION
-            router.push({
+            go({
                 path: '/commontaskmanage/rollingNomination',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'VGM_FEEDBACK':
             // VGM_FEEDBACK
-            router.push({
+            go({
                 path: '/commontaskmanage/vgmDetail',
                 query: { taskPKId: data.pK_ID, type: 'VGM_FEEDBACK' }
             });
             break;
         case 'CAUTION_NOTICE':
-            // CAUTION_NOTICE
-            router.push({
+            // CAUTION_NOTICE 重要提醒
+            go({
                 path: '/commontaskmanage/cautionNotice',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'VGM_MISSING':
-            // VGM_MISSING
-            router.push({
+            // VGM_MISSING VGM未提交
+            go({
                 path: '/commontaskmanage/vgmDetail',
                 query: { taskPKId: data.pK_ID, type: 'VGM_MISSING' }
             });
             break;
         case 'CUT_MODIFY':
-            // CUT_MODIFY
-            router.push({
-                path: '/commontaskmanage/cutTime',
+            // CUT_MODIFY 截止时间变更
+            go({
+                path: '/commontaskmanage/cutModify',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'POD_DISCHARGE_FULL':
-            // POD_DISCHARGE_FULL
-            router.push({
-                path: '/commontaskmanage/POD_DISCHARGE_FULL',
+            //  目的港未提货
+            go({
+                path: '/commontaskmanage/podDischargeFull',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'TRNAS_PLAN_HAS_CHANGE':
-            // TRNAS_PLAN_HAS_CHANGE
-            router.push({
-                path: '/commontaskmanage/trnasPlan',
+            // 运输计划已变更
+            go({
+                path: '/commontaskmanage/transPlanHasChange',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'DRAFT':
             // DRAFT
-            router.push({
+            go({
                 path: '/commontaskmanage/draft',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'ROUTE_CUT_CHANGE':
-            // ROUTE_CUT_CHANGE
-            router.push({
-                path: '/commontaskmanage/cutChange',
+            // 航线截至事件调整
+            go({
+                path: '/commontaskmanage/routeCutChange',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         case 'POD_GATEOUT_FULL':
-            // POD_GATEOUT_FULL
-            router.push({
-                path: '/commontaskmanage/POD_GATEOUT_FULL',
+            // 目的港未返空箱 
+            go({
+                path: '/commontaskmanage/podGateoutFull',
                 query: { taskPKId: data.pK_ID }
             });
             break;
         default:
             // 默认跳转到订舱详情查看页面
-            router.push({
+            go({
                 path: '/commontaskmanage/BookingDetails',
                 query: { taskPKId: data.pK_ID }
             });
@@ -950,8 +588,400 @@ function handleDelete() {
 
 }
 
+// 取消
+function removeFun() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    console.log('当前选中', pkIdArr)
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    CancelTask(pkIdArr)
+        .then(res => {
+            if (res.success) {
+                this.$message.success('取消任务成功')
+                this.bcFileFlag = true
+                this.bcFile = res.data
+                this.getCurrentTotalStat()
+            } else {
+                this.$message.error(res.message)
+            }
+        })
+        .catch(err => {
+            console.log(err)
+        })
+}
+// 完成
+function submitFun() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    console.log('当前选中', pkIdArr)
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    CompleteTask(pkIdArr)
+        .then(res => {
+            if (res.success) {
+                this.$message.success('已完成任务')
+                this.bcFileFlag = true
+                this.bcFile = res.data
+                this.getCurrentTotalStat()
+            } else {
+                this.$message.error(res.message)
+            }
+        })
+        .catch(err => {
+            console.log(err)
+        })
+}
+// 批量下载
+function downloadFun() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    console.log('当前选中', pkIdArr)
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    pkIdArr.map(item => {
+        const name = select[pkIdArr.indexOf(item)].taskTitle
+        this.downloadTaskAttach(item, name)
+    })
+}
+function downloadTaskAttach(id, name) {
+    DownloadTaskAttach({
+        taskPKId: id
+    }).then(res => {
+        if (res.message) {
+            // this.showdownLoadErr = true
+            this.downLoadErrTip = `${name}下载失败：${res.message}`
+
+            message.error(`${name}下载失败：${res.message}`, 0)
+            return false
+        }
+        const blob = new Blob([res], { type: `application/pdf;chartset=UTF-8` })
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = URL.createObjectURL(blob)
+        link.download = name
+        document.body.appendChild(link)
+        link.click()
+        URL.revokeObjectURL(link.href) // 释放URL对象
+        document.body.removeChild(link)
+    })
+        .catch(err => {
+            console.log(err)
+        })
+}
+// 重新比对
+function reComparisonFun() {
+    // 未找到接口
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    const query = this.$qs.stringify({ PKIds: pkIdArr }, { arrayFormat: 'repeat' })
+    ManualReCompareBC(query)
+        .then(res => {
+            if (res.success) {
+                this.$message.success('重新比对完成')
+            } else {
+                this.$message.error(res.message)
+            }
+        })
+        .catch(err => {
+            console.log(err)
+        })
+}
+// 批量转发
+function SendEmailFun() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    console.log('当前选中', pkIdArr)
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    this.sendEmailPkIds = pkIdArr
+    this.sendEmailVisible = true
+}
+
+// 打印
+function FnCilckTemplateType(templateId) {
+    this.$message.success(`搜索文件中...`)
+    const printType = this.PrintType == 4 ? 20 : 10
+    TaskManageTruckGetInfoByTaskId({ taskPkId: this.pkIdArr[0] })
+        .then(res => {
+            if (res.data.succ) {
+                TaskManageTruckPrint({
+                    taskPKId: res.data.ext.pK_ID,
+                    templateId,
+                    cateCode: 'truckBill',
+                    type: this.PrintType,
+                    printType
+                }).then(res => {
+                    if (!res.success) {
+                        this.$message.error(res.message)
+                    } else {
+                        // this.$message.success(res.data)
+                        if (this.PrintType == 1) {
+                            window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/ViewPrintPdf/${res.data}`, '_blank')
+                        } else {
+                            window.open(
+                                ` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`,
+                                '_blank'
+                            )
+                        }
+                    }
+                })
+            } else {
+                this.$message.error(`${res.data.msg}`)
+            }
+            this.confirmLoading = false
+        })
+        .catch(() => {
+            this.confirmLoading = false
+        })
+}
+function GetPrintData(cateCode, printType) {
+    const Data = {
+        cateCode,
+        printType
+    }
+    this.spinning = true
+
+    TaskManageTruckPrintTemplateWithHistoryList(Data).then(res => {
+        console.log(res.data)
+        if (res.data.length == 1) {
+            this.FnCilckTemplateType(res.data[0].id)
+        } else {
+            this.templateType = res.data
+            this.spinning = false
+            this.PrintModalVisible = true
+        }
+    })
+}
+function FnPrint() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    if (pkIdArr.length != 1) {
+        this.$message.error('请仅选择一条数据')
+        return false
+    }
+    this.pkIdArr = pkIdArr
+    let printType = ''
+    if (this.PrintType == 4) {
+        printType = 20
+    } else {
+        printType = 10
+    }
+    this.PrintType = '1'
+    this.GetPrintData('truckBill', printType)
+}
+function FnSendCar() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    TaskManageTruckSendDispatchBatchByTask(pkIdArr).then(res => {
+        if (res.data.succ) {
+            this.$message.success('派车成功')
+        } else {
+            this.$message.error(`派车失败,${res.data.msg}`)
+        }
+    })
+}
+function CancelSendCar() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    TaskManageTruckCancelDispatchBatchByTask(pkIdArr).then(res => {
+        if (res.data.succ) {
+            this.$message.success('取消派车成功')
+        } else {
+            this.$message.error(`取消派车失败,${res.data.msg}`)
+        }
+    })
+}
+
+// 页数计算
+function laraPaperCalc() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    const query = this.$qs.stringify({ PKIds: pkIdArr }, { arrayFormat: 'repeat' })
+    LaraPaperCalc(query)
+        .then(res => {
+            if (res.success) {
+                this.paperCalcRes = res.data
+                this.paperCalcExtras = res.extras || ''
+                this.paperCalcVisible = true
+            } else {
+                this.$message.error(res.message)
+            }
+        })
+        .catch(err => {
+            console.log(err)
+        })
+}
+function handlePaperCalcCancel() {
+    this.paperCalcVisible = false
+}
+// COPY打印
+function copyPrintFun() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    PrintBatch({
+        PKIds: pkIdArr
+    })
+        .then(res => {
+            // 接口暂时报错
+            if (res.message) {
+                const downLoadErrTip = `COPY打印失败：${res.message}`
+                this.$message.error(downLoadErrTip)
+                return false
+            }
+            const blob = new Blob([res], { type: `application/pdf;chartset=UTF-8` })
+            const link = document.createElement('a')
+            link.style.display = 'none'
+            link.href = URL.createObjectURL(blob)
+            link.download = 'COPY打印'
+            document.body.appendChild(link)
+            link.click()
+            URL.revokeObjectURL(link.href) // 释放URL对象
+            document.body.removeChild(link)
+        })
+        .catch(err => {
+            console.log(err)
+        })
+}
+// COPY下载
+function copyDownloadFun() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    DownloadAttach({
+        PKIds: pkIdArr
+    })
+        .then(res => {
+            // 暂时报错 接口404 文档中也没有 等更新
+            if (res.message) {
+                const downLoadErrTip = `COPY下载失败：${res.message}`
+                this.$message.error(downLoadErrTip)
+                return false
+            }
+            const blob = new Blob([res], { type: `application/pdf;chartset=UTF-8` })
+            const link = document.createElement('a')
+            link.style.display = 'none'
+            link.href = URL.createObjectURL(blob)
+            link.download = 'COPY下载'
+            document.body.appendChild(link)
+            link.click()
+            URL.revokeObjectURL(link.href) // 释放URL对象
+            document.body.removeChild(link)
+        })
+        .catch(err => {
+            console.log(err)
+        })
+}
+// 正本下载
+function printBatchFun() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    DownloadOriginalTask({
+        PKIds: pkIdArr
+    })
+        .then(res => {
+            // 接口调用成功，但是无下载数据？？？？
+            if (res.message) {
+                const downLoadErrTip = `正本下载失败：${res.message}`
+                this.$message.error(downLoadErrTip)
+                return false
+            }
+            const blob = new Blob([res], { type: `application/pdf;chartset=UTF-8` })
+            const link = document.createElement('a')
+            link.style.display = 'none'
+            link.href = URL.createObjectURL(blob)
+            link.download = '正本下载'
+            document.body.appendChild(link)
+            link.click()
+            URL.revokeObjectURL(link.href) // 释放URL对象
+            document.body.removeChild(link)
+        })
+        .catch(err => {
+            console.log(err)
+        })
+}
+// LARA登记
+function laraPaperRegistFun() {
+    const select = this.$refs.xGrid.getCheckboxRecords()
+    const pkIdArr = select.map((item, index) => {
+        return item.pK_ID
+    })
+    if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+    }
+    const pkids = pkIdArr.toString()
+    console.log('跳转页面', pkIdArr.toString())
+    this.$go({ name: 'TaskLaraRegist', query: { taskPKId: pkids } })
+}
+// LARA记录
+function laraRecordFun() {
+    this.$go({ name: 'TaskLaraRecord' })
+}
+
 // 点击详细任务类型
 function handleClickTree(row, index) {
+    console.log(row)
+    taskType.value = row.key
     levelTree.value.map((item, index) => {
         item.active = false
     })
diff --git a/src/views/taskmanage/taskList/Amendment.vue b/src/views/taskmanage/taskList/Amendment.vue
new file mode 100644
index 00000000..98f8b912
--- /dev/null
+++ b/src/views/taskmanage/taskList/Amendment.vue
@@ -0,0 +1,178 @@
+<template>
+    <a-spin :spinning="spinning">
+        <a-row style="padding: 15px;" :gutter="16">
+            <a-col :span="pdfUrl ? 11 : 24">
+                <taskData ref="taskDataRef" title='Booking Amendment' ></taskData>
+            </a-col>
+            <a-col>
+                <pdf ref="pdfData"></pdf>
+                <taskButton @loadingStart="loadingStart" @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"></taskButton>
+            </a-col>
+        </a-row>
+    </a-spin>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted } from 'vue'
+import { useRouter,useRoute } from 'vue-router'
+import pdf from '../components/pdf.vue'
+import taskData from '../components/taskData.vue'
+import taskButton from '../components/taskButton.vue'
+const route = useRoute()
+const router = useRouter();
+const form = ref({
+    "pkId": "08dcab8e-3757-49bb-8082-1bb3de042459",
+    "taskId": "08dcab8e-374d-4a44-8093-6dc531177f01",
+    "busiType": "BookingConfirmation",
+    "bookingParty": "QINGDAO CHENGSI FREIGHT FORWARDER CO",
+    "mblNo": "242636125",
+    "vessel": "GSL MELITA",
+    "voyNo": "431S",
+    "placeReceipt": "Qingdao,Shandong,China",
+    "portload": "QINGDAO QIANWAN CONTAINER CO LTD",
+    "vgmCutoffTime": "2024-08-01 17:00:00",
+    "eta": "2024-09-03 00:00:00",
+    "etd": "2024-08-03 00:00:00",
+    "portDischarge": "Brisbane Patrick Terminal",
+    "placeDelivery": "Brisbane,Queensland,Australia",
+    "contractNo": "299026908",
+    "fstCustomerSerUserName": "Eight chengsi",
+    "cyCutoffTime": "2024-08-01 22:00:00",
+    "ctnList": [
+        {
+            "ctnALL": "40HC",
+            "ctnnum": 1
+        }
+    ],
+    "fileList": [
+        {
+            "filePath": "BookingAttach\\bcfiles\\08dcab8e-374d-4a44-8093-6dc531177f01\\20240724111048159\\DB_aabhcbhjagaf0x023A.pdf",
+            "fileType": ".pdf",
+            "fileName": "DB_aabhcbhjagaf0x023A.pdf",
+            "fileCategory": "BC",
+            "fileCategoryName": "Booking Confirmation"
+        },
+        {
+            "filePath": "BookingAttach\\bcnoticefiles\\08dcab8e-374d-4a44-8093-6dc531177f01\\20240724111048174\\DB_aabhcbhjagaf0x023A_MODIFY.pdf",
+            "fileType": ".pdf",
+            "fileName": "DB_aabhcbhjagaf0x023A_MODIFY.pdf",
+            "fileCategory": "BC_NOTICE",
+            "fileCategoryName": "Booking Confirmation Notice"
+        }
+    ],
+    "bookingSlotId": 571905822330949,
+    "carrierId": "MSK",
+    "carriageType": "DIRECT_SHIP",
+    "carriageTypeName": "直达",
+    "bookingSlotType": "CONTRACT_ORDER",
+    "bookingSlotTypeName": "合约订舱",
+    "ctnStat": "40HC*1",
+    "weekAt": "31",
+    "detensionFreeDays": 0,
+    "siCutDate": "2024-07-31 18:00:00",
+    "bookingConfirmDate": "2024-07-24 11:10:00",
+    "keywords": [
+        {
+            "name": "承运方式：直达",
+            "background": "#FFFF80",
+            "icon": "icon-yunshu1"
+        },
+        {
+            "name": "订舱方式：合约订舱",
+            "background": "#81D3F8",
+            "icon": "icon-touzijilu"
+        }
+    ],
+    "taskStatus": "Create"
+}) as any
+const pdfUrl = ref('123')
+const taskDataRef = ref()
+onMounted(() => {
+    taskDataRef.value.init(form.value)
+})
+const taskPKId = ref(route.query.taskPKId)
+const spinning = ref(false)
+const formItemLayout = {
+    labelCol1: { span: 6 },
+    wrapperCol1: { span: 18 },
+    labelCol2: { span: 8 },
+    wrapperCol2: { span: 16 },
+    labelCol3: { span: 4 },
+    wrapperCol3: { span: 20 },
+    labelCol4: { span: 8 },
+    wrapperCol4: { span: 16 },
+    labelCol5: { span: 14 },
+    wrapperCol5: { span: 10 },
+    labelCol6: { span: 8 },
+    wrapperCol6: { span: 16 }
+}
+
+const pdfData = ref()
+
+onMounted(() => {
+    pdfData.value.init()
+})
+
+function loadingStart(){
+    spinning.value = true
+}
+function loadingStop(){
+    spinning.value = false
+}
+
+
+
+
+</script>
+<style lang="less" scoped>
+.LeftHead {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+        font-size: 15px;
+        font-weight: 700;
+        color: black;
+    }
+}
+
+.text {
+    font-weight: 700;
+    color: black;
+}
+
+/deep/ .ant-form-item-control-input-content {
+    div {
+        color: rgba(122, 135, 152, 1);
+    }
+}
+
+.box {
+    border: 1px solid rgba(232, 235, 237, 1);
+    padding: 15px 20px;
+    margin-bottom: 16px;
+
+    .title {
+        font-size: 15px;
+        font-weight: 700;
+        color: black;
+    }
+}
+
+.CsSee {
+    color: rgb(104, 104, 228);
+    font-weight: 500;
+    cursor: pointer;
+}
+
+.unitBox {
+    display: flex;
+
+    .unit {
+        margin-right: 15px;
+        padding: 0 5px;
+    }
+}
+/deep/ .ant-form-item{
+    margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/BcEditing.vue b/src/views/taskmanage/taskList/BcEditing.vue
index c0d34ea0..841bd3ff 100644
--- a/src/views/taskmanage/taskList/BcEditing.vue
+++ b/src/views/taskmanage/taskList/BcEditing.vue
@@ -2,273 +2,22 @@
     <a-spin :spinning="spinning">
         <a-row style="padding: 15px;" :gutter="16">
             <a-col :span="pdfUrl ? 11 : 24">
-                <a-form :label-col="labelCol" :wrapper-col="wrapperCol" :model="form">
-                    <div class="box">
-                        <div class="LeftHead">
-                            <p class="title">
-                                Booking Confirmation（{{ form.carrierId }}）
-                                <i @click="reload" class="icon-refresh-1-copy iconfont"></i>
-                            </p>
-                            <p>订舱时间：{{ form.bookingConfirmDate }}</p>
-                        </div>
-                        <a-row>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>提单号</div>
-                                    <span class="text"> {{ form.mblNo }}</span>
-                                    <a-icon @click="copyText(form.mblNo)" style="cursor: pointer;" type="copy" />
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>船名/航次</div>
-                                    <span class="text"> {{ form.vessel }}/{{ form.voyNo }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>收货地</div>
-                                    <span class="text"> {{ form.placeReceipt }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>ETD</div>
-                                    <span class="text"> {{ form.etd ? form.etd.substring(0, 11) : '-' }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>交货地</div>
-                                    <span class="text"> {{ form.placeDelivery }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>ETA</div>
-                                    <span class="text"> {{ form.eta ? form.eta.substring(0, 11) : '-' }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>订舱人</div>
-                                    <span class="text"> {{ form.bookingParty }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>合约号</div>
-                                    <span class="text"> {{ form.contractNo }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>样单截止时间</div>
-                                    <span class="text"> {{ form.siCutDate }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>箱使天数</div>
-                                    <span class="text"> {{ form.detensionFreeDays }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>舱单截止时间</div>
-                                    <span class="text"> {{ form.manifestCutDate }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>截港时间</div>
-                                    <span class="text"> {{ form.cyCutoffTime }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>MDGF截止时间</div>
-                                    <span class="text"> {{ form.mdgfCutDate }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>VGM截止时间</div>
-                                    <span class="text"> {{ form.vgmCutoffTime }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>箱型箱量</div>
-                                    <span class="text"> {{ form.ctnStat }}</span>
-                                </a-form-item>
-                            </a-col>
-                        </a-row>
-                    </div>
-
-
-                    <div class="box">
-                        <a-row>
-                            <a-col :span="24">
-                                <p class="title">一程</p>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>船名/航次</div>
-                                    <span class="text">{{ form.vessel }}/{{ form.voyNo }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>ETD</div>
-                                    <span class="text">{{ form.etd ? form.etd.substring(0, 11) : '-' }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>装货港</div>
-                                    <span class="text">{{ form.portload }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>ETA</div>
-                                    <span class="text"> {{ form.eta ? form.eta.substring(0, 11) : '-' }}</span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>卸货港</div>
-                                    <span class="text">{{ form.portDischarge }}</span>
-                                </a-form-item>
-                            </a-col>
-
-                            <div v-if="form.carriageType == 'TRANSFER_SHIP'">
-                                <a-col :span="24">
-                                    <p class="title">二程</p>
-                                </a-col>
-                                <a-col :span="8">
-                                    <a-form-item label="">
-                                        <div>船名/航次</div>
-                                        <span class="text">{{ form.secondVessel }}/{{ form.secondVoyno }}</span>
-                                    </a-form-item>
-                                </a-col>
-                                <a-col :span="8">
-                                    <a-form-item label="ETD：">
-                                        <div>ETD</div>
-                                        <span class="text"> {{ form.secondETD ? form.secondETD.substring(0, 11) : '-'
-                                            }}</span>
-                                    </a-form-item>
-                                </a-col>
-                                <a-col :span="8">
-                                    <a-form-item label="">
-                                        <div>装货港</div>
-                                        <span class="text"> {{ form.transferPort1 }}</span>
-                                    </a-form-item>
-                                </a-col>
-                                <a-col :span="8">
-                                    <a-form-item label="">
-                                        <div>ETA</div>
-                                        <span class="text"> {{ form.secondETA ? form.secondETA.substring(0, 11) : '-'
-                                            }}</span>
-                                    </a-form-item>
-                                </a-col>
-                                <a-col :span="8">
-                                    <a-form-item label="">
-                                        <div>卸货港</div>
-                                        <span class="text"> {{ form.portDischarge }}</span>
-                                    </a-form-item>
-                                </a-col>
-                            </div>
-                        </a-row>
-                    </div>
-
-
-                    <div class="box">
-                        <a-row>
-                            <a-col :span="24">
-                                <p class="title">关联详情</p>
-                            </a-col>
-                        </a-row>
-                        <a-row>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>已生成舱位</div>
-                                    <span class="text">
-                                        {{ form.bookingSlotId ? '是' : '否' }}
-                                        <span class="CsSee" v-if="form.bookingSlotId" @click="FnSee1">(查看)</span>
-                                    </span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>已生成订舱</div>
-                                    <span class="text">
-                                        {{ form.bookingOrderId ? '是' : '否' }}
-                                        <span class="CsSee" v-if="form.bookingOrderId" @click="FnSee">(查看)</span>
-                                    </span>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="8">
-                                <a-form-item label="">
-                                    <div>任务状态</div>
-                                    <span class="text"> {{ form.taskStatus == 'Complete' ? '已完成' : '-' }}</span>
-                                </a-form-item>
-                            </a-col>
-                        </a-row>
-                    </div>
-                    <div class="box">
-                        <a-col :span="24">
-                            <p class="title">关键信息</p>
-                        </a-col>
-                        <div class="unitBox">
-                            <p v-for="(item, index) in form.keywords" :key="index" class="unit" :style="{
-                                background: item.background,
-                                color: Rcolor(item.background),
-                            }">
-                                <i :class="item.icon" class="iconfont"></i>{{ item.name }}
-                            </p>
-                        </div>
-                    </div>
-                </a-form>
+                <taskData ref="taskDataRef" title='Booking Confirmation' ></taskData>
             </a-col>
             <a-col>
                 <pdf ref="pdfData"></pdf>
-                <a-row type="flex" :gutter="16">
-                    <a-col>
-                        <a-button type="primary" @click="OpenUser">
-                            转移任务
-                        </a-button>
-                    </a-col>
-                    <a-col>
-                        <a-button type="primary" @click="FnCompleteTask">
-                            完成任务
-                        </a-button>
-                    </a-col>
-                    <a-col>
-                        <a-button type="primary" @click="OpenModal">
-                            生 成
-                        </a-button>
-                    </a-col>
-                    <a-col>
-                        <a-button type="danger" @click="FnCancelTask">
-                            取消任务
-                        </a-button>
-                    </a-col>
-                    <a-col>
-                        <a-button type="primary" @click="handleSendMail">
-                            发送邮件
-                        </a-button>
-                    </a-col>
-                </a-row>
+                <taskButton @loadingStart="loadingStart" @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"></taskButton>
             </a-col>
         </a-row>
     </a-spin>
 </template>
 <script lang="ts" setup>
 import { ref, onMounted } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRouter,useRoute } from 'vue-router'
 import pdf from '../components/pdf.vue'
+import taskData from '../components/taskData.vue'
+import taskButton from '../components/taskButton.vue'
+const route = useRoute()
 const router = useRouter();
 const form = ref({
     "pkId": "08dcab8e-3757-49bb-8082-1bb3de042459",
@@ -336,8 +85,11 @@ const form = ref({
     "taskStatus": "Create"
 }) as any
 const pdfUrl = ref('123')
-const wrapperCol = { span: 22 }
-const labelCol = { span: 0 }
+const taskDataRef = ref()
+onMounted(() => {
+    taskDataRef.value.init(form.value)
+})
+const taskPKId = ref(route.query.taskPKId)
 const spinning = ref(false)
 const formItemLayout = {
     labelCol1: { span: 6 },
@@ -353,40 +105,22 @@ const formItemLayout = {
     labelCol6: { span: 8 },
     wrapperCol6: { span: 16 }
 }
-function reload() {
 
-}
 const pdfData = ref()
 
 onMounted(() => {
     pdfData.value.init()
 })
-function Rcolor(hexColor) {
-    const hex = hexColor.replace('#', '').toLowerCase()
-    const red = parseInt(hex.substring(0, 2), 16) - 90
-    const green = parseInt(hex.substring(2, 4), 16) - 90
-    const blue = parseInt(hex.substring(4, 6), 16) - 50
-    return `rgb(${red}, ${green}, ${blue})`
-}
 
-function FnSee() {
-    router.push({ path: '/BookingDetail?id=' + this.form.bookingOrderId })
+function loadingStart(){
+    spinning.value = true
 }
-
-function FnSee1() {
-    router.push({ path: '/CabinManagementDetails?type=Edit&id=' + this.form.bookingSlotId })
+function loadingStop(){
+    spinning.value = false
 }
 
-function copyText(text) {
-    const inputDom = document.createElement('textarea')
-    document.body.appendChild(inputDom)
-    inputDom.value = text
-    inputDom.select()
-    inputDom.focus()
-    document.execCommand('copy')
-    document.body.removeChild(inputDom)
-    this.$message.success('复制成功')
-}
+
+
 
 </script>
 <style lang="less" scoped>
@@ -438,4 +172,7 @@ function copyText(text) {
         padding: 0 5px;
     }
 }
+/deep/ .ant-form-item{
+    margin-bottom: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/Cancellation.vue b/src/views/taskmanage/taskList/Cancellation.vue
new file mode 100644
index 00000000..7f0a890f
--- /dev/null
+++ b/src/views/taskmanage/taskList/Cancellation.vue
@@ -0,0 +1,178 @@
+<template>
+    <a-spin :spinning="spinning">
+        <a-row style="padding: 15px;" :gutter="16">
+            <a-col :span="pdfUrl ? 11 : 24">
+                <taskData ref="taskDataRef" title='Booking Cancellation' ></taskData>
+            </a-col>
+            <a-col>
+                <pdf ref="pdfData"></pdf>
+                <taskButton @loadingStart="loadingStart" @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"></taskButton>
+            </a-col>
+        </a-row>
+    </a-spin>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted } from 'vue'
+import { useRouter,useRoute } from 'vue-router'
+import pdf from '../components/pdf.vue'
+import taskData from '../components/taskData.vue'
+import taskButton from '../components/taskButton.vue'
+const route = useRoute()
+const router = useRouter();
+const form = ref({
+    "pkId": "08dcab8e-3757-49bb-8082-1bb3de042459",
+    "taskId": "08dcab8e-374d-4a44-8093-6dc531177f01",
+    "busiType": "BookingConfirmation",
+    "bookingParty": "QINGDAO CHENGSI FREIGHT FORWARDER CO",
+    "mblNo": "242636125",
+    "vessel": "GSL MELITA",
+    "voyNo": "431S",
+    "placeReceipt": "Qingdao,Shandong,China",
+    "portload": "QINGDAO QIANWAN CONTAINER CO LTD",
+    "vgmCutoffTime": "2024-08-01 17:00:00",
+    "eta": "2024-09-03 00:00:00",
+    "etd": "2024-08-03 00:00:00",
+    "portDischarge": "Brisbane Patrick Terminal",
+    "placeDelivery": "Brisbane,Queensland,Australia",
+    "contractNo": "299026908",
+    "fstCustomerSerUserName": "Eight chengsi",
+    "cyCutoffTime": "2024-08-01 22:00:00",
+    "ctnList": [
+        {
+            "ctnALL": "40HC",
+            "ctnnum": 1
+        }
+    ],
+    "fileList": [
+        {
+            "filePath": "BookingAttach\\bcfiles\\08dcab8e-374d-4a44-8093-6dc531177f01\\20240724111048159\\DB_aabhcbhjagaf0x023A.pdf",
+            "fileType": ".pdf",
+            "fileName": "DB_aabhcbhjagaf0x023A.pdf",
+            "fileCategory": "BC",
+            "fileCategoryName": "Booking Confirmation"
+        },
+        {
+            "filePath": "BookingAttach\\bcnoticefiles\\08dcab8e-374d-4a44-8093-6dc531177f01\\20240724111048174\\DB_aabhcbhjagaf0x023A_MODIFY.pdf",
+            "fileType": ".pdf",
+            "fileName": "DB_aabhcbhjagaf0x023A_MODIFY.pdf",
+            "fileCategory": "BC_NOTICE",
+            "fileCategoryName": "Booking Confirmation Notice"
+        }
+    ],
+    "bookingSlotId": 571905822330949,
+    "carrierId": "MSK",
+    "carriageType": "DIRECT_SHIP",
+    "carriageTypeName": "直达",
+    "bookingSlotType": "CONTRACT_ORDER",
+    "bookingSlotTypeName": "合约订舱",
+    "ctnStat": "40HC*1",
+    "weekAt": "31",
+    "detensionFreeDays": 0,
+    "siCutDate": "2024-07-31 18:00:00",
+    "bookingConfirmDate": "2024-07-24 11:10:00",
+    "keywords": [
+        {
+            "name": "承运方式：直达",
+            "background": "#FFFF80",
+            "icon": "icon-yunshu1"
+        },
+        {
+            "name": "订舱方式：合约订舱",
+            "background": "#81D3F8",
+            "icon": "icon-touzijilu"
+        }
+    ],
+    "taskStatus": "Create"
+}) as any
+const pdfUrl = ref('123')
+const taskDataRef = ref()
+onMounted(() => {
+    taskDataRef.value.init(form.value)
+})
+const taskPKId = ref(route.query.taskPKId)
+const spinning = ref(false)
+const formItemLayout = {
+    labelCol1: { span: 6 },
+    wrapperCol1: { span: 18 },
+    labelCol2: { span: 8 },
+    wrapperCol2: { span: 16 },
+    labelCol3: { span: 4 },
+    wrapperCol3: { span: 20 },
+    labelCol4: { span: 8 },
+    wrapperCol4: { span: 16 },
+    labelCol5: { span: 14 },
+    wrapperCol5: { span: 10 },
+    labelCol6: { span: 8 },
+    wrapperCol6: { span: 16 }
+}
+
+const pdfData = ref()
+
+onMounted(() => {
+    pdfData.value.init()
+})
+
+function loadingStart(){
+    spinning.value = true
+}
+function loadingStop(){
+    spinning.value = false
+}
+
+
+
+
+</script>
+<style lang="less" scoped>
+.LeftHead {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+        font-size: 15px;
+        font-weight: 700;
+        color: black;
+    }
+}
+
+.text {
+    font-weight: 700;
+    color: black;
+}
+
+/deep/ .ant-form-item-control-input-content {
+    div {
+        color: rgba(122, 135, 152, 1);
+    }
+}
+
+.box {
+    border: 1px solid rgba(232, 235, 237, 1);
+    padding: 15px 20px;
+    margin-bottom: 16px;
+
+    .title {
+        font-size: 15px;
+        font-weight: 700;
+        color: black;
+    }
+}
+
+.CsSee {
+    color: rgb(104, 104, 228);
+    font-weight: 500;
+    cursor: pointer;
+}
+
+.unitBox {
+    display: flex;
+
+    .unit {
+        margin-right: 15px;
+        padding: 0 5px;
+    }
+}
+/deep/ .ant-form-item{
+    margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/changeShip.vue b/src/views/taskmanage/taskList/changeShip.vue
new file mode 100644
index 00000000..da977c9a
--- /dev/null
+++ b/src/views/taskmanage/taskList/changeShip.vue
@@ -0,0 +1,3 @@
+<template>
+    changeShip
+</template>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/cutModify.vue b/src/views/taskmanage/taskList/cutModify.vue
new file mode 100644
index 00000000..b68ebadb
--- /dev/null
+++ b/src/views/taskmanage/taskList/cutModify.vue
@@ -0,0 +1,3 @@
+<template>
+    cutModify
+</template>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/draft.vue b/src/views/taskmanage/taskList/draft.vue
new file mode 100644
index 00000000..ee51c3d5
--- /dev/null
+++ b/src/views/taskmanage/taskList/draft.vue
@@ -0,0 +1,3 @@
+<template>
+    draft
+</template>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/invoiceBillMail.vue b/src/views/taskmanage/taskList/invoiceBillMail.vue
new file mode 100644
index 00000000..301495f3
--- /dev/null
+++ b/src/views/taskmanage/taskList/invoiceBillMail.vue
@@ -0,0 +1,3 @@
+<template>
+    invoiceBillMail
+</template>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/originalLost.vue b/src/views/taskmanage/taskList/originalLost.vue
new file mode 100644
index 00000000..5be880bf
--- /dev/null
+++ b/src/views/taskmanage/taskList/originalLost.vue
@@ -0,0 +1,3 @@
+<template>
+    originalLost
+</template>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/perBill.vue b/src/views/taskmanage/taskList/perBill.vue
new file mode 100644
index 00000000..3f46fda5
--- /dev/null
+++ b/src/views/taskmanage/taskList/perBill.vue
@@ -0,0 +1,3 @@
+<template>
+    perBill
+</template>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/podDischargeFull.vue b/src/views/taskmanage/taskList/podDischargeFull.vue
new file mode 100644
index 00000000..7546d5bc
--- /dev/null
+++ b/src/views/taskmanage/taskList/podDischargeFull.vue
@@ -0,0 +1,3 @@
+<template>
+    podDischargeFull
+</template>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/podGateoutFull.vue b/src/views/taskmanage/taskList/podGateoutFull.vue
new file mode 100644
index 00000000..994d0aca
--- /dev/null
+++ b/src/views/taskmanage/taskList/podGateoutFull.vue
@@ -0,0 +1,3 @@
+<template>
+    podGateoutFull
+</template>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/rollingNomination.vue b/src/views/taskmanage/taskList/rollingNomination.vue
new file mode 100644
index 00000000..b0dea7fc
--- /dev/null
+++ b/src/views/taskmanage/taskList/rollingNomination.vue
@@ -0,0 +1,3 @@
+<template>
+    rollingNomination
+</template>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/routeCutChange.vue b/src/views/taskmanage/taskList/routeCutChange.vue
new file mode 100644
index 00000000..3f65361f
--- /dev/null
+++ b/src/views/taskmanage/taskList/routeCutChange.vue
@@ -0,0 +1,3 @@
+<template>
+    routeCutChange
+</template>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/transPlanHasChange.vue b/src/views/taskmanage/taskList/transPlanHasChange.vue
new file mode 100644
index 00000000..fa889738
--- /dev/null
+++ b/src/views/taskmanage/taskList/transPlanHasChange.vue
@@ -0,0 +1,3 @@
+<template>
+    transPlanHasChange
+</template>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/vgmCompare.vue b/src/views/taskmanage/taskList/vgmCompare.vue
new file mode 100644
index 00000000..e5e24787
--- /dev/null
+++ b/src/views/taskmanage/taskList/vgmCompare.vue
@@ -0,0 +1,192 @@
+<template>
+  <div class="task-vgm-contrast">
+    <div class="nav-btn-box" v-if="taskType === 'Create'">
+      <a-button class="nav-btn" type="primary" @click="overTaskFun">完成任务</a-button>
+      <a-button class="nav-btn" type="primary" @click="updateTaskFun">更新订舱</a-button>
+    </div>
+    <div class="vgm-compare">
+      <a-row :gutter="10">
+        <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+          <div class="booking-vgm old">
+            <div class="title">原订舱箱信息</div>
+            <ul class="vgm-table">
+              <li class="top">
+                <span class="label" v-for="(label, index) in columns" :key="index"
+                  :class="{ 'isContaNo': label.key === 'contaNo' }"
+                  :style="label.key === 'contaNo' ? 'width:110px;' : 'flex:1;'">{{ label.title
+                  }}</span>
+              </li>
+              <li v-for="(lastItem, oindex) in vgmLastTableData" :key="oindex">
+                <span class="label" v-for="(lastlabel, lindex) in columns" :key="lindex"
+                  :class="[{ 'active': lastItem.compareDiffList.includes(lastlabel.key.slice(0, 1).toUpperCase() + lastlabel.key.slice(1)) || lastItem.compareDiffList.includes(lastlabel.key.toUpperCase()) }, { 'isContaNo': lastlabel.key === 'contaNo' }]"
+                  :style="lastlabel.key === 'contaNo' ? 'width:110px;' : 'flex:1;'">
+                  {{ lastItem[lastlabel.key] }}
+                </span>
+              </li>
+            </ul>
+          </div>
+        </a-col>
+        <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+          <div class="booking-vgm new">
+            <div class="title">客户提交信息</div>
+            <ul class="vgm-table">
+              <li class="top">
+                <span class="label" v-for="(label, index) in columns" :key="index"
+                  :style="label.key === 'contaNo' ? 'width:110px;' : 'flex:1;'">
+                  {{ label.title }}
+                </span>
+              </li>
+              <li v-for="(submitItem, zindex) in vgmSubmitTableData" :key="zindex">
+                <span class="label" v-for="(slabel, sindex) in columns" :key="sindex"
+                  :class="[{ 'active': submitItem.compareDiffList.includes(slabel.key.slice(0, 1).toUpperCase() + slabel.key.slice(1)) || submitItem.compareDiffList.includes(slabel.key.toUpperCase()) }, { 'isContaNo': slabel.key === 'contaNo' }]"
+                  :style="slabel.key === 'contaNo' ? 'width:110px;' : 'flex:1;'">
+                  {{ submitItem[slabel.key] }}
+                </span>
+              </li>
+            </ul>
+          </div>
+        </a-col>
+      </a-row>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted } from 'vue'
+import { GetVGMCompareResult, SaveBookingVGM, CompleteTask } from '../api'
+import { useRouter, useRoute } from 'vue-router'
+import { useMessage } from '/@/hooks/web/useMessage'
+const { createMessage } = useMessage()
+const route = useRoute()
+const taskPKId = ref(route.query.taskPKId)
+const taskType = ref(route.query.type)
+const columns = ref([
+  { dataIndex: 'contaType', key: 'contaType', title: '箱型' },
+  { dataIndex: 'contaNo', key: 'contaNo', title: '箱号' },
+  { dataIndex: 'sealNo', key: 'sealNo', title: '封号' },
+  { dataIndex: 'kgs', key: 'kgs', title: '毛重' },
+  { dataIndex: 'tareWeight', key: 'tareWeight', title: '皮重' },
+  { dataIndex: 'weighKGs', key: 'weighKGs', title: '称重重量' },
+  { dataIndex: 'weighType', key: 'weighType', title: '称重方式' }
+])
+onMounted(() => {
+  getInfo()
+})
+const vgmLastTableData = ref([]) as any
+const vgmSubmitTableData = ref([]) as any
+function getInfo() {
+  GetVGMCompareResult({
+    taskPKId: taskPKId.value
+  }).then((res) => {
+    if (res.success) {
+      res.data.bookOrderCompareList.map((item, index) => {
+        if (!item.hasOwnProperty('compareDiffList')) {
+          item.compareDiffList = []
+        }
+      })
+      res.data.vgmCompareList.map((oitem, oindex) => {
+        if (!oitem.hasOwnProperty('compareDiffList')) {
+          oitem.compareDiffList = []
+        }
+      })
+      vgmLastTableData.value = res.data.bookOrderCompareList
+      vgmSubmitTableData.value = res.data.vgmCompareList
+    } else {
+      createMessage.error(res.message)
+    }
+  }).catch((err) => {
+    console.log(err)
+  })
+}
+function overTaskFun() {
+  CompleteTask({
+    PKIds: [this.taskPKId]
+  }).then((res) => {
+    if (res.success) {
+      this.$message.success('已完成任务')
+    } else {
+      this.$message.error(res.message)
+    }
+  }).catch((err) => {
+    console.log(err)
+  })
+}
+function updateTaskFun() {
+  SaveBookingVGM(this.taskPKId).then((res) => {
+    if (res.success) {
+      this.$message.success('更新成功')
+    } else {
+      this.$message.error(res.message)
+    }
+  }).catch((err) => {
+    console.log(err)
+  })
+}
+</script>
+<style lang="less" scoped>
+.nav-btn-box {
+  margin-bottom: 20px;
+
+  .nav-btn {
+    margin-right: 10px;
+  }
+}
+
+ul,
+li {
+  list-style: none;
+}
+
+.vgm-compare {
+  padding: 20px;
+  background: #fff;
+
+  .booking-vgm {
+    padding: 0 20px;
+
+    .title {
+      height: 30px;
+      line-height: 30px;
+      font-size: 16px;
+      color: #666;
+      border-bottom: 1px solid #eee;
+      margin-bottom: 10px;
+    }
+
+    .vgm-table {
+      border: 1px solid #eee;
+      padding: 0;
+
+      li {
+        height: 40px;
+        border-bottom: 1px solid #eee;
+        line-height: 40px;
+        display: flex;
+
+        span {
+          display: block;
+          // flex: 1;
+          text-align: center;
+          font-size: 14px;
+          border-right: 1px solid #eee;
+
+          &:nth-last-of-type(1) {
+            border-right: none;
+          }
+
+          &.active {
+            color: #CC3333;
+          }
+
+          &.isContaNo {
+            // width: 110px;
+          }
+        }
+
+        &.top {
+          background: #f8f8fa;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/taskmanage/taskList/vgmDetail.vue b/src/views/taskmanage/taskList/vgmDetail.vue
new file mode 100644
index 00000000..ffc8fff3
--- /dev/null
+++ b/src/views/taskmanage/taskList/vgmDetail.vue
@@ -0,0 +1,3 @@
+<template>
+    vgmDetail
+</template>
\ No newline at end of file