Merge branch 'master' of E:\project\nsgk_mobile with conflicts.

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});
           }

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});
             }

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});
           }

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});
           }

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});
           }

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});
           }

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});
             }

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});
           }

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});
           }

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});
           }

打包.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
+@echo SUCCESS
+pause