From d647d78c29afaeff8e6ba01d01cf9c2dc6e53479 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期六, 20 四月 2024 18:43:11 +0800
Subject: [PATCH] 修改所有备忘录上传图片

---
 ruoyi-ui/src/views/contacts/index.vue |  162 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 117 insertions(+), 45 deletions(-)

diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index ec75261..079c3ce 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -82,6 +82,7 @@
           plain
           icon="el-icon-plus"
           size="mini"
+
           @click="handleAdd"
           v-hasPermi="['system:role:add']"
         >鏂板</el-button>
@@ -94,6 +95,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+
           v-hasPermi="['system:role:remove']"
         >鍒犻櫎</el-button>
       </el-col>
@@ -217,6 +219,7 @@
               size="mini"
               type="text"
               icon="el-icon-edit"
+                     :disabled="!scope.row.ownData"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['system:role:edit']"
             >
@@ -226,6 +229,7 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
+                     :disabled="!scope.row.ownData"
               @click="handleDelete(scope.row)"
               v-hasPermi="['system:role:remove']"
             ><span style="font-size: 14px;">鍒犻櫎</span></el-button>
@@ -305,6 +309,9 @@
           multiple
           :http-request="requestUpload"
           :file-list="fileList"
+		  :on-change="handleChange"
+		  :auto-upload="false"
+		  	ref="upload"
         >
          <i  slot="default" class="el-icon-plus"></i>
           <div slot="file" slot-scope="{ file }">
@@ -338,6 +345,13 @@
 
           </div>
         </el-upload>
+		<el-button
+		         style="margin-left: 10px"
+		         size="small"
+		         type="success"
+		
+		         @click="picUpload"
+		       >涓婁紶鍒版湇鍔″櫒</el-button>
         <h4 class="form-header">鍏朵粬闄勪欢 </h4>
         <el-upload
           action=""
@@ -348,15 +362,23 @@
           :on-remove="handleRemoveFile"
           :http-request="requestUpload1"
           :show-file-list="true"
+		  ref="upload1"
+		  :on-change="handleChange1"
+		  :auto-upload="false"
+		  list-type="picture-card"
         >
-          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
-          <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div>
+     
           <template #tip>
             <div class="el-upload__tip">
             </div>
           </template>
         </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       </el-form>
       <h4 class="form-header"> </h4>
 
@@ -418,12 +440,13 @@
       // 鏁版嵁鑼冨洿閫夐」
       fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
         '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-      
+
       fileList:[
       ],
-      fileListOther:[
-
-      ],
+    fileList1:[],
+    	  uploadFileList: [],
+    		uploadFileList1: [],
+    fileListOther:[],
       dsb:true,
       btn:false,
       fit:['fill'],
@@ -443,7 +466,7 @@
         twitter:undefined,
         isAlways:undefined,
         remark:undefined,
-        url: undefined,
+        url: '',
 
       },
       // 鑿滃崟鍒楄〃
@@ -596,14 +619,22 @@
       for(let i = 0; i < this.fileListOther.length; i++)
       {
         if(this.fileListOther[i].url==file.url)
-          this.$delete(this.fileListOther,i);
+       {
+         
+         this.$delete(this.fileListOther,i);
+         this.$delete(this.uploadFileList1,i);
+         
+         }
       }
     },
     handleRemove(file) {
       for(let i = 0; i < this.fileList.length; i++)
       {
         if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
+         {
+           this.$delete(this.fileList,i);
+         		 this.$delete(this.uploadFileList,i);
+         		 }
       }
     },
     // 鍙栨秷鎸夐挳
@@ -698,13 +729,6 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
-      let ul = this.fileList.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      let uls = this.fileListOther.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      this.formDat.url = ul+","+uls
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 
@@ -729,38 +753,86 @@
     },
     requestUpload(params)
     {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-        }
-      })
+   
     },
     requestUpload1(params)
     {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading1 = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading1 = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) !== true)
-        {
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-        }
-      })
+      
     },
+	handleChange(file, fileList1) {
+	   //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+	
+	 // this.uploadFileList.push(file.raw);
+	  console.log("=========5555=========")
+	  console.log(file)
+	//  console.log(this.uploadFileList)
+	//  this.fileList = fileList
+	//alert(file)
+	    this.uploadFileList.push(file.raw);
+	     this.fileList.push({name:file.name,url:file.url})
+	//alert(fileList1.length)
+	},
+	handleChange1(file, fileOtherList1) {
+	   //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+	this.uploadFileList1.push(file.raw);
+	 this.fileListOther.push({name:file.name,url:file.url})
+	 // this.uploadFileList.push(file.raw);
+	  console.log("=========5555=========")
+	  //console.log(file)
+	//  console.log(this.uploadFileList)
+	//  this.fileList = fileList
+	},
+	fileUpload(){
+	//	var file = params.file;
+	
+		var formData = new FormData();
+		this.$refs.upload1.submit();
+		// formData.append('uploadFile', file);
+		if(this.uploadFileList1.length==0){
+			  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
+			  return
+		}
+		this.uploadFileList1.forEach((elem)=>{
+			formData.append("files", elem)
+			
+		})
+	
+		let _this = this
+	
+		this.uploading = true;
+		uploadPic(formData).then(response => {
+		_this.uploadFileList1 = []
+		_this.formDat.url = _this.formDat.url+","+response.fileNames
+		_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
+		  })
+	
+	},
+	picUpload()
+	{
+		var formData = new FormData();
+		//alert(976)
+		//this.$refs.upload.submit();
+		//alert(8)
+		//alert(this.uploadFileList.length)
+	if(this.uploadFileList.length==0){
+		  this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+		  return}
+	//console.log(this.uploadFileList)
+		this.uploadFileList.forEach((elem)=>{
+			formData.append("files", elem)
+			
+		})
+		//alert(90)
+		let _this = this
+		//alert(9)
+	    uploadPic(formData).then(response => {
+		//	alert("dds")
+	      _this.formDat.url = _this.formDat.url+","+response.fileNames
+		  _this.uploadFileList = []
+		  _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+	
+	  });
+	},
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;

--
Gitblit v1.9.1