yxh
2026-05-09 b745457acd3bb8f40c145df34dce5729463377ab
Merge branch 'QD-opo' of http://116.62.18.175:6699/r/~yxh/opo-web into QD-opo
已修改6个文件
100 ■■■■ 文件已修改
src/views/business/affirm/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/allocation/index.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/assess/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/maintain/index.vue 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donatebaseinfo/EditCaseModal.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donatebaseinfo/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/affirm/index.vue
@@ -114,7 +114,7 @@
        <el-table-column
          label="案例编号"
          align="center"
          prop="caseNo"
          prop="inpatientno"
          width="120"
        />
        <el-table-column
src/views/business/allocation/index.vue
@@ -111,12 +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="捐献者编号"
@@ -145,6 +150,11 @@
          show-overflow-tooltip
        />
        -->
=======
        /> -->
        <el-table-column label="姓名" align="center" prop="name" width="100" />
>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
        <el-table-column
          label="住院号"
          align="center"
src/views/business/assess/index.vue
@@ -126,7 +126,7 @@
        <el-table-column
          label="住院号"
          align="center"
          prop="caseNo"
          prop="inpatientno"
          width="120"
        />
        <el-table-column
@@ -378,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
src/views/business/maintain/index.vue
@@ -105,18 +105,28 @@
        @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="donorno"
          prop="inpatientno"
          width="120"
        />        
        <el-table-column
@@ -159,7 +169,36 @@
          min-width="180"
          show-overflow-tooltip
        />
<<<<<<< HEAD
        
=======
        <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"
        />
>>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
        <!-- <el-table-column
          label="维护项目"
          align="center"
src/views/project/donatebaseinfo/EditCaseModal.vue
@@ -164,22 +164,32 @@
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="20">
            <el-col :span="8">
              <el-form-item label="上报医院" prop="treatmenthospitalname">
                <el-input
                  v-model="formData.treatmenthospitalname"
                  placeholder="请输入上报医院"
                />
              </el-form-item>
            </el-col>
          </el-row>
        </el-card>
        <!-- 医疗信息部分 -->
        <el-card header="医疗信息" class="form-section">
          <el-row :gutter="20">
            <el-col :span="8">
              <el-form-item label="首诊医院" prop="treatmenthospitalno">
                <org-selecter
                  :org-type="'3'"
                  v-model="formData.treatmenthospitalno"
                  @change="handleHospitalChange"
              <el-form-item label="当前医院" prop="Reporttothehospital">
                <el-input
                  v-model="formData.Reporttothehospital"
                  placeholder="请输入上报医院"
                />
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="科室" prop="treatmentdeptname">
              <el-form-item label="入院科室" prop="treatmentdeptname">
                <el-input
                  v-model="formData.treatmentdeptname"
                  placeholder="请输入科室"
src/views/project/donatebaseinfo/index.vue
@@ -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'"
@@ -158,7 +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
@@ -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" }