From 34a4dad9f162543e7c06177374141d9fed06bc9c Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 14 九月 2023 17:36:05 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 101 +++++++++++++++++++++++++++++---------------------
1 files changed, 59 insertions(+), 42 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 7dedd27..84eb3e4 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -177,15 +177,13 @@
>
</div></el-col
>
-
</el-row>
- <el-row v-if="businessType == 1&&operationType == 'check'">
-
+ <el-row v-if="businessType == 1 && operationType == 'check'">
<el-col :span="3"
><div style="margin-bottom: 15px;">
<el-button
type="success"
- icon="el-icon-download"
+ icon="el-icon-edit-outline"
@click="Manualcalculationfn"
>璁＄畻鏄庣粏</el-button
>
@@ -223,7 +221,7 @@
<template slot-scope="scope">
<el-select
v-model="scope.row.applytype"
- placeholder="鏈嶅姟绫诲瀷"
+ placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷"
@change="verifyFeeItemType(scope.row)"
>
<el-option
@@ -244,7 +242,7 @@
<template slot-scope="scope">
<el-select
v-model="scope.row.itemid"
- placeholder="鏈嶅姟椤圭洰"
+ placeholder="璇烽�夋嫨鏈嶅姟椤圭洰"
filterable
@change="verifyFeeItem(scope.row)"
:filter-method="val => searchItemType(val, scope)"
@@ -385,7 +383,11 @@
type="primary"
plain
@click="ShowDetailDialog(scope, 'expert')"
- >{{ scope.row.beneficiaryname }}</el-button
+ >{{
+ scope.row.beneficiaryname
+ ? scope.row.beneficiaryname
+ : "鐐瑰嚮閫夋嫨"
+ }}</el-button
>
<!-- <el-select
filterable
@@ -1441,8 +1443,8 @@
cityOptions: [],
checkAll: false,
checkedCities: [],
- Personnelforname: "璇烽�夋嫨",
- unitforname: "璇烽�夋嫨",
+ Personnelforname: null,
+ unitforname: null,
isIndeterminate: true,
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
@@ -2019,10 +2021,7 @@
return;
}
- if (
- tempDetail.beneficiaryno == null ||
- tempDetail.beneficiaryno == "鐐瑰嚮閫夋嫨"
- ) {
+ if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
(k + 1).toString() +
@@ -2558,30 +2557,36 @@
//璁＄畻涓◣锛歵ype(A:宸茬煡绋庡墠閲戦锛岃绠楃◣鍚庨噾棰濓紱B锛氬凡鐭ョ◣鍚庨噾棰濓紝璁＄畻绋庡墠閲戦)
calculateTax(row, type) {
+ let targetValue = 0;
+ for (let i = 0; i < this.rbDetails.length; i++) {
+ targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅
+ }
+ this.form.pretaxcost = targetValue;
+
//if (isNaN(parseFloat(tempDetail.taxedamount)))
//鑾峰彇鍙傛暟
- this.taxParam.beneficiaryNo = row.beneficiaryno;
- this.taxParam.startTime = this.form.createTime.substring(0, 10);
+ // this.taxParam.beneficiaryNo = row.beneficiaryno;
+ // this.taxParam.startTime = this.form.createTime.substring(0, 10);
- if (type == "A") {
- // 璁＄畻涓◣銆佺◣鍚庨噾棰�
- this.taxParam.money = row.amount.toString();
- getTaxByBeneFiciaryNo(this.taxParam).then(res => {
- if (res.code == 200) {
- row.taxamount = res.data;
- row.taxedamount = row.amount - row.taxamount;
- }
- });
- } else {
- // 璁＄畻绋庡墠銆佷釜绋庨噾棰�
- this.taxParam.money = row.taxedamount.toString();
- getTaxBeforeByAfterMoney(this.taxParam).then(res => {
- if (res.code == 200) {
- row.taxamount = res.data.nowTax;
- row.amount = parseFloat(res.data.nowTaxBeforeMoney);
- }
- });
- }
+ // if (type == "A") {
+ // // 璁＄畻涓◣銆佺◣鍚庨噾棰�
+ // this.taxParam.money = row.amount.toString();
+ // getTaxByBeneFiciaryNo(this.taxParam).then(res => {
+ // if (res.code == 200) {
+ // row.taxamount = res.data;
+ // row.taxedamount = row.amount - row.taxamount;
+ // }
+ // });
+ // } else {
+ // // 璁＄畻绋庡墠銆佷釜绋庨噾棰�
+ // this.taxParam.money = row.taxedamount.toString();
+ // getTaxBeforeByAfterMoney(this.taxParam).then(res => {
+ // if (res.code == 200) {
+ // row.taxamount = res.data.nowTax;
+ // row.amount = parseFloat(res.data.nowTaxBeforeMoney);
+ // }
+ // });
+ // }
},
//瀵煎叆鎵�鏈夐」鐩�
@@ -2608,8 +2613,8 @@
itemid: this.feeItemTypes[i].itemDetails[j].id,
itemcode: this.feeItemTypes[i].itemDetails[j].itemCode,
recordstatus: "-1",
- beneficiaryname: "鐐瑰嚮閫夋嫨",
- unitname: "鐐瑰嚮閫夋嫨",
+ beneficiaryname: null,
+ unitname: null,
itemlist: this.feeItemTypes[i].itemDetails,
rowfeeblocks: null,
servicesscope: null,
@@ -2691,10 +2696,7 @@
return;
}
- if (
- tempDetail.beneficiaryno == null ||
- tempDetail.beneficiaryno == "鐐瑰嚮閫夋嫨"
- ) {
+ if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
(k + 1).toString() +
@@ -2910,6 +2912,21 @@
Manualcalculationfn() {
ManualCalculation(this.rbDetails).then(res => {
console.log(res);
+ if (res.code == 200) {
+ sessionStorage.removeItem("apiform");
+ sessionStorage.removeItem("apifunddetail");
+ sessionStorage.setItem(
+ "apifunddetail",
+ JSON.stringify(this.rbDetails)
+ );
+ sessionStorage.setItem("apiform", JSON.stringify(this.form));
+ this.$router.go(0);
+ } else {
+ // this.$message({
+ // type: "error",
+ // message: "鐢宠澶辫触"
+ // });
+ }
});
},
// 鎵归噺褰曞叆鐐瑰嚮
@@ -2982,9 +2999,9 @@
orderno: null,
id: null,
fundid: null,
- beneficiaryname: "鐐瑰嚮閫夋嫨",
+ beneficiaryname: null,
beneficiaryno: null,
- unitname: "鐐瑰嚮閫夋嫨",
+ unitname: null,
unitno: null,
uintuserno: null,
title: null,
--
Gitblit v1.9.3