From 970660e0f54a635c2ea1c17e1a3d5d37ed671573 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 19 九月 2023 16:50:13 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 77 ++++++++++++++++++++++++++++----------
src/views/project/fund/expertFeeApply/index.vue | 1
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 3 +
src/views/project/fund/officeExpenseApply/index.vue | 1
4 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 7f8e422..ccf4751 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -779,6 +779,16 @@
>
<el-button
type="primary"
+ @click="handleup"
+ v-if="
+ operationType == 'add' ||
+ operationType == 'update' ||
+ ismanager == true
+ "
+ >涓婃姤</el-button
+ >
+ <el-button
+ type="primary"
@click="checksubmit"
v-if="operationType == 'check'"
>鎻愪氦瀹℃牳</el-button
@@ -935,10 +945,10 @@
style="width: 100%"
>
<el-option
- v-for="(spec, index) in unitList"
+ v-for="(spec, index) in feeUnitList"
:key="index"
- :label="spec.organizationname"
- :value="spec.organizationname"
+ :label="spec.reportName"
+ :value="spec.reportName"
></el-option>
</el-select>
</el-form-item>
@@ -1406,7 +1416,7 @@
exportLoading: false,
usernamedata: "",
jurisdiction: false,
-
+ Routinglevel: 1,
// 琛ㄥ崟鍙傛暟
form: {},
experthear: "",
@@ -1944,7 +1954,17 @@
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
- handleUp() {
+ handleup() {
+ if (
+ (JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
+ JSON.stringify(this.rbDetails) ==
+ sessionStorage.getItem("apifunddetail")) ||
+ !sessionStorage.getItem("apifunddetail")
+ ){
+ }else{
+ this.$message.error('璇蜂繚瀛樺悗鍐嶈繘琛屼笂鎶�');
+ return
+ }
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -1961,6 +1981,7 @@
type: "success",
message: "鐢宠鎴愬姛"
});
+ this.cancel()
} else {
this.$message({
type: "error",
@@ -2207,24 +2228,35 @@
// });
}
- addorupdateFund(this.form).then(response => {
- if (response.code === 200) {
- this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
- } else {
- this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
- }
- });
sessionStorage.setItem(
"apifunddetail",
JSON.stringify(this.rbDetails)
);
sessionStorage.setItem("apiform", JSON.stringify(this.form));
-
+ addorupdateFund(this.form).then(response => {
+ console.log(response, "淇濆瓨杩斿弬");
+ if (response.code === 200) {
+ this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: response.data,
+ businessType: "2",
+ operationType: "update",
+ curCase: this.curCase
+ }
+ });
+ this.Routinglevel++;
+ } else {
+ this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
+ }
+ });
//鍏抽棴绐楀彛
this.loading = false;
// this.getfundList();
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.go(-1);
+ // this.$store.dispatch("tagsView/delView", this.$route);
+ // this.$router.go(-1);
}
});
}, 500),
@@ -2249,8 +2281,10 @@
// 鍙栨秷鎸夐挳
cancel() {
// this.reset();
+ console.log(-this.Routinglevel);
this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.go(-1);
+ this.$router.go(-this.Routinglevel);
+
},
//鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
@@ -2352,6 +2386,7 @@
getFeeUnitList() {
listReportname("org").then(res => {
this.feeUnitList = res.data;
+ console.log(this.feeUnitList);
});
},
@@ -2562,12 +2597,12 @@
calculateTax(row, type) {
let targetValue = 0;
for (let i = 0; i < this.rbDetails.length; i++) {
- if(!this.rbDetails[i].amount){
- this.rbDetails[i].amount=0;
+ if (!this.rbDetails[i].amount) {
+ this.rbDetails[i].amount = 0;
}
targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅
}
- console.log(targetValue,'鍚堣');
+ console.log(targetValue, "鍚堣");
this.form.pretaxcost = targetValue;
//if (isNaN(parseFloat(tempDetail.taxedamount)))
@@ -3509,7 +3544,9 @@
beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ destroyed() {
+ window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
+ }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index 4776252..131be04 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -1559,6 +1559,7 @@
/** 涓婃姤鎸夐挳鎿嶄綔 */
handleUp(row) {
+ console.log(row);
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
diff --git a/src/views/project/fund/officeExpenseApply/index.vue b/src/views/project/fund/officeExpenseApply/index.vue
index 3a5efc5..bfa4d90 100644
--- a/src/views/project/fund/officeExpenseApply/index.vue
+++ b/src/views/project/fund/officeExpenseApply/index.vue
@@ -700,6 +700,7 @@
});
},
handleup(row) {
+ console.log(row);
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index b2a3e5a..315c6ee 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -1348,6 +1348,9 @@
this.$refs["table"].doLayout();
});
},
+ destroyed() {
+ window.removeEventListener('beforeunload', e => this.beforeunloadFn(e))
+ }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
methods: {
// 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
--
Gitblit v1.9.3