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

WXL

2026-05-13 e5af0daca71f21317b061f174869e6ded2829071

 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">
          <el-form-item label="首诊医院" prop="treatmenthospitalname">
<<<<<<< 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="首诊医院"
        label="上报医院"
        align="center"
        prop="treatmenthospitalname"
      />
      <el-table-column label="GSC评分" align="center" prop="gcsScore" />
      <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"
          />
        </template>
      </el-table-column>
        prop="treatmenthospitalname"
      />
      <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"
@@ -209,7 +222,7 @@
            style="color: #f56c6c;"
            @click="handleTerminate(scope.row)"
            v-if="
              scope.row.terminationCase === 0 && scope.row.recordstate !== '99'
              scope.row.terminationCase == 0 && scope.row.recordstate !== '99'
            "
          >
            终止
@@ -219,7 +232,7 @@
            type="text"
            style="color: #67c23a;"
            @click="handleRestore(scope.row)"
            v-if="scope.row.terminationCase === 1"
            v-if="scope.row.terminationCase == 1"
          >
            恢复
          </el-button>
@@ -345,7 +358,7 @@
          { required: true, message: "请选择出生日期", trigger: "blur" }
        ],
        treatmenthospitalno: [
          { required: true, message: "请选择首诊医院", trigger: "blur" }
          { required: true, message: "请选择上报医院", trigger: "blur" }
        ],
        bloodtype: [
          { required: true, message: "请选择ABO血型", trigger: "blur" }
@@ -553,6 +566,7 @@
    /** 处理编辑弹窗关闭 */
    handleEditClosed() {
      this.currentEditData = {};
      this.editModalVisible = false;
    },

    handleModalVisibleChange(newVisible) {