From 149f8c929884c35f2f7260bc80651a69d5dbb4fb Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 01 十二月 2023 11:15:17 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 32 ++++++++++
src/views/project/fund/performancedetails/index.vue | 10 ++
src/views/project/fund/applyDetail/index.vue | 90 ++++++++++++++++++++----------
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 2
4 files changed, 100 insertions(+), 34 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index c363abf..f43ff28 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -978,6 +978,13 @@
label-width="100px"
label-position="right"
>
+ <el-form-item label-width="100px" label="閫夋嫨鍣ㄥ畼">
+ <el-checkbox-group v-model="organdecision">
+ <el-checkbox v-for="item in organlist" :label="item">
+ {{ item }}
+ </el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
<el-row>
<el-col :span="6">
<el-form-item label="瀛愬コ鏁伴噺" prop="kinshipChildrennum">
@@ -2325,11 +2332,30 @@
infoid: null
},
affirmform: {
- infoid: null
+ infoid: null,
+ organdecision: []
},
+ organdecision: [],
ethicform: {
infoid: null
},
+ organlist: [
+ "蹇冭剰",
+ "鍏ㄨ倽",
+ "宸﹁倽",
+ "鍙宠倽",
+ "宸﹁偩",
+ "鍙宠偩",
+ "鍏ㄨ偩",
+ "宸﹁偤",
+ "鍙宠偤",
+ "灏忚偁",
+ "鑵轰綋",
+ "閬椾綋",
+ "宸︾溂瑙掕啘",
+ "鍙崇溂瑙掕啘",
+ "鍏朵粬"
+ ],
allocationstatuslist: [
{ value: 0, label: "鏈垎閰�" },
{ value: 1, label: "宸插垎閰�" },
@@ -2606,6 +2632,9 @@
listRelativesconfirmation(searchParam).then(response => {
if (response.code == 200 && response.rows[0]) {
this.affirmform = response.rows[0];
+ if (this.affirmform.organdecision) {
+ this.organdecision = this.affirmform.organdecision.split(",");
+ }
if (!this.affirmform) {
this.affirmform = {};
this.affirmform.residenceprovincename = "";
@@ -2830,6 +2859,7 @@
});
} else if (this.actives == 2) {
this.affirmform.infoid = this.infoid;
+ this.affirmform.organdecision = this.organdecision.join(",");
this.$refs["affirmform"].validate(valid => {
if (valid) {
if (this.affirmform.id != null) {
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 1b3fbdf..ef54219 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -323,6 +323,23 @@
</template>
</el-table-column>
<el-table-column
+ prop="taxamount"
+ align="center"
+ label="鎵ｇ◣閲戦"
+ width="120"
+ v-if="
+ (this.ismanager == true) &
+ (form.applytype == '1' || form.applytype == '2')
+ "
+ >
+ <template slot-scope="scope">
+ <el-input
+ v-model="scope.row.taxamount"
+ placeholder="鎵ｇ◣閲戦"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
prop="taxedamount"
align="center"
label="绋庡悗閲戦"
@@ -451,6 +468,9 @@
<template slot-scope="scope">
<el-form-item :error="scope.row.error" label-width="0">
<el-input
+ :disabled="
+ userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+ "
v-model.number="scope.row.idcardno"
@input="tableParValueChange1(scope.row)"
placeholder="韬唤璇佸彿"
@@ -467,6 +487,9 @@
<!-- v-if="form.applytype != '4'" -->
<template slot-scope="scope">
<el-input
+ :disabled="
+ userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+ "
v-model="scope.row.depositbank"
placeholder="寮�鎴烽摱琛�"
/>
@@ -480,13 +503,16 @@
>
<template slot-scope="scope">
<el-input
+ :disabled="
+ userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+ "
v-model="scope.row.bankcardno"
placeholder="閾惰甯愬彿"
/>
</template>
</el-table-column>
<el-table-column
- prop="itemdescribe"
+ prop="itemdescrisca"
align="center"
width="330"
label="椤圭洰璇存槑"
@@ -1182,10 +1208,10 @@
<el-button
type="success"
size="mini"
- icon="el-icon-search" circle
+ icon="el-icon-search"
+ circle
@click.native.prevent.stop="Downloadfile(scope.row)"
- ></el-button
- >
+ ></el-button>
</template>
</el-table-column>
</el-table>
@@ -1285,10 +1311,10 @@
<el-button
type="success"
size="mini"
- icon="el-icon-search" circle
+ icon="el-icon-search"
+ circle
@click.native.prevent.stop="Downloadfile(scope.row)"
- ></el-button
- >
+ ></el-button>
</template>
</el-table-column>
</el-table>
@@ -2294,31 +2320,35 @@
JSON.stringify(this.rbDetails)
);
sessionStorage.setItem("apiform", JSON.stringify(this.form));
- addorupdateFund(this.form).then(response => {
- console.log(this.form);
- console.log(response, "淇濆瓨杩斿弬");
- if (response.code === 200) {
- if (this.form.id) {
- this.$modal.msgSuccess("鐢宠鍗曚慨鏀规垚鍔燂紒");
- this.$router.go(-1);
+ addorupdateFund(this.form)
+ .then(response => {
+ console.log(this.form);
+ console.log(response, "淇濆瓨杩斿弬");
+ if (response.code === 200) {
+ if (this.form.id) {
+ this.$modal.msgSuccess("鐢宠鍗曚慨鏀规垚鍔燂紒");
+ this.$router.go(-1);
+ } else {
+ this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: response.data,
+ businessType: "2",
+ operationType: "update",
+ curCase: this.curCase
+ }
+ });
+ }
+ this.form.id = response.data;
} else {
- this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.push({
- path: "/finance/applyDetail/",
- query: {
- id: response.data,
- businessType: "2",
- operationType: "update",
- curCase: this.curCase
- }
- });
+ this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
}
- this.form.id = response.data;
- } else {
- this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
- }
- });
+ })
+ .catch(res => {
+ this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + res);
+ });
//鍏抽棴绐楀彛
this.loading = false;
// this.getfundList();
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index f661042..eb106e5 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -254,9 +254,13 @@
align="center"
label="韬唤璇佸彿"
width="200"
- >
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
+ <el-input
+
+ v-model="scope.row.idcardno"
+ placeholder="韬唤璇佸彿"
+ />
</template>
</el-table-column>
@@ -268,6 +272,7 @@
>
<template slot-scope="scope">
<el-input
+
v-model="scope.row.depositbank"
placeholder="寮�鎴烽摱琛�"
/>
@@ -281,6 +286,7 @@
>
<template slot-scope="scope">
<el-input
+
v-model="scope.row.bankcardno"
placeholder="閾惰甯愬彿"
/>
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index f866229..7067353 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -2452,7 +2452,7 @@
this.$router.go(-1);
})
.catch(err => {
- this.$modal.msgError("鏂板鎶ラ攢鍗曚繚瀛樺け璐ワ紒");
+ this.$modal.msgError("鏂板鎶ラ攢鍗曚繚瀛樺け璐ワ紒" + res);
});
}
}
--
Gitblit v1.9.3