From 9d7c414604c7f3690ec7e8c2065a3e84a9c5e7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Mon, 17 Mar 2025 17:22:27 +0800 Subject: [PATCH] =?UTF-8?q?task=2041397=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=20?= =?UTF-8?q?=E2=80=9C=E9=93=B6=E8=A1=8C=E5=8D=A1=E8=BD=AC=E8=B4=A6=E2=80=9D?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=94=B6=E6=AC=BE=E6=96=B9=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E8=BE=93=E5=85=A5=E4=BA=BA=E5=90=8D?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/maps/plotPremises_huancui.json | 5 ++++ src/assets/maps/qu_huancui.json | 5 ++++ .../paymentApproval/approvalAdd.vue | 17 +++++++++++++ .../paymentApproval/approvalAdd2.vue | 17 +++++++++++++ .../paymentApproval/approvalAdd3.vue | 12 +++++++++- .../paymentApproval/approvalAdd4.vue | 16 +++++++++++++ .../paymentApproval/approvalAdd5.vue | 10 +++++++- .../paymentApproval/approvalModify.vue | 18 +++++++++++++- .../paymentApproval/approvalModify2.vue | 17 +++++++++++++ .../paymentApproval/approvalModify3.vue | 11 ++++++++- .../paymentApproval/approvalModify4.vue | 16 +++++++++++++ .../paymentApproval/approvalModify5.vue | 8 +++++++ .../paymentApproval/approvalAdd.vue | 18 ++++++++++++++ .../paymentApproval/approvalAdd2.vue | 24 ++++++++++++++++--- .../paymentApproval/approvalAdd3.vue | 17 +++++++++---- .../paymentApproval/approvalAdd4.vue | 16 +++++++++++++ .../paymentApproval/approvalAdd5.vue | 14 ++++++++--- .../paymentApproval/approvalModify.vue | 19 ++++++++++++++- .../paymentApproval/approvalModify2.vue | 17 +++++++++++++ .../paymentApproval/approvalModify3.vue | 8 +++++++ .../paymentApproval/approvalModify4.vue | 16 +++++++++++++ .../paymentApproval/approvalModify5.vue | 9 +++++++ 22 files changed, 295 insertions(+), 15 deletions(-) diff --git a/src/assets/maps/plotPremises_huancui.json b/src/assets/maps/plotPremises_huancui.json index e69de29b..b194cd56 100644 --- a/src/assets/maps/plotPremises_huancui.json +++ b/src/assets/maps/plotPremises_huancui.json @@ -0,0 +1,5 @@ +{"student":[ + {"name":"张三","address":"河南","age":20}, + {"name":"李四","address":"北京","age":25}, + {"name":"王五","address":"上海","age":30} +]} diff --git a/src/assets/maps/qu_huancui.json b/src/assets/maps/qu_huancui.json index e69de29b..b194cd56 100644 --- a/src/assets/maps/qu_huancui.json +++ b/src/assets/maps/qu_huancui.json @@ -0,0 +1,5 @@ +{"student":[ + {"name":"张三","address":"河南","age":20}, + {"name":"李四","address":"北京","age":25}, + {"name":"王五","address":"上海","age":30} +]} diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue index a7fee5df..33a6ba4f 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue @@ -299,6 +299,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + { + response.rows.map((res,index) => { + if(res.payeeType==1||res.payeeType==2){ + response.rows[index].text = res.payee; + response.rows[index].value = res.id; + this.payeeList.push(res) + } + }) + }); + }, beforeRead(obj) { return (file) =>{ let params1 = new FormData(); diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd2.vue index d63c42de..1b7bd415 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd2.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd2.vue @@ -264,6 +264,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + { + response.rows.map((res,index) => { + if(res.payeeType==4||res.payeeType==3){ + res.text = res.payee + res.value = res.id + this.payeeList.push(res) + } + }) + }); + }, goFlow(){ if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd3.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd3.vue index 64041cd2..b0db4b4e 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd3.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd3.vue @@ -191,6 +191,8 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + + { console.log(response) diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd4.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd4.vue index f0bd7eae..6b053d0e 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd4.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd4.vue @@ -232,6 +232,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + { + response.rows.map((res,index) => { + if(res.payeeType==1||res.payeeType==2){ + res.text = res.payee; + res.value = res.id; + this.payeeList.push(res) + } + }) + }); + }, goFlow(){ if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd5.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd5.vue index 53b4bbc1..2359d34f 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd5.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd5.vue @@ -191,6 +191,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + + { + response.rows.map((res,index) => { + if(res.payeeType==1||res.payeeType==2){ + response.rows[index].text = res.payee; + response.rows[index].value = res.id; + this.payeeList.push(res) + } + }) + }); + }, goFlow(){ if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify2.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify2.vue index ad12052e..13df6715 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify2.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify2.vue @@ -254,6 +254,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + { + response.rows.map((res,index) => { + if(res.payeeType==4||res.payeeType==3){ + res.text = res.payee + res.value = res.id + this.payeeList.push(res) + } + }) + }); + }, goFlow(){ if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify3.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify3.vue index b8fc45ed..2ee7893c 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify3.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify3.vue @@ -191,6 +191,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + { console.log(response) diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify4.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify4.vue index fa73e351..1189264e 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify4.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify4.vue @@ -232,6 +232,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + { + response.rows.map((res,index) => { + if(res.payeeType==1||res.payeeType==2){ + res.text = res.payee; + res.value = res.id; + this.payeeList.push(res) + } + }) + }); + }, goFlow(){ if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify5.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify5.vue index 89257c91..dc8827f1 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify5.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify5.vue @@ -199,6 +199,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + + { + response.rows.map((res,index) => { + if(res.payeeType==1||res.payeeType==2){ + response.rows[index].text = res.payee; + response.rows[index].value = res.id; + this.payeeList.push(res) + } + }) + }); + }, goFlow(){ if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue index 6bcec707..63261be1 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue @@ -257,6 +257,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + - - + + { + response.rows.map((res,index) => { + if(res.payeeType==4||res.payeeType==3){ + res.text = res.payee + res.value = res.id + this.payeeList.push(res) + } + }) + }); + }, goFlow(){ if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd3.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd3.vue index aa615ec5..20837623 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd3.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd3.vue @@ -191,6 +191,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + - - + + { console.log(response) diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue index 26ac539c..4b40ca43 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue @@ -232,6 +232,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + { + response.rows.map((res,index) => { + if(res.payeeType==1||res.payeeType==2){ + res.text = res.payee; + res.value = res.id; + this.payeeList.push(res) + } + }) + }); + }, goFlow(){ if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd5.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd5.vue index f1298b66..94e43106 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd5.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd5.vue @@ -191,6 +191,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + - - + + + { + response.rows.map((res,index) => { + if(res.payeeType==1||res.payeeType==2){ + response.rows[index].text = res.payee; + response.rows[index].value = res.id; + this.payeeList.push(res) + } + }) + }); + }, goFlow() { if (this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined") { window.location = 'approvalProcess3?approvalTemplateId=' + this.form.approvalTemplateId + '&approvalMode=' + this.form.approvalMode; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue index eb3020dc..4c3f1480 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue @@ -254,6 +254,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + { + response.rows.map((res,index) => { + if(res.payeeType==4||res.payeeType==3){ + res.text = res.payee + res.value = res.id + this.payeeList.push(res) + } + }) + }); + }, goFlow(){ if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue index 0c571ee4..e6e29ba0 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue @@ -191,6 +191,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> + + { + response.rows.map((res,index) => { + if(res.payeeType==1||res.payeeType==2){ + res.text = res.payee; + res.value = res.id; + this.payeeList.push(res) + } + }) + }); + }, goFlow(){ if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify5.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify5.vue index c11c063d..442fde40 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify5.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify5.vue @@ -199,6 +199,7 @@ :rules="[{ required: true , message:'请选择收款方' }]" /> +