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

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

Browse Source
frame-financialTax-yjl-1127
张同海 1 week ago
parent b8a6422687 183fb7ee54
commit 5a56157226
5 changed files with 220 additions and 236 deletions
Show Stats Download Patch File Download Diff File

2
src/components/Table/src/BasicTable.vue
Unescape Escape View File

@ -110,7 +110,7 @@
<slot name="right" class="right" ></slot>
</div>
<div class="pagination-wrapper-vxe" >
<slot name="pageSlot" ></slot>
<div><slot name="pageSlot" ></slot></div>
<Pagination
v-if="getBindValues.tableComponent === 'vxe'"
v-bind="getBindValues.pagination"

8
src/views/finance/paymentSettlement/columns.tsx
Unescape Escape View File

@ -26,14 +26,6 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 80,
align: 'left',
customRender: ({ text }) => {
if (text === 1) {
return '收费'
} else if (text === 2) {
return '付费'
}
return text
}
},
{
title: '结算方式',

139
src/views/finance/paymentSettlement/index.vue
Unescape Escape View File

@ -4,42 +4,20 @@
* @Date: 2024-09-25 17:32:50
-->
<template>
<div class="ds-fee-settle-main-table">
<div class="ds-fee-settle-main-table p20">
<BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleEdit">
<template #tableTitle>
<div class="flex">
<ActionBar
class="ml15"
code="sea_freight_export"
:delete="deleteRow"
:exportFile="exportFile"
:paramJsonStr="'{id:' + 'id' + '}'"
:showBtns="['delete', 'print', 'export']"
layout="horizontal"
></ActionBar>
<Divider
type="vertical"
style="margin-top: 12px;"
class="action-divider"
/>
<div style="padding-top: 8px;">
<a-button type="link" @click="create('free')">
<span class="iconfont icon-lirun"></span>
新建自由结算
</a-button>
<a-button type="link" @click="create('1')">
<span class="iconfont icon-shenpi-pizhun"></span>
新建申请结算
</a-button>
<a-button type="link" @click="kfz">
<span class="iconfont icon-peizhitubiaosvg-"></span>
付费发票结算
</a-button>
<a-button type="link" @click="kfz">
<span class="iconfont icon-renwu_"></span>
生成凭证
</a-button>
</div>
<ActionBar class="ml15" code="sea_freight_export" :delete="deleteRow" :exportFile="exportFile"
:paramJsonStr="'{id:' + 'id' + '}'" :showBtns="['delete', 'print', 'export']" layout="horizontal">
</ActionBar>
<Divider type="vertical" style="margin-top: 12px;" class="action-divider" />
<TableButton :show="{}">
<span @click="create('free')" class="iconfont icon-lirun">新建自由结算</span>
<span @click="create('1')" class="iconfont icon-shenpi-pizhun">新建申请结算</span>
<span @click="kfz" class="iconfont icon-peizhitubiaosvg">付费发票结算</span>
<span @click="kfz" class="iconfont icon-renwu_">生成凭证</span>
</TableButton>
</div>
</template>
<template v-slot:tableAction="{ record }">
@ -52,24 +30,30 @@
</a-button>
</a-tooltip>
</template>
<template v-slot:bodyCell="{ column, record }">
<template v-if="column.dataIndex == 'billType'">
<span v-if="record.billType == 1">收费</span>
<span v-if="record.billType == 2">付费</span>
</template>
</template>
</BasicTable>
</div>
</template>
<script lang="ts" setup>
import { onMounted } from 'vue'
import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { Divider } from 'ant-design-vue'
import { GetList, Delete } from './api'
import { formatParams } from '/@/hooks/web/common'
import { useGo } from '/@/hooks/web/usePage'
import { columns, searchFormSchema } from './columns'
import { numberThousandFormat } from '/@/utils/commonUtil'
import { useMessage } from '/@/hooks/web/useMessage'
// 空数据表格高度
const tbHeight = window.innerHeight - 250
const { createMessage } = useMessage()
const go = useGo()
const [registerTable, { reload, getForm, getVxeSelectRows }] = useTable({
import { onMounted } from 'vue'
import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { Divider } from 'ant-design-vue'
import { GetList, Delete } from './api'
import { formatParams } from '/@/hooks/web/common'
import { useGo } from '/@/hooks/web/usePage'
import { columns, searchFormSchema } from './columns'
import { numberThousandFormat } from '/@/utils/commonUtil'
import { useMessage } from '/@/hooks/web/useMessage'
// 空数据表格高度
const tbHeight = window.innerHeight - 250
const { createMessage } = useMessage()
const go = useGo()
const [registerTable, { reload, getForm, getVxeSelectRows }] = useTable({
title: '',
api: async (p) => {
const res: API.DataResult = await GetList(p)
@ -105,19 +89,13 @@
width: 60,
},
canResize: true,
resizeHeightOffset: 15,
resizeHeightOffset: 45,
tableComponent: 'vxe',
autoHeight: tbHeight,
immediate: true,
actionColumn: {
width: 60,
title: '操作',
dataIndex: 'action',
fixed: 'right'
}
})
// 删除
function deleteRow() {
})
// 删除
function deleteRow() {
const rows = getVxeSelectRows()
if (rows.length == 0) return createMessage.warning('请勾选要删除的结算申请单！')
const ids = rows.map(item => {
@ -131,45 +109,46 @@
}).catch(() => {
})
}
// 导出
function exportFile() {
}
// 导出
function exportFile() {
}
// 编辑
const handleEdit = (row) => {
if (row.mode == 1) {
go(`/payment-settlement/detail?type=1&id=` + row.id)
}
// 编辑
const handleEdit = (row) => {
if(row.mode==1){
go(`/payment-settlement/detail?type=1&id=`+row.id)
}
if(row.mode==3){
go(`/paymentSettlementFree?type=free&id=`+row.id)
}
if (row.mode == 3) {
go(`/paymentSettlementFree?type=free&id=` + row.id)
}
// 新建
const create = (v) => {
if(v==1){
}
// 新建
const create = (v) => {
if (v == 1) {
go(`/payment-settlement/create?type=${v}`)
}
if(v=='free'){
if (v == 'free') {
go(`/paymentSettlementFree?type=${v}`)
}
}
onMounted(() => {
}
onMounted(() => {
//初始化字典选项
})
function handleSuccess() {
})
function handleSuccess() {
reload()
}
const kfz = () => {
}
const kfz = () => {
createMessage.warning('开发中！')
}
}
</script>
<style lang="less">
.ds-fee-settle-main-table {
.ant-table-title {
padding: 0!important;
padding: 0 !important;
}
.ant-divider-vertical {
height: 1.9em;
margin-top: 12px;

6
src/views/operation/invoiceApply/columns.tsx
Unescape Escape View File

@ -145,13 +145,13 @@ export const columns: BasicColumn[] = [
title: '申请金额RMB',
dataIndex: 'applyAmountRMB',
width: 100,
align: 'left',
align: 'right',
},
{
title: '申请金额USD',
dataIndex: 'applyAmountUSD',
width: 100,
align: 'left',
align: 'right',
},
{
title: '发票币别',
@ -163,7 +163,7 @@ export const columns: BasicColumn[] = [
title: '原币金额',
dataIndex: 'originalAmount',
width: 100,
align: 'left',
align: 'right',
},
{
title: '申请开票日期',

161
src/views/operation/invoiceApply/index.vue
Unescape Escape View File

@ -1,76 +1,110 @@
<template>
<div>
<div class="topTable">
<div class="topTable p20">
<BasicTable class="ds-table" @register="registerTable" @row-dbClick="(e) => {
GoDetailed(true, e)
}
">
<template #tableTitle>
<div class="buttonGroup ">
<div class="ds-h-aciton-btns-fee">
<a-tooltip placement="top" :mouseEnterDelay="0.5">
<template #title>
<span>新建</span>
</template>
<span class="ds-action-svg-btn" @click="GoDetailed(false)">
<img src="../../../assets/svg/infoclient/xinjian.svg" class="SvgImg" />
</span>
</a-tooltip>
<TableButton :show="{ del: 'op:goodstype:del', add: 'op:goodstype:add' }" @del="FnDel"
@add="GoDetailed(false)">
<a-tooltip placement="top" :mouseEnterDelay="0.5">
<template #title>
<span>删除</span>
<span>提交审核</span>
</template>
<span class="ds-action-svg-btn">
<a-popconfirm title="确定删除当前选中数据？" @confirm="FnDel" ok-text="是" cancel-text="否">
<img src="../../../assets/svg/infoclient/shanchu.svg" class="SvgImg" />
<span :class="`${prefixCls}-svg-btn`">
<a-popconfirm title="确定提交审核吗？" @confirm="handleApply" ok-text="是" cancel-text="否">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
width="16.01025390625" height="15.98126220703125" viewBox="0 0 16.01025390625 15.98126220703125"
fill="none">
<path
d="M7.07846 12.1812L4.17846 10.6812C3.27846 10.2812 2.77846 10.5813 3.17846 11.6812C3.17846 11.6812 4.87846 15.7813 4.87846 15.9812L7.47846 14.2813C7.77846 13.9812 7.97846 13.4812 7.87846 13.0813C7.77846 12.6812 7.47846 12.3812 7.07846 12.1812Z"
fill="#5097FF">
</path>
<path
d="M14.5788 0.18125L0.478775 7.28125C-0.121225 7.58125 -0.121225 8.08125 0.278775 8.38125C0.378775 8.48125 0.478775 8.48125 0.578775 8.48125L3.37878 9.58125C4.17878 9.88125 4.87878 9.68125 5.57878 9.08125L11.8788 4.08125C12.0788 3.88125 12.1788 4.08125 12.0788 4.28125L6.47878 9.68125C6.27878 9.88125 6.17878 10.2812 6.17878 10.5813C6.27878 10.8812 6.47878 11.0813 6.77878 11.2812L7.07878 11.3812L12.1788 13.7812L12.2788 13.7812C12.8788 14.0813 13.5788 13.7812 13.7788 13.1812C13.7788 13.0813 13.7788 13.0813 13.8788 12.9812L13.8788 12.8812L15.9788 1.18125C16.1788 0.28125 15.3788 -0.31875 14.5788 0.18125Z"
fill="#1B65DD">
</path>
</svg>
</a-popconfirm>
</span>
</a-tooltip>
<a-tooltip placement="top" :mouseEnterDelay="0.5">
<template #title>
<span>提交审核</span>
<span>撤销审核</span>
</template>
<span class="ds-action-svg-btn">
<a-popconfirm title="确定提交审核吗？" @confirm="handleApply" ok-text="是" cancel-text="否">
<img src="../../../assets/svg/infoclient/tijiao.svg" class="SvgImg" />
<span :class="`${prefixCls}-svg-btn`">
<a-popconfirm title="确定撤销审核吗？" @confirm="handleWithdraw" ok-text="是" cancel-text="否">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16"
height="16" viewBox="0 0 16 16" fill="none">
<path
d="M7.27895 13.7813L7.77895 13.7813C7.87895 13.5813 7.87895 13.2813 7.87895 13.0813C7.77895 12.7813 7.47895 12.3812 7.07895 12.1812L4.17895 10.6812C3.27895 10.2812 2.77895 10.5813 3.17895 11.6812C3.17895 11.6812 4.87895 15.7813 4.87895 15.9812L6.47895 14.8812L6.47895 14.5813C6.47895 14.1812 6.87895 13.7813 7.27895 13.7813Z"
fill="#7C868E">
</path>
<path
d="M6.47878 10.2812C6.47878 10.0813 6.57878 9.88125 6.67878 9.68125L6.77878 9.58125C6.87878 9.58125 6.97878 9.48125 7.07878 9.38125L8.67877 7.78125C8.77878 7.58125 8.97878 7.58125 9.17877 7.58125C9.37877 7.58125 9.57878 7.68125 9.77878 7.78125L10.0788 8.08125C10.3788 8.38125 10.3788 8.78125 10.1788 9.18125L12.7788 9.18125C13.3788 9.18125 13.9788 9.38125 14.3788 9.68125L15.8788 1.18125C16.1788 0.28125 15.3788 -0.31875 14.4788 0.18125L0.478775 7.28125C-0.121225 7.58125 -0.121225 8.08125 0.278775 8.38125C0.378775 8.48125 0.478775 8.48125 0.578775 8.48125L3.37878 9.58125C4.17878 9.88125 4.87878 9.68125 5.57878 9.08125L11.8788 4.08125C12.0788 3.88125 12.1788 4.08125 12.0788 4.28125L6.47878 9.68125C6.27878 9.88125 6.17878 10.2812 6.17878 10.5813C6.27878 10.8812 6.47878 11.0813 6.77878 11.2812L7.07878 11.3812L7.17878 11.3812L6.77878 10.9812C6.57878 10.7812 6.47878 10.5813 6.47878 10.2812Z"
fill="#B2BAC1">
</path>
<path
d="M8.979 12.4813C9.079 12.5813 9.079 12.5813 9.179 12.5813C9.279 12.5813 9.379 12.5813 9.379 12.4813L9.479 12.3813L8.479 11.8813L8.979 12.4813L8.979 12.4813Z"
fill="#C73035">
</path>
<path
d="M14.379 12.5813C14.379 13.5813 13.679 14.2813 12.779 14.2813L7.379 14.2813L6.979 14.5813L6.979 14.5813L6.979 15.0813L6.979 15.0813C6.979 15.2813 7.079 15.3813 7.279 15.3813L12.679 15.3813L12.679 15.3813C14.179 15.3813 15.379 14.0813 15.379 12.4813C15.379 11.4813 14.879 10.5813 14.179 10.0813L13.979 11.4813C14.179 11.8813 14.379 12.1813 14.379 12.5813Z"
fill="#C73035">
</path>
<path d="M7.279 14.2812C7.079 14.2812 6.979 14.3812 6.979 14.5813L7.379 14.2812L7.279 14.2812Z"
fill="#C73035">
</path>
<path
d="M9.779 12.1813C9.879 12.0813 9.879 11.8813 9.779 11.7813L8.979 10.8813L12.779 10.8813C13.279 10.8813 13.779 11.1813 14.079 11.5813L14.279 10.1813C13.879 9.88127 13.279 9.68127 12.779 9.68127L8.979 9.68127L9.679 8.88127C9.779 8.78127 9.779 8.58127 9.679 8.48127L9.379 8.18127L9.379 8.18127C9.379 8.08127 9.279 8.08127 9.179 8.08127C9.079 8.08127 8.979 8.08127 8.979 8.18127L7.379 9.78127C7.279 9.78127 7.279 9.88127 7.179 9.98127L7.079 10.0813C6.979 10.1813 6.979 10.1813 6.979 10.2813C6.979 10.3813 6.979 10.4813 7.079 10.4813L8.479 11.9813L9.479 12.4813L9.779 12.1813Z"
fill="#C73035">
</path>
<path
d="M13.6791 13.0813C13.6791 13.0813 13.7791 13.0813 13.6791 13.0813C13.6791 13.0813 13.5791 13.1813 13.5791 13.2813C13.5791 13.2813 13.6791 13.1813 13.6791 13.0813Z"
fill="#000000">
</path>
<path
d="M12.779 11.3813L10.179 11.3813C10.479 11.6813 10.479 12.1813 10.179 12.4813L9.979 12.6813L12.179 13.6813L12.279 13.6813C12.379 13.6813 12.479 13.6813 12.479 13.6813C12.779 13.7813 12.979 13.6813 13.179 13.5813L13.179 13.5813C13.279 13.4813 13.379 13.4813 13.479 13.3813C13.479 13.3813 13.479 13.2813 13.579 13.2813C13.679 13.1813 13.679 13.0813 13.779 12.9813C13.779 12.9813 13.779 12.9813 13.779 12.8813C13.779 12.7813 13.879 12.5813 13.879 12.4813C13.879 11.8813 13.379 11.3813 12.779 11.3813Z"
fill="#B2BAC1">
</path>
<path d="" fill="#000000">
</path>
</svg>
</a-popconfirm>
</span>
</a-tooltip>
<a-tooltip placement="top" :mouseEnterDelay="0.5">
<template #title>
<span>撤销审核</span>
<span>导出excel</span>
</template>
<span class="ds-action-svg-btn">
<a-popconfirm title="确定撤销审核吗？" @confirm="handleWithdraw" ok-text="是" cancel-text="否">
<img src="../../../assets/svg/infoclient/chexiaotijiao.svg" class="SvgImg" />
</a-popconfirm>
<span :class="`${prefixCls}-svg-btn`">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16"
height="16" viewBox="0 0 16 16" fill="none">
<path
d="M15.0001 1.5L2.6001 1.5C2.1001 1.5 1.6001 1.9 1.6001 2.5L1.6001 12C1.6001 12.5 2.0001 13 2.6001 13L8.4001 13C8.4001 13 8.3001 13 8.3001 13.1L6.4001 15L5.1001 15C4.8001 15 4.6001 15.2 4.6001 15.5C4.6001 15.8 4.8001 16 5.1001 16L12.7001 16C13.0001 16 13.2001 15.8 13.2001 15.5C13.2001 15.2 13.0001 15 12.7001 15L10.9001 15L9.1001 13.2L9.0001 13.1L15.0001 13.1C15.5001 13.1 16.0001 12.7 16.0001 12.1L16.0001 2.5C16.0001 2 15.6001 1.5 15.0001 1.5Z"
fill="#46B267">
</path>
<path
d="M7.2 8.3L1.1 8.3C0.5 8.3 0 7.8 0 7.2L0 1.1C0 0.5 0.5 0 1.1 0L7.2 0C7.8 0 8.3 0.5 8.3 1.1L8.3 7.2C8.3 7.8 7.8 8.3 7.2 8.3Z"
fill="#239148">
</path>
<path
d="M10.6001 6.59999L11.9001 7.69999C12.1001 7.89999 12.5001 7.89999 12.8001 7.69999C14.1001 6.59999 14.2001 6.59999 14.2001 6.49999C14.4001 6.19999 14.3001 5.79999 14.0001 5.59999C13.7001 5.39999 13.4001 5.39999 13.1001 5.69999C13.1001 5.69999 13.0001 5.79999 12.9001 5.79999L12.9001 4.09999C12.9001 3.69999 12.6001 3.39999 12.2001 3.39999C11.8001 3.39999 11.5001 3.69999 11.5001 4.09999L11.5001 5.69999L11.3001 5.49999C11.0001 5.29999 10.6001 5.29999 10.4001 5.59999C10.3001 5.89999 10.3001 6.29999 10.6001 6.59999Z"
fill="#70D68A">
</path>
<path
d="M1.70021 6.99999C1.70021 6.99999 1.60021 6.89999 1.70021 6.99999C1.70021 6.89999 1.70021 6.89999 1.70021 6.99999L3.2002 4.19999L1.70021 1.39999L1.70021 1.29999C1.70021 1.29999 1.70021 1.29999 1.70021 1.19999C1.70021 1.09999 1.70021 1.19999 1.80021 1.19999L3.2002 1.19999C3.3002 1.19999 3.3002 1.19999 3.3002 1.29999L4.1002 2.79999L5.0002 1.39999C5.0002 1.29999 5.0002 1.29999 5.1002 1.29999L6.5002 1.29999L6.6002 1.29999C6.6002 1.29999 6.6002 1.29999 6.6002 1.39999C6.6002 1.39999 6.6002 1.39999 6.6002 1.49999L5.1002 4.09999L6.6002 6.79999C6.6002 6.79999 6.6002 6.79999 6.6002 6.89999C6.6002 6.89999 6.6002 6.89999 6.6002 6.99999C6.6002 7.09999 6.6002 6.99999 6.5002 6.99999L5.1002 6.99999C5.1002 6.99999 5.0002 6.99999 5.0002 6.89999L4.2002 5.39999L3.3002 6.89999C3.3002 6.99999 3.2002 6.99999 3.2002 6.99999L1.70021 6.99999Z"
fill="#FFFFFF">
</path>
</svg>
</span>
</a-tooltip>
</div>
<!-- <a-button v-repeat type="link">
<span class="iconfont icon-liebiao IconColor"></span>
显示工作流
</a-button> -->
<a-button @click="ExportExcel" v-repeat type="link">
<span class="iconfont icon-a-17Btuichu IconColor"></span>
导出EXCEL
</a-button>
</div>
</TableButton>
</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 v-if="column.key === 'currency'">
<span v-if="!record.currency">原币申请</span>
<span v-else>{{ record.currency }}</span>
@ -96,16 +130,7 @@
</template>
</BasicTable>
</div>
<!-- 合计 -->
<!-- <div>
<a-table
class="ds-table"
:columns="calcColumns"
:data-source="calcData"
:pagination="false"
></a-table>
</div> -->
<DsPrint ref="dsPrint" name="客户对账"></DsPrint>
</div>
</template>
<script lang="ts" setup>
@ -113,18 +138,16 @@ import { ref } from 'vue'
import { GetList, InvoiceApplicationDelete, Withdraw, ApplyAudit } from './api.js'
import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { columns, searchFormSchema, billTypeData } from './columns'
import { GetOpenPrintModuleList } from '/@/views/operation/seaexport/api/BookingLedger.js'
import * as XLSX from 'xlsx'
import DsPrint from '/@/components/Print/index.vue'
import { useMessage } from '/@/hooks/web/useMessage'
const { notification } = useMessage()
import { useDesign } from '/@/hooks/web/useDesign'
const { prefixCls } = useDesign('ds-table-button')
const { createMessage } = useMessage()
import { useGo } from '/@/hooks/web/usePage'
const go = useGo()
// 引入处理入参方法
import { formatParams } from '/@/hooks/web/common'
import { useAppStore } from '/@/store/modules/app'
const appStore = useAppStore()
// 表格
const [registerTable, { reload, getForm, getSelectRows, getRawDataSource }] = useTable({
title: '',
@ -168,7 +191,6 @@ const [registerTable, { reload, getForm, getSelectRows, getRawDataSource }] = us
pagination: true,
striped: true,
useSearchForm: true,
resizeHeightOffset: 15,
showTableSetting: true,
bordered: true,
showIndexColumn: true,
@ -178,12 +200,9 @@ const [registerTable, { reload, getForm, getSelectRows, getRawDataSource }] = us
id: '44',
canResize: true,
immediate: true,
actionColumn: {
width: 80,
title: '操作',
dataIndex: 'action',
fixed: 'right',
},
resizeHeightOffset: 45,
tableComponent: 'vxe',
autoHeight: window.innerHeight - 330.5
})
// 新增 编辑
function GoDetailed(type, data) {
@ -312,12 +331,6 @@ async function printFee() {
}
</script>
<style lang="less" scoped>
.topTable {
height: calc(100vh - 145px);
}
.tableTitleBox {
.ant-btn-link {
border-radius: 2px;

Write Preview
Loading…
Cancel
Save