发票+任务+舱位

.env.development

@@ -13,7 +13,7 @@ VITE_PUBLIC_PATH = /
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
 # VITE_PROXY = [["/basic-api","http://60.209.125.238"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY=[["/api","http://118.190.144.189:3008"],["/stage-api","https://www.666cxf.com/stage-api"]]  # 开发 测试环境
+VITE_PROXY=[["/api","http://60.209.125.238:3008"],["/stage-api","https://www.666cxf.com/stage-api"]]  # 开发 测试环境
 
 # Delete console
 VITE_DROP_CONSOLE = false

src/views/bookingcabin/CabinManagement/api.ts

@@ -188,4 +188,12 @@ export function SaveRolling(parameter) {
     method: 'post',
     data: parameter
   })
+}
+
+export function GetRollingList(parameter) {
+  return request<DataResult>({
+    url: '/opApi/BookingSlotService/GetRollingList',
+    method: 'get',
+    params: parameter
+  })
 }

src/views/bookingcabin/CabinManagement/detail/index.vue

@@ -294,7 +294,7 @@ import { GetCtnSelectList, GetClientListByCode } from '/@/api/common'
 import DsFile from '/@/components/File/index.vue'
 import { ref, nextTick, onMounted, watch } from 'vue'
 import {
-    BookingSlotSave, BookingSlotDetail, SaveRolling
+    BookingSlotSave, BookingSlotDetail, SaveRolling,GetRollingList
 } from '../api'
 import {
     GetCustomerServiceList, GetSaleList, GetVouchingClerkList
@@ -740,6 +740,11 @@ function getDetail() {
         }
         loading.value = false
     })
+    GetRollingList({ slotId: id.value }).then(res=>{
+        if(res.succeeded){
+            setTableData(res.data)
+        }
+    })
 }
 const rollLoad = ref(false)
 function handleSaveRoll(){
@@ -932,6 +937,7 @@ function handleClick(item) {
         item.ctnNum = 1
     })
 }
+
 // 比较对象
 function compareObjects(oldObj, newObj) {
     const differences = {};

src/views/operation/bill/columns.tsx

@@ -215,6 +215,12 @@ export const columns: BasicColumn[] = [
     width: 100,
     align: 'left',
   },
+  {
+    title: '分单号',
+    dataIndex: 'hblNo',
+    width: 100,
+    align: 'left',
+  },
   {
     title: '提单签发状态',
     dataIndex: 'statusName',
@@ -222,11 +228,29 @@ export const columns: BasicColumn[] = [
     align: 'left',
   },
   {
-    title: '签单方式',
+    title: '提单类型',
     dataIndex: 'blTypeName',
     width: 100,
     align: 'left',
   },
+  {
+    title: '业务类型',
+    dataIndex: 'busiTypeName',
+    width: 100,
+    align: 'left',
+  },
+  {
+    title: '签单方式',
+    dataIndex: 'issueType',
+    width: 100,
+    align: 'left',
+  },
+  {
+    title: '主单分单',
+    dataIndex: 'masterHBillName',
+    width: 100,
+    align: 'left',
+  },
   {
     title: '最近操作人',
     dataIndex: 'updateUserName',
@@ -247,7 +271,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '结算方式',
-    dataIndex: 'createByName',
+    dataIndex: 'stlName',
     width: 100,
     align: 'left',
   },
@@ -299,12 +323,6 @@ export const columns: BasicColumn[] = [
     width: 100,
     align: 'left',
   },
-  {
-    title: '业务类型',
-    dataIndex: 'busiTypeName',
-    width: 100,
-    align: 'left',
-  },
   {
     title: '起运港',
     dataIndex: 'loadPort',
@@ -397,31 +415,31 @@ export const detailColumns: BasicColumn[] = [
   {
     title: '操作人',
     dataIndex: 'createUserName',
-    width: 100,
+    width: 80,
     align: 'left',
   },
   {
     title: '操作时间',
     dataIndex: 'createTime',
-    width: 120,
+    width: 130,
     align: 'left',
   },
   {
     title: '动作',
     dataIndex: 'actionName',
-    width: 100,
+    width: 80,
     align: 'left',
   },
   {
     title: '结果',
     dataIndex: 'result',
-    width: 50,
+    width: 45,
     align: 'left',
   },
   {
     title: '备注',
     dataIndex: 'note',
-    width: 100,
+    width: 90,
     align: 'left',
   },
 ]
@@ -435,17 +453,17 @@ export const feeColumns: BasicColumn[] = [
   {
     title: 'RMB应收欠费(超期)',
     dataIndex: 'noPayAmountCNY',
-    width: 140,
+    width: 130,
   },
   {
     title: 'USD应收欠费(超期)',
     dataIndex: 'noPayAmountUSD',
-    width: 140,
+    width: 130,
   },
   {
     title: '合计应收欠费(超期)',
     dataIndex: 'noPayAmountTotal',
-    width: 140,
+    width: 130,
   },
 
 

src/views/taskmanage/index.vue

@@ -1636,8 +1636,21 @@ function handleClickTree(row, index) {
       item.active = false
     })
     taskType.value = ''
-    console.log(arr1)
-    setColumns(arr1)
+    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 (arr.length == 0) {
+      setColumns(columns)
+    } else {
+      setColumns(arr)
+    }
   }
 
   reload()
@@ -1987,7 +2000,7 @@ function handleClickTree(row, index) {
   width: 15px;
 }
 
-:deep(.ant-table-tbody .ant-table-row td){
+:deep(.ant-table-tbody .ant-table-row td) {
   border-right: 1px solid #f0f0f0 !important;
   text-align: center;
 }