yxh

yxh

2023-07-31 681bd876235ddb2a73fc218c64d0cf174b38d666

yxh

 src/utils/request.js

@@ -98,7 +98,7 @@
    Message({
      message: message,
      type: 'error',
      duration: 5 * 1000
      duration: 30* 1000
    })
    return Promise.reject(error)
  }

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

@@ -402,7 +402,7 @@
            </el-form-item>
          </el-col>
        </el-row>
                  -->
                 
        <el-row>
          <el-col :span="12">
            <el-form-item label="费用申请附件" align="left" prop="annexbankcard">
@@ -415,7 +415,7 @@
              </el-upload>
            </el-form-item>
          </el-col>
        </el-row>
        </el-row> -->
        <el-row v-if="dialogType == 'detail'">
          <el-table :data="fundflowList" border>
            <el-table-column label="审核人" align="center" width="120" prop="checkusername" />
@@ -802,11 +802,17 @@
  methods: {
    //生命周期 - 创建完成（可以访问当前this实例）
    created() {
      console.log("getUnitList", 1);
      this.getUnitList();
      this.getList();
      console.log("getBaseInfoList", 2);
      this.getBaseInfoList();
      console.log("getlistUser", 3);
      this.getlistUser();
      console.log("getCurFundType", 4);
      this.getCurFundType();
      console.log("getList", 5);
      this.getList();
      console.log("last", 6);
    },
    //生命周期 - 挂载完成（可以访问DOM元素）
    mounted() {

 src/views/project/travelexpenseslist/Modifydetails/index.vue

@@ -439,7 +439,7 @@
          </el-table>
        </el-row>

        <el-row v-if="dialogType == 'detail'">
        <el-row v-if="dialogType == 'detail' || dialogType == 'check'">
          <el-table :data="fundflowList" border>
            <el-table-column label="审核人" align="center" width="120" prop="checkusername" />
            <el-table-column label="审核日期" align="center" width="160" prop="createTime" />
@@ -450,9 +450,27 @@
            <el-table-column label="审核备注" align="center" prop="flowcontent" />
          </el-table>
        </el-row>
        <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="dialogType == 'check'">
          <el-col :span="7">
            <el-form-item label="审核结果" align="left">
              <el-radio-group v-model="checkObj.flowlevelone" align="left">
                <el-radio label="1">通过</el-radio>
                <el-radio label="2">不通过</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row v-if="dialogType == 'check'">
          <el-col :span="17">
            <el-form-item label="审核备注" align="left">
              <el-input v-model="checkObj.flowconclusion" placeholder="备注" />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm" v-if="dialogType == 'edit'">保 存</el-button>
        <el-button type="primary" @click="checksubmit" v-if="dialogType == 'check'">提 交</el-button>
        <!--<el-button @click="cancel">退 出</el-button>-->
      </div>
    </div>
@@ -511,6 +529,7 @@
  updateReimbursement,
  exportReimbursement,
  getdownload,
  checkfund,
  fundSubmit
} from "@/api/project/reimbursement";
import {
@@ -666,7 +685,18 @@

      headers: {
        Authorization: "Bearer " + getToken()
      }
      },

      //审批信息
      checkObj: {
        flowlevelone: null,
        flowconclusion: null,
        fundid: null,
      },

      //保存按钮控制
      idisabled: false,

    };
  },

@@ -719,6 +749,9 @@
    }
    else if (pos == 3) {
      this.handleDetail(ids);
    }
    else if (pos == 4) {
      this.handleCheck(ids);
    }
  },

@@ -901,11 +934,12 @@

      //计算补助
      this.getallowance(row);

    },

    //计算补助
    getallowance(row) {
      console.log("ro", row);
      if (row.persontype == "专职人员" || row.persontype == "协调员" || row.persontype == "管理人员") {
      //公杂费补助：杭州桐庐，建德，淳安60，杭州其他地区0，非杭州地区80
      if (row.destination != "") {
        var tempStr = row.destination;
@@ -929,6 +963,7 @@

      //计算合计
      this.sumRowFee(row);
      }
    },

    getStandard(row) {
@@ -1210,11 +1245,12 @@
        //获取报销明细信息
        getReimbursementdetaillist(ids).then(res => {
          this.rbDetails = res.data;
          console.log(this.rbDetails);
          if (this.rbDetails.length == 0) {
            this.addDetailRow(0);
          }

          //实时合计金额
          //this.sumTotalFee();
          for (let i = 0; i < this.rbDetails.length; i++) {
            this.sumRowFee(this.rbDetails[i]);
            //解析出差地址
@@ -1226,9 +1262,6 @@
                qu: this.rbDetails[i].traveltownname,
              }; */
          }

          //实时合计金额
          //this.sumTotalFee();
        });

        //获取报销打款信息
@@ -1250,6 +1283,67 @@
      this.reset();
      this.open = true;
      const id = ids || this.ids;

      getReimbursement(id).then(response => {
        this.form = response.data;
        //票据
        this.fileListto = this.form.annexfiles
          ? this.form.annexfiles
            .split(",")
            .map(item => ({ url: item, name: item }))
          : [];

        //审核状态
        this.form.recordstatus = response.data.recordstatus + "";
        let ids = response.data.id;
        let listFundflowparams = {
          fundid: ids,
          fundtype: 1
        };
        listFundflow(listFundflowparams).then(res => {
          this.fundflowList = res.rows;
        });

        //报销明细
        getReimbursementdetaillist(ids).then(res => {
          this.rbDetails = res.data;
          /*
          for (let i = 0; i < this.rbDetails.length; i++) {
            this.rbDetails[i].index = i;
            this.rbDetails[i].searchAddress = {
              sheng: this.rbDetails[i].travelprovincename,
              shi: this.rbDetails[i].travelcityname,
              qu: this.rbDetails[i].traveltownname,
            };
          }
          */
          //合计费用
          // if (this.rbDetails.length > 0) this.sumTotalFee();
          for (let i = 0; i < this.rbDetails.length; i++) {
            this.sumRowFee(this.rbDetails[i]);
          }
        });

        //付款信息
        this.queryParamsPayee.rbid = ids;
        listReimbursementpayee(this.queryParamsPayee).then(res => {
          this.rbPayees = res.rows;
          if (this.rbPayees.length == 0) {
            this.addPayeeRow(0);
          }
        });
      });
    },

    /** 审核按钮操作 */
    handleCheck(ids) {
      this.dialogType = "check";
      this.title = "报销申请详情";

      this.reset();
      this.open = true;
      const id = ids || this.ids;
      this.checkObj.fundid = id;

      getReimbursement(id).then(response => {
        this.form = response.data;
@@ -1285,9 +1379,13 @@
            };
          }
          */
        });

        if (this.rbDetails.length > 0) this.sumTotalFee();
          //合计费用
          // if (this.rbDetails.length > 0) this.sumTotalFee();
          for (let i = 0; i < this.rbDetails.length; i++) {
            this.sumRowFee(this.rbDetails[i]);
          }
        });

        //付款信息
        this.queryParamsPayee.rbid = ids;
@@ -1300,10 +1398,36 @@
      });
    },

    //提交审核意见
    checksubmit() {
      let checkfundobj = {
        flowconclusion: this.checkObj.flowlevelone,
        flowcontent: this.checkObj.flowconclusion,
        fundid: this.checkObj.fundid,
      };

      if (
        checkfundobj.flowconclusion == null ||
        checkfundobj.flowconclusion == undefined ||
        checkfundobj.flowconclusion == ""
      ) {
        this.$modal.msgError("请选择审核结论后再提交审批结果!");
        return;
      }

      checkfund(checkfundobj).then((res) => {
        this.reset();
        this.open = false;
        this.getList();
        this.$modal.msgSuccess("提交审核成功!");
      });
    },

    /** 提交保存按钮 */
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          // idisabled=true;
          /**
           let indexErrTime = this.rbDetails.findIndex((item) => {
             if (item.endtime && item.starttime) {
@@ -1412,6 +1536,9 @@

            this.$modal.msgSuccess("修改报销单保存成功!");
            this.open = false;
            
                // 关闭窗口                
                this.$router.go(-1);
            // this.getList();
            // })
            // .catch(err => {
@@ -1438,11 +1565,16 @@
                this.$modal.msgSuccess("新增报销单保存成功!");
                this.open = false;
                // this.getList();
                // 关闭窗口                
                this.$router.go(-1);

              })
              .catch(err => {
                this.$modal.msgError("新增报销单保存失败！");
              });
          }


        }
      });
    },