From 966a9c008ded0a25f1de183b680a291212445e31 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 20 十一月 2023 09:50:14 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/applyDetail/index.vue | 338 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 193 insertions(+), 145 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index c4f8e17..02d0d38 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -150,7 +150,7 @@
<div
style="margin-bottom: 15px;"
v-if="
- userprofile.nickName == '闄堟厱鍗�' && operationType == 'check'
+ userprofile.nickName == '闄堟厱鍗�'&&(businessType=='1'||businessType=='2')
"
>
<el-button
@@ -346,7 +346,7 @@
<el-table-column
prop="beneficiaryname"
align="center"
- label="濮撳悕"
+ label="涓撳/鍗曚綅"
width="120"
v-if="form.applytype == '1' || form.applytype == '2'"
>
@@ -366,7 +366,7 @@
<el-table-column
prop="unitno"
align="center"
- label="鍗曚綅鍚嶇О"
+ label="涓撳鎵�鍦ㄥ崟浣�"
width="250"
v-if="form.applytype != '4' && form.applytype != '3'"
>
@@ -448,7 +448,13 @@
v-if="form.applytype == '1' || form.applytype == '2'"
>
<template slot-scope="scope">
- <el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
+ <el-form-item :error="scope.row.error" label-width="0">
+ <el-input
+ v-model.number="scope.row.idcardno"
+ @input="tableParValueChange1(scope.row)"
+ placeholder="韬唤璇佸彿"
+ />
+ </el-form-item>
</template>
</el-table-column>
<el-table-column
@@ -753,7 +759,7 @@
style="text-align: center"
v-loading="loading"
>
- <el-form ref="funddetailForm" :model="funddetailForm">
+ <el-form ref="funddetailForm" :rules="funddrules" :model="funddetailForm">
<el-row v-if="businessType != 4 && businessType != 3">
<el-col
:span="24"
@@ -857,7 +863,7 @@
</el-col>
<el-col :span="24" v-if="experthear == 'unit'">
<el-form-item
- label="浜哄憳濮撳悕"
+ label="涓撳/鍗曚綅"
prop="beneficiaryname"
label-width="80px"
>
@@ -1446,6 +1452,14 @@
],
data() {
+ var validatePass = (rule, value, callback) => {
+ 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 (regex.test(value)) {
+ callback();
+ } else {
+ callback(new Error("韬唤璇佸彿鐮佹牸寮忛敊璇�"));
+ }
+ };
//杩欓噷瀛樻斁鏁版嵁
return {
// 閬僵灞�
@@ -1557,6 +1571,18 @@
],
deptmentname: [
{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
+ ]
+ },
+ funddrules: {
+ // expertidcardno: [{ validator: validatePass, trigger: "blur" }],
+ expertdepositbank: [
+ { required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }
+ ],
+ expertbankcardno: [
+ { required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" }
+ ],
+ expertunitno: [
+ { required: true, message: "璇烽�夋嫨鍗曚綅鍚嶇О", trigger: "change" }
]
},
@@ -2096,6 +2122,8 @@
);
return;
}
+
+ /*
if (
tempDetail.idcardno == null &&
this.businessType != "3" &&
@@ -2109,6 +2137,7 @@
);
return;
}
+ */
if (this.businessType == "1") {
if (tempDetail.servicesscope == null) {
@@ -2292,9 +2321,8 @@
this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�");
return;
}
- this.Savenow();
- console.log("淇濆瓨骞跺鎵�");
-
+ this.Savenow();
+ console.log("淇濆瓨骞跺鎵�");
},
// 鍙栨秷鎸夐挳
@@ -2862,20 +2890,22 @@
);
sessionStorage.setItem("apiform", JSON.stringify(this.form));
// this.$router.go(0);
- this.$router.push({
- path: "/finance/applyDetail/",
- query: {
- id: this.curId,
- businessType: this.businessType,
- operationType: this.operationType,
- curCase: this.curCase
- }
- });
- } else {
- // this.$message({
- // type: "error",
- // message: "鐢宠澶辫触"
+ // this.$router.push({
+ // path: "/finance/applyDetail/",
+ // query: {
+ // id: this.curId,
+ // businessType: this.businessType,
+ // operationType: this.operationType,
+ // curCase: this.curCase
+ // }
// });
+ this.$modal.msgSuccess("璁＄畻鎴愬姛");
+ this.handleCheck()
+ } else {
+ this.$message({
+ type: "error",
+ message: "璁＄畻閿欒"
+ });
}
});
},
@@ -3163,6 +3193,8 @@
uploadSccess(response, file, fileList) {
this.rbDetails;
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
+ console.log(response);
+ console.log(file);
if (this.activeName == 1) {
if (response.code == 200) {
// this.form.filename = file.raw.name;
@@ -3378,145 +3410,161 @@
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ConfirmDetailDialog() {
- // if (this.businessType == 4) {
- // if (this.experthear == "expert") {
- // this.funddetailForm.beneficiaryname = this.unitforname;
- // } else {
- // this.funddetailForm.beneficiaryname = this.Personnelforname;
- // }
- // }
- let tempIndex = this.funddetailForm.index;
- let tempExpertName = this.funddetailForm.beneficiaryname;
- let tempUnitname = this.funddetailForm.unitname;
- let singleDetail = this.rbDetails[tempIndex];
+ this.$refs["funddetailForm"].validate(valid => {
+ let tempIndex = this.funddetailForm.index;
+ let tempExpertName = this.funddetailForm.beneficiaryname;
+ let tempUnitname = this.funddetailForm.unitname;
+ let singleDetail = this.rbDetails[tempIndex];
- if (
- this.selectionType == "expert" ||
- this.businessType == 4 ||
- this.businessType == 3
- ) {
- if (this.expertfrom == "1" || this.experthear == "unit") {
- //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
- this.personlist.map(res => {
- if (tempExpertName == res.username) {
- singleDetail.beneficiaryno = res.userno;
- singleDetail.beneficiaryname = res.username;
- singleDetail.bankcardno = res.bankcardno;
- singleDetail.branchbankname = res.branchbankname;
- singleDetail.depositbank = res.depositbank;
- singleDetail.idcardno = res.idcardno;
- singleDetail.phone = res.telephone;
- singleDetail.title = res.title;
- singleDetail.unitname = res.unitname;
- singleDetail.unitno = parseInt(res.unitno);
- }
- });
- } else {
- //淇濆瓨鏂板涓撳
- this.expertform.id = null;
- this.expertform.userno =
- this.personlist[this.personlist.length - 1].id + 1;
- this.expertform.usertype = "expert";
- this.expertform.username = this.funddetailForm.expertname;
- this.expertform.idcardno = this.funddetailForm.expertidcardno;
- this.expertform.sex = null;
- this.expertform.telephone = null;
- this.expertform.address = null;
- this.expertform.wbm = null;
- this.expertform.pym = null;
+ if (
+ this.selectionType == "expert" ||
+ this.businessType == 4 ||
+ this.businessType == 3
+ ) {
+ if (this.expertfrom == "1" || this.experthear == "unit") {
+ //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
+ this.personlist.map(res => {
+ if (tempExpertName == res.username) {
+ singleDetail.beneficiaryno = res.userno;
+ singleDetail.beneficiaryname = res.username;
+ singleDetail.bankcardno = res.bankcardno;
+ singleDetail.branchbankname = res.branchbankname;
+ singleDetail.depositbank = res.depositbank;
+ singleDetail.idcardno = res.idcardno;
+ singleDetail.phone = res.telephone;
+ singleDetail.title = res.title;
+ singleDetail.unitname = res.unitname;
+ singleDetail.unitno = parseInt(res.unitno);
+ }
+ });
+ } else {
+ //淇濆瓨鏂板涓撳
+ this.expertform.id = null;
+ this.expertform.userno =
+ this.personlist[this.personlist.length - 1].id + 1;
+ this.expertform.usertype = "expert";
+ this.expertform.username = this.funddetailForm.expertname;
+ this.expertform.idcardno = this.funddetailForm.expertidcardno;
+ this.expertform.sex = null;
+ this.expertform.telephone = null;
+ this.expertform.address = null;
+ this.expertform.wbm = null;
+ this.expertform.pym = null;
- this.expertform.unitno = this.funddetailForm.expertunitno;
- try {
- let unitIndex = this.unitList.findIndex(
- item => this.expertform.unitno == item.organizationid
- );
- if (unitIndex > -1) {
- this.expertform.unitname = this.unitList[
- unitIndex
- ].organizationname;
- } else {
+ this.expertform.unitno = this.funddetailForm.expertunitno;
+ try {
+ let unitIndex = this.unitList.findIndex(
+ item => this.expertform.unitno == item.organizationid
+ );
+ if (unitIndex > -1) {
+ this.expertform.unitname = this.unitList[
+ unitIndex
+ ].organizationname;
+ } else {
+ this.expertform.unitname = this.expertform.unitno;
+ }
+ } catch {
this.expertform.unitname = this.expertform.unitno;
}
- } catch {
- this.expertform.unitname = this.expertform.unitno;
- }
- this.expertform.title = this.funddetailForm.experttitle;
- this.expertform.personnelunitno = null;
+ this.expertform.title = this.funddetailForm.experttitle;
+ this.expertform.personnelunitno = null;
- this.expertform.depositbank = this.funddetailForm.expertdepositbank;
- this.expertform.bankcardno = this.funddetailForm.expertbankcardno;
- this.expertform.branchbankname = null;
- this.expertform.remark = null;
- this.expertform.del_flag = "0";
+ this.expertform.depositbank = this.funddetailForm.expertdepositbank;
+ this.expertform.bankcardno = this.funddetailForm.expertbankcardno;
+ this.expertform.branchbankname = null;
+ this.expertform.remark = null;
+ this.expertform.del_flag = "0";
- addExternalperson(this.expertform).then(response => {
- if (response.code == 200) {
- this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�");
+ addExternalperson(this.expertform).then(response => {
+ if (response.code == 200) {
+ this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�");
- listExternalperson().then(res => {
- this.personlist = res.rows;
- //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
- this.personlist.map(res => {
- if (res.username == this.funddetailForm.expertname) {
- singleDetail.beneficiaryno = res.userno;
- singleDetail.beneficiaryname = res.username;
- singleDetail.bankcardno = res.bankcardno;
- singleDetail.branchbankname = res.branchbankname;
- singleDetail.depositbank = res.depositbank;
- singleDetail.idcardno = res.idcardno;
- singleDetail.phone = res.telephone;
- singleDetail.title = res.title;
- singleDetail.unitname = res.unitname;
- singleDetail.unitno = parseInt(res.unitno);
- }
+ listExternalperson().then(res => {
+ this.personlist = res.rows;
+ //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
+ this.personlist.map(res => {
+ if (res.username == this.funddetailForm.expertname) {
+ singleDetail.beneficiaryno = res.userno;
+ singleDetail.beneficiaryname = res.username;
+ singleDetail.bankcardno = res.bankcardno;
+ singleDetail.branchbankname = res.branchbankname;
+ singleDetail.depositbank = res.depositbank;
+ singleDetail.idcardno = res.idcardno;
+ singleDetail.phone = res.telephone;
+ singleDetail.title = res.title;
+ singleDetail.unitname = res.unitname;
+ singleDetail.unitno = parseInt(res.unitno);
+ }
+ });
});
- });
- }
- });
- }
- } else if (this.selectionType == "unit") {
- singleDetail.unitno = this.funddetailForm.unitno;
- if (this.businessType == 1 || this.businessType == 2) {
- try {
- let unitIndex = this.unitList.findIndex(
- item => singleDetail.unitno == item.organizationid
- );
- if (unitIndex > -1) {
- singleDetail.unitname = this.unitList[unitIndex].organizationname;
- } else {
+ }
+ });
+ }
+ } else if (this.selectionType == "unit") {
+ singleDetail.unitno = this.funddetailForm.unitno;
+ if (this.businessType == 1 || this.businessType == 2) {
+ try {
+ let unitIndex = this.unitList.findIndex(
+ item => singleDetail.unitno == item.organizationid
+ );
+ if (unitIndex > -1) {
+ singleDetail.unitname = this.unitList[
+ unitIndex
+ ].organizationname;
+ } else {
+ singleDetail.unitname = singleDetail.unitno;
+ }
+ } catch {
singleDetail.unitname = singleDetail.unitno;
}
- } catch {
- singleDetail.unitname = singleDetail.unitno;
- }
- } else if (this.businessType == 3 || this.businessType == 4) {
- try {
- let unitIndex = this.feeUnitList.findIndex(
- item => singleDetail.unitno == item.reportNo
- );
- if (unitIndex > -1) {
- singleDetail.unitname = this.feeUnitList[unitIndex].reportName;
- singleDetail.depositbank = this.feeUnitList[
- unitIndex
- ].depositbank;
- singleDetail.bankcardno = this.feeUnitList[unitIndex].bankcardno;
- } else {
+ } else if (this.businessType == 3 || this.businessType == 4) {
+ try {
+ let unitIndex = this.feeUnitList.findIndex(
+ item => singleDetail.unitno == item.reportNo
+ );
+ if (unitIndex > -1) {
+ singleDetail.unitname = this.feeUnitList[unitIndex].reportName;
+ singleDetail.depositbank = this.feeUnitList[
+ unitIndex
+ ].depositbank;
+ singleDetail.bankcardno = this.feeUnitList[
+ unitIndex
+ ].bankcardno;
+ } else {
+ singleDetail.unitname = singleDetail.unitno;
+ }
+ } catch {
singleDetail.unitname = singleDetail.unitno;
}
- } catch {
- singleDetail.unitname = singleDetail.unitno;
}
}
- }
- // if (this.experthear == "unit") {
- // singleDetail.unitname = "";
- // }
- if (this.businessType == 4 || this.businessType == 3) {
- singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
+ // if (this.experthear == "unit") {
+ // singleDetail.unitname = "";
+ // }
+ if (this.businessType == 4 || this.businessType == 3) {
+ singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
+ }
+ this.rbDetails[tempIndex] = singleDetail;
+ 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) {
+ if (regex.test(funddetailForm.expertidcardno)) {
+ row.error = "";
+ } else {
+ row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�";
+ }
+ return;
}
- this.rbDetails[tempIndex] = singleDetail;
- this.showSelectionDialog = false;
+ console.log(11);
+ if (regex.test(row.idcardno)) {
+ row.error = "";
+ } else {
+ row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�";
+ }
}
},
--
Gitblit v1.9.3