From 4b7cbbc7106e4d62afee30dd8a56152b2a75ead0 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 11 十月 2023 10:44:53 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 50 +++++++++++++------------
src/views/project/fund/expertFeeApply/index.vue | 14 +------
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 1
3 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index f1bebe6..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
@@ -2248,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 = {
@@ -3035,7 +3037,7 @@
beneficiaryname: null,
beneficiaryno: null,
unitname: null,
- itemdescribe:null,
+ itemdescribe: null,
unitno: null,
uintuserno: null,
title: null,
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index 4eeba97..373d32a 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -11,7 +11,7 @@
<el-col :span="6">
<el-form-item label="濮撳悕" prop="name">
<el-input
- v-model="queryParams.name"
+ v-model="queryParams.donorname"
placeholder="璇疯緭鍏ュ鍚�"
clearable
size="small"
@@ -36,17 +36,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input
- v-model="queryParams.donorname"
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- </el-col>
+
<el-col :span="6">
<el-button
type="primary"
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 4373323..b714ab3 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -2834,7 +2834,6 @@
"destination",
"traffictype",
"traffictype2",
- "departure"
];
columns.forEach((column, index) => {
if (index === 0) {
--
Gitblit v1.9.3