lijingjia
/
ds-wms-client-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
szh-new
sunzehua 4 months ago
parent 6a2fe5987b ed8b5f7a30
commit 17074ebeab
8 changed files with 451 additions and 249 deletions
Show Stats Download Patch File Download Diff File

59
src/components/ActionBar/index.vue
Unescape Escape View File

@ -11,11 +11,19 @@
</div> </div>
<div class="btn-box"> <div class="btn-box">
<dl> <dl>
<dt class="iconfont icon-zhankai2" style="transform: rotate(90deg); position: relative; left: 4px; bottom: -2px;" @click="toPage('next')"></dt> <dt
class="iconfont icon-zhankai2"
style="transform: rotate(90deg); position: relative; left: 4px; bottom: -2px"
@click="toPage('next')"
></dt>
<dd>上一票</dd> <dd>上一票</dd>
</dl> </dl>
<dl> <dl>
<dt class="iconfont icon-zhankai2" style="transform: rotate(270deg);; position: relative; left: -4px; bottom: -2px;" @click="toPage('last')"></dt> <dt
class="iconfont icon-zhankai2"
style="transform: rotate(270deg); position: relative; left: -4px; bottom: -2px"
@click="toPage('last')"
></dt>
<dd>下一票</dd> <dd>下一票</dd>
</dl> </dl>
<dl v-if="temId" @click="openPrint"> <dl v-if="temId" @click="openPrint">
@ -29,7 +37,7 @@
<dl v-if="save" @click="saveHandle"> <dl v-if="save" @click="saveHandle">
<dt v-if="!saveFlag" class="iconfont icon-baocun1"></dt> <dt v-if="!saveFlag" class="iconfont icon-baocun1"></dt>
<dt v-else> <dt v-else>
<img src="../../assets/images/loading.gif" alt=""> <img src="../../assets/images/loading.gif" alt="" />
</dt> </dt>
<dd>保存</dd> <dd>保存</dd>
</dl> </dl>
@ -39,10 +47,7 @@
</dl> </dl>
</div> </div>
</div> </div>
<DsPrint <DsPrint ref="dsPrint" :id="temId" />
ref="dsPrint"
:id="temId"
/>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -75,22 +80,22 @@
// 上下票取id用的key // 上下票取id用的key
name: { name: {
type: String, type: String,
default: null default: null,
}, },
// 保存 // 保存
save: { save: {
type: Function, type: Function,
default: null default: null,
}, },
// 提交 // 提交
submit: { submit: {
type: Function, type: Function,
default: null default: null,
}, },
}, },
emits: ['copy'], emits: ['copy'],
components: { components: {
DsPrint DsPrint,
}, },
setup(props, context) { setup(props, context) {
const { t } = useI18n() const { t } = useI18n()
@ -126,7 +131,17 @@
} }
id = ids[index + 1] id = ids[index + 1]
} }
<<<<<<< HEAD
closePage()
go({
path: route.path,
query: {
id,
},
})
=======
closePage(route.path + '?id=' + id) closePage(route.path + '?id=' + id)
>>>>>>> 98e811704e6901ae61f0123993cfa1d3a82e36b6
} else { } else {
createMessage.warning('列表页面数据丢失，请回退列表页面后重试！') createMessage.warning('列表页面数据丢失，请回退列表页面后重试！')
} }
@ -136,7 +151,7 @@
// } // }
// console.log(ids) // console.log(ids)
} }
// 保存 // 保存
const saveHandle = async () => { const saveHandle = async () => {
saveFlag.value = true saveFlag.value = true
await props.save() await props.save()
@ -149,7 +164,7 @@
saveHandle, saveHandle,
copy, copy,
toPage, toPage,
saveFlag saveFlag,
} }
}, },
}) })
@ -166,14 +181,14 @@
width: 52px; width: 52px;
opacity: 1; opacity: 1;
border-radius: 4px; border-radius: 4px;
background: #FFFFFF; background: #ffffff;
border-top: 2px solid #257AFA; border-top: 2px solid #257afa;
box-shadow: 0px 5px 10px #6D8AB0; box-shadow: 0px 5px 10px #6d8ab0;
.tip { .tip {
display: inline-block; display: inline-block;
width: 3px; width: 3px;
height: 3px; height: 3px;
background: #E1EBFA; background: #e1ebfa;
margin: 0 1px 0px 1px; margin: 0 1px 0px 1px;
} }
.tip:nth-child(n + 6) { .tip:nth-child(n + 6) {
@ -187,11 +202,12 @@
dl { dl {
border-radius: 2px; border-radius: 2px;
} }
dl, dd { dl,
dd {
margin: 0; margin: 0;
} }
dt { dt {
color: #257AFA; color: #257afa;
font-size: 15px; font-size: 15px;
height: 21px; height: 21px;
padding-top: 3px; padding-top: 3px;
@ -203,8 +219,9 @@
padding-bottom: 3px; padding-bottom: 3px;
} }
dl:hover { dl:hover {
background: #257AFA; background: #257afa;
dt, dd { dt,
dd {
color: #ffffff; color: #ffffff;
} }
} }

8
src/design/iconfont.less
Unescape Escape View File

@ -4,6 +4,12 @@
.icon-lock-openkaisuo, .icon-chahao { .icon-lock-openkaisuo, .icon-chahao {
color: @msg-color; color: @msg-color;
} }
<<<<<<< HEAD
.IconColor {
color: #257afa !important;
}
=======
.icon-bingtu3 { .icon-bingtu3 {
color: #257afa; color: #257afa;
} }
>>>>>>> 98e811704e6901ae61f0123993cfa1d3a82e36b6

140
src/views/operation/CustomerReconciliation/columns.tsx
Unescape Escape View File

@ -1,85 +1,73 @@
import { BasicColumn, FormSchema } from '/@/components/Table' import { BasicColumn, FormSchema } from '/@/components/Table'
export const searchFormSchema: FormSchema[] = [
{ field: 'billNo', label: '对账编号', component: 'Input', colProps: { span: 4 } },
{ field: 'customerName', label: '对账客户名称', component: 'Input', colProps: { span: 4 } },
// {
// field: 'mblno',
// label: '对账客户',
// component: 'Input',
// colProps: { span: 4 },
// },
// {
// field: 'mblno',
// label: '从对账日期',
// component: 'Input',
// colProps: { span: 4 },
// },
// {
// field: 'mblno',
// label: '到对账日期',
// component: 'Input',
// colProps: { span: 4 },
// },
// {
// field: 'mblno',
// label: '账单说明',
// component: 'Input',
// colProps: { span: 4 },
// },
// {
// field: 'mblno',
// label: '对账人',
// component: 'Input',
// colProps: { span: 4 },
// },
// {
// field: 'mblno',
// label: '业务相关编号',
// component: 'Input',
// colProps: { span: 4 },
// },
// {
// field: 'mblno',
// label: '从业务日期',
// component: 'Input',
// colProps: { span: 4 },
// },
// {
// field: 'mblno',
// label: '到业务日期',
// component: 'Input',
// colProps: { span: 4 },
// },
// {
// field: 'mblno',
// label: '船名',
// component: 'Input',
// colProps: { span: 4 },
// },
// {
// field: 'mblno',
// label: '航次',
// component: 'Input',
// colProps: { span: 4 },
// },
// {
// field: 'mblno',
// label: '状态',
// component: 'Input',
// colProps: { span: 2 },
// },
// {
// field: 'mblno',
// label: '备注',
// component: 'Input',
// colProps: { span: 2 },
// },
]
export const billTypeData = [ export const billTypeData = [
{ code: 0, value: '全部' }, { code: 0, value: '全部' },
{ code: 1, value: '应收' }, { code: 1, value: '应收' },
{ code: 2, value: '应付' }, { code: 2, value: '应付' },
] ]
export const searchFormSchema: FormSchema[] = [
{ field: 'billNo', label: '对账编号', component: 'Input', colProps: { span: 4 } },
{ field: 'billName', label: '对账单名称', component: 'Input', colProps: { span: 4 } },
{
field: 'billType',
label: '收付类型',
component: 'Select',
colProps: { span: 4 },
componentProps: {
options: billTypeData,
},
},
{ field: 'customerName', label: '对账客户名称', component: 'Input', colProps: { span: 4 } },
{ field: 'isNoTax', label: '是否不含税', component: 'Switch', colProps: { span: 4 } },
{
field: 'rmbdr',
label: '应收RMB',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'balrmbdr',
label: '未收RMB',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'usddr',
label: '应收USD',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'balusddr',
label: '未收USD',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'rmbcr',
label: '应付RBM',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'balrmbcr',
label: '未付RMB',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'usdcr',
label: '应付USD',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'balusdcr',
label: '未付USD',
component: 'Input',
colProps: { span: 4 },
},
]
//列表 //列表
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ title: '对账编号', dataIndex: 'billNo', align: 'left' }, { title: '对账编号', dataIndex: 'billNo', align: 'left' },

2
src/views/operation/CustomerReconciliation/detail/detailColumns.tsx
Unescape Escape View File

@ -78,7 +78,7 @@ export const schemas: FormSchema[] = [
field: 'isLocking', field: 'isLocking',
component: 'Select', component: 'Select',
label: '业务锁定', label: '业务锁定',
colProps: { span: 2 }, colProps: { span: 4 },
dynamicDisabled: true, dynamicDisabled: true,
defaultValue: false, defaultValue: false,
componentProps: { componentProps: {

244
src/views/operation/CustomerReconciliation/detail/index.vue
Unescape Escape View File

@ -1,96 +1,110 @@
<template> <template>
<div class="CsMain p-4" id="detail"> <div class="CsMain p-4" id="detail">
<div class="buttonBox"> <div class="buttonBox">
<div class="nav" @click="Save"> <i class="iconfont icon-icon_baocun"></i>保存</div> <!-- <div @click="Save"> <i class="iconfont icon-icon_baocun"></i>保存</div> -->
<div class="nav" @click="waitFor"> <i class="iconfont icon-printing"></i>标准打印</div> <!-- <div @click="waitFor"> <i class="iconfont icon-printing"></i>标准打印</div> -->
<!-- <div class="nav" @click="waitFor"> <i class="iconfont icon-dayinxiaopiao"></i>模板打印</div> --> <!-- <div @click="waitFor"> <i class="iconfont icon-icon_baocun"></i>保存并关闭</div> -->
<div class="nav" @click="waitFor"> <i class="iconfont icon-icon_baocun"></i>保存并关闭</div>
<div class="nav" @click="waitFor"> <i class="iconfont icon-icon_baocun"></i>保存并新建</div> <!-- <div > <i class="iconfont icon-jiahao2fill"></i>费用提交审核</div> -->
<div class="nav" @click="Lock"> <div class="left">
<Icon icon="ant-design:lock-outlined" class="iconfont" /> <a-button type="link" @click="Lock">
锁定 <span class="iconfont icon-locksuo IconColor"></span>
</div> 锁定
<div class="nav" @click="UnLock"> </a-button>
<Icon icon="ant-design:unlock-outlined" class="iconfont" /> <a-button type="link" @click="UnLock">
撤销锁定 <span class="iconfont icon-lock-openkaisuo IconColor"></span>
撤销锁定
</a-button>
</div> </div>
<div class="nav"> <i class="iconfont icon-jiahao2fill"></i>费用提交审核</div> <a-button type="link" @click="addDetail">
<span class="iconfont icon-new_document"></span>
新建
</a-button>
</div> </div>
<a-tabs v-model:activeKey="activeKey" type="card" class="CsTabs">
<a-tab-pane key="1" tab="账单明细">
<a-row class="CsHeader" :gutter="5">
<a-col :span="24" class="headerForm">
<a-spin :spinning="spinningT">
<BasicForm @register="registerForm" />
</a-spin>
</a-col>
</a-row>
<a-row class="CsBottom" :gutter="5">
<a-col :span="17" class="bottomTableL">
<a-spin :spinning="spinningL">
<BasicTable
class="ds-table"
@register="registerTableL"
@selection-change="selectionChange"
>
<template #toolbar>
<div class="buttonGroup">
<div class="nav" @click="addDetail">
<i class="iconfont icon-jiahao2fill"></i>增加账单明细
</div>
<a-popconfirm
title="是否要删除选中数据?"
ok-text="是"
cancel-text="否"
@confirm="DelDetailL"
>
<div class="nav">
<i class="iconfont icon-shanchu2"></i>
删除账单明细
</div>
</a-popconfirm>
<!-- <div class="nav" @click="RowClick"> <!-- <a-tabs v-model:activeKey="activeKey" type="card" class="CsTabs">
<i class="iconfont icon-bianjiwenjian"></i> <a-tab-pane key="1" tab="账单明细"> -->
测试 后期改为双击 <ActionBar
</div> --> :id="route.query.id"
</div> temId="1777229219986804736"
</template> name="khdz"
</BasicTable> :save="Save"
</a-spin> ></ActionBar>
</a-col> <a-row class="CsHeader" :gutter="5">
<a-col :span="7" class="bottomTableR"> <a-col :span="24" class="headerForm">
<a-spin :spinning="spinningR"> <a-spin :spinning="spinningT">
<BasicTable class="ds-table" @register="registerTableR"> <BasicForm @register="registerForm" />
<template #toolbar> </a-spin>
<div class="buttonGroup"> </a-col>
<a-popconfirm </a-row>
title="是否要删除选中数据?" <!-- <a-row class="CsBottom" :gutter="5">
ok-text="是" <a-col :span="24" class="bottomTableL"> -->
cancel-text="否" <div class="CsBottom">
@confirm="DelDetailR" <div class="bottomTableL">
> <a-spin :spinning="spinningL">
<div class="nav"> <BasicTable
<i class="iconfont icon-shanchu2"></i> class="ds-table"
删除账单费用明细 @register="registerTableL"
</div> @selection-change="selectionChange"
</a-popconfirm> >
<template #tableTitle>
<p class="tableTitle">账单明细</p>
<a-popconfirm
title="确定删除当前选中数据？"
ok-text="是"
cancel-text="否"
@confirm="DelDetailL"
>
<a-button type="link">
<span class="iconfont icon-shanchu21"></span>
删除账单明细
</a-button>
</a-popconfirm>
<a-button type="link" @click="waitFor">
<span class="iconfont icon-fujian"></span>
附件管理
</a-button>
</template>
</BasicTable>
</a-spin>
</div>
<div class="bottomTableR">
<a-spin :spinning="spinningR">
<BasicTable class="ds-table" @register="registerTableR">
<template #toolbar>
<div class="buttonGroup">
<a-popconfirm
title="是否要删除选中数据?"
ok-text="是"
cancel-text="否"
@confirm="DelDetailR"
>
<div>
<i class="iconfont icon-shanchu2"></i>
删除账单费用明细
</div> </div>
</template> </a-popconfirm>
</BasicTable> </div>
</a-spin> </template>
</a-col> </BasicTable>
</a-row> </a-spin>
</a-tab-pane> </div>
</div>
<!-- </a-col>
<a-col :span="24" class="bottomTableR"> -->
<!-- </a-col>
</a-row> -->
<!-- </a-tab-pane>
<a-tab-pane key="2" tab="附件"> <a-tab-pane key="2" tab="附件">
<BasicTable class="ds-table" @register="registerTableFile"> <BasicTable class="ds-table" @register="registerTableFile">
<template #toolbar> <template #toolbar>
<div class="buttonGroup"> <div class="buttonGroup">
<div class="nav"> <div>
<i class="iconfont icon-shanchu2"></i> <i class="iconfont icon-shanchu2"></i>
删除 删除
</div> </div>
<div class="nav" @click="OpenFileModal"> <div @click="OpenFileModal">
<i class="iconfont icon-shiyongwendang"></i> <i class="iconfont icon-shiyongwendang"></i>
上传附件 上传附件
</div> </div>
@ -98,7 +112,7 @@
</template> </template>
</BasicTable> </BasicTable>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs> -->
<Info <Info
ref="RefInfo" ref="RefInfo"
@register="registerAdd" @register="registerAdd"
@ -190,8 +204,8 @@
showTableSetting: false, showTableSetting: false,
bordered: true, bordered: true,
showIndexColumn: true, showIndexColumn: true,
canResize: true, // canResize: true,
resizeHeightOffset: 35, // resizeHeightOffset: 3500,
immediate: false, immediate: false,
}, },
) )
@ -405,15 +419,20 @@
} }
</style> </style>
<style lang="less"> <style lang="less">
@import url('/@/styles/buttonGroup.scss');
.CsMain { .CsMain {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.buttonBox { .buttonBox {
background: #fff; display: flex;
padding: 5px 10px; // flex: 1;
margin-bottom: 5px; .left {
display: flex;
flex: 1;
> div {
margin-right: 5px;
}
}
} }
.CsTabs { .CsTabs {
height: calc(100% - 43px); height: calc(100% - 43px);
@ -429,21 +448,62 @@
} }
.CsHeader { .CsHeader {
padding-bottom: 0 !important; padding-bottom: 0 !important;
margin: 0 0 10px 0 !important;
border: 1px solid #e8ebed;
.headerForm { .headerForm {
background: #fff; background: #fff;
padding: 10px 15px 0 15px !important; padding: 5px 15px 10px 15px !important;
margin-bottom: 5px;
} }
} }
.CsBottom { .CsBottom {
flex: 1; height: calc(100vh - 300px);
padding-top: 0 !important; display: flex;
flex-direction: column;
// flex: 1;
// padding-top: 0 !important;
.bottomTableL { .bottomTableL {
padding-left: 0 !important; height: calc(100vh - 535px);
border: 1px solid #e8ebed;
margin-bottom: 10px;
} }
.bottomTableR { .bottomTableR {
padding-right: 0 !important; height: calc(100vh - 600px);
border: 1px solid #e8ebed;
}
.ant-spin-nested-loading {
height: 100%;
.ant-spin-container {
height: 100%;
.ds-table {
height: 100%;
.ant-table-wrapper {
height: 100%;
.ant-spin-nested-loading {
height: 100%;
.ant-spin-container {
height: 100%;
.ant-table {
height: calc(100% - 30px);
.ant-table-container {
height: calc(100% - 54px);
}
}
}
}
}
}
}
} }
} }
} }
.tableTitle {
margin: 0;
font-size: 12px;
font-weight: 700;
letter-spacing: 1px;
line-height: 15.84px;
color: rgba(51, 56, 61, 1);
text-align: left;
vertical-align: bottom;
}
</style> </style>

197
src/views/operation/CustomerReconciliation/index.vue
Unescape Escape View File

@ -9,28 +9,20 @@
} }
" "
> >
<!-- <template #form-more>
<a-button type="link">多提单号查询</a-button>
<a-button type="link">高级查询</a-button>
</template> -->
<template #tableTitle> <template #tableTitle>
<div class="buttonGroup"> <div class="buttonGroup">
<a-button type="link" @click="Lock"> <a-button type="link" @click="Lock">
<span class="iconfont icon-locksuo"></span> <span class="iconfont icon-locksuo IconColor"></span>
锁定 锁定
</a-button> </a-button>
<a-button type="link" @click="UnLock"> <a-button type="link" @click="UnLock">
<span class="iconfont icon-lock-openkaisuo"></span> <span class="iconfont icon-lock-openkaisuo IconColor"></span>
撤销锁定 撤销锁定
</a-button> </a-button>
<a-button type="link" @click="ExportExcel"> <a-button type="link" @click="ExportExcel">
<span class="iconfont icon-weibiaoti--"></span> <span class="iconfont icon-weibiaoti--"></span>
EXCEL导出 EXCEL导出
</a-button> </a-button>
<a-button type="link" @click="printFee">
<span class="iconfont icon-xiaopiaodayin"></span>
打印
</a-button>
</div> </div>
</template> </template>
<template #toolbar> <template #toolbar>
@ -44,15 +36,43 @@
删除 删除
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
<a-button type="link" @click="printFee">
<span class="iconfont icon-xiaopiaodayin"></span>
打印
</a-button>
</template>
<template v-slot:bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<TableAction
:actions="[
{
icon: 'clarity:note-edit-line',
tooltip: '编辑',
onClick: () => {
GoDetailed(true, record)
},
},
]"
/>
</template>
</template> </template>
</BasicTable> </BasicTable>
<!-- 合计 -->
<div>
<a-table
class="ds-table"
:columns="calcColumns"
:data-source="calcData"
:pagination="false"
></a-table>
</div>
<DsPrint ref="dsPrint" name="客户对账"></DsPrint> <DsPrint ref="dsPrint" name="客户对账"></DsPrint>
</div> </div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue' import { ref } from 'vue'
import { GetCheckBillList, CheckBillLocking, CheckBillUnLocking } from './api.js' import { GetCheckBillList, CheckBillLocking, CheckBillUnLocking } from './api.js'
import { BasicTable, useTable } from '/@/components/Table' import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { columns, searchFormSchema, billTypeData } from './columns' import { columns, searchFormSchema, billTypeData } from './columns'
import { GetOpenPrintModuleList } from '/@/views/operation/seaexport/api/BookingLedger.js' import { GetOpenPrintModuleList } from '/@/views/operation/seaexport/api/BookingLedger.js'
import * as XLSX from 'xlsx' import * as XLSX from 'xlsx'
@ -61,52 +81,70 @@
const { notification } = useMessage() const { notification } = useMessage()
import { useGo } from '/@/hooks/web/usePage' import { useGo } from '/@/hooks/web/usePage'
const go = useGo() const go = useGo()
// 引入处理入参方法
import { formatParams } from '/@/hooks/web/common'
import { useAppStore } from '/@/store/modules/app'
const appStore = useAppStore()
// 表格 // 表格
const [registerTable, { getForm, getPaginationRef, getSelectRows, getRawDataSource }] = useTable({ const [registerTable, { getForm, getPaginationRef, getSelectRows, getRawDataSource }] = useTable({
title: '', title: '',
api: async (p) => { api: async (p) => {
const res: API.DataResult = await GetCheckBillList(p) const res: API.DataResult = await GetCheckBillList(p)
calcData.value = [res.data?.dataTotal]
return new Promise((resolve) => { return new Promise((resolve) => {
if (res?.data) {
const ids = res.data.map((item) => {
return item.id
})
appStore.setIds(ids, 'khdz')
}
resolve({ data: [...res.data], total: res.count }) resolve({ data: [...res.data], total: res.count })
}) })
}, },
beforeFetch: () => { // 请求前的参数格式化
var currentPageInfo: any = getPaginationRef() beforeFetch: (p) => {
var data = getForm().getFieldsValue() return formatParams(p)
const postParam: API.PageRequest = {
queryCondition: '',
pageCondition: {
pageIndex: currentPageInfo.current,
pageSize: currentPageInfo.pageSize,
sortConditions: [],
},
}
postParam.pageCondition.sortConditions.push({
sortField: 'createTime',
listSortDirection: 1,
})
let condition: API.ConditionItem[] = []
if (!!data.billNo) {
condition.push({
FieldName: 'billNo',
FieldValue: data.billNo,
ConditionalType: 1,
})
}
if (!!data.customerName) {
condition.push({
FieldName: 'customerName',
FieldValue: data.customerName,
ConditionalType: 1,
})
}
postParam.queryCondition = JSON.stringify(condition)
return postParam
}, },
// beforeFetch: () => {
// var currentPageInfo: any = getPaginationRef()
// var data = getForm().getFieldsValue()
// const postParam: API.PageRequest = {
// queryCondition: '',
// pageCondition: {
// pageIndex: currentPageInfo.current,
// pageSize: currentPageInfo.pageSize,
// sortConditions: [],
// },
// }
// postParam.pageCondition.sortConditions.push({
// sortField: 'createTime',
// listSortDirection: 1,
// })
// let condition: API.ConditionItem[] = []
// if (!!data.billNo) {
// condition.push({
// FieldName: 'billNo',
// FieldValue: data.billNo,
// ConditionalType: 1,
// })
// }
// if (!!data.customerName) {
// condition.push({
// FieldName: 'customerName',
// FieldValue: data.customerName,
// ConditionalType: 1,
// })
// }
// postParam.queryCondition = JSON.stringify(condition)
// return postParam
// },
columns, columns,
formConfig: { formConfig: {
labelWidth: 120, labelWidth: 120,
// 表格表单需要的过滤字段集合
schemas: searchFormSchema, schemas: searchFormSchema,
// 是否显示高级查询(默认否)
useAdvancedSearch: true,
}, },
isTreeTable: false, isTreeTable: false,
pagination: true, pagination: true,
@ -119,8 +157,14 @@
width: 60, width: 60,
}, },
canResize: true, canResize: true,
resizeHeightOffset: 35, resizeHeightOffset: 80,
immediate: true, immediate: true,
actionColumn: {
width: 80,
title: '操作',
dataIndex: 'action',
fixed: 'right',
},
}) })
// 新增 编辑 // 新增 编辑
function GoDetailed(type, data) { function GoDetailed(type, data) {
@ -227,4 +271,69 @@
async function printFee() { async function printFee() {
dsPrint.value.init() dsPrint.value.init()
} }
// 合计列
const calcColumns = [
{
title: '应收RMB',
dataIndex: 'mainCount',
width: 110,
},
{
title: '未收RMB',
dataIndex: 'mainCount',
width: 110,
},
{
title: '应收USD',
dataIndex: 'mainCount',
width: 110,
},
{
title: '未收USD',
dataIndex: 'mainCount',
width: 110,
},
{
title: '应收其他币别',
dataIndex: 'mainCount',
width: 110,
},
{
title: '未收其他币别',
dataIndex: 'mainCount',
width: 110,
},
{
title: '应付RMB',
dataIndex: 'mainCount',
width: 110,
},
{
title: '未付RMB',
dataIndex: 'mainCount',
width: 110,
},
{
title: '应付USD',
dataIndex: 'mainCount',
width: 110,
},
{
title: '未付USD',
dataIndex: 'mainCount',
width: 110,
},
{
title: '应付其他币别',
dataIndex: 'mainCount',
width: 110,
},
{
title: '未付其他币别',
dataIndex: 'mainCount',
width: 110,
},
]
// 合计数据
const calcData = ref([])
</script> </script>

45
src/views/operation/seaexport/detail/modules/goodsTable.vue
Unescape Escape View File

@ -119,6 +119,7 @@
title="多品名维护" title="多品名维护"
width="80%" width="80%"
:visible="moreVisible" :visible="moreVisible"
v-if="moreVisible"
:confirmLoading="moreModelconfirm" :confirmLoading="moreModelconfirm"
:maskClosable="false" :maskClosable="false"
@cancel="handleModelCancel" @cancel="handleModelCancel"
@ -132,12 +133,37 @@
alt="" alt=""
/> />
</hot-table> </hot-table>
<div class="model-botton-box"> <!-- <div class="model-botton-box">
<a-button class="btn" type="primary" @click="addChildData">新增</a-button> <a-button class="btn" type="primary" @click="addChildData">新增</a-button>
<a-button class="btn btn-delete" @click="removeChildData">删除</a-button> <a-button class="btn btn-delete" @click="removeChildData">删除</a-button>
<a-button class="btn" type="primary" @click="saveChildData">保存</a-button> <a-button class="btn" type="primary" @click="saveChildData">保存</a-button>
</div> </div> -->
<a-spin :spinning="!moreSelectLoad"> <a-spin :spinning="!moreSelectLoad">
<div class="flex" v-if="!isLockBooking" style="justify-content: space-between">
<div>
<a-button type="link" size="mini" @click="saveChildData">
<span class="iconfont icon-baocun"></span>
保存
</a-button>
</div>
<div>
<a-button type="link" size="mini" @click="addChildData">
<span class="iconfont icon-new_document"></span>
添加
</a-button>
<a-popconfirm
title="是否要删除选中数据?"
ok-text="是"
cancel-text="否"
@confirm="removeChildData"
>
<a-button type="link" size="mini">
<span class="iconfont icon-shanchu21"></span>
删除
</a-button>
</a-popconfirm>
</div>
</div>
<div class="model-child-table"> <div class="model-child-table">
<input <input
class="ds-tb-check ds-goods-tb-check2" class="ds-tb-check ds-goods-tb-check2"
@ -989,6 +1015,7 @@
}) })
}) })
} }
const moreVisible = ref(false)
// 打开多品名 // 打开多品名
function openDialog() { function openDialog() {
if (list.value.length === 0) { if (list.value.length === 0) {
@ -1013,9 +1040,10 @@
} }
// 关闭多品名 // 关闭多品名
function handleModelCancel() { function handleModelCancel() {
moreVisible.value = false
moreTList.value.splice(0) moreTList.value.splice(0)
moreData.value = [[]]
moreSelectNum.value = '' moreSelectNum.value = ''
moreVisible.value = false
} }
// 多品名新增 // 多品名新增
function addChildData() { function addChildData() {
@ -1231,7 +1259,7 @@
} }
}, },
}) })
const moreVisible = ref(false)
const id = ref() const id = ref()
const YarnLoading = ref(false) const YarnLoading = ref(false)
const sealnoLoading = ref(false) const sealnoLoading = ref(false)
@ -1836,12 +1864,11 @@
// }), // }),
// 表格配置项 // 表格配置项
const settings = { const settings = {
height: 'auto', height: '208',
width: '100%',
autoWrapRow: true, autoWrapRow: true,
autoWrapCol: true, autoWrapCol: true,
// 每行的高度 // 每行的高度
rowHeights: 32, rowHeights: 26,
fixedColumnsLeft: 1, fixedColumnsLeft: 1,
// 需要隐藏的列 // 需要隐藏的列
hiddenColumns: { hiddenColumns: {
@ -1976,7 +2003,7 @@
autoWrapRow: true, autoWrapRow: true,
autoWrapCol: true, autoWrapCol: true,
// 每行的高度 // 每行的高度
rowHeights: 32, rowHeights: 26,
fixedColumnsLeft: 1, fixedColumnsLeft: 1,
// 控制回车移动 // 控制回车移动
@ -2064,7 +2091,7 @@
autoWrapRow: true, autoWrapRow: true,
autoWrapCol: true, autoWrapCol: true,
// 每行的高度 // 每行的高度
rowHeights: 32, rowHeights: 26,
fixedColumnsLeft: 1, fixedColumnsLeft: 1,
// 控制回车移动 // 控制回车移动

5
src/views/operation/seaexport/index.vue
Unescape Escape View File

@ -1,8 +1,3 @@
<!--
* @Description: 海运出口列表
* @Author: lijj
* @Date: 2024-04-29 11:54:04
-->
<template> <template>
<div class="ds-sea-export-table"> <div class="ds-sea-export-table">
<BasicTable class="ds-table" @register="registerTable" @row-dbClick="handledbclick"> <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handledbclick">

Write Preview
Loading…
Cancel
Save