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

yxh

5 小时以前 c75027743ea7c3ecc2d0885f01d11d2ad78679a3

 src/views/project/medicalevaluation/index.vue

@@ -2,6 +2,7 @@
<template>
  <div class="app-container">
    <el-form
      class="opo-query-form"
      :model="queryParams"
      ref="queryForm"
      :inline="true"
@@ -150,7 +151,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="医疗机构"
@@ -398,7 +411,7 @@
                  clearable
                  size="small"
                  v-model="form.hospitalassesstime"
                  type="date"
                  type="date" format="yyyy-MM-dd"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  placeholder="选择院级评估时间"
                >
@@ -451,7 +464,7 @@
                  clearable
                  size="small"
                  v-model="form.provincialassesstime"
                  type="date"
                  type="date" format="yyyy-MM-dd"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  placeholder="选择省级评估时间"
                >
@@ -505,7 +518,7 @@
                  clearable
                  size="small"
                  v-model="form.coreteamassesstime"
                  type="date"
                  type="date" format="yyyy-MM-dd"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  placeholder="评估时间"
                >