From d75975f18f3d4e57eb7a94646b32c8a8b3f33ade Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 12 三月 2024 21:54:59 +0800
Subject: [PATCH] 修改了bug

---
 ruoyi-ui/src/views/self/show.vue                   |   10 +++++-----
 ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue |   22 ++++++++++++++++++----
 ruoyi-ui/src/views/self/memoInfo.vue               |    2 +-
 ruoyi-ui/src/views/honor/honorInfo.vue             |    2 +-
 ruoyi-ui/src/views/selfeconomy/memo.vue            |    1 +
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ruoyi-ui/src/views/honor/honorInfo.vue b/ruoyi-ui/src/views/honor/honorInfo.vue
index de4a44d..fd1bc88 100644
--- a/ruoyi-ui/src/views/honor/honorInfo.vue
+++ b/ruoyi-ui/src/views/honor/honorInfo.vue
@@ -440,7 +440,7 @@
       const newOption = this.newOption.trim();
       if (newOption && !this.typeOptions.includes(newOption)) {
         this.typeOptions.push(newOption);
-        this.$set(this.formData, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+        this.$set(this.formData, 'name', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
       }
     },
     getTypeOptions() {
diff --git a/ruoyi-ui/src/views/self/memoInfo.vue b/ruoyi-ui/src/views/self/memoInfo.vue
index 2bade5d..5413138 100644
--- a/ruoyi-ui/src/views/self/memoInfo.vue
+++ b/ruoyi-ui/src/views/self/memoInfo.vue
@@ -326,7 +326,7 @@
           }
         }
       })
-      this.goBack()
+     // this.goBack()
     },
     resetForm() {
       this.$refs['elForm'].resetFields()
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 2b285c4..4eee4ea 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -941,7 +941,7 @@
       // 寮瑰嚭灞傛爣棰�
       title: "",
 
-      // open:true,
+       open:false,
       // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
       openDataScope: false,
       menuExpand: false,
@@ -1161,7 +1161,7 @@
   methods: {
     // 鍙栨秷鎸夐挳
     cancelData() {
-		alert(23)
+	//	alert(23)
       this.dialogVisible.open = false;
       this.dialogVisible.relation1 = false;
       this.dialogVisible.certificate =false;
@@ -1169,7 +1169,7 @@
       this.dialogVisible.autobiography=false;
       this.isEdit1 = false;
       this.reset();
-	  alert(32)
+	 // alert(32)
       // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
       Object.keys(this.formDat).forEach(key => {
         this.formDat[key] = '';
@@ -1587,8 +1587,8 @@
 	{
 		this.open = false;
 		
-		alert(123)
-		alert(this.open)
+		// alert(123)
+		// alert(this.open)
 	},
 
     /** 鏌ヨ鑷紶淇℃伅 */
diff --git a/ruoyi-ui/src/views/selfeconomy/memo.vue b/ruoyi-ui/src/views/selfeconomy/memo.vue
index 443a9fc..ce16402 100644
--- a/ruoyi-ui/src/views/selfeconomy/memo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/memo.vue
@@ -52,6 +52,7 @@
               v-model='formDat.happenTime'
               type='date'
               placeholder='閫夋嫨鏃ユ湡'
+			  			value-format="yyyy-MM-dd"
             ></el-date-picker>
           </el-form-item>
 
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index 34d6110..eb9c5a8 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -296,7 +296,7 @@
           trigger: 'blur'
         }],
         status: [{
-          // required: true,
+          required: true,
           message: '璇疯緭鍏ユ槸鍚︽敞閿�',
           trigger: 'blur'
         }],
@@ -380,6 +380,10 @@
       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++)
         {
@@ -436,18 +440,28 @@
       this.formData.url = ul+","+uls
 
       this.$refs['elForm'].validate(valid => {
-
-
+	   if(this.formData.status=="1")
+		this.formData.status = 1
+		else
+		this.formData.status = 0
+		//alert(this.formData.status)
         if (valid) {
           if (this.formData.id != undefined) {
             updateSelfEconomy(this.formData).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
               // this.open = false;
+			  if(this.formData.status==1)
+			  		this.formData.status = '鏄�'
+			  		else
+			  		this.formData.status = '鍚�'
               this.btn=false
             });
           } else {
             this.$modal.msgSuccess("淇敼澶辫触");
-
+	  if(this.formData.status==1)
+			  		this.formData.status = '鏄�'
+			  		else
+			  		this.formData.status = '鍚�'
           }
         }
       })

--
Gitblit v1.9.1