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

yxh

4 小时以前 c75027743ea7c3ecc2d0885f01d11d2ad78679a3

 src/views/project/donatefinishcheck/index.vue

@@ -1,6 +1,7 @@
<template>
  <div class="app-container">
    <el-form
      class="opo-query-form"
      :model="queryParams"
      ref="queryForm"
      :inline="true"
@@ -139,7 +140,19 @@
          />
        </template>
      </el-table-column>
      <el-table-column label="年龄" align="center" prop="age" width="100" />
      <el-table-column label="年龄" align="center" prop="age" width="100">
        <template slot-scope="scope">
           {{
            `${
              scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
            } ${
              scope.row.age2 && scope.row.age2 !== 0
                ? `${scope.row.age2}${scope.row.ageunit2}`
                : ""
            }`.trim()
          }}
        </template>
      </el-table-column>
      <el-table-column
        label="现所在地市"
        align="center"
@@ -167,7 +180,7 @@
          />
        </template>
      </el-table-column>
      

      <el-table-column
        label="操作"
        align="center"
@@ -211,14 +224,6 @@
        <el-button type="primary" @click="saveReview">确 定</el-button>
        <el-button @click="hideReviewDialog">取 消</el-button>
      </div>
       <!-- <el-dialog
      :title="title"
      align="center"
      :visible.sync="open"
      width="1100px"
      :close-on-click-modal="false"
      append-to-body
    > -->
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-row>
          <el-col :span="8">
@@ -246,8 +251,8 @@
                clearable
                size="small"
                v-model="form.completetime"
                type="date"
                value-format="yyyy-MM-dd hh:mm:ss"
                type="date" format="yyyy-MM-dd"
                value-format="yyyy-MM-dd HH:mm:ss"
                placeholder="选择完成时间"
              >
              </el-date-picker>
@@ -316,7 +321,7 @@
                    size="small"
                    style="width: 90%"
                    v-model="scope.row.transplanttime"
                    type="date"
                    type="date" format="yyyy-MM-dd"
                    value-format="yyyy-MM-dd HH:mm:ss"
                    placeholder="选择器官获取时间"
                  >
@@ -497,7 +502,7 @@
    </el-dialog>


     



  </div>
@@ -893,16 +898,10 @@
      // this.queryParams.residenceprovince = this.$refs.areaSelect.getSheng();
      // this.queryParams.residencecity = this.$refs.areaSelect.getShi();
      // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
       if (this.starttime != "") {
        this.queryParams.starttime = this.starttime;
      } else {
        this.queryParams.starttime = "";
      }
      if (this.endtime != "") {
        this.queryParams.endtime = this.endtime;
      } else {
        this.queryParams.endtime = "";
      }
      // 未选时间范围时传 null：空串会让后端拼出 `donatetime >= ''`，
      // MySQL 严格模式会报 Incorrect DATETIME value: ''（见 CHANGELOG 2026-10-22）
      this.queryParams.starttime = this.starttime || null;
      this.queryParams.endtime = this.endtime || null;
      // this.queryParams.residenceprovince = this.$refs.areaSelect.getSheng();
      // this.queryParams.residencecity = this.$refs.areaSelect.getShi();
      // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
@@ -1294,7 +1293,6 @@

    LoadReportList() {
      listDonatebaseinfo().then((res) => {
        debugger
        let list = res.rows;
        let reportlist = [];
        reportlist.push({ reporterno: "", reportername: "全部" });
@@ -1304,7 +1302,6 @@
            reportername: element.reportername,
          });
        });
        debugger
        if (reportlist != 0) {
          reportlist = this.resetArr(reportlist);
          this.reportlist = reportlist;