服务器更换

.env.development

@@ -15,7 +15,6 @@ VITE_PUBLIC_PATH = /
 # VITE_PROXY = [["/basic-api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
 VITE_PROXY=[["/api","http://118.190.144.189:3008"],["/stage-api","https://www.666cxf.com/stage-api"]]  # 开发 测试环境
 
-
 # Delete console
 VITE_DROP_CONSOLE = false
 

src/views/taskmanage/api.ts

@@ -27,7 +27,7 @@ export function GetUserListAll() {
 
 export function TransferTask(parameter) {
   return request<DataResult>({
-    url: '/TaskManageBC/TransferTask',
+    url: '/taskApi/TaskManageBC/TransferTask',
     method: 'get',
     params: parameter
   })
@@ -322,15 +322,15 @@ export function GetVGMSubmissionInfoByTaskId(parameter) {
 
 export function GetInfoByTaskId(parameter) {
   return request<DataResult>({
-    url: '/TaskManageBC/GetInfoByTaskId',
+    url: '/taskApi/TaskManageBC/GetInfoByTaskId',
-    method: 'get',
+    method: 'post',
     params: parameter
   })
 }
 
 export function DownloadFileByBC(parameter) {
   return request<DataResult>({
-    url: '/TaskManageBC/DownloadFile',
+    url: '/taskApi/TaskManageBC/DownloadFile',
     method: 'get',
     params: parameter,
     responseType: 'blob'
@@ -338,7 +338,7 @@ export function DownloadFileByBC(parameter) {
 }
 export function GetProjectList(parameter) {
   return request<DataResult>({
-    url: '/TaskManageBC/GetProjectList',
+    url: '/taskApi/TaskManageBC/GetProjectList',
     method: 'get',
     params: parameter
   })
@@ -346,7 +346,7 @@ export function GetProjectList(parameter) {
 
 export function DownloadFile(parameter) {
   return request<DataResult>({
-    url: '/TaskManageBC/DownloadFile',
+    url: '/taskApi/TaskManageBC/DownloadFile',
     method: 'get',
     params: parameter,
     responseType: 'blob'
@@ -355,7 +355,7 @@ export function DownloadFile(parameter) {
 
 export function CreateBookingAndSlot(parameter) {
   return request<DataResult>({
-    url: '/TaskManageBC/CreateBookingAndSlot',
+    url: '/taskApi/TaskManageBC/CreateBookingAndSlot',
     method: 'post',
     data: parameter
   })
@@ -363,7 +363,7 @@ export function CreateBookingAndSlot(parameter) {
 
 export function TaskManageBCSendEmai1(parameter) {
   return request<DataResult>({
-    url: '/TaskManageBC/SendEmail',
+    url: '/taskApi/TaskManageBC/SendEmail',
     method: 'get',
     params: parameter
   })
@@ -377,7 +377,7 @@ export function TaskTransPlanHasChange(parameter) {
 }
 export function TaskManageBCGetCompareResult(parameter) {
   return request<DataResult>({
-    url: '/TaskManageBC/GetCompareResult',
+    url: '/taskApi/TaskManageBC/GetCompareResult',
     method: 'get',
     params: parameter
   })
@@ -569,7 +569,7 @@ export function DRAFTSearchAndConnectBookingInfo(parameter) {
 
 export function BcSearchAndConnectBookingInfo(parameter) {
   return request<DataResult>({
-    url: '/TaskManageBC/ReCompareResult',
+    url: '/taskApi/TaskManageBC/ReCompareResult',
     method: 'get',
     params: parameter
   })
@@ -577,7 +577,7 @@ export function BcSearchAndConnectBookingInfo(parameter) {
 
 export function ReCompareResult(parameter) {
   return request<DataResult>({
-    url: '/TaskManageBC/SearchAndConnectBookingInfo',
+    url: '/taskApi/TaskManageBC/SearchAndConnectBookingInfo',
     method: 'get',
     params: parameter
   })
@@ -585,7 +585,7 @@ export function ReCompareResult(parameter) {
 
 export function GetBookingOrder(parameter) {
   return request<DataResult>({
-    url: '/TaskManageBC/GetBookingOrder',
+    url: '/taskApi/TaskManageBC/GetBookingOrder',
     method: 'get',
     params: parameter
   })

src/views/taskmanage/components/taskData.vue

@@ -1,5 +1,5 @@
 <template>
-    <a-form :label-col="labelCol" :wrapper-col="wrapperCol" :model="form">
+    <a-form :label-col="labelCol" :wrapper-col="wrapperCol" :model="form" style="font-size: 12px !important ;" >
         <div class="box">
             <div class="LeftHead">
                 <p class="title">
@@ -141,6 +141,7 @@
                 </a-col>
 
                 <div v-if="form.carriageType == 'TRANSFER_SHIP'">
+                    <a-row>
                     <a-col :span="24">
                         <p class="title">二程</p>
                     </a-col>
@@ -151,7 +152,7 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="8">
-                        <a-form-item label="ETD：">
+                        <a-form-item label="">
                             <div>ETD</div>
                             <span class="text"> {{ form.secondETD ? form.secondETD.substring(0, 11) : '-'
                                 }}</span>
@@ -176,6 +177,7 @@
                             <span class="text"> {{ form.portDischarge }}</span>
                         </a-form-item>
                     </a-col>
+                    </a-row>
                 </div>
             </a-row>
         </div>
@@ -233,6 +235,8 @@
 import { ref, onMounted } from 'vue'
 const wrapperCol = { span: 22 }
 const labelCol = { span: 0 }
+import { useMessage } from '../../../hooks/web/useMessage'
+const { createMessage } = useMessage()
 import { useRouter, useRoute } from 'vue-router'
 const props = defineProps({
     title: {
@@ -259,7 +263,7 @@ function copyText(text) {
     inputDom.focus()
     document.execCommand('copy')
     document.body.removeChild(inputDom)
-    this.$message.success('复制成功')
+    createMessage.success('复制成功')
 }
 function Rcolor(hexColor) {
     const hex = hexColor.replace('#', '').toLowerCase()
@@ -288,11 +292,13 @@ function init(data){
 .text {
     font-weight: 700;
     color: black;
+    font-size: 12px;
 }
 
 /deep/ .ant-form-item-control-input-content {
     div {
         color: rgba(122, 135, 152, 1);
+        font-size: 12px;
     }
 }
 
@@ -302,7 +308,7 @@ function init(data){
     margin-bottom: 16px;
 
     .title {
-        font-size: 15px;
+        font-size: 12px;
         font-weight: 700;
         color: black;
     }

src/views/taskmanage/taskList/BcEditing.vue

@@ -2,21 +2,25 @@
     <a-spin :spinning="spinning">
         <a-row style="padding: 15px;" :gutter="16">
             <a-col :span="pdfUrl ? 11 : 24">
-                <taskData ref="taskDataRef" title='Booking Confirmation' ></taskData>
+                <taskData ref="taskDataRef" title='Booking Confirmation'></taskData>
             </a-col>
             <a-col>
                 <pdf ref="pdfData"></pdf>
-                <taskButton :buttonList="['取消','完成','转移','生成','邮件']" @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>
 </template>
 <script lang="ts" setup>
 import { ref, onMounted } from 'vue'
-import { useRouter,useRoute } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 import pdf from '../components/pdf.vue'
 import taskData from '../components/taskData.vue'
 import taskButton from '../components/taskButton.vue'
+import { GetInfoByTaskId } from '../api'
+import { useMessage } from '../../../hooks/web/useMessage'
+const { createMessage } = useMessage()
 const route = useRoute()
 const router = useRouter();
 const form = ref({
@@ -87,21 +91,32 @@ const form = ref({
 const pdfUrl = ref('123')
 const taskDataRef = ref()
 onMounted(() => {
-    taskDataRef.value.init(form.value)
+    pdfData.value.init()
+    getInfo()
 })
 const taskPKId = ref(route.query.taskPKId)
 const spinning = ref(false)
 
 const pdfData = ref()
 
-onMounted(() => {
+function getInfo() {
-    pdfData.value.init()
+    const ApiData = {
-})
+        taskId: taskPKId.value
+    }
+    GetInfoByTaskId(ApiData).then(res => {
+        if (res.data.succ) {
+            taskDataRef.value.init(res.data.ext)
+        } else {
+            createMessage.error(res.data.msg)
+        }
+        // this.ChangeFileRadio()
+    })
+}
 
-function loadingStart(){
+function loadingStart() {
     spinning.value = true
 }
-function loadingStop(){
+function loadingStop() {
     spinning.value = false
 }
 

src/views/taskmanage/taskList/rollingNomination.vue

@@ -1,3 +1,227 @@
 <template>
-    rollingNomination
+    <div class="main">
+        <a-spin :spinning="spinning">
+            <div class="box">
+                <div class="LeftHead">
+                    <p>
+                        <i class="icon-PC_gangkou iconfont"
+                            style="color: orange;margin-right: 10px;font-size: 16px"></i>
+                        Rolling Nomination({{ taskData.carrier }})
+                    </p>
+                    <p>时间：{{ taskData.createTime }}</p>
+                </div>
+                <div class="main-box" v-for="(item, index) in taskData.fromToList" :key="index">
+                    <div class="box">
+                        <div class="box-title">
+                            原船
+                        </div>
+                        <div class="content">
+                            <div class="row">
+                                船名/航次：{{ item.fromShip.vessel }} /
+                                {{ item.fromShip.voyNo }}
+                            </div>
+                            <div class="row">
+                                {{ item.fromShip.port }}ETD：{{ item.fromShip.etd }}
+                            </div>
+                            <div class="row">
+                                {{ item.fromShip.terminal }}
+                            </div>
+                        </div>
+                    </div>
+                    <div class="middle">换船</div>
+                    <div v-for="(toData, index1) in item.toShipList" :key="index1"
+                        style="display: flex;align-items: center;">
+                        <div class="middleOr" v-if="index1 !== 0">或</div>
+                        <div class="box">
+                            <div class="box-title">
+                                新船{{ index1 + 1 }}
+                                VslCode:{{ toData.vslCode }} String:{{ toData.shipString }}
+                            </div>
+                            <div class="content">
+                                <div class="row">
+                                    船名/航次：{{ toData.vessel }} / {{
+                                        toData.voyNo }}
+                                </div>
+                                <div class="row">
+                                    {{ toData.port }}
+                                    ETD：{{
+                                        toData.etd ? toData.etd : '-' }}
+                                </div>
+                                <div class="row">
+                                    {{ toData.terminal }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </a-spin>
+    </div>
 </template>
+<script lang="ts" setup>
+import { ref, onMounted } from 'vue'
+import { GetInfoByTaskIdNotice } from '../api'
+import { useMessage } from '../../../hooks/web/useMessage'
+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 = {
+        "planType": "Rolling",
+        "carrierId": "MSK",
+        "confirmDeadLine": "2024-07-25 14:30:00",
+        "createTime": "2024-07-25 11:53:38",
+        "rollingPlanList": [
+            "*Nominated cargoes will be rolled to [",
+            "GSL Maria T5F-432S",
+            "],\r\n with ETA delay of [7] days.",
+            ""
+        ],
+        "from": [
+            {
+                "shipType": "From",
+                "shipString": "DRAGON",
+                "vslCode": "C4D",
+                "vessel": "GSL MELITA",
+                "voyNo": "431S",
+                "port": "Qingdao",
+                "terminal": "Qingdao Qianwan Container Co Ltd",
+                "groupIndx": 0,
+                "pkId": "08dcac5d-5e6f-476f-80f6-be148cb414ab"
+            }
+        ],
+        "to": [
+            {
+                "shipType": "To",
+                "shipString": "DRAGON",
+                "vslCode": "T5F",
+                "vessel": "GSL MARIA",
+                "voyNo": "432S",
+                "port": "Qingdao",
+                "terminal": "Qingdao Qianwan Container Co Ltd",
+                "groupIndx": 0,
+                "pkId": "08dcac5d-5e70-430e-8415-fedd8d0be840"
+            }
+        ],
+        "fromToList": [
+            {
+                "fromShip": {
+                    "shipType": "From",
+                    "shipString": "DRAGON",
+                    "vslCode": "C4D",
+                    "vessel": "GSL MELITA",
+                    "voyNo": "431S",
+                    "port": "Qingdao",
+                    "terminal": "Qingdao Qianwan Container Co Ltd",
+                    "groupIndx": 0,
+                    "pkId": "08dcac5d-5e6f-476f-80f6-be148cb414ab"
+                },
+                "toShipList": [
+                    {
+                        "shipType": "To",
+                        "shipString": "DRAGON",
+                        "vslCode": "T5F",
+                        "vessel": "GSL MARIA",
+                        "voyNo": "432S",
+                        "port": "Qingdao",
+                        "terminal": "Qingdao Qianwan Container Co Ltd",
+                        "groupIndx": 0,
+                        "pkId": "08dcac5d-5e70-430e-8415-fedd8d0be840"
+                    }
+                ]
+            }
+        ],
+        "preBillList": [
+            {
+                "batchId": "08dcac5d-5e7b-41ff-800a-0b3fb13cb4c8",
+                "status": "WAIT",
+                "bookedby": "QINGDAO SHISONGXINGYUAN LOGISTICS TECHNOLOGY CO.,LTD",
+                "contractualName": "QINGDAO SHISONGXINGYUAN LOGISTICS TECHNOLOGY CO.,LTD",
+                "shipment": "242294826",
+                "placeOfReceipt": "Qingdao",
+                "loadPortName": "Qingdao",
+                "dischargePortName": "Melbourne",
+                "placeOfDelivery": "Melbourne",
+                "ctnStat": "20GP*1",
+                "isUserManual": false,
+                "isSend": false,
+                "confirmDeadLine": "2024-07-25 16:30:00",
+                "groupName": "",
+                "ctnNote": ""
+            },
+            {
+                "batchId": "08dcac5d-5e7b-41ff-800a-0b3fb13cb4c8",
+                "status": "WAIT",
+                "bookedby": "QINGDAO SHISONGXINGYUAN LOGISTICS TECHNOLOGY CO.,LTD",
+                "contractualName": "QINGDAO SHISONGXINGYUAN LOGISTICS TECHNOLOGY CO.,LTD",
+                "shipment": "242294826",
+                "placeOfReceipt": "Qingdao",
+                "loadPortName": "Qingdao",
+                "dischargePortName": "Melbourne",
+                "placeOfDelivery": "Melbourne",
+                "ctnStat": "20GP*1",
+                "isUserManual": false,
+                "isSend": false,
+                "confirmDeadLine": "2024-07-25 16:30:00",
+                "groupName": "",
+                "ctnNote": ""
+            }
+        ],
+        "loadDetailList": [],
+        "totalPreBillCtnStat": "20GP*2",
+        "nominationId": "08dcac5d-5e6e-4d02-8e1e-f10f5bd65220"
+    }
+})
+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>
+@import url('./taskStyle.less');
+
+.main-box {
+    display: flex;
+    align-items: center;
+    margin-top: 15px;
+    font-size: 12px;
+
+    .box {
+        border-radius: 2px;
+        .box-title {
+            background: rgba(37, 122, 250, 1);
+            color: white;
+            height: 26px;
+            line-height: 26px;
+            padding-left: 16px;
+        }
+        .content{
+            background: rgba(245, 249, 252, 1);
+            padding-left: 16px;
+        }
+
+    }
+}
+</style>