From 95d698742247301412cd6a990030961445a98217 Mon Sep 17 00:00:00 2001 From: yangfuda <945208611@qq.com> Date: Thu, 11 May 2023 16:35:58 +0800 Subject: [PATCH] Merge branch 'master' of E:\project\nsgk_mobile with conflicts. --- .../collectionAccount/collectionAdd.vue | 2 +- .../collectionAccount/collectionModify.vue | 2 +- .../paymentApproval/collectionAdd.vue | 2 +- .../paymentApproval/collectionAdd2.vue | 2 +- .../paymentApproval/collectionApprovalAdd.vue | 2 +- .../collectionAccount/collectionAdd.vue | 2 +- .../collectionAccount/collectionModify.vue | 2 +- .../paymentApproval/collectionAdd.vue | 2 +- .../paymentApproval/collectionAdd2.vue | 2 +- .../paymentApproval/collectionApprovalAdd.vue | 2 +- 打包.bat | 19 ++++++------------- 11 files changed, 16 insertions(+), 23 deletions(-) diff --git a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue index 3e946690..dc4e2b64 100644 --- a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue @@ -155,7 +155,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue index fd882efc..8029eb54 100644 --- a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue +++ b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue @@ -147,7 +147,7 @@ getPayee(this.$route.query.id).then((response) => { let _this = this this.form = response.data; - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ _this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue index d51c0e1d..0b2b5ecf 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue @@ -171,7 +171,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue index 262fbd3f..06a3b6be 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue @@ -171,7 +171,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue index 61acd464..b43f96ce 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue @@ -167,7 +167,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue index ee239ac1..2df5b7a1 100644 --- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue +++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue @@ -150,7 +150,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue index fd882efc..8029eb54 100644 --- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue +++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue @@ -147,7 +147,7 @@ getPayee(this.$route.query.id).then((response) => { let _this = this this.form = response.data; - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ _this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue index 27fed99f..d7f10dd4 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue @@ -165,7 +165,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue index 078bf246..78bc199c 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue @@ -165,7 +165,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue index 61acd464..b43f96ce 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue @@ -167,7 +167,7 @@ }, methods: { getDictionaries(){ - this.houseGetDicts("bank_type").then((res) => { + this.houseGetDicts("bank_type_all").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } diff --git a/打包.bat b/打包.bat index cf9cfe03..f3aefd88 100644 --- a/打包.bat +++ b/打包.bat @@ -1,21 +1,14 @@ @echo off -@echo ʼApp...... +E: +cd E:\project\nsgk_mobile -call :extract %0 -goto :eof -:extract -rem ĿĿ¼ -@echo ĿĿ¼: %~dp1 -%~d1 -cd %~dp1 -call npm run build -@echo ɹ +:: 打包预发布环境 +npm run build -@echo Ŀļ -start "" %~dp1 -@pause \ No newline at end of file +@echo SUCCESS +pause \ No newline at end of file