yxh
yxh
2023-08-25 de9308daec6fb3f32d3a73fe89b76e1ffc1ef8e7
yxh
已修改5个文件
209 ■■■■■ 文件已修改
src/views/project/fund/applyDetail/index.vue 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/expertFeeCheck/index.vue 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/medicalCostCheck/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/officeExpenseCheck/index.vue 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/applyDetail/index.vue
@@ -74,13 +74,12 @@
            <el-form-item label="申请金额" prop="pretaxcost">
              <el-input v-model="form.pretaxcost" placeholder="税前金额合计" :disabled="true" />
            </el-form-item>
          </el-col>
          </el-col> <!--
          <el-col :span="5">
            <el-form-item label="应缴税" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
              <el-input v-model="form.taxcost" placeholder="应缴税金额合计" :disabled="true" />
            </el-form-item>
          </el-col>
          <!--
          <el-col :span="5">
            <el-form-item label="税后金额" prop="pretaxcost">
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" :disabled="true" />
@@ -93,7 +92,7 @@
          </el-col>
          <el-col :span="5">
            <el-form-item label="捐献者" prop="name">
              <el-input :disabled="true" v-model="form.name" placeholder="请输入捐献者姓名" />
              <el-input :disabled="true" v-model="form.donorname" placeholder="请输入捐献者姓名" />
            </el-form-item>
          </el-col>
          <!-- 
@@ -167,8 +166,8 @@
                  " />
              </template>
            </el-table-column>
            <el-table-column v-if="businessType == 3 || businessType == 4 || ismanager == true" prop="amount"
              align="center" :label=amountLabel width="120">
            <el-table-column v-if="businessType == 2 || businessType == 3 || businessType == 4 || ismanager == true"
              prop="amount" align="center" :label=amountLabel width="120">
              <template slot-scope="scope">
                <!--
                  <el-select v-model="scope.row.amount" placeholder="税前金额" clearable filterable allow-create
@@ -667,7 +666,7 @@
      selectionType: "",
      showSelectionDialog: false,
      //税前金额标题:专家费-税前金额;医学成本、办公费用-金额
      amountLabel:"税前金额",
      amountLabel: "税前金额",
      // 表单校验
      rules: {
@@ -857,33 +856,32 @@
      // if (!this.businessType && !this.operationType) {
      if (this.businessType == "1") {
        this.curCase = this.$route.query.curCase;
        this.businessName = "专家劳务费申请单"
        this.amountLabel="税前金额"
        this.amountLabel = "税前金额"
        this.getUnitList();
      }
      else if (this.businessType == "2") {
        this.curCase = this.$route.query.curCase;
        this.businessName = "伦理专家劳务费申请单";
        this.amountLabel="税前金额"
        this.amountLabel = "税前金额"
        this.getUnitList();
      }
      else if (this.businessType == "3") {
        if (this.operationType != "check") {
          this.curCase = this.$route.query.curCase;
        }
        this.businessName = "医学成本报销单";
        this.amountLabel="金额"
        this.amountLabel = "金额"
      }
      else if (this.businessType == "4") {
        this.businessName = "办公费用报销单";
        this.amountLabel="金额"
        this.amountLabel = "金额"
        // this.getBaseInfoList();
      }
      if (this.operationType == "add") {
        this.title = this.businessName + "新建";
        if (this.operationType != "4") {
          this.curCase = this.$route.query.curCase;
          console.log("this.curCase",this.curCase);
        }
        this.handleAdd();
      }
      else if (this.operationType == "update") {
@@ -981,6 +979,7 @@
      getFund(this.curId).then(response => {
        this.form = response.data;
        console.log("response.data",response.data);
        //附件处理
        // this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
@@ -1032,13 +1031,18 @@
          for (let m = 0; m < this.rbDetails.length; m++) {
            this.rbDetails[m].itemlist = [];
            this.getFeeItems(m, this.rbDetails[m]);
            this.rbDetails[m].rowfeeblocks = [];
            this.rbDetails[m].rowfeeblocks.push({
              expense: this.rbDetails[m].expense,
              servicesscope: this.rbDetails[m].servicesscope,
              expensedescribe: this.rbDetails[m].servicesscopename,
              remark: this.rbDetails[m].servicesscope,
              servicesscope: this.rbDetails[m].servicesscope
              expense: this.rbDetails[m].expense,
              remark: this.rbDetails[m].servicesscopename
            });
          }
          if (this.rbDetails.length == 0) {
            this.addRow(0);
          }
        });
@@ -1324,16 +1328,12 @@
      getUserProfile().then(res => {
        this.userprofile = res.data;
        this.standardlevel = res.data.standardlevel;
        if (
          this.userprofile.createBy == "admin" ||
          this.userprofile.createBy == "001" ||
          this.userprofile.createBy == "012" ||
          this.userprofile.createBy == "002"
        ) {
        if (this.userprofile.userName == "admin" || this.userprofile.userName == "001" || this.userprofile.userName == "012" || this.userprofile.userName == "002") {
          this.ismanager = true;
        } else {
          this.ismanager = false;
        }
        console.log(this.userprofile,this.ismanager);
        this.form.username = this.userprofile.nickName;
        this.form.userno = this.userprofile.userName;
        this.form.deptmentname = this.userprofile.dept.deptName;
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -32,50 +32,45 @@
    </el-form>
    <el-form ref="infoform" label-width="100px">
      <el-row>
        <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
        <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
         <!--
          <el-table-column label="审批状态" width="120" align="center" prop="checkFlag">
            <template slot-scope="scope">
              <span v-if="scope.row.checkFlag == 0"><i class="el-icon-check"
                  style="color: #5fb878; font-weight: bold"></i></span>
              <!-- <span v-else>待审核</span> -->
              <span v-else>待审核</span>
            </template>
          </el-table-column>
          -->
          <el-table-column label="申请日期" width="120" align="center" prop="createTime">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
            </template>
          </el-table-column>
          <el-table-column label="申请人" align="center" prop="username" width="120px" />
          <el-table-column label="捐献编号" align="center" prop="donorno" width="240px" />
          <el-table-column label="捐献者" align="center" prop="donorname" width="120px" />
          <!-- <el-table-column
            label="工作单位"
            align="center"
            prop="unitname"
            width="230px"
          /> -->
          <!-- <el-table-column
            label="联系电话"
            align="center"
            prop="phone"
            width="160"
          /> -->
          <el-table-column label="经办人" align="center" prop="username" width="150px" />
          <el-table-column label="申请金额" align="center" prop="pretaxcost" width="200px" />
          <el-table-column label="所属组别" align="center" prop="deptmentname" width="200px" />
          <el-table-column label="组长" align="center" prop="managername" width="150px" />
          <!-- <el-table-column label="工作单位" align="center"  prop="unitname" width="230px" /> -->
          <!-- <el-table-column label="联系电话" align="center"  prop="phone"  width="160"  /> -->
          <!-- <el-table-column label="税后金额" align="center" prop="taxedcost" width="120px" />
          <el-table-column label="申请金额" align="center" prop="amountrequested" width="120px" />
          <el-table-column label="记录状态" align="center" prop="recordstatus" width="180">
          <el-table-column label="预支费用" align="center" prop="prepaidamount" width="120px" /> -->
          <el-table-column label="审核状态" align="center" prop="recordstatus" width="200">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
            </template>
          </el-table-column>
          <el-table-column label="预支费用" align="center" prop="prepaidamount" width="120px" />
          <el-table-column label="财务审核" align="center" prop="financechecher" width="140" />
          <el-table-column label="捐献者" align="center" prop="donorname" width="120px" />
          <el-table-column label="备注" align="center" prop="remark" />
          <!--<el-table-column label="捐献编号" align="center" prop="donorno" />
          <el-table-column label="财务审核" align="center" prop="financechecher" width="140" />-->
          <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="260px">
            <template slot-scope="scope">
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
                @click="handleShow(scope.row)">详情</el-button>
              <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
                @click="handleUpdate(scope.row)">审核</el-button>
                @click="handleCheck(scope.row)">审核</el-button>
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
                @click="handleDetail(scope.row)">详情</el-button>
              <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
              <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)"
                v-hasPermi="['project:donateconsolationfund:download']">下载</el-button>
@@ -867,7 +862,17 @@
      }
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
    handleCheck(row) {
      this.$router.push({
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          businessType: "2",
          operationType: "check"
        }
      });
      return;
      this.isopen = 0;
      this.reset();
      this.queryParams.params = {};
@@ -1287,7 +1292,17 @@
    },
    //查看审核详情
    handleShow(row) {
    handleDetail(row) {
      this.$router.push({
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          businessType: "2",
          operationType: "detail"
        }
      });
      return;
      this.isopen = 0;
      this.reset();
      this.queryParams.params = {};
src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -68,7 +68,7 @@
          <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="160px">
            <template slot-scope="scope">
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
                @click="handleShow(scope.row)">详情</el-button>
                @click="handleDetail(scope.row)">详情</el-button>
              <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
                @click="handleCheck(scope.row)">审核</el-button>
              <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
@@ -908,15 +908,15 @@
    },
    /** 修改按钮操作 */
    handleCheck(row) {      
      // this.$router.push({
      //   path: "/finance/applyDetail/",
      //   query: {
      //     id: row.id,
      //     businessType: "1",
      //     operationType: "check"
      //   }
      // });
      // return;
      this.$router.push({
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          businessType: "1",
          operationType: "check"
        }
      });
      return;
      this.isopen = 0;
      this.reset();
@@ -958,7 +958,17 @@
    },
    //查看审核详情
    handleShow(row) {
    handleDetail(row) {
      this.$router.push({
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          businessType: "1",
          operationType: "detail"
        }
      });
      return;
      this.isopen = 0;
      this.reset();
      this.queryParams.params = {};
src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -47,7 +47,7 @@
            </template>
          </el-table-column>
          <el-table-column label="经办人" align="center" prop="username" width="150px" />
          <el-table-column label="申请金额" align="center" prop="amountrequested" width="200px" />
          <el-table-column label="申请金额" align="center" prop="pretaxcost" width="200px" />
          <el-table-column label="所属组别" align="center" prop="deptmentname" width="200px" />
          <el-table-column label="组长" align="center" prop="managername" width="150px" />
          <!--<el-table-column label="捐献编号" align="center" prop="donorno" />-->
@@ -74,7 +74,7 @@
              <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
                @click="handleCheck(scope.row)">审核</el-button>
              <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">查看</el-button>
              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">详情</el-button>
              <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)">下载</el-button>
              <!-- v-hasPermi="['project:donateconsolationfund:download']" -->
src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -32,26 +32,28 @@
    <el-form ref="infoform" label-width="100px">
      <el-row>
        <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
         <!--
          <el-table-column label="审批状态" width="120" align="center" prop="checkFlag">
            <template slot-scope="scope">
              <span v-if="scope.row.checkFlag == 0"><i class="el-icon-check"
                  style="color: #5fb878; font-weight: bold"></i></span>
              <!-- <span v-else>待审核</span> -->
              <span v-else>待审核</span>
            </template>
          </el-table-column>
          <el-table-column label="申请日期" width="120" align="center" prop="createTime">
           -->
           <el-table-column label="申请日期" width="180" align="center" prop="createTime">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
            </template>
          </el-table-column>
          <el-table-column label="申请人" align="center" prop="username" width="120px" />
          <el-table-column label="所属组别" align="center" prop="deptmentname" width="140px" />
          <el-table-column label="组长" align="center" prop="managername" width="120px" />
          <el-table-column label="捐献者" align="center" prop="donorname" width="120px" />
          <el-table-column label="经办人" align="center" prop="username" width="150px" />
          <el-table-column label="申请金额" align="center" prop="pretaxcost" width="200px" />
          <el-table-column label="所属组别" align="center" prop="deptmentname" width="200px" />
          <el-table-column label="组长" align="center" prop="managername" width="150px" />
          <!--<el-table-column label="捐献编号" align="center" prop="donorno" />-->
          <el-table-column label="申请金额" align="center" prop="amountrequested" width="120px" />
          <!--
          <el-table-column label="预支费用" align="center" prop="prepaidamount" width="120px" />
          <!--<el-table-column label="工作单位" align="center" prop="unitname" width="230px" />
          <el-table-column label="工作单位" align="center" prop="unitname" width="230px" />
          <el-table-column label="联系电话" align="center" prop="phone" width="160" />
          <el-table-column label="当前审核级别" width="180" align="center" prop="flowlevel">
            <template slot-scope="scope">
@@ -60,17 +62,19 @@
          </el-table-column>
          <el-table-column label="财务审核" align="center" prop="financechecher" width="140" />
          -->
          <el-table-column label="记录状态" align="center" prop="recordstatus" width="180">
          <el-table-column label="捐献者" align="center" prop="donorname" width="150px" />
          <el-table-column label="审核状态" align="center" prop="recordstatus" width="200">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
            </template>
          </el-table-column>
          <el-table-column label="备注" align="center" prop="remark" />
          <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="260px">
            <template slot-scope="scope">
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
                @click="handleShow(scope.row)">详情</el-button>
                @click="handleDetail(scope.row)">详情</el-button>
              <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
                @click="handleUpdate(scope.row)">审核</el-button>
                @click="handleCheck(scope.row)">审核</el-button>
              <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
              <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)"
                v-hasPermi="['project:donateconsolationfund:download']">下载</el-button>
@@ -131,7 +135,7 @@
              <el-radio-group v-model="form.applytype" @change="LoadItemTypeArr">
                <!--<el-radio v-for="dict in dict.type.sys_financeitemtype" :key="dict.value" :label="dict.value"
                  :disabled="form.id != null">{{ dict.label }}</el-radio>-->
                <el-radio v-model="form.applytype" label="3">医学成本费用申请</el-radio>
                <el-radio v-model="form.applytype" label="4">办公费用申请</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -859,7 +863,7 @@
        annexbankcard: null,
        annexregistform: null,
        consolationmoney: null,
        applytype: "3",
        applytype: "4",
      };
      this.resetForm("form");
@@ -908,8 +912,18 @@
        });
      }
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
    /** 审核按钮操作 */
    handleCheck(row) {
      this.$router.push({
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          businessType: "4",
          operationType: "check"
        }
      });
      return;
      this.isopen = 0;
      this.reset();
      this.queryParams.params = {};
@@ -940,7 +954,17 @@
    },
    //查看审核详情
    handleShow(row) {
    handleDetail(row) {
      this.$router.push({
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          businessType: "4",
          operationType: "detail"
        }
      });
      return;
      this.isopen = 0;
      this.reset();
      this.queryParams.params = {};