geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lng销售结算

Browse Source
This commit is contained in:
‘huanghaiixia’
2026-03-20 18:13:06 +08:00
parent 4d5bbd8188
commit d24e882e6c
8 changed files with 176 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/dayPlan/LngSettleHdr/components/config.ts
View File

@ -18,7 +18,7 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
field: 'cuName',
field: 'cpName',
label: '客户',
component: 'Input',
},
@ -30,7 +30,7 @@ export const columns: BasicColumn[] = [
title: '结算月',
componentType: 'input',
align: 'left',
width: 100,
sorter: true,
},
@ -39,7 +39,7 @@ export const columns: BasicColumn[] = [
title: '结算月开始日期',
componentType: 'input',
align: 'left',
width: 120,
sorter: true,
},
@ -48,16 +48,16 @@ export const columns: BasicColumn[] = [
title: '结算月结束日期',
componentType: 'input',
align: 'left',
width: 120,
sorter: true,
},
{
dataIndex: 'cuSname',
dataIndex: 'cpName',
title: '客户简称',
componentType: 'input',
align: 'left',
width: 140,
sorter: true,
},
@ -66,7 +66,7 @@ export const columns: BasicColumn[] = [
title: '结算总数量(吨)',
componentType: 'input',
align: 'left',
width: 130,
sorter: true,
},
@ -75,7 +75,7 @@ export const columns: BasicColumn[] = [
title: '结算总金额(元)',
componentType: 'input',
align: 'left',
width: 130,
sorter: true,
},
@ -84,7 +84,7 @@ export const columns: BasicColumn[] = [
title: '交易主体',
componentType: 'input',
align: 'left',
width: 120,
sorter: true,
},
@ -93,7 +93,7 @@ export const columns: BasicColumn[] = [
title: '结算说明',
componentType: 'input',
align: 'left',
width: 150,
sorter: true,
},
@ -102,7 +102,7 @@ export const columns: BasicColumn[] = [
title: '附件',
componentType: 'input',
align: 'left',
width: 150,
sorter: true,
},
@ -111,7 +111,7 @@ export const columns: BasicColumn[] = [
title: '审批状态',
componentType: 'input',
align: 'left',
width: 80,
sorter: true,
},
];

53
src/views/dayPlan/LngSettleHdr/components/createForm.vue
View File

@ -48,8 +48,8 @@
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="结算总数量(方)" name="qtySettleM3">
<a-input v-model:value="formState.qtySettleM3" disabled/>
<a-form-item label="结算总数量(吨)" name="qtySettleTon">
<a-input v-model:value="formState.qtySettleTon" disabled/>
</a-form-item>
</a-col>
<a-col :span="8">
@ -98,7 +98,7 @@
import type { Rule } from 'ant-design-vue/es/form';
import { getDictionary } from '/@/api/sales/Customer';
import { useModal } from '/@/components/Modal';
import { addLngPngSettleHdr,updateLngPngSettleHdr, getLngPngSettleHdr, getLngPngSettleHdrDate} from '/@/api/dayPlan/PngSettleHdr';
import { addLngLngSettleHdr,updateLngLngSettleHdr, getLngLngSettleHdr,getLngLngSettleHdrMonth} from '/@/api/dayPlan/LngSettleHdr';
import dayjs from 'dayjs';
import { getAppEnvConfig } from '/@/utils/env';
import { message } from 'ant-design-vue';
@ -109,8 +109,8 @@
import { getAllCom} from '/@/api/contract/ContractPurInt';
import { DataFormat, FormatOption, DATE_FORMAT, FormatType } from '/@/utils/dataFormat';
const tableName = 'PngSettleHdr';
const columnName = 'PngSettleHdr'
const tableName = 'LngSettleHdr';
const columnName = 'LngSettleHdr'
const formType = ref('2'); // 0 新建 1 修改 2 查看
const formRef = ref();
@ -196,20 +196,26 @@
});
const uploadChange = (val) => {
val.forEach(v=> {
v.tableId = ''
})
dataFileAccount.value = val
}
const uploadListChange = (val) => {
val.forEach(v=> {
v.tableId = ''
})
dataFile.value = val
}
async function getInfo(id) {
spinning.value = true
try {
let data = await getLngPngSettleHdr(id)
let data = await getLngLngSettleHdr(id)
spinning.value = false
Object.assign(formState, {...data})
Object.assign(dataFile.value, formState.lngFileUploadList || [])
Object.assign(dataFileAccount.value, formState.billList || [])
Object.assign(dataList.value, formState.lngPngSettleSalesList || [])
Object.assign(dataList.value, formState.lngLngSettleList || [])
formState.settleMonth = formState.settleMonth ? dayjs(formState.settleMonth) : null
formState.dateFrom = formState.dateFrom ? dayjs(formState.dateFrom) : null
formState.dateTo = formState.dateTo ? dayjs(formState.dateTo) : null
@ -222,7 +228,7 @@
const numFormat = () => {
dataList.value = DataFormat.format(dataList.value, [
FormatOption.createQty('qtySettleGj'),
FormatOption.createQty('qtySettleM3'),
FormatOption.createQty('qtySettleTon'),
FormatOption.createQty('qtyMeaGj'),
FormatOption.createQty('qtyMeaM3'),
FormatOption.createAmt('amount'),
@ -231,16 +237,16 @@
]);
let obj = {
qtySettleGj: formState.qtySettleGj,
qtySettleM3: formState.qtySettleM3,
qtySettleTon: formState.qtySettleTon,
amount: formState.amount
}
let a = DataFormat.format({...obj}, [
FormatOption.createQty('qtySettleGj'),
FormatOption.createQty('qtySettleM3'),
FormatOption.createQty('qtySettleTon'),
FormatOption.createAmt('amount'),
]);
formState.qtySettleGj = a.qtySettleGj
formState.qtySettleM3 = a.qtySettleM3
formState.qtySettleTon = a.qtySettleTon
formState.amount = a.amount
}
const settleChange = (val) => {
@ -251,23 +257,23 @@
const numClear = () => {
if (!dataList.value.length) {
formState.qtySettleGj = ''
formState.qtySettleM3 = ''
formState.qtySettleTon = ''
formState.amount = ''
}
}
const tableCount = () => {
let qtySettleGj = 0
let qtySettleM3 = 0
let qtySettleTon = 0
let amount = 0
dataList.value.forEach(v => {
if (Number(v.settleTimes) == 1){
qtySettleGj+=Number(v.qtySettleGj) || 0
qtySettleM3+=Number(v.qtySettleM3) || 0
qtySettleTon+=Number(v.qtySettleTon) || 0
}
amount+=Number(v.amount) || 0
})
formState.qtySettleGj = qtySettleGj.toFixed(3)
formState.qtySettleM3 = qtySettleM3.toFixed(3)
formState.qtySettleTon = qtySettleTon.toFixed(3)
formState.amount = amount.toFixed(2)
numFormat()
}
@ -280,12 +286,11 @@
cpCode: formState.cpCode,
comId: formState.comId
}
if (!pageId.value && formState.cpCode && formState.comId && !formState.dateFrom) {
let data = await getLngPngSettleHdrDate(obj) || []
if (data.length) {
formState.dateFrom = data[0]?.dateTo ? dayjs(data[0]?.dateTo) : null
formState.dateTo = null
}
if (formState.cpCode && formState.comId && !formState.dateFrom) {
let data = await getLngLngSettleHdrMonth(obj) || []
formState.dateFrom = data?.dateFrom ? dayjs(data?.dateFrom) : null
formState.dateTo = null
}
})
async function getOption() {
@ -333,10 +338,10 @@
...formState,
lngFileUploadList: dataFile.value,
billList: dataFileAccount.value,
lngPngSettleSalesList: dataList.value,
lngLngSettleList: dataList.value,
}
spinning.value = true;
let request = !formState.id ? addLngPngSettleHdr :updateLngPngSettleHdr
let request = !formState.id ? addLngLngSettleHdr :updateLngLngSettleHdr
try {
const data = await request(obj);
@ -347,7 +352,7 @@
// 同意保存不提示
if (!type) {
notification.success({
message: 'Tip',
message: '提示',
description: data?.id ? t('新增成功！') : t('修改成功！')
}); //提示消息
}

60
src/views/dayPlan/LngSettleHdr/index.vue
View File

@ -39,7 +39,7 @@
import { Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table';
import { getLngLngSettleHdrPage, deleteLngLngSettleHdr} from '/@/api/dayPlan/LngSettleHdr';
import { getLngLngSettleHdrPage, deleteLngLngSettleHdr,cancelLngSettleHdr} from '/@/api/dayPlan/LngSettleHdr';
import { PageWrapper } from '/@/components/Page';
import { useMessage } from '/@/hooks/web/useMessage';
import { useI18n } from '/@/hooks/web/useI18n';
@ -82,7 +82,7 @@
const tableRef = ref();
//所有按钮
const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":true},{"isUse":true,"name":"生成对账单","code":"check","icon":"ant-design:check-outlined","isDefault":false},{"isUse":true,"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true},{"isUse":true,"name":"取消对账单","code":"cancel","icon":"ant-design:rollback-outlined","isDefault":false},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true}]);
const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":true},{"isUse":true,"name":"生成对账单","code":"check","icon":"ant-design:check-outlined","isDefault":false},{"isUse":true,"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true},{"isUse":true,"name":"取消对账单","code":"cancel","icon":"ant-design:rollback-outlined","isDefault":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true}]);
//展示在列表内的按钮
const actionButtons = ref<string[]>(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord','approve']);
const buttonConfigs = computed(()=>{
@ -97,7 +97,7 @@
return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code));
});
const btnEvent = {add : handleAdd,edit : handleEdit,refresh : handleRefresh,view : handleView,startwork : handleStartwork,flowRecord : handleFlowRecord,approve : handleApprove,delete : handleDelete,}
const btnEvent = {add : handleAdd,edit : handleEdit,refresh : handleRefresh,view : handleView,startwork : handleStartwork,flowRecord : handleFlowRecord,approve : handleApprove,delete : handleDelete,datalog: handleDatalog, cancel: handelCancel}
const { currentRoute } = useRouter();
const router = useRouter();
@ -115,11 +115,13 @@
const draftsId = ref();
const visibleApproveProcessRef = ref(false);
const tableData = ref([])
const selectedKeys = ref([])
const taskIdRef = ref('');
const visibleFlowRecordModal = ref(false);
const [registerModal, { openModal }] = useModal();
const formName=currentRoute.value.meta?.title;
const [registerTable, { reload, setTableData }] = useTable({
const [registerTable, { reload, setTableData,clearSelectedRowKeys }] = useTable({
title: '' || (formName + '列表'),
api: getLngLngSettleHdrPage,
rowKey: 'id',
@ -150,6 +152,10 @@
dataIndex: 'action',
slots: { customRender: 'action' },
},
rowSelection: {
type: 'checkbox',
onChange: onSelectChange
},
tableSetting: {
size: false,
setting: false,
@ -174,6 +180,9 @@
deep: true,
}
);
function onSelectChange(rowKeys: string[]) {
selectedKeys.value = rowKeys;
}
const handleDownload = (info) => {
const url = parseDownloadUrl(info.response ? info.response.data.fileUrl : info.fileUrl);
const fileName = info.response ? info.response.data.fileOrg : info.fileOrg;
@ -235,6 +244,22 @@
btnEvent[code]();
}
async function handelCancel() {
if(!selectedKeys.value.length) {
notification.warning({
message: '提示',
description: t('请选择需要取消对账的数据'),
});
return
}
await cancelLngSettleHdr(selectedKeys.value)
handleSuccess();
notification.success({
message: '提示',
description: t('取消成功！'),
});
clearSelectedRowKeys()
}
function handleDatalog (record: Recordable) {
modalVisible.value = true
logId.value = record.id
@ -262,17 +287,30 @@
}
function handleEdit(record: Recordable) {
router.push({
path: '/form/LngSettleHdr/' + record.id + '/updateForm',
query: {
if (schemaIdComputedRef.value) {
router.push({
path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow',
query: {
formPath: 'dayPlan/LngSettleHdr',
formName: "编辑"+formName,
formId:currentRoute.value.meta.formId,
type:'edit',
id: record.id
}
});
}
});
} else {
router.push({
path: '/form/LngSettleHdr/' + record.id + '/updateForm',
query: {
formPath: 'dayPlan/LngSettleHdr',
formName: "编辑"+formName,
formId:currentRoute.value.meta.formId,
type:'edit',
id: record.id
}
});
}
}
function handleApprove () {
const { processId, taskIds, schemaId } = record.workflowData || {};
@ -302,7 +340,7 @@
deleteLngLngSettleHdr(ids).then((_) => {
handleSuccess();
notification.success({
message: 'Tip',
message: '提示',
description: t('删除成功！'),
});
});

2
src/views/dayPlan/PngSettleHdr/components/createForm.vue
View File

@ -288,7 +288,7 @@
cpCode: formState.cpCode,
comId: formState.comId
}
if (!pageId.value && formState.cpCode && formState.comId && !formState.dateFrom) {
if ( formState.cpCode && formState.comId && !formState.dateFrom) {
let data = await getLngPngSettleHdrDate(obj) || []
if (data.length) {
formState.dateFrom = data[0]?.dateTo ? dayjs(data[0]?.dateTo) : null

2
src/views/dayPlan/PngSettleHdrPur/components/createForm.vue
View File

@ -288,7 +288,7 @@
cpCode: formState.cpCode,
comId: formState.comId
}
if (!pageId.value && formState.cpCode && formState.comId && !formState.dateFrom) {
if ( formState.cpCode && formState.comId && !formState.dateFrom) {
let data = await getLngPngSettleHdrDate(obj) || []
if (data.length) {
formState.dateFrom = data[0]?.dateTo ? dayjs(data[0]?.dateTo) : null