11
WXL
2023-11-10 408360a5156afcd3724aa4d88fff38ba82e20d81
11
已修改7个文件
1341 ■■■■ 文件已修改
src/views/project/donatebaseinfo/index.vue 737 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donatefinish/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donationdetails/index.vue 557 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/ethicalReview/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/performancedetails/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/expertFeeCheck/index.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donatebaseinfo/index.vue
@@ -1,32 +1,65 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
    <el-form
      :model="queryParams"
      ref="queryForm"
      :inline="true"
      v-show="showSearch"
      label-width="70px"
    >
      <el-row :gutter="8">
        <el-col :span="6">
          <el-form-item label="姓名" prop="name">
            <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable size="small"
              @keyup.enter.native="handleQuery" />
            <el-input
              v-model="queryParams.name"
              placeholder="请输入姓名"
              clearable
              size="small"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item align="left" label="医疗机构" prop="treatmenthospitalname">
            <org-selecter ref="orgSelecter" :org-type="'3'" v-model="queryParams.treatmenthospitalno"
              @keyup.enter.native="handleQuery" />
          <el-form-item
            align="left"
            label="医疗机构"
            prop="treatmenthospitalname"
          >
            <org-selecter
              ref="orgSelecter"
              :org-type="'3'"
              v-model="queryParams.treatmenthospitalno"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item label="捐献地市">
            <el-select v-model="queryParams.city" placeholder="请选择地市">
              <el-option v-for="item in provinceData" :key="item.value" :label="item.label" :value="item.value">
              <el-option
                v-for="item in provinceData"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item label="捐献进度" prop="recordstate">
            <el-select v-model="queryParams.recordstate" placeholder="请选择当前进度" clearable size="small">
              <el-option v-for="dict in dict.type.sys_DonationStatus" :key="dict.value" :label="dict.label"
                :value="dict.value" />
            <el-select
              v-model="queryParams.recordstate"
              placeholder="请选择当前进度"
              clearable
              size="small"
            >
              <el-option
                v-for="dict in dict.type.sys_DonationStatus"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
        </el-col>
@@ -34,8 +67,16 @@
      <el-row :gutter="8">
        <el-col :span="6">
          <el-form-item label="报告人">
            <el-select v-model="queryParams.reporterno" placeholder="请选择报告人">
              <el-option v-for="item in reportlist" :key="item.index" :label="item.reportername" :value="item.reporterno">
            <el-select
              v-model="queryParams.reporterno"
              placeholder="请选择报告人"
            >
              <el-option
                v-for="item in reportlist"
                :key="item.index"
                :label="item.reportername"
                :value="item.reporterno"
              >
              </el-option>
            </el-select>
          </el-form-item>
@@ -43,8 +84,16 @@
        <el-col :span="12">
          <el-form-item label="报告日期">
            <el-date-picker style="width: 100%" v-model="selecttime" type="monthrange" range-separator="至"
              start-placeholder="开始月份" end-placeholder="结束月份" value-format="yyyy-MM-dd" @change="getTimeList">
            <el-date-picker
              style="width: 100%"
              v-model="selecttime"
              type="monthrange"
              range-separator="至"
              start-placeholder="开始月份"
              end-placeholder="结束月份"
              value-format="yyyy-MM-dd"
              @change="getTimeList"
            >
            </el-date-picker>
          </el-form-item>
        </el-col>
@@ -54,23 +103,41 @@
        <el-col :span="14">
          <el-form-item label="籍贯">
            <div>
              <li_area_select ref="areaSelect" v-model="searchAddress"></li_area_select>
              <li_area_select
                ref="areaSelect"
                v-model="searchAddress"
              ></li_area_select>
            </div>
          </el-form-item>
        </el-col>
        <el-col :span="4">
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
            <el-button
              type="primary"
              icon="el-icon-search"
              size="mini"
              @click="handleQuery"
              >搜索</el-button
            >
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
              >重置</el-button
            >
          </el-form-item>
        </el-col>
      </el-row>
    </el-form>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
          v-hasPermi="['project:donatebaseinfo:add']">新增</el-button>
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['project:donatebaseinfo:add']"
          >新增</el-button
        >
      </el-col>
      <!-- <el-col :span="1.5">
        <el-button
@@ -86,17 +153,38 @@
      </el-col> -->
      <el-col :span="1.5">
        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport"
          v-hasPermi="['project:donatebaseinfo:export']">导出</el-button>
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['project:donatebaseinfo:export']"
          >导出</el-button
        >
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
      ></right-toolbar>
    </el-row>
    <el-table v-loading="loading" :data="donatebaseinfoList" @selection-change="handleSelectionChange" border
      :default-sort="{ prop: 'reporttime', order: 'descending' }">
    <el-table
      v-loading="loading"
      :data="donatebaseinfoList"
      @selection-change="handleSelectionChange"
      border
      :default-sort="{ prop: 'reporttime', order: 'descending' }"
    >
      <!-- <el-table-column label="报告时间" align="center" prop="id" /> -->
      <!-- <el-table-column type="selection" width="55" align="center" /> -->
      <el-table-column label="报告时间" align="center" prop="reporttime" width="100">
      <el-table-column
        label="报告时间"
        align="center"
        prop="reporttime"
        width="100"
      >
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
        </template>
@@ -106,25 +194,62 @@
      <el-table-column label="性别" align="center" prop="sex" width="100">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_user_sex" :value="parseInt(scope.row.sex)" />
          <dict-tag
            :options="dict.type.sys_user_sex"
            :value="parseInt(scope.row.sex)"
          />
        </template>
      </el-table-column>
      <el-table-column label="年龄" align="center" prop="age" width="100" />
      <el-table-column label="现所在地市" align="center" prop="registercityname" width="150" />
      <el-table-column
        label="现所在地市"
        align="center"
        prop="registercityname"
        width="150"
      />
      <el-table-column label="医疗机构" align="center" prop="treatmenthospitalname" />
      <el-table-column label="报告人" align="center" prop="reportername" width="100" />
      <el-table-column
        label="医疗机构"
        align="center"
        prop="treatmenthospitalname"
      />
      <el-table-column
        label="报告人"
        align="center"
        prop="reportername"
        width="100"
      />
      <el-table-column label="捐献进度" align="center" prop="recordstate" width="120">
      <el-table-column
        label="捐献进度"
        align="center"
        prop="recordstate"
        width="120"
      >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" />
          <dict-tag
            :options="dict.type.sys_DonationStatus"
            :value="scope.row.recordstate"
          />
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
      <el-table-column
        label="操作"
        align="center"
        class-name="small-padding fixed-width"
        width="200"
        fixed="right"
      >
        <template slot-scope="scope">
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
            v-hasPermi="['project:donatebaseinfo:edit']">详情</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['project:donatebaseinfo:edit']"
            >详情</el-button
          >
          <!-- <el-button v-if="scope.row.recordstate == 0" size="mini" type="text" icon="el-icon-delete"
            @click="handleDelete(scope.row)" v-hasPermi="['project:donatebaseinfo:remove']">删除</el-button>
@@ -137,16 +262,35 @@
        </template>
      </el-table-column>
    </el-table>
    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
      @pagination="getList" />
    <pagination
      v-show="total > 0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <!-- 添加或修改捐献基础对话框 -->
    <el-dialog :title="title" align="center" :visible.sync="open" :close-on-click-modal="false" width="1100px">
      <el-form ref="form" :model="form" :rules="rules" label-width="130px" label-position="right">
        <div style="
    <el-dialog
      :title="title"
      align="center"
      :visible.sync="open"
      :close-on-click-modal="false"
      width="1100px"
    >
      <el-form
        ref="form"
        :model="form"
        :rules="rules"
        label-width="130px"
        label-position="right"
      >
        <div
          style="
                border-bottom: 1px solid #ddd;
                border-top: 1px solid #ddd;
                padding-right: 60px;
              ">
              "
        >
          <el-row style="margin-top: 40px">
            <el-col :span="8">
              <el-form-item label="捐献编号" prop="donorno">
@@ -154,13 +298,24 @@
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item align="left" label="医疗机构" prop="treatmenthospitalno">
                <org-selecter ref="addOrgSelect" :org-type="'3'" v-model="form.treatmenthospitalno" />
              <el-form-item
                align="left"
                label="医疗机构"
                prop="treatmenthospitalno"
              >
                <org-selecter
                  ref="addOrgSelect"
                  :org-type="'3'"
                  v-model="form.treatmenthospitalno"
                />
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="科室" prop="treatmentdeptno">
                <el-input v-model="form.treatmentdeptname" placeholder="请输入科室" />
                <el-input
                  v-model="form.treatmentdeptname"
                  placeholder="请输入科室"
                />
              </el-form-item>
            </el-col>
          </el-row>
@@ -173,8 +328,12 @@
            <el-col :span="6">
              <el-form-item label="民族" prop="nation">
                <el-select v-model="form.nation" placeholder="请选择民族">
                  <el-option v-for="dict in dict.type.sys_nation" :key="dict.value" :label="dict.label"
                    :value="dict.value"></el-option>
                  <el-option
                    v-for="dict in dict.type.sys_nation"
                    :key="dict.value"
                    :label="dict.label"
                    :value="dict.value"
                  ></el-option>
                </el-select>
              </el-form-item>
            </el-col>
@@ -192,22 +351,40 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="证件类型" prop="idcardtype">
                <el-select v-model="form.idcardtype" placeholder="请选择证件类型">
                  <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
                    :value="parseInt(dict.value)"></el-option>
                <el-select
                  v-model="form.idcardtype"
                  placeholder="请选择证件类型"
                >
                  <el-option
                    v-for="dict in dict.type.sys_IDType"
                    :key="dict.value"
                    :label="dict.label"
                    :value="parseInt(dict.value)"
                  ></el-option>
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="证件号码" prop="idcardno">
                <el-input style="width: 174px" ref="updateBSvalue" class="sfzcode" v-model="form.idcardno"
                  placeholder="请输入证件号码" @blur="updateMessage" />
              </el-form-item> </el-col>
                <el-input
                  style="width: 174px"
                  ref="updateBSvalue"
                  class="sfzcode"
                  v-model="form.idcardno"
                  placeholder="请输入证件号码"
                  @blur="updateMessage"
                />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="性别" prop="sex">
                <el-select v-model="form.sex" placeholder="请输入性别">
                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.label" :label="dict.label"
                    :value="parseInt(dict.value)"></el-option>
                  <el-option
                    v-for="dict in dict.type.sys_user_sex"
                    :key="dict.label"
                    :label="dict.label"
                    :value="parseInt(dict.value)"
                  ></el-option>
                </el-select>
              </el-form-item>
            </el-col>
@@ -217,27 +394,42 @@
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item label="出生日期" prop="birthday">
                <el-date-picker clearable size="small" v-model="form.birthday" type="date" style="width: 174px"
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择出生日期">
                <el-date-picker
                  clearable
                  size="small"
                  v-model="form.birthday"
                  type="date"
                  style="width: 174px"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  placeholder="选择出生日期"
                >
                </el-date-picker>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="职业" prop="occupation">
                <el-select v-model="form.occupation" placeholder="请选择职业">
                  <el-option v-for="dict in dict.type.sys_occupation" :key="dict.value" :label="dict.label"
                    :value="dict.value"></el-option>
                  <el-option
                    v-for="dict in dict.type.sys_occupation"
                    :key="dict.value"
                    :label="dict.label"
                    :value="dict.value"
                  ></el-option>
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="学历" prop="education">
                <el-select v-model="form.education" placeholder="请选择学历">
                  <el-option v-for="dict in dict.type.sys_education" :key="dict.value" :label="dict.label"
                    :value="dict.value"></el-option>
                  <el-option
                    v-for="dict in dict.type.sys_education"
                    :key="dict.value"
                    :label="dict.label"
                    :value="dict.value"
                  ></el-option>
                </el-select>
              </el-form-item>
            </el-col>
@@ -246,13 +438,19 @@
            <el-col :span="12">
              <el-form-item label="住址" prop="residenceaddress">
                <div>
                  <li_area_select ref="residenceSelect" v-model="residenceAddresss"></li_area_select>
                  <li_area_select
                    ref="residenceSelect"
                    v-model="residenceAddresss"
                  ></li_area_select>
                  <!-- <div>{{defultAddress}}</div> -->
                </div>
              </el-form-item>
            </el-col>
            <el-col :span="11" :push="1">
              <el-input v-model="form.residenceaddress" placeholder="请输入内容" />
              <el-input
                v-model="form.residenceaddress"
                placeholder="请输入内容"
              />
            </el-col>
          </el-row>
@@ -260,22 +458,30 @@
            <el-col :span="12">
              <el-form-item label="现所在地" prop="registeraddress">
                <div>
                  <li_area_select ref="registerSelect" v-model="registerAddresss"></li_area_select>
                  <li_area_select
                    ref="registerSelect"
                    v-model="registerAddresss"
                  ></li_area_select>
                  <!-- <div>{{defultAddress}}</div> -->
                </div>
              </el-form-item>
            </el-col>
            <el-col :span="11" :push="1">
              <el-input v-model="form.registeraddress" placeholder="请输入内容" />
              <el-input
                v-model="form.registeraddress"
                placeholder="请输入内容"
              />
            </el-col>
          </el-row>
        </div>
        <div style="
        <div
          style="
                border-bottom: 1px solid #ddd;
                margin-top: 20px;
                padding-right: 60px;
              ">
              "
        >
          <el-row>
            <el-col :span="8">
              <el-form-item label="住院号" prop="inpatientno">
@@ -284,7 +490,10 @@
            </el-col>
            <el-col :span="16">
              <el-form-item label="疾病诊断" prop="diagnosisname">
                <el-input v-model="form.diagnosisname" placeholder="请输入疾病诊断名称" />
                <el-input
                  v-model="form.diagnosisname"
                  placeholder="请输入疾病诊断名称"
                />
              </el-form-item>
            </el-col>
          </el-row>
@@ -292,16 +501,24 @@
            <el-col :span="12">
              <el-form-item align="left" label="血型" prop="bloodtype">
                <el-radio-group v-model="form.bloodtype">
                  <el-radio v-for="dict in dict.type.sys_BloodType" :key="dict.value" :label="dict.value">{{ dict.label
                  }}</el-radio>
                  <el-radio
                    v-for="dict in dict.type.sys_BloodType"
                    :key="dict.value"
                    :label="dict.value"
                    >{{ dict.label }}</el-radio
                  >
                </el-radio-group>
              </el-form-item>
            </el-col>
            <el-col :span="12" :pull="1">
              <el-form-item label="Rh(D)" align="left" prop="rhyin">
                <el-radio-group v-model="form.rhyin">
                  <el-radio v-for="dict in dict.type.sys_bloodtype_rhd" :key="dict.value" :label="dict.value">{{
                    dict.label }}</el-radio>
                  <el-radio
                    v-for="dict in dict.type.sys_bloodtype_rhd"
                    :key="dict.value"
                    :label="dict.value"
                    >{{ dict.label }}</el-radio
                  >
                </el-radio-group>
              </el-form-item>
            </el-col>
@@ -309,20 +526,31 @@
          <el-row>
            <el-form-item label="疾病类型" align="left">
              <el-checkbox-group v-model="form.diseasetype">
                <el-checkbox v-for="dict in dict.type.sys_DiseaseType" :key="dict.value" :label="dict.value">
                <el-checkbox
                  v-for="dict in dict.type.sys_DiseaseType"
                  :key="dict.value"
                  :label="dict.value"
                >
                  {{ dict.label }}
                </el-checkbox>
              </el-checkbox-group>
            </el-form-item>
            <el-form-item label="其他" prop="diseasetypeOther">
              <el-input v-model="form.diseasetypeOther" placeholder="请输入其他" />
              <el-input
                v-model="form.diseasetypeOther"
                placeholder="请输入其他"
              />
            </el-form-item>
          </el-row>
          <el-row>
            <el-col :span="12">
              <el-form-item align="left" label="传染病">
                <el-checkbox-group v-model="form.infectious">
                  <el-checkbox v-for="dict in dict.type.sys_Infectious" :key="dict.value" :label="dict.value">
                  <el-checkbox
                    v-for="dict in dict.type.sys_Infectious"
                    :key="dict.value"
                    :label="dict.value"
                  >
                    {{ dict.label }}
                  </el-checkbox>
                </el-checkbox-group>
@@ -330,7 +558,10 @@
            </el-col>
            <el-col :span="12">
              <el-form-item align="left" label="其他" prop="infectiousOther">
                <el-input v-model="form.infectiousOther" placeholder="请输入其他" />
                <el-input
                  v-model="form.infectiousOther"
                  placeholder="请输入其他"
                />
              </el-form-item>
            </el-col>
          </el-row>
@@ -338,7 +569,11 @@
            <el-col :span="9">
              <el-form-item align="left" label="病人状况">
                <el-checkbox-group v-model="form.patientstate">
                  <el-checkbox v-for="dict in dict.type.sys_patientstate" :key="dict.value" :label="dict.value">
                  <el-checkbox
                    v-for="dict in dict.type.sys_patientstate"
                    :key="dict.value"
                    :label="dict.value"
                  >
                    {{ dict.label }}
                  </el-checkbox>
                </el-checkbox-group>
@@ -347,7 +582,11 @@
            <el-col :span="15" align="left">
              <el-form-item label="其他情况">
                <el-checkbox-group v-model="form.othercases">
                  <el-checkbox v-for="dict in dict.type.sys_OtherCases" :key="dict.value" :label="dict.value">
                  <el-checkbox
                    v-for="dict in dict.type.sys_OtherCases"
                    :key="dict.value"
                    :label="dict.value"
                  >
                    {{ dict.label }}
                  </el-checkbox>
                </el-checkbox-group>
@@ -356,18 +595,29 @@
          </el-row>
        </div>
        <div style="
        <div
          style="
                border-bottom: 1px solid #ddd;
                padding-right: 60px;
                margin-top: 20px;
              ">
              "
        >
          <el-row>
            <div display="flex">
              <el-row>
                <el-col :span="12">
                  <el-form-item label="亲属状况" prop="kinship" class="relation" align="left">
                  <el-form-item
                    label="亲属状况"
                    prop="kinship"
                    class="relation"
                    align="left"
                  >
                    <el-checkbox-group v-model="form.kinship">
                      <el-checkbox v-for="dict in dict.type.sys_Kinship" :key="dict.value" :label="dict.value">
                      <el-checkbox
                        v-for="dict in dict.type.sys_Kinship"
                        :key="dict.value"
                        :label="dict.value"
                      >
                        {{ dict.label }}
                      </el-checkbox>
                    </el-checkbox-group>
@@ -375,7 +625,10 @@
                </el-col>
                <el-col :span="12">
                  <el-form-item label="其他" prop="kinshipOther">
                    <el-input v-model="form.kinshipOther" placeholder="请输入其他" />
                    <el-input
                      v-model="form.kinshipOther"
                      placeholder="请输入其他"
                    />
                  </el-form-item>
                </el-col>
              </el-row>
@@ -385,7 +638,11 @@
            <el-col :span="24">
              <el-form-item align="left" label="本人意愿 ">
                <el-checkbox-group v-model="form.selfwill">
                  <el-checkbox v-for="dict in dict.type.sys_SelfWill" :key="dict.value" :label="dict.value">
                  <el-checkbox
                    v-for="dict in dict.type.sys_SelfWill"
                    :key="dict.value"
                    :label="dict.value"
                  >
                    {{ dict.label }}
                  </el-checkbox>
                </el-checkbox-group>
@@ -395,14 +652,24 @@
          <el-row>
            <el-col :span="12">
              <el-form-item label="主要亲属" prop="majorrelatives">
                <el-input v-model="form.majorrelatives" placeholder="请输入主要亲属" />
                <el-input
                  v-model="form.majorrelatives"
                  placeholder="请输入主要亲属"
                />
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="与捐赠者关系" prop="familyrelations">
                <el-select v-model="form.familyrelations" placeholder="请选择与捐赠者关系">
                  <el-option v-for="dict in dict.type.sys_FamilyRelation" :key="dict.value" :label="dict.label"
                    :value="dict.value"></el-option>
                <el-select
                  v-model="form.familyrelations"
                  placeholder="请选择与捐赠者关系"
                >
                  <el-option
                    v-for="dict in dict.type.sys_FamilyRelation"
                    :key="dict.value"
                    :label="dict.label"
                    :value="dict.value"
                  ></el-option>
                </el-select>
              </el-form-item>
            </el-col>
@@ -411,7 +678,11 @@
            <el-col :span="12">
              <el-form-item align="left" label="信息来源">
                <el-checkbox-group v-model="form.infosources">
                  <el-checkbox v-for="dict in dict.type.sys_InfoSources" :key="dict.value" :label="dict.value">
                  <el-checkbox
                    v-for="dict in dict.type.sys_InfoSources"
                    :key="dict.value"
                    :label="dict.value"
                  >
                    {{ dict.label }}
                  </el-checkbox>
                </el-checkbox-group>
@@ -419,7 +690,10 @@
            </el-col>
            <el-col :span="8">
              <el-form-item label="其他" prop="infosourcesOther">
                <el-input v-model="form.infosourcesOther" placeholder="请输入信息来源其他" />
                <el-input
                  v-model="form.infosourcesOther"
                  placeholder="请输入信息来源其他"
                />
              </el-form-item>
            </el-col>
          </el-row>
@@ -431,72 +705,123 @@
            </el-col>
            <el-col :span="8">
              <el-form-item label="联系电话" prop="infophone">
                <el-input v-model="form.infophone" placeholder="请输入信息员联系电话" />
                <el-input
                  v-model="form.infophone"
                  placeholder="请输入信息员联系电话"
                />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="8">
              <el-form-item align="left" label="红十字会" prop="redorganno">
                <org-selecter ref="addCrossOrgSelect" :org-type="'2'" v-model="form.redorganno" />
                <org-selecter
                  ref="addCrossOrgSelect"
                  :org-type="'2'"
                  v-model="form.redorganno"
                />
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="联系人" prop="contactperson">
                <el-input v-model="form.contactperson" placeholder="请输入联系人" />
                <el-input
                  v-model="form.contactperson"
                  placeholder="请输入联系人"
                />
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="联系时间" prop="contacttime">
                <el-date-picker clearable size="small" style="width: 190px" v-model="form.contacttime" type="datetime"
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择报告时间">
                <el-date-picker
                  clearable
                  size="small"
                  style="width: 190px"
                  v-model="form.contacttime"
                  type="datetime"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  placeholder="选择报告时间"
                >
                </el-date-picker>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="24">
              <el-form-item align="left" label="获取组织" prop="acquisitiontissuename">
                <org-selecter style="width: 260px" ref="orgSelecter" :org-type="'1'" v-model="form.acquisitiontissueno" />
              <el-form-item
                align="left"
                label="获取组织"
                prop="acquisitiontissuename"
              >
                <org-selecter
                  style="width: 260px"
                  ref="orgSelecter"
                  :org-type="'1'"
                  v-model="form.acquisitiontissueno"
                />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="8">
              <el-form-item label="报告人" prop="reporterno">
                <el-select ref="getReportname" v-model="form.reporterno" placeholder="请选择">
                  <el-option v-for="item in reporters" :key="item.reportNo" :label="item.reportName"
                    :value="item.reportNo">
                <el-select
                  ref="getReportname"
                  v-model="form.reporterno"
                  placeholder="请选择"
                >
                  <el-option
                    v-for="item in reporters"
                    :key="item.reportNo"
                    :label="item.reportName"
                    :value="item.reportNo"
                  >
                  </el-option>
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="联系电话" prop="reporterphone">
                <el-input v-model="form.reporterphone" placeholder="请输入联系电话" />
                <el-input
                  v-model="form.reporterphone"
                  placeholder="请输入联系电话"
                />
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="报告时间" align="left" prop="reporttime">
                <el-date-picker clearable size="small" style="width: 190px" v-model="form.reporttime" type="datetime"
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择报告时间">
                <el-date-picker
                  clearable
                  size="small"
                  style="width: 190px"
                  v-model="form.reporttime"
                  type="datetime"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  placeholder="选择报告时间"
                >
                </el-date-picker>
              </el-form-item>
            </el-col>
          </el-row>
        </div>
        <div style="padding-right: 60px; margin-top: 20px">
        <!-- <div style="padding-right: 60px; margin-top: 20px">
          <el-row>
            <el-form-item label="附件" align="left" prop="annexfile">
              <annex-upload ref="annex" :infoid="form.id" :donorno="form.donorno" :flowname="flowname"
                :annexno="annexno" />
            </el-form-item>
          </el-row>
        </div>
        </div> -->
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button v-show="showSaveBtn" type="primary" @click="submitForm">保 存</el-button>
        <el-button v-show="showTerminationBtn" type="primary" @click="submitForm">终止案例</el-button>
        <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
          >保存并前往案例工作台</el-button
        >
        <el-button
          v-show="showTerminationBtn"
          type="primary"
          @click="submitForm"
          >终止案例</el-button
        >
        <el-button @click="cancel">取 消</el-button>
        <!-- <el-button @click="handleapproval">提交审核</el-button> -->
      </div>
@@ -514,7 +839,7 @@
  updateDonatebaseinfo,
  exportDonatebaseinfo,
  downloadbaseinfo,
  getdonatorno,
  getdonatorno
  // exportProvincemessage,
} from "@/api/project/donatebaseinfo";
import Li_area_select from "@/components/Address";
@@ -525,14 +850,14 @@
  listOrganization,
  getOrganization,
  listReportname,
  listUser,
  listUser
} from "@/api/project/organization";
export default {
  components: {
    Li_area_select,
    OrgSelecter,
    AnnexUpload,
    ReportName,
    ReportName
  },
  name: "Donatebaseinfo",
  dicts: [
@@ -560,7 +885,7 @@
    "sys_DonationStatus",
    "sys_DiseaseType",
    "sys_SelfWill",
    "sys_FamilyRelation",
    "sys_FamilyRelation"
  ],
  data() {
    return {
@@ -577,17 +902,17 @@
        sheng: "",
        shi: "",
        qu: "",
        organizationname: null,
        organizationname: null
      },
      residenceAddresss: {
        sheng: "浙江省",
        shi: "",
        qu: "",
        qu: ""
      },
      registerAddresss: {
        sheng: "浙江省",
        shi: "",
        qu: "",
        qu: ""
      },
      // 遮罩层
      loading: true,
@@ -629,7 +954,7 @@
        starttime: null,
        endtime: null,
        city: null,
        reportno: null,
        reportno: null
        // organizationname: null,
        // organizationtype: null,
        // idcardno: null,
@@ -645,77 +970,77 @@
      // 表单校验
      rules: {
        name: [
          { required: true, message: "请输入捐献者姓名", trigger: "blur" },
          { required: true, message: "请输入捐献者姓名", trigger: "blur" }
        ],
        birthday: [
          { required: true, message: "请选择出生日期", trigger: "blur" },
          { required: true, message: "请选择出生日期", trigger: "blur" }
        ],
        idcardtype: [
          { required: true, message: "请选择证件类型", trigger: "blur" },
          { required: true, message: "请选择证件类型", trigger: "blur" }
        ],
        residenceaddress: [
          { required: true, message: "请输入住址", trigger: "blur" },
          { required: true, message: "请输入住址", trigger: "blur" }
        ],
        contacttime: [
          {
            required: true,
            message: "请输入红十字会联系时间",
            trigger: "blur",
          },
            trigger: "blur"
          }
        ],
        idcardno: [
          { required: true, message: "请正确输入证件号码", trigger: "blur" },
          { required: true, message: "请正确输入证件号码", trigger: "blur" }
        ],
        sex: [{ required: true, message: "性别不能为空", trigger: "blur" }],
        age: [{ required: true, message: "请输入年龄", trigger: "blur" }],
        treatmenthospitalno: [
          { required: true, message: "请选择医疗机构", trigger: "blur" },
          { required: true, message: "请选择医疗机构", trigger: "blur" }
        ],
        // treatmenthospitalno: [{ required: true, message: "请选择医疗机构", trigger: "change" }],
        bloodtype: [
          { required: true, message: "请选择ABO血型", trigger: "blur" },
          { required: true, message: "请选择ABO血型", trigger: "blur" }
        ],
        rhyin: [{ required: true, message: "请选择RHD血型", trigger: "blur" }],
        diseasetype: [
          { required: true, message: "请选择RHD血型", trigger: "blur" },
          { required: true, message: "请选择RHD血型", trigger: "blur" }
        ],
        inpatientno: [
          { required: true, message: "输入住院号", trigger: "blur" },
          { required: true, message: "输入住院号", trigger: "blur" }
        ],
        diagnosisname: [
          { required: true, message: "疾病诊断不能为空", trigger: "blur" },
          { required: true, message: "疾病诊断不能为空", trigger: "blur" }
        ],
        infoname: [
          { required: true, message: "请输入信息员姓名", trigger: "blur" },
          { required: true, message: "请输入信息员姓名", trigger: "blur" }
        ],
        infophone: [
          { required: true, message: "请输入信息员联系电话", trigger: "blur" },
          { required: true, message: "请输入信息员联系电话", trigger: "blur" }
        ],
        redorganno: [
          { required: true, message: "请选择红十字会机构", trigger: "blur" },
          { required: true, message: "请选择红十字会机构", trigger: "blur" }
        ],
        contactperson: [
          {
            required: true,
            message: "红十字会联系人不能为空",
            trigger: "blur",
          },
            trigger: "blur"
          }
        ],
        // contactnumber: [{required: true,message: "请输入红十字会联系电话",trigger: "change"}],
        acquisitiontissueno: [
          { required: true, message: "器官获取组织不能为空", trigger: "blur" },
          { required: true, message: "器官获取组织不能为空", trigger: "blur" }
        ],
        reporterno: [
          { required: true, message: "请选择报告人", trigger: "blur" },
          { required: true, message: "请选择报告人", trigger: "blur" }
        ],
        reporttime: [
          { required: true, message: "请输入报告时间", trigger: "blur" },
          { required: true, message: "请输入报告时间", trigger: "blur" }
        ],
        reporterphone: [
          { required: true, message: "请输入报告人联系电话", trigger: "blur" },
        ],
          { required: true, message: "请输入报告人联系电话", trigger: "blur" }
        ]
      },
      //是否显示保存按钮
      showSaveBtn: true,
@@ -739,11 +1064,11 @@
        { label: "衢州市", value: "8" },
        { label: "舟山市", value: "9" },
        { label: "台州市", value: "A" },
        { label: "丽水市", value: "B" },
      ],
        { label: "丽水市", value: "B" }
      ]
    };
  },
  created() { },
  created() {},
  mounted(e) {
    // let idd = this.$route.query.userid
@@ -760,7 +1085,7 @@
        this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
        this.$moment(this.$route.params.endtime)
          .add(-1, "month")
          .format("YYYY-MM-DD"),
          .format("YYYY-MM-DD")
      ];
    }
    if (this.$route.params.reporterno != "") {
@@ -798,20 +1123,20 @@
  methods: {
    getCurrentUser() {
      getUserProfile().then((response) => {
      getUserProfile().then(response => {
        this.currentuser = response.data;
      });
    },
    LoadReportList() {
      listDonatebaseinfo().then((res) => {
      listDonatebaseinfo().then(res => {
        let list = res.rows;
        let reportlist = [];
        reportlist.push({ reporterno: "", reportername: "全部" });
        list.forEach((element) => {
        list.forEach(element => {
          reportlist.push({
            reporterno: element.reporterno,
            reportername: element.reportername,
            reportername: element.reportername
          });
        });
@@ -824,7 +1149,7 @@
    resetArr(Arr) {
      var hash = {};
      Arr = Arr.reduce(function (arr, current) {
      Arr = Arr.reduce(function(arr, current) {
        hash[current.reporterno]
          ? ""
          : (hash[current.reporterno] = true && arr.push(current));
@@ -897,14 +1222,14 @@
    selectReporters() {
      //专职人员
      listReportname("zzry").then((res) => {
      listReportname("zzry").then(res => {
        this.reporters = res.data;
      });
    },
    getuserlist() {
      //用户列表
      listUser().then((res) => {
      listUser().then(res => {
        this.users = res.data;
      });
    },
@@ -913,11 +1238,11 @@
      this.$confirm("是否确认将案例上报审核?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
        type: "warning"
      })
        .then(() => {
          row.recordstate = 1;
          updateDonatebaseinfo(row).then((response) => {
          updateDonatebaseinfo(row).then(response => {
            this.$modal.msgSuccess("上报审核成功");
            this.getList();
          });
@@ -925,7 +1250,7 @@
        .catch(() => {
          this.$message({
            type: "info",
            message: "已取消上报",
            message: "已取消上报"
          });
        });
    },
@@ -933,15 +1258,14 @@
      this.approvalState = false;
      //  this.reset();
      // const id = row.id || this.ids;
      updateDonatebaseinfo(row).then((response) => {
      updateDonatebaseinfo(row).then(response => {
        row.recordstate = 0;
      });
    },
    updateMessage() {
      try {
        const reg =
          /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
        const reg = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
        if (reg.test(this.form.idcardno)) {
          // 身份证号码是否合法
          var org_birthday = this.form.idcardno.substring(6, 14);
@@ -959,8 +1283,8 @@
            d.getFullYear() -
            birthdays.getFullYear() -
            (d.getMonth() < birthdays.getMonth() ||
              (d.getMonth() == birthdays.getMonth() &&
                d.getDate() < birthdays.getDate())
            (d.getMonth() == birthdays.getMonth() &&
              d.getDate() < birthdays.getDate())
              ? 1
              : 0);
          // 赋值给表格
@@ -969,7 +1293,7 @@
          this.form.age = age;
        } else {
        }
      } catch { }
      } catch {}
    },
    // sheng: '浙江省',
    //   shi: '',
@@ -996,7 +1320,7 @@
      }
      this.setState({
        birthday,
        sex,
        sex
      });
    },
@@ -1031,7 +1355,7 @@
      this.queryParams.residenceprovince = this.$refs.areaSelect.getSheng();
      this.queryParams.residencecity = this.$refs.areaSelect.getShi();
      this.queryParams.residencetown = this.$refs.areaSelect.getQu();
      listDonatebaseinfo(this.queryParams).then((response) => {
      listDonatebaseinfo(this.queryParams).then(response => {
        this.donatebaseinfoList = response.rows;
        //console.log("listDonatebaseinfo", response.rows);
        this.total = response.total;
@@ -1123,7 +1447,7 @@
        majorrelatives: null,
        familyrelations: null,
        acquisitiontissueno: "ZJOPO",
        acquisitiontissuename: "浙江省人体器官获取组织",
        acquisitiontissuename: "浙江省人体器官获取组织"
      };
      this.resetForm("form");
@@ -1156,7 +1480,7 @@
        reportername: null,
        reporttime: null,
        city: null,
        treatmenthospitalno: null,
        treatmenthospitalno: null
      };
      this.selecttime = [];
      this.getTimeList();
@@ -1164,7 +1488,7 @@
        sheng: "",
        shi: "",
        qu: "",
        organizationname: null,
        organizationname: null
      };
      //this.$refs.areaSelect.clean();
@@ -1173,32 +1497,32 @@
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map((item) => item.id);
      this.ids = selection.map(item => item.id);
      this.single = selection.length !== 1;
      this.multiple = !selection.length;
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.$router.push({
        path: "/organ/donationdetails/",
        query: {
          organType: "add",
        }
      });
      // this.reset();
      // //设置报告人和部门/组
      // this.form.reporterno = this.currentuser.userName;
      // this.form.reportername = this.currentuser.nickName;
      // this.form.deptid = this.currentuser.deptid;
      // this.showSaveBtn = true;
      // //this.$refs.annex.getAnnexList();
      // this.open = true;
      // this.$nextTick(function () {
      //   this.$refs.annex.getAnnexList();
      // this.$router.push({
      //   path: "/organ/donationdetails/",
      //   query: {
      //     organType: "add",
      //   }
      // });
      this.reset();
      //设置报告人和部门/组
      this.form.reporterno = this.currentuser.userName;
      this.form.reportername = this.currentuser.nickName;
      this.form.deptid = this.currentuser.deptid;
      // this.title = "人体器官潜在捐献者登记表";
      this.showSaveBtn = true;
      //this.$refs.annex.getAnnexList();
      this.open = true;
      this.$nextTick(function() {
        this.$refs.annex.getAnnexList();
      });
      this.title = "人体器官潜在捐献者登记表";
    },
    /** 修改按钮操作 */
@@ -1207,7 +1531,7 @@
        path: "/organ/donationdetails/",
        query: {
          id: row.id,
          organType: "edit",
          organType: "edit"
        }
      });
      // this.showSaveBtn = true;
@@ -1240,13 +1564,13 @@
      //   this.registerAddresss.qu = response.data.registertownname;
      // });
    },
// 终止案例
    // 终止案例
    handletermination(row) {
      this.reset();
      this.showSaveBtn = false;
      this.showTerminationBtn = true;
      const id = row.id || this.ids;
      getDonatebaseinfo(id).then((response) => {
      getDonatebaseinfo(id).then(response => {
        this.form = response.data;
        this.form.diseasetype = this.form.diseasetype.split(",");
@@ -1265,14 +1589,14 @@
        this.open = true;
        this.title = "人体器官潜在捐献者登记表";
        this.form.recordstate = 99;
        this.$nextTick(function () {
        this.$nextTick(function() {
          this.$refs.annex.getAnnexList();
        });
      });
    },
    /** 提交按钮 */
    submitForm() {
      this.$refs["form"].validate((valid) => {
      this.$refs["form"].validate(valid => {
        console.log("提交的数据们:", this.form);
        if (valid) {
          this.form.birthday = this.$moment(this.form.birthday).format(
@@ -1306,19 +1630,17 @@
          this.form.reportername = this.$refs.getReportname.$data.selectedLabel;
          try {
            this.form.treatmenthospitalname =
              this.$refs.addOrgSelect.getOptionByValue(
                this.form.treatmenthospitalno
              ).organizationname;
            this.form.treatmenthospitalname = this.$refs.addOrgSelect.getOptionByValue(
              this.form.treatmenthospitalno
            ).organizationname;
          } catch {
            this.form.treatmenthospitalname = this.form.treatmenthospitalno;
          }
          try {
            this.form.redorganname =
              this.$refs.addCrossOrgSelect.getOptionByValue(
                this.form.redorganno
              ).organizationname;
            this.form.redorganname = this.$refs.addCrossOrgSelect.getOptionByValue(
              this.form.redorganno
            ).organizationname;
          } catch {
            this.form.redorganname = this.form.redorganno;
          }
@@ -1330,18 +1652,25 @@
          // });
          if (this.form.id != null) {
            updateDonatebaseinfo(this.form).then((response) => {
            updateDonatebaseinfo(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            this.form.recordstate = 0;
            addDonatebaseinfo(this.form).then((response) => {
            addDonatebaseinfo(this.form).then(response => {
              if (response.code == 200) {
                this.$modal.msgSuccess("新增成功");
                this.$router.push({
                  path: "/organ/donationdetails/",
                  query: {
                    id: response.data.id,
                    organType: "edit"
                  }
                });
                this.open = false;
                this.getList();
                // this.getList();
              } else {
                this.$modal.msgError("新增失败:" + response.msg);
              }
@@ -1355,14 +1684,14 @@
      const ids = row.id || this.ids;
      this.$modal
        .confirm('是否确认删除捐献基础编号为"' + ids + '"的数据项?')
        .then(function () {
        .then(function() {
          return delDonatebaseinfo(ids);
        })
        .then(() => {
          this.getList();
          this.$modal.msgSuccess("删除成功");
        })
        .catch(() => { });
        .catch(() => {});
    },
    /** 导出按钮操作 */
@@ -1374,11 +1703,11 @@
          this.exportLoading = true;
          return exportDonatebaseinfo(queryParams);
        })
        .then((response) => {
        .then(response => {
          this.$download.name(response.msg);
          this.exportLoading = false;
        })
        .catch(() => { });
        .catch(() => {});
    },
    // 对象转成指定字符串分隔
@@ -1404,7 +1733,7 @@
    handledownload(row) {
      const id = row.id || this.ids;
      downloadbaseinfo(id).then((response) => {
      downloadbaseinfo(id).then(response => {
        var fileUrl = response;
        //获取当前网址
        var urlBase = process.env.VUE_APP_BASE_API;
@@ -1417,8 +1746,8 @@
          curWWWPath.substring(0, pos) + urlBase + fileUrl["downloadUrl"];
        aEle.click();
      });
    },
  },
    }
  }
};
</script>
@@ -1428,4 +1757,4 @@
  margin: auto !important;
  padding-bottom: 0px !important;
}
</style>
</style>
src/views/project/donatefinish/index.vue
@@ -319,7 +319,7 @@
              label="器官名称"
              align="center"
              prop="organname"
              width="80"
              width="100"
            />
            <el-table-column
              label="移植医院(接收单位)"
src/views/project/donationdetails/index.vue
@@ -8,16 +8,16 @@
            <el-step title="潜在捐献" icon="el-icon-user">
              <template
                slot="description"
                v-if="Processdata.donateorgan.createtime"
                v-if="Processdata.donatebaseinfo.createtime"
              >
                <p>
                  提交时间:<span>{{
                    parseTime(Processdata.donateorgan.createtime)
                    parseTime(Processdata.donatebaseinfo.createtime)
                  }}</span>
                </p>
                <p>
                  更新时间:<span>{{
                    parseTime(Processdata.donateorgan.updatetime)
                    parseTime(Processdata.donatebaseinfo.updatetime)
                  }}</span>
                </p>
              </template>
@@ -92,16 +92,16 @@
            >
              <template
                slot="description"
                v-if="Processdata.organallocationService.createtime"
                v-if="Processdata.donateorgansService.createtime"
              >
                <p>
                  提交时间:<span>{{
                    parseTime(Processdata.organallocationService.updatetime)
                    parseTime(Processdata.donateorgansService.updatetime)
                  }}</span>
                </p>
                <p>
                  更新时间:<span>{{
                    parseTime(Processdata.organallocationService.updatetime)
                    parseTime(Processdata.donateorgansService.updatetime)
                  }}</span>
                </p>
              </template>
@@ -746,12 +746,7 @@
            @click="Reportforreview"
            >上报审核</el-button
          >
          <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          <el-button @click="cancel">取 消</el-button>
          <!-- <el-button @click="handleapproval">提交审核</el-button> -->
        </div>
@@ -971,12 +966,7 @@
            @click="Terminationcase"
            >{{ showTerminationBtn == 0 ? "终止案例" : "恢复案例" }}</el-button
          >
          <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          <el-button @click="cancel">取 消</el-button>
        </div>
      </div>
@@ -1171,12 +1161,7 @@
            @click="Terminationcase"
            >{{ showTerminationBtn == 0 ? "终止案例" : "恢复案例" }}</el-button
          >
          <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          <el-button @click="cancel">取 消</el-button>
        </div>
      </div>
@@ -1239,24 +1224,23 @@
            @click="Terminationcase"
            >{{ showTerminationBtn == 0 ? "终止案例" : "恢复案例" }}</el-button
          >
          <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          <el-button @click="cancel">取 消</el-button>
        </div>
      </div>
      <!-- 器官分配 -->
      <div class="boxdiv" v-show="actives == 4">
      <div class="boxdiv" v-show="actives == 4 || actives == 5 || actives == 6">
        <el-form
          ref="allocationform"
          :model="allocationform"
          :rules="allocationrules"
          label-position="right"
        >
          <el-form-item label-width="100px" label="选择器官">
          <el-form-item
            label-width="100px"
            label="选择器官"
            v-show="actives == 4"
          >
            <el-checkbox-group v-model="organalForm.organname">
              <el-checkbox
                v-for="dict in dict.type.sys_Organ"
@@ -1273,20 +1257,42 @@
              <el-table-column
                label="器官名称"
                align="center"
                width="70"
                width="100"
                prop="organname"
              />
              <el-table-column
                label="器官编号"
                align="center"
                width="70"
                width="100"
                prop="organno"
              />
              <el-table-column
                label="分配状态"
                align="center"
                width="120"
                width="150"
                prop="allocationstatus"
                v-if="actives == 4"
              >
                <template slot-scope="scope">
                  <el-select
                    v-model="scope.row.allocationstatus"
                    placeholder="请选择器官状态"
                  >
                    <el-option
                      v-for="dict in allocationstatuslist"
                      :key="dict.value"
                      :label="dict.label"
                      :value="dict.value"
                    ></el-option>
                  </el-select>
                </template>
              </el-table-column>
              <el-table-column
                label="获取状态"
                align="center"
                width="150"
                prop="organstate"
                v-if="actives == 5"
              >
                <template slot-scope="scope">
                  <el-select
@@ -1294,7 +1300,28 @@
                    placeholder="请选择器官状态"
                  >
                    <el-option
                      v-for="dict in dict.type.sys_organstate"
                      v-for="dict in organstatelist"
                      :key="dict.value"
                      :label="dict.label"
                      :value="dict.value"
                    ></el-option>
                  </el-select>
                </template>
              </el-table-column>
              <el-table-column
                label="移植状态"
                align="center"
                width="150"
                prop="transplantstate"
                v-if="actives == 6"
              >
                <template slot-scope="scope">
                  <el-select
                    v-model="scope.row.transplantstate"
                    placeholder="请选择器官状态"
                  >
                    <el-option
                      v-for="dict in transplantstatelist"
                      :key="dict.value"
                      :label="dict.label"
                      :value="dict.value"
@@ -1310,9 +1337,35 @@
              >
                <template slot-scope="scope">
                  <org-selecter
                    :disabled="
                      scope.row.allocationstatus == 2 ||
                        scope.row.organstate == 2 ||
                        scope.row.transplantstate == 2
                    "
                    ref="tranHosSelect"
                    :org-type="'4'"
                    v-model="scope.row.transplanthospitalno"
                    style="width: 100%"
                  />
                </template>
              </el-table-column>
              <el-table-column
                label="获取组织"
                align="center"
                width="230"
                prop="gainhospitalno"
                v-if="actives == 5"
              >
                <template slot-scope="scope">
                  <org-selecter
                    :disabled="
                      scope.row.allocationstatus == 2 ||
                        scope.row.organstate == 2 ||
                        scope.row.transplantstate == 2
                    "
                    ref="tranHosSelect"
                    :org-type="'4'"
                    v-model="scope.row.gainhospitalno"
                    style="width: 100%"
                  />
                </template>
@@ -1322,9 +1375,15 @@
                align="center"
                width="120"
                prop="ageunit"
                v-if="actives == 4"
              >
                <template slot-scope="scope">
                  <el-input
                    :disabled="
                      scope.row.allocationstatus == 2 ||
                        scope.row.organstate == 2 ||
                        scope.row.transplantstate == 2
                    "
                    v-model="scope.row.ageunit"
                    placeholder="系统编号"
                  />
@@ -1335,9 +1394,15 @@
                align="center"
                width="200"
                prop="applicanttime"
                v-if="actives == 4"
              >
                <template slot-scope="scope">
                  <el-date-picker
                    :disabled="
                      scope.row.allocationstatus == 2 ||
                        scope.row.organstate == 2 ||
                        scope.row.transplantstate == 2
                    "
                    clearable
                    size="small"
                    style="width: 100%"
@@ -1354,9 +1419,106 @@
                align="center"
                width="120"
                prop="name"
                v-if="actives == 4"
              >
                <template slot-scope="scope">
                  <el-input v-model="scope.row.name" placeholder="受体姓名" />
                  <el-input
                    :disabled="
                      scope.row.allocationstatus == 2 ||
                        scope.row.organstate == 2 ||
                        scope.row.transplantstate == 2
                    "
                    v-model="scope.row.name"
                    placeholder="受体姓名"
                  />
                </template>
              </el-table-column>
              <el-table-column
                label="移植负责人"
                align="center"
                width="120"
                prop="transplantdoct"
                v-if="actives == 6"
              >
                <template slot-scope="scope">
                  <el-input
                    :disabled="
                      scope.row.allocationstatus == 2 ||
                        scope.row.organstate == 2 ||
                        scope.row.transplantstate == 2
                    "
                    v-model="scope.row.transplantdoct"
                    placeholder="医师姓名"
                  />
                </template>
              </el-table-column>
              <el-table-column
                label="移植时间"
                align="center"
                width="200"
                prop="transplanttime"
                v-if="actives == 6"
              >
                <template slot-scope="scope">
                  <el-date-picker
                    :disabled="
                      scope.row.allocationstatus == 2 ||
                        scope.row.organstate == 2 ||
                        scope.row.transplantstate == 2
                    "
                    clearable
                    size="small"
                    style="width: 100%"
                    v-model="scope.row.transplanttime"
                    type="datetime"
                    value-format="yyyy-MM-dd HH:mm:ss"
                    placeholder="选择移植时间"
                  >
                  </el-date-picker>
                </template>
              </el-table-column>
              <el-table-column
                label="获取医师"
                align="center"
                width="120"
                prop="organgetdoct"
                v-if="actives == 5"
              >
                <template slot-scope="scope">
                  <el-input
                    :disabled="
                      scope.row.allocationstatus == 2 ||
                        scope.row.organstate == 2 ||
                        scope.row.transplantstate == 2
                    "
                    v-model="scope.row.organgetdoct"
                    placeholder="医师姓名"
                  />
                </template>
              </el-table-column>
              <el-table-column
                label="获取时间"
                align="center"
                width="200"
                prop="organgettime"
                v-if="actives == 5"
              >
                <template slot-scope="scope">
                  <el-date-picker
                    :disabled="
                      scope.row.allocationstatus == 2 ||
                        scope.row.organstate == 2 ||
                        scope.row.transplantstate == 2
                    "
                    clearable
                    size="small"
                    style="width: 100%"
                    v-model="scope.row.organgettime"
                    type="datetime"
                    value-format="yyyy-MM-dd HH:mm:ss"
                    placeholder="选择获取时间"
                  >
                  </el-date-picker>
                </template>
              </el-table-column>
              <el-table-column
@@ -1364,9 +1526,15 @@
                align="center"
                width="150"
                prop="idcardtype"
                v-if="actives == 4"
              >
                <template slot-scope="scope">
                  <el-select
                    :disabled="
                      scope.row.allocationstatus == 2 ||
                        scope.row.organstate == 2 ||
                        scope.row.transplantstate == 2
                    "
                    v-model="scope.row.idcardtype"
                    placeholder="移植人证件类型"
                  >
@@ -1384,18 +1552,40 @@
                align="center"
                width="200"
                prop="idcardno"
                v-if="actives == 4"
              >
                <template slot-scope="scope">
                  <el-input
                    :disabled="
                      scope.row.allocationstatus == 2 ||
                        scope.row.organstate == 2 ||
                        scope.row.transplantstate == 2
                    "
                    v-model="scope.row.idcardno"
                    placeholder="证件号码"
                  />
                </template>
              </el-table-column>
              <el-table-column
                prop="abandonreason"
                label="弃用/作废原因"
                align="center"
                width="260"
              >
                <template slot-scope="scope">
                  <el-row>
                    <el-input
                      clearable
                      v-model="scope.row.abandonreason"
                      placeholder="请输入弃用/作废原因"
                    />
                  </el-row>
                </template>
              </el-table-column>
            </el-table>
          </el-form-item>
        </el-form>
        <div class="dialog-footer">
        <div class="dialog-footer" v-show="actives == 4">
          <el-button
            v-show="!showTerminationBtn"
            type="primary"
@@ -1407,12 +1597,12 @@
            @click="Terminationcase"
            >{{ showTerminationBtn == 0 ? "终止案例" : "恢复案例" }}</el-button
          >
          <el-button
          <!-- <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          > -->
          <el-button @click="cancel">取 消</el-button>
        </div>
      </div>
@@ -1762,12 +1952,7 @@
            @click="Terminationcase"
            >{{ showTerminationBtn == 0 ? "终止案例" : "恢复案例" }}</el-button
          >
          <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          <el-button @click="cancel">取 消</el-button>
        </div>
      </div>
@@ -1894,7 +2079,7 @@
      </div>
      <!-- 完结流程 -->
      <div class="boxdiv" v-show="actives > 6">
         <h3>全部流程已完结!</h3>
        <h3>全部流程已完结!</h3>
      </div>
    </div>
    <!-- 附件弹窗 -->
@@ -1906,6 +2091,11 @@
      :visible.sync="pdfVisible"
      width="60%"
    >
      <div style="text-align: right;">
        <el-button type="success" @click="drawer = true"
          >文件指导目录</el-button
        >
      </div>
      <el-tabs
        style="margin-top: 20px;"
        v-model="activeName"
@@ -1913,10 +2103,6 @@
        @tab-click="handleClick"
      >
        <el-tab-pane :label="activetele" :name="1"> </el-tab-pane>
        <!-- <el-tab-pane label="医学评估" :name="2"> </el-tab-pane>
        <el-tab-pane label="捐献确认" :name="3"> </el-tab-pane>
        <el-tab-pane label="伦理审查" :name="4"> </el-tab-pane>
        <el-tab-pane label="完成登记" :name="7"> </el-tab-pane> -->
      </el-tabs>
      <div class="pdfimg">
        <div class="box-pdf">
@@ -2008,23 +2194,50 @@
        <div v-else class="pdfimgmins">{{ hintitle }}</div>
      </div>
    </el-dialog>
    <!-- 批量抽屉 -->
    <el-drawer title="器官捐献相关附件" :visible.sync="drawer" direction="rtl">
      <div style="padding:20px">
        <el-button @click="clearFilter">取消筛选</el-button>
        <el-table ref="filterTable" :data="tableDatafile" style="width: 100%">
          <el-table-column prop="name" label="文件名" width="250">
          </el-table-column>
          <el-table-column
            prop="tag"
            label="类型"
            :filters="[
              { text: '中国一类(DBD)', value: '中国一类(DBD)' },
              { text: '中国二类(DCD)', value: '中国二类(DCD)' },
              { text: '中国三类(DBCD)', value: '中国三类(DBCD)' }
            ]"
            :filter-method="filterTag"
            filter-placement="bottom-end"
          >
            <template slot-scope="scope">
              <el-tag :type="scope.row.type" disable-transitions>{{
                scope.row.tag
              }}</el-tag>
            </template>
          </el-table-column>
        </el-table>
      </div>
      <div style="margin-left: 20px;">
        <el-button @click="drawer = false">取 消</el-button>
      </div>
    </el-drawer>
  </div>
</template>
<script>
import {
  addDonateannex,
  listDonateannex,
  Modifydonationattachment
} from "@/api/project/donateannex";
import { listReportname } from "@/api/project/organization";
import {
  getDonatecompletioninfo,
  listnewDonatecompletioninfo,
  addDonatecompletioninfo,
  updateDonatecompletioninfo,
  listDonatecompletioninfo,
  downloadcompletioninfo
  updateDonatecompletioninfo
} from "@/api/project/donatecompletioninfo";
import {
  getDonatebaseinfo,
@@ -2080,35 +2293,61 @@
    AnnexUpload,
    ReportName
  },
  dicts: [
    "sys_nation",
    "sys_occupation",
    "sys_education",
    "sys_Organ",
    "sys_organstate",
    "sys_user_sex",
    "sys_IDType",
    "sys_BloodType",
    "sys_0_1",
    "sys_patientstate",
    "sys_DonationCategory",
    "sys_Kinship",
    "sys_Infectious",
    "sys_bloodtype_rhd",
    "sys_InfoSources",
    "sys_OtherCases",
    "sys_DiseaseType",
    "sys_SelfWill",
    "sys_FamilyRelation",
    "sys_OrganDecision",
    "sys_CoreAssessConclusion",
    "sys_BaseAssessConclusion",
    "sys_EthicalReview"
  ],
  // dicts: [
  //   "sys_nation",
  //   "sys_occupation",
  //   "sys_education",
  //   "sys_Organ",
  //   "sys_user_sex",
  //   "sys_IDType",
  //   "sys_BloodType",
  //   "sys_0_1",
  //   "sys_patientstate",
  //   "sys_DonationCategory",
  //   "sys_Kinship",
  //   "sys_Infectious",
  //   "sys_bloodtype_rhd",
  //   "sys_InfoSources",
  //   "sys_OtherCases",
  //   "sys_DiseaseType",
  //   "sys_SelfWill",
  //   "sys_FamilyRelation",
  //   "sys_OrganDecision",
  //   "sys_CoreAssessConclusion",
  //   "sys_BaseAssessConclusion",
  //   "sys_EthicalReview"
  // ],
  data() {
    return {
      infoid: 736,
      drawer: false,
      form: {},
      tableDatafile: [
        {
          name: "王小虎",
          address: "上海市普陀区金沙江路 1518 弄",
          tag: "中国一类(DBD)",
          type: "success"
        },
        {
          name: "王小虎",
          address: "上海市普陀区金沙江路 1517 弄",
          tag: "中国二类(DCD)",
          type: "danger"
        },
        {
          name: "王小虎",
          address: "上海市普陀区金沙江路 1519 弄",
          tag: "中国三类(DBCD)",
          type: "warning"
        },
        {
          name: "王小虎",
          address: "上海市普陀区金沙江路 1516 弄",
          tag: "中国三类(DBCD)",
          type: "warning"
        }
      ],
      medicineform: {
        infoid: null
      },
@@ -2119,6 +2358,21 @@
      ethicform: {
        infoid: null
      },
      allocationstatuslist: [
        { value: 0, label: "未分配" },
        { value: 1, label: "已分配" },
        { value: 2, label: "作废" }
      ],
      organstatelist: [
        { value: "0", label: "未获取" },
        { value: "1", label: "已获取" },
        { value: "2", label: "弃用" }
      ],
      transplantstatelist: [
        { value: 0, label: "未移植" },
        { value: 1, label: "已移植" },
        { value: 2, label: "弃用" }
      ],
      allocationform: [],
      witnessform: {
        infoid: null
@@ -2253,7 +2507,7 @@
      fileList: [],
      fileListto: [],
      donatelist: [], //总
      activetele:'潜在捐献',
      activetele: "潜在捐献",
      //上传附件路径
      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      //文件上传token
@@ -2331,9 +2585,9 @@
      let searchParam = {
        infoid: this.infoid
      };
      if (this.actives == 1) {
      if (this.actives == 1 && !this.medicineform.infoid) {
        this.annexfilesList = this.medicinelist;
        this.activetele="医学评估";
        this.activetele = "医学评估";
        listMedicalevaluation(searchParam).then(response => {
          if (response.code == 200 && response.rows[0]) {
            this.medicineform = response.rows[0];
@@ -2343,9 +2597,9 @@
            );
          }
        });
      } else if (this.actives == 2) {
      } else if (this.actives == 2 && !this.affirmform.infoid) {
        this.annexfilesList = this.affirmlist;
        this.activetele="捐献确认";
        this.activetele = "捐献确认";
        listRelativesconfirmation(searchParam).then(response => {
          if (response.code == 200 && response.rows[0]) {
            this.affirmform = response.rows[0];
@@ -2358,23 +2612,23 @@
            this.defultAddresss.sheng = this.affirmform.residenceprovincename;
            this.defultAddresss.shi = this.affirmform.residencecityname;
            this.defultAddresss.qu = this.affirmform.residencetownname;
            if (this.affirmform.kinship) {
              this.affirmform.kinship = this.affirmform.kinship.split(",");
            }
            if (this.affirmform.organdecision) {
              this.affirmform.organdecision = this.affirmform.organdecision.split(
                ","
              );
            }
            // if (this.affirmform.kinship) {
            //   this.affirmform.kinship = this.affirmform.kinship.split(",");
            // }
            // if (this.affirmform.organdecision) {
            //   this.affirmform.organdecision = this.affirmform.organdecision.split(
            //     ","
            //   );
            // }
          } else {
            this.$modal.msgError(
              "查询是否存在确认登记记录失败" + JSON.stringify(response)
            );
          }
        });
      } else if (this.actives == 3) {
      } else if (this.actives == 3 && !this.ethicform.infoid) {
        this.annexfilesList = this.ethiclist;
        this.activetele="伦理审查";
        this.activetele = "伦理审查";
        listDonateflowchart(searchParam).then(response => {
          if (response.code == 200 && response.rows.length == 1) {
@@ -2383,12 +2637,11 @@
            console.log("伦理审查数据为空");
          }
        });
      } else if (this.actives == 4) {
      } else if (this.actives == 4 && !this.medicineform[0]) {
        listDonateorgan(searchParam).then(response => {
          if (response.code == 200) {
            if (response.rows[0]) {
              this.allocationform = response.rows;
              // this.allocationform[0].infoid = this.form.id;
            }
            this.organalForm.organname = [];
            for (let i = 0; i < response.rows.length; i++) {
@@ -2400,7 +2653,22 @@
            );
          }
        });
      } else if (this.actives == 5) {
      } else if (this.actives == 5 && !this.witnessform.infoid) {
        // 不存在时获取器官信息
        if (!this.allocationform[0]) {
          listDonateorgan(searchParam).then(resall => {
            if (resall.code == 200) {
              if (resall.rows[0]) {
                this.allocationform = resall.rows;
              }
            } else {
              this.$modal.msgError(
                "器官列表获取失败:" + JSON.stringify(resall)
              );
            }
          });
        }
        // 获取当前见证信息
        getByInfoId(searchParam.infoid).then(response => {
          if (response.code == 200) {
            if (response.data) {
@@ -2413,13 +2681,28 @@
            );
          }
        });
      } else if (this.actives == 6) {
      } else if (this.actives == 6 && !this.allocationform.infoid) {
        this.annexfilesList = this.registerlist;
        this.activetele="完成登记";
        this.activetele = "完成登记";
        let accpre = {
          id: searchParam.infoid
        };
        // 不存在时获取器官
        if (!this.allocationform[0]) {
          listDonateorgan(searchParam).then(resall => {
            if (resall.code == 200) {
              if (resall.rows[0]) {
                this.allocationform = resall.rows;
                this.allocationform.infoid = this.infoid;
              }
            } else {
              this.$modal.msgError(
                "器官列表获取失败:" + JSON.stringify(resall)
              );
            }
          });
        }
        // 获取完成登记信息
        listnewDonatecompletioninfo(accpre).then(response => {
          if (response.code == 200 && response.rows.length) {
            this.accomplishform = response.rows[0];
@@ -2430,8 +2713,7 @@
        });
      } else if (this.actives == 0) {
        this.annexfilesList = this.registerlist;
        this.activetele="潜在捐献";
        this.activetele = "潜在捐献";
      }
    },
    /** 保存主表按钮 */
@@ -2580,7 +2862,6 @@
            let arrallo = [];
            this.allocationform.map(item => {
              if (item.id) {
                console.log(formatDate(item.applicanttime));
                item.applicanttime = formatDate(item.applicanttime);
                updateDonateorgan(item).then(response => {});
              } else {
@@ -2617,8 +2898,16 @@
          }
          console.log("juanxian");
          if (valid) {
            console.log("juanxian");
            // 保存器官分配表数据
            let arrallo = [];
            this.allocationform.map(item => {
              if (item.id) {
                item.applicanttime = formatDate(item.applicanttime);
                updateDonateorgan(item).then(response => {});
              } else {
                arrallo.push(item);
              }
            });
            if (this.witnessform.id != null) {
              console.log(456);
              updateDonationwitness(this.witnessform).then(response => {
@@ -2637,6 +2926,17 @@
        this.accomplishform.infoid = this.infoid;
        this.$refs["accomplishform"].validate(valid => {
          if (valid) {
            // 保存器官分配表数据
            let arrallo = [];
            this.allocationform.map(item => {
              if (item.id) {
                item.applicanttime = formatDate(item.applicanttime);
                updateDonateorgan(item).then(response => {});
              } else {
                arrallo.push(item);
              }
            });
            // 保存确认信息
            if (this.accomplishform.id) {
              console.log(this.accomplishform);
              updateDonatecompletioninfo(this.accomplishform).then(response => {
@@ -2735,7 +3035,10 @@
      console.log(this.form.workflow);
      console.log(this.actives);
      if (this.form.workflow == this.actives) {
        this.form.workflow++;
        if (this.form.workflow <= 6) {
        } else {
          this.form.workflow++;
        }
        this.submitForm();
        // this.GetAttacheddata();
      } else if (this.form.workflow > this.actives) {
@@ -2935,9 +3238,41 @@
      const item = this.fileListto.splice(index, 1)[0]; // 移除指定索引处的元素,并保存到item变量中
      this.fileListto.splice(index - 1, 0, item); // 将item插入到索引位置的前一位
    },
    // 保存
    saveattachment(stype) {}
  }
    clearFilter() {
      this.$refs.filterTable.clearFilter();
    },
    formatter(row, column) {
      return row.address;
    },
    filterTag(value, row) {
      return row.tag === value;
    }
  },
  dicts: [
    "sys_nation",
    "sys_occupation",
    "sys_education",
    "sys_Organ",
    "sys_user_sex",
    "sys_IDType",
    "sys_BloodType",
    "sys_0_1",
    "sys_patientstate",
    "sys_DonationCategory",
    "sys_Kinship",
    "sys_Infectious",
    "sys_bloodtype_rhd",
    "sys_InfoSources",
    "sys_OtherCases",
    "sys_DiseaseType",
    "sys_SelfWill",
    "sys_FamilyRelation",
    "sys_OrganDecision",
    "sys_CoreAssessConclusion",
    "sys_BaseAssessConclusion",
    "sys_EthicalReview"
  ]
};
</script>
src/views/project/ethicalReview/index.vue
@@ -682,7 +682,7 @@
      this.handleQuery();
    },
    /** 伦理审查弹窗 */
    showDonationEvaluationDialog(dontateInfo) {
    showDonationEvaluationDialog(row) {
      this.$router.push({
        path: "/organ/donationdetails/",
        query: {
src/views/project/fund/performancedetails/index.vue
@@ -2005,7 +2005,7 @@
          singleDetail.bankcardno = res.bankCardNo;
          singleDetail.branchbankname = res.branchbankname;
          singleDetail.depositbank = res.depositBank;
          singleDetail.idcardno = res.bankCardNo;
          singleDetail.idcardno = res.idcardNo;
          singleDetail.phone = res.telephone;
          singleDetail.title = res.title;
          singleDetail.unitname = res.unitname;
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -1320,7 +1320,6 @@
          const obj = selection.find(obj => obj.id === item);
          console.log(obj);
          this.overallidsvalue.push(obj);
        }
      });
      console.log(this.overallids);
@@ -1354,17 +1353,17 @@
    },
    Totalcalculation(tot) {
      console.log(tot);
      let bojite={
        fundids:this.overallids,
        isTaxAfter:tot,
      }
      let bojite = {
        fundids: this.overallids,
        isTaxAfter: tot
      };
      if (tot == 0) {
        TotalcalculationFn(bojite).then(row => {
          console.log(row.msg);
          if (row.code=200) {
          if ((row.code = 200)) {
            this.$modal.msgSuccess(row.msg);
          }else{
          this.$modal.msgError(row.msg);
          } else {
            this.$modal.msgError(row.msg);
          }
        });
      } else {
@@ -1372,7 +1371,11 @@
        const hasValue = this.overallidsvalue.every(obj => obj.istax == 1);
        if (hasValue) {
          TotalcalculationFn(bojite).then(row => {
            console.log(row.msg);
            if ((row.code = 200)) {
              this.$modal.msgSuccess(row.msg);
            } else {
              this.$modal.msgError(row.msg);
            }
          });
        } else {
          this.$modal.msgError("请选择算税后的数据进行合并计算");
src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -1363,23 +1363,27 @@
    },
    Totalcalculation(tot) {
      console.log(tot);
      let bojite={
        fundids:this.overallids,
        isTaxAfter:tot,
      }
      let bojite = {
        fundids: this.overallids,
        isTaxAfter: tot
      };
      if (tot == 0) {
        TotalcalculationFn(bojite).then(row => {
          if (row.code=200) {
          if ((row.code = 200)) {
            this.$modal.msgSuccess(row.msg);
          }else{
          this.$modal.msgError(row.msg);
          } else {
            this.$modal.msgError(row.msg);
          }
        });
      } else {
        const hasValue = this.overallidsvalue.every(obj => obj.istax == 1);
        if (hasValue) {
          TotalcalculationFn(bojite).then(row => {
            console.log(row.msg);
            if ((row.code = 200)) {
              this.$modal.msgSuccess(row.msg);
            } else {
              this.$modal.msgError(row.msg);
            }
          });
        } else {
          this.$modal.msgError("请选择算税后的数据进行合并计算");