From 71e8709a556ec8782e4da4bcae52fa050ef2066f Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 26 三月 2024 15:34:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index 31ce44e..e5315f9 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -445,7 +445,7 @@
 		// 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 => {
@@ -518,6 +518,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 +564,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("鍒犻櫎鎴愬姛");
       	  });
@@ -641,6 +649,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 +661,14 @@
  		    updateSelfEconomy(_this.formData).then(response => {
  		      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
  		      // this.open = false;
+          if(this.formData.status=='鏄�')
+          	this.formData.status = 1
+          else
+          	this.formData.status = 0
+
  		    });
  		  })
-
+          this.uploading = false;
  	},
  	picUpload()
  	{
@@ -668,7 +686,10 @@
  		})
  		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)
@@ -695,14 +716,19 @@
            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