From 7bbf99f0f2030d2d0672aa8d7e46ddf3cc4ab19a Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 14 五月 2024 17:24:13 +0800
Subject: [PATCH] 在家大事迹中获取到了roleID

---
 ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue |  129 +++++++++++++++++++++++++++++++++---------
 1 files changed, 100 insertions(+), 29 deletions(-)

diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index 31ce44e..fb52189 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -93,8 +93,6 @@
           action="#"
           list-type="picture-card"
           multiple
-
-
 		  ref="upload"
 		  		        :show-file-list="true"
 		  :http-request="requestUpload"
@@ -258,9 +256,8 @@
       fileList1:[],
       uploadFileList:[],
       uploadFileList1:[],
-      fileListOther:[
-
-      ],
+      fileListOther:[],
+      fileListOther1:[],
       dsb:true,
       btn:false,
       isShow:true,
@@ -338,11 +335,11 @@
         }],
       },
       typeOptions: [{
-        value: '1',
+        value: '鏄�',
         label: '鏄�',
       },
         {
-          value: '0',
+          value: '鍚�',
           label: '鍚�',
         }],
       typeOptions1: [{
@@ -379,6 +376,7 @@
     if (id) {
       this.loading = true;
       getSelfEconomyInfo({id}).then((response) => {
+        console.log(response.data,'123123123')
         this.formData = response.data;
 		if(this.formData.status==1)
 			this.formData.status = '鏄�'
@@ -390,7 +388,7 @@
           if(paths[i]!="") {
 
               let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-          //	alert(pth)
+          	// alert(pth)
               if (_this.fot.includes(pth) === true)
           	{
           		if(paths[i][0]=="/")
@@ -416,9 +414,52 @@
       // this.getCateInfor()
 
     }
+
   },
   mounted() {},
   methods: {
+    getData(){
+      const id = this.$route.params && this.$route.params.id;
+      let _this = this
+      if (id) {
+        this.loading = true;
+        getSelfEconomyInfo({id}).then((response) => {
+          this.formData = response.data;
+      if(this.formData.status==1)
+      	this.formData.status = '鏄�'
+      else
+      	this.formData.status = '鍚�'
+          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)
+            	// alert(pth)
+                if (_this.fot.includes(pth) === true)
+            	{
+              console.log()
+            	  }
+                else {
+                  // alert(paths[i])
+            	 // alert()
+                  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()
     // {
@@ -431,21 +472,21 @@
     //   })
     // },
     submitForm() {
-      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.formData.url = ul+","+uls
+      // 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.formData.url = ul+","+uls
 
       this.$refs['elForm'].validate(valid => {
-	 //   if(this.formData.status=="鏄�")
-		// this.formData.status = 1
-		// else
-		// this.formData.status = 0
+	    if(this.formData.status=='鏄�')
+        this.formData.status = 1
+      else
+        this.formData.status = 0
 
-		alert(this.formData.status)
+	///	alert(this.formData.status)
         if (valid) {
           if (this.formData.id != undefined) {
             updateSelfEconomy(this.formData).then(response => {
@@ -459,11 +500,12 @@
             });
           } else {
             this.$modal.msgSuccess("淇敼澶辫触");
-	  if(this.formData.status=='鏄�')
-			  		this.formData.status = 1
-			  		else
-			  		this.formData.status = 0
+      if(this.formData.status==1)
+      		this.formData.status = '鏄�'
+      		else
+      		this.formData.status = '鍚�'
           }
+
         }
       })
     },
@@ -518,6 +560,10 @@
         this.formData.url = ul+","+uls;
       //  alert(this.formData.url)
         if(res==true){
+			if(this.formData.status=='鏄�')
+						  		this.formData.status = 1
+						  		else
+						  		this.formData.status = 0
       	  updateSelfEconomy(this.formData).then(response => {
       		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
       		// this.open = false;
@@ -560,6 +606,10 @@
         })
         this.formData.url = ul+","+uls;
         if(res==true){
+			if(this.formData.status=='鏄�')
+						  		this.formData.status = 1
+						  		else
+						  		this.formData.status = 0
       	  updateSelfEconomy(this.formData).then(response => {
       		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
       	  });
@@ -612,7 +662,7 @@
  	   this.fileList.push({name:file.name,url:file.url,res:true})
      },
  	//鑷畾涔変笂浼犳柟娉�
- 	handleChange1(file, fileListOther1) {
+ 	handleChange1(file, fileListOther12) {
  	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
 
  	     // this.uploadFileList.push(file.raw);
@@ -641,6 +691,11 @@
  		console.log(this.uploadFileList1)
  		let _this = this
 
+    if(this.formData.status=='鏄�')
+    	  		this.formData.status = 1
+    	  		else
+    	  		this.formData.status = 0
+
  		this.uploading = true;
  		uploadPic(formData).then(response => {
  		_this.uploadFileList1 = []
@@ -648,9 +703,16 @@
  		    updateSelfEconomy(_this.formData).then(response => {
  		      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
  		      // this.open = false;
+          this.getData()
+          this.fileListOther1=[]
+          if(this.formData.status== 1)
+          	this.formData.status = '鏄�'
+          else
+          	this.formData.status = '鍚�'
+
  		    });
  		  })
-
+          this.uploading = false;
  	},
  	picUpload()
  	{
@@ -666,9 +728,13 @@
  			formData.append("files", elem)
 
  		})
+
  		let _this = this
 
-
+	  if(this.formData.status=='鏄�')
+			  		this.formData.status = 1
+			  		else
+			  		this.formData.status = 0
          uploadPic(formData).then(response => {
  			// console.log(response.originalFilenames)
  			// console.log(response.urls)
@@ -688,21 +754,26 @@
          //     return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
          //   }).join(",")
  		//console.log(_this.fileList)
- 	//	alert(response.fileNames)
+ 		// alert(response.fileNames)
            _this.formData.url = _this.formData.url+","+response.fileNames
  		_this.uploadFileList = []
           // alert(87)
            updateSelfEconomy(_this.formData).then(response => {
              _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
              // this.open = false;
-
+	  if(_this.formData.status==1)
+			  		_this.formData.status = '鏄�'
+			  		else
+			  		_this.formData.status = '鍚�'
            });
+
          // }
          // else{
          //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
 
          // }
        });
+       this.uploading = false;
  	},
       requestUpload(params)
      {

--
Gitblit v1.9.1