From 4fc9abfa57e81e83b74bdbd2e2f6d71d3500ef66 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 19 九月 2023 11:26:07 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 590212a..7f8e422 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 = "閲戦";
@@ -2561,8 +2562,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;
+ }
targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅
}
+ console.log(targetValue,'鍚堣');
this.form.pretaxcost = targetValue;
//if (isNaN(parseFloat(tempDetail.taxedamount)))
@@ -2993,6 +2998,7 @@
for (let i = 0; i < this.checkedCities.length + 1; i++) {
this.rbDetails[i].orderno = i + 1;
}
+ this.calculateTax();
this.batchdialogVisible = false;
},
//鏂板涓�琛�
@@ -3309,7 +3315,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 +3323,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 +3342,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 +3476,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;
--
Gitblit v1.9.3