yxh
yxh
2023-08-14 dfe9df350655b09b344f38e099cec95d46a2b48a
yxh
已修改5个文件
155 ■■■■■ 文件已修改
src/views/project/fund/applyDetail/index.vue 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/medicalCostApply/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/officeExpenseApply/index.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseapply/index.vue 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseapply/travelexpensedetail/index.vue 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/applyDetail/index.vue
@@ -14,7 +14,8 @@
          </el-col>
          <el-col :span="5">
            <el-form-item label="经办人" prop="username">
              <el-select v-model="form.username" placeholder="申请人" clearable filterable allow-create style="width: 100%">
              <el-select v-model="form.username" placeholder="申请人" clearable filterable allow-create style="width: 100%"
                @change="getUserAccount">
                <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
                  :value="dict.nickname"></el-option>
              </el-select>
@@ -46,9 +47,13 @@
              }}</el-radio>
            </el-form-item>
          </el-col>
          <el-col :span="10">
            <el-form-item label="申请说明" prop="remark">
              <el-input v-model="form.remark" placeholder="申请说明" />
          <el-col :span="5">
            <el-form-item label="银行名称" prop="bankname">
              <el-input v-model="form.bankname" placeholder="请输入银行名称" />
            </el-form-item>
          </el-col><el-col :span="5">
            <el-form-item label="银行账号" prop="bankcardno">
              <el-input v-model="form.bankcardno" placeholder="请输入银行账号" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
@@ -81,6 +86,11 @@
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" :disabled="true" />
            </el-form-item>
          </el-col>-->
          <el-col :span="10">
            <el-form-item label="申请说明" prop="remark">
              <el-input v-model="form.remark" placeholder="申请说明" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="捐献者" prop="name">
              <el-input :disabled="true" v-model="form.name" placeholder="请输入捐献者姓名" />
@@ -899,7 +909,6 @@
        this.businessType == "2" ||
        this.businessType == "3"
      ) {
        console.log("", this.curCase);
        this.form.infoid = this.curCase.id;
        this.form.donorname = this.curCase.name;
        this.form.donorno = this.curCase.donorno;
@@ -1318,12 +1327,13 @@
        }
        this.form.username = this.userprofile.nickName;
        this.form.userno = this.userprofile.userName;
        this.form.phone = this.userprofile.phonenumber;
        this.form.deptmentname = this.userprofile.dept.deptName;
        this.form.deptmentno = this.userprofile.dept.deptId;
        this.form.managername = this.userprofile.dept.leader;
        this.form.phone = this.userprofile.phonenumber;
        // this.form.applytype = this.businessType;
        // this.form.createTime = new Date();
        this.getUserAccount();
      });
    },
@@ -1357,6 +1367,17 @@
              exportName: this.personlist[j].username
            });
          }
        }
      });
    },
    //获取经办人账号信息
    getUserAccount() {
      this.personlist.map(res => {
        if (res.username == this.form.username) {
          this.form.bankname = res.depositbank;//res.branchbankname、res.depositbank;
          this.form.bankcardno = res.bankcardno;
          this.form.phone = res.telephone;
        }
      });
    },
@@ -2065,13 +2086,13 @@
  created() {
    //获取路由参数
    this.getroute();
    this.getUserProfile();
    this.getUserList();
    this.getExternalList();
  },
  //生命周期 - 挂载完成(可以访问DOM元素)
  mounted() {
    this.getExternalList();
    this.getUserList();
    this.getUserProfile();
    // this.getFeeUnitList();
  },
src/views/project/fund/medicalCostApply/index.vue
@@ -1115,7 +1115,6 @@
      listFund(this.fundQueryParam).then(response => {
        this.loading = false;
        this.donateconsolationfundList = response.rows;
        console.log("donateconsolationfundList", this.donateconsolationfundList);
      });
    },
src/views/project/fund/officeExpenseApply/index.vue
@@ -666,13 +666,11 @@
        });
      } else if (this.detailInfoDialogShowType == "unit") {
        singleDetail.unitno = this.funddetailForm.unitno;
        console.log("this.funddetailForm", this.funddetailForm);
        try {
          let unitIndex = this.bankaccountlist.findIndex(
            (item) => singleDetail.unitno == item.reportNo
          );
          console.log("this.bankaccountlist[unitIndex]", this.bankaccountlist[unitIndex]);
          if (unitIndex > -1) {
            singleDetail.unitname = this.bankaccountlist[unitIndex].reportName;
            singleDetail.depositbank = this.bankaccountlist[unitIndex].depositbank;
@@ -684,7 +682,7 @@
          singleDetail.unitname = singleDetail.unitno;
        }
      }
      console.log("singleDetail", singleDetail);
      this.fundDetails[tempIndex] = singleDetail;
      this.detailInfoDialogShow = false;
    },
@@ -1190,7 +1188,6 @@
      //获取银行账号列表,类型是机构
      listReportname("org").then((res) => {
        this.bankaccountlist = res.data;
        console.log("this.bankaccountlist", this.bankaccountlist);
      });
    },
@@ -1346,7 +1343,6 @@
    getUnitList() {
      listOrganization(3).then((res) => {
        console.log("listOrganization", res);
        for (let i = 0; i < res.rows.length; i++) {
          this.unitList.push({
            organizationid: res.rows[i].organizationid,
@@ -1439,9 +1435,6 @@
    },
    //文件上传成功回调
    uploadSccess(response, file, fileList) {
      console.log("response", response);
      console.log("file", file);
      console.log("fileList", fileList);
      //获取附件信息位置
      if (response.code == 200) {
        this.form.filename = file.raw.name;
@@ -1464,9 +1457,7 @@
  // 点击文件
  Filepopup(index, rows, row) {
    console.log(index, rows, row);
    this.atpresent = index;
    console.log(this.atpresent);
    this.pdfVisible = true;
    if (this.fundDetails[index].annexfilesList) {
      this.fileListto = this.rbDetails[index].annexfilesList;
src/views/project/travelexpenseapply/index.vue
@@ -44,18 +44,18 @@
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
        <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd">新增</el-button>
        <!-- v-hasPermi="['project:funddetail:add']" -->
      </el-col>
      <el-col :span="1.5">
        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
        <el-button type="warning" plain icon="el-icon-download" :loading="exportLoading"
          @click="handleExport">导出</el-button>
      </el-col>
      <!-- v-hasPermi="['project:funddetail:export']" -->
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table border v-loading="loading" :data="reimbursementList" @selection-change="handleSelectionChange">
    <el-table  :row-class-name="rowClassName" v-loading="loading" :data="reimbursementList" @selection-change="handleSelectionChange" >
      <!-- <el-table-column type="selection" width="55" align="center" /> 
      <el-table-column label="报销人类别" width="120" align="center" prop="costtype">
        <template slot-scope="scope">
@@ -90,7 +90,7 @@
      <el-table-column label="报销合计" align="center" prop="financechecher"/>-->
      <!-- <el-table-column label="财务审核" width="120" align="center" prop="financechecher" /> -->
      <el-table-column label="捐献者" width="150" align="center" prop="donorname" />
      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="210">
      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1" size="mini" type="text"
            icon="el-icon-upload2" @click="handleup(scope.row)">上报</el-button>
@@ -388,8 +388,8 @@
            <el-table-column prop="trafficexpense" label="交通费" align="center" width="80">
              <template slot-scope="scope">
                <el-input v-model="scope.row.trafficexpense" placeholder="交通费" @blur="val => {
                    sumRowFee(scope.row);
                  }
                  sumRowFee(scope.row);
                }
                  " />
              </template>
            </el-table-column>
@@ -408,8 +408,8 @@
            <el-table-column prop="hotelexpense" label="住宿费" align="center" width="80">
              <template slot-scope="scope">
                <el-input v-model="scope.row.hotelexpense" placeholder="住宿费" @blur="val => {
                    sumRowFee(scope.row);
                  }
                  sumRowFee(scope.row);
                }
                  " />
              </template>
            </el-table-column>
@@ -417,24 +417,24 @@
            <el-table-column prop="foodexpenses" label="餐费报销" align="center" width="80">
              <template slot-scope="scope">
                <el-input v-model="scope.row.foodexpenses" placeholder="伙食费报销" @blur="val => {
                    sumRowFee(scope.row);
                  }
                  sumRowFee(scope.row);
                }
                  " />
              </template>
            </el-table-column>
            <el-table-column prop="foodallowance" label="伙食补助" align="center" width="80">
              <template slot-scope="scope">
                <el-input v-model="scope.row.foodallowance" placeholder="伙食费补助" @blur="val => {
                    sumRowFee(scope.row);
                  }
                  sumRowFee(scope.row);
                }
                  " />
              </template>
            </el-table-column>
            <el-table-column prop="otherexpense" label="公杂费补助" align="center" width="80">
              <template slot-scope="scope">
                <el-input v-model="scope.row.otherexpense" placeholder="杂费" @blur="val => {
                    sumRowFee(scope.row);
                  }
                  sumRowFee(scope.row);
                }
                  " />
              </template>
            </el-table-column>
@@ -442,8 +442,8 @@
            <el-table-column prop="otherfeeamount" label="其他费用" align="center" width="90">
              <template slot-scope="scope">
                <el-input v-model="scope.row.otherfeeamount" placeholder="其他费用" @blur="val => {
                    sumRowFee(scope.row);
                  }
                  sumRowFee(scope.row);
                }
                  " />
              </template>
            </el-table-column>
@@ -592,7 +592,7 @@
              <!-- <file-upload ref="fileUpload" :fileType=fileType :limit="1" :on-success="handleUploadSuccess"></file-upload> -->
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple
                :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
                    uploadSccess(response, file, fileList)
                  uploadSccess(response, file, fileList)
                  " :on-preview="downFile" :disabled="dialogType == 'detail'" :on-error="handleUploadError"
                :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
                <el-button :disabled="dialogType == 'detail'" size="small" type="primary">上传</el-button>
@@ -1963,7 +1963,25 @@
        chineseStr += cnInteger;
      }
      return chineseStr;
    }
    },
    //明显提示审批退回记录
    rowClassName({ row, column, rowIndex, columnIndex }) {
      //此判断为最后三行
      if (row.backflowlevel==199) {
        return "addClassva";
      }
    },
  }
};
</script>
<!-- <style scoped> -->
<!-- 不可加scoped,会独立样式element访问不到 -->
<style>
.addClassva {
  /* background: #10aec2; */
  background:#10aec2!important;
  /* color:whitesmoke; */
}
</style>
src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -443,7 +443,7 @@
        <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType != 'edit'">
          <el-col :span="20">审核记录</el-col>
        </el-row>
        <el-row v-if="operationType != 'edit'">
        <el-row v-if="operationType != 'add'">
          <el-table :data="fundflowList" border>
            <el-table-column label="审核人" align="center" width="150" prop="checkusername" />
            <el-table-column label="审核日期" align="center" width="200" prop="createTime" />
@@ -608,6 +608,9 @@
      loading: true,
      // 导出遮罩层
      exportLoading: false,
      // 当前单据ID
      curId:0,
      // 选中数组
      ids: [],
      // 非单个禁用
@@ -735,17 +738,17 @@
  mounted() {
    //选择业务类型:1、新增;2、修改;3、查看
    let ids = this.$route.query.id;
    let curId = this.$route.query.id;
    let pos = this.$route.query.pos;
    this.defaultperson = this.$route.query.routerparam;
    if (pos == 1) {
      this.handleAdd(ids);
      this.handleAdd(curId);
    } else if (pos == 2) {
      this.handleUpdate(ids);
      this.handleUpdate(curId);
    } else if (pos == 3) {
      this.handleDetail(ids);
      this.handleDetail(curId);
    } else if (pos == 4) {
      this.handleCheck(ids);
      this.handleCheck(curId);
    }
  },
@@ -947,7 +950,16 @@
        }
        //伙食费补助:城市(西藏,新疆,青海.120)(其他100)
        row.foodallowance = (parseInt(row.days) * 100).toString();
        if (tempStr == "杭州") {
          row.foodallowance = "";
        }
        else if (tempStr == "西藏" || tempStr == "新疆" || tempStr == "青海") {
          row.foodallowance = (parseInt(row.days) * 120).toString();
        }
        else {
          row.foodallowance = (parseInt(row.days) * 100).toString();
        }
        //计算合计
        this.sumRowFee(row);
@@ -1207,7 +1219,7 @@
    },
    /** 修改按钮操作 */
    handleUpdate(ids) {
    handleUpdate(curId) {
      // this.$router.push({
      //   path: "/finance/travelexpenseslist/Modifydetails/",
      //   query: { id: ids }
@@ -1219,8 +1231,7 @@
      this.title = "报销申请修改";
      //获取报销主信息
      const id = ids || this.ids;
      getReimbursement(id).then(response => {
      getReimbursement(curId).then(response => {
        this.form = response.data;
        this.fileListto = this.form.annexfiles
          ? this.form.annexfiles
@@ -1228,12 +1239,10 @@
            .map(item => ({ url: item, name: item }))
          : [];
        this.form.recordstatus = response.data.recordstatus + "";
        let ids = response.data.id;
        //获取报销明细信息
        getReimbursementdetaillist(ids).then(res => {
        getReimbursementdetaillist(curId).then(res => {
          this.rbDetails = res.data;
          console.log(this.rbDetails);
          if (this.rbDetails.length == 0) {
            this.addDetailRow(0);
          }
@@ -1254,13 +1263,24 @@
        });
        //获取报销打款信息
        this.queryParamsPayee.rbid = ids;
        this.queryParamsPayee.rbid = curId;
        listReimbursementpayee(this.queryParamsPayee).then(res => {
          this.rbPayees = res.rows;
          if (this.rbPayees.length == 0) {
            this.addPayeeRow(0);
          }
        });
        //审核状态
        this.form.recordstatus = response.data.recordstatus + "";
        let listFundflowparams = {
          fundid: curId,
          fundtype: 1
        };
        listFundflow(listFundflowparams).then(res => {
          this.fundflowList = res.rows;
        });
      });
    },