From 1b69ac6500a5034a35ababbaa7b52b65a2fd6a83 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, 20 Feb 2023 13:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B3=E5=85=89=E6=9D=91=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sunVillage_info/list_contract_add.vue     | 20 +++++++++++++------
 .../sunVillage_info/list_contract_edit.vue    | 17 +++++++++++-----
 .../sunVillage_info/list_finance_add.vue      | 17 ++++++++++++----
 .../sunVillage_info/list_finance_edit.vue     | 14 ++++++++++---
 src/views/sunVillage_info/list_issues_add.vue | 17 ++++++++++++----
 .../sunVillage_info/list_issues_edit.vue      | 14 ++++++++++---
 src/views/sunVillage_info/list_photo_add.vue  | 17 ++++++++++++----
 src/views/sunVillage_info/list_photo_edit.vue | 14 ++++++++++---
 .../sunVillage_info/list_tourists_add.vue     | 17 ++++++++++++----
 .../sunVillage_info/list_tourists_edit.vue    | 14 ++++++++++---
 10 files changed, 122 insertions(+), 39 deletions(-)

diff --git a/src/views/sunVillage_info/list_contract_add.vue b/src/views/sunVillage_info/list_contract_add.vue
index f99120e1..9dddcfce 100644
--- a/src/views/sunVillage_info/list_contract_add.vue
+++ b/src/views/sunVillage_info/list_contract_add.vue
@@ -205,16 +205,24 @@
         this.openFile2.splice(index,1);
       },
       afterRead(file) {
-        console.log(file)
-        // 此时可以自行将文件上传至服务器
-        file.map(res=>{
-          this.openPic.push(res.file);
+        console.log(file instanceof Array)
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            this.openPic.push(res.file);
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic2.push(r1.fileName);
+            })
+          })
+        }else{
+          this.openPic.push(file);
           let params1 = new FormData();
-          params1.append("file", res.file);
+          params1.append("file", file.file);
           commonUpload(params1).then((r1) => {
             this.openPic2.push(r1.fileName);
           })
-        })
+        }
       },
       afterReadOpenFile(file){
         let params1 = new FormData();
diff --git a/src/views/sunVillage_info/list_contract_edit.vue b/src/views/sunVillage_info/list_contract_edit.vue
index 01c02ef4..c8ee6e32 100644
--- a/src/views/sunVillage_info/list_contract_edit.vue
+++ b/src/views/sunVillage_info/list_contract_edit.vue
@@ -107,7 +107,7 @@
           </template>
         </van-field>
 
-        <vue-html5-editor :content="form.openContent" :height="400" @change="updateData" style="margin-top: 10px;"></vue-html5-editor>
+        <vue-html5-editor :content="form.openContent==null?'':form.openContent" :height="400" @change="updateData" style="margin-top: 10px;"></vue-html5-editor>
 
         <van-field v-model="form.remark" placeholder="请输入备注" input-align="right" :border="false" >
           <template #label>
@@ -232,14 +232,21 @@
       },
       afterRead(file) {
         // 此时可以自行将文件上传至服务器
-        // this.openPic.push(file.file);
-        file.forEach(res=> {
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic2.push(r1.fileName);
+            })
+          })
+        }else{
           let params1 = new FormData();
-          params1.append("file", res.file);
+          params1.append("file", file.file);
           commonUpload(params1).then((r1) => {
             this.openPic2.push(r1.fileName);
           })
-        })
+        }
       },
       afterReadOpenFile(file){
         let params1 = new FormData();
diff --git a/src/views/sunVillage_info/list_finance_add.vue b/src/views/sunVillage_info/list_finance_add.vue
index a651b259..a90504f1 100644
--- a/src/views/sunVillage_info/list_finance_add.vue
+++ b/src/views/sunVillage_info/list_finance_add.vue
@@ -165,14 +165,23 @@
       },
       afterRead(file) {
         // 此时可以自行将文件上传至服务器
-        file.map(res=> {
-          this.openPic.push(res.file);
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            this.openPic.push(res.file);
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic2.push(r1.fileName);
+            })
+          })
+        }else{
+          this.openPic.push(file);
           let params1 = new FormData();
-          params1.append("file", res.file);
+          params1.append("file", file.file);
           commonUpload(params1).then((r1) => {
             this.openPic2.push(r1.fileName);
           })
-        })
+        }
       },
       afterReadOpenFile(file){
         console.log(file)
diff --git a/src/views/sunVillage_info/list_finance_edit.vue b/src/views/sunVillage_info/list_finance_edit.vue
index 5213dbfc..b68308e3 100644
--- a/src/views/sunVillage_info/list_finance_edit.vue
+++ b/src/views/sunVillage_info/list_finance_edit.vue
@@ -192,13 +192,21 @@
       },
       afterRead(file) {
         // 此时可以自行将文件上传至服务器
-        file.forEach(res=> {
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic2.push(r1.fileName);
+            })
+          })
+        }else{
           let params1 = new FormData();
-          params1.append("file", res.file);
+          params1.append("file", file.file);
           commonUpload(params1).then((r1) => {
             this.openPic2.push(r1.fileName);
           })
-        })
+        }
       },
       afterReadOpenFile(file){
         console.log(file)
diff --git a/src/views/sunVillage_info/list_issues_add.vue b/src/views/sunVillage_info/list_issues_add.vue
index c1fca2d6..ea0159c0 100644
--- a/src/views/sunVillage_info/list_issues_add.vue
+++ b/src/views/sunVillage_info/list_issues_add.vue
@@ -170,14 +170,23 @@
       },
       afterRead(file) {
         // 此时可以自行将文件上传至服务器
-        file.map(res=> {
-          this.openPic.push(res.file);
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            this.openPic.push(res.file);
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic2.push(r1.fileName);
+            })
+          })
+        }else{
+          this.openPic.push(file);
           let params1 = new FormData();
-          params1.append("file", res.file);
+          params1.append("file", file.file);
           commonUpload(params1).then((r1) => {
             this.openPic2.push(r1.fileName);
           })
-        })
+        }
       },
       afterReadOpenFile(file){
         console.log(file)
diff --git a/src/views/sunVillage_info/list_issues_edit.vue b/src/views/sunVillage_info/list_issues_edit.vue
index fd98c5fa..eef9e003 100644
--- a/src/views/sunVillage_info/list_issues_edit.vue
+++ b/src/views/sunVillage_info/list_issues_edit.vue
@@ -200,13 +200,21 @@
       },
       afterRead(file) {
         // 此时可以自行将文件上传至服务器
-        file.forEach(res=> {
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic2.push(r1.fileName);
+            })
+          })
+        }else{
           let params1 = new FormData();
-          params1.append("file", res.file);
+          params1.append("file", file.file);
           commonUpload(params1).then((r1) => {
             this.openPic2.push(r1.fileName);
           })
-        })
+        }
       },
       afterReadOpenFile(file){
         let params1 = new FormData();
diff --git a/src/views/sunVillage_info/list_photo_add.vue b/src/views/sunVillage_info/list_photo_add.vue
index 4b1616ca..ebd1e98c 100644
--- a/src/views/sunVillage_info/list_photo_add.vue
+++ b/src/views/sunVillage_info/list_photo_add.vue
@@ -189,14 +189,23 @@
       },
       afterRead(file) {
         // 此时可以自行将文件上传至服务器
-        file.map(res=> {
-          this.openPic.push(res.file);
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            this.openPic.push(res.file);
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic2.push(r1.fileName);
+            })
+          })
+        }else{
+          this.openPic.push(file);
           let params1 = new FormData();
-          params1.append("file", res.file);
+          params1.append("file", file.file);
           commonUpload(params1).then((r1) => {
             this.openPic2.push(r1.fileName);
           })
-        })
+        }
       },
       afterReadOpenFile(file){
         let params1 = new FormData();
diff --git a/src/views/sunVillage_info/list_photo_edit.vue b/src/views/sunVillage_info/list_photo_edit.vue
index 17edadf0..6af450a3 100644
--- a/src/views/sunVillage_info/list_photo_edit.vue
+++ b/src/views/sunVillage_info/list_photo_edit.vue
@@ -209,13 +209,21 @@
       },
       afterRead(file) {
         // 此时可以自行将文件上传至服务器
-        file.forEach(res=> {
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic2.push(r1.fileName);
+            })
+          })
+        }else{
           let params1 = new FormData();
-          params1.append("file", res.file);
+          params1.append("file", file.file);
           commonUpload(params1).then((r1) => {
             this.openPic2.push(r1.fileName);
           })
-        })
+        }
       },
       afterReadOpenFile(file){
         let params1 = new FormData();
diff --git a/src/views/sunVillage_info/list_tourists_add.vue b/src/views/sunVillage_info/list_tourists_add.vue
index 2bf4a857..0567ce21 100644
--- a/src/views/sunVillage_info/list_tourists_add.vue
+++ b/src/views/sunVillage_info/list_tourists_add.vue
@@ -163,14 +163,23 @@
       },
       afterRead(file) {
         // 此时可以自行将文件上传至服务器
-        file.map(res=> {
-          this.openPic.push(res.file);
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            this.openPic.push(res.file);
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic2.push(r1.fileName);
+            })
+          })
+        }else{
+          this.openPic.push(file);
           let params1 = new FormData();
-          params1.append("file", res.file);
+          params1.append("file", file.file);
           commonUpload(params1).then((r1) => {
             this.openPic2.push(r1.fileName);
           })
-        })
+        }
       },
       afterReadOpenFile(file){
         let params1 = new FormData();
diff --git a/src/views/sunVillage_info/list_tourists_edit.vue b/src/views/sunVillage_info/list_tourists_edit.vue
index ea59586e..dc658c2e 100644
--- a/src/views/sunVillage_info/list_tourists_edit.vue
+++ b/src/views/sunVillage_info/list_tourists_edit.vue
@@ -192,13 +192,21 @@
       },
       afterRead(file) {
         // 此时可以自行将文件上传至服务器
-        file.forEach(res=> {
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic2.push(r1.fileName);
+            })
+          })
+        }else{
           let params1 = new FormData();
-          params1.append("file", res.file);
+          params1.append("file", file.file);
           commonUpload(params1).then((r1) => {
             this.openPic2.push(r1.fileName);
           })
-        })
+        }
       },
       afterReadOpenFile(file){
         let params1 = new FormData();