From cde7199a991fa91efeafdde898f64d8353b9c3d7 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 11 十月 2023 16:50:24 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 65 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index b9cf296..69bd09a 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -115,17 +115,6 @@
</el-col>-->
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px" />
- <el-row style="margin-bottom: 10px" v-if="businessType == '1'">
- <el-col :span="4">
- <el-button
- @click.native.prevent="importFeeItems"
- type="primary"
- size="small"
- >
- 瀵煎叆鏈嶅姟椤圭洰
- </el-button>
- </el-col>
- </el-row>
<el-row v-if="jurisdiction">
<!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
</el-alert> -->
@@ -136,29 +125,42 @@
>
</el-alert>
</el-row>
- <el-row v-if="businessType == 2">
+ <el-row>
+ <el-col :span="3" v-if="businessType == '1'">
+ <el-button
+ @click.native.prevent="importFeeItems"
+ type="primary"
+ size="small"
+ >
+ 瀵煎叆鏈嶅姟椤圭洰
+ </el-button>
+ </el-col>
<el-col :span="3"
- ><div style="margin-bottom: 15px;">
+ ><div style="margin-bottom: 15px;" v-if="businessType == 2">
<el-button
type="success"
icon="el-icon-download"
@click="Batchentry"
>鎵归噺褰曞叆</el-button
>
- </div></el-col
- >
- </el-row>
- <el-row v-if="businessType == 1 && operationType == 'check'">
- <el-col :span="3"
- ><div style="margin-bottom: 15px;">
+ </div>
+ </el-col>
+
+ <el-col :span="3">
+ <div style="margin-bottom: 15px;"
+ v-if="
+ (businessType == 1 || businessType == 2 || businessType == 5) &&
+ operationType != 'detail'
+ "
+ >
<el-button
type="success"
icon="el-icon-edit-outline"
@click="Manualcalculationfn"
>璁＄畻鏄庣粏</el-button
>
- </div></el-col
- >
+ </div>
+ </el-col>
</el-row>
<el-row>
<el-table
@@ -490,6 +492,21 @@
<el-input
v-model="scope.row.bankcardno"
placeholder="閾惰甯愬彿"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="itemdescribe"
+ align="center"
+ width="330"
+ label="椤圭洰璇存槑"
+ >
+ <template slot-scope="scope">
+ <el-input
+ type="textarea"
+ :rows="2"
+ v-model="scope.row.itemdescribe"
+ placeholder="椤圭洰璇存槑"
/>
</template>
</el-table-column>
@@ -2233,8 +2250,8 @@
//瀹℃壒鎻愪氦
checksubmit() {
- if (this.form.checkstatus != 3 && this.userprofile.nickName == "闄堟厱鍗�") {
- this.$modal.msgError("璇风‘璁ゆ敹鍒版潗鏂欏悗鍐嶆彁浜ゅ鏍革紒");
+ if (!this.form.checkstatus && this.userprofile.nickName == "闄堟厱鍗�") {
+ this.$modal.msgError("璇风‘璁ら瀹＄姸鎬佸悗鍐嶆彁浜ゅ鏍革紒");
return;
}
let checkFundObj = {
@@ -2995,6 +3012,7 @@
updateBy: null,
updateTime: null,
uploadflag: null,
+ itemdescribe: null,
uploadtime: null,
itemlist: [{ id: "27", itemName: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�" }],
servicesscope: null,
@@ -3019,6 +3037,7 @@
beneficiaryname: null,
beneficiaryno: null,
unitname: null,
+ itemdescribe: null,
unitno: null,
uintuserno: null,
title: null,
--
Gitblit v1.9.3