明树Git Lab

Commit b9a9a8aa authored by zhanghan's avatar zhanghan

1

parent 646e62af
Pipeline #109158 passed with stage
in 21 seconds
...@@ -294,7 +294,7 @@ const timeColumnGroups = computed(() => { ...@@ -294,7 +294,7 @@ const timeColumnGroups = computed(() => {
// 如果有 subGroup,在一级分组下创建二级分组 // 如果有 subGroup,在一级分组下创建二级分组
if (subGroup && subGroup.length > 0) { if (subGroup && subGroup.length > 0) {
let subGroupItem = groupMap[headerGroup].children.find( let subGroupItem = groupMap[headerGroup].children.find(
(child) => child.label === subGroup (child) => child.label === subGroup,
); );
if (!subGroupItem) { if (!subGroupItem) {
subGroupItem = { subGroupItem = {
...@@ -427,7 +427,7 @@ const handleTableData = (sourceIndicatorList, sourceTableData) => { ...@@ -427,7 +427,7 @@ const handleTableData = (sourceIndicatorList, sourceTableData) => {
noTotal, noTotal,
total: 0, total: 0,
...originRow, ...originRow,
}) }),
); );
initRowTimeField(rowData); initRowTimeField(rowData);
rowData.total = calculateRowTotal(rowData); rowData.total = calculateRowTotal(rowData);
...@@ -456,11 +456,11 @@ watch( ...@@ -456,11 +456,11 @@ watch(
await nextTick(); await nextTick();
const newTableData = handleTableData( const newTableData = handleTableData(
newVal.indicatorList, newVal.indicatorList,
newVal.tableData newVal.tableData,
); );
tableDataRef.value = newTableData; tableDataRef.value = newTableData;
}, },
{ deep: true, immediate: true } { deep: true, immediate: true },
); );
// 数字行输入回调 // 数字行输入回调
......
...@@ -169,10 +169,16 @@ ...@@ -169,10 +169,16 @@
} }
.add-project-content .tab-content .el-table tbody .el-table__cell { .add-project-content .tab-content .el-table tbody .el-table__cell {
padding: 0; padding: 0;
border-bottom: 1px solid rgba(0, 0, 0, 0.15) !important;
border-right: 1px solid rgba(0, 0, 0, 0.15) !important;
} }
.add-project-content .tab-content .el-table thead { .add-project-content .tab-content .el-table thead {
color: #000; color: #000;
} }
.add-project-content .tab-content .el-table thead .el-table__cell {
border-bottom: 1px solid rgba(0, 0, 0, 0.15) !important;
border-right: 1px solid rgba(0, 0, 0, 0.15) !important;
}
.add-project-content .tab-content .el-table thead th { .add-project-content .tab-content .el-table thead th {
background: #e4e8f1; background: #e4e8f1;
} }
......
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
box-sizing: border-box; box-sizing: border-box;
} }
.is-horizontal { .is-horizontal {
display: block !important; display: block !important;
} }
.el-scrollbar__thumb{ .el-scrollbar__thumb {
background:#467bad !important; background: #467bad !important;
opacity: 0.9 !important; opacity: 0.9 !important;
} }
.system-manage-header { .system-manage-header {
background: rgba(255, 255, 255, 0.9); background: rgba(255, 255, 255, 0.9);
border-radius: 8px; border-radius: 8px;
...@@ -180,11 +180,17 @@ ...@@ -180,11 +180,17 @@
} }
.el-table__cell { .el-table__cell {
padding: 0; padding: 0;
border-bottom: 1px solid rgba(0, 0, 0, 0.15) !important;
border-right: 1px solid rgba(0, 0, 0, 0.15) !important;
} }
} }
thead { thead {
color: #000; color: #000;
.el-table__cell {
border-bottom: 1px solid rgba(0, 0, 0, 0.15) !important;
border-right: 1px solid rgba(0, 0, 0, 0.15) !important;
}
th { th {
background: #e4e8f1; background: #e4e8f1;
.cell { .cell {
......
...@@ -718,49 +718,7 @@ let initTableData = () => { ...@@ -718,49 +718,7 @@ let initTableData = () => {
headerGroup: "投资回收(决策)", headerGroup: "投资回收(决策)",
subGroup: yearStr, subGroup: yearStr,
}, },
// 第二组:动态年度
{ label: "合计", prop: "a12", headerGroup: yearStr },
{ label: "政府付费", prop: "a13", headerGroup: yearStr },
{ label: "政府补助", prop: "a14", headerGroup: yearStr },
{ label: "使用者付费", prop: "a15", headerGroup: yearStr },
{ label: "使用者欠付", prop: "a16", headerGroup: yearStr },
{ label: "补贴收入", prop: "a17", headerGroup: yearStr },
{
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a18",
headerGroup: yearStr,
},
{ label: "资产盘活", prop: "a19", headerGroup: yearStr },
{ label: "股权分红", prop: "a20", headerGroup: yearStr },
{ label: "其他", prop: "a21", headerGroup: yearStr },
{
label: "目标(决策)与计划差异说明",
isTextRow: true,
prop: "a22",
headerGroup: yearStr,
},
// 第三组:动态年度(一季度)
{ label: "合计", prop: "a23", headerGroup: q1Str },
{ label: "政府付费", prop: "a24", headerGroup: q1Str },
{ label: "政府补助", prop: "a25", headerGroup: q1Str },
{ label: "使用者付费", prop: "a26", headerGroup: q1Str },
{ label: "使用者欠付", prop: "a27", headerGroup: q1Str },
{ label: "补贴收入", prop: "a28", headerGroup: q1Str },
{
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a29",
headerGroup: q1Str,
},
{ label: "资产盘活", prop: "a30", headerGroup: q1Str },
{ label: "股权分红", prop: "a31", headerGroup: q1Str },
{ label: "其他", prop: "a32", headerGroup: q1Str },
{
label: "目标(决策)与计划差异说明",
isTextRow: true,
prop: "a33",
headerGroup: q1Str,
},
// 第四组:投资回收(计划) -> 动态年度
{ {
label: "合计", label: "合计",
prop: "a34", prop: "a34",
...@@ -828,68 +786,280 @@ let initTableData = () => { ...@@ -828,68 +786,280 @@ let initTableData = () => {
headerGroup: "投资回收(计划)", headerGroup: "投资回收(计划)",
subGroup: yearStr, subGroup: yearStr,
}, },
// 第五组:动态年度(二季度)
{ label: "合计", prop: "a45", headerGroup: q2Str }, // 第三组:投资回收(计划) -> 一季度
{ label: "政府付费", prop: "a46", headerGroup: q2Str }, {
{ label: "政府补助", prop: "a47", headerGroup: q2Str }, label: "合计",
{ label: "使用者付费", prop: "a48", headerGroup: q2Str }, prop: "a23",
{ label: "使用者欠付", prop: "a49", headerGroup: q2Str }, headerGroup: "投资回收(计划)",
{ label: "补贴收入", prop: "a50", headerGroup: q2Str }, subGroup: q1Str,
},
{
label: "政府付费",
prop: "a24",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "政府补助",
prop: "a25",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "使用者付费",
prop: "a26",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "使用者欠付",
prop: "a27",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "补贴收入",
prop: "a28",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{ {
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)", label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a51", prop: "a29",
headerGroup: q2Str, headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "资产盘活",
prop: "a30",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "股权分红",
prop: "a31",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "其他",
prop: "a32",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
}, },
{ label: "资产盘活", prop: "a52", headerGroup: q2Str },
{ label: "股权分红", prop: "a53", headerGroup: q2Str },
{ label: "其他", prop: "a54", headerGroup: q2Str },
{ {
label: "目标(决策)与计划差异说明", label: "目标(决策)与计划差异说明",
isTextRow: true, isTextRow: true,
prop: "a55", prop: "a33",
headerGroup: q2Str, headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
// 第四组:投资回收(计划) -> 动态年度
// 第五组:投资回收(计划) -> 二季度
{
label: "合计",
prop: "a45",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "政府付费",
prop: "a46",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "政府补助",
prop: "a47",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "使用者付费",
prop: "a48",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "使用者欠付",
prop: "a49",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "补贴收入",
prop: "a50",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
}, },
// 第五组:动态年度(三季度)
{ label: "合计", prop: "a45", headerGroup: q3Str },
{ label: "政府付费", prop: "a46", headerGroup: q3Str },
{ label: "政府补助", prop: "a47", headerGroup: q3Str },
{ label: "使用者付费", prop: "a48", headerGroup: q3Str },
{ label: "使用者欠付", prop: "a49", headerGroup: q3Str },
{ label: "补贴收入", prop: "a50", headerGroup: q3Str },
{ {
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)", label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a51", prop: "a51",
headerGroup: q3Str, headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "资产盘活",
prop: "a52",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "股权分红",
prop: "a53",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "其他",
prop: "a54",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
}, },
{ label: "资产盘活", prop: "a52", headerGroup: q3Str },
{ label: "股权分红", prop: "a53", headerGroup: q3Str },
{ label: "其他", prop: "a54", headerGroup: q3Str },
{ {
label: "目标(决策)与计划差异说明", label: "目标(决策)与计划差异说明",
isTextRow: true, isTextRow: true,
prop: "a55", prop: "a55",
headerGroup: q3Str, headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
// 第六组:投资回收(计划) -> 三季度
{
label: "合计",
prop: "a56",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "政府付费",
prop: "a57",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "政府补助",
prop: "a58",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "使用者付费",
prop: "a59",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "使用者欠付",
prop: "a60",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "补贴收入",
prop: "a61",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
}, },
// 第六组:动态年度(四季度)
{ label: "合计", prop: "a56", headerGroup: q4Str },
{ label: "政府付费", prop: "a57", headerGroup: q4Str },
{ label: "政府补助", prop: "a58", headerGroup: q4Str },
{ label: "使用者付费", prop: "a59", headerGroup: q4Str },
{ label: "使用者欠付", prop: "a60", headerGroup: q4Str },
{ label: "补贴收入", prop: "a61", headerGroup: q4Str },
{ {
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)", label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a62", prop: "a62",
headerGroup: q4Str, headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "资产盘活",
prop: "a63",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "股权分红",
prop: "a64",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "其他",
prop: "a65",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
}, },
{ label: "资产盘活", prop: "a63", headerGroup: q4Str },
{ label: "股权分红", prop: "a64", headerGroup: q4Str },
{ label: "其他", prop: "a65", headerGroup: q4Str },
{ {
label: "目标(决策)与计划差异说明", label: "目标(决策)与计划差异说明",
isTextRow: true, isTextRow: true,
prop: "a66", prop: "a66",
headerGroup: q4Str, headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
// 第七组:投资回收(计划) -> 四季度
{
label: "合计",
prop: "a67",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "政府付费",
prop: "a68",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "政府补助",
prop: "a69",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "使用者付费",
prop: "a70",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "使用者欠付",
prop: "a71",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "补贴收入",
prop: "a72",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a73",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "资产盘活",
prop: "a74",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "股权分红",
prop: "a75",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "其他",
prop: "a76",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "目标(决策)与计划差异说明",
isTextRow: true,
prop: "a77",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
}, },
]; ];
}, },
...@@ -919,7 +1089,7 @@ const formData = reactive({ ...@@ -919,7 +1089,7 @@ const formData = reactive({
// 计算属性:动态生成年份相关的标题 // 计算属性:动态生成年份相关的标题
const currentYear = computed( const currentYear = computed(
() => formData.nd || new Date().getFullYear().toString() () => formData.nd || new Date().getFullYear().toString(),
); );
const lastYear = computed(() => { const lastYear = computed(() => {
const year = parseInt(currentYear.value); const year = parseInt(currentYear.value);
...@@ -963,7 +1133,7 @@ watch( ...@@ -963,7 +1133,7 @@ watch(
() => { () => {
activeCollapse.value = getActiveCollapseItems(); activeCollapse.value = getActiveCollapseItems();
}, },
{ immediate: false } { immediate: false },
); );
let options = ref(); let options = ref();
......
...@@ -718,49 +718,7 @@ let initTableData = () => { ...@@ -718,49 +718,7 @@ let initTableData = () => {
headerGroup: "投资回收(决策)", headerGroup: "投资回收(决策)",
subGroup: yearStr, subGroup: yearStr,
}, },
// 第二组:动态年度
{ label: "合计", prop: "a12", headerGroup: yearStr },
{ label: "政府付费", prop: "a13", headerGroup: yearStr },
{ label: "政府补助", prop: "a14", headerGroup: yearStr },
{ label: "使用者付费", prop: "a15", headerGroup: yearStr },
{ label: "使用者欠付", prop: "a16", headerGroup: yearStr },
{ label: "补贴收入", prop: "a17", headerGroup: yearStr },
{
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a18",
headerGroup: yearStr,
},
{ label: "资产盘活", prop: "a19", headerGroup: yearStr },
{ label: "股权分红", prop: "a20", headerGroup: yearStr },
{ label: "其他", prop: "a21", headerGroup: yearStr },
{
label: "目标(决策)与计划差异说明",
isTextRow: true,
prop: "a22",
headerGroup: yearStr,
},
// 第三组:动态年度(一季度)
{ label: "合计", prop: "a23", headerGroup: q1Str },
{ label: "政府付费", prop: "a24", headerGroup: q1Str },
{ label: "政府补助", prop: "a25", headerGroup: q1Str },
{ label: "使用者付费", prop: "a26", headerGroup: q1Str },
{ label: "使用者欠付", prop: "a27", headerGroup: q1Str },
{ label: "补贴收入", prop: "a28", headerGroup: q1Str },
{
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a29",
headerGroup: q1Str,
},
{ label: "资产盘活", prop: "a30", headerGroup: q1Str },
{ label: "股权分红", prop: "a31", headerGroup: q1Str },
{ label: "其他", prop: "a32", headerGroup: q1Str },
{
label: "目标(决策)与计划差异说明",
isTextRow: true,
prop: "a33",
headerGroup: q1Str,
},
// 第四组:投资回收(计划) -> 动态年度
{ {
label: "合计", label: "合计",
prop: "a34", prop: "a34",
...@@ -828,68 +786,280 @@ let initTableData = () => { ...@@ -828,68 +786,280 @@ let initTableData = () => {
headerGroup: "投资回收(计划)", headerGroup: "投资回收(计划)",
subGroup: yearStr, subGroup: yearStr,
}, },
// 第五组:动态年度(二季度)
{ label: "合计", prop: "a45", headerGroup: q2Str }, // 第三组:投资回收(计划) -> 一季度
{ label: "政府付费", prop: "a46", headerGroup: q2Str }, {
{ label: "政府补助", prop: "a47", headerGroup: q2Str }, label: "合计",
{ label: "使用者付费", prop: "a48", headerGroup: q2Str }, prop: "a23",
{ label: "使用者欠付", prop: "a49", headerGroup: q2Str }, headerGroup: "投资回收(计划)",
{ label: "补贴收入", prop: "a50", headerGroup: q2Str }, subGroup: q1Str,
},
{
label: "政府付费",
prop: "a24",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "政府补助",
prop: "a25",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "使用者付费",
prop: "a26",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "使用者欠付",
prop: "a27",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "补贴收入",
prop: "a28",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{ {
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)", label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a51", prop: "a29",
headerGroup: q2Str, headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "资产盘活",
prop: "a30",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "股权分红",
prop: "a31",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
{
label: "其他",
prop: "a32",
headerGroup: "投资回收(计划)",
subGroup: q1Str,
}, },
{ label: "资产盘活", prop: "a52", headerGroup: q2Str },
{ label: "股权分红", prop: "a53", headerGroup: q2Str },
{ label: "其他", prop: "a54", headerGroup: q2Str },
{ {
label: "目标(决策)与计划差异说明", label: "目标(决策)与计划差异说明",
isTextRow: true, isTextRow: true,
prop: "a55", prop: "a33",
headerGroup: q2Str, headerGroup: "投资回收(计划)",
subGroup: q1Str,
},
// 第四组:投资回收(计划) -> 动态年度
// 第五组:投资回收(计划) -> 二季度
{
label: "合计",
prop: "a45",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "政府付费",
prop: "a46",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "政府补助",
prop: "a47",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "使用者付费",
prop: "a48",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "使用者欠付",
prop: "a49",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "补贴收入",
prop: "a50",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
}, },
// 第五组:动态年度(三季度)
{ label: "合计", prop: "a45", headerGroup: q3Str },
{ label: "政府付费", prop: "a46", headerGroup: q3Str },
{ label: "政府补助", prop: "a47", headerGroup: q3Str },
{ label: "使用者付费", prop: "a48", headerGroup: q3Str },
{ label: "使用者欠付", prop: "a49", headerGroup: q3Str },
{ label: "补贴收入", prop: "a50", headerGroup: q3Str },
{ {
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)", label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a51", prop: "a51",
headerGroup: q3Str, headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "资产盘活",
prop: "a52",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "股权分红",
prop: "a53",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
{
label: "其他",
prop: "a54",
headerGroup: "投资回收(计划)",
subGroup: q2Str,
}, },
{ label: "资产盘活", prop: "a52", headerGroup: q3Str },
{ label: "股权分红", prop: "a53", headerGroup: q3Str },
{ label: "其他", prop: "a54", headerGroup: q3Str },
{ {
label: "目标(决策)与计划差异说明", label: "目标(决策)与计划差异说明",
isTextRow: true, isTextRow: true,
prop: "a55", prop: "a55",
headerGroup: q3Str, headerGroup: "投资回收(计划)",
subGroup: q2Str,
},
// 第六组:投资回收(计划) -> 三季度
{
label: "合计",
prop: "a56",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "政府付费",
prop: "a57",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "政府补助",
prop: "a58",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "使用者付费",
prop: "a59",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "使用者欠付",
prop: "a60",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "补贴收入",
prop: "a61",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
}, },
// 第六组:动态年度(四季度)
{ label: "合计", prop: "a56", headerGroup: q4Str },
{ label: "政府付费", prop: "a57", headerGroup: q4Str },
{ label: "政府补助", prop: "a58", headerGroup: q4Str },
{ label: "使用者付费", prop: "a59", headerGroup: q4Str },
{ label: "使用者欠付", prop: "a60", headerGroup: q4Str },
{ label: "补贴收入", prop: "a61", headerGroup: q4Str },
{ {
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)", label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a62", prop: "a62",
headerGroup: q4Str, headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "资产盘活",
prop: "a63",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "股权分红",
prop: "a64",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
{
label: "其他",
prop: "a65",
headerGroup: "投资回收(计划)",
subGroup: q3Str,
}, },
{ label: "资产盘活", prop: "a63", headerGroup: q4Str },
{ label: "股权分红", prop: "a64", headerGroup: q4Str },
{ label: "其他", prop: "a65", headerGroup: q4Str },
{ {
label: "目标(决策)与计划差异说明", label: "目标(决策)与计划差异说明",
isTextRow: true, isTextRow: true,
prop: "a66", prop: "a66",
headerGroup: q4Str, headerGroup: "投资回收(计划)",
subGroup: q3Str,
},
// 第七组:投资回收(计划) -> 四季度
{
label: "合计",
prop: "a67",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "政府付费",
prop: "a68",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "政府补助",
prop: "a69",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "使用者付费",
prop: "a70",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "使用者欠付",
prop: "a71",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "补贴收入",
prop: "a72",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "销售回款(含房地产、水泥、新能源售电、其他生产制造收入等)",
prop: "a73",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "资产盘活",
prop: "a74",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "股权分红",
prop: "a75",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "其他",
prop: "a76",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
},
{
label: "目标(决策)与计划差异说明",
isTextRow: true,
prop: "a77",
headerGroup: "投资回收(计划)",
subGroup: q4Str,
}, },
]; ];
}, },
...@@ -919,7 +1089,7 @@ const formData = reactive({ ...@@ -919,7 +1089,7 @@ const formData = reactive({
// 计算属性:动态生成年份相关的标题 // 计算属性:动态生成年份相关的标题
const currentYear = computed( const currentYear = computed(
() => formData.nd || new Date().getFullYear().toString() () => formData.nd || new Date().getFullYear().toString(),
); );
const lastYear = computed(() => { const lastYear = computed(() => {
const year = parseInt(currentYear.value); const year = parseInt(currentYear.value);
...@@ -963,7 +1133,7 @@ watch( ...@@ -963,7 +1133,7 @@ watch(
() => { () => {
activeCollapse.value = getActiveCollapseItems(); activeCollapse.value = getActiveCollapseItems();
}, },
{ immediate: false } { immediate: false },
); );
let options = ref(); let options = ref();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment