java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复对账和结算显示

dev-xx
qb 8 months ago
parent
e170e1f9ed
commit
28deacd29a
6 changed files with 66 additions and 454 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/components/SelectComponent/SelectComponent.vue
  2. 486
      src/option/finance/CustomerSettlement.js
  3. 23
      src/option/finance/MerchantDepositSlip.js
  4. 2
      src/views/distribution/inventory/CreateOrder.vue
  5. 2
      src/views/finance/CustomerSettlement.vue
  6. 5
      src/views/waybill/CreateZeroOrder.vue

2
src/components/SelectComponent/SelectComponent.vue
Unescape View File

@ -27,11 +27,13 @@ onMounted(() => {
// 获取body节点并添加点击事件, 通过事件委派进行监听模块是否显示
_bodyNode.value = document.querySelector('body');
_bodyNode.value.addEventListener('click', addFn, false);
window.addEventListener('click', addFn, false);
});
onUnmounted(() => {
// 模块销毁时去除监听事件
_bodyNode.value.removeEventListener('click', addFn);
window.removeEventListener('click', addFn);
});
</script>

486
src/option/finance/CustomerSettlement.js
Unescape View File

@ -37,7 +37,7 @@ export const columnList = [
head: false,
},
{
prop: 'orderNo',
prop: 'orderCode',
label: '订单编号',
type: 1,
values: '',
@ -92,18 +92,22 @@ export const columnList = [
head: false,
},
{
prop: 'waybillStatus',
prop: 'balanceStatusName',
label: '结算状态',
type: 1,
values: '',
width: '150',
checkarr: [],
checkarr: [
{ label: '未结算', value: '0' },
{ label: '部分结算', value: '1' },
{ label: '已结算', value: '2' },
],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'templateType',
prop: 'totalBalanceFee',
label: '结算单总金额',
type: 1,
values: '',
@ -114,7 +118,7 @@ export const columnList = [
head: false,
},
{
prop: 'templateType',
prop: 'hasBalanceFee',
label: '已结算金额',
type: 1,
values: '',
@ -125,7 +129,7 @@ export const columnList = [
head: false,
},
{
prop: 'templateType',
prop: 'noBalanceFee',
label: '待结算金额',
type: 1,
values: '',
@ -135,52 +139,8 @@ export const columnList = [
sortable: true,
head: false,
},
// {
// prop: 'statementStatus',
// label: '对账状态',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'totalStatementFee',
// label: '对账单金额',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'openTime',
// label: '开单时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'goodsName',
// label: '货物品类',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'totalcount',
prop: 'totalCount',
label: '总件数',
type: 1,
values: '',
@ -212,17 +172,6 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'openFee',
label: '订单开单总费用',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'openFee',
label: '订单实际总费用',
@ -236,17 +185,6 @@ export const columnList = [
},
{
prop: 'pickupFee',
label: '开单提货费',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'realPickupFee',
label: '实际提货费',
type: 1,
values: '',
@ -258,17 +196,6 @@ export const columnList = [
},
{
prop: 'freightFee',
label: '开单运费',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'realFreightFee',
label: '实际运费',
type: 1,
values: '',
@ -279,7 +206,7 @@ export const columnList = [
head: false,
},
{
prop: 'realWarehouseServiceFee',
prop: 'warehouseServiceFee',
label: '仓储服务费',
type: 1,
values: '',
@ -290,7 +217,7 @@ export const columnList = [
head: false,
},
{
prop: 'realWarehouseFee',
prop: 'warehouseFee',
label: '仓储费',
type: 1,
values: '',
@ -301,7 +228,7 @@ export const columnList = [
head: false,
},
{
prop: 'realWarehouseManageFee',
prop: 'warehouseManageFee',
label: '仓储管理费',
type: 1,
values: '',
@ -312,7 +239,7 @@ export const columnList = [
head: false,
},
{
prop: 'realWarehouseSortingFee',
prop: 'warehouseSortingFee',
label: '仓储分拣费',
type: 1,
values: '',
@ -323,7 +250,7 @@ export const columnList = [
head: false,
},
{
prop: 'realWarehouseOperatingFee',
prop: 'warehouseOperatingFee',
label: '仓储操作费',
type: 1,
values: '',
@ -335,17 +262,6 @@ export const columnList = [
},
{
prop: 'deliveryServiceFee',
label: '开单配送服务费',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'realDeliveryServiceFee',
label: '实际配送服务费',
type: 1,
values: '',
@ -357,17 +273,6 @@ export const columnList = [
},
{
prop: 'deliveryFee',
label: '开单配送费',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'realDeliveryFee',
label: '实际配送费',
type: 1,
values: '',
@ -378,7 +283,7 @@ export const columnList = [
head: false,
},
{
prop: 'realDeliveryLoadingFee',
prop: 'deliveryLoadingFee',
label: '配送操作装卸费',
type: 1,
values: '',
@ -389,7 +294,7 @@ export const columnList = [
head: false,
},
{
prop: 'realDeliverySortingFee',
prop: 'deliverySortingFee',
label: '配送分货费',
type: 1,
values: '',
@ -400,7 +305,7 @@ export const columnList = [
head: false,
},
{
prop: 'realDeliveryUpfloorFee',
prop: 'deliveryUpfloorFee',
label: '配送上楼费',
type: 1,
values: '',
@ -411,7 +316,7 @@ export const columnList = [
head: false,
},
{
prop: 'realDeliveryMoveFee',
prop: 'deliveryMoveFee',
label: '配送平移费',
type: 1,
values: '',
@ -422,7 +327,7 @@ export const columnList = [
head: false,
},
{
prop: 'realDeliveryCrossingFee',
prop: 'deliveryCrossingFee',
label: '配送超区费',
type: 1,
values: '',
@ -433,7 +338,7 @@ export const columnList = [
head: false,
},
{
prop: 'realInstallFee',
prop: 'installFee',
label: '安装费',
type: 1,
values: '',
@ -444,7 +349,7 @@ export const columnList = [
head: false,
},
{
prop: 'realOtherFee',
prop: 'otherFee',
label: '其他费',
type: 1,
values: '',
@ -454,180 +359,9 @@ export const columnList = [
sortable: true,
head: false,
},
// {
// prop: 'realQuotationFee',
// label: '保价费',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'realClaimingValue',
// label: '申明价值',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'realReturnFee',
// label: '回扣',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'realThirdOprationFee',
// label: '三方操作费',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'realDeliveryDistance',
// label: '实际配送公里数',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'realXPay',
// label: '现付',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'realDPay',
// label: '到付',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'realHPay',
// label: '实际回付',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'yPay',
// label: '开单月结',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'realYPay',
// label: '实际月付',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'totalStatementFee',
label: '是否售后',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalStatementFee',
label: '售后金额',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'isChangesName',
label: '是否异动',
type: 1,
values: '',
width: '150',
checkarr: [
{ label: '是', value: 1 },
{ label: '否', value: 0 },
],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'changesFee',
label: '异动金额',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'changesItems',
label: '异动条目',
type: 1,
values: '',
width: '150',
checkarr: [
{ label: '是', value: 1 },
{ label: '否', value: 0 },
],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'changesRemark',
label: '异动备注',
prop: 'abnormalBalanceStatusName',
label: '是否异常结算',
type: 1,
values: '',
width: '150',
@ -640,162 +374,8 @@ export const columnList = [
head: false,
},
{
prop: 'templateType',
label: '异动操作人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'statementCreateTime',
label: '对账确认时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'statementCreateUser',
label: '对账确认人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'incomingTime',
label: '入库时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'outingTime',
label: '出库时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'templateType',
label: '出库周期',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'templateType',
label: '结算方',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'payWay',
label: '支付方式',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'templateType',
label: '付款方式',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'templateType',
label: '服务号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'shipperPerson',
label: '发货人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'shipperMobile',
label: '发货手机号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'shipperAddress',
label: '发货地址',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'consigneePerson',
label: '收货人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'consigneeMobile',
label: '收货人手机号',
prop: 'abnormalBalanceFee',
label: '异常结算金额',
type: 1,
values: '',
width: '150',
@ -805,8 +385,8 @@ export const columnList = [
head: false,
},
{
prop: 'templateType',
label: '收货人地址',
prop: 'abnormalRemark',
label: '异常结算备注',
type: 1,
values: '',
width: '150',
@ -816,8 +396,8 @@ export const columnList = [
head: false,
},
{
prop: 'departure',
label: '发站',
prop: 'abnormalTime',
label: '异常结算时间',
type: 1,
values: '',
width: '150',
@ -827,8 +407,8 @@ export const columnList = [
head: false,
},
{
prop: 'destination',
label: '到站',
prop: 'abnormalUserName',
label: '异常结算操作人',
type: 1,
values: '',
width: '150',

23
src/option/finance/MerchantDepositSlip.js
Unescape View File

@ -756,7 +756,28 @@ export const columnList = [
type: 1,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '1',
label: '现付',
},
{
value: '2',
label: '到付',
},
{
value: '3',
label: '月结',
},
{
value: '4',
label: '回付',
},
{
value: '5',
label: '内部结算',
},
],
fixed: false,
sortable: true,
head: false,

2
src/views/distribution/inventory/CreateOrder.vue
Unescape View File

@ -2938,6 +2938,8 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
});
}
if (!(details.query.totalFreight > 0)) return ElMessage.warning('请输入大于零的运费');
const submitData = {
...details.totalObj,
...details.query,

2
src/views/finance/CustomerSettlement.vue
Unescape View File

@ -120,6 +120,7 @@ import {
handleClearTableQuery,
handleInputQuery,
handleSelectQuery,
handleTranslationDataSeclect,
} from '@/utils/util';
import { columnList } from '@/option/finance/CustomerSettlement';
import { useRouter } from 'vue-router';
@ -221,6 +222,7 @@ const onLoad = async (params = {}) => {
const { code, data } = res.data;
if (code !== 200) return;
details.data = data.records;
handleTranslationDataSeclect(details.data, details.columnList);
details.page.total = data.total;
return res.data;

5
src/views/waybill/CreateZeroOrder.vue
Unescape View File

@ -1118,6 +1118,9 @@ const instance = getCurrentInstance();
const ruleFormRef = ref<FormInstance>();
const causeFormRef = ref<FormInstance>();
// 组件实例
const tableNode = ref();
// vuex
const $store = useStore();
@ -2479,6 +2482,8 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
});
}
if (!(details.query.totalFreight > 0)) return ElMessage.warning('请输入大于零的运费');
console.log('submit!');
const submitData = {
...details.totalObj,

Write Preview
Loading…
Cancel
Save