From 86a98c135c7ebc417f8af2045aa105a94f2ccbeb Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 23 五月 2023 18:45:17 +0800
Subject: [PATCH] 修改了财务和审批
---
src/views/project/travelexpenseslist/index.vue | 170 +++++++++++++++++++++++++++++---------------------------
1 files changed, 87 insertions(+), 83 deletions(-)
diff --git a/src/views/project/travelexpenseslist/index.vue b/src/views/project/travelexpenseslist/index.vue
index 85f18fc..f9ced41 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,24 @@
</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="鎵�灞炵粍鍒�" />
</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 +274,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>
@@ -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">
@@ -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">
@@ -649,7 +654,6 @@
"sys_travelexpensebelong",
"sys_traffictype",
"sys_area_name",
- "sys_traffictype"
],
data() {
return {
@@ -727,19 +731,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
@@ -925,34 +927,29 @@
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 = '';
};
//鍏潅璐硅ˉ鍔╋細鏉窞妗愬簮锛屽缓寰凤紝娣冲畨60锛屾澀宸炲叾浠栧湴鍖�0锛岄潪鏉窞鍦板尯80
if (row.destination2 != "") {
- var str = row.destination2;
+ var tempStr = row.destination2;
+
//楠岃瘉鍩庡競
- ////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();
@@ -994,6 +991,7 @@
patowncode: this.$refs["residenceSelect_" + row.index].getQu(),
standardlevel: this.standardlevel,
};
+
getTravelStandard(info)
.then((response) => {
let fee = 0;
@@ -1122,7 +1120,7 @@
},
// 琛ㄥ崟閲嶇疆
reset() {
- this.fileList = []
+ this.fileList = [];
this.form = {
ceshi: {},
bigstrmoney: null,
@@ -1216,13 +1214,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,7 +1249,7 @@
//鑾峰彇鎶ラ攢鏄庣粏淇℃伅
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++) {
@@ -1263,10 +1266,10 @@
});
//鑾峰彇鎶ラ攢鎵撴淇℃伅
- 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 +1279,7 @@
this.dialogType = "detail";
this.title = "鏌ョ湅鎶ラ攢鐢宠";
- this.reset();
+ this.reset();
this.open = true;
const id = row.id || this.ids;
@@ -1312,10 +1315,10 @@
});
//璐︽埛
- 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); }
});
});
@@ -1346,11 +1349,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 +1361,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 +1373,7 @@
});
return;
}
-
+
//璐圭敤褰掑睘
let belongArr = this.dict.type.sys_travelexpensebelong;
let costtypeindex = belongArr.findIndex(
@@ -1510,6 +1513,7 @@
days: null,
trafficexpense: 0,
traffictype: null,
+ traffictype2: null,
cityfee: 0,
hotelexpense: 0,
invoicecount: null,
--
Gitblit v1.9.3