From df1103bf5ba31714f7828bb9b1cba585223abdf3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 28 八月 2023 11:04:06 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/applyDetail/index.vue | 121 +++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 46 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index c78600e..23a9bce 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -74,13 +74,12 @@
<el-form-item label="鐢宠閲戦" prop="pretaxcost">
<el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
</el-form-item>
- </el-col>
+ </el-col> <!--
<el-col :span="5">
<el-form-item label="搴旂即绋�" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
<el-input v-model="form.taxcost" placeholder="搴旂即绋庨噾棰濆悎璁�" :disabled="true" />
</el-form-item>
</el-col>
- <!--
<el-col :span="5">
<el-form-item label="绋庡悗閲戦" prop="pretaxcost">
<el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
@@ -93,7 +92,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
+ <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
</el-form-item>
</el-col>
<!--
@@ -167,8 +166,8 @@
" />
</template>
</el-table-column>
- <el-table-column v-if="businessType == 3 || businessType == 4 || ismanager == true" prop="amount"
- align="center" :label=amountLabel width="120">
+ <el-table-column v-if="businessType == 2 || businessType == 3 || businessType == 4 || ismanager == true"
+ prop="amount" align="center" :label=amountLabel width="120">
<template slot-scope="scope">
<!--
<el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
@@ -667,7 +666,7 @@
selectionType: "",
showSelectionDialog: false,
//绋庡墠閲戦鏍囬锛氫笓瀹惰垂-绋庡墠閲戦锛涘尰瀛︽垚鏈�佸姙鍏垂鐢�-閲戦
- amountLabel:"绋庡墠閲戦",
+ amountLabel: "绋庡墠閲戦",
// 琛ㄥ崟鏍￠獙
rules: {
@@ -857,33 +856,32 @@
// if (!this.businessType && !this.operationType) {
if (this.businessType == "1") {
- this.curCase = this.$route.query.curCase;
this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟"
- this.amountLabel="绋庡墠閲戦"
+ this.amountLabel = "绋庡墠閲戦"
this.getUnitList();
}
else if (this.businessType == "2") {
- this.curCase = this.$route.query.curCase;
this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟";
- this.amountLabel="绋庡墠閲戦"
+ this.amountLabel = "绋庡墠閲戦"
this.getUnitList();
}
else if (this.businessType == "3") {
- if (this.operationType != "check") {
- this.curCase = this.$route.query.curCase;
- }
this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
- this.amountLabel="閲戦"
+ this.amountLabel = "閲戦"
}
else if (this.businessType == "4") {
this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
- this.amountLabel="閲戦"
+ this.amountLabel = "閲戦"
// this.getBaseInfoList();
}
if (this.operationType == "add") {
this.title = this.businessName + "鏂板缓";
+ if (this.operationType != "4") {
+ this.curCase = this.$route.query.curCase;
+ console.log("this.curCase", this.curCase);
+ }
this.handleAdd();
}
else if (this.operationType == "update") {
@@ -981,6 +979,7 @@
getFund(this.curId).then(response => {
this.form = response.data;
+ console.log("response.data", response.data);
//闄勪欢澶勭悊
// this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
@@ -1032,13 +1031,18 @@
for (let m = 0; m < this.rbDetails.length; m++) {
this.rbDetails[m].itemlist = [];
this.getFeeItems(m, this.rbDetails[m]);
+
this.rbDetails[m].rowfeeblocks = [];
this.rbDetails[m].rowfeeblocks.push({
- expense: this.rbDetails[m].expense,
+ servicesscope: this.rbDetails[m].servicesscope,
expensedescribe: this.rbDetails[m].servicesscopename,
- remark: this.rbDetails[m].servicesscope,
- servicesscope: this.rbDetails[m].servicesscope
+ expense: this.rbDetails[m].expense,
+ remark: this.rbDetails[m].servicesscopename
});
+ }
+
+ if (this.rbDetails.length == 0) {
+ this.addRow(0);
}
});
@@ -1173,7 +1177,7 @@
// this.form.annexfiles = list.map(item => item.url).join(",");
// }
- //澶勭悊鏄庣粏
+ //澶勭悊鏄庣粏
for (let i = 0; i < this.rbDetails.length; i++) {
let tempDetail = this.rbDetails[i];
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
@@ -1191,15 +1195,9 @@
item => tempDetail.applytype == item.value
);
if (applytypeIndex > -1) {
- tempDetail.applytypename = this.rowfeeItemTypes[
- applytypeIndex
- ].label;
- tempDetail.subjecttype = this.rowfeeItemTypes[
- applytypeIndex
- ].subjecttype;
- tempDetail.subjecttypename = this.rowfeeItemTypes[
- applytypeIndex
- ].subjecttypename;
+ tempDetail.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
+ tempDetail.subjecttype = this.rowfeeItemTypes[applytypeIndex].subjecttype;
+ tempDetail.subjecttypename = this.rowfeeItemTypes[applytypeIndex].subjecttypename;
}
this.rbDetails[i] = tempDetail;
/*
@@ -1224,7 +1222,7 @@
});
}
- // 璁＄畻绋庡墠閲戦
+ // 璁＄畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰�
if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
//鑾峰彇鍙傛暟
this.taxParam.money = tempDetail.taxedamount.toString();
@@ -1240,7 +1238,32 @@
});
}
*/
+
}
+ //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
+ if (this.businessType == '2') {
+ for (let j = 0; j < this.rbDetails.length; j++) {
+ let tempDetail = this.rbDetails[j];
+ if (isNaN(parseFloat(tempDetail.amount)) || parseFloat(tempDetail.amount) == 0) {
+ this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (j + 1).toString() + "琛岀殑閲戦涓鸿緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�");
+ return;
+ }
+ }
+ } else if (this.businessType == '3' || this.businessType == '4') {
+ for (let j = 0; j < this.rbDetails.length; j++) {
+ let tempDetail = this.rbDetails[j];
+ if (isNaN(parseFloat(tempDetail.amount)) || parseFloat(tempDetail.amount) == 0) {
+ this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (j + 1).toString() + "琛岀殑閲戦涓鸿緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�");
+ return;
+ }
+ if (isNaN(parseFloat(tempDetail.amount)) || parseFloat(tempDetail.amount) == 0) {
+ tempDetail.taxedamount = tempDetail.amount
+ } else {
+ tempDetail.taxedamount = tempDetail.amount + tempDetail.taxamount
+ }
+ }
+ }
+
//璐圭敤鍚堣
// this.form.pretaxcost = parseFloat(this.totalPreTaxAmount).toFixed(2);
// this.form.taxedcost = parseFloat(this.totalAfterTaxAmount).toFixed(2);
@@ -1292,8 +1315,9 @@
});
//鍏抽棴绐楀彛
- // this.loading = false;
- // this.getfundList();
+ this.loading = false;
+ // this.getfundList();
+ this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1);
}
});
@@ -1308,14 +1332,18 @@
flowcontent: this.checkObj.flowconclusion,
};
checkfund(checkFundObj).then((res) => {
+ //鍏抽棴绐楀彛
this.reset();
this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
+ this.$store.dispatch('tagsView/delView', this.$route)
+ this.$router.go(-1);
});
},
// 鍙栨秷鎸夐挳
cancel() {
// this.reset();
+ this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1);
},
@@ -1324,25 +1352,26 @@
getUserProfile().then(res => {
this.userprofile = res.data;
this.standardlevel = res.data.standardlevel;
- if (
- this.userprofile.createBy == "admin" ||
- this.userprofile.createBy == "001" ||
- this.userprofile.createBy == "012" ||
- this.userprofile.createBy == "002"
- ) {
+ if (this.userprofile.userName == "admin" || this.userprofile.userName == "001" || this.userprofile.userName == "047") {
this.ismanager = true;
} else {
this.ismanager = false;
}
- this.form.username = this.userprofile.nickName;
- this.form.userno = this.userprofile.userName;
- 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();
+ console.log(this.userprofile, this.ismanager);
+ if (this.operationType == "add") {
+ this.form.username = this.userprofile.nickName;
+ this.form.userno = this.userprofile.userName;
+ 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();
+
+ if (this.businessType == "4") {
+ this.getUserAccount();
+ }
+ }
});
},
--
Gitblit v1.9.3