diff --git a/src/views/plan/PlanYearDemandHdr/components/createForm.vue b/src/views/plan/PlanYearDemandHdr/components/createForm.vue
index e3b6382..cfbe47b 100644
--- a/src/views/plan/PlanYearDemandHdr/components/createForm.vue
+++ b/src/views/plan/PlanYearDemandHdr/components/createForm.vue
@@ -92,12 +92,13 @@ import Index from '/@/views/sys/error-log/index.vue';
});
const columns = ref([
- { title: t('序号'), dataIndex: 'index', key: 'index', width: 50 },
- { title: t('月份'), dataIndex: 'month', width: 80 },
- { title: t('管道气(万方)'), dataIndex: 'qty', width: 250 },
- { title: t('LNG(吨)'), dataIndex: 'lng', width: 250 },
- { title: t('LNG(万方)(气化率1400)'), dataIndex: 'lngNum' },
- { title: t('小计(万方)'), dataIndex: 'total' },
+ { title: t('序号'), dataIndex: 'index', key: 'index', customRender: (column) => `${column.index + 1}` ,width: 60},
+ { title: t('月份'), dataIndex: 'month', width: 70},
+ { title: t('管道气(万方)'), dataIndex: 'qty', width: 180},
+ { title: t('LNG(吨)'), dataIndex: 'lng', width: 180},
+ { title: t('备注'), dataIndex: 'note', width: 300},
+ { title: t('LNG(万方)(气化率1400)'), dataIndex: 'lngNum',width: 250},
+ { title: t('小计(万方)'), dataIndex: 'total',width: 250},
]);
onMounted(async () => {
@@ -122,6 +123,12 @@ import Index from '/@/views/sys/error-log/index.vue';
try {
const data = await getLngPlanYearDemandHdr(id);
Object.assign(formState, data);
+ let noteKeys = []
+ for (let i in data) {
+ if (i.includes('note') && i.length>4) {
+ noteKeys.push({note: i, value: data[i]})
+ }
+ }
let arr = data?.lngPlanYearDemandList || [];
let objPng = {}
let objLng = {}
@@ -146,6 +153,7 @@ import Index from '/@/views/sys/error-log/index.vue';
}
lngkeys.forEach((i,idx)=> {
dataList.value[idx].lng = i.value
+ dataList.value[idx].note = noteKeys[idx].value
})
let totalObj = {month: '合计'}
dataList.value.splice(12,0,totalObj)
diff --git a/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue b/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue
index afceb6c..f01eece 100644
--- a/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue
+++ b/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue
@@ -47,10 +47,14 @@
年度需求明细