From 7c524db9218938da1fb5f09a6b017f7ed9a217a0 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 18 五月 2024 18:23:54 +0800
Subject: [PATCH] css上传

---
 ruoyi-ui/src/views/marry/index.vue |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index d70c533..c669367 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -570,6 +570,7 @@
       limitCountImg:1,//涓婁紶鍥剧墖鐨勬渶澶ф暟閲�
       //涓汉淇℃伅鏁版嵁
       marryList:{
+        id:undefined,
         name:undefined,
         sex:undefined,
         birthday:undefined,
@@ -602,6 +603,7 @@
       activeNames:['1'],
       // 寮瑰嚭灞傛爣棰�
       title: "",
+      iddd:undefined,
       // 鏄惁鏄剧ず寮瑰嚭灞�
       open: false,
       // open:true,
@@ -672,13 +674,13 @@
       },
       // 琛ㄥ崟鏍￠獙
       rules: {
-        id: [{
-          required: true,
+        idNo: [{
+          // required: true,
           message: '璇疯緭鍏ヨ韩浠借瘉鍙风爜',
           trigger: 'blur'
         }],
         name: [{
-          required: true,
+          // required: true,
           message: '璇疯緭鍏ュ鍚�',
           trigger: 'blur'
         }],
@@ -688,7 +690,7 @@
           trigger: 'change'
         }],
         marryStatus: [{
-          required: true,
+          // required: true,
           message: '璇烽�夋嫨濠氬Щ鐘跺喌',
           trigger: 'change'
         }],
@@ -753,6 +755,7 @@
     cancelData() {
       this.open = false;
       this.reset();
+
     },
     //涓嬫媺
     handleChange(val) {
@@ -782,7 +785,9 @@
             this.oldSpouseList = this.marryList.oldSpouseList;
             console.log(111)
             console.log("淇℃伅")
-            console.log(this.marryList);
+            console.log(this.marryList,'1111111111111111111');
+            this.iddd = this.marryList.id
+            console.log(this.iddd,'2222222222222')
 			//alert(this.marryList.bearStatus)
             if(this.marryList.marryStatus===3){
               this.showOldSpouse = true;
@@ -833,7 +838,7 @@
           deptCheckStrictly: true,
           remark: undefined
         };
-      this.resetForm("form");
+      this.resetForm("elForm");
     },
 
 
@@ -969,7 +974,10 @@
       this.marryList.handbookStatus =parseInt(this.handsj)
       this.marryList.sex = this.sinds
       this.marryList.spouseSex = this.inds
+      console.log(this.marryList,'marryListmarryListmarryListmarryList')
+      // this.marryList.id = this.iddd
       this.$refs['elForm'].validate(valid => {
+        // alert(valid)
         if (valid) {
           if (this.marryList.id !== undefined) {
             updateMarry(this.marryList).then(response => {
@@ -980,6 +988,7 @@
               this.dsb = true
               this.isShow_2=false
               this.isShow = true
+              this.getList()
 
             }).catch(error => {
               console.error(error);
@@ -991,6 +1000,7 @@
           }
         }
       })
+      this.getList()
       // 鍒锋柊椤甸潰
       // window.location.reload();
     },

--
Gitblit v1.9.1