-
@@ -44,7 +46,7 @@
import type { Rule } from 'ant-design-vue/es/form';
import { getDictionary } from '/@/api/sales/Customer';
import { useModal } from '/@/components/Modal';
- import { getLngPngAppro,approveLngPngAppro,getLngPngApproCompare } from '/@/api/dayPlan/PngAppro';
+ import { getLngPngAppro,approveLngPngAppro,getLngPngApproCompare,approveLngPngApproSZ,approveLngPngApproGD } from '/@/api/dayPlan/PngAppro';
import dayjs from 'dayjs';
import { getAppEnvConfig } from '/@/utils/env';
import { message } from 'ant-design-vue';
@@ -83,6 +85,9 @@
const hasDel = ref(false)
const formState = reactive({
+ });
+ const formStateNew = reactive({
+
});
const [register, { openModal:openModal}] = useModal();
const rules= reactive({
@@ -93,7 +98,9 @@
wrapperCol: { span: 18 },
}
const title = ref('日计划审批')
+ const titleNew = ref('')
const dataList = ref([])
+ const dataListNew = ref([])
const basicFormRef = ref()
let optionSelect= reactive({
approCodeList: [],
@@ -112,39 +119,27 @@
async function getCompareInfo(id) {
spinning.value = true
try {
- let data = await getLngPngApproCompare(id)
+ let data = await getLngPngApproCompare(id) || []
spinning.value = false
- Object.assign(formState, {...data})
- Object.assign(dataList.value, formState.lngPngApproPurList || [{}])
- const startDate = dayjs(formState.datePlan);
- const endDate = dayjs(new Date());
- const diffInDays = endDate.diff(startDate, 'day');
- if (diffInDays == 0) {
- formState.dayDesc = '当日'
- } else if (diffInDays == 1) {
- formState.dayDesc = '次日'
- } else if (diffInDays > 1) {
- formState.dayDesc = diffInDays + '日后'
- } else {
- formState.dayDesc = ''
+ if (data.length == 1) {
+ let obj = changeData(data[0])
+ Object.assign(formState, {...obj.params})
+ Object.assign(dataList.value, obj.list || [{}])
+ title.value = '版本V'+ formState.verNo
+ }
+ if (data.length > 1) {
+ let obj = changeData(data[0])
+ Object.assign(formState, {...obj.params})
+ Object.assign(dataList.value, obj.list || [{}])
+ title.value = '版本V'+ formState.verNo
+
+ let obj1 = changeData(data[1])
+ Object.assign(formStateNew, {...obj1.params})
+ Object.assign(dataListNew.value, obj1.list || [{}])
+ titleNew.value = '版本V'+ formStateNew.verNo
}
- formState.qtyContractM3 = Number(formState.qtyContractM3)/10000
- formState.qtyPlanM3 = Number(formState.qtyPlanM3)/10000
- formState.qtyDemandM3 = Number(formState.qtyDemandM3)/10000
- formState.qtySalesM3 = Number(formState.qtySalesM3)/10000
- let num = 0;
- let num1 = 0;
- dataList.value.forEach(v => {
- v.qtyDemandM3 = Number(v.qtyDemandM3)/10000
- v.qtySalesM3 = Number(v.qtySalesM3)/10000
- num+=(Number(v.qtySalesGj) || 0)
- num1+=(Number(v.qtySalesM3) || 0)
- });
- formState.qtySalesGj = num
- formState.qtySalesM3 = num1
} catch (error) {
- console.log(error, 'error')
spinning.value = false
}
@@ -154,40 +149,46 @@
try {
let data = await getLngPngAppro(id)
spinning.value = false
- Object.assign(formState, {...data})
- Object.assign(dataList.value, formState.lngPngApproPurList || [{}])
- const startDate = dayjs(formState.datePlan);
- const endDate = dayjs(new Date());
- const diffInDays = endDate.diff(startDate, 'day');
- if (diffInDays == 0) {
- formState.dayDesc = '当日'
- } else if (diffInDays == 1) {
- formState.dayDesc = '次日'
- } else if (diffInDays > 1) {
- formState.dayDesc = diffInDays + '日后'
- } else {
- formState.dayDesc = ''
+ let obj = changeData(data)
+ Object.assign(formState, {...obj.params})
+ Object.assign(dataList.value, obj.list || [{}])
+ } catch (error) {
+ spinning.value = false
}
- formState.qtyContractM3 = Number(formState.qtyContractM3)/10000
- formState.qtyPlanM3 = Number(formState.qtyPlanM3)/10000
- formState.qtyDemandM3 = Number(formState.qtyDemandM3)/10000
- formState.qtySalesM3 = Number(formState.qtySalesM3)/10000
+ }
+ const changeData = (obj) => {
+ let arr = obj.lngPngApproPurList || [{}]
+ // const startDate = dayjs(obj.datePlan);
+ // const endDate = dayjs(new Date());
+ // const diffInDays = endDate.diff(startDate, 'day');
+ // if (diffInDays == 0) {
+ // obj.dayDesc = '当日'
+ // } else if (diffInDays == 1) {
+ // obj.dayDesc = '次日'
+ // } else if (diffInDays > 1) {
+ // obj.dayDesc = diffInDays + '日后'
+ // } else {
+ // obj.dayDesc = ''
+ // }
+ obj.qtyContractM3 = Number(obj.qtyContractM3)/10000
+ obj.qtyPlanM3 = Number(obj.qtyPlanM3)/10000
+ obj.qtyDemandM3 = Number(obj.qtyDemandM3)/10000
+ obj.qtySalesM3 = Number(obj.qtySalesM3)/10000
let num = 0;
let num1 = 0;
- dataList.value.forEach(v => {
+ arr.forEach(v => {
v.qtyDemandM3 = Number(v.qtyDemandM3)/10000
v.qtySalesM3 = Number(v.qtySalesM3)/10000
num+=(Number(v.qtySalesGj) || 0)
num1+=(Number(v.qtySalesM3) || 0)
});
- formState.qtySalesGj = num
- formState.qtySalesM3 = num1
-
- } catch (error) {
- console.log(error, 'error')
- spinning.value = false
+ obj.qtySalesGj = num
+ obj.qtySalesM3 = num1
+ return {
+ list : arr,
+ params: obj
}
- }
+ }
async function getOption() {
optionSelect.approCodeList = await getDictionary('LNG_APPRO')
@@ -197,7 +198,6 @@
}
async function checkBtn(type) {
let data = basicFormRef.value.getFormValue()
- console.log(data, 'data')
let arr = JSON.parse(JSON.stringify(data.list))
arr.forEach(v=> {
v.qtyDemandM3 = Number(v.qtyDemandM3)*10000
@@ -214,7 +214,7 @@
let params = {
result: type == 'agree' ? 'C' : 'R',
remark: formState.reply,
- data: obj
+ data: [obj]
}
spinning.value = true;
try {
@@ -224,7 +224,17 @@
return
}
}
- await approveLngPngAppro(params);
+ let request = ''
+ if (formPath.includes('dayPlan/PngAppro/index')) {
+ request = approveLngPngAppro
+ }
+ if (formPath.includes('dayPlan/pngPipeAppro/index')) {
+ request = approveLngPngApproGD
+ }
+ if (formPath.includes('dayPlan/pngReceiveStationAppro/index')) {
+ request = approveLngPngApproSZ
+ }
+ await request(params);
spinning.value = false;
notification.success({
message: 'Tip',
diff --git a/src/views/dayPlan/PngAppro/index.vue b/src/views/dayPlan/PngAppro/index.vue
index 57ca288..a441831 100644
--- a/src/views/dayPlan/PngAppro/index.vue
+++ b/src/views/dayPlan/PngAppro/index.vue
@@ -44,7 +44,8 @@
import { useFormConfig } from '/@/hooks/web/useFormConfig';
import { useRouter } from 'vue-router';
import { setIndexFlowStatus } from '/@/utils/flow/index'
- import { getLngPngAppro } from '/@/api/dayPlan/PngAppro';
+ import { getLngPngAppro,getLngPngApproPageGd, getLngPngApproPageJsz, approveLngPngApproSZ, approveLngPngApproGD, approveLngPngAppro
+ } from '/@/api/dayPlan/PngAppro';
import { useModal,BasicModal } from '/@/components/Modal';
import LookProcess from '/@/views/workflow/task/components/LookProcess.vue';
import LaunchProcess from '/@/views/workflow/task/components/LaunchProcess.vue';
@@ -95,7 +96,6 @@
const { currentRoute } = useRouter();
const router = useRouter();
const path = currentRoute.value?.path
- console.log(currentRoute, 'router55555555555555', path)
const formIdComputedRef = ref();
formIdComputedRef.value = currentRoute.value.meta.formId
const schemaIdComputedRef = ref();
@@ -108,7 +108,7 @@
const formDataRef = ref();
const rowKeyData = ref();
const draftsId = ref();
-
+ const selectedKeys = ref([])
const visibleApproveProcessRef = ref(false);
const taskIdRef = ref('');
const visibleFlowRecordModal = ref(false);
@@ -117,21 +117,29 @@
let formName='管道气销售审批';
let curPath = 'dayPlan/PngAppro/index'
+ let request = ''
+ let requestApprove = ''
if (path.includes('dayPlan/PngAppro/index')) {
formName='管道气销售审批'
curPath = 'dayPlan/PngAppro/index'
+ request = getLngPngApproPage
+ requestApprove = approveLngPngAppro
}
if (path.includes('dayPlan/pngPipeAppro/index')) {
formName='管道气管道审批'
curPath = 'dayPlan/pngPipeAppro'
+ request = getLngPngApproPageGd
+ requestApprove = approveLngPngApproGD
}
if (path.includes('dayPlan/pngReceiveStationAppro/index')) {
formName='管道气接收站审批'
curPath = 'dayPlan/pngReceiveStationAppro'
+ request = getLngPngApproPageJsz
+ requestApprove = approveLngPngApproSZ
}
const [registerTable, { reload, clearSelectedRowKeys, setTableData }] = useTable({
title: '' || (formName + '列表'),
- api: getLngPngApproPage,
+ api: request,
rowKey: 'id',
columns: customConfigColums,
formConfig: {
@@ -182,7 +190,7 @@
});
const btnCheck = (record)=> {
- openModalApproStatus(true,{isUpdate: false,id:record.id});
+ openModalApproStatus(true,{isUpdate: false,id:record.demandId});
}
function onSelectChange(rowKeys: string[]) {
selectedKeys.value = rowKeys;
@@ -277,8 +285,32 @@
}
});
}
- function handleBatchApprove () {
- setTableData([{verNo: 5, cuCode: 444, approName: '未提交'}])
+ async function handleBatchApprove () {
+ if (!selectedKeys.value.length) {
+ notification.warning({
+ message: 'Tip',
+ description: t('请选择需要审批的数据'),
+ });
+ return;
+ }
+ let arr = selectedKeys.value.map(v=> {
+ return {
+ id: v
+ }
+ })
+
+ let obj = {
+ "result": "C",
+ "remark": "",
+ "data": arr
+ }
+ await requestApprove(obj)
+ handleSuccess();
+ notification.success({
+ message: 'Tip',
+ description: t('审批成功！'),
+ });
+ clearSelectedRowKeys()
}
onMounted(() => {
diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/searchForm.vue b/src/views/dayPlan/PngMeasureSalesPur/components/searchForm.vue
index 018da32..4f3485f 100644
--- a/src/views/dayPlan/PngMeasureSalesPur/components/searchForm.vue
+++ b/src/views/dayPlan/PngMeasureSalesPur/components/searchForm.vue
@@ -61,7 +61,6 @@
import downloadPointModal from '/@/components/common/downloadPointModal.vue';
import { Button as AButton, ButtonProps } from '/@/components/Button';
import { BasicArrow } from '/@/components/Basic';
-import { dE } from '@fullcalendar/core/internal-common';
const userStore = useUserStore();
@@ -106,10 +105,10 @@ import { dE } from '@fullcalendar/core/internal-common';
const onSearch = () => {
let obj = {
...formState.value,
- startDate: formState.value.datePlan[0],
- endDate: formState.value.datePlan[0],
- dateMeaStart: formState.value.dateMea[0],
- dateMeaEnd: formState.value.dateMea[1],
+ startDate: formState.value.datePlan ? dayjs(formState.value.datePlan[0]).format('YYYY-MM-DD') : '',
+ endDate: formState.value.datePlan ? dayjs(formState.value.datePlan[1]).format('YYYY-MM-DD') : '',
+ dateMeaStart: formState.value.dateMea ? dayjs(formState.value.dateMea[0]).format('YYYY-MM-DD') : '',
+ dateMeaEnd: formState.value.dateMea ? dayjs(formState.value.dateMea[1]).format('YYYY-MM-DD') : '',
}
delete obj.datePlan
delete obj.dateMea
diff --git a/src/views/system/systemNotice/components/Form.vue b/src/views/system/systemNotice/components/Form.vue
index 7364118..0c52f39 100644
--- a/src/views/system/systemNotice/components/Form.vue
+++ b/src/views/system/systemNotice/components/Form.vue
@@ -74,7 +74,9 @@
// 根据行唯一ID查询行数据，并设置表单数据 【编辑】
async function setFormDataFromId(rowId, skipUpdate) {
try {
- const record = await getXjrNotice(rowId);
+ let record = await getXjrNotice(rowId);
+ record.status = ''+record.status
+ record.publisherType = ''+record.publisherType
if (skipUpdate) {
return record;
}
From b0e03cecc0e50437b586566ee49d7230fb89ebde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com>
Date: Tue, 20 Jan 2026 17:55:58 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E9=87=8F?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PngMeasureSalesPur/components/config.ts | 28 +-
.../dayPlan/PngMeasureSalesPur/index.vue | 163 +++---
.../dayPlan/PngMeasureSalesPur/indexOld.vue | 540 ++++++++++++++++++
3 files changed, 622 insertions(+), 109 deletions(-)
create mode 100644 src/views/dayPlan/PngMeasureSalesPur/indexOld.vue
diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/config.ts b/src/views/dayPlan/PngMeasureSalesPur/components/config.ts
index 81a2fef..bdadbe3 100644
--- a/src/views/dayPlan/PngMeasureSalesPur/components/config.ts
+++ b/src/views/dayPlan/PngMeasureSalesPur/components/config.ts
@@ -39,7 +39,8 @@ export const columns: BasicColumn[] = [
title: '计划日期',
componentType: 'input',
align: 'left',
- width: 100,
+ width: 120,
+ ellipsis: true,
sorter: true,
},
@@ -48,7 +49,7 @@ export const columns: BasicColumn[] = [
title: '计量日期',
componentType: 'input',
align: 'left',
- width: 100,
+ width: 120,
sorter: true,
},
{
@@ -56,7 +57,8 @@ export const columns: BasicColumn[] = [
title: '客户',
componentType: 'input',
align: 'left',
-
+ ellipsis: true,
+ width: 200,
sorter: true,
},
{
@@ -64,7 +66,8 @@ export const columns: BasicColumn[] = [
title: '下载点',
componentType: 'input',
align: 'left',
-
+ ellipsis: true,
+ width: 200,
sorter: true,
},
{
@@ -72,7 +75,8 @@ export const columns: BasicColumn[] = [
title: '供应商',
componentType: 'input',
align: 'left',
-
+ ellipsis: true,
+ width: 200,
sorter: true,
},
@@ -81,7 +85,8 @@ export const columns: BasicColumn[] = [
title: '上载点',
componentType: 'input',
align: 'left',
-
+ ellipsis: true,
+ width: 200,
sorter: true,
},
@@ -170,7 +175,8 @@ export const columns: BasicColumn[] = [
title: '销售合同',
componentType: 'input',
align: 'left',
-
+ ellipsis: true,
+ width: 200,
sorter: true,
},
{
@@ -178,7 +184,8 @@ export const columns: BasicColumn[] = [
title: '采购合同',
componentType: 'input',
align: 'left',
-
+ ellipsis: true,
+ width: 200,
sorter: true,
},
@@ -187,7 +194,7 @@ export const columns: BasicColumn[] = [
title: '附件',
componentType: 'input',
align: 'left',
-
+ width: 200,
sorter: true,
},
@@ -205,7 +212,8 @@ export const columns: BasicColumn[] = [
title: '备注',
componentType: 'input',
align: 'left',
-
+ ellipsis: true,
+ width: 200,
sorter: true,
},
];
diff --git a/src/views/dayPlan/PngMeasureSalesPur/index.vue b/src/views/dayPlan/PngMeasureSalesPur/index.vue
index d2f93eb..f639c7e 100644
--- a/src/views/dayPlan/PngMeasureSalesPur/index.vue
+++ b/src/views/dayPlan/PngMeasureSalesPur/index.vue
@@ -17,27 +17,16 @@