Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web

sinake

9 小时以前 8f059b6cc8daf96433ac699543996c9e1260023c

 src/views/project/statistics/caseStatistics/index.vue

@@ -86,11 +86,30 @@
      ></right-toolbar>
    </el-row>

    <!--<el-table v-loading="loading" border :data="donatebaseinfoList">     -->
    <el-tabs v-model="activeTab">
      <el-tab-pane label="按业务组" name="dept">
        <el-table
          v-loading="loading"
          :data="deptData"
          ref="deptTable"
          border
          max-height="700"
          highlight-current-row
          :summary-method="getDeptSummaries"
          show-summary
        >
          <el-table-column label="序号" align="center" prop="id" width="50" />
          <el-table-column label="业务组" align="center" prop="deptname" width="250" />
          <el-table-column label="累计案例" align="center" prop="caseTotal" width="150" />
          <el-table-column label="终止案例" align="center" prop="terminationTotal" width="150" />
        </el-table>
      </el-tab-pane>

      <el-tab-pane label="按人员" name="person">
    <el-table
      v-loading="loading"
      :data="jxidata"
      ref="table"
          ref="personTable"
      border
      max-height="700"
      highlight-current-row
@@ -98,11 +117,10 @@
      show-summary
    >
      <el-table-column label="序号" align="center" prop="id" width="50" />
      <el-table-column label="统计月份" align="center" prop="donationmonth" />
      <el-table-column label="业务组" align="center" prop="deptname">      </el-table-column>
      <el-table-column label="专职人员" align="center" prop="reportername" />
      <el-table-column label="案例累计" align="center" prop="casesum" />
      <el-table-column label="潜在捐献" align="center" prop="workflow0" width="100" />
          <el-table-column label="业务组" align="center" prop="deptname" width="250" >      </el-table-column>
          <el-table-column label="专职人员" align="center" prop="reportername" width="150" />
          <!-- <el-table-column label="登记案例累计" align="center" prop="casesum" width="100" /> -->
          <!-- <el-table-column label="潜在捐献" align="center" prop="workflow0" width="100" />
      <el-table-column label="医学评估" align="center" prop="workflow1" width="100" />
      <el-table-column label="家属确认" align="center" prop="workflow2" width="100" />
      <el-table-column label="伦理审查" align="center" prop="workflow3" width="100" />
@@ -110,8 +128,8 @@
      <el-table-column label="获取见证" align="center" prop="workflow5" width="100" />
      <el-table-column label="捐献完成" align="center" prop="workflow6" width="100" />
      <el-table-column label="归档撤销" align="center" prop="workflow7" width="100" />
      <el-table-column label="案例归档" align="center" prop="workflow8" width="100" />
      <!-- <el-table-column label="案例终止" align="center" prop="workflow9" width="90" /> -->
          <el-table-column label="案例归档" align="center" prop="workflow8" width="100" /> -->
          <el-table-column label="案例累计" align="center" prop="workflowsum" width="200" />
      <el-table-column label="终止案例" align="center" prop="terminationcase" width="100" />

      <!-- <el-table-column
@@ -127,9 +145,12 @@
        </template>
      </el-table-column> -->
    </el-table>
      </el-tab-pane>
    </el-tabs>

    <div style="margin: 10px;text-align: right;">
      <div>
        共 <span style="color:#1890FF ;">{{ total }}</span> 条数据
        共 <span style="color:#1890FF ;">{{ tableTotal }}</span> 条数据
      </div>
    </div>

@@ -146,7 +167,8 @@
  listbxiaostatistics,
  listjixstatistics,
  listanlstatistics,
  exportCaseStatistics
  exportCaseStatistics,
  exportCaseDeptStatistics
} from "@/api/project/statistics";

import { listUser } from "@/api/project/organization";
@@ -230,6 +252,10 @@
      donatebaseinfoList: [],
      // 捐献基础表格数据
      jxidata: [],
      // 当前页签：dept=按业务组，person=按人员
      activeTab: "dept",
      // 按业务组聚合数据
      deptData: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -260,7 +286,11 @@
    };
  },
  //监听属性 类似于data概念
  computed: {},
  computed: {
    tableTotal() {
      return this.activeTab === "dept" ? this.deptData.length : this.jxidata.length;
    }
  },
  activated() {},
  mounted() {},

@@ -316,6 +346,28 @@
          $obj.id = $index + 1;
        });
        this.total = res.total;
        this.buildDeptData();
      });
    },
    /** 按业务组聚合：累计案例 = Σworkflowsum，终止案例 = Σterminationcase */
    buildDeptData() {
      const map = new Map();
      this.jxidata.forEach(row => {
        const key = row.deptid || row.deptname || "未分组";
        if (!map.has(key)) {
          map.set(key, {
            deptname: row.deptname || "未分组",
            caseTotal: 0,
            terminationTotal: 0
          });
        }
        const item = map.get(key);
        item.caseTotal += Number(row.workflowsum) || 0;
        item.terminationTotal += Number(row.terminationcase) || 0;
      });
      this.deptData = Array.from(map.values()).map((item, index) => {
        item.id = index + 1;
        return item;
      });
    },
    /** 导出按钮操作 */
@@ -326,11 +378,15 @@
        padeptno: this.queryParams.padeptno,
        pausername: this.queryParams.pausername
      };
      const exportApi =
        this.activeTab === "dept"
          ? exportCaseDeptStatistics
          : exportCaseStatistics;
      this.$modal
        .confirm("是否确认导出当前筛选条件下的案例统计数据？")
        .confirm("是否确认导出当前列表的案例统计数据？")
        .then(() => {
          this.exportLoading = true;
          return exportCaseStatistics(queryParams);
          return exportApi(queryParams);
        })
        .then(response => {
          this.$download.name(response.msg);
@@ -343,7 +399,7 @@
    getSummaries(param) {
      const { columns, data } = param;
      const sums = [];
      var columnnames = ["donationmonth", "deptname", "reportername"];
      var columnnames = ["deptname", "reportername"];
      columns.forEach((column, index) => {
        if (index === 0) {
          sums[index] = "合计";
@@ -371,6 +427,26 @@
      });
      return sums;
    },
    /** 按业务组表格合计 */
    getDeptSummaries(param) {
      const { columns, data } = param;
      const sums = [];
      columns.forEach((column, index) => {
        if (index === 0) {
          sums[index] = "合计";
          return;
        }
        if (column.property === "deptname") {
          return;
        }
        const total = data.reduce(
          (prev, item) => prev + (Number(item[column.property]) || 0),
          0
        );
        sums[index] = data.length === 0 ? "" : total;
      });
      return sums;
    },

    // 表单重置
    reset() {