From a8708acd70e309f28bbd34a7cefdb732c8a13c6c Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Wed, 23 Oct 2024 13:43:01 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Print/printModal.vue |    2 +-
 src/views/taskmanage/index.vue      | 3169 +++++++++++++--------------
 2 files changed, 1512 insertions(+), 1659 deletions(-)

diff --git a/src/components/Print/printModal.vue b/src/components/Print/printModal.vue
index 0217595e..4870fb69 100644
--- a/src/components/Print/printModal.vue
+++ b/src/components/Print/printModal.vue
@@ -23,7 +23,7 @@
                         <a-button type="primary" size="small">分享</a-button>
                     </a-popover>
                 </div>
-                <iframe id="PrintPath" :src="fileURL" width="100%" height="600px"></iframe>
+                <iframe frameborder="0" id="PrintPath" :src="fileURL + '#scrollbars=0&toolbar=0&statusbar=0'" width="100%" height="600px"></iframe>
             </div>
         </a-modal>
         <EmailModal  :bookingData="bookingData" ref="EmailModalRef" ></EmailModal>
diff --git a/src/views/taskmanage/index.vue b/src/views/taskmanage/index.vue
index fad8b13b..b534a314 100644
--- a/src/views/taskmanage/index.vue
+++ b/src/views/taskmanage/index.vue
@@ -6,63 +6,30 @@
           <div class="nav-box">
             <div class="nav-bottom">
               <a-button type="link" size="small" @click="getCurrentTotalStat('refsh')">
-                <i class="icon-refresh-1-copy iconfont"></i>刷新任务单</a-button
-              >
+                <i class="icon-refresh-1-copy iconfont"></i>刷新任务单</a-button>
             </div>
             <a-spin :spinning="levelLoading" tip="加载中...">
               <div class="bottom-box">
                 <div class="nav-title" v-if="levelTop.length > 0">
-                  <a-radio-group
-                    button-style="solid"
-                    v-model:value="activeTopKey"
-                    style="margin-bottom: 16px; display: flex"
-                    @change="changeTopLevel"
-                  >
-                    <a-radio-button
-                      v-for="(item, index) in levelTop"
-                      :value="item.key"
-                      :key="index"
-                    >
-                      <span class="nav-top"
-                        >{{ item.name }}<span class="nav-top-tip">({{ item.total }})</span></span
-                      >
+                  <a-radio-group button-style="solid" v-model:value="activeTopKey"
+                    style="margin-bottom: 16px; display: flex" @change="changeTopLevel">
+                    <a-radio-button v-for="(item, index) in levelTop" :value="item.key" :key="index">
+                      <span class="nav-top">{{ item.name }}<span class="nav-top-tip">({{ item.total }})</span></span>
                     </a-radio-button>
                   </a-radio-group>
                 </div>
-                <div class="nav-no-data" v-else
-                  ><i class="iconfont icon-guanli"></i><span>暂无导航数据</span>
+                <div class="nav-no-data" v-else><i class="iconfont icon-guanli"></i><span>暂无导航数据</span>
                 </div>
                 <div style="padding: 0 20px">
-                  <a-tabs
-                    tab-position="top"
-                    v-model:activeKey="activeNextKey"
-                    hide-add
-                    size="small"
-                    @change="changeNextLevel"
-                    v-if="levelNext.length > 0"
-                  >
-                    <a-tab-pane
-                      v-for="level in levelNext"
-                      :key="level.key"
-                      :tab="level.name"
-                      style="margin-right: 6px"
-                    >
+                  <a-tabs tab-position="top" v-model:activeKey="activeNextKey" hide-add size="small"
+                    @change="changeNextLevel" v-if="levelNext.length > 0">
+                    <a-tab-pane v-for="level in levelNext" :key="level.key" :tab="level.name" style="margin-right: 6px">
                       <div>
-                        <div
-                          v-for="(item, index) in levelTree"
-                          @click="handleClickTree(item, index)"
-                          :class="{ active: item.active, redColor: item.key == 'CAUTION_NOTICE' }"
-                          class="box-item"
-                        >
+                        <div v-for="(item, index) in levelTree" @click="handleClickTree(item, index)"
+                          :class="{ active: item.active, redColor: item.key == 'CAUTION_NOTICE' }" class="box-item">
                           <div class="box-text">
-                            <i
-                              v-if="item.key != 'CAUTION_NOTICE'"
-                              class="icon-touzijilu iconfont"
-                            ></i>
-                            <i
-                              v-if="item.key == 'CAUTION_NOTICE'"
-                              class="icon-jinggao iconfont"
-                            ></i>
+                            <i v-if="item.key != 'CAUTION_NOTICE'" class="icon-touzijilu iconfont"></i>
+                            <i v-if="item.key == 'CAUTION_NOTICE'" class="icon-jinggao iconfont"></i>
                             {{ item.name }}
                           </div>
                           <div class="box-number">{{ item.total }}</div>
@@ -76,31 +43,14 @@
           </div>
         </template>
         <template #tableTitle>
-          <a-popconfirm
-            title="是否取消当前选择项？"
-            ok-text="是"
-            cancel-text="否"
-            @confirm="removeFun"
-          >
+          <a-popconfirm title="是否取消当前选择项？" ok-text="是" cancel-text="否" @confirm="removeFun">
             <a-button type="link"> <i class="icon-weiwancheng iconfont"></i> 取消</a-button>
           </a-popconfirm>
-          <a-popconfirm
-            title="确定完成当前选择项？"
-            ok-text="是"
-            cancel-text="否"
-            @confirm="submitFun"
-          >
+          <a-popconfirm title="确定完成当前选择项？" ok-text="是" cancel-text="否" @confirm="submitFun">
             <a-button type="link"><i class="icon-yiwancheng2 iconfont"></i>完成</a-button>
           </a-popconfirm>
-          <a-button type="link" @click="openUser"
-            ><i class="icon-zhuanfa iconfont"></i>任务转交</a-button
-          >
-          <a-popconfirm
-            title="确定任务领取吗？"
-            ok-text="是"
-            cancel-text="否"
-            @confirm="handlePull"
-          >
+          <a-button type="link" @click="openUser"><i class="icon-zhuanfa iconfont"></i>任务转交</a-button>
+          <a-popconfirm title="确定任务领取吗？" ok-text="是" cancel-text="否" @confirm="handlePull">
             <a-button type="link"><i class="icon-shangchuanziliao iconfont"></i>任务领取</a-button>
           </a-popconfirm>
           <!-- <a-button type="link" @click="FnPrint"><i class="icon-weibiaoti-- iconfont"></i>打印</a-button> -->
@@ -108,104 +58,47 @@
                     <a-button type="link" @click="CancelSendCar"><i
                             class="icon-weiwancheng iconfont"></i>取消派车</a-button> -->
           <template v-if="taskType === 'BC'">
-            <a-popconfirm
-              title="确定批量下载当前选择项？"
-              ok-text="是"
-              cancel-text="否"
-              @confirm="downloadFun"
-            >
-              <a-button type="link"
-                ><i class="icon-xiazai-wenjianxiazai-16 iconfont"></i>批量下载</a-button
-              >
+            <a-popconfirm title="确定批量下载当前选择项？" ok-text="是" cancel-text="否" @confirm="downloadFun">
+              <a-button type="link"><i class="icon-xiazai-wenjianxiazai-16 iconfont"></i>批量下载</a-button>
             </a-popconfirm>
-            <a-popconfirm
-              title="确定重新比对当前选择项？"
-              ok-text="是"
-              cancel-text="否"
-              @confirm="reComparisonFun"
-            >
+            <a-popconfirm title="确定重新比对当前选择项？" ok-text="是" cancel-text="否" @confirm="reComparisonFun">
               <a-button type="link"><i class="iconfont icon-duibi"></i>重新比对</a-button>
             </a-popconfirm>
           </template>
           <template v-if="taskType === 'DRAFT' || taskType === 'SEAWAY BILL'">
-            <a-popconfirm
-              title="确定批量转发当前选择项？"
-              ok-text="是"
-              cancel-text="否"
-              @confirm="SendEmailFun"
-            >
+            <a-popconfirm title="确定批量转发当前选择项？" ok-text="是" cancel-text="否" @confirm="SendEmailFun">
               <a-button type="link"><i class="iconfont icon-31zhuanfa"></i>批量转发</a-button>
             </a-popconfirm>
-            <a-popconfirm
-              title="确定批量下载当前选择项？"
-              ok-text="是"
-              cancel-text="否"
-              @confirm="downloadFun"
-            >
-              <a-button type="link"
-                ><i class="icon-xiazai-wenjianxiazai-16 iconfont"></i>批量下载</a-button
-              >
+            <a-popconfirm title="确定批量下载当前选择项？" ok-text="是" cancel-text="否" @confirm="downloadFun">
+              <a-button type="link"><i class="icon-xiazai-wenjianxiazai-16 iconfont"></i>批量下载</a-button>
             </a-popconfirm>
           </template>
           <template v-if="taskType === 'DRAFT'">
-            <a-popconfirm
-              title="确定计算当前选择项？"
-              ok-text="是"
-              cancel-text="否"
-              @confirm="laraPaperCalc"
-            >
+            <a-popconfirm title="确定计算当前选择项？" ok-text="是" cancel-text="否" @confirm="laraPaperCalc">
               <a-button type="link"><i class="iconfont icon-52"></i>页数计算</a-button>
             </a-popconfirm>
           </template>
           <template v-if="taskType === 'WAIT_BC'">
-            <a-button @click="openFile" type="link"
-              ><i class="iconfont icon-52"></i>上传BC并放舱</a-button
-            >
+            <a-button @click="openFile" type="link"><i class="iconfont icon-52"></i>上传BC并放舱</a-button>
           </template>
           <template v-if="taskType === 'ORIGINAL_DOWN'">
-            <a-popconfirm
-              title="确定COPY打印当前选择项？"
-              ok-text="是"
-              cancel-text="否"
-              @confirm="copyPrintFun"
-            >
+            <a-popconfirm title="确定COPY打印当前选择项？" ok-text="是" cancel-text="否" @confirm="copyPrintFun">
               <a-button type="link"><i class="iconfont icon-weibiaoti--"></i>COPY打印</a-button>
             </a-popconfirm>
-            <a-popconfirm
-              title="确定COPY打印当前选择项？"
-              ok-text="是"
-              cancel-text="否"
-              @confirm="copyDownloadFun"
-            >
-              <a-button type="link"
-                ><i class="iconfont icon-xiazai-wenjianxiazai-13"></i>COPY下载</a-button
-              >
+            <a-popconfirm title="确定COPY打印当前选择项？" ok-text="是" cancel-text="否" @confirm="copyDownloadFun">
+              <a-button type="link"><i class="iconfont icon-xiazai-wenjianxiazai-13"></i>COPY下载</a-button>
             </a-popconfirm>
-            <a-popconfirm
-              title="确定正本下载当前选择项？"
-              ok-text="是"
-              cancel-text="否"
-              @confirm="printBatchFun"
-            >
+            <a-popconfirm title="确定正本下载当前选择项？" ok-text="是" cancel-text="否" @confirm="printBatchFun">
               <a-button type="link"><i class="iconfont icon-xiazai"></i>正本下载</a-button>
             </a-popconfirm>
-            <a-popconfirm
-              title="确定登记当前选择项？"
-              ok-text="是"
-              cancel-text="否"
-              @confirm="laraPaperRegistFun"
-            >
+            <a-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
-            >
+            <a-button type="link" @click="laraRecordFun"><i class="iconfont icon-touzijilu"></i>LARA记录</a-button>
           </template>
         </template>
         <template #toolbar>
-          <a-button type="link" @click="openCustom"
-            ><i class="icon-shuliebiao iconfont"></i>列设置</a-button
-          >
+          <a-button type="link" @click="openCustom"><i class="icon-shuliebiao iconfont"></i>列设置</a-button>
         </template>
         <template v-slot:bodyCell="{ column, record }">
           <template v-if="column.key === 'iS_EXCEPT'">
@@ -322,36 +215,24 @@
                         <span class="task-tit" @click="changePage(record)">{{ record.tasK_TITLE }}</span>
                     </template> -->
           <template v-if="column.key === 'action'">
-            <TableAction
-              :actions="[
-                {
-                  icon: 'clarity:note-edit-line',
-                  tooltip: '编辑',
-                  onClick: () => {
-                    handleEdit(record)
-                  },
+            <TableAction :actions="[
+              {
+                icon: 'clarity:note-edit-line',
+                tooltip: '编辑',
+                onClick: () => {
+                  handleEdit(record)
                 },
-              ]"
-            />
+              },
+            ]" />
           </template>
         </template>
       </BasicTable>
     </div>
-    <a-modal
-      title="提示信息"
-      width="900px"
-      :visible="bcFileFlag"
-      :footer="null"
-      @cancel="bcFileFlag = false"
-    >
+    <a-modal title="提示信息" width="900px" :visible="bcFileFlag" :footer="null" @cancel="bcFileFlag = false">
       <div class="bcfile-title" style="margin-top: 20px">
         <div>
-          <i
-            class="icon-fuzhi4 iconfont"
-            title="复制"
-            style="margin-right: 10px; cursor: pointer"
-            @click="handleCopy"
-          ></i>
+          <i class="icon-fuzhi4 iconfont" title="复制" style="margin-right: 10px; cursor: pointer"
+            @click="handleCopy"></i>
           时间{{ bcFile.executeTime }}
         </div>
         <span> {{ bcFile.batchTotal }}</span>
@@ -364,922 +245,918 @@
       </div>
       <div v-else>{{ bcFile.msg }}</div>
     </a-modal>
-    <a-modal
-      @cancel="UserVisible = false"
-      :visible="UserVisible"
-      title="转移任务"
-      @ok="UserhandleOk"
-    >
+    <a-modal @cancel="UserVisible = false" :visible="UserVisible" title="转移任务" @ok="UserhandleOk">
       <a-spin :spinning="userLoad">
         <div style="margin: 15px 0">接收人</div>
-        <a-select
-          mode="multiple"
-          show-search
-          style="width: 100%; margin-bottom: 30px"
-          :filter-option="false"
-          @search="handleSearch"
-          v-model:value="UserId"
-        >
-          <a-select-option
-            v-for="item in UserList"
-            :label="item.label"
-            :key="item.value"
-            :value="item.value"
-          >
+        <a-select mode="multiple" show-search style="width: 100%; margin-bottom: 30px" :filter-option="false"
+          @search="handleSearch" v-model:value="UserId">
+          <a-select-option v-for="item in UserList" :label="item.label" :key="item.value" :value="item.value">
             {{ item.label }}
           </a-select-option>
         </a-select>
       </a-spin>
     </a-modal>
-    <a-modal
-      @cancel="fileFlag = false"
-      :visible="fileFlag"
-      title="上传BC并放舱"
-      @ok="handleSaveFile"
-    >
+    <a-modal @cancel="fileFlag = false" :visible="fileFlag" title="上传BC并放舱" @ok="handleSaveFile">
       <div style="margin: 15px 0">
         <a-spin :spinning="fileLoad">
           <BasicForm @register="registerForm" />
-          <a-upload
-            :file-list="upFileList"
-            :before-upload="beforeUpload"
-            :max-count="1"
-            accept=".xlsm,.xlsx,.xls,.pdf,.txt,.pms,.jpeg,.png"
-            :rules="[{ required: true, message: '请上传文件！' }]"
-            @remove="handleRemove"
-          >
+          <a-upload :file-list="upFileList" :before-upload="beforeUpload" :max-count="1"
+            accept=".xlsm,.xlsx,.xls,.pdf,.txt,.pms,.jpeg,.png" :rules="[{ required: true, message: '请上传文件！' }]"
+            @remove="handleRemove">
             <a-button style="margin-top: 15px">
-              <span
-                class="iconfont icon-shujushangchuan-shixin"
-                :style="{ fontSize: '12px', marginRight: '5px' }"
-              ></span>
+              <span class="iconfont icon-shujushangchuan-shixin"
+                :style="{ fontSize: '12px', marginRight: '5px' }"></span>
               选择文件
             </a-button>
           </a-upload>
         </a-spin>
       </div>
     </a-modal>
-    <a-modal
-      width="800px"
-      @cancel="customFlag = false"
-      :visible="customFlag"
-      title="任务自定义列"
-      :footer="null"
-    >
+    <a-modal width="800px" @cancel="customFlag = false" :visible="customFlag" title="任务自定义列" :footer="null">
       <taskCustom @handleSuccess="handleSuccess" ref="taskCustomRef"></taskCustom>
     </a-modal>
   </div>
 </template>
 <script lang="ts" setup name="任务台账">
-  import { ref, onMounted, watch, onActivated } from 'vue'
-  import { formatParams } from '/@/hooks/web/common'
-  import { searchFormSchema, fileForm } from './columns'
-  import { BasicTable, useTable, TableAction } from '/@/components/Table'
-  import { GetUserTaskPlatFieldSet } from './api'
-  import { ApiGet } from '/@/views/baseinfo/infoclient/ClientStakeholder/api'
-  import { useMessage } from '../../hooks/web/useMessage'
-  import { useRoute, useRouter } from 'vue-router'
-  import { useOptionsStore } from '/@/store/modules/options'
-  import { BasicForm, useForm } from '/@/components/Form/index'
-  import { useUserStore } from '/@/store/modules/user'
-  import taskCustom from './taskList/taskCustom.vue'
-  const userStore = useUserStore()
-  const optionsStore = useOptionsStore()
-  const { createMessage } = useMessage()
-  const route = useRoute()
-  const router = useRouter()
-  import {
-    GetCurrentTotalStat,
-    GetPageAsync,
-    TaskManageTruckGetInfoByTaskId,
-    TaskManageTruckPrintTemplateWithHistoryList,
-    TaskManageTruckPrint,
-    TaskManageTruckSendDispatchBatchByTask,
-    TaskManageTruckCancelDispatchBatchByTask,
-    UploadBcThenRunTask,
-    CancelTask,
-    CompleteTask,
-    DownloadTaskAttach,
-    PullTask,
-    SetTaskOwner,
-    LaraPaperCalc,
-    PrintBatch,
-    DownloadAttach,
-    DownloadOriginalTask,
-    ManualReCompareBC,
-    GetUserListAll,
-  } from './api'
-  import { useGo } from '/@/hooks/web/usePage'
-  const go = useGo()
-  onMounted(() => {
-    getCurrentTotalStat('')
-    getSetColumns('BASIC')
-    setProps({
-      rowSelection: {
-        onChange: onSelectChange,
-        fixed: true,
-      },
-    })
-  })
-  const [
-    registerForm,
-    {
-      getFieldsValue: getFieldsValueL,
-      validateFields: validateFieldsL,
-      updateSchema: updateSchemaL,
-      setFieldsValue: setFieldsValueL,
+import { ref, onMounted, watch, onActivated } from 'vue'
+import { formatParams } from '/@/hooks/web/common'
+import { searchFormSchema, fileForm } from './columns'
+import { BasicTable, useTable, TableAction } from '/@/components/Table'
+import { GetUserTaskPlatFieldSet } from './api'
+import { ApiGet } from '/@/views/baseinfo/infoclient/ClientStakeholder/api'
+import { useMessage } from '../../hooks/web/useMessage'
+import { useRoute, useRouter } from 'vue-router'
+import { useOptionsStore } from '/@/store/modules/options'
+import { BasicForm, useForm } from '/@/components/Form/index'
+import { useUserStore } from '/@/store/modules/user'
+import taskCustom from './taskList/taskCustom.vue'
+const userStore = useUserStore()
+const optionsStore = useOptionsStore()
+const { createMessage } = useMessage()
+const route = useRoute()
+const router = useRouter()
+import {
+  GetCurrentTotalStat,
+  GetPageAsync,
+  TaskManageTruckGetInfoByTaskId,
+  TaskManageTruckPrintTemplateWithHistoryList,
+  TaskManageTruckPrint,
+  TaskManageTruckSendDispatchBatchByTask,
+  TaskManageTruckCancelDispatchBatchByTask,
+  UploadBcThenRunTask,
+  CancelTask,
+  CompleteTask,
+  DownloadTaskAttach,
+  PullTask,
+  SetTaskOwner,
+  LaraPaperCalc,
+  PrintBatch,
+  DownloadAttach,
+  DownloadOriginalTask,
+  ManualReCompareBC,
+  GetUserListAll,
+} from './api'
+import { useGo } from '/@/hooks/web/usePage'
+const go = useGo()
+onMounted(() => {
+  getCurrentTotalStat('')
+  getSetColumns('BASIC')
+  setProps({
+    rowSelection: {
+      onChange: onSelectChange,
+      fixed: true,
     },
-  ] = useForm({
-    labelWidth: 100,
-    schemas: fileForm,
-    showActionButtonGroup: false,
   })
-  const upFileList = ref([]) as any
-  function beforeUpload(file, fileList) {
-    upFileList.value = [file]
-    return false
+})
+const [
+  registerForm,
+  {
+    getFieldsValue: getFieldsValueL,
+    validateFields: validateFieldsL,
+    updateSchema: updateSchemaL,
+    setFieldsValue: setFieldsValueL,
+  },
+] = useForm({
+  labelWidth: 100,
+  schemas: fileForm,
+  showActionButtonGroup: false,
+})
+const upFileList = ref([]) as any
+function beforeUpload(file, fileList) {
+  upFileList.value = [file]
+  return false
+}
+const customFlag = ref(false)
+function onSelectChange(selectedRowKeys) { }
+function handleSuccess() {
+  customFlag.value = false
+  if (taskType.value) {
+    getSetColumns(taskType.value)
+  } else {
+    getSetColumns('BASIC')
   }
-  const customFlag = ref(false)
-  function onSelectChange(selectedRowKeys) {}
-  function handleSuccess() {
-    customFlag.value = false
-    if (taskType.value) {
-      getSetColumns(taskType.value)
-    } else {
-      getSetColumns('BASIC')
-    }
+}
+function handleRemove(file: any) {
+  const index = upFileList.value.indexOf(file)
+  const newFileList = upFileList.value.slice()
+  newFileList.splice(index, 1)
+  upFileList.value = newFileList
+}
+router.afterEach((to, from) => {
+  if (to.fullPath === '/taskmanage') {
+    refshTotalStat()
+  }
+})
+const underlingTaskScope = ref('')
+const fileLoad = ref(false)
+function handleSaveFile() {
+  if (!getFieldsValueL().carrierId) {
+    createMessage.warning('请选择船公司')
+    return false
   }
-  function handleRemove(file: any) {
-    const index = upFileList.value.indexOf(file)
-    const newFileList = upFileList.value.slice()
-    newFileList.splice(index, 1)
-    upFileList.value = newFileList
+  if (upFileList.value.length == 0) {
+    createMessage.warning('请选择文件')
+    return false
   }
-  router.afterEach((to, from) => {
-    if (to.fullPath === '/taskmanage') {
-      refshTotalStat()
-    }
+  fileLoad.value = true
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
   })
-  const underlingTaskScope = ref('')
-  const fileLoad = ref(false)
-  function handleSaveFile() {
-    if (!getFieldsValueL().carrierId) {
-      createMessage.warning('请选择船公司')
-      return false
-    }
-    if (upFileList.value.length == 0) {
-      createMessage.warning('请选择文件')
-      return false
-    }
-    fileLoad.value = true
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
+  const postData = new FormData()
+  postData.append('file', upFileList.value[0])
+  UploadBcThenRunTask(postData, getFieldsValueL().carrierCode, pkIdArr[0])
+    .then((res) => {
+      fileLoad.value = false
+      if (res.succeeded) {
+        createMessage.success(res.message)
+        fileFlag.value = false
+      }
     })
-    const postData = new FormData()
-    postData.append('file', upFileList.value[0])
-    UploadBcThenRunTask(postData, getFieldsValueL().carrierCode, pkIdArr[0])
-      .then((res) => {
-        fileLoad.value = false
-        if (res.succeeded) {
-          createMessage.success(res.message)
-          fileFlag.value = false
-        }
-      })
-      .catch((err) => {
-        fileLoad.value = false
-      })
-  }
-  const levelreLoading = ref(false)
-  const levelLoading = ref(false)
-  const fileFlag = ref(false)
-  const levelTop = ref([]) as any //顶层tab
-  const levelNext = ref([]) as any //二级tab分类
-  const levelTree = ref([]) as any //详细任务类型
-  const levelNextAll = ref([]) as any
-  const levelTreeAll = ref([]) as any
-  const taskType = ref('') //任务类型
-  const activeTopKey = ref('') //顶层tab key
-  const activeNextKey = ref('') //二级tab分类 key
-  const activeTreeKey = ref([]) //详细任务类型 key
-  // 根据接口获取相应数据 以及处理数据和key
-  function getCurrentTotalStat(type) {
-    levelreLoading.value = true
-    levelLoading.value = true
-    levelTop.value = []
-    levelNextAll.value = []
-    levelNext.value = []
-    levelTreeAll.value = []
-    levelTree.value = []
-    let bussObj = ''
-    let str1 = ''
-    let str2 = ''
-    let queryData = formatParams(getForm().getFieldsValue()).queryCondition
-    if (queryData) {
-      queryData = JSON.parse(queryData)
-      let i = queryData.length
-      while (i--) {
-        if (queryData[i].FieldName === 'businessNo') {
-          bussObj = queryData[i].FieldValue
-          queryData.splice(i, 1)
-        } else if (queryData[i].FieldName === 'portloaD_CODE') {
-          str1 = queryData[i].FieldValue
-          queryData.splice(i, 1)
-        } else if (queryData[i].FieldName === 'portdischargE_CODE') {
-          str2 = queryData[i].FieldValue
-          queryData.splice(i, 1)
-        }
+    .catch((err) => {
+      fileLoad.value = false
+    })
+}
+const levelreLoading = ref(false)
+const levelLoading = ref(false)
+const fileFlag = ref(false)
+const levelTop = ref([]) as any //顶层tab
+const levelNext = ref([]) as any //二级tab分类
+const levelTree = ref([]) as any //详细任务类型
+const levelNextAll = ref([]) as any
+const levelTreeAll = ref([]) as any
+const taskType = ref('') //任务类型
+const activeTopKey = ref('') //顶层tab key
+const activeNextKey = ref('') //二级tab分类 key
+const activeTreeKey = ref([]) //详细任务类型 key
+// 根据接口获取相应数据 以及处理数据和key
+function getCurrentTotalStat(type) {
+  levelreLoading.value = true
+  levelLoading.value = true
+  levelTop.value = []
+  levelNextAll.value = []
+  levelNext.value = []
+  levelTreeAll.value = []
+  levelTree.value = []
+  let bussObj = ''
+  let str1 = ''
+  let str2 = ''
+  let queryData = formatParams(getForm().getFieldsValue()).queryCondition
+  if (queryData) {
+    queryData = JSON.parse(queryData)
+    let i = queryData.length
+    while (i--) {
+      if (queryData[i].FieldName === 'businessNo') {
+        bussObj = queryData[i].FieldValue
+        queryData.splice(i, 1)
+      } else if (queryData[i].FieldName === 'portloaD_CODE') {
+        str1 = queryData[i].FieldValue
+        queryData.splice(i, 1)
+      } else if (queryData[i].FieldName === 'portdischargE_CODE') {
+        str2 = queryData[i].FieldValue
+        queryData.splice(i, 1)
       }
     }
-    const data = {
-      isReCalc: false,
-      queryCondition: JSON.stringify(queryData),
-      otherQueryCondition: {
-        businessNo: bussObj,
-        portloaD_CODE: str1,
-        portdischargE_CODE: str2,
-      },
-    }
-    if (type == 'refsh') {
-      data.isReCalc = true
-    } else {
-      data.isReCalc = false
-    }
-    GetCurrentTotalStat(data)
-      .then((res) => {
-        levelLoading.value = false
-        levelreLoading.value = false
-        levelTop.value = res.data.levelTop
-        underlingTaskScope.value = res.data.underlingTaskScope
-        levelTop.value = levelTop.value.sort((a, b) => a.sortNo - b.sortNo)
-        levelNextAll.value = res.data.levelNext
-        levelTreeAll.value = res.data.levelTree
-        if (levelTop.value.length > 0) {
-          if(type!='search'){
-            activeTopKey.value = levelTop.value[0].key
-          }
-          levelNext.value = selectNextLevel(levelNextAll.value, activeTopKey.value)
-          if (levelNext.value.length > 0) {
-            if (!activeNextKey.value) {
-              activeNextKey.value = levelNext.value[0].key
-              getForm().setFieldsValue({ status: activeNextKey.value })
-            }
-            levelTree.value = selectTreeLevel(
-              levelTreeAll.value,
-              activeNextKey.value,
-              activeTopKey.value,
-            )
-          }
-        }
-        activeTreeKey.value = []
-        taskType.value = ''
-        reload()
-      })
-      .catch((err) => {
-        levelLoading.value = false
-        levelreLoading.value = false
-      })
   }
-
-  function openFile() {
-    const select = getSelectRows()
-    if (select.length == 0) {
-      createMessage.warning('请选择任务')
-      return false
-    }
-    if (select.length > 1) {
-      createMessage.warning('只能选择一条任务')
-      return false
-    }
-    fileFlag.value = true
+  const data = {
+    isReCalc: false,
+    queryCondition: JSON.stringify(queryData),
+    otherQueryCondition: {
+      businessNo: bussObj,
+      portloaD_CODE: str1,
+      portdischargE_CODE: str2,
+    },
   }
-
-  function refshTotalStat() {
-    levelreLoading.value = true
-    levelLoading.value = true
-    let bussObj = ''
-    let str1 = ''
-    let str2 = ''
-    let queryData = formatParams(getForm().getFieldsValue()).queryCondition
-    if (queryData) {
-      queryData = JSON.parse(queryData)
-      let i = queryData.length
-      while (i--) {
-        if (queryData[i].FieldName === 'businessNo') {
-          bussObj = queryData[i].FieldValue
-          queryData.splice(i, 1)
-        } else if (queryData[i].FieldName === 'portloaD_CODE') {
-          str1 = queryData[i].FieldValue
-          queryData.splice(i, 1)
-        } else if (queryData[i].FieldName === 'portdischargE_CODE') {
-          str2 = queryData[i].FieldValue
-          queryData.splice(i, 1)
+  if (type == 'refsh') {
+    data.isReCalc = true
+  } else {
+    data.isReCalc = false
+  }
+  GetCurrentTotalStat(data)
+    .then((res) => {
+      levelLoading.value = false
+      levelreLoading.value = false
+      levelTop.value = res.data.levelTop
+      underlingTaskScope.value = res.data.underlingTaskScope
+      levelTop.value = levelTop.value.sort((a, b) => a.sortNo - b.sortNo)
+      levelNextAll.value = res.data.levelNext
+      levelTreeAll.value = res.data.levelTree
+      if (levelTop.value.length > 0) {
+        if (type != 'search') {
+          activeTopKey.value = levelTop.value[0].key
         }
-      }
-    }
-    GetCurrentTotalStat({
-      isReCalc: false,
-      queryCondition: JSON.stringify(queryData),
-      otherQueryCondition: {
-        businessNo: bussObj,
-        portloaD_CODE: str1,
-        portdischargE_CODE: str2,
-      },
-    })
-      .then((res) => {
-        levelLoading.value = false
-        levelreLoading.value = false
-        levelTop.value = res.data.levelTop
-        underlingTaskScope.value = res.data.underlingTaskScope
-        levelTop.value = levelTop.value.sort((a, b) => a.sortNo - b.sortNo)
-        levelNextAll.value = res.data.levelNext
-        levelTreeAll.value = res.data.levelTree
-        levelTree.value = selectTreeLevel(
-          levelTreeAll.value,
-          activeNextKey.value,
-          activeTopKey.value,
-        )
-        levelTree.value.map((item, index) => {
-          if (item.key === taskType.value) {
-            item.active = true
+        levelNext.value = selectNextLevel(levelNextAll.value, activeTopKey.value)
+        if (levelNext.value.length > 0) {
+          if (!activeNextKey.value) {
+            activeNextKey.value = levelNext.value[0].key
+            getForm().setFieldsValue({ status: activeNextKey.value })
           }
-        })
-        reload()
-      })
-      .catch((err) => {
-        levelLoading.value = false
-        levelreLoading.value = false
-      })
-  }
-  function selectNextLevel(list, key) {
-    const arr = [] as any
-    list.map((item, index) => {
-      if (item.topKey === key) {
-        arr.push(item)
-      }
-    })
-    return arr
-  }
-
-  //转移任务
-  const UserVisible = ref(false)
-  const UserList = ref([]) as any
-  const UserId = ref([])
-  const userLoad = ref(false)
-
-  function UserhandleOk() {
-    if (UserId.value.length === 0) {
-      createMessage.error('请选择转移人')
-      return false
-    }
-    const arr = [] as any
-    UserList.value.forEach((item) => {
-      UserId.value.forEach((ite) => {
-        if (item.value == ite) {
-          arr.push({
-            recvUserId: item.value,
-            recvUserName: item.label,
-          })
+          levelTree.value = selectTreeLevel(
+            levelTreeAll.value,
+            activeNextKey.value,
+            activeTopKey.value,
+          )
         }
-      })
-    })
-    const select = getSelectRows()
-    let queryStr = ''
-    select.forEach((item, index) => {
-      if (index === 0) {
-        queryStr += 'taskIds=' + item.id
-      } else {
-        queryStr += '&taskIds=' + item.id
       }
+      activeTreeKey.value = []
+      taskType.value = ''
+      reload()
     })
-    userLoad.value = true
-    SetTaskOwner(arr, queryStr).then((res) => {
-      if (res.succeeded) {
-        createMessage.success(res.message)
-        UserVisible.value = false
-      } else {
-        createMessage.error(res.message)
-      }
-      userLoad.value = false
+    .catch((err) => {
+      levelLoading.value = false
+      levelreLoading.value = false
     })
+}
+
+function openFile() {
+  const select = getSelectRows()
+  if (select.length == 0) {
+    createMessage.warning('请选择任务')
+    return false
   }
-  const taskCustomRef = ref()
-  function openCustom() {
-    customFlag.value = true
-    setTimeout(() => {
-      taskCustomRef.value.init()
-    }, 50)
+  if (select.length > 1) {
+    createMessage.warning('只能选择一条任务')
+    return false
   }
-  function openUser() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
-    })
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
+  fileFlag.value = true
+}
+
+function refshTotalStat() {
+  levelreLoading.value = true
+  levelLoading.value = true
+  let bussObj = ''
+  let str1 = ''
+  let str2 = ''
+  let queryData = formatParams(getForm().getFieldsValue()).queryCondition
+  if (queryData) {
+    queryData = JSON.parse(queryData)
+    let i = queryData.length
+    while (i--) {
+      if (queryData[i].FieldName === 'businessNo') {
+        bussObj = queryData[i].FieldValue
+        queryData.splice(i, 1)
+      } else if (queryData[i].FieldName === 'portloaD_CODE') {
+        str1 = queryData[i].FieldValue
+        queryData.splice(i, 1)
+      } else if (queryData[i].FieldName === 'portdischargE_CODE') {
+        str2 = queryData[i].FieldValue
+        queryData.splice(i, 1)
+      }
     }
-    GetUserListAll({ queryKey: '' }).then((res) => {
-      UserList.value = res.data
-    })
-    UserId.value = []
-    UserVisible.value = true
-  }
-
-  function filterOption(input, option) {
-    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
   }
-  // 点击顶层切换
-  function changeTopLevel() {
-    levelNext.value = selectNextLevel(levelNextAll.value, activeTopKey.value)
-    activeNextKey.value = levelNext.value[0].key
-    levelTree.value = selectTreeLevel(levelTreeAll.value, activeNextKey.value, activeTopKey.value)
-    activeTreeKey.value = []
-    taskType.value = ''
-    levelTree.value.forEach((item) => {
-      item.active = false
+  GetCurrentTotalStat({
+    isReCalc: false,
+    queryCondition: JSON.stringify(queryData),
+    otherQueryCondition: {
+      businessNo: bussObj,
+      portloaD_CODE: str1,
+      portdischargE_CODE: str2,
+    },
+  })
+    .then((res) => {
+      levelLoading.value = false
+      levelreLoading.value = false
+      levelTop.value = res.data.levelTop
+      underlingTaskScope.value = res.data.underlingTaskScope
+      levelTop.value = levelTop.value.sort((a, b) => a.sortNo - b.sortNo)
+      levelNextAll.value = res.data.levelNext
+      levelTreeAll.value = res.data.levelTree
+      levelTree.value = selectTreeLevel(
+        levelTreeAll.value,
+        activeNextKey.value,
+        activeTopKey.value,
+      )
+      levelTree.value.map((item, index) => {
+        if (item.key === taskType.value) {
+          item.active = true
+        }
+      })
+      reload()
     })
-    const arr = [] as any
-    columsAll.value.forEach((item) => {
-      if (item.taskTypeCode === 'BASIC') {
-        JSON.parse(item.content).forEach((item) => {
-          if (item.checked) {
-            arr.push(item)
-          }
-        })
-      }
+    .catch((err) => {
+      levelLoading.value = false
+      levelreLoading.value = false
     })
-    setColumns(arr)
-    reload()
+}
+function selectNextLevel(list, key) {
+  const arr = [] as any
+  list.map((item, index) => {
+    if (item.topKey === key) {
+      arr.push(item)
+    }
+  })
+  return arr
+}
+
+//转移任务
+const UserVisible = ref(false)
+const UserList = ref([]) as any
+const UserId = ref([])
+const userLoad = ref(false)
+
+function UserhandleOk() {
+  if (UserId.value.length === 0) {
+    createMessage.error('请选择转移人')
+    return false
   }
-
-  // 点击二层切换
-  function changeNextLevel() {
-    levelTree.value = selectTreeLevel(levelTreeAll.value, activeNextKey.value, activeTopKey.value)
-    activeTreeKey.value = []
-    getForm().setFieldsValue({ status: activeNextKey.value })
-    taskType.value = ''
-    levelTree.value.forEach((item) => {
-      item.active = false
-    })
-    const arr = [] as any
-    columsAll.value.forEach((item) => {
-      if (item.taskTypeCode === 'BASIC') {
-        JSON.parse(item.content).forEach((item) => {
-          if (item.checked) {
-            arr.push(item)
-          }
+  const arr = [] as any
+  UserList.value.forEach((item) => {
+    UserId.value.forEach((ite) => {
+      if (item.value == ite) {
+        arr.push({
+          recvUserId: item.value,
+          recvUserName: item.label,
         })
       }
     })
-    setColumns(arr)
-    reload()
-  }
-  function selectTreeLevel(list, key, topKey) {
-    const arr = [] as any
-    list.map((item, index) => {
-      if (item.nextKey === key && item.topKey === topKey) {
-        arr.push(item)
-      }
-    })
-    return arr
+  })
+  const select = getSelectRows()
+  let queryStr = ''
+  select.forEach((item, index) => {
+    if (index === 0) {
+      queryStr += 'taskIds=' + item.id
+    } else {
+      queryStr += '&taskIds=' + item.id
+    }
+  })
+  userLoad.value = true
+  SetTaskOwner(arr, queryStr).then((res) => {
+    if (res.succeeded) {
+      createMessage.success(res.message)
+      UserVisible.value = false
+    } else {
+      createMessage.error(res.message)
+    }
+    userLoad.value = false
+  })
+}
+const taskCustomRef = ref()
+function openCustom() {
+  customFlag.value = true
+  setTimeout(() => {
+    taskCustomRef.value.init()
+  }, 50)
+}
+function openUser() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
   }
-
-  const columns = [
-    { dataIndex: 'tasK_TYPE_NAME', 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_NAME', width: 100, title: '任务状态' },
-    { dataIndex: 'tasK_USER_STATUS_NAME', width: 120, title: '任务个人状态' },
-    { dataIndex: 'vesseL_VOYNO', width: 180, title: '船名/航次' },
-    { dataIndex: 'carrieR_CODE', width: 100, title: '船公司' },
-    { dataIndex: 'tasK_NO', width: 150, title: '任务流水号' },
-    { dataIndex: 'tasK_SOURCE_NAME', width: 100, title: '任务来源' },
-    { dataIndex: 'createUserName', width: 100, title: '接收人' },
-    { dataIndex: 'completE_DEAL_NAME', width: 100, title: '完成方式' },
-  ]
-  const [registerTable, { reload, setProps, getForm, getSelectRows, setColumns }] = useTable({
-    api: async (p) => {
-      const res: API.DataResult = await GetPageAsync(p)
-      console.log(res)
-      return new Promise((resolve) => {
-        res.data.forEach((item) => {
-          if (item.recvUserList) {
-            item.recvUserListName = item.recvUserList.map((ite) => ite.recvUserName).join(' / ')
-          }
-        })
-        resolve({
-          data: res.data,
-          total: res.count,
-        })
-      })
-    },
-    beforeFetch: (p) => {
-      const data = {} as any
-      const queryData = JSON.parse(formatParams(p).queryCondition)
-      data.pageCondition = formatParams(p).pageCondition
-      let bussObj = '' as any
-      let str1 = '' as any
-      let str2 = '' as any
-      for (let i = 0; i < queryData.length; i++) {
-        if (queryData[i].FieldName === 'task_TYPE') {
-          queryData[i].ConditionalType = 0
-        }
-        if (queryData[i].FieldName === 'taskRecvName') {
-          queryData[i].ConditionalType = 0
-        }
-        if (queryData[i].FieldName === 'taskSource') {
-          queryData[i].ConditionalType = 0
-        }
-        if (queryData[i].FieldName === 'customerId') {
-          queryData[i].ConditionalType = 0
-        }
-        if (queryData[i].FieldName === 'operatorId') {
-          queryData[i].ConditionalType = 0
-        }
-        if (queryData[i].FieldName === 'saleId') {
-          queryData[i].ConditionalType = 0
+  GetUserListAll({ queryKey: '' }).then((res) => {
+    UserList.value = res.data
+  })
+  UserId.value = []
+  UserVisible.value = true
+}
+
+function filterOption(input, option) {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+}
+// 点击顶层切换
+function changeTopLevel() {
+  levelNext.value = selectNextLevel(levelNextAll.value, activeTopKey.value)
+  activeNextKey.value = levelNext.value[0].key
+  levelTree.value = selectTreeLevel(levelTreeAll.value, activeNextKey.value, activeTopKey.value)
+  activeTreeKey.value = []
+  taskType.value = ''
+  levelTree.value.forEach((item) => {
+    item.active = false
+  })
+  const arr = [] as any
+  columsAll.value.forEach((item) => {
+    if (item.taskTypeCode === 'BASIC') {
+      JSON.parse(item.content).forEach((item) => {
+        if (item.checked) {
+          arr.push(item)
         }
-        if (queryData[i].FieldName === 'customerService') {
-          queryData[i].ConditionalType = 0
+      })
+    }
+  })
+  if (arr.length == 0) {
+    setColumns(columns)
+  } else {
+    setColumns(arr)
+  }
+  reload()
+}
+
+// 点击二层切换
+function changeNextLevel() {
+  levelTree.value = selectTreeLevel(levelTreeAll.value, activeNextKey.value, activeTopKey.value)
+  activeTreeKey.value = []
+  getForm().setFieldsValue({ status: activeNextKey.value })
+  taskType.value = ''
+  levelTree.value.forEach((item) => {
+    item.active = false
+  })
+  const arr = [] as any
+  columsAll.value.forEach((item) => {
+    if (item.taskTypeCode === 'BASIC') {
+      JSON.parse(item.content).forEach((item) => {
+        if (item.checked) {
+          arr.push(item)
         }
-      }
-      let i = queryData.length
-      while (i--) {
-        if (queryData[i].FieldName === 'businessNo') {
-          bussObj = queryData[i].FieldValue
-          queryData.splice(i, 1)
-        } else if (queryData[i].FieldName === 'portloaD_CODE') {
-          str1 = queryData[i].FieldValue
-          queryData.splice(i, 1)
-        } else if (queryData[i].FieldName === 'portdischargE_CODE') {
-          str2 = queryData[i].FieldValue
-          queryData.splice(i, 1)
+      })
+    }
+  })
+  if (arr.length == 0) {
+    setColumns(columns)
+  } else {
+    setColumns(arr)
+  }
+  reload()
+}
+function selectTreeLevel(list, key, topKey) {
+  const arr = [] as any
+  list.map((item, index) => {
+    if (item.nextKey === key && item.topKey === topKey) {
+      arr.push(item)
+    }
+  })
+  return arr
+}
+
+const columns = [
+  { dataIndex: 'tasK_TYPE_NAME', 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_NAME', width: 100, title: '任务状态' },
+  { dataIndex: 'tasK_USER_STATUS_NAME', width: 120, title: '任务个人状态' },
+  { dataIndex: 'vesseL_VOYNO', width: 180, title: '船名/航次' },
+  { dataIndex: 'carrieR_CODE', width: 100, title: '船公司' },
+  { dataIndex: 'tasK_NO', width: 150, title: '任务流水号' },
+  { dataIndex: 'tasK_SOURCE_NAME', width: 100, title: '任务来源' },
+  { dataIndex: 'createUserName', width: 100, title: '接收人' },
+  { dataIndex: 'completE_DEAL_NAME', width: 100, title: '完成方式' },
+]
+const [registerTable, { reload, setProps, getForm, getSelectRows, setColumns }] = useTable({
+  api: async (p) => {
+    const res: API.DataResult = await GetPageAsync(p)
+    console.log(res)
+    return new Promise((resolve) => {
+      res.data.forEach((item) => {
+        if (item.recvUserList) {
+          item.recvUserListName = item.recvUserList.map((ite) => ite.recvUserName).join(' / ')
         }
+      })
+      resolve({
+        data: res.data,
+        total: res.count,
+      })
+    })
+  },
+  beforeFetch: (p) => {
+    const data = {} as any
+    const queryData = JSON.parse(formatParams(p).queryCondition)
+    data.pageCondition = formatParams(p).pageCondition
+    let bussObj = '' as any
+    let str1 = '' as any
+    let str2 = '' as any
+    for (let i = 0; i < queryData.length; i++) {
+      if (queryData[i].FieldName === 'task_TYPE') {
+        queryData[i].ConditionalType = 0
       }
-      data.queryCondition = JSON.stringify(queryData)
-      data.otherQueryCondition = {}
-      if (activeTopKey.value) {
-        data.otherQueryCondition.taskCategory = activeTopKey.value
+      if (queryData[i].FieldName === 'taskRecvName') {
+        queryData[i].ConditionalType = 0
       }
-      if (underlingTaskScope.value) {
-        data.otherQueryCondition.underlingTaskScope = underlingTaskScope.value
+      if (queryData[i].FieldName === 'taskSource') {
+        queryData[i].ConditionalType = 0
       }
-      if (activeNextKey.value) {
-        data.otherQueryCondition.status = activeNextKey.value
+      if (queryData[i].FieldName === 'customerId') {
+        queryData[i].ConditionalType = 0
       }
-      if (taskType.value) {
-        data.otherQueryCondition.taskType = taskType.value
+      if (queryData[i].FieldName === 'operatorId') {
+        queryData[i].ConditionalType = 0
       }
-      if (bussObj) {
-        data.otherQueryCondition.businessNo = bussObj
+      if (queryData[i].FieldName === 'saleId') {
+        queryData[i].ConditionalType = 0
       }
-      if (str1) {
-        data.otherQueryCondition.portloaD_CODE = str1
+      if (queryData[i].FieldName === 'customerService') {
+        queryData[i].ConditionalType = 0
       }
-      if (str2) {
-        data.otherQueryCondition.portdischargE_CODE = str2
+    }
+    let i = queryData.length
+    while (i--) {
+      if (queryData[i].FieldName === 'businessNo') {
+        bussObj = queryData[i].FieldValue
+        queryData.splice(i, 1)
+      } else if (queryData[i].FieldName === 'portloaD_CODE') {
+        str1 = queryData[i].FieldValue
+        queryData.splice(i, 1)
+      } else if (queryData[i].FieldName === 'portdischargE_CODE') {
+        str2 = queryData[i].FieldValue
+        queryData.splice(i, 1)
       }
-      return data
-    },
-    immediate: false,
-    columns,
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchFormSchema,
-      submitFunc: handleNext,
-      resetFunc: handleResetFunc,
-    },
-    isTreeTable: false,
-    pagination: true,
-    striped: true,
-    useSearchForm: true,
-    bordered: true,
-    showIndexColumn: true,
-    indexColumnProps: {
-      width: 60,
-    },
-    canResize: true,
-    resizeHeightOffset: 35,
-    actionColumn: {
-      width: 80,
-      title: '操作',
-      dataIndex: 'action',
-      fixed: 'right',
-    },
+    }
+    data.queryCondition = JSON.stringify(queryData)
+    data.otherQueryCondition = {}
+    if (activeTopKey.value) {
+      data.otherQueryCondition.taskCategory = activeTopKey.value
+    }
+    if (underlingTaskScope.value) {
+      data.otherQueryCondition.underlingTaskScope = underlingTaskScope.value
+    }
+    if (activeNextKey.value) {
+      data.otherQueryCondition.status = activeNextKey.value
+    }
+    if (taskType.value) {
+      data.otherQueryCondition.taskType = taskType.value
+    }
+    if (bussObj) {
+      data.otherQueryCondition.businessNo = bussObj
+    }
+    if (str1) {
+      data.otherQueryCondition.portloaD_CODE = str1
+    }
+    if (str2) {
+      data.otherQueryCondition.portdischargE_CODE = str2
+    }
+    return data
+  },
+  immediate: false,
+  columns,
+  formConfig: {
+    labelWidth: 120,
+    schemas: searchFormSchema,
+    submitFunc: handleNext,
+    resetFunc: handleResetFunc,
+  },
+  isTreeTable: false,
+  pagination: true,
+  striped: true,
+  useSearchForm: true,
+  bordered: true,
+  showIndexColumn: true,
+  indexColumnProps: {
+    width: 60,
+  },
+  canResize: true,
+  resizeHeightOffset: 35,
+  actionColumn: {
+    width: 80,
+    title: '操作',
+    dataIndex: 'action',
+    fixed: 'right',
+  },
+})
+function handleSearch(val) {
+  GetUserListAll({ queryKey: val }).then((res) => {
+    UserList.value = res.data
   })
-  function handleSearch(val) {
-    GetUserListAll({ queryKey: val }).then((res) => {
-      UserList.value = res.data
+  console.log(val)
+}
+function handleNext() {
+  activeNextKey.value = ''
+  getCurrentTotalStat('search')
+}
+function handledbclick(row) {
+  handleEdit(row)
+}
+function handleResetFunc() {
+  console.log('handleResetFunc')
+}
+function handleEdit(data) {
+  // 当前用户id
+  const userid = userStore.getUserInfo.userId
+  let statusFlag = false
+  if (data?.recvUserList && data.recvUserList.length) {
+    data.recvUserList.forEach((item) => {
+      if (item.recvUserId == userid) statusFlag = true
     })
-    console.log(val)
   }
-  function handleNext() {
-    activeNextKey.value = ''
-    getCurrentTotalStat('search')
-  }
-  function handledbclick(row) {
-    handleEdit(row)
-  }
-  function handleResetFunc() {
-    console.log('handleResetFunc')
-  }
-  function handleEdit(data) {
-    // 当前用户id
-    const userid = userStore.getUserInfo.userId
-    let statusFlag = false
-    if (data?.recvUserList && data.recvUserList.length) {
-      data.recvUserList.forEach((item) => {
-        if (item.recvUserId == userid) statusFlag = true
-      })
-    }
-    console.log(data, 1111111111)
+  console.log(data, 1111111111)
 
-    switch (data.tasK_TYPE) {
-      case 'VGM_COMPARE':
-        // VGM比对查看页面
-        go({
-          path: '/commontaskmanage/vgmCompare',
-          query: { taskPKId: data.id, type: data.status },
-        })
-        break
-      case 'INVOICE_BILL_MAIL':
-        // 航次账单查看
-        go({
-          path: '/commontaskmanage/invoiceBillMail',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'PER_BILL':
-        // 单票账单查看
-        go({
-          path: '/commontaskmanage/perBill',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'CHANGE_SHIP':
-        // 换船通知查看
-        go({
-          path: '/commontaskmanage/changeShip',
-          query: { taskPKId: data.id, type: 'change' },
-        })
-        break
-      case 'ABORT_CHANGE_SHIP':
-        // 取消换船通知查看
-        go({
-          path: '/commontaskmanage/changeShip',
-          query: { taskPKId: data.id, type: 'abortChange' },
-        })
-        break
-      case 'ORIGINAL_LOST':
-        // 正本缺失查看
-        go({
-          path: '/commontaskmanage/originalLost',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'SI_FEEDBACK':
-        // 订舱详情编辑
-        go({
-          path: '/commontaskmanage/siFeedback',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'TRUCK_DISPATCH':
-        // 派车编辑
-        go({
-          name: 'SendCarAdd',
-          query: { type: 'Edit', taskPKId: data.id },
-        })
-        break
-      case 'BC':
-        // BC编辑
-        go({
-          path: '/commontaskmanage/BcEditing',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'BC_MODIFY':
-        // BC变更 Amendment
-        go({
-          path: '/commontaskmanage/Amendment',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'CANCELLATION':
-        // Cancellation
-        go({
-          path: '/commontaskmanage/Cancellation',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'ROLLING_NOMINATION':
-        // ROLLING_NOMINATION
-        go({
-          path: '/commontaskmanage/rollingNomination',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'VGM_FEEDBACK':
-        // VGM_FEEDBACK
-        go({
-          path: '/commontaskmanage/vgmDetail',
-          query: { taskPKId: data.id, type: 'VGM_FEEDBACK' },
-        })
-        break
-      case 'CAUTION_NOTICE':
-        // CAUTION_NOTICE 重要提醒
-        go({
-          path: '/commontaskmanage/cautionNotice',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'VGM_MISSING':
-        // VGM_MISSING VGM未提交
-        go({
-          path: '/commontaskmanage/vgmDetail',
-          query: { taskPKId: data.id, type: 'VGM_MISSING' },
-        })
-        break
-      case 'CUT_MODIFY':
-        // CUT_MODIFY 截止时间变更
-        go({
-          path: '/commontaskmanage/cutModify',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'POD_DISCHARGE_FULL':
-        //  目的港未提货
-        go({
-          path: '/commontaskmanage/podDischargeFull',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'TRNAS_PLAN_HAS_CHANGE':
-        // 运输计划已变更
-        go({
-          path: '/commontaskmanage/transPlanHasChange',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'DRAFT':
-        // DRAFT
-        go({
-          path: '/commontaskmanage/draft',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'ROUTE_CUT_CHANGE':
-        // 航线截至时间调整
-        go({
-          path: '/commontaskmanage/routeCutChange',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'POD_GATEOUT_FULL':
-        // 目的港未返空箱
-        go({
-          path: '/commontaskmanage/podGateoutFull',
-          query: { taskPKId: data.id },
-        })
-        break
-      case 'INFO_CLIENT_AUDIT':
-        // 客户/供应商审核
+  switch (data.tasK_TYPE) {
+    case 'VGM_COMPARE':
+      // VGM比对查看页面
+      go({
+        path: '/commontaskmanage/vgmCompare',
+        query: { taskPKId: data.id, type: data.status },
+      })
+      break
+    case 'INVOICE_BILL_MAIL':
+      // 航次账单查看
+      go({
+        path: '/commontaskmanage/invoiceBillMail',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'PER_BILL':
+      // 单票账单查看
+      go({
+        path: '/commontaskmanage/perBill',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'CHANGE_SHIP':
+      // 换船通知查看
+      go({
+        path: '/commontaskmanage/changeShip',
+        query: { taskPKId: data.id, type: 'change' },
+      })
+      break
+    case 'ABORT_CHANGE_SHIP':
+      // 取消换船通知查看
+      go({
+        path: '/commontaskmanage/changeShip',
+        query: { taskPKId: data.id, type: 'abortChange' },
+      })
+      break
+    case 'ORIGINAL_LOST':
+      // 正本缺失查看
+      go({
+        path: '/commontaskmanage/originalLost',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'SI_FEEDBACK':
+      // 订舱详情编辑
+      go({
+        path: '/commontaskmanage/siFeedback',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'TRUCK_DISPATCH':
+      // 派车编辑
+      go({
+        name: 'SendCarAdd',
+        query: { type: 'Edit', taskPKId: data.id },
+      })
+      break
+    case 'BC':
+      // BC编辑
+      go({
+        path: '/commontaskmanage/BcEditing',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'BC_MODIFY':
+      // BC变更 Amendment
+      go({
+        path: '/commontaskmanage/Amendment',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'CANCELLATION':
+      // Cancellation
+      go({
+        path: '/commontaskmanage/Cancellation',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'ROLLING_NOMINATION':
+      // ROLLING_NOMINATION
+      go({
+        path: '/commontaskmanage/rollingNomination',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'VGM_FEEDBACK':
+      // VGM_FEEDBACK
+      go({
+        path: '/commontaskmanage/vgmDetail',
+        query: { taskPKId: data.id, type: 'VGM_FEEDBACK' },
+      })
+      break
+    case 'CAUTION_NOTICE':
+      // CAUTION_NOTICE 重要提醒
+      go({
+        path: '/commontaskmanage/cautionNotice',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'VGM_MISSING':
+      // VGM_MISSING VGM未提交
+      go({
+        path: '/commontaskmanage/vgmDetail',
+        query: { taskPKId: data.id, type: 'VGM_MISSING' },
+      })
+      break
+    case 'CUT_MODIFY':
+      // CUT_MODIFY 截止时间变更
+      go({
+        path: '/commontaskmanage/cutModify',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'POD_DISCHARGE_FULL':
+      //  目的港未提货
+      go({
+        path: '/commontaskmanage/podDischargeFull',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'TRNAS_PLAN_HAS_CHANGE':
+      // 运输计划已变更
+      go({
+        path: '/commontaskmanage/transPlanHasChange',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'DRAFT':
+      // DRAFT
+      go({
+        path: '/commontaskmanage/draft',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'ROUTE_CUT_CHANGE':
+      // 航线截至时间调整
+      go({
+        path: '/commontaskmanage/routeCutChange',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'POD_GATEOUT_FULL':
+      // 目的港未返空箱
+      go({
+        path: '/commontaskmanage/podGateoutFull',
+        query: { taskPKId: data.id },
+      })
+      break
+    case 'INFO_CLIENT_AUDIT':
+      // 客户/供应商审核
+      go({
+        path: '/approval-infoclient',
+        query: {
+          id: data.ouT_BS_NO,
+          source: data.tasK_USER_STATUS,
+          taskId: data.id,
+          status: data.tasK_TYPE,
+        },
+      })
+      break
+    case 'CLIENT_STAKEHOLDER_AUDIT':
+      // ouT_BS_NO
+      ApiGet({ id: data.ouT_BS_NO }).then((res) => {
+        // 客户干系人审核
         go({
           path: '/approval-infoclient',
           query: {
-            id: data.ouT_BS_NO,
+            id: res.data.clientId,
             source: data.tasK_USER_STATUS,
-            taskId: data.id,
+            taskId: data.ouT_BS_NO,
             status: data.tasK_TYPE,
           },
         })
-        break
-      case 'CLIENT_STAKEHOLDER_AUDIT':
-        // ouT_BS_NO
-        ApiGet({ id: data.ouT_BS_NO }).then((res) => {
-          // 客户干系人审核
-          go({
-            path: '/approval-infoclient',
-            query: {
-              id: res.data.clientId,
-              source: data.tasK_USER_STATUS,
-              taskId: data.ouT_BS_NO,
-              status: data.tasK_TYPE,
-            },
-          })
-        })
+      })
 
-        break
-      case 'FEE_AUDIT':
-        // 费用审批
-        go({
-          path: '/approve-fee',
-          query: {
-            id: data.ouT_BS_NO,
-            btype: 1
+      break
+    case 'FEE_AUDIT':
+      // 费用审批
+      go({
+        path: '/approve-fee',
+        query: {
+          id: data.ouT_BS_NO,
+          btype: 1
+        }
+      })
+      break
+    case 'WAIT_ORDER_AUDIT':
+    case 'WAIT_BOOKING':
+    case 'WAIT_BC':
+    case 'WAIT_SPACE_RELEASE':
+    case 'WAIT_CANGDAN':
+    case 'WAIT_BILL_CONFIRM':
+    case 'WAIT_SI':
+    case 'WAIT_DRAFT':
+    case 'WAIT_CHECKOUT_BILL':
+    case 'WAIT_VGM':
+    case 'WAIT_BAOGUAN':
+    case 'WAIT_AMS':
+    case 'WAIT_SHANGJIAN':
+    case 'WAIT_COA':
+    case 'WAIT_CHANDIZHENG':
+    case 'WAIT_TUOCHE':
+    case 'WAIT_Insurance':
+    case 'ORDER_AUDIT_REJECTED':
+    case 'RETURN_CABIN_AUDIT':
+    case 'WAIT_SI_REJECTED':
+    case 'RETURN_CABIN':
+    case 'RETURN_CABIN_POOL':
+      // 跳转到订舱详情查看页面
+      go({
+        path: '/taskmanage/booking-approval',
+        query: {
+          id: data.ouT_BS_NO,
+          source: data.tasK_USER_STATUS,
+          taskId: data.id,
+          status: statusFlag ? data.tasK_TYPE : 'n',
+          tabName: data.tasK_TYPE_NAME,
+        },
+      })
+      break
+    default:
+      break
+  }
+}
+const columsAll = ref([]) as any
+function getSetColumns(type) {
+  const data = {
+    permissionId: 1819556999776571399,
+    taskTypeCodeArray: [
+      'DRAFT',
+      'ROLLING_NOMINATION',
+      'CUT_MODIFY',
+      'TRUCK_DISPATCH',
+      'PER_BILL',
+      'BC',
+      'SI_FEEDBACK',
+      'basic',
+      'ROUTE_CUT_CHANGE',
+      'CAUTION_NOTICE',
+      'POD_DISCHARGE_FULL',
+    ],
+    isSetDefault: false,
+  }
+  GetUserTaskPlatFieldSet(data).then((res) => {
+    if (res.succeeded) {
+      if (res.data.length > 0) {
+        columsAll.value = res.data
+        const arr = [] as any
+        columsAll.value.forEach((item) => {
+          if (item.taskTypeCode === type) {
+            JSON.parse(item.content).forEach((item) => {
+              if (item.checked) {
+                arr.push(item)
+              }
+            })
           }
         })
-        break
-      case 'WAIT_ORDER_AUDIT':
-      case 'WAIT_BOOKING':
-      case 'WAIT_BC':
-      case 'WAIT_SPACE_RELEASE':
-      case 'WAIT_CANGDAN':
-      case 'WAIT_BILL_CONFIRM':
-      case 'WAIT_SI':
-      case 'WAIT_DRAFT':
-      case 'WAIT_CHECKOUT_BILL':
-      case 'WAIT_VGM':
-      case 'WAIT_BAOGUAN':
-      case 'WAIT_AMS':
-      case 'WAIT_SHANGJIAN':
-      case 'WAIT_COA':
-      case 'WAIT_CHANDIZHENG':
-      case 'WAIT_TUOCHE':
-      case 'WAIT_Insurance':
-      case 'ORDER_AUDIT_REJECTED':
-      case 'RETURN_CABIN_AUDIT':
-      case 'WAIT_SI_REJECTED':
-      case 'RETURN_CABIN':
-      case 'RETURN_CABIN_POOL':
-        // 跳转到订舱详情查看页面
-        go({
-          path: '/taskmanage/booking-approval',
-          query: {
-            id: data.ouT_BS_NO,
-            source: data.tasK_USER_STATUS,
-            taskId: data.id,
-            status: statusFlag ? data.tasK_TYPE : 'n',
-            tabName: data.tasK_TYPE_NAME,
-          },
-        })
-        break
-      default:
-        break
+        setColumns(arr)
+      }
     }
+  })
+}
+const bcFileFlag = ref(false)
+const bcFile = ref({}) as any
+// 取消
+function removeFun() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
   }
-  const columsAll = ref([]) as any
-  function getSetColumns(type) {
-    const data = {
-      permissionId: 1819556999776571399,
-      taskTypeCodeArray: [
-        'DRAFT',
-        'ROLLING_NOMINATION',
-        'CUT_MODIFY',
-        'TRUCK_DISPATCH',
-        'PER_BILL',
-        'BC',
-        'SI_FEEDBACK',
-        'basic',
-        'ROUTE_CUT_CHANGE',
-        'CAUTION_NOTICE',
-        'POD_DISCHARGE_FULL',
-      ],
-      isSetDefault: false,
+  CancelTask(pkIdArr).then((res) => {
+    if (res.succeeded) {
+      createMessage.success('取消任务成功')
+      bcFileFlag.value = true
+      bcFile.value = res.data
+      reload()
+    } else {
+      createMessage.error(res.message)
     }
-    GetUserTaskPlatFieldSet(data).then((res) => {
-      if (res.succeeded) {
-        if (res.data.length > 0) {
-          columsAll.value = res.data
-          const arr = [] as any
-          columsAll.value.forEach((item) => {
-            if (item.taskTypeCode === type) {
-              JSON.parse(item.content).forEach((item) => {
-                if (item.checked) {
-                  arr.push(item)
-                }
-              })
-            }
-          })
-          setColumns(arr)
-        }
-      }
-    })
+  })
+}
+// 完成
+function submitFun() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
   }
-  const bcFileFlag = ref(false)
-  const bcFile = ref({}) as any
-  // 取消
-  function removeFun() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
-    })
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
-    }
-    CancelTask(pkIdArr).then((res) => {
+  CompleteTask(pkIdArr)
+    .then((res) => {
       if (res.succeeded) {
-        createMessage.success('取消任务成功')
+        createMessage.success('已完成任务')
         bcFileFlag.value = true
         bcFile.value = res.data
         reload()
@@ -1287,765 +1164,741 @@
         createMessage.error(res.message)
       }
     })
-  }
-  // 完成
-  function submitFun() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
-    })
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
-    }
-    CompleteTask(pkIdArr)
-      .then((res) => {
-        if (res.succeeded) {
-          createMessage.success('已完成任务')
-          bcFileFlag.value = true
-          bcFile.value = res.data
-          reload()
-        } else {
-          createMessage.error(res.message)
-        }
-      })
-      .catch((err) => {
-        console.log(err)
-      })
-  }
-  function handlePull() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
+    .catch((err) => {
+      console.log(err)
     })
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
-    }
-    PullTask(pkIdArr)
-      .then((res) => {
-        if (res.succeeded) {
-          createMessage.success('操作成功')
-          reload()
-        } else {
-          createMessage.error(res.message)
-        }
-      })
-      .catch((err) => {
-        console.log(err)
-      })
+}
+function handlePull() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
   }
-  // 批量下载
-  function downloadFun() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
+  PullTask(pkIdArr)
+    .then((res) => {
+      if (res.succeeded) {
+        createMessage.success('操作成功')
+        reload()
+      } else {
+        createMessage.error(res.message)
+      }
     })
-    console.log('当前选中', pkIdArr)
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
-    }
-    pkIdArr.map((item) => {
-      const name = select[pkIdArr.indexOf(item)].taskTitle
-      this.downloadTaskAttach(item, name)
+    .catch((err) => {
+      console.log(err)
     })
+}
+// 批量下载
+function downloadFun() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  console.log('当前选中', pkIdArr)
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
   }
-  function downloadTaskAttach(id, name) {
-    DownloadTaskAttach({
-      taskPKId: id,
-    })
-      .then((res) => {
-        if (res.message) {
-          // this.showdownLoadErr = true
-          this.downLoadErrTip = `${name}下载失败：${res.message}`
+  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 = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
+        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)
     })
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
-    }
-    const query = this.$qs.stringify({ PKIds: pkIdArr }, { arrayFormat: 'repeat' })
-    ManualReCompareBC(query)
-      .then((res) => {
-        if (res.succeeded) {
-          createMessage.success('重新比对完成')
-        } else {
-          createMessage.error(res.message)
-        }
-      })
-      .catch((err) => {
-        console.log(err)
-      })
-  }
-  const bcBox = ref()
-  function handleCopy() {
-    const text = bcBox.value.innerText
-    var cInput = document.createElement('input')
-    cInput.value = text
-    document.body.appendChild(cInput)
-    cInput.select() // 选取文本框内容
-    document.execCommand('copy')
-    document.body.removeChild(cInput)
-    createMessage.success('复制成功')
+    .catch((err) => {
+      console.log(err)
+    })
+}
+// 重新比对
+function reComparisonFun() {
+  // 未找到接口
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
   }
-  // 批量转发
-  function SendEmailFun() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
+  const query = this.$qs.stringify({ PKIds: pkIdArr }, { arrayFormat: 'repeat' })
+  ManualReCompareBC(query)
+    .then((res) => {
+      if (res.succeeded) {
+        createMessage.success('重新比对完成')
+      } else {
+        createMessage.error(res.message)
+      }
     })
-    console.log('当前选中', pkIdArr)
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
-    }
-    this.sendEmailPkIds = pkIdArr
-    this.sendEmailVisible = true
+    .catch((err) => {
+      console.log(err)
+    })
+}
+const bcBox = ref()
+function handleCopy() {
+  const text = bcBox.value.innerText
+  var cInput = document.createElement('input')
+  cInput.value = text
+  document.body.appendChild(cInput)
+  cInput.select() // 选取文本框内容
+  document.execCommand('copy')
+  document.body.removeChild(cInput)
+  createMessage.success('复制成功')
+}
+// 批量转发
+function SendEmailFun() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  console.log('当前选中', pkIdArr)
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
   }
+  this.sendEmailPkIds = pkIdArr
+  this.sendEmailVisible = true
+}
 
-  // 打印
-  function FnCilckTemplateType(templateId) {
-    createMessage.success(`搜索文件中...`)
-    const printType = this.PrintType == 4 ? 20 : 10
-    TaskManageTruckGetInfoByTaskId({ taskPkId: this.pkIdArr[0] })
-      .then((res) => {
-        if (res.data.succ) {
-          TaskManageTruckPrint({
-            taskPKId: res.data.ext.id,
-            templateId,
-            cateCode: 'truckBill',
-            type: this.PrintType,
-            printType,
-          }).then((res) => {
-            if (!res.succeeded) {
-              createMessage.error(res.message)
+// 打印
+function FnCilckTemplateType(templateId) {
+  createMessage.success(`搜索文件中...`)
+  const printType = this.PrintType == 4 ? 20 : 10
+  TaskManageTruckGetInfoByTaskId({ taskPkId: this.pkIdArr[0] })
+    .then((res) => {
+      if (res.data.succ) {
+        TaskManageTruckPrint({
+          taskPKId: res.data.ext.id,
+          templateId,
+          cateCode: 'truckBill',
+          type: this.PrintType,
+          printType,
+        }).then((res) => {
+          if (!res.succeeded) {
+            createMessage.error(res.message)
+          } else {
+            // createMessage.success(res.data)
+            if (this.PrintType == 1) {
+              window.open(
+                ` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/ViewPrintPdf/${res.data}`,
+                '_blank',
+              )
             } else {
-              // createMessage.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',
-                )
-              }
+              window.open(
+                ` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`,
+                '_blank',
+              )
             }
-          })
-        } else {
-          createMessage.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
+        createMessage.error(`${res.data.msg}`)
       }
+      this.confirmLoading = false
     })
-  }
-  function FnPrint() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
+    .catch(() => {
+      this.confirmLoading = false
     })
-    if (pkIdArr.length != 1) {
-      createMessage.error('请仅选择一条数据')
-      return 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
     }
-    this.pkIdArr = pkIdArr
-    let printType = ''
-    if (this.PrintType == 4) {
-      printType = 20
+  })
+}
+function FnPrint() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length != 1) {
+    createMessage.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 = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
+  }
+  TaskManageTruckSendDispatchBatchByTask(pkIdArr).then((res) => {
+    if (res.data.succ) {
+      createMessage.success('派车成功')
     } else {
-      printType = 10
+      createMessage.error(`派车失败,${res.data.msg}`)
     }
-    this.PrintType = '1'
-    this.GetPrintData('truckBill', printType)
+  })
+}
+function CancelSendCar() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
   }
-  function FnSendCar() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
-    })
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
+  TaskManageTruckCancelDispatchBatchByTask(pkIdArr).then((res) => {
+    if (res.data.succ) {
+      createMessage.success('取消派车成功')
+    } else {
+      createMessage.error(`取消派车失败,${res.data.msg}`)
     }
-    TaskManageTruckSendDispatchBatchByTask(pkIdArr).then((res) => {
-      if (res.data.succ) {
-        createMessage.success('派车成功')
+  })
+}
+
+// 页数计算
+function laraPaperCalc() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
+  }
+  const query = this.$qs.stringify({ PKIds: pkIdArr }, { arrayFormat: 'repeat' })
+  LaraPaperCalc(query)
+    .then((res) => {
+      if (res.succeeded) {
+        this.paperCalcRes = res.data
+        this.paperCalcExtras = res.extras || ''
+        this.paperCalcVisible = true
       } else {
-        createMessage.error(`派车失败,${res.data.msg}`)
+        createMessage.error(res.message)
       }
     })
-  }
-  function CancelSendCar() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
+    .catch((err) => {
+      console.log(err)
     })
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
-    }
-    TaskManageTruckCancelDispatchBatchByTask(pkIdArr).then((res) => {
-      if (res.data.succ) {
-        createMessage.success('取消派车成功')
-      } else {
-        createMessage.error(`取消派车失败,${res.data.msg}`)
+}
+function handlePaperCalcCancel() {
+  this.paperCalcVisible = false
+}
+// COPY打印
+function copyPrintFun() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
+  }
+  PrintBatch({
+    PKIds: pkIdArr,
+  })
+    .then((res) => {
+      // 接口暂时报错
+      if (res.message) {
+        const downLoadErrTip = `COPY打印失败：${res.message}`
+        createMessage.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)
     })
-  }
-
-  // 页数计算
-  function laraPaperCalc() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
+    .catch((err) => {
+      console.log(err)
     })
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
-    }
-    const query = this.$qs.stringify({ PKIds: pkIdArr }, { arrayFormat: 'repeat' })
-    LaraPaperCalc(query)
-      .then((res) => {
-        if (res.succeeded) {
-          this.paperCalcRes = res.data
-          this.paperCalcExtras = res.extras || ''
-          this.paperCalcVisible = true
-        } else {
-          createMessage.error(res.message)
-        }
-      })
-      .catch((err) => {
-        console.log(err)
-      })
-  }
-  function handlePaperCalcCancel() {
-    this.paperCalcVisible = false
+}
+// COPY下载
+function copyDownloadFun() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
   }
-  // COPY打印
-  function copyPrintFun() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
+  DownloadAttach({
+    PKIds: pkIdArr,
+  })
+    .then((res) => {
+      // 暂时报错 接口404 文档中也没有 等更新
+      if (res.message) {
+        const downLoadErrTip = `COPY下载失败：${res.message}`
+        createMessage.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)
     })
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
-    }
-    PrintBatch({
-      PKIds: pkIdArr,
+    .catch((err) => {
+      console.log(err)
     })
-      .then((res) => {
-        // 接口暂时报错
-        if (res.message) {
-          const downLoadErrTip = `COPY打印失败：${res.message}`
-          createMessage.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 = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.error('请选择数据')
+    return false
   }
-  // COPY下载
-  function copyDownloadFun() {
-    const select = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
+  DownloadOriginalTask({
+    PKIds: pkIdArr,
+  })
+    .then((res) => {
+      // 接口调用成功，但是无下载数据？？？？
+      if (res.message) {
+        const downLoadErrTip = `正本下载失败：${res.message}`
+        createMessage.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)
     })
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
-    }
-    DownloadAttach({
-      PKIds: pkIdArr,
+    .catch((err) => {
+      console.log(err)
     })
-      .then((res) => {
-        // 暂时报错 接口404 文档中也没有 等更新
-        if (res.message) {
-          const downLoadErrTip = `COPY下载失败：${res.message}`
-          createMessage.error(downLoadErrTip)
-          return false
+}
+// LARA登记
+function laraPaperRegistFun() {
+  const select = getSelectRows()
+  const pkIdArr = select.map((item, index) => {
+    return item.id
+  })
+  if (pkIdArr.length === 0) {
+    createMessage.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) {
+  let arr = [] as any
+  let arr1 = [] as any
+  columsAll.value.forEach((item) => {
+    if (item.taskTypeCode === row.key) {
+      JSON.parse(item.content).forEach((item) => {
+        if (item.checked) {
+          arr.push(item)
         }
-        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 = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
-    })
-    if (pkIdArr.length === 0) {
-      createMessage.error('请选择数据')
-      return false
     }
-    DownloadOriginalTask({
-      PKIds: pkIdArr,
-    })
-      .then((res) => {
-        // 接口调用成功，但是无下载数据？？？？
-        if (res.message) {
-          const downLoadErrTip = `正本下载失败：${res.message}`
-          createMessage.error(downLoadErrTip)
-          return false
+    if (item.taskTypeCode === 'BASIC') {
+      JSON.parse(item.content).forEach((item) => {
+        if (item.checked) {
+          arr1.push(item)
         }
-        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 = getSelectRows()
-    const pkIdArr = select.map((item, index) => {
-      return item.id
-    })
-    if (pkIdArr.length === 0) {
-      createMessage.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) {
-    let arr = [] as any
-    let arr1 = [] as any
-    columsAll.value.forEach((item) => {
-      if (item.taskTypeCode === row.key) {
-        JSON.parse(item.content).forEach((item) => {
-          if (item.checked) {
-            arr.push(item)
-          }
-        })
-      }
-      if (item.taskTypeCode === 'BASIC') {
-        JSON.parse(item.content).forEach((item) => {
-          if (item.checked) {
-            arr1.push(item)
-          }
-        })
-      }
+  if (!row.active) {
+    taskType.value = row.key
+    levelTree.value.map((item, index) => {
+      item.active = false
     })
-
-    if (!row.active) {
-      taskType.value = row.key
-      levelTree.value.map((item, index) => {
-        item.active = false
-      })
-      levelTree.value[index].active = true
-      if (arr.length == 0 && arr1.length == 0) {
-        setColumns(columns)
-      } else {
-        const arr3 = arr1.concat(arr)
-        setColumns(arr3)
-      }
+    levelTree.value[index].active = true
+    if (arr.length == 0 && arr1.length == 0) {
+      setColumns(columns)
     } else {
-      levelTree.value.map((item, index) => {
-        item.active = false
-      })
-      taskType.value = ''
-      console.log(arr1)
-      setColumns(arr1)
+      const arr3 = arr1.concat(arr)
+      setColumns(arr3)
     }
-
-    reload()
+  } else {
+    levelTree.value.map((item, index) => {
+      item.active = false
+    })
+    taskType.value = ''
+    console.log(arr1)
+    setColumns(arr1)
   }
+
+  reload()
+}
 </script>
 <style lang="less" scoped>
-  /deep/ .ant-popover-placement-top {
-    width: 330px !important;
-  }
-
-  /deep/ .ant-tabs-bar {
-    margin-bottom: 0 !important;
-  }
-
-  /deep/ .ant-table.ant-table-bordered > .ant-table-container {
-    border-left: none !important;
-  }
-
-  /deep/ .ant-tabs-tab {
-    padding: 8px !important;
-    margin-right: 8px !important;
-  }
-
-  /deep/ .ant-form-item {
-    display: flex;
-  }
-
-  /deep/ .ant-radio-button-wrapper-checked {
-    background: white;
-    color: black;
-    border: none;
-    font-weight: 700;
-  }
-
-  /deep/ .ant-radio-button-wrapper {
-    background: rgba(245, 249, 252, 1);
-    border: none !important;
-  }
-
-  /deep/ .ant-tabs-tab + .ant-tabs-tab {
-    margin: 0 0 0 12px;
-  }
-
-  /deep/
-    .ant-radio-group-solid
-    .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
-    background: white;
-    color: black;
-    font-weight: 700;
-  }
-
-  /deep/ .nav-title .ant-radio-button-wrapper {
-    padding: 0px;
-    flex-grow: 1;
-  }
-
-  /deep/ .ant-radio-button-wrapper:not(:first-child)::before {
-    width: 0px;
-  }
-
-  /deep/ .ant-radio-group {
-    width: 100%;
+/deep/ .ant-popover-placement-top {
+  width: 330px !important;
+}
+
+/deep/ .ant-tabs-bar {
+  margin-bottom: 0 !important;
+}
+
+/deep/ .ant-table.ant-table-bordered>.ant-table-container {
+  border-left: none !important;
+}
+
+/deep/ .ant-tabs-tab {
+  padding: 8px !important;
+  margin-right: 8px !important;
+}
+
+/deep/ .ant-form-item {
+  display: flex;
+}
+
+/deep/ .ant-radio-button-wrapper-checked {
+  background: white;
+  color: black;
+  border: none;
+  font-weight: 700;
+}
+
+/deep/ .ant-radio-button-wrapper {
+  background: rgba(245, 249, 252, 1);
+  border: none !important;
+}
+
+/deep/ .ant-tabs-tab+.ant-tabs-tab {
+  margin: 0 0 0 12px;
+}
+
+/deep/ .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+  background: white;
+  color: black;
+  font-weight: 700;
+}
+
+/deep/ .nav-title .ant-radio-button-wrapper {
+  padding: 0px;
+  flex-grow: 1;
+}
+
+/deep/ .ant-radio-button-wrapper:not(:first-child)::before {
+  width: 0px;
+}
+
+/deep/ .ant-radio-group {
+  width: 100%;
+}
+
+.box-item {
+  cursor: pointer;
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .iconfont {
+    font-size: 14px;
   }
 
-  .box-item {
-    cursor: pointer;
-    margin-bottom: 10px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .iconfont {
-      font-size: 14px;
-    }
-
-    &:hover {
-      .box-text {
-        background: rgba(245, 249, 252, 1);
-        color: rgba(37, 122, 250, 1);
-      }
-    }
-
-    &.active {
-      .box-number {
-        background: rgba(37, 122, 250, 1);
-        color: white;
-      }
-
-      .box-text {
-        background: rgba(245, 249, 252, 1);
-        color: rgba(37, 122, 250, 1);
-      }
+  &:hover {
+    .box-text {
+      background: rgba(245, 249, 252, 1);
+      color: rgba(37, 122, 250, 1);
     }
+  }
 
-    &.active.redColor {
-      .box-number {
-        background: rgba(237, 88, 88, 1);
-        color: white;
-      }
+  &.active {
+    .box-number {
+      background: rgba(37, 122, 250, 1);
+      color: white;
     }
 
-    &.redColor {
-      .box-text {
-        color: rgba(237, 88, 88, 1);
-      }
+    .box-text {
+      background: rgba(245, 249, 252, 1);
+      color: rgba(37, 122, 250, 1);
     }
   }
 
-  .box-number {
-    border-radius: 2px;
-    background: rgba(245, 249, 252, 1);
-    text-align: center;
-    margin-right: 7px;
-    display: inline-block;
-    width: 45px;
-    font-size: 14px;
-    color: rgba(37, 122, 250, 1);
+  &.active.redColor {
+    .box-number {
+      background: rgba(237, 88, 88, 1);
+      color: white;
+    }
   }
 
-  .box-text {
-    padding: 4px 7px;
-    font-size: 14px;
-    font-weight: 400;
-    line-height: 14px;
-    flex: 1;
-    margin-right: 10px;
+  &.redColor {
+    .box-text {
+      color: rgba(237, 88, 88, 1);
+    }
   }
-
-  .bottom-box {
-    border: 1px solid rgba(232, 235, 237, 1);
+}
+
+.box-number {
+  border-radius: 2px;
+  background: rgba(245, 249, 252, 1);
+  text-align: center;
+  margin-right: 7px;
+  display: inline-block;
+  width: 45px;
+  font-size: 14px;
+  color: rgba(37, 122, 250, 1);
+}
+
+.box-text {
+  padding: 4px 7px;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 14px;
+  flex: 1;
+  margin-right: 10px;
+}
+
+.bottom-box {
+  border: 1px solid rgba(232, 235, 237, 1);
+}
+
+.nav-title {
+  width: 100%;
+
+  .icon {
+    float: right;
+  }
+}
+
+.main {
+  display: flex;
+}
+
+.table-page-search-submitButtons {
+  width: 100%;
+  display: block;
+  text-align: right;
+}
+
+.nav-bottom {
+  width: 100%;
+  margin-bottom: 14px;
+
+  .icon {
+    font-size: 12px;
   }
+}
 
-  .nav-title {
-    width: 100%;
+.list-btn {
+  margin-right: 10px;
 
-    .icon {
-      float: right;
-    }
+  .iconfont {
+    margin-right: 8px;
   }
+}
 
-  .main {
-    display: flex;
-  }
+.task-tit {
+  color: @primary-color;
+  cursor: pointer;
+}
 
-  .table-page-search-submitButtons {
-    width: 100%;
-    display: block;
-    text-align: right;
-  }
+.nav-loading {
+  width: 100%;
+  height: 100px;
+  line-height: 100px;
+  text-align: center;
 
-  .nav-bottom {
-    width: 100%;
-    margin-bottom: 14px;
-
-    .icon {
-      font-size: 12px;
-    }
+  .tip {
+    margin-left: 10px;
   }
+}
 
-  .list-btn {
-    margin-right: 10px;
-
-    .iconfont {
-      margin-right: 8px;
-    }
-  }
+.operate-btn {
+  width: 30px;
+  text-align: center;
+  display: inline-block;
 
-  .task-tit {
+  &:nth-of-type(1) {
     color: @primary-color;
-    cursor: pointer;
   }
+}
 
-  .nav-loading {
-    width: 100%;
-    height: 100px;
-    line-height: 100px;
-    text-align: center;
-
-    .tip {
-      margin-left: 10px;
-    }
-  }
+.icon-tip {
+  font-size: 12px;
+  color: @primary-color;
+}
 
-  .operate-btn {
-    width: 30px;
+.nav-title {
+  .ant-radio-button-wrapper {
+    padding: 0 4px;
     text-align: center;
-    display: inline-block;
-
-    &:nth-of-type(1) {
-      color: @primary-color;
-    }
   }
+}
+
+.nav-top {
+  width: 100%;
+  height: 100%;
 
-  .icon-tip {
+  .nav-top-tip {
     font-size: 12px;
-    color: @primary-color;
+    text-align: center;
+    line-height: 20px;
+    margin-left: 4px;
+  }
+}
+
+.nav-box {
+  padding: 5px 14px;
+  background: #fff;
+  border-radius: 2px;
+  width: 20%;
+  flex-shrink: 0;
+  margin-top: 4px;
+}
+
+.nav-no-data {
+  height: 84px;
+  line-height: 84px;
+  text-align: center;
+  margin-top: 20px;
+
+  i {
+    display: block;
+    line-height: 60px;
+    font-size: 32px;
+    color: #aaa;
   }
 
-  .nav-title {
-    .ant-radio-button-wrapper {
-      padding: 0 4px;
-      text-align: center;
-    }
+  span {
+    display: block;
+    line-height: 24px;
+    color: #999;
   }
+}
 
-  .nav-top {
-    width: 100%;
-    height: 100%;
+.tab-btn {
+  cursor: pointer;
+}
 
-    .nav-top-tip {
-      font-size: 12px;
-      text-align: center;
-      line-height: 20px;
-      margin-left: 4px;
-    }
-  }
+.PrintMain {
+  display: flex;
+  flex-wrap: wrap;
 
-  .nav-box {
-    padding: 5px 14px;
-    background: #fff;
-    border-radius: 2px;
-    width: 20%;
-    flex-shrink: 0;
-    margin-top: 4px;
-  }
+  .PrintTitle {
+    width: 100%;
+    display: flex;
+    padding: 20px;
+    box-sizing: border-box;
+    background: #f7f8fe;
+    border: 1px dashed #cdcdcd;
 
-  .nav-no-data {
-    height: 84px;
-    line-height: 84px;
-    text-align: center;
-    margin-top: 20px;
+    p {
+      margin: 0;
 
-    i {
-      display: block;
-      line-height: 60px;
-      font-size: 32px;
-      color: #aaa;
-    }
+      &:nth-child(2) {
+        margin-left: 35px;
+      }
 
-    span {
-      display: block;
-      line-height: 24px;
-      color: #999;
+      span {
+        color: #ff6646;
+      }
     }
   }
 
-  .tab-btn {
-    cursor: pointer;
-  }
-
-  .PrintMain {
-    display: flex;
-    flex-wrap: wrap;
-
-    .PrintTitle {
-      width: 100%;
-      display: flex;
-      padding: 20px;
-      box-sizing: border-box;
-      background: #f7f8fe;
-      border: 1px dashed #cdcdcd;
-
-      p {
-        margin: 0;
+  .PrintMainBox {
+    width: 100%;
+    max-height: 50vh;
+    overflow-y: auto;
+    margin-top: 5px;
 
-        &:nth-child(2) {
-          margin-left: 35px;
-        }
+    .items {
+      padding-left: 1rem;
+      height: 2.5rem;
+      line-height: 2.5rem;
+      border-bottom: 1px solid #ebebeb;
+      cursor: pointer;
 
-        span {
-          color: #ff6646;
-        }
+      &:hover {
+        color: #2f54eb;
       }
-    }
-
-    .PrintMainBox {
-      width: 100%;
-      max-height: 50vh;
-      overflow-y: auto;
-      margin-top: 5px;
-
-      .items {
-        padding-left: 1rem;
-        height: 2.5rem;
-        line-height: 2.5rem;
-        border-bottom: 1px solid #ebebeb;
-        cursor: pointer;
-
-        &:hover {
-          color: #2f54eb;
-        }
 
-        span {
-          font-weight: bolder;
-          margin-right: 0.6rem;
-        }
+      span {
+        font-weight: bolder;
+        margin-right: 0.6rem;
       }
     }
   }
+}
 
-  .bcfile-title {
-    border-bottom: 1px dashed black;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
+.bcfile-title {
+  border-bottom: 1px dashed black;
+  padding-bottom: 5px;
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
 
-  .bc-box {
-    max-height: 200px;
-    overflow-y: auto;
-    padding-right: 14px;
+.bc-box {
+  max-height: 200px;
+  overflow-y: auto;
+  padding-right: 14px;
 
-    .bc-item {
-      margin: 7px 0px;
-      display: flex;
-      justify-content: space-between;
-    }
+  .bc-item {
+    margin: 7px 0px;
+    display: flex;
+    justify-content: space-between;
   }
+}
 </style>

From a64b688a342aec91750f392e37ecb1a5e5783a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Wed, 23 Oct 2024 14:09:36 +0800
Subject: [PATCH 2/6] =?UTF-8?q?10/23=20=20=E9=83=A8=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infoclient/ClientStakeholder/columns.tsx  | 28 +++++++++++++------
 .../infoclient/TenantAuditStepModal.vue       |  1 -
 src/views/baseinfo/infoclient/columns.tsx     |  2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx b/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx
index 2c578f5f..879ab8e4 100644
--- a/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx
@@ -4,7 +4,7 @@ import { GetUserList } from '/@/api/common'
 export const columns: BasicColumn[] = [
   {
     title: '干系人姓名',
-    dataIndex: 'createByName',
+    dataIndex: 'userName',
     sorter: true,
     width: 150,
   },
@@ -20,6 +20,18 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 150,
   },
+  {
+    title: '创建人',
+    dataIndex: 'createByName',
+    sorter: true,
+    width: 150,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    sorter: true,
+    width: 150,
+  },
   {
     title: '备注',
     dataIndex: 'remark',
@@ -30,7 +42,7 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'createByName',
+    field: 'userName',
     label: '干系人姓名',
     component: 'Input',
     colProps: { span: 4 },
@@ -59,13 +71,13 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '干系人Name',
-    field: 'createByName',
+    field: 'userName',
     component: 'Input',
     show: false,
   },
   {
     label: '干系人',
-    field: 'createBy',
+    field: 'userId',
     component: 'ApiSelect',
     required: false,
     defaultValue: null,
@@ -81,12 +93,12 @@ export const formSchema: FormSchema[] = [
         onChange: (e, obj) => {
           if (e && obj) {
             console.log(e, obj)
-            formModel.createBy = obj.value
-            formModel.createByName = obj.label
+            formModel.userId = obj.value
+            formModel.userName = obj.label
           }
           if (!e && !obj) {
-            formModel.createBy = ''
-            formModel.createByName = ''
+            formModel.userId = ''
+            formModel.userName = ''
           }
         },
       }
diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
index 8984650a..7ff7e8df 100644
--- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
@@ -520,7 +520,6 @@
     }
   }
   function ChangeCustomerOrSupplier() {
-    // setFieldsValue({ ArrclientTag: [] })
     ChangeArrclientTag(true)
   }
   watch(activeKey, (nval, oval) => {
diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index 2f6cbf3f..cf5f97d8 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -1261,7 +1261,7 @@ export const formSchema: FormSchema[] = [
     field: 'ArrclientTag',
     component: 'ApiSelect',
     colProps: { span: 12 },
-    defaultValue: 'isController',
+    defaultValue: ['isController'],
     componentProps: ({ formModel }) => {
       return {
         api: () => {

From d9ae6c42a899c81f87fea36e77802e506e7b06b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Wed, 23 Oct 2024 16:41:54 +0800
Subject: [PATCH 3/6] =?UTF-8?q?10/23=20=20=E9=83=A8=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BuyCtn/TenantAuditStepModal.vue           |   9 +-
 .../CurrentState/columns.tsx                  | 206 ++++++++++--------
 .../CurrentState/index.vue                    |   3 +
 .../CustFeeDui/TenantAuditStepModal.vue       |   9 +-
 .../RentIn/TenantAuditStepModal.vue           |  18 +-
 .../RentOneWay/TenantAuditStepModal.vue       |   9 +-
 .../RentOneWayIn/TenantAuditStepModal.vue     |   9 +-
 .../RentOut/TenantAuditStepModal.vue          |  36 ++-
 .../StateChange/columns.tsx                   | 102 +++++----
 .../ContainerManagement/StateChange/index.vue |   3 +
 .../TemplatImport/TenantAuditStepModal.vue    |  14 +-
 .../ContainerManagement/dsxxcl/columns.tsx    |  10 +-
 .../ContainerManagement/qbxdtbdrz/columns.tsx |  20 +-
 .../baseinfo/ClientStakeholder/columns.tsx    |   4 +-
 .../infoclient/ClientStakeholder/api.ts       |   9 +
 .../infoclient/ClientStakeholder/index.vue    |  14 +-
 src/views/baseinfo/infoclient/EditColumns.tsx |   7 +
 src/views/baseinfo/infoclient/columns.tsx     |  18 --
 18 files changed, 312 insertions(+), 188 deletions(-)

diff --git a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
index 08448889..71281aa9 100644
--- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
@@ -658,9 +658,14 @@
       data: 'mblno',
     },
     {
-      title: '船名航次',
+      title: '船名',
       width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
     },
   ]
   const settings = {
diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx
index 8773cda2..8bba591e 100644
--- a/src/views/ContainerManagement/CurrentState/columns.tsx
+++ b/src/views/ContainerManagement/CurrentState/columns.tsx
@@ -30,14 +30,20 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 150,
   },
-  // {
-  //   title: '序号',
-  //   dataIndex: 'index',
-  //   width: 50,
-  // },
   {
-    title: '当前箱业务状态',
-    dataIndex: 'ctnBizState',
+    title: '序号',
+    dataIndex: 'index',
+    width: 50,
+  },
+  {
+    title: '箱状态',
+    dataIndex: 'ctnState',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '箱流转状态',
+    dataIndex: 'ctnFlowState',
     sorter: true,
     width: 200,
   },
@@ -48,8 +54,14 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '船名航次',
-    dataIndex: 'vesselVoyno',
+    title: '船名',
+    dataIndex: 'vessel',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '航次',
+    dataIndex: 'voyno',
     sorter: true,
     width: 200,
   },
@@ -60,7 +72,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '状态时间',
+    title: '发生日期',
     dataIndex: 'stateTime',
     sorter: true,
     width: 200,
@@ -115,94 +127,88 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 200,
   },
-  {
-    title: '新旧箱',
-    dataIndex: 'usedState',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: '箱主',
-    dataIndex: 'ctnOwner',
-    sorter: true,
-    width: 200,
-  },
   // {
-  //   title: '所属分部',
-  //   dataIndex: 'orgid',
+  //   title: '新旧箱',
+  //   dataIndex: 'usedState',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '箱主',
+  //   dataIndex: 'ctnOwner',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '箱来源',
+  //   dataIndex: 'ctnSource',
   //   sorter: true,
   //   width: 200,
   // },
-  {
-    title: '箱来源',
-    dataIndex: 'ctnSource',
-    sorter: true,
-    width: 200,
-  },
 
-  {
-    title: '箱业务编号',
-    dataIndex: 'billno',
-    sorter: true,
-    width: 200,
-  },
+  // {
+  //   title: '箱业务编号',
+  //   dataIndex: 'billno',
+  //   sorter: true,
+  //   width: 200,
+  // },
 
-  {
-    title: '箱状态',
-    dataIndex: 'ctnState',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: '箱损坏',
-    dataIndex: 'ctnBreakState',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: '是否上线',
-    dataIndex: 'isOnline',
-    sorter: true,
-    width: 200,
-  },
+  // {
+  //   title: '箱状态',
+  //   dataIndex: 'ctnState',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '箱损坏',
+  //   dataIndex: 'ctnBreakState',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '是否上线',
+  //   dataIndex: 'isOnline',
+  //   sorter: true,
+  //   width: 200,
+  // },
 
-  {
-    title: '当前港口',
-    dataIndex: 'port',
-    sorter: true,
-    width: 150,
-  },
+  // {
+  //   title: '当前港口',
+  //   dataIndex: 'port',
+  //   sorter: true,
+  //   width: 150,
+  // },
 
-  {
-    title: '业务委托单位',
-    dataIndex: 'customerName',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: 'ETD',
-    dataIndex: 'etd',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: 'ETA',
-    dataIndex: 'eta',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: '生产日期',
-    dataIndex: 'productionDate',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: '箱初期成本',
-    dataIndex: 'ctnValue_Base',
-    sorter: true,
-    width: 200,
-  },
+  // {
+  //   title: '业务委托单位',
+  //   dataIndex: 'customerName',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: 'ETD',
+  //   dataIndex: 'etd',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: 'ETA',
+  //   dataIndex: 'eta',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '生产日期',
+  //   dataIndex: 'productionDate',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '箱初期成本',
+  //   dataIndex: 'ctnValue_Base',
+  //   sorter: true,
+  //   width: 200,
+  // },
 ]
 
 export const searchFormSchema: FormSchema[] = [
@@ -277,8 +283,14 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'vesselVoyno',
-    label: '船名航次',
+    field: 'vessel',
+    label: '船名',
+    component: 'Input',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'Voyno',
+    label: '航次',
     component: 'Input',
     colProps: { span: 4 },
   },
@@ -849,8 +861,14 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'vesselVoyno',
-    label: '船名航次',
+    field: 'vessel',
+    label: '船名',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'Voyno',
+    label: '航次',
     component: 'Input',
     colProps: { span: 6 },
   },
diff --git a/src/views/ContainerManagement/CurrentState/index.vue b/src/views/ContainerManagement/CurrentState/index.vue
index 466a7bfb..d51f5729 100644
--- a/src/views/ContainerManagement/CurrentState/index.vue
+++ b/src/views/ContainerManagement/CurrentState/index.vue
@@ -46,6 +46,9 @@
     title: '集装箱信息列表',
     api: async (p) => {
       const res: API.DataResult = await ApiList(p)
+      res.data.forEach((item, index) => {
+        item.index = index + 1
+      })
       return new Promise((resolve) => {
         resolve({ data: [...res.data], total: res.count })
       })
diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
index 85caeea9..48488713 100644
--- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
@@ -902,9 +902,14 @@
       data: 'mblno',
     },
     {
-      title: '船名航次',
+      title: '船名',
       width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
     },
   ]
   const Viewsettings = {
diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
index 466ee4bf..39827b7e 100644
--- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
@@ -775,9 +775,14 @@
       data: 'mblno',
     },
     {
-      title: '船名航次',
+      title: '船名',
       width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
     },
     {
       title: '合同号',
@@ -1082,9 +1087,14 @@
       data: 'mblno',
     },
     {
-      title: '船名航次',
+      title: '船名',
+      width: 120,
+      data: 'vessel',
+    },
+    {
+      title: '航次',
       width: 120,
-      data: 'vesselVoyno',
+      data: 'voyno',
     },
   ]
   const settings2 = {
diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
index 68096a8a..4bf1d52a 100644
--- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
@@ -760,9 +760,14 @@
       data: 'mblno',
     },
     {
-      title: '船名航次',
+      title: '船名',
       width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
     },
 
     // {
diff --git a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
index d1574c1f..c14f56f1 100644
--- a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
@@ -711,9 +711,14 @@
       data: 'mblno',
     },
     {
-      title: '船名航次',
+      title: '船名',
       width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
     },
 
     // {
diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
index 85f44f3b..5b7d0784 100644
--- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
@@ -810,9 +810,14 @@
       data: 'mblno',
     },
     {
-      title: '船名航次',
+      title: '船名',
       width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
     },
   ]
   const settings = {
@@ -1142,9 +1147,14 @@
       data: 'mblno',
     },
     {
-      title: '船名航次',
+      title: '船名',
+      width: 120,
+      data: 'vessel',
+    },
+    {
+      title: '航次',
       width: 120,
-      data: 'vesselVoyno',
+      data: 'voyno',
     },
   ]
   const settings2 = {
@@ -1399,9 +1409,14 @@
       data: 'mblno',
     },
     {
-      title: '船名航次',
+      title: '船名',
       width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
     },
     {
       title: '状态时间',
@@ -1587,9 +1602,14 @@
       data: 'mblno',
     },
     {
-      title: '船名航次',
+      title: '船名',
+      width: 120,
+      data: 'vessel',
+    },
+    {
+      title: '航次',
       width: 120,
-      data: 'vesselVoyno',
+      data: 'voyno',
     },
     {
       title: '合同号',
diff --git a/src/views/ContainerManagement/StateChange/columns.tsx b/src/views/ContainerManagement/StateChange/columns.tsx
index 32299eca..e5cbb857 100644
--- a/src/views/ContainerManagement/StateChange/columns.tsx
+++ b/src/views/ContainerManagement/StateChange/columns.tsx
@@ -29,14 +29,20 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 150,
   },
-  // {
-  //   title: '序号',
-  //   dataIndex: 'index',
-  //   width: 50,
-  // },
   {
-    title: '箱业务状态',
-    dataIndex: 'ctnBizState',
+    title: '序号',
+    dataIndex: 'index',
+    width: 50,
+  },
+  {
+    title: '箱状态',
+    dataIndex: 'ctnState',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '箱流转状态',
+    dataIndex: 'ctnFlowState',
     sorter: true,
     width: 200,
   },
@@ -47,8 +53,14 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '船名航次',
-    dataIndex: 'vesselVoyno',
+    title: '船名',
+    dataIndex: 'vessel',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '航次',
+    dataIndex: 'voyno',
     sorter: true,
     width: 200,
   },
@@ -60,7 +72,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: 'DATE',
+    title: '发生日期',
     dataIndex: 'changeTime',
     sorter: true,
     width: 150,
@@ -110,38 +122,44 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '当前港口',
-    dataIndex: 'port',
-    sorter: true,
-    width: 150,
-  },
-
-  {
-    title: '变动来源',
-    dataIndex: 'changeSource',
-    sorter: true,
-    width: 150,
-  },
-  {
-    title: '状态变动',
-    dataIndex: 'ctnFlowState',
+    title: '备注',
+    dataIndex: 'remark',
     sorter: true,
     width: 200,
   },
+  // {
+  //   title: '当前港口',
+  //   dataIndex: 'port',
+  //   sorter: true,
+  //   width: 150,
+  // },
 
-  {
-    title: '新旧箱',
-    dataIndex: 'usedState',
-    sorter: true,
-    width: 200,
-  },
+  // {
+  //   title: '变动来源',
+  //   dataIndex: 'changeSource',
+  //   sorter: true,
+  //   width: 150,
+  // },
+  // {
+  //   title: '状态变动',
+  //   dataIndex: 'ctnFlowState',
+  //   sorter: true,
+  //   width: 200,
+  // },
 
-  {
-    title: '箱状态',
-    dataIndex: 'ctnState',
-    sorter: true,
-    width: 200,
-  },
+  // {
+  //   title: '新旧箱',
+  //   dataIndex: 'usedState',
+  //   sorter: true,
+  //   width: 200,
+  // },
+
+  // {
+  //   title: '箱状态',
+  //   dataIndex: 'ctnState',
+  //   sorter: true,
+  //   width: 200,
+  // },
 ]
 
 export const searchFormSchema: FormSchema[] = [
@@ -627,8 +645,14 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'vesselVoyno',
-    label: '船名航次',
+    field: 'vessel',
+    label: '船名',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'Voyno',
+    label: '航次',
     component: 'Input',
     colProps: { span: 6 },
   },
diff --git a/src/views/ContainerManagement/StateChange/index.vue b/src/views/ContainerManagement/StateChange/index.vue
index bc270603..62e64cf3 100644
--- a/src/views/ContainerManagement/StateChange/index.vue
+++ b/src/views/ContainerManagement/StateChange/index.vue
@@ -41,6 +41,9 @@
         notification.warning({ message: '请输入查询条件！', duration: 3 })
       } else {
         const res: API.DataResult = await ApiChangeList(p)
+        res.data.forEach((item, index) => {
+          item.index = index + 1
+        })
         return new Promise((resolve) => {
           resolve({ data: [...res.data], total: res.count })
         })
diff --git a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
index 8b582b21..e528b672 100644
--- a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
@@ -369,6 +369,11 @@
       width: 200,
       data: 'dealRemark',
     },
+    {
+      title: '箱流转状态',
+      width: 120,
+      data: 'ctnFlowState',
+    },
     {
       title: '当前箱业务状态',
       width: 120,
@@ -405,9 +410,14 @@
       data: 'depot',
     },
     {
-      title: '船名航次',
+      title: '船名',
+      width: 120,
+      data: 'vessel',
+    },
+    {
+      title: '航次',
       width: 120,
-      data: 'vesselVoyno',
+      data: 'voyno',
     },
     {
       title: '业务编号',
diff --git a/src/views/ContainerManagement/dsxxcl/columns.tsx b/src/views/ContainerManagement/dsxxcl/columns.tsx
index 5c265406..539bfd90 100644
--- a/src/views/ContainerManagement/dsxxcl/columns.tsx
+++ b/src/views/ContainerManagement/dsxxcl/columns.tsx
@@ -94,8 +94,14 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '船名航次',
-    dataIndex: 'vesselVoyno',
+    title: '船名',
+    dataIndex: 'vessel',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '航次',
+    dataIndex: 'voyno',
     sorter: true,
     width: 200,
   },
diff --git a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
index 495952e0..e3c8942c 100644
--- a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
+++ b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
@@ -91,8 +91,14 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '船名航次',
-    dataIndex: 'vesselVoyno',
+    title: '船名',
+    dataIndex: 'vessel',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '航次',
+    dataIndex: 'voyno',
     sorter: true,
     width: 200,
   },
@@ -407,8 +413,14 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'vesselVoyno',
-    label: '船名航次',
+    field: 'vessel',
+    label: '船名',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'Voyno',
+    label: '航次',
     component: 'Input',
     colProps: { span: 6 },
   },
diff --git a/src/views/baseinfo/ClientStakeholder/columns.tsx b/src/views/baseinfo/ClientStakeholder/columns.tsx
index fb80c8d9..83f5eb6f 100644
--- a/src/views/baseinfo/ClientStakeholder/columns.tsx
+++ b/src/views/baseinfo/ClientStakeholder/columns.tsx
@@ -79,7 +79,7 @@ if (res.succeeded) {
 export const columns: BasicColumn[] = [
   {
     title: '干系人姓名',
-    dataIndex: 'createByName',
+    dataIndex: 'userName',
     sorter: true,
     width: 150,
   },
@@ -105,7 +105,7 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'createByName',
+    field: 'userName',
     label: '干系人姓名',
     component: 'Input',
     colProps: { span: 4 },
diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/api.ts b/src/views/baseinfo/infoclient/ClientStakeholder/api.ts
index bab62442..dc5b9a29 100644
--- a/src/views/baseinfo/infoclient/ClientStakeholder/api.ts
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/api.ts
@@ -6,6 +6,7 @@ enum Api {
   Audit = '/mainApi/ClientStakeholder/Audit',
   Get = '/mainApi/ClientStakeholder/Get',
   edit = '/mainApi/ClientStakeholder/Edit',
+  Del = '/mainApi/ClientStakeholder/Delete',
 }
 
 // 列表 (Auth)
@@ -40,3 +41,11 @@ export function ApiEdit(data) {
     data,
   })
 }
+// 删除干系人 (Auth)
+export function ApiDel(data) {
+  return request<DataResult>({
+    url: Api.Del,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/index.vue b/src/views/baseinfo/infoclient/ClientStakeholder/index.vue
index 868012f5..aee0e266 100644
--- a/src/views/baseinfo/infoclient/ClientStakeholder/index.vue
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/index.vue
@@ -7,10 +7,10 @@
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
-        <!-- <a-button type="link" @click="handleDel">
+        <a-button type="link" @click="handleDel">
           <span class="iconfont icon-shanchu2"></span>
           删除
-        </a-button> -->
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -41,7 +41,7 @@
 <script lang="ts" setup>
   import { ref } from 'vue'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
-  import { ApiList, ApiClientStakeholderAudit } from './api'
+  import { ApiList, ApiClientStakeholderAudit, ApiDel } from './api'
   import { columns, searchFormSchema } from './columns'
   import { formatParams } from '/@/hooks/web/common'
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -152,10 +152,10 @@
     const removeArr = select.map((item) => {
       return item.id
     })
-    // ApiDel({ ids: removeArr }).then((res) => {
-    //   notification.success({ message: res.message, duration: 3 })
-    //   reload()
-    // })
+    ApiDel({ ids: removeArr }).then((res) => {
+      notification.success({ message: res.message, duration: 3 })
+      reload()
+    })
   }
   function handleSuccess() {
     reload()
diff --git a/src/views/baseinfo/infoclient/EditColumns.tsx b/src/views/baseinfo/infoclient/EditColumns.tsx
index 9a7f6bd6..96863f01 100644
--- a/src/views/baseinfo/infoclient/EditColumns.tsx
+++ b/src/views/baseinfo/infoclient/EditColumns.tsx
@@ -198,6 +198,9 @@ export const EditformSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: (e) => {
       return {
+        min: '0',
+        step: '0.01',
+        stringMode: true,
         onEdit: () => {
           const { formActionType } = e
           formActionType ? formActionType.linkageForm(e) : null
@@ -213,6 +216,10 @@ export const EditformSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: (e) => {
       return {
+        showTime: true,
+        allowClear: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
         onEdit: () => {
           const { formActionType } = e
           formActionType ? formActionType.linkageForm(e) : null
diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index cf5f97d8..b60ab4fa 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -645,27 +645,12 @@ export const formSchema: FormSchema[] = [
     label: '注册资金',
     component: 'InputNumber',
     colProps: { span: 4 },
-    componentProps: () => {
-      return {
-        min: '0',
-        step: '0.01',
-        stringMode: true,
-      }
-    },
   },
   {
     field: 'registrationTime',
     label: '注册时间',
     component: 'DatePicker',
     colProps: { span: 4 },
-    componentProps: () => {
-      return {
-        showTime: true,
-        allowClear: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      }
-    },
   },
   {
     field: 'Divider1',
@@ -680,14 +665,12 @@ export const formSchema: FormSchema[] = [
     field: 'chief',
     label: '法人',
     component: 'Input',
-
     colProps: { span: 4 },
   },
   {
     field: 'tel',
     label: '电话',
     component: 'Input',
-
     colProps: { span: 4 },
   },
   {
@@ -700,7 +683,6 @@ export const formSchema: FormSchema[] = [
     field: 'web',
     label: '网址',
     component: 'Input',
-
     colProps: { span: 4 },
   },
   {

From 6ac7f0fb0926e2ec49434d79f60507700cc9f47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Wed, 23 Oct 2024 17:28:59 +0800
Subject: [PATCH 4/6] =?UTF-8?q?10/23=20=20=E9=83=A8=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContainerManagement/RentIn/TenantAuditStepModal.vue     | 6 +++---
 .../ContainerManagement/RentOut/TenantAuditStepModal.vue    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
index 39827b7e..8e93c8ff 100644
--- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
@@ -3,7 +3,7 @@
     v-bind="$attrs"
     :use-wrapper="true"
     title="租箱租入维护"
-    width="55%"
+    width="70%"
     @register="registerModal"
     @ok="handleSave"
   >
@@ -164,7 +164,7 @@
       >
         审核通过
       </a-button>
-      <!-- <a-button
+      <a-button
         pre-icon="ant-design:check-circle-outlined"
         type="primary"
         :loading="loading"
@@ -181,7 +181,7 @@
         v-if="!TotTableType"
       >
         取消执行
-      </a-button> -->
+      </a-button>
       <a-button
         pre-icon="ant-design:file-excel-outlined"
         type="primary"
diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
index 5b7d0784..460f3c6e 100644
--- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
@@ -3,7 +3,7 @@
     v-bind="$attrs"
     :use-wrapper="true"
     title="租箱租出维护"
-    width="55%"
+    width="70%"
     @register="registerModal"
     @ok="handleSave"
   >
@@ -162,7 +162,7 @@
       >
         审核通过
       </a-button>
-      <!-- <a-button
+      <a-button
         pre-icon="ant-design:check-circle-outlined"
         type="primary"
         :loading="loading"
@@ -177,7 +177,7 @@
         @click="Cancel()"
       >
         取消执行
-      </a-button> -->
+      </a-button>
       <a-button
         pre-icon="ant-design:file-excel-outlined"
         type="primary"

From 520cc4614185dcec687d39195f0b6aeca02ace0d Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Wed, 23 Oct 2024 17:42:46 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=88=B1=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/components/ladingInfo.tsx          | 27 +++++++++++++++++++
 src/views/taskmanage/index.vue                |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.tsx b/src/views/operation/seaexport/detail/components/ladingInfo.tsx
index b99051a8..29c55874 100644
--- a/src/views/operation/seaexport/detail/components/ladingInfo.tsx
+++ b/src/views/operation/seaexport/detail/components/ladingInfo.tsx
@@ -1335,6 +1335,16 @@ export const storageColumns: BasicColumn[] = [
     dataIndex: 'bookingParty',
     width: 210,
   },
+  {
+    title: 'ETD',
+    dataIndex: 'etd',
+    width: 100,
+  },
+  {
+    title: '船司参考号',
+    width: 100,
+    dataIndex: 'carrierReferNo',
+  },
   {
     title: '订舱方式',
     dataIndex: 'bookingSlotTypeName',
@@ -1404,4 +1414,21 @@ export const storageSearchFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 4 },
   },
+  {
+    field: 'etd',
+    label: 'ETD',
+    component: 'RangePicker',
+    required: false,
+    dynamicDisabled: false,
+    colProps: { span: 4 },
+    componentProps: {
+      allowClear: true,
+    }
+  },
+  {
+    field: 'carrierReferNo',
+    label: '船司参考号',
+    component: 'Input',
+    colProps: { span: 4 },
+  },
 ]
diff --git a/src/views/taskmanage/index.vue b/src/views/taskmanage/index.vue
index b534a314..6994c81d 100644
--- a/src/views/taskmanage/index.vue
+++ b/src/views/taskmanage/index.vue
@@ -708,7 +708,7 @@ const columns = [
   { 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: 'tasK_REQ_USERNAME', width: 100, title: '发起人' },
   { dataIndex: 'contA_INFO', width: 100, title: '箱型箱量' },
   { dataIndex: 'yarD_NAME', width: 100, title: '场站' },
   { dataIndex: 'etd', width: 180, title: '开船日期' },

From 9199658fa5870ba9b91bda31b999ac351fd81f48 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Wed, 23 Oct 2024 17:50:33 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=88=B1=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Print/printModal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Print/printModal.vue b/src/components/Print/printModal.vue
index 4870fb69..f918f6be 100644
--- a/src/components/Print/printModal.vue
+++ b/src/components/Print/printModal.vue
@@ -1,8 +1,8 @@
 <template>
     <div>
-        <a-modal :footer="false" v-model:visible="visible" title="打印" width="1050px" :maskClosable="false">
+        <a-modal :footer="false" v-model:visible="visible" title="" width="1050px" :maskClosable="false">
             <div style="padding-bottom: 20px">
-                <div style="margin-bottom: 15px;margin-top: 10px">
+                <div style="margin-bottom: 15px;">
                     <a-button type="primary" size="small" @click="print">打印</a-button>
                     <a-button type="primary" size="small" @click="downLoad" style="margin: 0 10px">下载</a-button>
                     <a-button type="primary" size="small" @click="openMail" >发送邮件</a-button>