From 92cf010eaa361321e689bdedfe0fc1de59c3ff21 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 25 八月 2023 15:19:46 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/applyDetail/index.vue | 79 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 12b70ee..8eb3fcd 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>
<!--
@@ -151,7 +150,7 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="price" align="center" label="鍗曚环" width="120" v-if="0">
+ <el-table-column prop="price" align="center" label="鍗曚环" width="120" v-if="businessType == 4">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="鍗曚环" @blur="val => {
sumTotalFee(scope.row);
@@ -159,7 +158,7 @@
" />
</template>
</el-table-column>
- <el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="0">
+ <el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="businessType == 4">
<template slot-scope="scope">
<el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="val => {
sumTotalFee(scope.row);
@@ -167,8 +166,8 @@
" />
</template>
</el-table-column>
- <el-table-column v-if="businessType == 3 || businessType == 4 || ismanager == true" prop="amount"
- align="center" label="绋庡墠閲戦" 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
@@ -177,7 +176,7 @@
:value="dict.expense"></el-option>
</el-select>
-->
- <el-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" />
+ <el-input v-model="scope.row.amount" placeholder="閲戦" />
</template>
</el-table-column>
<el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="(this.ismanager == true) &
@@ -666,6 +665,8 @@
//涓撳/鍗曚綅閫夋嫨锛歟xpert/unit
selectionType: "",
showSelectionDialog: false,
+ //绋庡墠閲戦鏍囬锛氫笓瀹惰垂-绋庡墠閲戦锛涘尰瀛︽垚鏈�佸姙鍏垂鐢�-閲戦
+ amountLabel: "绋庡墠閲戦",
// 琛ㄥ崟鏍￠獙
rules: {
@@ -855,29 +856,32 @@
// if (!this.businessType && !this.operationType) {
if (this.businessType == "1") {
- this.curCase = this.$route.query.curCase;
this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟"
+ this.amountLabel = "绋庡墠閲戦"
this.getUnitList();
}
else if (this.businessType == "2") {
- this.curCase = this.$route.query.curCase;
this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟";
+ this.amountLabel = "绋庡墠閲戦"
this.getUnitList();
}
else if (this.businessType == "3") {
- if (this.operationType != "check") {
- this.curCase = this.$route.query.curCase;
- }
this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
+ this.amountLabel = "閲戦"
}
else if (this.businessType == "4") {
this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
+ 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") {
@@ -975,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 })) : []
@@ -1026,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);
}
});
@@ -1287,7 +1297,8 @@
//鍏抽棴绐楀彛
// this.loading = false;
- // this.getfundList();
+ // this.getfundList();
+ this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1);
}
});
@@ -1302,14 +1313,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);
},
@@ -1318,24 +1333,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 == "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