From e55484fc73e5d7dd3ae0a904a9d4eb56260cd6a4 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 13 十月 2023 10:31:13 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 81 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index f1bebe6..44be7c9 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="
+ userprofile.nickName == '闄堟厱鍗�' && operationType == 'check'
+ "
+ >
<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
@@ -736,15 +738,15 @@
v-if="operationType == 'check'"
>
<el-col :span="7">
- <el-form-item label="棰勫鐘舵��" prop="infoid">
+ <el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid">
<el-radio-group
v-model="form.checkstatus"
align="left"
:disabled="userprofile.nickName != '闄堟厱鍗�'"
>
- <el-radio label="1">寰呴瀹�</el-radio>
- <el-radio label="2">棰勫閫氳繃绛夊緟鏉愭枡</el-radio>
- <el-radio label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio>
+ <el-radio :label="1">寰呯敵璇锋潗鏂�</el-radio>
+ <el-radio :label="2">鐢宠鏉愭枡閫氳繃绛夊緟鏉愭枡</el-radio>
+ <el-radio :label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -778,8 +780,7 @@
v-if="
operationType == 'add' ||
operationType == 'update' ||
- ismanager == true ||
- beforehandType == '1'
+ ismanager == true
"
>鎻愪氦淇濆瓨</el-button
>
@@ -792,7 +793,7 @@
<el-button
type="primary"
@click="checksubmit"
- v-if="operationType == 'check' && beforehandType != '1'"
+ v-if="operationType == 'check'"
>鎻愪氦瀹℃牳</el-button
>
<el-button @click="cancel">鍏� 闂�</el-button>
@@ -1467,11 +1468,11 @@
baselisttages: [
{
id: 1,
- name: "寰呴瀹�"
+ name: "寰呯敵璇锋潗鏂�"
},
{
id: 2,
- name: "棰勫閫氳繃绛夊緟鏉愭枡"
+ name: "鐢宠鏉愭枡閫氳繃绛夊緟鏉愭枡"
},
{
id: 3,
@@ -1612,7 +1613,6 @@
money: "0",
startTime: ""
},
- beforehandType: null,
//鏈嶅姟璐圭敤鍙傛暟
expenseQueryParams: {
pageNum: 1,
@@ -1738,7 +1738,6 @@
this.curId = this.$route.query.id;
this.businessType = this.$route.query.businessType;
this.operationType = this.$route.query.operationType;
- this.beforehandType = this.$route.query.beforehandType;
//鑾峰彇璐圭敤椤圭洰绫诲瀷
this.getFeeTypes();
@@ -2223,7 +2222,9 @@
console.log(this.form);
console.log(response, "淇濆瓨杩斿弬");
if (response.code === 200) {
- this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
+ if (this.userprofile.nickName != "闄堟厱鍗�") {
+ this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
+ }
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.push({
path: "/finance/applyDetail/",
@@ -2248,8 +2249,13 @@
//瀹℃壒鎻愪氦
checksubmit() {
- if (this.form.checkstatus != 3 && this.userprofile.nickName == "闄堟厱鍗�") {
- this.$modal.msgError("璇风‘璁ゆ敹鍒版潗鏂欏悗鍐嶆彁浜ゅ鏍革紒");
+ console.log(this.checkObj.flowlevelone);
+ if (
+ this.form.checkstatus != 3 &&
+ this.userprofile.nickName == "闄堟厱鍗�" &&
+ this.checkObj.flowlevelone == 1
+ ) {
+ this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�");
return;
}
let checkFundObj = {
@@ -2262,6 +2268,9 @@
//鍏抽棴绐楀彛
this.reset();
this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
+ if (this.userprofile.nickName == "闄堟厱鍗�") {
+ this.submitForm();
+ }
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1);
});
@@ -3035,7 +3044,7 @@
beneficiaryname: null,
beneficiaryno: null,
unitname: null,
- itemdescribe:null,
+ itemdescribe: null,
unitno: null,
uintuserno: null,
title: null,
--
Gitblit v1.9.3