From 149bd3ef2573dd53ee9263ef54db8b106f857171 Mon Sep 17 00:00:00 2001 From: yangfuda <945208611@qq.com> Date: Fri, 14 Mar 2025 16:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9C=EF=BC=9A=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E3=80=81=E5=B9=BF=E8=A5=BF=E5=86=9C=E5=95=86=E8=A1=8C=E5=BC=80?= =?UTF-8?q?=E6=94=BE=E6=89=B9=E9=87=8F=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paymentApproval/approvalAdd.vue | 25 ++++++++++++++----- .../paymentApproval/approvalModify.vue | 16 ++++++++++-- src/views/sunVillage_info/index.vue | 12 ++++++++- src/views/yinnong/my.vue | 6 +++-- 4 files changed, 48 insertions(+), 11 deletions(-) diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue index f73968a1..a7fee5df 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue @@ -462,6 +462,7 @@ chargeItmeShow:[], templateList:[], payeeList:[], + bankTypeList:[], // 查询参数 queryParams: { transferType:"", @@ -513,6 +514,11 @@ } this.projectFundTypeDictionaries = response.data; }); + this.getDicts("bank_type").then((response) => { + for (var i = 0; i < response.data.length; i++) { + this.bankTypeList.push({text: response.data[i].dictLabel, value: response.data[i].dictValue}); + } + }); let params1={ accountType: "102", // "params":{townAccountType:'0'}, @@ -681,8 +687,14 @@ // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){ // this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' }); // }else - if(this.form.bankType == '7' && this.chargeItme.length>0 && this.chargeItme != []){ - this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' }); + var heilongjiang = false; + this.bankTypeList.map(res => { + if(res.value == 7 && res.text.includes("黑龙江")){ + heilongjiang = true; + } + }); + if(heilongjiang && this.form.bankType == '7' && this.chargeItme.length>0 && this.chargeItme != []){ + this.$notify({ type: 'danger', message: '目前黑龙江农商行仅支持单笔转账，即仅能有一个收款方！' }); }else{ this.getDicts("bank_type").then(res => { this.chargeItme.splice(index + 1, 0, { @@ -696,10 +708,11 @@ showPayee:false, showbankType:false }); - });} - if(this.form.bankType == '7'){ - this.isCanBatch = false; - } + }); + } + if(heilongjiang && this.form.bankType == '7'){ + this.isCanBatch = false; + } }, getPayeeList() { //普通转账 diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue index dbb4b864..445e6919 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue @@ -430,6 +430,7 @@ chargeItmeShow:[], payeeList:[], + bankTypeList:[], // 查询参数 queryParams: { transferType:"", @@ -499,6 +500,11 @@ } this.projectFundTypeDictionaries = response.data; }); + this.getDicts("bank_type").then((response) => { + for (var i = 0; i < response.data.length; i++) { + this.bankTypeList.push({text: response.data[i].dictLabel, value: response.data[i].dictValue}); + } + }); let params1={ accountType: "102", // "params":{townAccountType:'0'}, @@ -632,8 +638,14 @@ // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length==1){ // this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' }); // }else - if(this.form.bankType == '7' && this.chargeItme.length==1){ - this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' }); + var heilongjiang = false; + this.bankTypeList.map(res => { + if(res.value == 7 && res.text.includes("黑龙江")){ + heilongjiang = true; + } + }); + if(heilongjiang && this.form.bankType == '7' && this.chargeItme.length==1){ + this.$notify({ type: 'danger', message: '目前黑龙江农商行仅支持单笔转账，即仅能有一个收款方！' }); }else{ this.getDicts("bank_type_all").then(res => { this.chargeItme.splice(index + 1, 0, { diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue index af2b54f0..dc805fd4 100644 --- a/src/views/sunVillage_info/index.vue +++ b/src/views/sunVillage_info/index.vue @@ -62,6 +62,7 @@ import {logout} from "../../api/login"; import { sysConfig } from "@/api/homesteadSurvey/index"; import {removeToken} from "@/utils/auth"; + import { getConfigKey } from "@/api/system/config"; export default { name: "certificateList", data() { @@ -111,6 +112,16 @@ }; }, created() { + getConfigKey("system.app.yinnongExclusive").then(response => { + if(response.msg == "Y"){ + this.actions=[ + { text: '个人信息', icon: 'manager-o' , index: 0 }, + { text: '修改密码', icon: 'edit' , index: 1 }, + { text: '事项审批', icon: 'todo-list-o' , index: 2 }, + { text: '退出登录', icon: 'revoke' , index: 8 }, + ]; + } + }); getInfo().then(response => { this.bookName = response.user.bookName this.deptName = response.user.deptName @@ -128,7 +139,6 @@ }); this.getBookList(response.user.loginDeptId); }); - treeselectByUser().then((res) => { if (res.code == 200) { this.hcAreaInfoOption = res.data; diff --git a/src/views/yinnong/my.vue b/src/views/yinnong/my.vue index e74f2454..2c012945 100644 --- a/src/views/yinnong/my.vue +++ b/src/views/yinnong/my.vue @@ -9,7 +9,7 @@ margin: 0 auto; " > - +

{{nickName}}

{{deptName}}

@@ -170,7 +170,9 @@ this.nickName = response.user.nickName this.deptName = response.user.dept.deptName this.userId = response.user.userId - this.avatar = location.protocol+"//"+location.host+request.defaults.baseURL+response.user.avatar + if(response.user.avatar != null && response.user.avatar != ""){ + this.avatar = location.protocol+"//"+location.host+request.defaults.baseURL+response.user.avatar + } }); this.getData(); },