Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/bookingcabin/CabinManagement/index.vue

@@ -340,7 +340,7 @@ function handleSum() {
   }
   sumload.value = true
   GetMergeList(data).then(res => {
-    if (res.successed) {
+    if (res.succeeded) {
       this.$refs.generation.initSum(res.data)
     } else {
       createMessage.error(res.message)
@@ -355,7 +355,7 @@ const loadingExport = ref(false)
 function handleSuport() {
   loadingExport.value = true
   PrintOrder(getForm().getFieldsValue()).then(res => {
-    if (res.successed) {
+    if (res.succeeded) {
       // window.open(
       //   ` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`,
       //   '_blank'

src/views/bookingcabin/generation/index.vue

@@ -60,6 +60,7 @@ const [registerForm, { resetFields, setFieldsValue, getFieldsValue }] = useForm(
   showActionButtonGroup: false,
 })
 const [registerModal, { setModalProps, closeModal }] = useModalInner((data) => {
+  resetFields()
   if (data.type === 'init') {
     console.log(1231233)
     setFieldsValue(data.row)
@@ -177,7 +178,7 @@ function handleSaveCabin() {
   }
   setModalProps({ loading: true })
   CreateBookingOrder(ApiData).then(res => {
-    if (res.successed) {
+    if (res.succeeded) {
       closeModal()
       createMessage.success(res.message)
     } else {

src/views/taskmanage/components/taskButton.vue

@@ -1,18 +1,18 @@
 <template>
     <a-row type="flex" :gutter="16">
-        <a-col>
+        <a-col v-if="buttonList?.includes('转移')" >
             <a-button type="primary" @click="OpenUser">转移任务</a-button>
         </a-col>
-        <a-col>
+        <a-col v-if="buttonList?.includes('完成')">
             <a-button type="primary" @click="FnCompleteTask">完成任务</a-button>
         </a-col>
-        <a-col>
+        <a-col v-if="buttonList?.includes('生成')">
             <a-button type="primary" @click="OpenModal">生 成</a-button>
         </a-col>
-        <a-col>
+        <a-col v-if="buttonList?.includes('取消')">
             <a-button type="danger" @click="FnCancelTask">取消任务</a-button>
         </a-col>
-        <a-col>
+        <a-col v-if="buttonList?.includes('邮件')">
             <a-button type="primary" @click="handleSendMail">发送邮件</a-button>
         </a-col>
     </a-row>
@@ -34,6 +34,9 @@ const { createMessage } = useMessage()
 const props = defineProps({
     id: {
         type: String || Number
+    },
+    buttonList:{
+        type: Array
     }
 });
 const UserVisible = ref(false);

src/views/taskmanage/index.vue

@@ -8,8 +8,8 @@
             <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"
-                            @change="changeTopLevel">
+                        <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>
@@ -37,19 +37,19 @@
                 </div>
             </a-spin>
         </div>
-        <div style="width: 84%;">
+        <div style="width: 80%;">
             <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handledbclick">
                 <template #tableTitle>
                     <a-popconfirm title="是否取消当前选择项？" ok-text="是" cancel-text="否" @confirm="removeFun">
-                        <a-button type="link"> <i class="icon-chahao iconfont"></i> 取消</a-button>
+                        <a-button type="link"> <i class="icon-weiwancheng iconfont"></i> 取消</a-button>
                     </a-popconfirm>
                     <a-popconfirm title="确定完成当前选择项？" ok-text="是" cancel-text="否" @confirm="submitFun">
                         <a-button type="link"><i class="icon-yiwancheng2 iconfont"></i>完成</a-button>
                     </a-popconfirm>
                     <a-button type="link" @click="FnPrint"><i class="icon-weibiaoti-- iconfont"></i>打印</a-button>
-                    <a-button type="link" @click="FnSendCar"><i class="icon-chezaikucun iconfont"></i>派车</a-button>
+                    <!-- <a-button type="link" @click="FnSendCar"><i class="icon-chezaikucun iconfont"></i>派车</a-button>
                     <a-button type="link" @click="CancelSendCar"><i
-                            class="icon-weiwancheng iconfont"></i>取消派车</a-button>
+                            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>
@@ -215,6 +215,22 @@
             </BasicTable>
         </div>
     </div>
+    <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>
+                时间{{ bcFile.executeTime }}
+            </div>
+            <span> {{ bcFile.batchTotal }}</span>
+        </div>
+        <div ref="bcBox" class="bc-box" v-if="bcFile.ext && bcFile.ext.length > 0">
+            <div class="bc-item" v-for="(item, index) in bcFile.ext" :key="index">
+                <span>{{ item.bno }}</span>
+                <span> {{ item.msg }}</span>
+            </div>
+        </div>
+        <div v-else>{{ bcFile.msg }}</div>
+    </a-modal>
 
 </template>
 <script lang="ts" setup>
@@ -222,6 +238,8 @@ import { ref, onMounted } from 'vue'
 import { formatParams } from '/@/hooks/web/common'
 import { searchFormSchema } from './columns'
 import { BasicTable, useTable, TableAction } from '/@/components/Table'
+import { useMessage } from '../../hooks/web/useMessage'
+const { createMessage } = useMessage()
 import {
     GetCurrentTotalStat, GetPageAsync, TaskManageTruckGetInfoByTaskId,
     TaskManageTruckPrintTemplateWithHistoryList,
@@ -384,7 +402,7 @@ const [registerTable, { reload, setLoading, getForm, getSelectRows, setProps }]
         const res: API.DataResult = await GetPageAsync(p)
         return new Promise((resolve) => {
             resolve({
-                data: res.data, total: res.count
+                data: startData, total: res.count
             })
         })
     },
@@ -443,154 +461,154 @@ function handleEdit(data) {
             // VGM比对查看页面
             go({
                 path: '/commontaskmanage/vgmCompare',
-                query: { taskPKId: data.pK_ID, type: data.status }
+                query: { taskPKId: data.id, type: data.status }
             });
             break;
         case 'INVOICE_BILL_MAIL':
             // 航次账单查看
             go({
                 path: '/commontaskmanage/invoiceBillMail',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'PER_BILL':
             // 单票账单查看
             go({
                 path: '/commontaskmanage/perBill',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'CHANGE_SHIP':
             // 换船通知查看
             go({
                 path: '/commontaskmanage/changeShip',
-                query: { taskPKId: data.pK_ID, type: 'change' }
+                query: { taskPKId: data.id, type: 'change' }
             });
             break;
         case 'ABORT_CHANGE_SHIP':
             // 取消换船通知查看
             go({
                 path: '/commontaskmanage/changeShip',
-                query: { taskPKId: data.pK_ID, type: 'abortChange' }
+                query: { taskPKId: data.id, type: 'abortChange' }
             });
             break;
         case 'ORIGINAL_LOST':
             // 正本缺失查看
             go({
                 path: '/commontaskmanage/originalLost',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'SI_FEEDBACK':
             // 订舱详情编辑
             go({
                 path: '/commontaskmanage/TaskmanageDetail',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'TRUCK_DISPATCH':
             // 派车编辑
             go({
                 name: 'SendCarAdd',
-                query: { type: 'Edit', taskPKId: data.pK_ID }
+                query: { type: 'Edit', taskPKId: data.id }
             });
             break;
         case 'BC':
             // BC编辑
             go({
                 path: '/commontaskmanage/BcEditing',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'BC_MODIFY':
             // BC变更 Amendment
             go({
                 path: '/commontaskmanage/Amendment',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'CANCELLATION':
             // Cancellation
             go({
                 path: '/commontaskmanage/Cancellation',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'ROLLING_NOMINATION':
             // ROLLING_NOMINATION
             go({
                 path: '/commontaskmanage/rollingNomination',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'VGM_FEEDBACK':
             // VGM_FEEDBACK
             go({
                 path: '/commontaskmanage/vgmDetail',
-                query: { taskPKId: data.pK_ID, type: 'VGM_FEEDBACK' }
+                query: { taskPKId: data.id, type: 'VGM_FEEDBACK' }
             });
             break;
         case 'CAUTION_NOTICE':
             // CAUTION_NOTICE 重要提醒
             go({
                 path: '/commontaskmanage/cautionNotice',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'VGM_MISSING':
             // VGM_MISSING VGM未提交
             go({
                 path: '/commontaskmanage/vgmDetail',
-                query: { taskPKId: data.pK_ID, type: 'VGM_MISSING' }
+                query: { taskPKId: data.id, type: 'VGM_MISSING' }
             });
             break;
         case 'CUT_MODIFY':
             // CUT_MODIFY 截止时间变更
             go({
                 path: '/commontaskmanage/cutModify',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'POD_DISCHARGE_FULL':
             //  目的港未提货
             go({
                 path: '/commontaskmanage/podDischargeFull',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'TRNAS_PLAN_HAS_CHANGE':
             // 运输计划已变更
             go({
                 path: '/commontaskmanage/transPlanHasChange',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'DRAFT':
             // DRAFT
             go({
                 path: '/commontaskmanage/draft',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'ROUTE_CUT_CHANGE':
             // 航线截至事件调整
             go({
                 path: '/commontaskmanage/routeCutChange',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         case 'POD_GATEOUT_FULL':
             // 目的港未返空箱 
             go({
                 path: '/commontaskmanage/podGateoutFull',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
         default:
             // 默认跳转到订舱详情查看页面
             go({
                 path: '/commontaskmanage/BookingDetails',
-                query: { taskPKId: data.pK_ID }
+                query: { taskPKId: data.id }
             });
             break;
     }
@@ -598,53 +616,49 @@ function handleEdit(data) {
 function handleDelete() {
 
 }
-
+const bcFileFlag = ref(false)
+const bcFile = ref({}) as any
 // 取消
 function removeFun() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
-    console.log('当前选中', pkIdArr)
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     CancelTask(pkIdArr)
         .then(res => {
-            if (res.success) {
-                this.$message.success('取消任务成功')
-                this.bcFileFlag = true
-                this.bcFile = res.data
-                this.getCurrentTotalStat()
+            if (res.succeeded) {
+                createMessage.success('取消任务成功')
+                bcFileFlag.value = true
+                bcFile.value = res.data
+                reload()
             } else {
-                this.$message.error(res.message)
+                createMessage.error(res.message)
             }
         })
-        .catch(err => {
-            console.log(err)
-        })
 }
 // 完成
 function submitFun() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
-    console.log('当前选中', pkIdArr)
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     CompleteTask(pkIdArr)
         .then(res => {
-            if (res.success) {
-                this.$message.success('已完成任务')
-                this.bcFileFlag = true
-                this.bcFile = res.data
-                this.getCurrentTotalStat()
+            if (res.succeeded) {
+                createMessage.success('已完成任务')
+                bcFileFlag.value = true
+                bcFile.value = res.data
+                reload()
             } else {
-                this.$message.error(res.message)
+                createMessage.error(res.message)
             }
         })
         .catch(err => {
@@ -653,13 +667,13 @@ function submitFun() {
 }
 // 批量下载
 function downloadFun() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
     console.log('当前选中', pkIdArr)
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     pkIdArr.map(item => {
@@ -695,36 +709,47 @@ function downloadTaskAttach(id, name) {
 // 重新比对
 function reComparisonFun() {
     // 未找到接口
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     const query = this.$qs.stringify({ PKIds: pkIdArr }, { arrayFormat: 'repeat' })
     ManualReCompareBC(query)
         .then(res => {
-            if (res.success) {
-                this.$message.success('重新比对完成')
+            if (res.succeeded) {
+                createMessage.success('重新比对完成')
             } else {
-                this.$message.error(res.message)
+                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('复制成功')
+}
 // 批量转发
 function SendEmailFun() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
     console.log('当前选中', pkIdArr)
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     this.sendEmailPkIds = pkIdArr
@@ -733,22 +758,22 @@ function SendEmailFun() {
 
 // 打印
 function FnCilckTemplateType(templateId) {
-    this.$message.success(`搜索文件中...`)
+    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.pK_ID,
+                    taskPKId: res.data.ext.id,
                     templateId,
                     cateCode: 'truckBill',
                     type: this.PrintType,
                     printType
                 }).then(res => {
-                    if (!res.success) {
-                        this.$message.error(res.message)
+                    if (!res.succeeded) {
+                        createMessage.error(res.message)
                     } else {
-                        // this.$message.success(res.data)
+                        // createMessage.success(res.data)
                         if (this.PrintType == 1) {
                             window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/ViewPrintPdf/${res.data}`, '_blank')
                         } else {
@@ -760,7 +785,7 @@ function FnCilckTemplateType(templateId) {
                     }
                 })
             } else {
-                this.$message.error(`${res.data.msg}`)
+                createMessage.error(`${res.data.msg}`)
             }
             this.confirmLoading = false
         })
@@ -787,12 +812,12 @@ function GetPrintData(cateCode, printType) {
     })
 }
 function FnPrint() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
     if (pkIdArr.length != 1) {
-        this.$message.error('请仅选择一条数据')
+        createMessage.error('请仅选择一条数据')
         return false
     }
     this.pkIdArr = pkIdArr
@@ -806,59 +831,59 @@ function FnPrint() {
     this.GetPrintData('truckBill', printType)
 }
 function FnSendCar() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     TaskManageTruckSendDispatchBatchByTask(pkIdArr).then(res => {
         if (res.data.succ) {
-            this.$message.success('派车成功')
+            createMessage.success('派车成功')
         } else {
-            this.$message.error(`派车失败,${res.data.msg}`)
+            createMessage.error(`派车失败,${res.data.msg}`)
         }
     })
 }
 function CancelSendCar() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     TaskManageTruckCancelDispatchBatchByTask(pkIdArr).then(res => {
         if (res.data.succ) {
-            this.$message.success('取消派车成功')
+            createMessage.success('取消派车成功')
         } else {
-            this.$message.error(`取消派车失败,${res.data.msg}`)
+            createMessage.error(`取消派车失败,${res.data.msg}`)
         }
     })
 }
 
 // 页数计算
 function laraPaperCalc() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     const query = this.$qs.stringify({ PKIds: pkIdArr }, { arrayFormat: 'repeat' })
     LaraPaperCalc(query)
         .then(res => {
-            if (res.success) {
+            if (res.succeeded) {
                 this.paperCalcRes = res.data
                 this.paperCalcExtras = res.extras || ''
                 this.paperCalcVisible = true
             } else {
-                this.$message.error(res.message)
+                createMessage.error(res.message)
             }
         })
         .catch(err => {
@@ -870,12 +895,12 @@ function handlePaperCalcCancel() {
 }
 // COPY打印
 function copyPrintFun() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     PrintBatch({
@@ -885,7 +910,7 @@ function copyPrintFun() {
             // 接口暂时报错
             if (res.message) {
                 const downLoadErrTip = `COPY打印失败：${res.message}`
-                this.$message.error(downLoadErrTip)
+                createMessage.error(downLoadErrTip)
                 return false
             }
             const blob = new Blob([res], { type: `application/pdf;chartset=UTF-8` })
@@ -904,12 +929,12 @@ function copyPrintFun() {
 }
 // COPY下载
 function copyDownloadFun() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     DownloadAttach({
@@ -919,7 +944,7 @@ function copyDownloadFun() {
             // 暂时报错 接口404 文档中也没有 等更新
             if (res.message) {
                 const downLoadErrTip = `COPY下载失败：${res.message}`
-                this.$message.error(downLoadErrTip)
+                createMessage.error(downLoadErrTip)
                 return false
             }
             const blob = new Blob([res], { type: `application/pdf;chartset=UTF-8` })
@@ -938,12 +963,12 @@ function copyDownloadFun() {
 }
 // 正本下载
 function printBatchFun() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     DownloadOriginalTask({
@@ -953,7 +978,7 @@ function printBatchFun() {
             // 接口调用成功，但是无下载数据？？？？
             if (res.message) {
                 const downLoadErrTip = `正本下载失败：${res.message}`
-                this.$message.error(downLoadErrTip)
+                createMessage.error(downLoadErrTip)
                 return false
             }
             const blob = new Blob([res], { type: `application/pdf;chartset=UTF-8` })
@@ -972,12 +997,12 @@ function printBatchFun() {
 }
 // LARA登记
 function laraPaperRegistFun() {
-    const select = this.$refs.xGrid.getCheckboxRecords()
+    const select = getSelectRows()
     const pkIdArr = select.map((item, index) => {
-        return item.pK_ID
+        return item.id
     })
     if (pkIdArr.length === 0) {
-        this.$message.error('请选择数据')
+        createMessage.error('请选择数据')
         return false
     }
     const pkids = pkIdArr.toString()
@@ -1041,8 +1066,9 @@ function handleClickTree(row, index) {
 }
 
 /deep/ .nav-title .ant-radio-button-wrapper {
-    width: 50%;
     padding: 0px;
+    flex-grow: 1;
+
 }
 
 /deep/ .ant-radio-button-wrapper:not(:first-child)::before {
@@ -1185,7 +1211,7 @@ function handleClickTree(row, index) {
     padding: 5px 14px;
     background: #fff;
     border-radius: 2px;
-    width: 16%;
+    width: 20%;
     flex-shrink: 0;
 }
 

src/views/taskmanage/taskList/BcEditing.vue

@@ -6,7 +6,7 @@
             </a-col>
             <a-col>
                 <pdf ref="pdfData"></pdf>
-                <taskButton @loadingStart="loadingStart" @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"></taskButton>
+                <taskButton :buttonList="['取消','完成','转移','生成','邮件']" @loadingStart="loadingStart" @loadingStop="loadingStop" :id="taskPKId" ref="taskButtonRef"></taskButton>
             </a-col>
         </a-row>
     </a-spin>

src/views/taskmanage/taskList/cautionNotice.vue

@@ -0,0 +1,119 @@
+<template>
+    <a-spin :spinning="spinning">
+        <div class="main">
+            <div class="LeftHead">
+                <p>
+                    <i class="icon-jinggao1 iconfont" style="color: red;margin-right: 10px;font-size: 16px"></i>
+                    重要提醒({{ taskData.cautionNoticeTypeName }})
+                    -{{ taskData.carrier }}
+                </p>
+                <p>时间：{{ taskData.createTime }}</p>
+            </div>
+            <a-row style="margin-bottom: 20px;" >
+                <a-col :span="4">
+                    <div style="font-weight: bold">提单号</div>
+                    {{ taskData.mblNo }}
+                </a-col>
+                <a-col :span="4">
+                    <div style="font-weight: bold">原值</div>
+                    {{ taskData.origVal }}
+                </a-col>
+            </a-row>
+            <a-row >
+                <a-col :span="4">
+                    <div style="font-weight: bold">差异内容</div>
+                    {{ taskData.cautionNoticeTypeName }}
+                </a-col>
+                <a-col :span="4">
+                    <div style="font-weight: bold">新值</div>
+                    {{ taskData.newVal }}
+                </a-col>
+            </a-row>
+            <a-row style="margin-top: 40px;padding-left: 120px" type="flex" :gutter="16">
+                <taskButton :buttonList="['取消','完成','转移']"  @loadingStart="loadingStart" @loadingStop="loadingStop" :id="taskPKId"></taskButton>
+            </a-row>
+        </div>
+    </a-spin>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted } from 'vue'
+import { GetInfoByTaskIdNotice } from '../api'
+import { useMessage } from '../../../hooks/web/useMessage'
+import taskButton from '../components/taskButton.vue'
+const { createMessage } = useMessage()
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const spinning = ref(false)
+const taskData = ref({}) as any
+const taskPKId = ref(route.query.taskPKId)
+onMounted(()=>{
+    // getInfo()
+    taskData.value = {
+    "pkId": "08dc9904-5d50-4c1d-8255-fe30e3503e4e",
+    "cautionNoticeType": "VesselCutDateTransfer",
+    "cautionNoticeTypeName": "船名航次、变中转、截止时间提前",
+    "mblNo": "238699308",
+    "taskPKId": "08dc9904-5d27-48c9-8748-e89f4de721c3",
+    "createTime": "2024-06-30 20:58:40",
+    "origVal": "",
+    "newVal": "",
+    "carrier": "MSK",
+    "vgmCutOldVal": "2024-06-30 20:00",
+    "vgmCutNewVal": "2024-06-11 10:00",
+    "siCutOldVal": "2024-06-30 20:00",
+    "siCutNewVal": "2024-06-11 10:00",
+    "vesselOldVal": "MORTEN MAERSK3",
+    "vesselNewVal": "MORTEN MAERSK",
+    "voynoOldVal": "424W3",
+    "voynoNewVal": "424W",
+    "isWeekDiff": false,
+    "isPriceDateDiff": false,
+    "isTransfer": false,
+    "isVesselChange": true,
+    "isCutDateAdvanced": true
+}
+})
+function getInfo() {
+    spinning.value = true
+    const ApiData = {
+        taskPKId: taskPKId.value
+    }
+    GetInfoByTaskIdNotice(ApiData).then(res => {
+        if (res.succeeded) {
+            taskData.value = res.data
+        } else {
+            createMessage.error(res.message)
+        }
+        spinning.value = false
+    })
+}
+function loadingStart(){
+    spinning.value = true
+}
+function loadingStop(){
+    spinning.value = false
+}
+
+</script>
+<style lang="less" scoped>
+.LeftHead {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    padding: 8px;
+    margin-bottom: 16px;
+    border-bottom: 1px solid #000;
+
+    p {
+        margin: 0;
+
+        &:nth-child(1) {
+            font-weight: bold;
+        }
+    }
+}
+
+.main {
+    padding: 20px;
+}
+</style>