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

yxh

3 小时以前 c75027743ea7c3ecc2d0885f01d11d2ad78679a3

 src/views/project/donatefinish/index.vue

@@ -1,6 +1,7 @@
<template>
  <div class="app-container">
    <el-form
      class="opo-query-form"
      :model="queryParams"
      ref="queryForm"
      :inline="true"
@@ -126,7 +127,7 @@
          </el-form-item>
        </el-col>

        

      </el-row> -->
    </el-form>

@@ -155,7 +156,21 @@
          />
        </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.age2 && scope.row.age2 !== 0
                ? `${scope.row.age2}${scope.row.ageunit2}`
                : ""
            }`.trim()
          }}
        </template>
      </el-table-column>
      <el-table-column
        label="医疗机构"
        align="center"
@@ -294,8 +309,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>
@@ -364,7 +379,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="选择器官移植时间"
                  >