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/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"
@@ -83,10 +83,10 @@
    <el-card class="tool-card">
      <el-row :gutter="10">
        <el-col :span="16">
          <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
          <!-- <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
            >新增评估</el-button
          >
          <el-button
          > -->
          <!-- <el-button
            type="success"
            icon="el-icon-edit"
            :disabled="single"
@@ -99,7 +99,7 @@
            :disabled="multiple"
            @click="handleDelete"
            >删除</el-button
          >
          > -->
          <el-button
            type="warning"
            icon="el-icon-download"
@@ -121,17 +121,16 @@
        v-loading="loading"
        :data="assessmentList"
        @selection-change="handleSelectionChange"
        @row-click="handleRowClick"
      >
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column
         <el-table-column
          label="住院号"
          align="center"
          prop="caseNo"
          prop="inpatientno"
          width="120"
        />
        <el-table-column
          label="潜在捐献者姓名"
          label="姓名"
          align="center"
          prop="name"
          width="120"
@@ -152,6 +151,7 @@
          min-width="180"
          show-overflow-tooltip
        />
        <!--
        <el-table-column
          label="所在医疗机构"
          align="center"
@@ -169,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"
@@ -184,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"
@@ -205,6 +207,7 @@
          label="操作"
          align="center"
          width="200"
          fixed="right"
          class-name="small-padding fixed-width"
        >
          <template slot-scope="scope">
@@ -217,8 +220,8 @@
            >
            <el-button
              v-if="
                scope.row.assessState === '1' ||
                  scope.row.assessState === '2'
                scope.row.assessState != '3' ||
                  scope.row.assessState != '4'
              "
              size="mini"
              type="text"
@@ -226,14 +229,14 @@
              @click.stop="handleAssess(scope.row)"
              >评估</el-button
            >
            <el-button
            <!-- <el-button
              v-if="scope.row.assessState === '3'"
              size="mini"
              type="text"
              icon="el-icon-check"
              @click.stop="handleConfirm(scope.row)"
              >确认</el-button
            >
            > -->
          </template>
        </el-table-column>
      </el-table>
@@ -375,19 +378,19 @@
        if (Array.isArray(response.data)) {
          // 如果返回的是数组
          this.assessmentList = response.data;
          this.total = response.data.length;
          this.total = response.total;
        } else if (response.data.rows) {
          // 如果返回的是分页数据结构
          this.assessmentList = response.data.rows;
          this.total = response.data.total;
          this.total = response.total;
        } else if (Array.isArray(response.data.list)) {
          // 如果返回的是list字段
          this.assessmentList = response.data.list;
          this.total = response.data.total || response.data.list.length;
          this.total = response.total || response.data.list.length;
        } else {
          // 其他数据结构，尝试直接使用data
          this.assessmentList = response.data;
          this.total = response.total || response.data.length;
          this.total = response.total || response.total;
        }
      } else {
        // 如果data为空，使用根级别的rows或list