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

yxh

4 小时以前 c75027743ea7c3ecc2d0885f01d11d2ad78679a3

 src/views/project/fund/ethicalExpertFeeApply/index.vue

@@ -1,122 +1,67 @@
<!--  -->
<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">
          <!-- 捐献案例列表 -->
          <el-row>
            <el-col :span="10">
              <el-row type="flex" :gutter="10" align="right" class="mb8">
              </el-row>
            </el-col>
          </el-row>
          <el-table
            v-loading="loading"
            border
            highlight-current-row
            :data="donatebaseinfoList"
            @row-click="selectDonotor"
          >
            <!-- <el-table-column label="捐献编号" align="center" prop="donorno" /> -->
            <el-table-column label="捐献进度" align="center" prop="recordstate">
              <template slot-scope="scope">
                <dict-tag
                  :options="dict.type.sys_DonationStatus"
                  :value="scope.row.recordstate"
                />
              </template>
            </el-table-column>
            <el-table-column label="姓名" align="center" prop="name" />
          </el-table>
          <pagination
            v-show="total > 0"
            :total="total"
            small
            :page.sync="queryParams.pageNum"
            :limit.sync="queryParams.pageSize"
            @pagination="getBaseInfoList"
          />
        </el-card>
      </el-col>
      <el-col :span="18">
      <el-col :span="24">
        <el-card shadow="naver">
          <el-form ref="infoform" label-width="100px">
            <el-row :gutter="4" align="right" class="mb8">
              <el-col :span="9">
                <el-form-item label="捐献编号">
                  <el-input
                    v-model="curCase.donorno"
                    :disabled="true"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="9">
                <el-form-item label="姓名">
                  <el-input v-model="curCase.name" :disabled="true"></el-input>
                </el-form-item>
              </el-col>
            </el-row>
            <!-- 报销单筛选：捐献者、审批状态 -->
            <el-form
              class="opo-query-form"
              :model="fundQueryParam"
              ref="fundQueryForm"
              :inline="true"
              label-width="82px"
            >
              <el-row>
                <el-col :span="6">
                  <el-form-item label="捐献者" prop="donorname">
                    <el-input
                      v-model="fundQueryParam.donorname"
                      placeholder="请输入捐献者姓名"
                      clearable
                      size="small"
                      @keyup.enter.native="handleQueryFund"
                    />
                  </el-form-item>
                </el-col>
                <el-col :span="6">
                  <el-form-item label="审批状态" prop="recordstatus">
                    <el-select
                      v-model="fundQueryParam.recordstatus"
                      placeholder="请选择审批状态"
                      clearable
                      size="small"
                      style="width: 100%"
                    >
                      <el-option
                        v-for="dict in dict.type.sys_recordstatus"
                        :key="dict.value"
                        :label="dict.label"
                        :value="Number(dict.value)"
                      />
                    </el-select>
                  </el-form-item>
                </el-col>
                <el-col :span="6">
                  <el-form-item label-width="10px">
                    <el-button
                      type="primary"
                      icon="el-icon-search"
                      size="small"
                      @click="handleQueryFund"
                      >搜索</el-button
                    >
                    <el-button
                      icon="el-icon-refresh"
                      size="small"
                      @click="resetFundQuery"
                      >重置</el-button
                    >
                  </el-form-item>
                </el-col>
              </el-row>
            </el-form>
            <el-row :gutter="10" class="mb8">
              <el-col :span="1.5">
                <el-button
@@ -198,6 +143,13 @@
                    />
                  </template>
                </el-table-column>
                <el-table-column
                  label="捐献者"
                  align="center"
                  prop="donorname"
                  width="110px"
                  show-overflow-tooltip
                />
                <!--
                <el-table-column label="联系电话" align="center" prop="phone" width="150px" />
                <el-table-column label="工作单位" align="center" prop="unitname" width="220px" />
@@ -261,11 +213,119 @@
                  </template>
                </el-table-column>
              </el-table>
              <!-- 未选择案例时展示该登录人全部伦理审查单据，超过一页可用分页翻看 -->
              <pagination
                v-show="fundTotal > 0"
                :total="fundTotal"
                small
                :page.sync="fundQueryParam.pageNum"
                :limit.sync="fundQueryParam.pageSize"
                @pagination="listFundData"
              />
            </el-row>
          </el-form>
        </el-card>
      </el-col>
    </el-row>

    <!-- 新增申请单前先选择捐献案例（原左侧案例列表移到这里） -->
    <el-dialog
      title="选择捐献案例"
      :visible.sync="caseDialogVisible"
      width="760px"
      append-to-body
    >
      <el-form
        class="opo-query-form"
        :model="queryParams"
        ref="queryForm"
        :inline="true"
        label-width="70px"
      >
        <el-row>
          <el-col :span="8">
            <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="8">
            <el-form-item label="捐献进度" prop="recordstate">
              <el-select
                v-model="queryParams.recordstate"
                placeholder="请选择记录状态"
                clearable
                size="small"
                style="width: 100%"
              >
                <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="8">
            <el-form-item label-width="10px">
              <el-button
                type="primary"
                icon="el-icon-search"
                size="small"
                @click="handleQuery"
                >搜索</el-button
              >
              <el-button icon="el-icon-refresh" size="small" @click="resetQuery"
                >重置</el-button
              >
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <el-table
        ref="caseTable"
        v-loading="loading"
        border
        height="380"
        highlight-current-row
        :data="donatebaseinfoList"
        @row-click="selectDonotor"
      >
        <el-table-column label="捐献进度" align="center" prop="recordstate">
          <template slot-scope="scope">
            <dict-tag
              :options="dict.type.sys_DonationStatus"
              :value="scope.row.recordstate"
            />
          </template>
        </el-table-column>
        <el-table-column label="姓名" align="center" prop="name" />
        <el-table-column label="操作" align="center" width="90">
          <template slot-scope="scope">
            <el-button type="text" size="mini" @click="selectDonotor(scope.row)"
              >选择</el-button
            >
          </template>
        </el-table-column>
      </el-table>
      <pagination
        v-show="total > 0"
        :total="total"
        small
        :page.sync="queryParams.pageNum"
        :limit.sync="queryParams.pageSize"
        @pagination="getBaseInfoList"
      />
      <div slot="footer" class="dialog-footer">
        <el-button @click="caseDialogVisible = false">取 消</el-button>
      </div>
    </el-dialog>

    <!-- 添加或修改费用申请单 -->
    <el-dialog
@@ -1012,11 +1072,19 @@
      },
      fundQueryParam: {
        pageNum: 1,
        pageSize: 100,
        pageSize: 10,
        infoid: null,
        applytype: "2",
        createBy: null
        createBy: null,
        // 报销单筛选条件
        donorname: null,
        recordstatus: null
      },
      // 右侧报销单总数（用于分页）
      fundTotal: 0,
      // 「选择捐献案例」对话框（新增申请单时使用）
      caseDialogVisible: false,
      casePickerMode: "",
      // 表单参数
      form: {},
      // 表单校验
@@ -1103,55 +1171,23 @@
    },
    /** 新增按钮操作 */
    handleAdd() {
      if (this.curCase.id) {
        this.$router.push({
          path: "/finance/applyDetail/",
          query: {
            id: 0,
            businessType: "2",
            operationType: "add",
            curCase: this.curCase
          }
        });
      } else {
        const h = this.$createElement;
        this.$message({
          message: h("p", null, [
            h("span", null, "请在左边的捐献案例表选择需要操作的案例！")
          ])
        });
      }
      return;
      // 新增申请单：先弹出「选择捐献案例」对话框
      this.casePickerMode = "add";
      this.caseDialogVisible = true;
      this.getBaseInfoList();
    },

      if (this.curCase.id) {
        this.istrue += 2;
        this.reset();
        this.dialogOpen = true;
        this.title = "添加费用申请";
        this.dialogType = "edit";
        this.queryParams.params = {};

        this.form.infoid = this.curCase.id;
        this.form.donorno = this.curCase.donorno;
        this.form.donorname = this.curCase.name;
        this.form.username = this.defaultperson.nickName;
        this.form.userno = this.defaultperson.userName;

        this.form.deptmentname = this.defaultperson.dept.deptName;
        this.form.deptmentno = this.defaultperson.dept.deptId;
        this.form.managername = this.defaultperson.dept.leader;
        // this.form.createTime = nowdate;
        //this.open = true;
        //this.initFundApplyForm();
        this.fundDetailArr = [];
        this.fundflowList = [];
        this.addRow();
      } else {
        const h = this.$createElement;
        this.$message({
          message: h("p", null, [h("span", null, "请先选择左方捐献案例 ")])
        });
      }
    /** 携带已选案例跳转到申请单填写页 */
    goApplyAdd() {
      this.$router.push({
        path: "/finance/applyDetail/",
        query: {
          id: 0,
          businessType: "2",
          operationType: "add",
          curCase: this.curCase
        }
      });
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
@@ -1495,18 +1531,60 @@
    //点击捐献案例列表触发方法
    selectDonotor(row, column, event) {
      this.curCase = row;
      this.getfundList();
      if (this.casePickerMode === "add") {
        // 从「新增申请单」进入：选完案例直接跳到申请单填写页
        this.casePickerMode = "";
        this.caseDialogVisible = false;
        this.goApplyAdd();
      }
    },

    /** 按当前 fundQueryParam 查询右侧报销单列表 */
    listFundData() {
      this.loading = true;
      listFund(this.fundQueryParam).then(response => {
        this.loading = false;
        this.donateconsolationfundList = response.rows;
        this.fundTotal = response.total;
      });
    },

    /** 报销单筛选：搜索 */
    handleQueryFund() {
      this.fundQueryParam.pageNum = 1;
      this.listFundData();
    },

    /** 报销单筛选：重置（清空条件与已选案例，回到该登录人全部单据） */
    resetFundQuery() {
      this.fundQueryParam.donorname = null;
      this.fundQueryParam.recordstatus = null;
      this.getAllfundList();
    },

    /** 检索全部：取消案例选择与筛选条件，查询当前登录人的全部伦理审查单据 */
    getAllfundList() {
      this.curCase = {};
      if (this.$refs.caseTable) {
        this.$refs.caseTable.setCurrentRow();
      }
      this.reset();
      this.fundQueryParam.infoid = null;
      this.fundQueryParam.donorname = null;
      this.fundQueryParam.recordstatus = null;
      this.fundQueryParam.pageNum = 1;
      this.listFundData();
    },

    //获取案例专家费用申请单
    getfundList() {
      this.loading = true;
      this.reset();
      // 选中案例后按案例展示，同时清掉列表筛选条件，避免两个条件叠加导致空列表
      this.fundQueryParam.donorname = null;
      this.fundQueryParam.recordstatus = null;
      this.fundQueryParam.infoid = this.curCase.id;
      listFund(this.fundQueryParam).then(response => {
        this.loading = false;
        this.donateconsolationfundList = response.rows;
      });
      this.fundQueryParam.pageNum = 1;
      this.listFundData();
    },

    select(row) {
@@ -2057,10 +2135,11 @@
  //生命周期 - 创建完成（可以访问当前this实例）
  created() {
    this.getUnitList();
    this.getList();
    this.getBaseInfoList();
    // 案例列表已移入「选择捐献案例」对话框，打开对话框时再查询
    this.getlistUser();
    this.getCurFundType();
    // 首屏展示当前登录人的全部伦理审查单据
    this.getAllfundList();
  },
  //生命周期 - 挂载完成（可以访问DOM元素）
  mounted() {