bug处理

5240403c · suesueyue · 4e3639ee · 5240403c · 5240403c · 5240403c
Commit 5240403c authored Apr 01, 2026 by suesueyue
11 changed files
--- a/src/components/FinancialTable.vue
+++ b/src/components/FinancialTable.vue
@@ -18,7 +18,6 @@
      :data="tableDataRef"
      style="width: 100%"
      border
-      :cell-style="tableCellStyle"
      row-key="serialNumber"
      v-if="validConfig"
    >
@@ -69,7 +68,10 @@
      </el-table-column>

      <!-- 多级时间列表头渲染逻辑 -->
-      <template v-for="group in timeColumnGroups" :key="`time-group-${group.key}`">
+      <template
+        v-for="group in timeColumnGroups"
+        :key="`time-group-${group.key}`"
+      >
        <!-- 有一级分组标题 -->
        <el-table-column
          v-if="!group.isSingle && group.label"
@@ -77,7 +79,10 @@
          align="right"
        >
          <!-- 遍历一级分组的子项 -->
-          <template v-for="child in group.children" :key="`child-${child.key || child.prop}`">
+          <template
+            v-for="child in group.children"
+            :key="`child-${child.key || child.prop}`"
+          >
            <!-- 如果是二级分组 -->
            <el-table-column
              v-if="child.isSubGroup"
@@ -422,7 +427,7 @@ const handleTableData = (sourceIndicatorList, sourceTableData) => {
        noTotal,
        total: 0,
        ...originRow,
-      }),
+      })
    );
    initRowTimeField(rowData);
    rowData.total = calculateRowTotal(rowData);
@@ -451,11 +456,11 @@ watch(
    await nextTick();
    const newTableData = handleTableData(
      newVal.indicatorList,
-      newVal.tableData,
+      newVal.tableData
    );
    tableDataRef.value = newTableData;
  },
-  { deep: true, immediate: true },
+  { deep: true, immediate: true }
 );

 // 数字行输入回调

--- a/src/styles/manage.css
+++ b/src/styles/manage.css
@@ -5,6 +5,9 @@
  flex-direction: column;
  box-sizing: border-box;
 }
+.is-horizontal {
+  display: block !important;
+}
 .system-manage-header {
  background: rgba(255, 255, 255, 0.9);
  border-radius: 8px;
@@ -304,6 +307,7 @@
  height: 32px;
  display: flex;
  align-items: center;
+  text-align: justify !important;
  justify-content: center;
  line-height: 1.2;
 }

--- a/src/styles/manage.less
+++ b/src/styles/manage.less
@@ -6,6 +6,9 @@
  box-sizing: border-box;
 }

+  .is-horizontal {
+      display: block !important;
+  }
 .system-manage-header {
  background: rgba(255, 255, 255, 0.9);
  border-radius: 8px;
@@ -333,6 +336,7 @@
  height: 32px;
  display: flex;
  align-items: center;
+      text-align: justify !important;
  justify-content: center;
  line-height: 1.2;
 }

--- a/src/views/castbehind/investmentCecoveryAdd.vue
+++ b/src/views/castbehind/investmentCecoveryAdd.vue
@@ -136,7 +136,10 @@
                  name="投资额完成情况（万元）"
                  ><el-row gutter="20">
                    <el-col :span="12">
-                      <el-form-item label="项目投资总额（决策值）（万元）">
+                      <el-form-item
+                        label-width="260px"
+                        label="项目投资总额（决策值）（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.tzzejc"
@@ -145,7 +148,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="我方资本金出资额-决策值（万元）">
+                      <el-form-item
+                        label-width="260px"
+                        label="我方资本金出资额-决策值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.wfzbjczejc"
@@ -154,7 +160,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="投资总额-实际值（万元）">
+                      <el-form-item
+                        label-width="260px"
+                        label="投资总额-实际值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.tzzesj"
@@ -163,7 +172,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="我方资本金出资额--实际值（万元）">
+                      <el-form-item
+                        label-width="260px"
+                        label="我方资本金出资额--实际值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.wfzbjczesj"
@@ -172,7 +184,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="投资总额-计划值（万元）">
+                      <el-form-item
+                        label-width="260px"
+                        label="投资总额-计划值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.tzzejhz"
@@ -190,7 +205,10 @@
                  <el-row gutter="20">
                    <!-- 第一行：决策目标值相关数字项 -->
                    <el-col :span="12">
-                      <el-form-item label="本年完成 投资回收决策目标值（万元）">
+                      <el-form-item
+                        label-width="260px"
+                        label="本年完成 投资回收决策目标值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.bnwc"
@@ -200,7 +218,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="截止本年累计（决策目标值）">
+                      <el-form-item
+                        label-width="260px"
+                        label="截止本年累计（决策目标值）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.jzbnlj"
@@ -210,7 +231,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="下一年完成数（万元）">
+                      <el-form-item
+                        label-width="260px"
+                        label="下一年完成数（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.xynwcs"
@@ -220,7 +244,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="本年计划（万元）">
+                      <el-form-item
+                        label-width="260px"
+                        label="本年计划（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.bnjh"
@@ -232,7 +259,10 @@

                    <!-- 第二行：实际值相关数字项 -->
                    <el-col :span="12">
-                      <el-form-item label="本年完成--投资回收实际值（万元）">
+                      <el-form-item
+                        label-width="260px"
+                        label="本年完成--投资回收实际值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.bnwcsjz"
@@ -242,7 +272,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="截止本年累计--投资回收实际值">
+                      <el-form-item
+                        label-width="260px"
+                        label="截止本年累计--投资回收实际值"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.jzbnljsjz"
@@ -252,7 +285,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="累计欠收（万元）">
+                      <el-form-item
+                        label-width="260px"
+                        label="累计欠收（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.ljqs"
@@ -262,7 +298,7 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="完成率（%）">
+                      <el-form-item lable-width="240px" label="完成率（%）">
                        <el-input-number
                          precision="2"
                          v-model="formData.wcl"
@@ -402,9 +438,13 @@
      </div>

      <!-- 预览模式底部信息区域 -->
-      <el-collapse v-model="activeCollapse" v-if="isPreview" style="margin-top: 20px;">
+      <el-collapse
+        v-model="activeCollapse"
+        v-if="isPreview"
+        style="margin-top: 20px"
+      >
        <el-collapse-item title="相关信息" name="相关信息">
-          <div style="padding: 20px; color: #909399; text-align: center;">
+          <div style="padding: 20px; color: #909399; text-align: center">
            <p>此为预览模式，如需编辑请返回列表页点击"编辑"按钮</p>
          </div>
        </el-collapse-item>
@@ -788,6 +828,27 @@ let initTableData = () => {
          headerGroup: "投资回收（计划）",
          subGroup: yearStr,
        },
+        // 第五组：动态年度（二季度）
+        { label: "合计", prop: "a45", headerGroup: q2Str },
+        { label: "政府付费", prop: "a46", headerGroup: q2Str },
+        { label: "政府补助", prop: "a47", headerGroup: q2Str },
+        { label: "使用者付费", prop: "a48", headerGroup: q2Str },
+        { label: "使用者欠付", prop: "a49", headerGroup: q2Str },
+        { label: "补贴收入", prop: "a50", headerGroup: q2Str },
+        {
+          label: "销售回款（含房地产、水泥、新能源售电、其他生产制造收入等）",
+          prop: "a51",
+          headerGroup: q2Str,
+        },
+        { label: "资产盘活", prop: "a52", headerGroup: q2Str },
+        { label: "股权分红", prop: "a53", headerGroup: q2Str },
+        { label: "其他", prop: "a54", headerGroup: q2Str },
+        {
+          label: "目标（决策）与计划差异说明",
+          isTextRow: true,
+          prop: "a55",
+          headerGroup: q2Str,
+        },
        // 第五组：动态年度（三季度）
        { label: "合计", prop: "a45", headerGroup: q3Str },
        { label: "政府付费", prop: "a46", headerGroup: q3Str },
@@ -858,7 +919,7 @@ const formData = reactive({

 // 计算属性：动态生成年份相关的标题
 const currentYear = computed(
-  () => formData.nd || new Date().getFullYear().toString(),
+  () => formData.nd || new Date().getFullYear().toString()
 );
 const lastYear = computed(() => {
  const year = parseInt(currentYear.value);
@@ -902,7 +963,7 @@ watch(
  () => {
    activeCollapse.value = getActiveCollapseItems();
  },
-  { immediate: false },
+  { immediate: false }
 );

 let options = ref();

--- a/src/views/everydayPage/annualAdd.vue
+++ b/src/views/everydayPage/annualAdd.vue
--- a/src/views/everydayPage/annualPlan.vue
+++ b/src/views/everydayPage/annualPlan.vue
@@ -276,7 +276,7 @@ watch(
    const newData = handleTableData(newVal);
    tableData.value = newData; // 只更新内部数据，不emit
  },
-  { deep: true, immediate: true },
+  { deep: true, immediate: true }
 );

 // 监听时间列表变化，更新内部数据后统一emit【保留所有字段emit】
@@ -288,7 +288,7 @@ watch(
    tableData.value = newData;
    emitDataChange(newData);
  },
-  { deep: true, immediate: true },
+  { deep: true, immediate: true }
 );

 // 工具方法：数据变化校验+深拷贝emit【完整保留所有字段emit给父组件】
@@ -353,6 +353,7 @@ onMounted(() => {
  border-collapse: collapse;
  border: 1px solid #ebeef5;
  border-right: 0;
+  background: #f7faff;
 }
 .investment-table td {
  width: 160px;
@@ -367,22 +368,22 @@ onMounted(() => {
 .investment-table thead td {
  height: 48px;
  font-weight: bold;
-  background: #f5f7fa;
+  background: #f7faff;
 }
 .first-col {
  font-weight: bold;
-  background-color: #f5f7fa;
+  // background-color: #f5f7fa;
 }
 .second-col {
-  background-color: #f5f7fa;
+  // background-color: #f5f7fa;
 }
 .third-col {
  font-weight: 500;
-  background-color: #f5f7fa;
+  // background-color: #f5f7fa;
 }
 // 新增：第四列样式（计划投资回款等模块）
 .fourth-col {
-  background-color: #f5f7fa;
+  // background-color: #f5f7fa;
  font-weight: 500;
 }
 // 样式优化：移除不必要的隐藏，确保元素可见

--- a/src/views/everydayPage/shareAdd.vue
+++ b/src/views/everydayPage/shareAdd.vue
--- a/src/views/investingManage/constructionTimeAdd.vue
+++ b/src/views/investingManage/constructionTimeAdd.vue
@@ -136,7 +136,10 @@
                  name="投资额完成情况（万元）"
                  ><el-row gutter="20">
                    <el-col :span="12">
-                      <el-form-item label="项目投资总额（决策值）（万元）">
+                      <el-form-item
+                        label-width="280px"
+                        label="项目投资总额（决策值）（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.tzzejc"
@@ -145,7 +148,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="我方资本金出资额-决策值（万元）">
+                      <el-form-item
+                        label-width="280px"
+                        label="我方资本金出资额-决策值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.wfzbjczejc"
@@ -154,7 +160,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="投资总额-实际值（万元）">
+                      <el-form-item
+                        label-width="280px"
+                        label="投资总额-实际值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.tzzesj"
@@ -163,7 +172,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="我方资本金出资额--实际值（万元）">
+                      <el-form-item
+                        label-width="280px"
+                        label="我方资本金出资额--实际值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.wfzbjczesj"
@@ -172,7 +184,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="投资总额-计划值（万元）">
+                      <el-form-item
+                        label-width="280px"
+                        label="投资总额-计划值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.tzzejhz"
@@ -190,7 +205,10 @@
                  <el-row gutter="20">
                    <!-- 第一行：决策目标值相关数字项 -->
                    <el-col :span="12">
-                      <el-form-item label="本年完成 投资回收决策目标值（万元）">
+                      <el-form-item
+                        label-width="280px"
+                        label="本年完成 投资回收决策目标值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.bnwc"
@@ -200,7 +218,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="截止本年累计（决策目标值）">
+                      <el-form-item
+                        label-width="280px"
+                        label="截止本年累计（决策目标值）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.jzbnlj"
@@ -210,7 +231,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="下一年完成数（万元）">
+                      <el-form-item
+                        label-width="280px"
+                        label="下一年完成数（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.xynwcs"
@@ -220,7 +244,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="本年计划（万元）">
+                      <el-form-item
+                        label-width="280px"
+                        label="本年计划（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.bnjh"
@@ -232,7 +259,10 @@

                    <!-- 第二行：实际值相关数字项 -->
                    <el-col :span="12">
-                      <el-form-item label="本年完成--投资回收实际值（万元）">
+                      <el-form-item
+                        label-width="280px"
+                        label="本年完成--投资回收实际值（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.bnwcsjz"
@@ -242,7 +272,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="截止本年累计--投资回收实际值">
+                      <el-form-item
+                        label-width="280px"
+                        label="截止本年累计--投资回收实际值"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.jzbnljsjz"
@@ -252,7 +285,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="累计欠收（万元）">
+                      <el-form-item
+                        label-width="280px"
+                        label="累计欠收（万元）"
+                      >
                        <el-input-number
                          precision="2"
                          v-model="formData.ljqs"
@@ -262,7 +298,7 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
-                      <el-form-item label="完成率（%）">
+                      <el-form-item label-width="280px" label="完成率（%）">
                        <el-input-number
                          precision="2"
                          v-model="formData.wcl"
@@ -792,6 +828,27 @@ let initTableData = () => {
          headerGroup: "投资回收（计划）",
          subGroup: yearStr,
        },
+        // 第五组：动态年度（二季度）
+        { label: "合计", prop: "a45", headerGroup: q2Str },
+        { label: "政府付费", prop: "a46", headerGroup: q2Str },
+        { label: "政府补助", prop: "a47", headerGroup: q2Str },
+        { label: "使用者付费", prop: "a48", headerGroup: q2Str },
+        { label: "使用者欠付", prop: "a49", headerGroup: q2Str },
+        { label: "补贴收入", prop: "a50", headerGroup: q2Str },
+        {
+          label: "销售回款（含房地产、水泥、新能源售电、其他生产制造收入等）",
+          prop: "a51",
+          headerGroup: q2Str,
+        },
+        { label: "资产盘活", prop: "a52", headerGroup: q2Str },
+        { label: "股权分红", prop: "a53", headerGroup: q2Str },
+        { label: "其他", prop: "a54", headerGroup: q2Str },
+        {
+          label: "目标（决策）与计划差异说明",
+          isTextRow: true,
+          prop: "a55",
+          headerGroup: q2Str,
+        },
        // 第五组：动态年度（三季度）
        { label: "合计", prop: "a45", headerGroup: q3Str },
        { label: "政府付费", prop: "a46", headerGroup: q3Str },
@@ -862,7 +919,7 @@ const formData = reactive({

 // 计算属性：动态生成年份相关的标题
 const currentYear = computed(
-  () => formData.nd || new Date().getFullYear().toString(),
+  () => formData.nd || new Date().getFullYear().toString()
 );
 const lastYear = computed(() => {
  const year = parseInt(currentYear.value);
@@ -906,7 +963,7 @@ watch(
  () => {
    activeCollapse.value = getActiveCollapseItems();
  },
-  { immediate: false },
+  { immediate: false }
 );

 let options = ref();

--- a/src/views/investingManage/decisionAdd.vue
+++ b/src/views/investingManage/decisionAdd.vue
--- a/src/views/investingManage/quitAdd.vue
+++ b/src/views/investingManage/quitAdd.vue
@@ -312,7 +312,10 @@
                <el-collapse-item title="财务评价指标" name="财务评价指标">
                  <el-row :gutter="20">
                    <el-col :span="8">
-                      <el-form-item label="决策:项目投资内部收益率(税前):">
+                      <el-form-item
+                        label-width="260px"
+                        label="决策:项目投资内部收益率(税前):"
+                      >
                        <el-input
                          v-model="formData.jcxmtznbsylsq"
                          :precision="2"
@@ -325,7 +328,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="8">
-                      <el-form-item label="项目资本金内部收益率:">
+                      <el-form-item
+                        label-width="260px"
+                        label="项目资本金内部收益率:"
+                      >
                        <el-input
                          v-model="formData.xmzbjnbsyl"
                          :precision="2"
@@ -338,7 +344,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="8">
-                      <el-form-item label="项目投资回收期(税前):">
+                      <el-form-item
+                        label-width="260px"
+                        label="项目投资回收期(税前):"
+                      >
                        <el-input
                          v-model="formData.xmtzhsq"
                          :disabled="isPreview"
@@ -349,6 +358,7 @@
                    </el-col>
                    <el-col :span="8">
                      <el-form-item
+                        label-width="260px"
                        label="实际:预测项目全投资内部收益率(税前):"
                      >
                        <el-input
@@ -362,7 +372,10 @@
                      </el-form-item>
                    </el-col>
                    <el-col :span="8">
-                      <el-form-item label="预测项目资本金内部收益率(税后):">
+                      <el-form-item
+                        label-width="260px"
+                        label="预测项目资本金内部收益率(税后):"
+                      >
                        <el-input
                          v-model="formData.ycxmzbjnbsylsh"
                          :precision="2"

--- a/src/views/projectManage/addProject.vue
+++ b/src/views/projectManage/addProject.vue