发票+任务+舱位

feature-JimuReport-1106-yjl
sunzehua 4 weeks ago
parent 48d62f13e7
commit 2e42974af1

@ -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

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

@ -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 = {};

@ -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,
},

@ -1,7 +1,7 @@
<template>
<div class="main">
<div class="top">
<BasicTable :rowClassName="rowClassName" height="600px" @row-click="handleClick" class="examine-table" @register="registerTable">
<div class="top" style="padding-left: 14px;">
<BasicTable :rowClassName="rowClassName" @row-click="handleClick" class="examine-table" @register="registerTable">
<template #tableTitle>
<div class="ds-h-aciton-btns-fee">
<a-tooltip placement="top" :mouseEnterDelay="0.5">
@ -129,9 +129,8 @@
</template>
</BasicTable>
</div>
<div style="padding-left: 20px;">
<a-spin :spinning="loading">
<div style="display: flex;">
<div style="padding-left: 20px;height: 250px">
<div style="display: flex;height: 100%;">
<div class="left">
<div class="title-bold">日志</div>
<BasicTable class="ds-mini-table-detail pay-table" @register="registerTable2">
@ -139,29 +138,28 @@
</BasicTable>
</div>
<div class="middle">
<div style="display: flex">
<div style="width: 65%;margin-right: 1%">
<div style="display: flex;width: 100%;">
<div style="width: 63%;margin-right: 2%">
<div class="title-bold">欠费信息</div>
<BasicTable class="ds-mini-table-detail pay-table" @register="registerTable3">
</BasicTable>
</div>
<div style="width: 38%">
<div class="title-bold" style="display: flex">
<div style="width: 35%">
<div class="title-bold" style="display: flex;line-height: 18.84px;height: 18.84px">
<span>附件</span>
<DsFile @handleSuccess="fileSuccess" ref="dsFile" :showFileList="false" :id="bookid"
:show="false" height="300">
<DsFile @handleSuccess="fileSuccess" ref="dsFile" :showFileList="false" :id="bookid" :show="false"
height="300">
<i style="margin-left: 15px;color: #257afa;cursor: pointer;" @click="addFile"
class="iconfont icon-fujian"></i>
</DsFile>
</div>
<a-table size="small" :scroll="{ x: 200 }" :pagination="false" rowKey="id"
:columns="columnsFile" :data-source="fileData" bordered>
<BasicTable class="ds-mini-table-detail pay-table" @register="registerTable5">
<template v-slot:bodyCell="{ column, record }">
<template v-if="column.dataIndex == 'fileName'">
<a @click="download(record)">{{ record.fileName }}</a>
</template>
</template>
</a-table>
</BasicTable>
</div>
</div>
</div>
@ -179,10 +177,9 @@
</div>
</div>
</div>
</a-spin>
</div>
<a-modal width="600px" @cancel="checkFlag = false" @ok="sureCheckIn" :visible="checkFlag" title="签入">
<a-modal width="600px" @cancel="checkFlag = false" @ok="sureCheckIn" :visible="checkFlag"
:title="checkType == 2 ? '签出' : '签入'">
<a-spin :spinning="loadingCheck">
<a-form :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }" style="margin-top: 10px">
<a-form-item label="签入日期">
@ -227,7 +224,7 @@
const { createMessage } = useMessage()
const queryData = ref({})
const [registerTable, { reload, setLoading, getSelectRows, getForm, getColumns }] = useTable({
maxHeight: 300,
maxHeight: 380,
api: async (p) => {
const res: API.DataResult = await GetList(p)
return new Promise((resolve) => {
@ -262,7 +259,7 @@
}
}
data.queryCondition = JSON.stringify(queryDataObj)
data.OtherQueryCondition = obj
data.otherQueryCondition = JSON.stringify(obj)
queryData.value = JSON.parse(JSON.stringify(data))
return data
},
@ -285,13 +282,32 @@
canResize: true,
immediate: true,
})
const columnsFile = [
{
title: '文件名称',
width: 100,
dataIndex: 'fileName',
},
{
title: '上传日期',
width: 100,
dataIndex: 'createTime',
},
{
title: '上传者',
width: 100,
dataIndex: 'createUserName',
},
]
const [registerTable2, { getSelectRows: getSelectRows2, setTableData }] = useTable({
columns: detailColumns,
isTreeTable: false,
pagination: false,
showIndexColumn: false,
maxHeight: 450,
bordered: true,
striped: true,
rowKey: 'id',
canResize: false,
})
const feeList = ref([])
@ -299,43 +315,30 @@
columns: feeColumns,
useSearchForm: false,
showIndexColumn: false,
maxHeight: 450,
pagination: false,
showTableSetting: false,
striped: true,
rowKey: 'id',
bordered: true,
canResize: true,
canResize: false,
immediate: false,
})
const [registerTable4, { setTableData: setTableDataFeeSum }] = useTable({
columns: feeColumnsSum,
const [registerTable5, { setTableData: setTableDataFile }] = useTable({
columns: columnsFile,
useSearchForm: false,
showIndexColumn: false,
maxHeight: 450,
pagination: false,
showTableSetting: false,
striped: true,
rowKey: 'id',
bordered: true,
canResize: true,
canResize: false,
immediate: false,
})
const columnsFile = [
{
title: '文件名称',
width: 100,
dataIndex: 'fileName',
},
{
title: '上传日期',
width: 100,
dataIndex: 'createTime',
},
{
title: '上传者',
width: 100,
dataIndex: 'createUserName',
},
]
function exportExcel() {
const list = [] as any
getColumns().forEach((item) => {
@ -453,9 +456,11 @@ const getfileList = () => {
}
item['type'] = item?.filePath?.split('.')[1]
fileData.value = res.data
setTableDataFile(res.data)
})
if (res.data.length == 0) {
fileData.value = []
setTableDataFile([])
}
})
.catch(() => { })
@ -538,8 +543,11 @@ const getfileList = () => {
const idList = ref([])
function checkClick() {
let ids = [] as any
ids = getSelectRows().map((item) => {
return item.bookingId
getSelectRows().forEach(item=>{
ids.push({
bookid:item.bookingId,
MHBillType:item.masterHBill
})
})
idList.value = ids
if (ids.length == 0) {
@ -627,6 +635,12 @@ const getfileList = () => {
border-bottom: 1px solid #ebebeb;
margin-bottom: 0px;
padding-bottom: 10px;
}
.main {
}
.left {
@ -636,16 +650,15 @@ const getfileList = () => {
}
.middle {
width: 52%;
margin: 0 1%;
width: 53%;
margin: 0 10px;
padding-right: 10px;
border-right: 1px solid #ebebeb;
display: flex;
}
.right {
width: 15%;
padding-top: 5px;
width: 14%;
font-size: 12px;
}
@ -769,11 +782,10 @@ const getfileList = () => {
font-size: 12px;
margin-bottom: 10px;
}
:deep(.active-row) {
.ant-table-cell {
background: #dfe8f6;
}
}
</style>

@ -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()

Loading…
Cancel
Save