From 44cb62ea744df9576d3591a96868364af2a2ffa0 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 07 十一月 2023 18:15:24 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 2
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 132 ++++++++++++++++++++--
src/views/project/fundcheck/expertFeeCheck/index.vue | 154 ++++++++++++++++++++----
src/views/project/fundcheck/performanceCheck/index.vue | 20 ++
src/api/project/fund.js | 8 +
5 files changed, 270 insertions(+), 46 deletions(-)
diff --git a/src/api/project/fund.js b/src/api/project/fund.js
index 0663c8e..5c20776 100644
--- a/src/api/project/fund.js
+++ b/src/api/project/fund.js
@@ -47,6 +47,14 @@
data: data
})
}
+// 璁＄畻璐圭敤鐢宠涓�
+export function TotalcalculationFn(data) {
+ return request({
+ url: '/project/fund/totaltax',
+ method: 'post',
+ data: data
+ })
+}
// 淇敼璐圭敤鐢宠涓�
// export function updateFund(data) {
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index f339d54..5bbcfa4 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -150,7 +150,7 @@
<div
style="margin-bottom: 15px;"
v-if="
- userprofile.nickName == '闄堟厱鍗�'
+ userprofile.nickName == '闄堟厱鍗�'&&(businessType=='1'||businessType=='2')
"
>
<el-button
diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
index e5cd13c..9b8a1ca 100644
--- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -67,7 +67,7 @@
<el-row>
<el-col :span="5">
<el-form-item
- label-width="120px"
+ label-width="120px"
label="鐢宠鏉愭枡鐘舵��"
prop="checkstatus"
style="float: left"
@@ -112,23 +112,49 @@
</el-col>
</el-row>
</el-form>
+ <el-row>
+ <el-col :span="8">
+ <div style="margin-bottom: 15px;">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-circle-check"
+ size="mini"
+ @click="Totalcalculation(1)"
+ >璁＄◣鍚庡悎璁�</el-button
+ >
+ <el-button
+ icon="el-icon-remove-outline"
+ type="success"
+ plain
+ size="mini"
+ @click="Totalcalculation(0)"
+ >璁＄◣鍓嶅悎璁�</el-button
+ >
+ </div>
+ </el-col>
+ </el-row>
<el-form ref="infoform" label-width="100px">
<el-row>
<el-table
v-loading="loading"
+ ref="multipleTable"
+ tooltip-effect="dark"
border
:data="donateconsolationfundList"
@selection-change="handleSelectionChange"
>
- <!--
- <el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag">
+ <el-table-column type="selection" width="45"> </el-table-column>
+ <el-table-column
+ label="涓◣璁＄畻鎯呭喌"
+ align="center"
+ prop="recordstatus"
+ width="200"
+ >
<template slot-scope="scope">
- <span v-if="scope.row.checkFlag == 0"><i class="el-icon-check"
- style="color: #5fb878; font-weight: bold"></i></span>
- <span v-else>寰呭鏍�</span>
+ <dict-tag :options="dict.type.sys_tax" :value="scope.row.istax" />
</template>
</el-table-column>
- -->
<el-table-column
label="鐢宠鏃ユ湡"
width="120"
@@ -708,7 +734,8 @@
getdownloadBX,
checkfund,
listbypower,
- addFundSharedInfo
+ addFundSharedInfo,
+ TotalcalculationFn
} from "@/api/project/fund";
import {
onelistFunds,
@@ -775,7 +802,8 @@
"sys_fund_type",
"sys_finsubject",
"sys_financeitemtype",
- "sys_stage_type"
+ "sys_stage_type",
+ "sys_tax"
],
data() {
return {
@@ -817,6 +845,9 @@
exportLoading: false,
// 閫変腑鏁扮粍
ids: [],
+ overallids: [], //鎬婚�変腑
+ overallidsvalue: [], //鎬婚�変腑瀵硅薄
+
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -1267,9 +1298,86 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id);
- this.single = selection.length !== 1;
- this.multiple = !selection.length;
+ let xuanzlist = selection.map(item => item.id);
+ if (this.ids.length <= selection.length) {
+ this.ids = xuanzlist;
+ } else {
+ this.ids.forEach(item => {
+ if (xuanzlist.includes(item)) {
+ } else {
+ this.ids.splice(this.ids.indexOf(item), 1);
+ this.overallids.splice(this.overallids.indexOf(item), 1);
+ this.overallidsvalue.splice(this.overallidsvalue.indexOf(item), 1);
+ }
+ });
+ }
+ console.log(this.ids);
+ this.ids.forEach(item => {
+ if (this.overallids.includes(item)) {
+ console.log("3 is in the array");
+ } else {
+ this.overallids.push(item);
+ const obj = selection.find(obj => obj.id === item);
+ console.log(obj);
+ this.overallidsvalue.push(obj);
+
+ }
+ });
+ console.log(this.overallids);
+ },
+ // 鍒囨崲椤靛悗鎭㈠閫変腑
+ Restorecheck() {
+ console.log(this.donateconsolationfundList);
+ console.log(this.overallids);
+ const overlap = this.donateconsolationfundList.filter(value => {
+ return this.overallids.includes(value.id);
+ });
+ // 淇濇寔ids鍜屽綋鍓嶉〉闈㈢殑鍚屾鎬�
+ this.ids = overlap.map(item => item.id);
+ console.log(overlap, "褰撳墠椤甸�変腑鏁版嵁");
+ this.toggleSelection(overlap);
+ },
+ // 鎸傝浇閫夋嫨鐘舵��
+ toggleSelection(rows) {
+ console.log(rows);
+ if (rows) {
+ this.$nextTick(() => {
+ rows.forEach(row => {
+ console.log(row);
+ this.$refs.multipleTable.toggleRowSelection(row, true);
+ console.log(1);
+ });
+ });
+ } else {
+ this.$refs.multipleTable.clearSelection();
+ }
+ },
+ Totalcalculation(tot) {
+ console.log(tot);
+ let bojite={
+ fundids:this.overallids,
+ isTaxAfter:tot,
+ }
+ if (tot == 0) {
+ TotalcalculationFn(bojite).then(row => {
+ console.log(row.msg);
+ if (row.code=200) {
+ this.$modal.msgSuccess(row.msg);
+ }else{
+ this.$modal.msgError(row.msg);
+ }
+ });
+ } else {
+ console.log(this.overallidsvalue);
+ const hasValue = this.overallidsvalue.every(obj => obj.istax == 1);
+ if (hasValue) {
+ TotalcalculationFn(bojite).then(row => {
+ console.log(row.msg);
+ });
+ } else {
+ this.$modal.msgError("璇烽�夋嫨绠楃◣鍚庣殑鏁版嵁杩涜鍚堝苟璁＄畻");
+ }
+ }
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 2372bdd..383b157 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -47,7 +47,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left">
+ <el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left">
<el-select
v-model="queryParams.CHECKFLAG"
placeholder="璇烽�夋嫨"
@@ -70,7 +70,12 @@
</el-row>
<el-row>
<el-col :span="5">
- <el-form-item label-width="120px" label="鐢宠鏉愭枡鐘舵��" prop="checkstatus" style="float: left">
+ <el-form-item
+ label-width="120px"
+ label="鐢宠鏉愭枡鐘舵��"
+ prop="checkstatus"
+ style="float: left"
+ >
<el-select
v-model="queryParams.checkstatus"
placeholder="璇烽�夋嫨"
@@ -113,10 +118,33 @@
</el-col>
</el-row>
</el-form>
+ <el-row>
+ <el-col :span="8">
+ <div style="margin-bottom: 15px;">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-circle-check"
+ size="mini"
+ @click="Totalcalculation(1)"
+ >璁＄◣鍚庡悎璁�</el-button
+ >
+ <el-button
+ icon="el-icon-remove-outline"
+ type="success"
+ plain
+ size="mini"
+ @click="Totalcalculation(0)"
+ >璁＄◣鍓嶅悎璁�</el-button
+ >
+ </div>
+ </el-col>
+ </el-row>
<el-form ref="infoform" label-width="100px">
<el-row>
<el-table
- v-loading="loading"
+ ref="multipleTable"
+ tooltip-effect="dark"
border
:data="donateconsolationfundList"
@selection-change="handleSelectionChange"
@@ -130,6 +158,17 @@
</template>
</el-table-column>
-->
+ <el-table-column type="selection" width="45"> </el-table-column>
+ <el-table-column
+ label="涓◣璁＄畻鎯呭喌"
+ align="center"
+ prop="recordstatus"
+ width="200"
+ >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_tax" :value="scope.row.istax" />
+ </template>
+ </el-table-column>
<el-table-column
label="鐢宠鏃ユ湡"
width="120"
@@ -733,7 +772,8 @@
getdownloadBX,
checkfund,
listbypower,
- addFundSharedInfo
+ addFundSharedInfo,
+ TotalcalculationFn
} from "@/api/project/fund";
import {
onelistFunds,
@@ -799,7 +839,8 @@
"sys_fund_type",
"sys_finsubject",
"sys_financeitemtype",
- "sys_stage_type"
+ "sys_stage_type",
+ "sys_tax"
],
data() {
return {
@@ -840,10 +881,8 @@
exportLoading: false,
// 閫変腑鏁扮粍
ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
+ overallids: [], //鎬婚�変腑
+ overallidsvalue: [], //鎬婚�変腑瀵硅薄
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
// 鎬绘潯鏁�
@@ -1023,6 +1062,7 @@
let arr = [];
this.total = res.total;
this.donateconsolationfundList = list;
+ this.Restorecheck();
});
},
dundcheck() {
@@ -1205,23 +1245,6 @@
this.donateconsolationfundList = response.rows;
});
},
-
- /** 鏌ヨ鎹愮尞浜洪亾鎱伴棶閲戝垪琛� */
- // getList() {
- // this.loading = true;
- // this.queryParams.params = {};
- // if (null != this.daterangeReporttime && "" != this.daterangeReporttime) {
- // this.queryParams.params["beginReporttime"] =
- // this.daterangeReporttime[0];
- // this.queryParams.params["endReporttime"] = this.daterangeReporttime[1];
- // }
- // // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
- // listFund(this.queryParams).then((response) => {
- // this.donatebaseinfoList = response.rows;
- // this.total = response.total;
- // this.loading = false;
- // });
- // },
// 鍙栨秷鎸夐挳
cancel() {
this.dialogOpen = false;
@@ -1286,9 +1309,82 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id);
- this.single = selection.length !== 1;
- this.multiple = !selection.length;
+ let xuanzlist = selection.map(item => item.id);
+ if (this.ids.length <= selection.length) {
+ this.ids = xuanzlist;
+ } else {
+ this.ids.forEach(item => {
+ if (xuanzlist.includes(item)) {
+ } else {
+ this.ids.splice(this.ids.indexOf(item), 1);
+ this.overallids.splice(this.overallids.indexOf(item), 1);
+ this.overallidsvalue.splice(this.overallidsvalue.indexOf(item), 1);
+ }
+ });
+ }
+ console.log(this.ids);
+ this.ids.forEach(item => {
+ if (this.overallids.includes(item)) {
+ console.log("3 is in the array");
+ } else {
+ this.overallids.push(item);
+ const obj = selection.find(obj => obj.id === item);
+ this.overallidsvalue.push(obj);
+ }
+ });
+ console.log(this.overallids);
+ },
+ // 鍒囨崲椤靛悗鎭㈠閫変腑
+ Restorecheck() {
+ console.log(this.donateconsolationfundList);
+ console.log(this.overallids);
+ const overlap = this.donateconsolationfundList.filter(value => {
+ return this.overallids.includes(value.id);
+ });
+ // 淇濇寔ids鍜屽綋鍓嶉〉闈㈢殑鍚屾鎬�
+ this.ids = overlap.map(item => item.id);
+ console.log(overlap, "褰撳墠椤甸�変腑鏁版嵁");
+ this.toggleSelection(overlap);
+ },
+ // 鎸傝浇閫夋嫨鐘舵��
+ toggleSelection(rows) {
+ console.log(rows);
+ if (rows) {
+ this.$nextTick(() => {
+ rows.forEach(row => {
+ console.log(row);
+ this.$refs.multipleTable.toggleRowSelection(row, true);
+ console.log(1);
+ });
+ });
+ } else {
+ this.$refs.multipleTable.clearSelection();
+ }
+ },
+ Totalcalculation(tot) {
+ console.log(tot);
+ let bojite={
+ fundids:this.overallids,
+ isTaxAfter:tot,
+ }
+ if (tot == 0) {
+ TotalcalculationFn(bojite).then(row => {
+ if (row.code=200) {
+ this.$modal.msgSuccess(row.msg);
+ }else{
+ this.$modal.msgError(row.msg);
+ }
+ });
+ } else {
+ const hasValue = this.overallidsvalue.every(obj => obj.istax == 1);
+ if (hasValue) {
+ TotalcalculationFn(bojite).then(row => {
+ console.log(row.msg);
+ });
+ } else {
+ this.$modal.msgError("璇烽�夋嫨绠楃◣鍚庣殑鏁版嵁杩涜鍚堝苟璁＄畻");
+ }
+ }
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
diff --git a/src/views/project/fundcheck/performanceCheck/index.vue b/src/views/project/fundcheck/performanceCheck/index.vue
index af1bc82..6e6b569 100644
--- a/src/views/project/fundcheck/performanceCheck/index.vue
+++ b/src/views/project/fundcheck/performanceCheck/index.vue
@@ -64,12 +64,11 @@
</el-select>
</el-form-item>
</el-col>
-
</el-row>
<el-row>
<el-col :span="5">
<el-form-item
- label-width="120px"
+ label-width="120px"
label="鐢宠鏉愭枡鐘舵��"
prop="checkstatus"
style="float: left"
@@ -113,6 +112,17 @@
:data="donateconsolationfundList"
@selection-change="handleSelectionChange"
>
+ <el-table-column type="selection" width="45"> </el-table-column>
+ <el-table-column
+ label="涓◣璁＄畻鎯呭喌"
+ align="center"
+ prop="recordstatus"
+ width="200"
+ >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_tax" :value="scope.row.istax" />
+ </template>
+ </el-table-column>
<el-table-column
label="鐢宠鏃ユ湡"
width="180"
@@ -311,7 +321,9 @@
"sys_finsubject",
"sys_financeitemtype",
"sys_consolationfundlevel",
- "sys_stage_type"
+ "sys_stage_type",
+ "sys_performance_type",
+ "sys_tax"
],
data() {
return {
@@ -387,7 +399,7 @@
}
],
checkmaterials: [
- {
+ {
value: 1,
label: "鏉愭枡寰呭鏍�"
},
--
Gitblit v1.9.3