From b29f1588f2bb8b46df38a52cbae07ea8590f099a Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 08 八月 2023 19:10:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-ui/src/views/self/show.vue |   78 +++++++++++++++++++++++++++++---------
 1 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 1b1e0c2..9bd7f95 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <!--  鍒锋柊椤甸潰  -->
+<!--    <MyComponent :key="componentKey" />-->
     <!--    鍥炲埌椤堕儴-->
     <el-backtop :bottom="150" :right="30">
       <el-button type="primary" circle
@@ -56,12 +58,12 @@
 <!--                  <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">-->
 <!--                  </el-input>-->
                   <template v-if="!isEditing">
-                    <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+                    <el-input v-model="individualList.sex === 1 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                   </template>
                   <template v-else>
-                    <el-select v-model="individualList.sex" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}">
-                      <el-option label="鐢�" value="1"></el-option>
-                      <el-option label="濂�" value="0"></el-option>
+                    <el-select v-model="inds" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb">
+                      <el-option label="鐢�" value='1'></el-option>
+                      <el-option label="濂�" value='0'></el-option>
                     </el-select>
                   </template>
                 </el-form-item>
@@ -97,13 +99,14 @@
                   <template v-if="!isEditing" >
                     <el-input v-if="individualList.maritalStatus===0" placeholder="鏈"></el-input>
                     <el-input v-if="individualList.maritalStatus===1" placeholder="宸插"></el-input>
-                    <el-input v-if="individualList.maritalStatus===2" placeholder="绂诲"></el-input>
+                    <el-input v-if="individualList.maritalStatus===2" placeholder="鏈"></el-input>
+
                   </template>
                   <template v-else>
-                    <el-select v-model="individualList.maritalStatus" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}">
-                      <el-option label="鏈" value="0"></el-option>
-                      <el-option label="宸插" value="1"></el-option>
-                      <el-option label="绂诲" value="2"></el-option>
+                    <el-select v-model="mrs" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}">
+                      <el-option label="鏈" value='0'></el-option>
+                      <el-option label="宸插" value='1'></el-option>
+                      <el-option label="绂诲" value='2'></el-option>
                     </el-select>
                   </template>
                 </el-form-item>
@@ -239,7 +242,7 @@
       <div>
         <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
           <el-form-item label="鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�" >
-            <el-radio-group v-model="individualList.outStatus" style="margin-bottom: 0;color: #FEF7FC;">
+            <el-radio-group v-model="individualList.outStatus" style="margin-bottom: 0;color: #FEF7FC;" :disabled="dsb">
               <el-radio :label="1">鏄�</el-radio>
               <el-radio :label="0">鍚�</el-radio>
             </el-radio-group>
@@ -266,7 +269,7 @@
           <div class="title-wrapper">
             涓昏瀛︿範鍙婂伐浣滅粡鍘�
             <div>
-            <el-button class="button" size="mini" type="text"  @click="showDialog('open')">
+            <el-button class="button" size="mini" type="text"  @click="showDialog('open')" >
               <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
             </div>
           </div>
@@ -631,7 +634,7 @@
       </div>
     </el-dialog>
     <!--鏂板鑷紶-->
-    <el-dialog :title="isEdit ? '缂栬緫璁板綍' : '鏂板璁板綍'" :visible.sync="dialogVisible.autobiography" width="900px" append-to-body>
+    <el-dialog :title="isEdit1 ? '缂栬緫璁板綍' : '鏂板璁板綍'" :visible.sync="dialogVisible.autobiography" width="900px" append-to-body>
       <el-col >
         <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-position="left" >
           <el-row :span="5">
@@ -697,6 +700,9 @@
 export default {
   name: "show",
   dicts: ['sys_normal_disable'],
+  // components: {
+  //   MyComponent
+  // },
   data() {
     return {
       // 閬僵灞�
@@ -704,8 +710,13 @@
 
       loading: true,
       formData:[],
+      componentKey: 0,
       // 閫変腑鏁扮粍
       ids: [],
+      //鎬у埆
+      inds:undefined,
+      //濠氬Щ绫诲埆
+      mrs:undefined,
       // 闈炲崟涓鐢�
       single: true,
       // 闈炲涓鐢�
@@ -782,7 +793,7 @@
       btn:false,
       isShow:true,
       isShow_2:false,
-      isEdit:false,
+      isEdit1:false,
       formDat: {
         //涓汉鍩烘湰淇℃伅
         nickName:undefined,
@@ -982,8 +993,13 @@
       this.dialogVisible.relation1 = false;
       this.dialogVisible.certificate =false;
       this.dialogVisible.abroad=false;
-      this.dialogVisible.autobiography=false
+      this.dialogVisible.autobiography=false;
+      this.isEdit1 = false;
       this.reset();
+      // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+      Object.keys(this.formDat).forEach(key => {
+        this.formDat[key] = '';
+      });
     },
     //涓嬫媺
     handleChange(activeNames) {
@@ -1002,7 +1018,7 @@
     },
     //涓汉鑷紶缂栬緫
     editData(data) {
-      this.isEdit = true; // 璁剧疆涓虹紪杈戞搷浣�
+      this.isEdit1 = true; // 璁剧疆涓虹紪杈戞搷浣�
       // 灏嗚淇敼鐨勬暟鎹~鍏呭埌formDat瀵硅薄涓�
       this.formDat.ageBegin = data.ageBegin;
       this.formDat.ageEnd = data.ageEnd;
@@ -1213,7 +1229,12 @@
       this.isShow=false
       this.isShow_2=true
       this.isEditing=true
-      // this.isEdit=false
+      if(this.individualList.maritalStatus == 0)
+          this.mrs = '鏈'
+      else if(this.individualList.maritalStatus == 1)
+          this.mrs = '宸插'
+      else
+          this.mrs = '绂诲'// this.isEdit=false
     },
 
     /** 鏌ヨ鑷紶淇℃伅 */
@@ -1312,7 +1333,7 @@
           // 鏍规嵁鍊兼壘鍒伴�変腑鐨勯�夐」瀵硅薄
           const selectedOption = this.typeOptions.find(option => option.value === this.formDat.term);
 
-          if (this.isEdit) {
+          if (this.isEdit1) {
             // 鎵ц淇敼鎿嶄綔
             updateAutobiography(this.formDat).then(response => {
               // 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
@@ -1321,9 +1342,11 @@
               console.log("1")
               this.$modal.msgSuccess("淇敼鎴愬姛");
               this.dialogVisible.autobiography = false;
+              this.isEdit1 = false;
               this.getList();
             }).catch(error => {
               console.log(error);
+              this.isEdit1 = false;
               this.dialogVisible.autobiography = false;
             });
           } else {
@@ -1345,7 +1368,7 @@
         this.formDat[key] = '';
       });
       // 閲嶇疆isEdit涓篺alse锛屼互渚夸笅娆$偣鍑绘柊澧炴椂涓烘柊澧炴搷浣�
-      this.isEdit = false;
+      this.isEdit1 = false;
     },
 
     editRow(row) {
@@ -1355,6 +1378,16 @@
     //淇敼鍚庣殑淇濆瓨
     //涓汉鍩烘湰淇℃伅
     submitForm() {
+      if(this.inds=='1')
+        this.individualList.sex = 1;
+      else
+        this.individualList.sex = 0;
+      if(this.mrs=='0')
+        this.individualList.maritalStatus = 0
+      else if(this.mrs == '1')
+        this.individualList.maritalStatus = 1
+      else
+        this.individualList.maritalStatus = 2
       let ul = this.fileList.map(function (elem){
         return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
       }).join(",")
@@ -1368,8 +1401,14 @@
           if (this.individualList.userId !== undefined) {
             updateIndividual(this.individualList).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
+              // 寮哄埗鏇存柊鐩稿叧缁勪欢
+              this.individualList={...this.individualList}
+
               // this.open = false;
+              this.dsb = true
               this.btn=false
+              this.isShow_2=false
+              this.isShow=true
             });
           } else {
             this.$modal.msgSuccess("淇敼澶辫触");
@@ -1378,7 +1417,7 @@
         }
       })
       // 鍒锋柊椤甸潰
-      window.location.reload();
+      // window.location.reload();
     },
     //涓昏缁忓巻
     saveRowExperienceList(row) {
@@ -1579,6 +1618,7 @@
 .btn_edit{
   background:center no-repeat url('../../assets/icons/edit.png') ;
 }
+
 .button {
   background:center no-repeat url('../../assets/icons/add1.png') ;
   margin-left: 69.5vw;

--
Gitblit v1.9.1