11
WXL
2023-10-25 6196fc48d9a22add90e600e2d3a9ed8bacad3dd7
11
已修改7个文件
1308 ■■■■■ 文件已修改
src/views/project/donationdetails/index.vue 956 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/applyDetail/index.vue 188 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/expertFeeApply/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/medicalCostApply/index.vue 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/medicalCostCheck/index.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseapply/travelexpensedetail/index.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpensecheck/index.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donationdetails/index.vue
@@ -296,6 +296,11 @@
          ></el-step>
        </el-steps>
      </div>
      <div class="Ticket-button">
        <el-button @click.native.prevent="Filepopup" type="success"
          >凭证文件</el-button
        >
      </div>
      <!-- 潜在捐献 -->
      <div class="boxdiv" style="margin: 30px 0 66px 0;" v-show="actives == 0">
        <el-form
@@ -627,10 +632,16 @@
            @click="Terminationcase"
            >终止案例</el-button
          >
          <el-button v-show="Reportforreview" type="primary" @click="ReviewFn"
          <el-button
            v-show="Reportforreview"
            type="primary"
            @click="Reportforreview"
            >上报审核</el-button
          >
          <el-button v-show="makeastepforward" type="primary" @click="ReviewFn"
          <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          <el-button @click="cancel">取 消</el-button>
@@ -850,7 +861,10 @@
            @click="Terminationcase"
            >终止案例</el-button
          >
          <el-button v-show="makeastepforward" type="primary" @click="ReviewFn"
          <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          <el-button @click="cancel">取 消</el-button>
@@ -866,24 +880,6 @@
          label-position="right"
        >
          <el-row>
            <el-col :span="12">
              <el-form-item
                label="亲属关系"
                prop="kinship"
                class="relation"
                align="left"
              >
                <el-checkbox-group v-model="affirmform.kinship">
                  <el-checkbox
                    v-for="dict in dict.type.sys_Kinship"
                    :key="dict.value"
                    :label="dict.value"
                  >
                    {{ dict.label }}
                  </el-checkbox>
                </el-checkbox-group>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="子女数量" prop="kinshipChildrennum">
                <el-input
@@ -1063,7 +1059,10 @@
            @click="Terminationcase"
            >终止案例</el-button
          >
          <el-button v-show="makeastepforward" type="primary" @click="ReviewFn"
          <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          <el-button @click="cancel">取 消</el-button>
@@ -1126,7 +1125,10 @@
            @click="Terminationcase"
            >终止案例</el-button
          >
          <el-button v-show="makeastepforward" type="primary" @click="ReviewFn"
          <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          <el-button @click="cancel">取 消</el-button>
@@ -1138,115 +1140,146 @@
          ref="allocationform"
          :model="allocationform"
          :rules="allocationrules"
          label-width="100px"
          label-position="right"
        >
          <el-row>
            <el-col :span="8">
              <el-form-item label="分配状态" prop="organstate">
                <el-select
                  v-model="allocationform.organstate"
                  placeholder="请选择器官状态"
                >
                  <el-option
                    v-for="dict in dict.type.sys_organstate"
                    :key="dict.value"
                    :label="dict.label"
                    :value="dict.value"
                  ></el-option>
                </el-select>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="8">
              <el-form-item label="捐献姓名" prop="curdonorname">
                <el-input
                  v-model="curdonorname"
                  placeholder="捐献者姓名"
                  disabled
                />
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="器官名称" prop="organnumber">
                <el-select
                  ref="organNameSelect"
                  v-model="allocationform.organnumber"
                  placeholder="请选择器官编号"
                  clearable
                  size="small"
                  disabled
                >
                  <el-option
                    v-for="dict in dict.type.sys_Organ"
                    :key="dict.value"
                    :label="dict.label"
                    :value="dict.value"
          <el-form-item label-width="100px" label="选择器官">
            <el-checkbox-group v-model="organalForm.organname">
              <el-checkbox
                v-for="dict in dict.type.sys_Organ"
                :key="dict.value"
                :label="dict.value"
                @change="changeorganState(dict.value)"
              >
                {{ dict.label }}
              </el-checkbox>
            </el-checkbox-group>
          </el-form-item>
          <el-form-item>
            <el-table v-loading="loading" border :data="allocationform">
              <el-table-column
                label="器官名称"
                align="center"
                width="70"
                prop="organname"
              />
              <el-table-column
                label="器官编号"
                align="center"
                width="70"
                prop="organno"
              />
              <el-table-column
                label="分配状态"
                align="center"
                width="120"
                prop="organstate"
              >
                <template slot-scope="scope">
                  <el-select
                    v-model="scope.row.organstate"
                    placeholder="请选择器官状态"
                  >
                    <el-option
                      v-for="dict in dict.type.sys_organstate"
                      :key="dict.value"
                      :label="dict.label"
                      :value="dict.value"
                    ></el-option>
                  </el-select>
                </template>
              </el-table-column>
              <el-table-column
                label="移植医院"
                align="center"
                width="230"
                prop="transplanthospitalname"
              >
                <template slot-scope="scope">
                  <org-selecter
                    ref="tranHosSelect"
                    :org-type="'4'"
                    v-model="scope.row.transplanthospitalno"
                    style="width: 100%"
                  />
                </el-select>
              </el-form-item> </el-col
            ><el-col :span="8">
              <el-form-item label="系统编号" prop="ageunit">
                <el-input
                  v-model="allocationform.ageunit"
                  placeholder="请输入系统编号"
                />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row
            ><el-col :span="8">
              <el-form-item label="接收时间" prop="applicanttime">
                <el-date-picker
                  clearable
                  size="small"
                  style="width: 100%"
                  v-model="allocationform.applicanttime"
                  type="datetime"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  placeholder="选择接收时间"
                >
                </el-date-picker>
              </el-form-item> </el-col
            ><el-col :span="16">
              <el-form-item label="移植医院" prop="treatmenthospitalno">
                <org-selecter
                  ref="tranHosSelect"
                  :org-type="'4'"
                  v-model="allocationform.transplanthospitalno"
                  style="width: 100%"
                />
              </el-form-item> </el-col></el-row
          ><el-row>
            <el-col :span="8">
              <el-form-item label="受体姓名" prop="name">
                <el-input v-model="allocationform.name" placeholder="姓名" />
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="证件类型" prop="idcardtype">
                <el-select
                  v-model="allocationform.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="8">
              <el-form-item label="证件号码" prop="idcardno">
                <el-input
                  v-model="allocationform.idcardno"
                  placeholder="请输入移植人证件号码"
                />
              </el-form-item>
            </el-col>
          </el-row>
                </template>
              </el-table-column>
              <el-table-column
                label="系统编号"
                align="center"
                width="120"
                prop="ageunit"
              >
                <template slot-scope="scope">
                  <el-input
                    v-model="scope.row.ageunit"
                    placeholder="系统编号"
                  />
                </template>
              </el-table-column>
              <el-table-column
                label="接收时间"
                align="center"
                width="200"
                prop="applicanttime"
              >
                <template slot-scope="scope">
                  <el-date-picker
                    clearable
                    size="small"
                    style="width: 100%"
                    v-model="scope.row.applicanttime"
                    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="name"
              >
                <template slot-scope="scope">
                  <el-input v-model="scope.row.name" placeholder="受体姓名" />
                </template>
              </el-table-column>
              <el-table-column
                label="证件类型"
                align="center"
                width="150"
                prop="idcardtype"
              >
                <template slot-scope="scope">
                  <el-select
                    v-model="scope.row.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>
                </template>
              </el-table-column>
              <el-table-column
                label="证件号码"
                align="center"
                width="200"
                prop="idcardno"
              >
                <template slot-scope="scope">
                  <el-input
                    v-model="scope.row.idcardno"
                    placeholder="证件号码"
                  />
                </template>
              </el-table-column>
            </el-table>
          </el-form-item>
        </el-form>
        <div class="dialog-footer">
          <el-button v-show="showSaveBtn" type="primary" @click="Savethedetails"
@@ -1258,7 +1291,10 @@
            @click="Terminationcase"
            >终止案例</el-button
          >
          <el-button v-show="makeastepforward" type="primary" @click="ReviewFn"
          <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          <el-button @click="cancel">取 消</el-button>
@@ -1704,7 +1740,10 @@
            @click="Terminationcase"
            >终止案例</el-button
          >
          <el-button v-show="makeastepforward" type="primary" @click="ReviewFn"
          <el-button
            v-show="makeastepforward"
            type="primary"
            @click="makeastepforward"
            >下一步</el-button
          >
          <el-button @click="cancel">取 消</el-button>
@@ -1934,13 +1973,132 @@
            @click="Terminationcase"
            >终止案例</el-button
          >
          <el-button v-show="Reportforreview" type="primary" @click="ReviewFn"
          <el-button
            v-show="Reportforreview"
            type="primary"
            @click="Reportforreview"
            >上报审核</el-button
          >
          <el-button @click="cancel">取 消</el-button>
        </div>
      </div>
    </div>
    <el-dialog
      v-dialogDrags
      :modal="false"
      :close-on-click-modal="false"
      :title="pdftitle"
      :visible.sync="pdfVisible"
      width="60%"
    >
      <el-tabs
        style="margin-top: 20px;"
        v-model="activeName"
        type="card"
        @tab-click="handleClick"
      >
        <el-tab-pane label="潜在捐献" :name="0"> </el-tab-pane>
        <el-tab-pane label="医学评估" :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="6"> </el-tab-pane>
      </el-tabs>
      <div class="pdfimg">
        <div class="box-pdf">
          <div>
            <el-upload
              size="mini"
              class="upload-demo"
              :action="uploadFileUrl"
              :file-list="invoicefileList"
              :show-file-list="false"
              multiple
              drag
              :headers="headers"
              :on-success="
                (response, file, fileList) =>
                  uploadSccess(response, file, fileList)
              "
              :on-preview="downFile"
              :disabled="operationType == 'detail'"
              :on-error="handleUploadError"
              :on-remove="remove"
              accept="image/*,.pdf"
            >
              <i class="el-icon-upload"></i>
              <div class="el-upload__text">
                将发票文件拖到此处,或
                <em
                  ><el-button
                    :disabled="operationType == 'detail'"
                    size="small"
                    type="primary"
                    >点击上传</el-button
                  ></em
                >
              </div>
            </el-upload>
            <el-table
              :data="invoicefileListto"
              @row-click="downFile"
              style="width: 100%"
              height="400"
            >
              <el-table-column
                prop="name"
                :show-overflow-tooltip="true"
                label="名称"
              >
                <template slot-scope="scope">
                  <i style="color:#409EFF" class=" el-icon-s-order" />{{
                    scope.row.name
                  }}
                </template>
              </el-table-column>
              <el-table-column
                prop="name"
                width="180"
                :show-overflow-tooltip="true"
                label="功能"
              >
                <template slot-scope="scope">
                  <el-button
                    type="primary"
                    size="mini"
                    @click.native.prevent.stop="deletedowfile(scope.row)"
                    >删除</el-button
                  >
                  <el-button
                    type="primary"
                    size="mini"
                    @click.native.prevent.stop="moveupdowfile(scope.row)"
                    >上移</el-button
                  >
                </template>
              </el-table-column>
            </el-table>
          </div>
        </div>
        <div
          v-if="this.previewpdf && invoicepdfimgsrcList.length"
          class="pdfimgmin"
        >
          <!-- <img :src="pdfimg" /> -->
          <el-image
            style="width: 95%; height: 90%"
            :src="invoicepdfimg"
            :preview-src-list="invoicepdfimgsrcList"
          >
            <!-- <div slot="error" class="image-slot">
              <i class="el-icon-picture-outline"></i>
            </div> -->
          </el-image>
        </div>
        <div v-else class="pdfimgmins">{{ hintitle }}</div>
      </div>
    </el-dialog>
  </div>
</template>
@@ -1971,10 +2129,18 @@
  delDonateorgan,
  updateDonateorgan
} from "@/api/project/donateorgan";
import {
  listRelativesconfirmation,
  getRelativesconfirmation,
  addRelativesconfirmation,
  updateRelativesconfirmation
} from "@/api/project/relativesconfirmation";
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
import AnnexUpload from "@/views/project/components/annexupload";
import ReportName from "@/views/project/components/organizationUser";
import { getToken } from "@/utils/auth";
export default {
  name: "donationdetails",
  components: {
@@ -2005,23 +2171,32 @@
    "sys_FamilyRelation",
    "sys_OrganDecision",
    "sys_CoreAssessConclusion",
    "sys_BaseAssessConclusion"
    "sys_BaseAssessConclusion",
    "sys_EthicalReview"
  ],
  data() {
    return {
      id: 736,
      infoid: 734,
      form: {},
      medicineform: {},
      affirmform: {},
      affirmform: {
        organdecision: []
      },
      ethicform: {},
      allocationform: {},
      witnessform: {},
      accomplishform: {},
      tableData:[],
      tableData: [],
      actives: 0,
      loading: false,
      //   保存、终止按钮确认
      showSaveBtn: true,
      showTerminationBtn: true,
      //选择器官表单
      organalForm: {
        //器官列表
        organname: []
      },
      //省市区默认值设置,可为空
      searchAddress: {
        sheng: "",
@@ -2030,6 +2205,11 @@
        organizationname: null
      },
      residenceAddresss: {
        sheng: "浙江省",
        shi: "",
        qu: ""
      },
      defultAddresss: {
        sheng: "浙江省",
        shi: "",
        qu: ""
@@ -2111,17 +2291,41 @@
          { required: true, message: "请输入报告人联系电话", trigger: "blur" }
        ]
      },
      medicinerules: {},
      affirmrules: {},
      ethicrules: {},
      allocationrules: {},
      witnessrules: {},
      accomplishrules: {}
      accomplishrules: {},
      //附件列表
      fileList: [],
      fileListto: [],
      invoicefileList: [],
      invoicefileListto: [],
      invoicepdfimg: "",
      invoicepdfimgsrcList: [],
      invoDatatop: [],
      activeName: 1, //文件类型
      //上传附件路径
      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      //文件上传token
      headers: {
        Authorization: "Bearer " + getToken()
      },
      // 网络请求头
      Networkheader: null,
      //票据文件
      pdftitle: "",
      pdfimg: "",
      pdfimgsrcList: [],
      pdfVisible: false,
      previewpdf: false,
      hintitle: "请上传文件后查看",
      atpresent: ""
    };
  },
  created() {
  mounted() {
    // this.id = this.$route.query.id;
    this.Getbasicinformation();
  },
@@ -2129,7 +2333,9 @@
  methods: {
    // 获取主表数据
    Getbasicinformation() {
      getDonatebaseinfo(this.id).then(response => {
      console.log(this.infoid);
      console.log(this.hintitle);
      getDonatebaseinfo(this.infoid).then(response => {
        this.form = response.data;
        response.data.sex = parseInt(response.data.sex);
        this.form.id = response.data.id;
@@ -2153,11 +2359,11 @@
    // 获取二级表数据
    GetAttacheddata() {
      let searchParam = {
        id: this.form.id
        infoid: this.form.id
      };
      if (this.actives == 2) {
      if (this.actives == 1) {
        listMedicalevaluation(searchParam).then(response => {
          if (response.code == 200 && response.rows.length == 1) {
          if (response.code == 200) {
            this.medicineform = response.rows[0];
          } else {
            this.$modal.msgError(
@@ -2165,25 +2371,16 @@
            );
          }
        });
      } else if (this.actives == 3) {
      } else if (this.actives == 2) {
        listRelativesconfirmation(searchParam).then(response => {
          if (response.code == 200 && response.rows.length == 1) {
          if (response.code == 200) {
            this.affirmform = response.rows[0];
            this.affirmform.donorno = row.donorno;
            this.affirmform.doname = row.name;
            this.affirmform.dosex = row.sex;
            // 出生日期
            this.affirmform.dobirthday = row.birthday;
            // 民族
            this.affirmform.donationality = row.nationality;
            // 学历
            this.affirmform.doeducation = row.education;
            // 职业
            this.affirmform.dooccupation = row.occupation;
            this.affirmform.donation = row.nation;
            this.affirmform.doidcardtype = row.idcardtype;
            this.affirmform.doidcardno = row.idcardno;
            this.affirmform.donativeplace = row.nativeplace;
            if (!this.affirmform) {
              this.affirmform = {};
              this.affirmform.residenceprovincename = "";
              this.affirmform.residencecityname = "";
              this.affirmform.residencetownname = "";
            }
            this.defultAddresss.sheng = this.affirmform.residenceprovincename;
            this.defultAddresss.shi = this.affirmform.residencecityname;
            this.defultAddresss.qu = this.affirmform.residencetownname;
@@ -2201,45 +2398,45 @@
            );
          }
        });
      } else if (this.actives == 4) {
      } else if (this.actives == 3) {
        listDonateflowchart(searchParam).then(response => {
          if (response.code == 200 && response.rows.length == 1) {
            this.form = response.rows[0];
          } else if (response.rows.length == 0) {
            this.$modal.msgError("未找到本案例的伦理审查记录,请联系管理员!");
            this.ethicform = response.rows[0];
          } else {
            this.$modal.msgError("数据重复");
            console.log("伦理审查数据为空");
          }
        });
      } else if (this.actives == 5) {
        listOrganallocation(searchParam).then(response => {
          if (response.code == 200 && response.rows.length == 1) {
            this.form = response.rows[0];
            this.form.infoid = data.id;
            this.open = true;
      } else if (this.actives == 4) {
        listDonateorgan(searchParam).then(response => {
          if (response.code == 200) {
            this.allocationform = response.rows;
            this.allocationform.infoid = this.form.id;
            this.organalForm.organname = [];
            for (let i = 0; i < response.rows.length; i++) {
              this.organalForm.organname.push(response.rows[i].organno);
            }
          } else {
            this.$modal.msgError(
              "获取器官分配信息失败:" + JSON.stringify(response)
            );
          }
        });
      } else if (this.actives == 6) {
      } else if (this.actives == 5) {
        listMedicalevaluation(searchParam).then(response => {
          if (response.code == 200 && response.rows.length == 1) {
            this.form = response.rows[0];
            this.form.infoid = data.id;
            this.open = true;
          if (response.code == 200) {
            this.witnessform = response.rows[0];
            this.witnessform.infoid = this.form.id;
          } else {
            this.$modal.msgError(
              "获取医学评估记录失败:" + JSON.stringify(response)
            );
          }
        });
      } else if (this.actives == 7) {
      } else if (this.actives == 6) {
        listMedicalevaluation(searchParam).then(response => {
          if (response.code == 200 && response.rows.length == 1) {
            this.form = response.rows[0];
            this.form.infoid = data.id;
          if (response.code == 200) {
            this.accomplishform = response.rows[0];
            this.accomplishform.infoid = this.form.id;
            this.open = true;
          } else {
            this.$modal.msgError(
@@ -2308,7 +2505,7 @@
          if (this.form.id != null) {
            updateDonatebaseinfo(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.$modal.msgSuccess("保存成功");
              this.Getbasicinformation();
              this.open = false;
            });
@@ -2326,54 +2523,53 @@
        }
      });
    },
    // 保存明细表
    // 保存二级表按钮
    Savethedetails() {
      if (this.actives == 2) {
      if (this.actives == 1) {
        this.medicineform.infoid = this.form.id;
        this.$refs["medicineform"].validate(valid => {
          if (valid) {
            if (this.medicineform.id != null) {
              updateMedicalevaluation(this.medicineform).then(response => {
                this.$modal.msgSuccess("修改成功");
              });
              updateMedicalevaluation(this.medicineform).then(response => {});
            } else {
              addMedicalevaluation(this.medicineform).then(response => {
                this.$modal.msgSuccess("新增成功");
                this.$modal.msgSuccess("医学评估信息新增成功");
              });
            }
            this.submitForm();
          }
        });
      } else if (this.actives == 2) {
        this.affirmform.infoid = this.form.id;
        this.$refs["affirmform"].validate(valid => {
          if (valid) {
            if (this.affirmform.id != null) {
              updateRelativesconfirmation(this.affirmform).then(response => {});
            } else {
              addRelativesconfirmation(this.affirmform).then(response => {
                this.$modal.msgSuccess("捐献确认信息新增成功");
              });
            }
            this.submitForm();
          }
        });
      } else if (this.actives == 3) {
        this.$refs["affirmform"].validate(valid => {
        this.ethicform.infoid = this.form.id;
        this.$refs["ethicform"].validate(valid => {
          if (valid) {
            if (this.affirmform.id != null) {
              updateMedicalevaluation(this.affirmform).then(response => {
                this.$modal.msgSuccess("修改成功");
              });
            if (this.ethicform.id != null) {
              updateDonateflowchart(this.ethicform).then(response => {});
            } else {
              addMedicalevaluation(this.affirmform).then(response => {
                this.$modal.msgSuccess("新增成功");
              addDonateflowchart(this.ethicform).then(response => {
                this.$modal.msgSuccess("伦理审查信息新增成功");
              });
            }
            this.submitForm();
          }
        });
      } else if (this.actives == 4) {
        this.$refs["ethicform"].validate(valid => {
          if (valid) {
            if (this.ethicform.id != null) {
              updateDonateflowchart(this.ethicform).then(response => {
                this.$modal.msgSuccess("修改成功");
              });
            } else {
              addDonateflowchart(this.ethicform).then(response => {
                this.$modal.msgSuccess("新增成功");
              });
            }
            this.submitForm();
          }
        });
      } else if (this.actives == 5) {
        this.allocationform.infoid = this.form.id;
        this.$refs["allocationform"].validate(valid => {
          if (valid) {
            if (this.allocationform.id != null) {
@@ -2388,7 +2584,8 @@
            this.submitForm();
          }
        });
      } else if (this.actives == 6) {
      } else if (this.actives == 5) {
        this.witnessform.infoid = this.form.id;
        this.$refs["witnessform"].validate(valid => {
          if (valid) {
            if (this.witnessform.id != null) {
@@ -2426,7 +2623,6 @@
                }
              });
              // 获取信息
            } else {
              addMedicalevaluation(this.witnessform).then(response => {
                this.$modal.msgSuccess("新增成功");
@@ -2435,7 +2631,8 @@
            this.submitForm();
          }
        });
      } else if (this.actives == 7) {
      } else if (this.actives == 6) {
        this.accomplishform.infoid = this.form.id;
        this.$refs["accomplishform"].validate(valid => {
          if (valid) {
            if (this.accomplishform.id != null) {
@@ -2455,19 +2652,295 @@
    // 切换tab
    on_click(e) {
      console.log(e);
      if (e != "" || e != null) {
        this.actives = e;
      // if (e != "" || e != null) {
      this.actives = e;
      // }
      this.GetAttacheddata();
    },
    changeorganState(value) {
      let organIndex = this.allocationform.findIndex(
        item => item.organno == value
      );
      if (organIndex == -1) {
        //获取器官名称
        let temporganname = "";
        for (let i = 0; i < this.dict.type.sys_Organ.length; i++) {
          if (value == this.dict.type.sys_Organ[i].value) {
            temporganname = this.dict.type.sys_Organ[i].label;
            break;
          }
        }
        if (temporganname != "") {
          this.allocationform.push({
            organname: temporganname,
            organno: value,
            id: null,
            transplanthospitalname: null,
            transplanthospitalno: null,
            organstate: "2"
          });
        }
      } else {
        this.$confirm("是否确认删除器官分配记录", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            if (organIndex != -1) {
              let tempOrgan = this.allocationform[organIndex];
              console.log(tempOrgan);
              if (tempOrgan.organstate != 1 && tempOrgan.id > 0) {
                this.$modal.msgWarning("只有未分配器官可进行删除!");
                this.organalForm.organname.push(value);
                return;
              }
              if (tempOrgan.id > 0) {
                //查找器官表记录,判断器官状态
                this.loading = true;
                delDonateorgan(tempOrgan.id).then(delLocationRes => {
                  this.loading = false;
                  this.$modal.msgSuccess("删除成功");
                });
              } else {
                this.allocationform.splice(deleteIndex, 1);
              }
            }
          })
          .catch(() => {});
      }
    },
    // 前进步骤
    makeastepforward() {},
    makeastepforward() {
      console.log(this.actives);
      if (this.actives <= 6) {
        this.actives++;
        this.GetAttacheddata();
      } else {
        console.log("已到达最大值");
      }
    },
    // 上报审核
    Reportforreview() {},
    // 终止案例
    Terminationcase() {},
    // 返回上一页
    cancel() {}
    cancel() {},
    // ------------------------票据
    // 获取请求头
    Getnetworkheader() {
      let string = window.location.href;
      if (string.includes("9091")) {
        const index = string.indexOf("9091");
        this.Networkheader = string.slice(0, index + 4); // 截取9091及其前部字符
      } else {
        const index = string.indexOf("8032");
        this.Networkheader = string.slice(0, index + 4); // 截取8032及其前部字符
      }
    },
    //文件上传
    handleUploadError() {},
    remove(file, fileList) {
      const rbDetails = [...this.rbDetails];
      if (this.activeName == 1) {
        this.fileListto.splice(this.fileListto.indexOf(file), 1);
        rbDetails[this.atpresent].annexfilesList = this.fileListto;
      } else {
        this.invoicefileListto.splice(this.invoicefileListto.indexOf(file), 1);
        rbDetails[this.atpresent].invoicefilesList = this.invoicefileListto;
      }
    },
    uploadSccess(response, file, fileList) {
      this.rbDetails;
      //获取票据信息位置
      if (this.activeName == 1) {
        if (response.code == 200) {
          // this.form.filename = file.raw.name;
          this.previewpdf = true;
          this.$modal.msgSuccess(response.msg);
          this.fileListto.push({
            name: file.name,
            url: response.fileName
          });
          this.pdfimgsrcList.push(
            this.Networkheader + "/prod-api" + response.fileName
          );
          console.log(this.pdfimgsrcList);
          this.pdftitle = "共" + this.pdfimgsrcList.length + "项";
          this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
          this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
        } else {
          console.log(response.msg);
        }
      } else {
        if (response.code == 200) {
          // this.form.filename = file.raw.name;
          this.previewpdf = true;
          this.$modal.msgSuccess(response.msg);
          this.invoicefileListto.push({
            name: file.name,
            url: response.fileName
          });
          this.invoicepdfimgsrcList.push(
            this.Networkheader + "/prod-api" + response.fileName
          );
          console.log(this.invoicepdfimgsrcList);
          this.pdftitle = "共" + this.invoicepdfimgsrcList.length + "项";
          this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
          this.rbDetails[
            this.atpresent
          ].invoicefilesList = this.invoicefileListto;
          console.log(this.rbDetails[this.atpresent]);
        } else {
          console.log(response.msg);
        }
      }
    },
    // 点击票据
    Filepopup(index, rows, row) {
      this.tableDatatop = [];
      this.pdfimgsrcList = [];
      this.invoDatatop = [];
      this.invoicepdfimgsrcList = [];
      this.invoDatatop.push(row);
      this.tableDatatop.push(row);
      this.atpresent = index;
      this.pdfVisible = true;
      console.log(this.rbDetails[index]);
      if (this.rbDetails[index].annexfilesList) {
        this.previewpdf = true;
        this.fileListto = this.rbDetails[index].annexfilesList;
        console.log(this.fileListto);
        this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
        this.fileListto.forEach(item => {
          this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
        });
      } else {
        this.fileListto = [];
        this.pdfimg = "";
        this.pdftitle = "";
      }
      // -发票文件
      if (this.rbDetails[index].invoicefilesList) {
        this.previewpdf = true;
        this.invoicefileListto = this.rbDetails[index].invoicefilesList;
        console.log(this.invoicefileListto);
        this.invoicepdfimg =
          this.Networkheader + "/prod-api" + this.invoicefileListto[0].url;
        this.invoicefileListto.forEach(item => {
          this.invoicepdfimgsrcList.push(
            this.Networkheader + "/prod-api" + item.url
          );
        });
        console.log(this.invoicepdfimgsrcList);
        console.log(this.invoicepdfimg);
      } else {
        this.invoicefileListto = [];
        this.invoicepdfimg = "";
        this.pdftitle = "";
      }
      if (this.activeName == 1) {
        this.pdftitle = "共" + this.pdfimgsrcList.length + "项";
      } else {
        this.pdftitle = "共" + this.invoicepdfimgsrcList.length + "项";
      }
    },
    // 点击已上传文件
    downFile(item) {
      if (this.activeName == 1) {
        console.log(item, "点击文件拿item");
        this.pdftitle =
          "共" + this.pdfimgsrcList.length + "项,当前选中" + item.name;
        let name = item.name.split(".");
        if (name[1] == "pdf") {
          this.$modal.msgWarning("当前文件暂不支持预览");
          this.previewpdf = false;
          this.hintitle = "当前文件暂不支持预览";
        } else if (name[1] == "jpg" || "png") {
          this.previewpdf = true;
          if (item.url) {
            this.pdfimg = this.Networkheader + "/prod-api" + item.url;
          } else {
            this.pdfimg = this.Networkheader + "/prod-api" + item.response.url;
          }
        } else {
          this.hintitle = "当前文件暂不支持预览";
          this.$modal.msgWarning("当前文件暂不支持预览");
          this.previewpdf = false;
        }
      } else {
        console.log(item, "点击文件拿item");
        this.pdftitle =
          "共" + this.invoicepdfimgsrcList.length + "项,当前选中" + item.name;
        let name = item.name.split(".");
        if (name[1] == "pdf") {
          this.$modal.msgWarning("当前文件暂不支持预览");
          this.previewpdf = false;
          this.hintitle = "当前文件暂不支持预览";
        } else if (name[1] == "jpg" || "png") {
          this.previewpdf = true;
          if (item.url) {
            this.invoicepdfimg = this.Networkheader + "/prod-api" + item.url;
            console.log(this.invoicepdfimg, "pdfimg");
            console.log(this.invoicepdfimgsrcList, "imglist");
          } else {
            this.invoicepdfimg =
              this.Networkheader + "/prod-api" + item.response.url;
          }
        } else {
          this.hintitle = "当前文件暂不支持预览";
          this.$modal.msgWarning("当前文件暂不支持预览");
          this.previewpdf = false;
        }
      }
    },
    getIndexInArray(arr, obj) {
      return arr.indexOf(obj);
    },
    // 发票切换
    handleClick(tab, event) {
      if (this.activeName == 1) {
        this.pdftitle = "共" + this.pdfimgsrcList.length + "项";
      } else {
        this.pdftitle = "共" + this.invoicepdfimgsrcList.length + "项";
      }
    },
    // 点击删除
    deletedowfile(row) {
      if (this.activeName == 1) {
        const indexlist = this.getIndexInArray(
          this.pdfimgsrcList,
          this.Networkheader + "/prod-api" + row.url
        );
        this.pdfimgsrcList.splice(indexlist, 1);
        const index = this.getIndexInArray(this.fileListto, row);
        this.fileListto.splice(index, 1);
      } else {
        const indexlist = this.getIndexInArray(
          this.invoicepdfimgsrcList,
          this.Networkheader + "/prod-api" + row.url
        );
        this.invoicepdfimgsrcList.splice(indexlist, 1);
        const index = this.getIndexInArray(this.invoicefileListto, row);
        this.invoicefileListto.splice(index, 1);
      }
    },
    // 点击上移
    moveupdowfile(row) {
      if (this.activeName == 1) {
        const index = this.getIndexInArray(this.fileListto, row);
        const item = this.fileListto.splice(index, 1)[0]; // 移除指定索引处的元素,并保存到item变量中
        this.fileListto.splice(index - 1, 0, item); // 将item插入到索引位置的前一位
      } else {
        const index = this.getIndexInArray(this.invoicefileListto, row);
        const item = this.invoicefileListto.splice(index, 1)[0]; // 移除指定索引处的元素,并保存到item变量中
        this.invoicefileListto.splice(index - 1, 0, item); // 将item插入到索引位置的前一位
      }
    }
  }
};
</script>
@@ -2504,11 +2977,58 @@
    }
  }
}
.upload-demo {
  text-align: center;
}
.pdfimg {
  display: flex; // text-align: center;
  width: 100%;
  height: 600px;
  .box-pdf {
    width: 400px;
    padding-top: 20px;
    margin-right: 30px;
    border: 1px solid #dcdfe6;
    -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
      0 0 6px 0 rgba(0, 0, 0, 0.04);
    box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1); // <- Add this to fix.
  }
  .pdftit {
    width: 200px;
    padding: 20px;
    font-size: 18px;
  }
  .pdftit:hover {
    background: #c0cef7;
  }
  .pdfimgmin {
    width: 60%;
    img {
      width: 100%;
    }
  }
  .pdfimgmins {
    font-size: 28px;
    width: 60%;
    text-align: center;
  }
}
.Ticket-button {
  margin-top: 10px;
  text-align: right;
  padding-right: 66px;
}
.boxdiv {
  font-size: 18px;
  padding: 0 30px;
  padding-bottom: 10px;
  margin-top: 20px;
  margin-top: 10px;
  .top-text {
    text-align: center;
src/views/project/fund/applyDetail/index.vue
@@ -87,7 +87,7 @@
              />
            </el-form-item>
          </el-col>
          <el-col :span="5">
          <el-col :span="5" v-if="ismanager == true">
            <el-form-item label="申请金额" prop="pretaxcost">
              <el-input
                v-model="form.pretaxcost"
@@ -498,6 +498,12 @@
              align="center"
              width="330"
              label="备注"
              v-if="
                businessType == 2 ||
                  businessType == 3 ||
                  businessType == 4 ||
                  ismanager == true
              "
            >
              <template slot-scope="scope">
                <el-input
@@ -2123,26 +2129,7 @@
                return;
              }
            }
            // //判断单位 unitSel
            // try {
            //   let unitIndex = this.unitList.findIndex(
            //     (item) => tempDetail.unitno == item.organizationid
            //   );
            //   if (unitIndex > -1) {
            //     tempDetail.unitname = this.unitList[unitIndex].organizationname;
            //   } else {
            //     tempDetail.unitname = tempDetail.unitno;
            //   }
            // } catch {
            //   tempDetail.unitname = tempDetail.unitno;
            // }
          }
          //附件处理
          // if (list.length > 0) {
          //   this.form.annexfiles = list.map(item => item.url).join(",");
          // }
          //处理明细
          for (let i = 0; i < this.rbDetails.length; i++) {
@@ -2267,20 +2254,22 @@
            console.log(this.form);
            console.log(response, "保存返参");
            if (response.code === 200) {
              if (this.userprofile.nickName != "陈慕华") {
              if (this.form.id) {
                this.$modal.msgSuccess("申请单修改成功!");
                this.$router.go(-1);
              } else {
                this.$modal.msgSuccess("申请单保存成功!");
                this.$store.dispatch("tagsView/delView", this.$route);
                this.$router.push({
                  path: "/finance/applyDetail/",
                  query: {
                    id: response.data,
                    businessType: "2",
                    operationType: "update",
                    curCase: this.curCase
                  }
                });
              }
              this.$store.dispatch("tagsView/delView", this.$route);
              this.$router.push({
                path: "/finance/applyDetail/",
                query: {
                  id: response.data,
                  businessType: "2",
                  operationType: "update",
                  curCase: this.curCase
                }
              });
              this.Routinglevel++;
            } else {
              this.$modal.msgError("申请单保存失败:" + response.msg);
            }
@@ -2303,31 +2292,15 @@
        this.$modal.msgError("请选确认材料状态已收到!");
        return;
      }
      let checkFundObj = {
        // fundid: this.checkObj.fundid,
        fundid: this.curId,
        flowconclusion: this.checkObj.flowlevelone,
        flowcontent: this.checkObj.flowconclusion
      };
      if (this.userprofile.nickName == "陈慕华") {
        this.Savenow();
        console.log("保存");
      }
      checkfund(checkFundObj).then(res => {
        //关闭窗口
        this.$modal.msgSuccess("审核完成!");
        console.log("保存并审批");
        this.$store.dispatch("tagsView/delView", this.$route);
        this.$router.go(-1);
      });
    },
    // 取消按钮
    cancel() {
      // this.reset();
      console.log(-this.Routinglevel);
      this.$store.dispatch("tagsView/delView", this.$route);
      this.$router.go(-this.Routinglevel);
      this.$router.go(-1);
    },
    //获取当前用户信息
@@ -2744,20 +2717,6 @@
                return;
              }
            }
            // //判断单位 unitSel
            // try {
            //   let unitIndex = this.unitList.findIndex(
            //     (item) => tempDetail.unitno == item.organizationid
            //   );
            //   if (unitIndex > -1) {
            //     tempDetail.unitname = this.unitList[unitIndex].organizationname;
            //   } else {
            //     tempDetail.unitname = tempDetail.unitno;
            //   }
            // } catch {
            //   tempDetail.unitname = tempDetail.unitno;
            // }
          }
          //处理明细
@@ -2789,44 +2748,6 @@
              ].subjecttypename;
            }
            this.rbDetails[i] = tempDetail;
            /*
            //计算个税
            //if (isNaN(parseFloat(tempDetail.taxedamount)))
            //获取参数
            this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
            this.taxParam.startTime = this.form.createTime.substring(0, 10);
            // 计算税后金额
            if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
              //获取参数
              this.taxParam.money = tempDetail.amount.toString();
              getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
                if (res.code == 200) {
                  tempDetail.taxamount = res.data;
                  tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount;
                  this.rbDetails[k] = tempDetail;
                  this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
                  this.totalAmount += parseFloat(tempDetail.amount);
                }
              });
            }
            // 计算税前、税费、税后金额
            if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
              //获取参数
              this.taxParam.money = tempDetail.taxedamount.toString();
              getTaxBeforeByAfterMoney(this.taxParam).then((res) => {
                if (res.code == 200) {
                  tempDetail.taxamount = res.data.nowTax;
                  tempDetail.amount = parseFloat(res.data.nowTaxBeforeMoney);
                  this.rbDetails[k] = tempDetail;
                  this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
                  this.totalAmount += parseFloat(tempDetail.amount);
                }
              });
            }
            */
          }
          //计算当前行报销内容费用合计,税前金额(amount)、扣税金额(taxamount)、税后金额(taxedamount)
          if (this.businessType == "2") {
@@ -2871,11 +2792,6 @@
            }
          }
          //费用合计
          // this.form.pretaxcost = parseFloat(this.totalPreTaxAmount).toFixed(2);
          // this.form.taxedcost = parseFloat(this.totalAfterTaxAmount).toFixed(2);
          // this.form.amountrequested = this.totalAmount.toFixed(2);
          //保存数据
          this.loading = true;
          this.form.serviceFunddetails = 0;
@@ -2885,36 +2801,28 @@
          this.form.serviceFunddetails = this.rbDetails;
          if (this.form.id != null) {
            // updateFund(this.form).then((response) => {
            //   if (response.code === 200) {
            //     this.loading = false;
            //     for (let m = 0; m < this.rbDetails.length; m++) {
            //       if (this.rbDetails[m].id > 0) {
            //         updateFunddetail(this.rbDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("专家劳务费保存失败1:" + response.msg); } });
            //       } else {
            //         addFunddetail(this.rbDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("专家劳务费保存失败2:" + response.msg); } });
            //       }
            //     }
            //     this.$modal.msgSuccess("专家劳务费保存成功!");
            //   } else {
            //     this.$modal.msgError("专家劳务费保存失败:" + response.msg);
            //   }
            // });
          } else {
            this.form.recordstatus = -1;
            // addorupdateFund(this.form).then((response) => {
            //   if (response.code === 200) {
            //     this.selectDonotor(this.curCase);
            //   } else {
            //     this.$modal.msgError("专家劳务费保存失败:" + response.msg);
            //   }
            // });
          }
          addorupdateFund(this.form).then(response => {
            if (response.code === 200) {
              this.$modal.msgSuccess("申请单保存成功!");
              // 非提醒状态下执行审批解决异步调用延迟问题
              if (!this.Savereminder) {
                let checkFundObj = {
                  // fundid: this.checkObj.fundid,
                  fundid: this.curId,
                  flowconclusion: this.checkObj.flowlevelone,
                  flowcontent: this.checkObj.flowconclusion
                };
                checkfund(checkFundObj).then(res => {
                  //关闭窗口
                  this.$modal.msgSuccess("审核完成!");
                  this.$store.dispatch("tagsView/delView", this.$route);
                  this.$router.go(-1);
                });
              }
              this.Getnetworkheader();
              this.getroute();
              this.getExternalList();
@@ -2953,7 +2861,16 @@
            JSON.stringify(this.rbDetails)
          );
          sessionStorage.setItem("apiform", JSON.stringify(this.form));
          this.$router.go(0);
          // this.$router.go(0);
          this.$router.push({
            path: "/finance/applyDetail/",
            query: {
              id: this.curId,
              businessType: this.businessType,
              operationType: this.operationType,
              curCase: this.curCase
            }
          });
        } else {
          // this.$message({
          //   type: "error",
@@ -3440,10 +3357,7 @@
      if (this.businessType == 4 || this.businessType == 3 || !showType) {
        this.selectionType = this.experthear;
      }
      // if (!showType) {
      //   this.selectionType = this.experthear;
      // }
      this.expertfrom = "1";
      console.log(spoce);
      this.funddetailForm.index = spoce.$index;
@@ -3625,7 +3539,11 @@
    // this.getFeeUnitList();
  },
  beforeRouteLeave(to, from, next) {
    // 执行销毁操作
    this.$destroy();
    next();
  },
  beforeCreate() {}, //生命周期 - 创建之前
  beforeMount() {}, //生命周期 - 挂载之前
  beforeUpdate() {}, //生命周期 - 更新之前
src/views/project/fund/expertFeeApply/index.vue
@@ -152,12 +152,12 @@
                  prop="username"
                  width="120px"
                />
                <el-table-column
                <!-- <el-table-column
                  label="申请金额"
                  align="center"
                  prop="pretaxcost"
                  width="200px"
                />
                /> -->
                <el-table-column
                  label="捐献人"
                  align="center"
src/views/project/fund/medicalCostApply/index.vue
@@ -1,66 +1,6 @@
<!--  -->
<template>
  <div class="app-container">
    <el-form
      :model="queryParams"
      ref="queryForm"
      :inline="true"
      label-width="70px"
    >
      <el-row align="left">
        <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-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>
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item label="捐献者" prop="name">
            <el-input
              v-model="queryParams.donorname"
              placeholder="请输入捐献者姓名"
              clearable
              size="small"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <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-col>
      </el-row>
    </el-form>
    <el-row>
      <el-col :span="6">
        <el-card shadow="never">
@@ -71,6 +11,54 @@
              </el-row>
            </el-col>
          </el-row>
          <div>
            <el-form
              :model="queryParams"
              ref="queryForm"
              :inline="true"
              label-width="70px"
            >
              <el-form-item label="姓名" prop="name">
                <el-input
                  v-model="queryParams.name"
                  placeholder="请输入姓名"
                  clearable
                  size="small"
                  @keyup.enter.native="handleQuery"
                />
              </el-form-item>
              <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>
              </el-form-item>
              <div style="float: right; margin-bottom: 10px;">
                <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
                >
              </div>
            </el-form>
          </div>
          <el-table
            v-loading="loading"
            border
src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -46,17 +46,7 @@
            />
          </el-form-item>
        </el-col>
        <el-col :span="5">
          <el-form-item label="捐献人" prop="APPLICANT" style="float: left">
            <el-input
              v-model="queryParams.donorname"
              placeholder="请输入捐献人"
              clearable
              size="small"
              @keyup.enter.native="flowconclusion"
            />
          </el-form-item>
        </el-col>
        <el-col :span="5">
          <el-form-item label="审批状态" prop="CHECKFLAG" style="float: left">
            <el-select
src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -2354,16 +2354,15 @@
        this.$modal.msgError("请选择审核结论后再提交审批结果!");
        return;
      }
   if (this.userprofile.nickName == "陈慕华") {
          this.Savenow();
          console.log("保存");
        }
      if (this.userprofile.nickName == "陈慕华") {
        this.Savenow();
        console.log("保存");
      }
      checkfund(checkfundobj).then(res => {
        this.$modal.msgSuccess("提交审核成功!");
        // 关闭窗口
          this.$store.dispatch("tagsView/delView", this.$route);
          this.$router.go(-1);
        this.$store.dispatch("tagsView/delView", this.$route);
        this.$router.go(-1);
      });
    },
src/views/project/travelexpensecheck/index.vue
@@ -53,7 +53,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="5">
          <el-form-item  label="审批状态" prop="CHECKFLAG" style="float: left">
          <el-form-item label="审批状态" prop="CHECKFLAG" style="float: left">
            <el-select
              v-model="queryParams.CHECKFLAG"
              placeholder="请选择"
@@ -73,7 +73,7 @@
      <el-row>
        <el-col :span="5">
          <el-form-item
          label-width="120px"
            label-width="120px"
            label="申请材料状态"
            prop="checkstatus"
            style="float: left"
@@ -91,6 +91,17 @@
              >
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item label="捐献者" prop="name">
            <el-input
              v-model="queryParams.donorname"
              placeholder="请输入捐献者姓名"
              clearable
              size="small"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="6">
@@ -238,7 +249,6 @@
        width="270"
      >
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
@@ -1568,8 +1578,15 @@
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.resetForm("queryForm");
      this.handleQuery();
      (this.queryParams = {
        pageNum: 1,
        pageSize: 10,
        APPLICANT: null,
        APPLICATIONBEGTIME: null,
        APPLICATIONENDTIME: null,
        CHECKFLAG: 1
      }),
        this.handleQuery();
    },
    // 多选框选中数据
    handleSelectionChange(selection) {