From ca8f811c2a69f6004674dfacd204701c7ad23c54 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期五, 02 八月 2024 12:05:49 +0800
Subject: [PATCH] 完成了家大事迹和家庭资产管理的分享

---
 ruoyi-ui/src/views/note/propertyInfo.vue |  130 +++++++++++++++++++++++++++++++------------
 1 files changed, 93 insertions(+), 37 deletions(-)

diff --git a/ruoyi-ui/src/views/note/propertyInfo.vue b/ruoyi-ui/src/views/note/propertyInfo.vue
index f72797c..044551e 100644
--- a/ruoyi-ui/src/views/note/propertyInfo.vue
+++ b/ruoyi-ui/src/views/note/propertyInfo.vue
@@ -21,10 +21,14 @@
     <el-form ref="elForm" :model="formData"  :rules="rules" size="medium" label-width="100px">
 
       <el-form-item label="绫诲瀷" prop="type">
-        <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" :disabled="dsb" >
+        <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆"  allow-create
+		filterable clearable :style="{width: '100%'}" :disabled="dsb" >
           <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                      :disabled="item.disabled"></el-option>
         </el-select>
+
+
+
       </el-form-item>
 
       <el-form-item label="鍙戠敓鏃堕棿" prop="happenTime" >
@@ -67,7 +71,7 @@
         :disabled="!btn"
         :class="{hide:!btn}"
       >
-   
+
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <img
@@ -130,7 +134,7 @@
 
 
       >
-   
+
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -143,7 +147,7 @@
           ></video>
           <img v-else
                class="el-upload-list__item-thumbnail"
-            :src="file.url"
+            src="../../assets/images/deviceLis.png"
                alt=""
                style="width: 147px; height: 147px"
         >
@@ -216,8 +220,9 @@
      uploadFileList:[],
      uploadFileList1:[],
      fileListOther:[
-     
+
      ],
+     fileListOther1:[],
       dsb:true,
       btn:false,
       isShow:true,
@@ -300,16 +305,30 @@
         for(let i = 0; i < paths.length; i++)
         {
          if(paths[i]!="") {
-         
+
              let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
          //	alert(pth)
              if (_this.fot.includes(pth) === true)
-         	{
-         		if(paths[i][0]=="/")
-               _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
-         	  else
-         	     _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
-         	  }
+         	// {
+         	// 	if(paths[i][0]=="/")
+          //      _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+         	//   else
+         	//      _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+         	//   }
+          {
+            if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
+              if(paths[i][0]=="/")
+                    _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
+              else
+                 _this.fileList.push({name:paths[i],url: paths[i],res:false})
+            }else{
+              if(paths[i][0]=="/")
+                    _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+              else
+                 _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+            }
+
+            }
              else {
                // alert(paths[i])
          	 // alert()
@@ -319,7 +338,7 @@
                _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
          		else
          		_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
-         		
+
          	}
         }
 		}
@@ -331,6 +350,41 @@
   },
   mounted() {},
   methods: {
+    getData(){
+      const id = this.$route.params && this.$route.params.id;
+      let _this = this
+      if (id) {
+        this.loading = true;
+        getPropertyInfo(id).then((response) => {
+          this.formData = response.data;
+          let paths = response.data.url.split(",");
+          for(let i = 0; i < paths.length; i++)
+          {
+           if(paths[i]!="") {
+
+               let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+               if (_this.fot.includes(pth) === true)
+           	{
+            console.log()
+           	  }
+               else {
+                 let nms = paths[i].split("\/")
+                 let nm = nms[nms.length - 1]
+           	  if(paths[i][0]=="/")
+                 _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+           		else
+           		_this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+           	}
+          }
+      }
+          _this.fileListOther = _this.fileListOther1
+          this.loading = false;
+        });
+        this.getCateInfor()
+
+      }
+    },
     /** 鏌ヨ绫诲埆淇℃伅 */
     getCateInfor()
     {
@@ -407,10 +461,10 @@
     			this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
     		}
           this.$delete(this.fileListOther,i);
-    
+
     	}
       }
-      
+
       let ul = ""
       this.fileList.map(function (elem){
       		if(elem.res==false)
@@ -427,7 +481,7 @@
     	  updateProperty(this.formData).then(response => {
     		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
     		// this.open = false;
-    	  
+
     	  });
       }
     },
@@ -451,7 +505,7 @@
       		 	//	  alert(this.uploadFileList.length)
       		 }
             this.$delete(this.fileList,i);
-         
+
         }
         }
         let ul = ""
@@ -470,7 +524,7 @@
       		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
       	  });
         }
-      
+
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
@@ -502,20 +556,20 @@
       // const fid =2031
       this.$router.push("/familymodel/property/memo/" + id );
     },
-	
+
 	//鑷畾涔変笂浼犳柟娉�
 	    handleChange(file, fileList1) {
 	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-	
+
 	     // this.uploadFileList.push(file.raw);
 	      console.log("=========5555=========")
 		  this.uploadFileList.push(file.raw);
 		   this.fileList.push({name:file.name,url:file.url,res:true})
 	    },
 		//鑷畾涔変笂浼犳柟娉�
-		handleChange1(file, fileListOther1) {
+		handleChange1(file, fileListOther12) {
 		       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-		
+
 		     // this.uploadFileList.push(file.raw);
 			 this.uploadFileList1.push(file.raw);
 			  this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -526,7 +580,7 @@
 		},
 		fileUpload(){
 		//	var file = params.file;
-	
+
 			var formData = new FormData();
 			//this.$refs.upload1.submit();
 		//	alert(this.uploadFileList1.length)
@@ -534,14 +588,14 @@
 			if(this.uploadFileList1.length==0){
 				  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
 				  return}
-			
+
 			this.uploadFileList1.forEach((elem)=>{
 				formData.append("files", elem)
-				
+
 			})
 			console.log(this.uploadFileList1)
 			let _this = this
-	
+
 			this.uploading = true;
 			uploadPic(formData).then(response => {
 			_this.uploadFileList1 = []
@@ -549,27 +603,29 @@
 			    updateProperty(_this.formData).then(response => {
 			      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
 			      // this.open = false;
+            this.getData()
+            this.fileListOther1=[]
 			    });
 			  })
-	
+
 		},
 		picUpload()
 		{
-	
+
 			var formData = new FormData();
 			//this.$refs.upload.submit();
 			//alert(this.uploadFileList.length)
 		if(this.uploadFileList.length==0){
 			  this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
 			  return}
-	
+
 			this.uploadFileList.forEach((elem)=>{
 				formData.append("files", elem)
-				
+
 			})
 			let _this = this
-	
-			
+
+
 	        uploadPic(formData).then(response => {
 				// console.log(response.originalFilenames)
 				// console.log(response.urls)
@@ -596,12 +652,12 @@
 	          updateProperty(_this.formData).then(response => {
 	            _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
 	            // this.open = false;
-	
+
 	          });
 	        // }
 	        // else{
 	        //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-	
+
 	        // }
 	      });
 		},
@@ -609,10 +665,10 @@
 	    {
 	   //  alert(124)
 	//	 this.uploadFileList.push(params.file);
-	
+
 	     //alert(34)
-	 
-		
+
+
 	    },
 	    requestUpload1(params)
 	    {

--
Gitblit v1.9.1