From d448ce28415207d041acbf8c4cefd6850942a4ba Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 18 九月 2023 16:54:18 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 54 ++++++++++++++------------
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 63 ++++++++++++++++++++++---------
2 files changed, 73 insertions(+), 44 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 590212a..aa7619e 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -413,7 +413,7 @@
align="center"
label="鍗曚綅鍚嶇О"
width="250"
- v-if="form.applytype != '4'"
+ v-if="form.applytype != '4' && form.applytype != '3'"
>
<template slot-scope="scope">
<el-button
@@ -441,11 +441,11 @@
</template>
</el-table-column>
<el-table-column
- prop="unitno"
+ prop="beneficiaryname"
align="center"
label="鍗曚綅/涓汉"
width="250"
- v-if="form.applytype == '4'"
+ v-if="form.applytype == '4' || form.applytype == '3'"
>
<template slot-scope="scope">
<el-button
@@ -453,9 +453,9 @@
plain
@click="ShowDetailDialog(scope, 'expert')"
>{{
- experthear == "expert"
- ? scope.row.unitname
- : scope.row.beneficiaryname
+ scope.row.beneficiaryname
+ ? scope.row.beneficiaryname
+ : "鐐瑰嚮閫夋嫨"
}}</el-button
>
<!-- <el-select
@@ -796,7 +796,7 @@
v-loading="loading"
>
<el-form ref="funddetailForm" :model="funddetailForm">
- <el-row v-if="businessType != 4">
+ <el-row v-if="businessType != 4 && businessType != 3">
<el-col
:span="24"
v-if="selectionType == 'expert' && businessType != 4"
@@ -884,7 +884,7 @@
</el-col>
</el-row>
- <el-row v-if="businessType == 4">
+ <el-row v-if="businessType == 4 || businessType == 3">
<el-col :span="24">
<el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="experthear">
<el-radio-group
@@ -926,7 +926,7 @@
<el-col :span="24" v-if="experthear == 'expert'">
<el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px">
<el-select
- v-model="funddetailForm.unitname"
+ v-model="funddetailForm.beneficiaryname"
placeholder="鍗曚綅鍚嶇О"
@change="bbaaccss"
clearable
@@ -945,7 +945,7 @@
</el-col>
</el-row>
- <el-row v-if="businessType != 4">
+ <el-row v-if="businessType != 4 && businessType != 3">
<el-col :span="12" v-if="expertfrom == '2'">
<el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
<el-input
@@ -974,7 +974,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="businessType != 4">
+ <el-row v-if="businessType != 4 && businessType != 3">
<el-col :span="24" v-if="expertfrom == '2'">
<el-form-item
label="韬唤璇佸彿"
@@ -1000,7 +1000,7 @@
</el-col>
</el-row>
-->
- <el-row v-if="businessType != 4">
+ <el-row v-if="businessType != 4 && businessType != 3">
<el-col :span="24" v-if="expertfrom == '2'">
<el-form-item
label="鍗曚綅鍚嶇О"
@@ -1024,7 +1024,7 @@
</el-select> </el-form-item
></el-col>
</el-row>
- <el-row v-if="businessType != 4">
+ <el-row v-if="businessType != 4 && businessType != 3">
<el-col :span="24" v-if="expertfrom == '2'">
<el-form-item
label="寮�鎴烽摱琛�"
@@ -1729,6 +1729,7 @@
} else if (this.businessType == "3") {
this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
this.amountLabel = "閲戦";
+ this.getUnitList();
} else if (this.businessType == "4") {
this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
this.amountLabel = "閲戦";
@@ -3309,7 +3310,7 @@
ShowDetailDialog(spoce, showType) {
this.spocewl = spoce;
this.selectionType = showType;
- if (this.businessType == 4 || !showType) {
+ if (this.businessType == 4 || this.businessType == 3 || !showType) {
this.selectionType = this.experthear;
}
// if (!showType) {
@@ -3317,7 +3318,7 @@
// }
this.expertfrom = "1";
-
+ console.log(spoce);
this.funddetailForm.index = spoce.$index;
this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
@@ -3336,20 +3337,23 @@
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ConfirmDetailDialog() {
- if (this.businessType == 4) {
- if (this.experthear == "expert") {
- this.funddetailForm.beneficiaryname = this.unitforname;
- } else {
- this.funddetailForm.beneficiaryname = this.Personnelforname;
- }
- }
-
+ // if (this.businessType == 4) {
+ // if (this.experthear == "expert") {
+ // this.funddetailForm.beneficiaryname = this.unitforname;
+ // } else {
+ // this.funddetailForm.beneficiaryname = this.Personnelforname;
+ // }
+ // }
let tempIndex = this.funddetailForm.index;
let tempExpertName = this.funddetailForm.beneficiaryname;
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.rbDetails[tempIndex];
- if (this.selectionType == "expert" || this.businessType == 4) {
+ if (
+ this.selectionType == "expert" ||
+ this.businessType == 4 ||
+ this.businessType == 3
+ ) {
if (this.expertfrom == "1" || this.experthear == "unit") {
//浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
this.personlist.map(res => {
@@ -3467,7 +3471,7 @@
// if (this.experthear == "unit") {
// singleDetail.unitname = "";
// }
- if (this.businessType == 4) {
+ if (this.businessType == 4 || this.businessType == 3) {
singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
}
this.rbDetails[tempIndex] = singleDetail;
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index b26091f..f59155b 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -943,28 +943,24 @@
>
<div>
<el-table :data="tableDatatop" style="width: 100%">
- <el-table-column prop="orderno" label="搴忓彿" >
+ <el-table-column prop="orderno" label="搴忓彿"> </el-table-column>
+ <el-table-column prop="personname" label="璐圭敤浜哄憳">
</el-table-column>
- <el-table-column prop="personname" label="璐圭敤浜哄憳" >
+ <el-table-column prop="createTime" label="寮�濮嬫棩鏈�">
</el-table-column>
- <el-table-column prop="createTime" label="寮�濮嬫棩鏈�" >
- </el-table-column>
- <el-table-column prop="endtime" label="缁撴潫鏃ユ湡" >
- </el-table-column>
+ <el-table-column prop="endtime" label="缁撴潫鏃ユ湡"> </el-table-column>
<el-table-column prop="departure" label="鍑哄彂鍦�"> </el-table-column>
<el-table-column prop="destination" label="鍒拌揪鍦�"> </el-table-column>
<el-table-column prop="days" label="澶╂暟"> </el-table-column>
-
</el-table>
<el-table :data="tableDatatop" style="width: 100%">
<el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�">
</el-table-column>
<el-table-column prop="traffictype2" label="杩斿洖浜ら�氬伐鍏�">
</el-table-column>
- <el-table-column prop="trafficexpense" label="浜ら�氳垂" >
+ <el-table-column prop="trafficexpense" label="浜ら�氳垂">
</el-table-column>
- <el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂" >
- </el-table-column>
+ <el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂"> </el-table-column>
<el-table-column prop="hotelexpense" label="浣忓璐�">
</el-table-column>
<el-table-column prop="foodallowance" label="浼欓琛ュ姪">
@@ -1330,6 +1326,8 @@
},
mounted() {
+ window.addEventListener("beforeunload", e => this.beforeunloadHandler(e));
+
//閫夋嫨涓氬姟绫诲瀷:1銆佹柊澧烇紱2銆佷慨鏀癸紱3銆佹煡鐪�
let curId = this.$route.query.id;
let pos = this.$route.query.pos;
@@ -1351,6 +1349,24 @@
},
methods: {
+ // 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
+ beforeunloadHandler(e) {
+ if (
+ (JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
+ JSON.stringify(this.rbDetails) ==
+ sessionStorage.getItem("apifunddetail")) ||
+ !sessionStorage.getItem("apifunddetail")
+ ) {
+ } else {
+ this._beforeUnload_time = new Date().getTime();
+ e = e || window.event;
+ if (e) {
+ e.returnValue = "鍏抽棴鎻愮ず";
+ }
+ return "鍏抽棴鎻愮ず";
+ }
+ },
+
handleUploadError() {},
// 鑾峰彇璇锋眰澶�
Getnetworkheader() {
@@ -1903,12 +1919,15 @@
//鑾峰彇鎶ラ攢涓讳俊鎭�
getReimbursement(curId).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 + "";
+ sessionStorage.removeItem("apiform");
+ sessionStorage.setItem("apiform", JSON.stringify(this.form));
//鑾峰彇鎶ラ攢鏄庣粏淇℃伅
getReimbursementdetaillist(curId).then(res => {
@@ -1917,20 +1936,16 @@
if (this.rbDetails.length == 0) {
this.addDetailRow(0);
}
-
//瀹炴椂鍚堣閲戦
//this.sumTotalFee();
for (let i = 0; i < this.rbDetails.length; i++) {
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,
- }; */
}
+ sessionStorage.removeItem("apifunddetail");
+ sessionStorage.setItem(
+ "apifunddetail",
+ JSON.stringify(this.rbDetails)
+ );
});
//鑾峰彇鎶ラ攢鎵撴淇℃伅
@@ -2012,6 +2027,8 @@
this.addPayeeRow(0);
}
});
+ sessionStorage.removeItem("apiform");
+ sessionStorage.setItem("apiform", JSON.stringify(this.form));
});
},
@@ -2027,6 +2044,7 @@
getReimbursement(id).then(response => {
this.form = response.data;
+
//绁ㄦ嵁
this.fileListto = this.form.annexfiles
? this.form.annexfiles
@@ -2076,6 +2094,8 @@
this.addPayeeRow(0);
}
});
+ sessionStorage.removeItem("apiform");
+ sessionStorage.setItem("apiform", JSON.stringify(this.form));
});
},
@@ -2244,6 +2264,11 @@
rbPayees[i].rbid = response.data;
addReimbursementpayee(rbPayees[i]);
}
+ sessionStorage.setItem(
+ "apifunddetail",
+ JSON.stringify(this.rbDetails)
+ );
+ sessionStorage.setItem("apiform", JSON.stringify(this.form));
this.$modal.msgSuccess("鏂板鎶ラ攢鍗曚繚瀛樻垚鍔�!");
this.open = false;
--
Gitblit v1.9.3