From 966a9c008ded0a25f1de183b680a291212445e31 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 20 十一月 2023 09:50:14 +0800
Subject: [PATCH] yxh
---
/dev/null | 0
src/views/project/donationdetails/index.vue | 2
src/views/project/fund/applyDetail/index.vue | 13 ++++--
src/views/project/fundcheck/expertFeeCheck/index.vue | 65 +++++++++++++++++++++-----------
4 files changed, 51 insertions(+), 29 deletions(-)
diff --git a/dist.7z b/dist.7z
deleted file mode 100644
index 7b4ce78..0000000
--- a/dist.7z
+++ /dev/null
Binary files differ
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index f681619..8780e32 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -156,7 +156,7 @@
<div style="background: #fff;">
<!-- 椤堕儴鏁版嵁 -->
<div class="boxdiv">
- <div class="top-text">鎹愮尞鑰呰褰曞伐浣滃彴</div>
+ <div class="top-text">鎹愮尞妗堜緥淇℃伅</div>
<el-form
ref="form"
:model="form"
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 5bbcfa4..02d0d38 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -346,7 +346,7 @@
<el-table-column
prop="beneficiaryname"
align="center"
- label="濮撳悕"
+ label="涓撳/鍗曚綅"
width="120"
v-if="form.applytype == '1' || form.applytype == '2'"
>
@@ -366,7 +366,7 @@
<el-table-column
prop="unitno"
align="center"
- label="鍗曚綅鍚嶇О"
+ label="涓撳鎵�鍦ㄥ崟浣�"
width="250"
v-if="form.applytype != '4' && form.applytype != '3'"
>
@@ -451,7 +451,7 @@
<el-form-item :error="scope.row.error" label-width="0">
<el-input
v-model.number="scope.row.idcardno"
- @input="tableParValueChange(scope.row)"
+ @input="tableParValueChange1(scope.row)"
placeholder="韬唤璇佸彿"
/>
</el-form-item>
@@ -863,7 +863,7 @@
</el-col>
<el-col :span="24" v-if="experthear == 'unit'">
<el-form-item
- label="浜哄憳濮撳悕"
+ label="涓撳/鍗曚綅"
prop="beneficiaryname"
label-width="80px"
>
@@ -1574,7 +1574,7 @@
]
},
funddrules: {
- expertidcardno: [{ validator: validatePass, trigger: "blur" }],
+ // expertidcardno: [{ validator: validatePass, trigger: "blur" }],
expertdepositbank: [
{ required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }
],
@@ -2122,6 +2122,8 @@
);
return;
}
+
+ /*
if (
tempDetail.idcardno == null &&
this.businessType != "3" &&
@@ -2135,6 +2137,7 @@
);
return;
}
+ */
if (this.businessType == "1") {
if (tempDetail.servicesscope == null) {
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index db33367..f33cf6d 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -122,20 +122,21 @@
<el-col :span="8">
<div style="margin-bottom: 15px;">
<el-button
+ icon="el-icon-remove-outline"
+ type="success"
+ plain
+ size="mini"
+ disabled="true"
+ @click="Totalcalculation(0)"
+ >涓◣鍓嶆眹鎬�</el-button
+ >
+ <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
+ >涓◣鍚庢眹鎬�</el-button
>
</div>
</el-col>
@@ -159,8 +160,8 @@
</el-table-column>
-->
<el-table-column type="selection" width="45"> </el-table-column>
- <el-table-column
- label="涓◣璁＄畻鎯呭喌"
+ <!-- <el-table-column
+ label="涓◣璁＄畻"
align="center"
prop="recordstatus"
width="200"
@@ -168,7 +169,28 @@
<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"
+ align="center"
+ prop="fundtaxtime"
+ >
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.fundtaxtime, "{y}-{m}-{d}") }}</span>
+ </template>
</el-table-column>
+ <el-table-column
+ label="鎵�灞炵粍鍒�"
+ align="center"
+ prop="deptmentname"
+ width="200px"
+ /><el-table-column
+ label="缁忓姙浜�"
+ align="center"
+ prop="username"
+ width="150px"
+ />
<el-table-column
label="鐢宠鏃ユ湡"
width="120"
@@ -179,24 +201,14 @@
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column
- label="缁忓姙浜�"
- align="center"
- prop="username"
- width="150px"
- />
+
<el-table-column
label="鐢宠閲戦"
align="center"
prop="pretaxcost"
width="200px"
/>
- <el-table-column
- label="鎵�灞炵粍鍒�"
- align="center"
- prop="deptmentname"
- width="200px"
- />
+
<el-table-column
label="缁勯暱"
align="center"
@@ -1374,6 +1386,13 @@
},
Totalcalculation(tot) {
console.log(tot);
+ if(this.overallids.length == 0) {
+ this.$message({
+ type: "info",
+ message: "褰撳墠娌℃湁閫夋嫨瑕佹眹鎬荤殑涓撳璐圭敵璇峰崟锛屼笉鑳芥眹鎬伙紒"
+ });
+ return;}
+
let bojite = {
fundids: this.overallids,
isTaxAfter: tot
--
Gitblit v1.9.3