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

yxh

2026-05-09 b745457acd3bb8f40c145df34dce5729463377ab

 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"
@@ -44,7 +46,7 @@
          >
            <el-option label="全部" value="" />
            <el-option
              v-for="dict in dict.type.allocation_Status"
              v-for="dict in dict.type.organ_allocation_status"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
@@ -109,11 +111,17 @@
        @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="捐献者编号"
@@ -122,17 +130,38 @@
          width="120"
        />
        <el-table-column
          label="姓名"
          label="证件号码"
          align="center"
          prop="name"
          width="100"
          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
@@ -141,31 +170,12 @@
            />
          </template>
        </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="age" width="80" />        
        <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
@@ -176,7 +186,7 @@
        >
          <template slot-scope="scope">
            <dict-tag
              :options="dict.type.allocation_Status"
              :options="dict.type.organ_allocation_status"
              :value="scope.row.allocationStatus"
            />
          </template>
@@ -187,13 +197,6 @@
          prop="allocationTime"
          width="160"
        >
          <template slot-scope="scope">
            <span>{{
              scope.row.allocationTime
                ? parseTime(scope.row.allocationTime, "{y}-{m}-{d} {h}:{i}")
                : "-"
            }}</span>
          </template>
        </el-table-column>
        <el-table-column
          label="登记人"
@@ -263,7 +266,7 @@
</template>

<script>
import { allocationList,  } from "@/api/businessApi";
import { allocationList } from "@/api/businessApi";
import Pagination from "@/components/Pagination";

export default {
@@ -315,9 +318,14 @@
      delete params.allocationTimeRange;

      // 如果有时间范围参数
      if (this.queryParams.allocationTimeRange && this.queryParams.allocationTimeRange.length === 2) {
        params.allocationTimeStart = this.queryParams.allocationTimeRange[0] + ' 00:00:00';
        params.allocationTimeEnd = this.queryParams.allocationTimeRange[1] + ' 23:59:59';
      if (
        this.queryParams.allocationTimeRange &&
        this.queryParams.allocationTimeRange.length === 2
      ) {
        params.allocationTimeStart =
          this.queryParams.allocationTimeRange[0] + " 00:00:00";
        params.allocationTimeEnd =
          this.queryParams.allocationTimeRange[1] + " 23:59:59";
      }

      allocationList(params)
@@ -357,7 +365,7 @@
    handleView(row) {
      this.$router.push({
        path: "/case/allocationInfo",
        query: { id: row.infoid }
        query: { id: row.id, infoid: row.infoid }
      });
    },
    // 新增按钮操作
@@ -366,15 +374,15 @@
    },
    // 修改按钮操作
    handleUpdate(row) {
      const id = row.infoid || this.ids[0];
      this.$router.push({
        path: "/case/allocationInfo",
        query: { id: id }
        query: { id: row.id, infoid: row.infoid }
      });
    },
    // 删除按钮操作
    handleDelete(row) {
      const selectedRow = row || (this.selectedRows.length === 1 ? this.selectedRows[0] : null);
      const selectedRow =
        row || (this.selectedRows.length === 1 ? this.selectedRows[0] : null);
      if (!selectedRow) {
        this.$message.warning("请选择一条记录");
        return;