From 2bf3fda0cd085d5e6af9b55471701e44768d26a9 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 20 十二月 2023 15:47:07 +0800
Subject: [PATCH] yxh:修改了银行账户管理
---
src/views/project/fund/applyDetail/index.vue | 346 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 186 insertions(+), 160 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index f15f222..2771bcd 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -6,8 +6,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.createTime" type="date"
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
+ <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.applyTime" type="date"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="鏃� 鏈�">
</el-date-picker>
</el-form-item>
@@ -90,21 +90,21 @@
</el-row>
<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;" v-if="businessType == 2">
- <el-button type="success" icon="el-icon-download" @click="Batchentry">鎵归噺褰曞叆</el-button>
+ <div style="margin-bottom: 15px;">
+ <el-button type="primary" icon="el-icon-download" size="small" @click.native.prevent="importFeeItems">
+ 鎵归噺瀵煎叆鏈嶅姟椤圭洰
+ </el-button>
</div>
</el-col>
-
- <el-col :span="3">
- <div style="margin-bottom: 15px;" v-if="userprofile.nickName == '闄堟厱鍗�' &&
- (businessType == '1' || businessType == '2')
- ">
- <el-button type="success" icon="el-icon-edit-outline" @click="Manualcalculationfn">璁＄畻涓◣</el-button>
+ <el-col :span="3" v-if="businessType == 2">
+ <div style="margin-bottom: 15px;">
+ <el-button type="primary" icon="el-icon-download" size="small" @click="Batchentry">鎵归噺褰曞叆涓撳</el-button>
+ </div>
+ </el-col>
+ <el-col :span="3" v-if="userprofile.nickName == '闄堟厱鍗�' && (businessType == '1' || businessType == '2')">
+ <div style="margin-bottom: 15px;">
+ <el-button type="success" icon="el-icon-edit-outline" size="small"
+ @click="Manualcalculationfn">璁＄畻涓◣</el-button>
</div>
</el-col>
</el-row>
@@ -229,7 +229,7 @@
<el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200"
v-if="businessType == '1' || businessType == '2'">
<template slot-scope="scope">
- <el-form-item :error="scope.row.error" label-width="0">
+ <el-form-item label-width="0">
<el-input :disabled="userprofile.nickName != '闄堟厱鍗�'
" v-model.number="scope.row.idcardno" @input="tableParValueChange1(scope.row)"
placeholder="韬唤璇佸彿" />
@@ -379,11 +379,11 @@
<el-form ref="accountselectform" :rules="dialogrules" :model="accountselectform" label-width="120px">
<el-row v-if="selectionType == 'workunit'">
<el-col :span="24">
- <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitno" label-width="120px">
- <el-select v-model="accountselectform.expertunitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
+ <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitname" label-width="120px">
+ <el-select v-model="accountselectform.expertunitname" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
style="width: 100%">
<el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
- :value="spec.organizationid"></el-option>
+ :value="spec.organizationname"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -407,23 +407,24 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col :span="16"><el-form-item label="鏂板绫诲瀷" prop="usertype">
- <el-radio-group v-model="accountselectform.usertype" style="margin-bottom: 0">
+ <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-group>
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <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-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2' && accountselectform.usertype != 'org'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2' && accountselectform.usertype != 'org'">
<el-col :span="12">
<el-form-item label="韬唤璇佸彿" prop="idcardno">
<el-input v-model="accountselectform.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" />
@@ -438,7 +439,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2' && accountselectform.usertype != 'org'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2' && accountselectform.usertype != 'org'">
<el-col>
<el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitno">
<el-select v-model="accountselectform.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
@@ -454,7 +455,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
<el-input v-model="accountselectform.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" />
</el-form-item>
@@ -464,14 +465,14 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col>
<el-form-item label="鑱旂郴鍦板潃" prop="address">
<el-input v-model="accountselectform.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" />
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col>
<el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
<el-input v-model="accountselectform.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
@@ -724,7 +725,8 @@
delExternalperson,
addExternalperson,
updateExternalperson,
- exportExternalperson
+ exportExternalperson,
+ getOnlyCode,
} from "@/api/project/externalperson";
import { listItemexpense } from "@/api/project/itemexpense";
@@ -870,27 +872,17 @@
// 琛ㄥ崟鏍￠獙
rules: {
- // createTime: [
- // { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
- // ],
- reason: [
- { required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
- ],
- deptmentname: [
- { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
- ]
+ reason: [{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }],
+ deptmentname: [{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }]
},
+
dialogrules: {
- // expertidcardno: [{ validator: validatePass, trigger: "blur" }],
- depositbank: [
- { required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }
- ],
- bankcardno: [
- { required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" }
- ],
- unitno: [
- { required: true, message: "璇烽�夋嫨鍗曚綅鍚嶇О", trigger: "change" }
- ]
+ usertype: [{ required: true, message: "璇疯緭鍏ヨ处鎴风被鍨�", trigger: "blur" }],
+ username: [{ required: true, message: "璇疯緭鍏ヨ处鎴峰悕绉�", trigger: "blur" }],
+ idcardno: [{ required: true, message: "璇疯緭鍏ヨ韩浠借处鍙�", trigger: "blur" }],
+ //idcardno: [{ validator: validatePass, trigger: "blur" }],
+ depositbank: [{ required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }],
+ bankcardno: [{ required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" }],
},
accountselectform: {
@@ -908,13 +900,15 @@
unitno: null,
personnelunitno: null,
address: null,
- telephone: null
+ telephone: null,
+ username: null,
+ userno: null
},
accountform: {
searchValue: null,
id: null,
- userstatus: 1,
+ userstatus: 0,
usertype: null,
pym: null,
@@ -979,6 +973,11 @@
userno: null,
username: null,
usertype: null
+ },
+ // 鏌ヨ鏈�鏂板簭鍙峰弬鏁�
+ seqnoParams: {
+ businessType: "externalperson",
+ datequery: false,
},
//璁＄畻涓◣鍙傛暟
@@ -1379,7 +1378,7 @@
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
this.form.recordstatus = 0;
var currenttime = new Date();
- this.form.createTime =
+ this.form.applyTime =
currenttime.getFullYear() +
"-" +
(currenttime.getMonth() + 1) +
@@ -1594,6 +1593,8 @@
// });
} else {
this.form.recordstatus = -1;
+ var currenttime = new Date();
+ this.form.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth() + 1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
// addorupdateFund(this.form).then((response) => {
// if (response.code === 200) {
@@ -1716,8 +1717,7 @@
this.form.deptmentno = this.userprofile.dept.deptId;
this.form.managername = this.userprofile.dept.leader;
this.form.phone = this.userprofile.phonenumber;
- // this.form.applytype = this.businessType;
- // this.form.createTime = new Date();
+ // this.form.applytype = this.businessType;
if (this.businessType == "4") {
this.getUserAccount();
@@ -1737,6 +1737,24 @@
getAccountList() {
listExternalperson().then(res => {
this.accountlist = res.rows;
+ //鑾峰彇鍚敤鐨勮处鎴峰垪琛�
+ for (let j = 0; j < res.length; j++) {
+ //鍗曚綅璐﹀彿鍒楄〃
+ if (res.userstatus == "1") {
+ this.accountlist.push({
+ id: res.id,
+ userno: res.userno,
+ username: res.username,
+ idcardno: res.idcardno,
+ title: res.title,
+ depositbank: res.depositbank,
+ bankcardno: res.bankcardno,
+ unitno: res.unitno,
+ unitname: res.unitname
+ });
+ }
+ }
+
/**
for (let j = 0; j < this.accountlist.length; j++) {
//鍗曚綅璐﹀彿鍒楄〃
@@ -2724,6 +2742,7 @@
console.log(row);
window.location.href = this.Networkheader + "/prod-api" + row.url;
},
+
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
showSelectionDialog(scope, selectiontype) {
this.selectionScope = scope;
@@ -2733,15 +2752,15 @@
if (this.selectionType == "account") {
//榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴�
this.accountfrom = "1";
-
- this.accountselectform.accountno = scope.row.beneficiaryno;
this.accountselectform.accountname = scope.row.beneficiaryname;
+ this.accountselectform.accountno = scope.row.beneficiaryno;
this.accountselectform.expertunitname = "";
this.accountselectform.expertunitno = "";
- this.accountselectform.unitno = "";
- this.accountselectform.unitname = "";
- this.accountselectform.telephone = "";
+
+ this.accountselectform.username = '';
+ this.accountselectform.userno = '';
this.accountselectform.idcardno = "";
+ this.accountselectform.telephone = "";
this.accountselectform.title = "";
this.accountselectform.unitno = "";
this.accountselectform.unitname = "";
@@ -2765,120 +2784,116 @@
if (this.selectionType == "account") {
if (this.accountfrom == "1") {
//璧嬪�间俊鎭�
- this.accountlist.map(res => {
- if (res.username == this.accountselectform.accountname) {
- console.log(res);
- 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].bankcardno = res.bankcardno;
- this.rbDetails[tempIndex].phone = res.telephone;
+ if (this.rbDetails[tempIndex].beneficiaryname != this.accountselectform.accountname) {
+ 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].bankcardno = res.bankcardno;
+ this.rbDetails[tempIndex].phone = res.telephone;
- if (res.usertype == "org") {
- this.rbDetails[tempIndex].idcardno = "";
- this.rbDetails[tempIndex].title = "";
- this.rbDetails[tempIndex].unitno = "";
- this.rbDetails[tempIndex].unitname = "";
- } else {
- this.rbDetails[tempIndex].idcardno = res.idcardno;
- this.rbDetails[tempIndex].title = res.title;
- this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
- this.rbDetails[tempIndex].unitname = res.unitname;
- }
- }
- });
- } else if (this.accountfrom == "2") {
- //淇濆瓨鏂板璐﹀彿
- this.accountform.id = null;
- this.accountform.userno =
- this.accountlist[this.accountlist.length - 1].id + 1;
- this.accountform.usertype = this.accountselectform.usertype;
- this.accountform.username = this.accountselectform.username;
- this.accountform.idcardno = this.accountselectform.idcardno;
- this.accountform.sex = null;
- this.accountform.title = this.accountselectform.title;
- this.accountform.telephone = this.accountselectform.telephone;
- this.accountform.address = this.accountselectform.address;
- this.accountform.wbm = null;
- this.accountform.pym = null;
-
- this.accountform.depositbank = this.accountselectform.depositbank;
- this.accountform.bankcardno = this.accountselectform.bankcardno;
- this.accountform.branchbankname = null;
- this.accountform.remark = null;
- this.accountform.del_flag = "0";
- this.accountform.personnelunitno = null;
-
- if (this.accountselectform.usertype != "org") {
- this.accountform.unitno = this.accountselectform.unitno;
- this.unitList.map(res => {
- if (res.organizationid == this.accountform.unitno) {
- this.accountform.unitname = res.organizationname;
+ if (res.usertype == "org") {
+ this.rbDetails[tempIndex].idcardno = "";
+ this.rbDetails[tempIndex].title = "";
+ this.rbDetails[tempIndex].unitno = "";
+ this.rbDetails[tempIndex].unitname = "";
+ } else {
+ this.rbDetails[tempIndex].idcardno = res.idcardno;
+ this.rbDetails[tempIndex].title = res.title;
+ this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
+ this.rbDetails[tempIndex].unitname = res.unitname;
+ }
}
});
- // try {
- // let unitIndex = this.unitList.findIndex(
- // item => this.accountform.unitno == item.organizationid
- // );
- // if (unitIndex > -1) {
- // this.accountform.unitname = this.unitList[unitIndex].organizationname;
- // } else {
- // this.accountform.unitname = this.accountform.unitno;
- // }
- // } catch {
- // this.accountform.unitname = this.accountform.unitno;
- // }
}
- addExternalperson(this.accountform).then(response => {
- if (response.code == 200) {
- //this.$modal.msgSuccess("鏂扮殑涓撳鎴栧崟浣嶈处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�");
- this.accountselectform.accountno = this.accountselectform.userno;
- this.accountselectform.accountname = this.accountselectform.username;
+ } else if (this.accountfrom == "2") {
+ //淇濆瓨鏂板璐﹀彿
+ //鑾峰彇鐢ㄦ埛缂栧彿
+ // this.accountform.userno = this.accountlist[this.accountlist.length - 1].id + 1;
+ getOnlyCode(this.seqnoParams).then((res) => {
+ this.accountform.userno = res.data.currentvalue;
+ this.accountform.id = null;
- //閲嶆柊鑾峰彇璐︽埛鍒楄〃
- listExternalperson().then(res => {
- this.accountlist = res.rows;
+ this.accountform.usertype = this.accountselectform.usertype;
+ this.accountform.username = this.accountselectform.username;
+ this.accountform.idcardno = this.accountselectform.idcardno;
+ this.accountform.sex = null;
+ this.accountform.title = this.accountselectform.title;
+ this.accountform.telephone = this.accountselectform.telephone;
+ this.accountform.address = this.accountselectform.address;
+ this.accountform.wbm = null;
+ this.accountform.pym = null;
- //璧嬪�间俊鎭�
- 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].bankcardno = res.bankcardno;
- this.rbDetails[tempIndex].phone = res.telephone;
+ this.accountform.depositbank = this.accountselectform.depositbank;
+ this.accountform.bankcardno = this.accountselectform.bankcardno;
+ this.accountform.branchbankname = null;
+ this.accountform.remark = null;
+ this.accountform.del_flag = "0";
+ this.accountform.personnelunitno = null;
- if (res.usertype == "org") {
- this.rbDetails[tempIndex].idcardno = "";
- this.rbDetails[tempIndex].title = "";
- this.rbDetails[tempIndex].unitno = "";
- this.rbDetails[tempIndex].unitname = "";
- } else {
- this.rbDetails[tempIndex].idcardno = res.idcardno;
- this.rbDetails[tempIndex].title = res.title;
- this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
- this.rbDetails[tempIndex].unitname = res.unitname;
- }
- }
- });
+ if (this.accountselectform.usertype != "org") {
+ this.accountform.unitno = this.accountselectform.unitno;
+ this.unitList.map(res => {
+ if (res.organizationid == this.accountform.unitno) {
+ this.accountform.unitname = res.organizationname;
+ }
});
+ }
+ addExternalperson(this.accountform).then(response => {
+ if (response.code == 200) {
+ 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].bankcardno = res.bankcardno;
+ this.rbDetails[tempIndex].phone = res.telephone;
+
+ if (res.usertype == "org") {
+ this.rbDetails[tempIndex].idcardno = "";
+ this.rbDetails[tempIndex].title = "";
+ this.rbDetails[tempIndex].unitno = "";
+ this.rbDetails[tempIndex].unitname = "";
+ } else {
+ this.rbDetails[tempIndex].idcardno = res.idcardno;
+ this.rbDetails[tempIndex].title = res.title;
+ this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
+ this.rbDetails[tempIndex].unitname = res.unitname;
+ }
+ }
+ });
+ });
+ */
+ }
+ });
+ });
+
+
+ }
+ } else if (this.selectionType == "workunit") {
+ if (this.rbDetails[tempIndex].unitname != this.accountselectform.expertunitname) {
+ this.rbDetails[tempIndex].unitname = this.accountselectform.expertunitname;
+ this.unitList.map(res => {
+ if (res.organizationname == this.accountselectform.expertunitname) {
+ this.rbDetails[tempIndex].unitno = res.organizationid;
}
});
}
- } else if (this.selectionType == "workunit") {
- console.log(tempIndex);
-
- this.rbDetails[
- tempIndex
- ].unitno = this.accountselectform.expertunitno;
- this.unitList.map(res => {
- if (res.organizationid == this.accountform.unitno) {
- this.rbDetails[tempIndex].unitno.unitname = res.organizationname;
- }
- });
}
//鍏抽棴绐楀彛
@@ -2901,6 +2916,17 @@
} else {
row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�";
}
+ },
+
+ //璐︽埛绫诲瀷閫夋嫨鍙樺寲
+ userTypeChange(type) {
+ if (type == "org") {
+ this.accountselectform.idcardno = "";
+ this.accountselectform.unitno = "";
+ this.accountselectform.unitname = "";
+ this.accountselectform.personnelunitno = "";
+ };
+ // this.$modal.msgWarning(type);
}
},
--
Gitblit v1.9.3