Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-17 b12ea16fa2d9440e9680127d126a4f3af450afd2

 src/views/reportForm/locationReport/index.vue

@@ -21,6 +21,7 @@
          :table-list="tableList"
          @selTableCol="selTableCol"
          @tableRowClick="tableRowClick"
          :showSummary="true"
        >
          <template slot="tableButton">
            <el-table-column label="操作" width="210" align="center">
@@ -179,7 +180,7 @@
          prop: "unit",
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值")
          isShowColumn: showcol.includes("单位")
        },
        {
          label: "价值",