From 8674bd83142b905e2377ddeeba6d0163c37bd48f Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 26 十二月 2023 15:49:01 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/applyDetail/index.vue | 83 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 2771bcd..5f8b9ac 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -393,7 +393,7 @@
<el-form-item label="璐︽埛鏉ユ簮" prop="accountfrom" class="left-align">
<el-radio-group v-model="accountfrom" style="margin-bottom: 0">
<el-radio label="1">浠庤处鎴峰簱</el-radio>
- <el-radio label="2">鏂板璐︽埛锛堟柊澧炲悗闇�瑕佸鏍哥‘璁ゆ墠鑳藉惎鐢級</el-radio>
+ <el-radio label="2">鏂板璐︽埛锛堟柊澧炰笓瀹惰处鎴峰悗闇�瑕佸鏍稿惎鐢ㄦ墠鑳戒娇鐢級</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -408,11 +408,13 @@
</el-col>
</el-row>
<el-row v-if="selectionType == 'account' && accountfrom == '2'">
- <el-col :span="16"><el-form-item label="鏂板绫诲瀷" prop="usertype">
+ <el-col :span="24">
+ <el-form-item label="鏂板绫诲瀷" prop="usertype" class="left-align">
<el-radio-group v-model="accountselectform.usertype" style="margin-bottom: 0"
@change="userTypeChange(accountselectform.usertype)">
- <el-radio label="expert">鏂板涓撳璐﹀彿</el-radio>
- <el-radio label="org">鏂板鍗曚綅璐﹀彿</el-radio>
+ <el-radio label="expert">涓撳璐﹀彿</el-radio>
+ <el-radio label="org">鍗曚綅璐﹀彿</el-radio>
+ <el-radio label="donor">鎹愮尞鑰呬翰灞炶处鍙�</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -420,7 +422,7 @@
<el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col :span="24">
<el-form-item label="璐﹀彿鍚嶇О" prop="username">
- <el-input v-model="accountselectform.username" placeholder="璇疯緭鍏ュ崟浣嶅悕绉版垨涓撳濮撳悕" />
+ <el-input v-model="accountselectform.username" placeholder="璇疯緭鍏ュ崟浣嶅悕绉帮紝鎴栦笓瀹跺鍚嶏紝鎴栧叾浠栬处鍙�" />
</el-form-item>
</el-col>
</el-row>
@@ -430,7 +432,7 @@
<el-input v-model="accountselectform.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" />
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12" v-if="accountselectform.usertype == 'expert'">
<el-form-item label="鑱岀О" prop="title">
<el-select v-model="accountselectform.title" placeholder="璇烽�夋嫨浜哄憳鑱岀О">
<el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
@@ -439,7 +441,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="selectionType == 'account' && accountfrom == '2' && accountselectform.usertype != 'org'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2' && accountselectform.usertype == 'expert'">
<el-col>
<el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitno">
<el-select v-model="accountselectform.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
@@ -875,7 +877,7 @@
reason: [{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }],
deptmentname: [{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }]
},
-
+
dialogrules: {
usertype: [{ required: true, message: "璇疯緭鍏ヨ处鎴风被鍨�", trigger: "blur" }],
username: [{ required: true, message: "璇疯緭鍏ヨ处鎴峰悕绉�", trigger: "blur" }],
@@ -1664,23 +1666,31 @@
// },
checksubmit() {
console.log(this.checkObj.flowlevelone);
- if (this.userprofile.nickName == "闄堟厱鍗�") {
- //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
- if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
- this.$modal.msgError("璇风‘璁ゆ姤閿�鐨勭焊璐ㄦ潗鏂欏凡缁忔敹鍒帮紒");
- return;
- }
+ //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
+ if (this.checkObj.flowlevelone == 2 && !this.checkObj.flowconclusion && this.checkObj.flowconclusion.trim() != "") {
+ this.$modal.msgError("璇疯緭鍏ュ鏍镐笉閫氳繃鐨勮鏄庝俊鎭紝鏂逛究缁忓姙浜轰慨鏀圭敵璇峰崟锛�");
+ return;
+ }
+ else {
- //妫�鏌ヤ釜绋庤绠�
- // if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) {
- // this.$modal.msgError(
- // "鎻愪氦涓撳璐圭敤鐢宠鍗曘�佷鸡鐞嗕笓瀹剁敵璇疯垂鐢ㄧ敵璇峰崟瀹℃牳锛岄渶瑕佸厛瀹屾垚涓◣璁＄畻锛�"
- // );
- // return;
- // }
- if (this.form.applytype == "1" && this.form.fundtaxtime == null) {
- this.$modal.msgError("鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁＄畻锛�");
- return;
+ if (this.userprofile.nickName == "闄堟厱鍗�") {
+ //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
+ if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
+ this.$modal.msgError("璇风‘璁ゆ姤閿�鐨勭焊璐ㄦ潗鏂欏凡缁忔敹鍒帮紒");
+ return;
+ }
+
+ //妫�鏌ヤ釜绋庤绠�
+ // if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) {
+ // this.$modal.msgError(
+ // "鎻愪氦涓撳璐圭敤鐢宠鍗曘�佷鸡鐞嗕笓瀹剁敵璇疯垂鐢ㄧ敵璇峰崟瀹℃牳锛岄渶瑕佸厛瀹屾垚涓◣璁＄畻锛�"
+ // );
+ // return;
+ // }
+ if (this.form.applytype == "1" && this.form.fundtaxtime == null) {
+ this.$modal.msgError("鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁＄畻锛�");
+ return;
+ }
}
}
@@ -2833,7 +2843,7 @@
this.accountform.del_flag = "0";
this.accountform.personnelunitno = null;
- if (this.accountselectform.usertype != "org") {
+ if (this.accountselectform.usertype == "expert") {
this.accountform.unitno = this.accountselectform.unitno;
this.unitList.map(res => {
if (res.organizationid == this.accountform.unitno) {
@@ -2841,29 +2851,33 @@
}
});
}
+
addExternalperson(this.accountform).then(response => {
if (response.code == 200) {
- this.$modal.msgSuccess("鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒");
+ if (this.accountselectform.usertype == "expert") {
+ this.$modal.msgSuccess("鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒");
+ return;
+ } else {
+ this.$modal.msgSuccess("鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�");
+ }
- /**
this.accountselectform.accountno = this.accountselectform.userno;
this.accountselectform.accountname = this.accountselectform.username;
-
+
//閲嶆柊鑾峰彇璐︽埛鍒楄〃
listExternalperson().then(res => {
this.accountlist = res.rows;
-
+
//璧嬪�间俊鎭�
this.accountlist.map(res => {
if (res.username == this.accountselectform.accountname) {
this.rbDetails[tempIndex].beneficiaryno = res.userno;
this.rbDetails[tempIndex].beneficiaryname = res.username;
this.rbDetails[tempIndex].depositbank = res.depositbank;
- this.rbDetails[tempIndex].branchbankname =
- res.branchbankname;
+ this.rbDetails[tempIndex].branchbankname = res.branchbankname;
this.rbDetails[tempIndex].bankcardno = res.bankcardno;
this.rbDetails[tempIndex].phone = res.telephone;
-
+
if (res.usertype == "org") {
this.rbDetails[tempIndex].idcardno = "";
this.rbDetails[tempIndex].title = "";
@@ -2878,12 +2892,10 @@
}
});
});
- */
+
}
});
});
-
-
}
} else if (this.selectionType == "workunit") {
if (this.rbDetails[tempIndex].unitname != this.accountselectform.expertunitname) {
@@ -2900,6 +2912,7 @@
this.showselectiondialog = false;
});
},
+
tableParValueChange(row, tto) {
const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9]|X)$/;
if (tto) {
--
Gitblit v1.9.3