From e5e3e1a5bc8aa300c580126703bb6067221dee96 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 15 六月 2023 10:09:08 +0800
Subject: [PATCH] 主要修改了个税计算
---
src/views/project/travelexpenseslist/index.vue | 373 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 225 insertions(+), 148 deletions(-)
diff --git a/src/views/project/travelexpenseslist/index.vue b/src/views/project/travelexpenseslist/index.vue
index 85f18fc..f153007 100644
--- a/src/views/project/travelexpenseslist/index.vue
+++ b/src/views/project/travelexpenseslist/index.vue
@@ -3,20 +3,27 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-row>
+ <!--
<el-col :span="6">
<el-form-item label="鍑哄樊浜�" prop="travelers">
<el-input v-model="queryParams.travelers" placeholder="璇疯緭鍏ュ嚭宸汉" clearable size="small"
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
-
+-->
<el-col :span="6">
<el-form-item label="缁忓姙浜�" prop="username">
<el-input v-model="queryParams.username" placeholder="璇疯緭鍏ョ粡鍔炰汉" clearable size="small"
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
-
+ <el-col :span="8">
+ <el-form-item label="鎶ラ攢鏃ユ湡" prop="createTime">
+ <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="value1" type="daterange" @blur="onpick"
+ range-separator="鑷�" start-placeholder="鎶ラ攢寮�濮嬫棩鏈�" end-placeholder="鎶ラ攢缁撴潫鏃ユ湡" @keyup.enter.native="handleQuery">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
<el-input v-model="queryParams.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" v-if="0"
@@ -27,18 +34,7 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
-
- <el-row>
- <el-col :span="8">
- <el-form-item label="鎶ラ攢鏃ユ湡" prop="createTime">
- <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="value1" type="daterange" @blur="onpick"
- range-separator="鑷�" start-placeholder="鎶ラ攢寮�濮嬫棩鏈�" end-placeholder="鎶ラ攢缁撴潫鏃ユ湡" @keyup.enter.native="handleQuery">
- </el-date-picker>
- </el-form-item>
- </el-col>
-
- <el-col :span="6">
+ <el-col :span="4">
<el-form-item>
<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>
@@ -61,31 +57,31 @@
</el-row>
<el-table border v-loading="loading" :data="reimbursementList" @selection-change="handleSelectionChange">
- <!-- <el-table-column type="selection" width="55" align="center" /> -->
- <el-table-column label="璁板綍鐘舵��" align="center" prop="recordstatus" width="180">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
- </template>
- </el-table-column>
- <!--
+ <!-- <el-table-column type="selection" width="55" align="center" />
<el-table-column label="鎶ラ攢浜虹被鍒�" width="120" align="center" prop="costtype">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_travelexpensebelong" :value="scope.row.costtype" />
</template>
</el-table-column>-->
- <el-table-column label="鐢宠鏃堕棿" width="120" align="center" prop="createTime">
+ <el-table-column label="鐢宠鏃堕棿" width="150" 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="缁忓姙浜�" width="120" align="center" prop="username">
- </el-table-column><!--
+ <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="160">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
+ </template>
+ </el-table-column>
+ <el-table-column label="缁忓姙浜�" width="150" align="center" prop="username" />
+ <!--
<el-table-column label="鍑哄樊浜�" width="180" align="center" prop="travelers">
</el-table-column>-->
- <el-table-column label="鎶ラ攢閲戦" width="120" align="center" prop="amountrequested">
+ <el-table-column label="鎶ラ攢閲戦" width="150" align="center" prop="amountrequested">
</el-table-column>
- <el-table-column label="鍑哄樊浜嬬敱" align="center" width="280" prop="reason">
- </el-table-column>
+ <el-table-column label="鎵�灞炵粍鍒�" width="150" align="center" prop="deptmentname" />
+ <el-table-column label="缁勯暱" width="150" align="center" prop="managername" />
+ <el-table-column label="鍑哄樊浜嬬敱" align="center" prop="reason" />
<!-- <el-table-column label="鑱旂郴鐢佃瘽" width="120" align="center" prop="phone">
</el-table-column>
<el-table-column label="寮�鎴烽摱琛�" width="180" align="center" prop="depositbank">
@@ -94,9 +90,8 @@
</el-table-column>
<el-table-column label="鎶ラ攢鍚堣" align="center" prop="financechecher"/>-->
<!-- <el-table-column label="璐㈠姟瀹℃牳" width="120" align="center" prop="financechecher" /> -->
- <el-table-column label="鎹愮尞鑰�" width="120" align="center" prop="donorname">
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="300">
+ <el-table-column label="鎹愮尞鑰�" width="150" align="center" prop="donorname" />
+ <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>
@@ -127,8 +122,7 @@
placeholder="鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
- </el-col>
- <el-col :span="5">
+ </el-col> <el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="username">
<el-select v-model="form.username" clearable filterable allow-create ref="getReportname"
default-first-option placeholder="璇烽�夋嫨">
@@ -137,12 +131,25 @@
</el-option>
</el-select>
</el-form-item>
- </el-col><el-col :span="5">
- <el-form-item label="鍖哄煙缁勯暱" prop="managername">
- <el-input v-model="form.managername" placeholder="鍖哄煙缁勯暱" />
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+ <el-input v-model="form.deptmentname" placeholder="鎵�灞炵粍鍒�" />
+ <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />-->
</el-form-item>
</el-col>
-
+ <el-col :span="5">
+ <el-form-item label="缁勯暱" prop="managername">
+ <el-input v-model="form.managername" placeholder="缁勯暱" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="15">
+ <el-form-item label="鍑哄樊浜嬬敱" prop="reason">
+ <el-input v-model="form.reason" placeholder="鍑哄樊浜嬬敱" />
+ </el-form-item>
+ </el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="infoid">
<el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
@@ -268,7 +275,7 @@
</el-col>
</el-row>
-->
- <el-row>
+ <el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="20">鎶ラ攢鏄庣粏褰曞叆锛�</el-col>
</el-row>
<el-row>
@@ -317,7 +324,7 @@
if (scope.row.endtime) { return time.getTime() > new Date(scope.row.endtime.replace(/-/g, '/')) }
}
}" clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫棩鏈�" @blur="getallowance(scope.row)">
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫棩鏈�" @blur="getdays(scope.row)">
</el-date-picker>
</template>
</el-table-column>
@@ -328,7 +335,7 @@
if (scope.row.starttime) { return time.getTime() < new Date(scope.row.starttime.replace(/-/g, '/')) }
}
}" clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃ユ湡" @blur="getallowance(scope.row)">
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃ユ湡" @blur="getdays(scope.row)">
</el-date-picker>
</template>
</el-table-column>
@@ -337,21 +344,20 @@
<el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦�" />
</template>
</el-table-column>
- <el-table-column label="鍒拌揪鍦�" prop="destination2" align="center" width="140">
+ <el-table-column label="鍒拌揪鍦�" prop="destination" align="center" width="140">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦�" @blur="getallowance(scope.row)" /> -->
-
<el-select filterable allow-create v-model="scope.row.destination" value-key="value" placeholder="鍒拌揪鍦�"
- @change="getallowance2(scope.row, scope.row.destination)">
+ @change="getallowance(scope.row)">
<el-option v-for="dict in dict.type.sys_area_name" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="days" label="澶╂暟" width="65" align="center">
<template slot-scope="scope">
- <el-input v-model="scope.row.days" @blur="getStandard(scope.row)" placeholder="澶╂暟" />
+ <el-input v-model="scope.row.days" @blur="getallowance(scope.row)" placeholder="澶╂暟" />
</template>
</el-table-column>
<el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�" align="center" width="100">
@@ -373,7 +379,7 @@
<el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -383,7 +389,7 @@
<template slot-scope="scope">
<el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="
(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
">{{ Number(scope.row.cityfee).toFixed(2) }}
</el-input>
@@ -393,7 +399,7 @@
<el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -402,7 +408,7 @@
<el-table-column prop="foodexpenses" label="椁愯垂鎶ラ攢" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -410,7 +416,7 @@
<el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -418,7 +424,7 @@
<el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -427,7 +433,7 @@
<el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="90">
<template slot-scope="scope">
<el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -454,7 +460,7 @@
</el-table-column>
</el-table>
</el-row>
- <el-row>
+ <el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="20">鎶ラ攢璇锋鏄庣粏锛�</el-col>
</el-row>
<el-row style="margin-top: 30px">
@@ -518,7 +524,7 @@
</el-table-column><el-table-column prop="paiddate" slot="" label="鎵撴鏃ユ湡" fixed align="center" width="150">
<template slot-scope="scope">
<el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.paiddate" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鎵撴鏃ユ湡" :disabled="true" @blur="getallowance(scope.row)">
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鎵撴鏃ユ湡" :disabled="true">
</el-date-picker>
</template>
</el-table-column>
@@ -564,9 +570,8 @@
<el-input v-model="form.financedirector" placeholder="璐㈠姟閮ㄤ富浠�" />
</el-form-item>
</el-col>
- </el-row>
- -->
- <el-row>
+ </el-row> -->
+ <el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="14">
<!--
<el-form-item label="鏂囦欢鍦板潃" prop="fileurl">
@@ -575,8 +580,8 @@
-->
<el-form-item label="鏂囦欢涓婁紶" align="left" prop="annexfiles">
<!-- <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="5"
- :headers="headers" :on-success="(response, file, fileList) =>
+ <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)
" :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
:on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
@@ -606,6 +611,8 @@
</template>
<script>
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
import { listReimbursementpayee, addReimbursementpayee, updateReimbursementpayee } from "@/api/project/reimbursementpayee";
import {
@@ -631,12 +638,14 @@
import { getInfoBytheUserNo } from "@/api/project/externalperson";
import { regionDataPlus, CodeToText } from "element-china-area-data";
import Li_area_select from "@/components/Address";
-import { getUserProfile } from "@/api/system/user";
+import { getUser,getUserProfile } from "@/api/system/user";
+import { treeselect } from "@/api/system/dept";
import { getSubsidy } from "@/api/project/travelcity";
import { listReportname, listUser } from "@/api/project/organization";
import { getToken } from "@/utils/auth";
export default {
components: {
+ Treeselect,
Li_area_select,
},
name: "Funddetail",
@@ -649,7 +658,6 @@
"sys_travelexpensebelong",
"sys_traffictype",
"sys_area_name",
- "sys_traffictype"
],
data() {
return {
@@ -664,7 +672,9 @@
//鍏ㄩ儴浜哄憳
personsList: [],
//涓嬫媺鍙互閫夋嫨浜哄憳鍒楄〃
- personsSel: [],
+ personsSel: [],
+ // 閮ㄩ棬鏍戦�夐」
+ deptOptions: undefined,
costtypeobj: {
value: 0,
@@ -709,7 +719,7 @@
remark: null,
departure: null,
endtime: null,
- destination2: null,
+ destination: null,
uploadFlag: null,
uploadTime: null,
// orderByColumn: "createTime",
@@ -720,6 +730,11 @@
persontype: null,
arriveAddr: null,
},
+ feesParams: {
+ beneficiaryNo: null,
+ starttime: null,
+ endtime: null,
+ },
//鏌ヨ浠樻
queryParamsPayee: {
rbid: null,
@@ -727,19 +742,17 @@
// 琛ㄥ崟鍙傛暟
form: {},
reimbursementList: [],
+
// 琛ㄥ崟鏍￠獙
rules: {
- costtype: [
- { required: true, message: "璇烽�夋嫨鎶ラ攢褰掔被", trigger: "blur" },
- ],
- username: [
- { required: true, message: "璇烽�夋嫨濉姤浜�", trigger: "blur" },
- ],
- travelers: [
- { required: true, message: "璇烽�夋嫨鎶ラ攢浜�", trigger: "blur" },
+ createTime: [
+ { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" },
],
reason: [
{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" },
+ ],
+ deptmentname: [
+ { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" },
],
},
//璐圭敤鐢宠鍗昮orm
@@ -804,6 +817,8 @@
//鑾峰彇鐧诲綍鑰呬俊鎭�
this.getUsermsg();
+ //鑾峰彇閮ㄩ棬淇℃伅
+ //this.getTreeselect();
},
methods: {
@@ -835,6 +850,13 @@
getUserProfile().then((response) => {
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
+ });
+ },
+
+ /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
+ getTreeselect() {
+ treeselect().then(response => {
+ this.deptOptions = response.data;
});
},
@@ -916,50 +938,46 @@
}
},
- //璁＄畻琛ュ姪
- getallowance(row) {
- if (
- row.starttime != "" &&
- row.starttime != null &&
- row.endtime != "" &&
- row.endtime != null
- ) {
+ //璁＄畻鏃ユ湡
+ getdays(row) {
+ if (row.starttime != "" && row.starttime != null && row.endtime != "" && row.endtime != null) {
//璁＄畻澶╂暟
- row.days = 1 + Math.floor(Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) / (1099 * 3699 * 24))
-
- /*let aDate, oDate1, oDate2, Date_end,Date_start;
- Date_end = row.endtime.split(" "); //灏嗘椂闂翠互绌烘牸鍒掑垎涓轰袱涓暟缁� 绗竴涓暟缁勬槸 2019-05-20 绗簩涓暟缁勬槸 00锛�00锛�00
- aDate = Date_end[0].split("-"); //鑾峰彇绗竴涓暟缁勭殑鍊�
- oDate1 = new Date(aDate[0], aDate[1], aDate[2]); //灏嗗墠鍗婁釜鏁扮粍浠�-鎷嗗垎锛屾瘡涓�涓槸涓�涓暟鍊�
-
- Date_start = row.starttime.split(" ");
- aDate = Date_start[0].split("-");
- oDate2 = new Date(aDate[0], aDate[1], aDate[2]);
- row.days = 1+parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24); //鎶婄浉宸殑姣鏁拌浆鎹负澶╂暟
- */
+ row.days = (Math.floor(Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) / (1000 * 3600 * 24)) + 1).toString()
} else {
- row.days = ''
+ row.days = 0;
};
+ //璁＄畻琛ュ姪
+ this.getallowance(row);
+ },
+
+ //璁＄畻琛ュ姪
+ getallowance(row) {
+ console.log("ro",row);
//鍏潅璐硅ˉ鍔╋細鏉窞妗愬簮锛屽缓寰凤紝娣冲畨60锛屾澀宸炲叾浠栧湴鍖�0锛岄潪鏉窞鍦板尯80
- if (row.destination2 != "") {
- var str = row.destination2;
+ if (row.destination != "") {
+ var tempStr = row.destination;
+
//楠岃瘉鍩庡競
- ////if (str.indexOf("妗愬簮锛屽缓寰凤紝娣冲畨") !== -1) { };
- if (str.includes("鏉窞")) { row.otherexpense = parseInt(row.days) * 0 }
- else if (str.includes("妗愬簮") || str.includes("寤哄痉") || str.includes("娣冲畨")) { row.otherexpense = parseInt(row.days) * 60 }
- else { row.otherexpense = parseInt(row.days) * 80 };
+ if (tempStr == "鏉窞") {
+ row.otherexpense = '';
+ }
+ else if (tempStr == "鏉窞-妗愬簮" || tempStr == "鏉窞-寤哄痉" || tempStr == "鏉窞-娣冲畨") {
+ row.otherexpense = (parseInt(row.days) * 60).toString();
+ }
+ else {
+ row.otherexpense = (parseInt(row.days) * 80).toString();
+ };
}
//浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.120锛夛紙鍏朵粬100锛�
- row.foodallowance = parseInt(row.days) * 100
+ row.foodallowance = (parseInt(row.days) * 100).toString();
- //璁＄畻鍚堣
- this.sumTotalFee();
+ //璁＄畻鍚堣
+ this.sumRowFee(row);
},
getallowance2(row, val2) {
- // this.getallowance(row);
this.arriveAddr = val2;
this.queryParams2.arriveAddr;
this.queryParams2.personType = row;
@@ -994,6 +1012,7 @@
patowncode: this.$refs["residenceSelect_" + row.index].getQu(),
standardlevel: this.standardlevel,
};
+
getTravelStandard(info)
.then((response) => {
let fee = 0;
@@ -1003,7 +1022,7 @@
row.hotelexpense = fee;
})
.finally(() => {
- this.sumTotalFee(row);
+ this.sumTotalFee();
});
}
},
@@ -1016,7 +1035,7 @@
row.searchAddress.shi != "" &&
row.searchAddress.qu != ""
) {
- row.destination2 =
+ row.destination =
row.searchAddress.sheng +
row.searchAddress.shi +
row.searchAddress.qu;
@@ -1122,7 +1141,7 @@
},
// 琛ㄥ崟閲嶇疆
reset() {
- this.fileList = []
+ this.fileList = [];
this.form = {
ceshi: {},
bigstrmoney: null,
@@ -1216,13 +1235,18 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
-
+
this.open = true;
this.title = "鏂板鎶ラ攢鐢宠";
this.dialogType = "edit";
this.fundflowList = [];
- this.form.username = this.defaultperson.nickName;
+
this.form.userno = this.defaultperson.userName;
+ this.form.username = this.defaultperson.nickName;
+ this.form.deptmentname = this.defaultperson.dept.deptName;
+ this.form.deptmentno = this.defaultperson.dept.deptId;
+ this.form.managername = this.defaultperson.dept.leader;
+
this.addDetailRow(0);
this.addPayeeRow(0);
},
@@ -1246,27 +1270,29 @@
//鑾峰彇鎶ラ攢鏄庣粏淇℃伅
getReimbursementdetaillist(ids).then((res) => {
this.rbDetails = res.data;
- if (this.rbDetails.length==0) {this.addDetailRow(0);}
- //瑙ｆ瀽鍑哄樊鍦板潃
- /*
+ if (this.rbDetails.length == 0) { this.addDetailRow(0); }
+
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,
- };
+ this.sumRowFee(this.rbDetails[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,
+ }; */
}
- */
+
//瀹炴椂鍚堣閲戦
//this.sumTotalFee();
});
//鑾峰彇鎶ラ攢鎵撴淇℃伅
- this.queryParamsPayee.rbid=ids;
+ this.queryParamsPayee.rbid = ids;
listReimbursementpayee(this.queryParamsPayee).then((res) => {
this.rbPayees = res.rows;
- if (this.rbPayees.length==0) {this.addPayeeRow(0);}
+ if (this.rbPayees.length == 0) { this.addPayeeRow(0); }
});
});
},
@@ -1276,7 +1302,7 @@
this.dialogType = "detail";
this.title = "鏌ョ湅鎶ラ攢鐢宠";
- this.reset();
+ this.reset();
this.open = true;
const id = row.id || this.ids;
@@ -1297,9 +1323,11 @@
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 = {
@@ -1308,14 +1336,17 @@
qu: this.rbDetails[i].traveltownname,
};
}
- //this.sumTotalFee();
+ */
});
- //璐︽埛
- this.queryParamsPayee.rbid=ids;
+ if (this.rbDetails.length > 0) this.sumTotalFee();
+
+
+ //浠樻淇℃伅
+ this.queryParamsPayee.rbid = ids;
listReimbursementpayee(this.queryParamsPayee).then((res) => {
this.rbPayees = res.rows;
- if (this.rbPayees.length==0) {this.addPayeeRow(0);}
+ if (this.rbPayees.length == 0) { this.addPayeeRow(0); }
});
});
@@ -1346,11 +1377,11 @@
});
return;
}
-
+
let emptyStartTimeindex = this.rbDetails.findIndex(
(item) => item.starttime == null || item.starttime == undefined || item.starttime == ""
);
-
+
if (emptyStartTimeindex > -1) {
this.$message({
message: "绗�" + (emptyStartTimeindex + 1) + "琛屽嚭鍙戞棩鏈熶负绌�",
@@ -1358,11 +1389,11 @@
});
return;
}
-
+
let emptyEndTimeindex = this.rbDetails.findIndex(
(item) => item.endtime == null || item.endtime == undefined || item.endtime == ""
);
-
+
if (emptyEndTimeindex > -1) {
this.$message({
message: "绗�" + (emptyEndTimeindex + 1) + "琛屽埌杈炬棩鏈熶负绌�",
@@ -1370,7 +1401,7 @@
});
return;
}
-
+
//璐圭敤褰掑睘
let belongArr = this.dict.type.sys_travelexpensebelong;
let costtypeindex = belongArr.findIndex(
@@ -1506,10 +1537,11 @@
starttime: null,
departure: null,
endtime: null,
- destination2: null,
+ destination: null,
days: null,
trafficexpense: 0,
traffictype: null,
+ traffictype2: null,
cityfee: 0,
hotelexpense: 0,
invoicecount: null,
@@ -1606,11 +1638,11 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
rows.splice(index, 1);
this.recountOrderNo2();
- // this.sumTotalFee();
+ this.sumTotalFee();
});
} else {
rows.splice(index, 1);
- //this.sumTotalFee();
+ this.sumTotalFee();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
this.recountOrderNo2();
}
@@ -1668,9 +1700,66 @@
});
},
+ //璁＄畻涓�琛屽悎璁�
+ //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣
+ sumRowFee(row) {
+ let totalFee = 0;
+ if (!isNaN(parseFloat(row.trafficexpense))) {
+ totalFee += parseFloat(row.trafficexpense);
+ }
+ if (!isNaN(parseFloat(row.cityfee))) {
+ totalFee += parseFloat(row.cityfee);
+ }
+ if (!isNaN(parseFloat(row.hotelexpense))) {
+ totalFee += parseFloat(row.hotelexpense);
+ }
+ if (!isNaN(parseFloat(row.otherexpense))) {
+ totalFee += parseFloat(row.otherexpense);
+ }
+ if (!isNaN(parseFloat(row.foodexpenses))) {
+ totalFee += parseFloat(row.foodexpenses);
+ }
+ if (!isNaN(parseFloat(row.foodallowance))) {
+ totalFee += parseFloat(row.foodallowance);
+ }
+ if (!isNaN(parseFloat(row.otherfeeamount))) {
+ totalFee += parseFloat(row.otherfeeamount);
+ }
+ row.total = totalFee;
+
+ /*
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].trafficexpense))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].trafficexpense);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].cityfee))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].cityfee);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].hotelexpense))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].hotelexpense);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].otherexpense))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].otherexpense);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].foodexpenses))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].foodexpenses);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].foodallowance))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].foodallowance);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].otherfeeamount))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].otherfeeamount);
+ }
+ this.rbDetails[rowIndex].total = parseFloat(totalFee).toFixed(2);
+ this.$set(this.rbDetails, rowIndex, this.rbDetails[rowIndex]);
+ */
+ //閲嶆柊璁＄畻鏁翠釜鎶ラ攢鍗曠殑鍚堣
+ this.sumTotalFee();
+ },
+
//璁＄畻璐圭敤鍚堣
sumTotalFee() {
let allSum = 0;
+
//鎹愮尞鑰呭灞炶垂鐢�
if (!isNaN(parseFloat(this.form.donoramount))) {
allSum += parseFloat(this.form.donoramount);
@@ -1679,10 +1768,11 @@
//鎶ラ攢鏄庣粏璐圭敤
try {
for (let i = 0; i < this.rbDetails.length; i++) {
+ /*
let totalFee = 0;
//璁＄畻褰撳墠鎶ラ攢鍐呭璐圭敤鍚堣
- if (!isNaN(parseFloat(this.rbDetails[i].trafficexpense))) {
- totalFee += parseFloat(this.rbDetails[i].trafficexpense);
+ if (!isNaN(parseFloat(this.rbDetails[i].total))) {
+ totalFee += parseFloat(this.rbDetails[i].total);
}
if (!isNaN(parseFloat(this.rbDetails[i].cityfee))) {
totalFee += parseFloat(this.rbDetails[i].cityfee);
@@ -1704,6 +1794,8 @@
}
this.rbDetails[i].total = parseFloat(totalFee).toFixed(2);
this.$set(this.rbDetails, i, this.rbDetails[i]);
+ */
+
if (!isNaN(parseFloat(this.rbDetails[i].total))) {
allSum += parseFloat(this.rbDetails[i].total);
}
@@ -1712,21 +1804,6 @@
this.form.amountrequested = allSum.toFixed(2);
this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
} catch { }
- },
-
- getDetailArr(rbid) {
- getReimbursementdetaillist(rbid).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,
- };
- }
- this.sumTotalFee();
- });
},
//閲戦鏁板瓧杞崲鎴愬ぇ鍐�
--
Gitblit v1.9.3