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

WXL

2026-05-13 e5af0daca71f21317b061f174869e6ded2829071

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

 src/views/business/affirm/index.vue

@@ -8,7 +8,7 @@
        :inline="true"
        label-width="100px"
      >
        <el-form-item label="捐献者姓名" prop="donorName">
        <el-form-item label="姓名" prop="donorName">
          <el-input
            v-model="queryParams.donorName"
            placeholder="请输入捐献者姓名"
@@ -17,19 +17,10 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="所在医疗机构" prop="hospitalName">
        <el-form-item label="上报医院" prop="hospitalName">
          <el-input
            v-model="queryParams.hospitalName"
            placeholder="请输入医疗机构"
            clearable
            style="width: 200px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="业务人员" prop="assignee">
          <el-input
            v-model="queryParams.assignee"
            placeholder="请输入业务人员"
            clearable
            style="width: 200px"
            @keyup.enter.native="handleQuery"
@@ -56,6 +47,15 @@
            end-placeholder="结束日期"
            value-format="yyyy-MM-dd"
            style="width: 240px"
          />
        </el-form-item>
        <el-form-item label="协调员" prop="assignee">
          <el-input
            v-model="queryParams.assignee"
            placeholder="请输入协调员"
            clearable
            style="width: 200px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item>
@@ -112,13 +112,13 @@
      >
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column
          label="住院号"
          label="案例编号"
          align="center"
          prop="inpatientno"
          width="120"
        />
        <el-table-column
          label="潜在捐献者姓名"
          label="姓名"
          align="center"
          prop="name"
          width="120"
@@ -139,13 +139,6 @@
          min-width="180"
          show-overflow-tooltip
        />
        <el-table-column
          label="所在医疗机构"
          align="center"
          prop="treatmenthospitalname"
          width="150"
          show-overflow-tooltip
        />
        <!-- <el-table-column
          label="确认状态"
          align="center"
@@ -158,14 +151,6 @@
            </el-tag>
          </template>
        </el-table-column> -->

        <el-table-column
          label="家属意见"
          align="center"
          prop="relativeRemark"
          width="150"
          show-overflow-tooltip
        />
        <el-table-column
          label="确认时间"
          align="center"
@@ -180,11 +165,13 @@
            }}</span>
          </template>
        </el-table-column>

        <el-table-column
          label="业务人员"
          label="家属意见"
          align="center"
          prop="responsibleusername"
          width="100"
          prop="relativeRemark"
          width="150"
          show-overflow-tooltip
        />
        <el-table-column
          label="协调员1"
@@ -199,6 +186,19 @@
          width="100"
        />
        <el-table-column
          label="上报医院"
          align="center"
          prop="treatmenthospitalname"
          width="150"
          show-overflow-tooltip
        />
        <el-table-column
          label="上报人员"
          align="center"
          prop="responsibleusername"
          width="100"
        />
        <el-table-column
          label="操作"
          align="center"
          width="120"

 src/views/business/allocation/index.vue

@@ -17,7 +17,7 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="捐献者姓名" prop="name">
        <el-form-item label="姓名" prop="name">
          <el-input
            v-model="queryParams.name"
            placeholder="请输入捐献者姓名"
@@ -26,6 +26,7 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        
        <el-form-item label="案例编号" prop="caseNo">
          <el-input
            v-model="queryParams.caseNo"
@@ -35,6 +36,7 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
       
        <el-form-item label="分配状态" prop="allocationStatus">
          <el-select
            v-model="queryParams.allocationStatus"
@@ -109,20 +111,57 @@
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55" align="center" />
<<<<<<< HEAD
        <!--
        <el-table-column
=======
        <!-- <el-table-column
>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
          label="案例编号"
          align="center"
          prop="caseNo"
          width="120"
<<<<<<< HEAD
        />
        <el-table-column
          label="捐献者编号"
          align="center"
          prop="donorno"
          width="120"
        />
        <el-table-column
          label="证件号码"
          align="center"
          prop="idcardno"
          width="180"
        />
        <el-table-column
          label="血型"
          align="center"
          prop="bloodtype"
          width="80"
        />
        
        <el-table-column
          label="医疗机构"
          align="center"
          prop="treatmenthospitalname"
          min-width="150"
          show-overflow-tooltip
        />
        -->
=======
        /> -->

        <el-table-column label="姓名" align="center" prop="name" width="100" />
>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
        <el-table-column
          label="住院号"
          align="center"
          prop="inpatientno"
          width="120"
        />
        <el-table-column label="姓名" align="center" prop="name" width="100" />
        <el-table-column label="性别" align="center" prop="sex" width="80">
          <template slot-scope="scope">
            <dict-tag
@@ -133,29 +172,10 @@
        </el-table-column>
        <el-table-column label="年龄" align="center" prop="age" width="80" />
        <el-table-column
          label="血型"
          align="center"
          prop="bloodtype"
          width="80"
        />
        <el-table-column
          label="证件号码"
          align="center"
          prop="idcardno"
          width="180"
        />
        <el-table-column
          label="疾病诊断"
          align="center"
          prop="diagnosisname"
          min-width="180"
          show-overflow-tooltip
        />
        <el-table-column
          label="医疗机构"
          align="center"
          prop="treatmenthospitalname"
          min-width="150"
          show-overflow-tooltip
        />
        <el-table-column

 src/views/business/appear/index.vue

@@ -8,15 +8,7 @@
        :inline="true"
        class="demo-form-inline"
      >
        <el-form-item label="案例编号" prop="caseNo">
          <el-input
            v-model="queryParams.caseNo"
            placeholder="请输入案例编号"
            clearable
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item label="患者姓名" prop="name">
        <el-form-item label="姓名" prop="name">
          <el-input
            v-model="queryParams.name"
            placeholder="请输入患者姓名"
@@ -24,7 +16,15 @@
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item label="案例状态" prop="reportStatus">
        <el-form-item label="上报医院" prop="caseNo">
          <el-input
            v-model="queryParams.caseNo"
            placeholder="请输入上报案例编号"
            clearable
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item label="上报状态" prop="reportStatus">
          <el-select
            v-model="queryParams.reportStatus"
            placeholder="请选择状态"
@@ -74,21 +74,23 @@
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="55" align="center" />
      
      <el-table-column
        label="案例编号"
        label="编号"
        align="center"
        prop="caseNo"
        width="150"
        fixed
      />
      <el-table-column
        label="上报时间"
        label="姓名"
        align="center"
        prop="reporttime"
        width="160"
        prop="name"
        width="100"
        fixed
      />
      <el-table-column
        label="状态"
        label="上报状态"
        align="center"
        prop="reportStatus"
        width="100"
@@ -99,19 +101,13 @@
          </el-tag>
        </template>
      </el-table-column>
      <el-table-column label="转运状态" align="center" width="100">
      <el-table-column label="转运" align="center" width="100">
        <template #default="scope">
          <el-tag :type="getTransportStatusTag(scope.row)">
            {{ getTransportStatusText(scope.row) }}
          </el-tag>
        </template>
      </el-table-column>
      <el-table-column
        label="患者姓名"
        align="center"
        prop="name"
        width="100"
      />
      <el-table-column label="性别" align="center" prop="sex" width="80">
        <template #default="scope">
          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
@@ -127,13 +123,6 @@
        </template>
      </el-table-column>
      <el-table-column
        label="GCS评分"
        align="center"
        prop="gcsScore"
        width="80"
        show-overflow-tooltip
      />
      <el-table-column
        label="疾病诊断"
        align="center"
        prop="diagnosisname"
@@ -141,13 +130,25 @@
        show-overflow-tooltip
      />
      <el-table-column
        label="治疗医院"
        label="GCS评分"
        align="center"
        prop="gcsScore"
        width="80"
        show-overflow-tooltip
      />
      <el-table-column
        label="上报医院"
        align="center"
        prop="treatmenthospitalname"
        width="150"
      />

      <el-table-column label="操作" align="center" fixed="right" width="350">
      <el-table-column
        label="上报时间"
        align="center"
        prop="reporttime"
        width="160"
      />
      <el-table-column label="操作" align="center" fixed="right" width="300">
        <template #default="scope">
          <el-button
            size="mini"

 src/views/business/assess/index.vue

@@ -8,7 +8,7 @@
        :inline="true"
        label-width="100px"
      >
        <el-form-item label="捐献者姓名" prop="name">
        <el-form-item label="姓名" prop="name">
          <el-input
            v-model="queryParams.name"
            placeholder="请输入捐献者姓名"
@@ -26,7 +26,7 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="业务人员" prop="coordinatorName">
        <el-form-item label="协调员" prop="coordinatorName">
          <el-input
            v-model="queryParams.coordinatorName"
            placeholder="请输入业务人员"
@@ -35,10 +35,10 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="评估状态" prop="assessState">
        <el-form-item label="评估结果" prop="assessState">
          <el-select
            v-model="queryParams.assessState"
            placeholder="请选择评估状态"
            placeholder="请选择评估结果"
            clearable
            style="width: 200px"
          >
@@ -48,7 +48,7 @@
            <el-option label="已关闭" value="4" />
          </el-select>
        </el-form-item>
        <el-form-item label="申请时间" prop="applyTimeRange">
        <el-form-item label="首次评估时间" prop="applyTimeRange">
          <el-date-picker
            v-model="queryParams.applyTimeRange"
            type="daterange"
@@ -59,7 +59,7 @@
            style="width: 240px"
          />
        </el-form-item>
        <el-form-item label="评估时间" prop="assessTimeRange">
        <el-form-item label="最新评估时间" prop="assessTimeRange">
          <el-date-picker
            v-model="queryParams.assessTimeRange"
            type="daterange"
@@ -130,7 +130,7 @@
          width="120"
        />
        <el-table-column
          label="捐献者姓名"
          label="姓名"
          align="center"
          prop="name"
          width="120"
@@ -151,6 +151,7 @@
          min-width="180"
          show-overflow-tooltip
        />
        <!--
        <el-table-column
          label="所在医疗机构"
          align="center"
@@ -168,6 +169,20 @@
            <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
          </template>
        </el-table-column>
        -->
        
        <el-table-column
          label="评估状态"
          align="center"
          prop="assessState"
          width="100"
        >
          <template slot-scope="scope">
            <el-tag :type="statusFilter(scope.row.assessState)">
              {{ statusTextFilter(scope.row.assessState) }}
            </el-tag>
          </template>
        </el-table-column>
        <el-table-column
          label="评估时间"
          align="center"
@@ -183,19 +198,7 @@
          </template>
        </el-table-column>
        <el-table-column
          label="评估状态"
          align="center"
          prop="assessState"
          width="100"
        >
          <template slot-scope="scope">
            <el-tag :type="statusFilter(scope.row.assessState)">
              {{ statusTextFilter(scope.row.assessState) }}
            </el-tag>
          </template>
        </el-table-column>
        <el-table-column
          label="业务人员"
          label="协调员"
          align="center"
          prop="coordinatorName"
          width="100"

 src/views/business/decide/index.vue

@@ -95,6 +95,7 @@
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55" align="center" />
        <!--
        <el-table-column
          label="案例编号"
          align="center"
@@ -102,13 +103,22 @@
          width="120"
        />
        <el-table-column
          label="治疗医院"
          align="center"
          prop="treatmenthospitalname"
          width="180"
          show-overflow-tooltip
        />
        -->
       
        <el-table-column
          label="住院号"
          align="center"
          prop="inpatientno"
          width="120"
        />
        <el-table-column
          label="捐献者姓名"
          label="姓名"
          align="center"
          prop="name"
          width="120"
@@ -122,13 +132,7 @@
          </template>
        </el-table-column>
        <el-table-column label="年龄" align="center" prop="age" width="80" />
        <el-table-column
          label="治疗医院"
          align="center"
          prop="treatmenthospitalname"
          width="180"
          show-overflow-tooltip
        />
       
        <el-table-column
          label="疾病诊断"
          align="center"
@@ -175,7 +179,7 @@
          width="120"
        />
        <el-table-column
          label="记录状态"
          label="判定状态"
          align="center"
          prop="recordstate"
          width="100"
@@ -187,7 +191,7 @@
          </template>
        </el-table-column>
        <el-table-column
          label="创建时间"
          label="判定时间"
          align="center"
          prop="createTime"
          width="160"

 src/views/business/ethicalReview/index.vue

@@ -116,6 +116,30 @@
      >
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column
          label="住院号"
          align="center"
          prop="inpatientno"
          width="120"
        />
        <el-table-column
          label="姓名"
          align="center"
          prop="name"
          width="100"
        />
        
        <el-table-column label="性别" align="center" prop="sex" width="80">
          <template slot-scope="scope">
            <dict-tag
              :options="dict.type.sys_user_sex"
              :value="scope.row.sex"
            />
          </template>
        </el-table-column>
        <el-table-column label="年龄" align="center" prop="age" width="80" />
        <!--
        
        <el-table-column
          label="案例编号"
          align="center"
          prop="caseNo"
@@ -128,27 +152,6 @@
          width="120"
        />
        <el-table-column
          label="姓名"
          align="center"
          prop="name"
          width="100"
        />
        <el-table-column
          label="住院号"
          align="center"
          prop="inpatientno"
          width="120"
        />
        <el-table-column label="性别" align="center" prop="sex" width="80">
          <template slot-scope="scope">
            <dict-tag
              :options="dict.type.sys_user_sex"
              :value="scope.row.sex"
            />
          </template>
        </el-table-column>
        <el-table-column label="年龄" align="center" prop="age" width="80" />
        <el-table-column
          label="血型"
          align="center"
          prop="bloodtype"
@@ -160,6 +163,22 @@
          prop="idcardno"
          width="180"
        />
        
        <el-table-column
          label="医疗机构"
          align="center"
          prop="treatmenthospitalname"
          min-width="150"
          show-overflow-tooltip
        />
        
        <el-table-column
          label="专家姓名"
          align="center"
          prop="expertName"
          width="100"
        />
        -->
        <el-table-column
          label="疾病诊断"
          align="center"
@@ -168,14 +187,7 @@
          show-overflow-tooltip
        />
        <el-table-column
          label="医疗机构"
          align="center"
          prop="treatmenthospitalname"
          min-width="150"
          show-overflow-tooltip
        />
        <el-table-column
          label="伦理状态"
          label="审查状态"
          align="center"
          prop="status"
          width="100"
@@ -188,7 +200,7 @@
          </template>
        </el-table-column>
        <el-table-column
          label="专家结论"
          label="审查结论"
          align="center"
          prop="expertConclusion"
          width="120"
@@ -201,20 +213,14 @@
          </template>
        </el-table-column>
        <el-table-column
          label="专家意见"
          label="审查意见"
          align="center"
          prop="expertOpinion"
          min-width="150"
          show-overflow-tooltip
        />
        <el-table-column
          label="专家姓名"
          align="center"
          prop="expertName"
          width="100"
        />
        <el-table-column
          label="结论时间"
          label="审查时间"
          align="center"
          prop="expertTime"
          width="160"

 src/views/business/maintain/index.vue

@@ -8,7 +8,7 @@
        :inline="true"
        label-width="100px"
      >
        <el-form-item label="捐献者姓名" prop="name">
        <el-form-item label="姓名" prop="name">
          <el-input
            v-model="queryParams.name"
            placeholder="请输入捐献者姓名"
@@ -17,25 +17,7 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="所在医疗机构" prop="treatmenthospitalname">
          <el-input
            v-model="queryParams.treatmenthospitalname"
            placeholder="请输入医疗机构"
            clearable
            style="width: 200px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="协调员" prop="coordinatorName">
          <el-input
            v-model="queryParams.coordinatorName"
            placeholder="请输入协调员姓名"
            clearable
            style="width: 200px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="患者状态" prop="recordstate">
        <el-form-item label="案例进度" prop="recordstate">
          <el-select
            v-model="queryParams.recordstate"
            placeholder="请选择记录状态"
@@ -49,10 +31,10 @@
            <el-option label="未完成捐献" value="5" />
          </el-select>
        </el-form-item>
        <el-form-item label="年龄范围" prop="ageRange">
        <el-form-item label="年龄" prop="ageRange">
          <el-input
            v-model="queryParams.startAge"
            placeholder="最小年龄"
            placeholder="0"
            clearable
            style="width: 95px"
            @keyup.enter.native="handleQuery"
@@ -60,13 +42,13 @@
          <span style="margin: 0 5px">-</span>
          <el-input
            v-model="queryParams.endAge"
            placeholder="最大年龄"
            placeholder="70"
            clearable
            style="width: 95px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="档案录入时间" prop="recordTimeRange">
        <el-form-item label="入院时间" prop="recordTimeRange">
          <el-date-picker
            v-model="queryParams.recordTimeRange"
            type="daterange"
@@ -75,6 +57,16 @@
            end-placeholder="结束日期"
            value-format="yyyy-MM-dd"
            style="width: 240px"
          />
        </el-form-item>

        <el-form-item label="协调员" prop="coordinatorName">
          <el-input
            v-model="queryParams.coordinatorName"
            placeholder="请输入协调员姓名"
            clearable
            style="width: 200px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item>
@@ -113,12 +105,30 @@
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55" align="center" />
<<<<<<< HEAD
        <!--
        <el-table-column
=======
        <!-- <el-table-column
>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
          label="案例编号"
          align="center"
          prop="caseNo"
          width="120"
<<<<<<< HEAD
        />
        -->
        <el-table-column
          label="捐献编号"
=======
        /> -->
         <el-table-column
          label="住院号"
>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
          align="center"
          prop="inpatientno"
          width="120"
        />        
         <el-table-column
          label="住院号"
          align="center"
@@ -126,7 +136,7 @@
          width="120"
        />
        <el-table-column
          label="潜在捐献者姓名"
          label="姓名"
          align="center"
          prop="name"
          width="120"
@@ -159,6 +169,9 @@
          min-width="180"
          show-overflow-tooltip
        />
<<<<<<< HEAD
        
=======
        <el-table-column
          label="首诊医疗机构"
          align="center"
@@ -185,6 +198,7 @@
          prop="coordinatorName"
          width="100"
        />
>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
        <!-- <el-table-column
          label="维护项目"
          align="center"
@@ -192,6 +206,20 @@
          width="120"
          show-overflow-tooltip
        /> -->
        <el-table-column
          label="首次维护时间"
          align="center"
          prop="updateTime"
          width="140"
        >
          <template slot-scope="scope">
            <span>{{
              scope.row.updateTime
                ? parseTime(scope.row.updateTime)
                : "-"
            }}</span>
          </template>
        </el-table-column>
        <el-table-column
          label="最新维护时间"
          align="center"
@@ -211,6 +239,36 @@
          align="center"
          prop="updateBy"
          width="120"
        /><el-table-column
          label="入院时间"
          align="center"
          prop="treatmenthospitalname"
          width="150"
          show-overflow-tooltip
        /><el-table-column
          label="上报医院"
          align="center"
          prop="treatmenthospitalname"
          width="150"
          show-overflow-tooltip
        />
        <!-- <el-table-column
          label="状态"
          align="center"
          prop="recordstate"
          width="120"
        >
          <template slot-scope="scope">
            <el-tag :type="statusFilter(scope.row.recordstate)">
              {{ statusTextFilter(scope.row.recordstate) }}
            </el-tag>
          </template>
        </el-table-column> -->
        <el-table-column
          label="协调员"
          align="center"
          prop="coordinatorName"
          width="100"
        />
        <el-table-column
          label="操作"

 src/views/business/transfer/index.vue

@@ -8,7 +8,7 @@
        :inline="true"
        label-width="80px"
      >
        <el-form-item label="案例编号" prop="caseNo">
        <el-form-item label="上报医院" prop="caseNo">
          <el-input
            v-model="queryParams.caseNo"
            placeholder="请输入案例编号"
@@ -17,7 +17,7 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="患者姓名" prop="patName">
        <el-form-item label="姓名" prop="patName">
          <el-input
            v-model="queryParams.patName"
            placeholder="请输入患者姓名"
@@ -41,7 +41,7 @@
            <el-option label="暂存" :value="5" />
          </el-select>
        </el-form-item>
        <el-form-item label="创建时间">
        <el-form-item label="转运时间">
          <el-date-picker
            v-model="dateRange"
            style="width: 240px"
@@ -150,23 +150,11 @@
      <el-table-column label="序号" type="index" width="60" align="center" />

      <el-table-column
        label="案例编号"
        label="编号"
        align="center"
        prop="caseNo"
        width="140"
      />
      <el-table-column
        label="转运状态"
        align="center"
        prop="transitStatus"
        width="100"
      >
        <template slot-scope="scope">
          <el-tag :type="getStatusTagType(scope.row.transitStatus)">
            {{ getStatusText(scope.row.transitStatus) }}
          </el-tag>
        </template>
      </el-table-column>
      <el-table-column label="患者信息" align="center" width="260">
        <template slot-scope="scope">
          <div class="donor-info">
@@ -189,11 +177,17 @@
        show-overflow-tooltip
      />
      <el-table-column
        label="治疗医院"
        label="转运状态"
        align="center"
        prop="treatmentHospitalName"
        width="150"
      />
        prop="transitStatus"
        width="100"
      >
        <template slot-scope="scope">
          <el-tag :type="getStatusTagType(scope.row.transitStatus)">
            {{ getStatusText(scope.row.transitStatus) }}
          </el-tag>
        </template>
      </el-table-column>
      <el-table-column
        label="计划转运时间"
        align="center"
@@ -201,13 +195,19 @@
        width="160"
      />
      <el-table-column
        label="负责协调员"
        label="协调员"
        align="center"
        prop="contactPerson"
        width="100"
      />

      <el-table-column
        label="上报医院"
        align="center"
        prop="treatmentHospitalName"
        width="150"
      />
      <el-table-column
        label="创建时间"
        align="center"
        prop="createTime"

 src/views/project/donatebaseinfo/index.vue

@@ -10,7 +10,7 @@
    >
      <el-row :gutter="8">
        <el-col :span="5">
          <el-form-item label="捐献者姓名" prop="name">
          <el-form-item label="姓名" prop="name">
            <el-input
              v-model="queryParams.name"
              placeholder="请输入姓名"
@@ -21,7 +21,11 @@
          </el-form-item>
        </el-col>
        <el-col :span="5">
<<<<<<< HEAD
          <el-form-item label="报告医院" prop="treatmenthospitalname">
=======
          <el-form-item label="上报医院" prop="treatmenthospitalname">
>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
            <org-selecter
              ref="orgSelecter"
              :org-type="'3'"
@@ -30,7 +34,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="9">
          <el-form-item label="上报时间">
          <el-form-item label="报告时间">
            <el-date-picker
              style="width: 100%"
              v-model="selecttime"
@@ -89,6 +93,7 @@
      border
      :default-sort="{ prop: 'donatetime', order: 'descending' }"
    >
      <el-table-column label="姓名" align="center" prop="name" width="100" />
      <el-table-column
        label="案例时间"
        align="center"
@@ -100,12 +105,40 @@
        </template>
      </el-table-column>
      <el-table-column
        label="捐献进度"
        align="center"
        prop="workflow"
        width="120"
      >
        <template slot-scope="scope">
          <div v-if="!scope.row.terminationCase">
            <dict-tag
              :options="dict.type.sys_donornode"
              :value="scope.row.workflow"
            />
          </div>
          <div v-else><el-button type="danger" plain>任务终止</el-button></div>
        </template>
      </el-table-column>
      <el-table-column
        label="捐献类别"
        align="center"
        prop="donationcategory"
        width="150"
      >
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_DonationCategory"
            :value="scope.row.donationcategory"
          />
        </template>
      </el-table-column>
      <el-table-column
        label="案例编号"
        align="center"
        prop="caseNo"
        width="200"
      />
      <el-table-column label="捐献者姓名" align="center" prop="name" width="100" />
      <el-table-column label="性别" align="center" prop="sex" width="100">
        <template slot-scope="scope">
          <dict-tag
@@ -129,12 +162,16 @@
          }}
        </template>
      </el-table-column>
<<<<<<< HEAD
      <el-table-column label="GCS评分" align="center" prop="gcsScore" width="100"/>
=======
      <el-table-column
        label="上报医院"
        align="center"
        prop="treatmenthospitalname"
      />
      <el-table-column label="GCS评分" align="center" prop="gcsScore" />
>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
      <el-table-column label="血型" align="center" prop="bloodtype" width="100">
        <template slot-scope="scope">
          <dict-tag
@@ -144,40 +181,16 @@
        </template>
      </el-table-column>
      <el-table-column
        label="捐献类别"
        label="报告医院"
        align="center"
        prop="donationcategory"
        width="150"
      >
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_DonationCategory"
            :value="scope.row.donationcategory"
        prop="treatmenthospitalname"
          />
        </template>
      </el-table-column>
      <el-table-column
        label="报告人"
        align="center"
        prop="reportername"
        width="100"
      />
      <el-table-column
        label="捐献进度"
        align="center"
        prop="workflow"
        width="120"
      >
        <template slot-scope="scope">
          <div v-if="!scope.row.terminationCase">
            <dict-tag
              :options="dict.type.sys_donornode"
              :value="scope.row.workflow"
            />
          </div>
          <div v-else><el-button type="danger" plain>任务终止</el-button></div>
        </template>
      </el-table-column>
      <el-table-column
        label="操作"
        width="190"