From 3119fa3f7f7a1791d918d77d3e8315d762719ab7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 13 十月 2024 22:23:10 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-ui/src/views/self/memo.vue |  105 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index e752d65..b05c809 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -149,7 +149,7 @@
 			                  accept="image/*"
 			                  :multiple="false"
 			                  :http-request="requestUpload"
-			                  :on-success="handleSucess"
+			              
 			                  :limit="1">
 
 			         <el-avatar shape="square"  style="width: 200px;;height: 200px;" >
@@ -628,7 +628,7 @@
 	            <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
 	            ></el-option>
 	          </el-select>
-	          <el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍨嬶紝璇峰湪姝よ緭鍏ユ柊鐨勮瘉浠剁被鍨�" @change="addNewOption"></el-input>
+	          <el-input v-model="newOption" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍨嬶紝璇峰湪姝よ緭鍏ユ柊鐨勮瘉浠剁被鍨�" ></el-input>
 	
 	        </el-form-item>
 	        <el-form-item label="鎸佹湁鎯呭喌" prop="ownStatus">
@@ -688,7 +688,7 @@
 	    <!--鏂板鑷紶-->
 	    <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-form ref="elFormzz" :model="formDat6" :rules="rules" size="medium" label-position="left" >
 	          <el-row :span="5">
 	<!--            <el-form-item label="闇�瑕佷慨鏀圭殑璁板綍锛�" prop="id">-->
 	<!--              <el-select v-model="formDat.id" placeholder="璇烽�夋嫨闇�瑕佷慨鏀圭殑璁板綍" clearable :style="{width: '50%'}"  >-->
@@ -697,10 +697,10 @@
 	<!--              </el-select>-->
 	<!--            </el-form-item>-->
 	            <el-form-item label="骞撮緞娈碉細" prop="ageBegin ageEnd" label-width="70px">
-	              <el-input type="number" v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
+	              <el-input  @input="$forceUpdate()" type="number" v-model="formDat6.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
 	              </el-input>
 	              <span> 宀� 鈥斺��</span>
-	              <el-input type="number" v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
+	              <el-input  @input="$forceUpdate()" type="number" v-model="formDat6.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
 	              </el-input>
 	              <span> 宀� </span>
 	          </el-form-item>
@@ -709,11 +709,11 @@
 	<!--                <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"-->
 	<!--                ></el-option>-->
 	<!--              </el-select>-->
-	              <el-input v-model="formDat.term"  placeholder="璇疯緭鍏ユ椂鏈�" clearable :style="{width: '100%'}" >
+	              <el-input @input="$forceUpdate()" v-model="formDat6.term"  placeholder="璇疯緭鍏ユ椂鏈�" clearable :style="{width: '100%'}" >
 	              </el-input>
 	            </el-form-item>
 	            <el-form-item label="鍐呭缂栬緫锛�" prop="content">
-	              <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" >
+	              <el-input  @input="$forceUpdate()" v-model="formDat6.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" >
 	              </el-input>
 	            </el-form-item>
 	          </el-row>
@@ -750,6 +750,7 @@
   dicts: ['sys_normal_disable'],
   data() {
     return {
+	   userId: undefined,
       // 閬僵灞�
       disabled: false,
      inds:undefined,
@@ -759,7 +760,7 @@
       formData:[],
       // 閫変腑鏁扮粍
       ids: [],
-          fit:['cover'],
+      fit:'cover',
       // 闈炲崟涓鐢�
       single: true,
       // 闈炲涓鐢�
@@ -797,11 +798,11 @@
       },
 	  
 	  // 涓汉缁忓巻鏁版嵁
-	  experienceList: [],
+	  experienceList: undefined,
 	  // isEdit:true,
 	  editStatus: {},
 	  //瀹跺涵鎴愬憳鍏崇郴鏁版嵁
-	  relationList:[],
+	  relationList: undefined,
 	  //鍑哄叆澧冭瘉浠舵儏鍐�
 	  certificateList:[],
 	  typeList:[],
@@ -810,7 +811,7 @@
 	  
       uploading: false,
       uploading1: false,
-      fit:['fill'],
+      fit1: ['fill'],
       keyword:'',
       rules: {
         //鍩烘湰淇℃伅
@@ -899,12 +900,12 @@
         }],
         ageBegin: [{
           required: true,
-          message: '',
+          message: '璇疯緭鍏ュ紑濮嬫椂闂�',
           trigger: 'blur'
         }],
         ageEnd: [{
           required: true,
-          message: '',
+          message: '璇疯緭鍏ョ粨鏉熸椂闂�',
           trigger: 'blur'
         }],
 
@@ -912,6 +913,7 @@
 	  
 	  
 	  open:false,
+	  formDat6: {},
       formDat: {
         //涓汉璁颁簨鏈鎯�
         id:undefined,
@@ -923,6 +925,7 @@
         url: undefined,
       },
        individualList:[],
+	  newOption: undefined,
       // 鑿滃崟鍒楄〃
       menuOptions: [],
       // 閮ㄩ棬鍒楄〃
@@ -977,6 +980,7 @@
           trigger: 'blur'
         }],
       },
+	  typeOption: [],
       typeOptions: [],
       isShow:true,
             dsb:true,
@@ -1000,10 +1004,10 @@
   methods: {
    getInfo(){
           console.log('-----------------')
-          getInfo().then(response=>{
-            console.log(response.user.roles[0].roleId,'roleID')
-            this.userId = response.user.roles[0].roleId
-          })
+          // getInfo().then(response=>{
+          //   console.log(response.user.roles[0].roleId,'roleID')
+          //   this.userId = response.user.roles[0].roleId
+          // })
         },
    getList1() {
     this.loading1 = true;
@@ -1125,7 +1129,7 @@
     // 鍙栨秷鎸夐挳
     cancel() {
       this.open = false;
-      this.reset();
+     // this.reset();
     },
     getRowId(row)
     {
@@ -1375,7 +1379,9 @@
 
           if (this.isEdit1) {
             // 鎵ц淇敼鎿嶄綔
-            updateAutobiography(this.formDat).then(response => {
+			
+			console.log(this.formDat6)
+            updateAutobiography(this.formDat6).then(response => {
               // 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
               // this.formDat.term = selectedOption.value;
               // this.formDat.id = selectedOption.id;
@@ -1384,18 +1390,30 @@
               this.dialogVisible.autobiography = false;
               this.isEdit1 = false;
               this.getList();
+			  // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+			  Object.keys(this.formDat6).forEach(key => {
+			    this.formDat6[key] = '';
+			  });
+			
             }).catch(error => {
+			//	alert(24)
               console.log(error);
               this.isEdit1 = false;
               this.dialogVisible.autobiography = false;
             });
           } else {
             // 鎵ц鏂板鎿嶄綔
-            addAutobiography(this.formDat).then(response => {
+            addAutobiography(this.formDat6).then(response => {
               // this.formDat.term = selectedOption.label;
               this.$modal.msgSuccess("鏂板鎴愬姛");
               this.dialogVisible.autobiography = false;
               this.getList();
+			  // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+			  Object.keys(this.formDat6).forEach(key => {
+			    this.formDat6[key] = '';
+			  });
+			  // 閲嶇疆isEdit涓篺alse锛屼互渚夸笅娆$偣鍑绘柊澧炴椂涓烘柊澧炴搷浣�
+			  this.isEdit1 = false;
             }).catch(error => {
               console.log(error);
               this.dialogVisible.autobiography = false;
@@ -1403,12 +1421,7 @@
           }
         }
       });
-      // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
-      Object.keys(this.formDat).forEach(key => {
-        this.formDat[key] = '';
-      });
-      // 閲嶇疆isEdit涓篺alse锛屼互渚夸笅娆$偣鍑绘柊澧炴椂涓烘柊澧炴搷浣�
-      this.isEdit1 = false;
+   
     },
 
     editRow(row) {
@@ -1585,12 +1598,17 @@
 	  this.dialogVisible.abroad=false;
 	  this.dialogVisible.autobiography=false;
 	  this.isEdit1 = false;
-	  this.reset();
+	 // this.reset();
 	 // alert(32)
 	  // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
 	  Object.keys(this.formDat).forEach(key => {
 	    this.formDat[key] = '';
 	  });
+	  // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+	  Object.keys(this.formDat6).forEach(key => {
+	    this.formDat6[key] = '';
+	  });
+	  
 	},
 	handleUploadSuccess(response, file) {
 	  // 澶勭悊鏂囦欢涓婁紶鎴愬姛鍚庣殑鍥炶皟
@@ -1600,34 +1618,51 @@
 	//涓嬫媺
 	handleChange5(activeNames) {
 	  // console.log(activeNames);
-	  this.reset();
+	  //this.reset();
 	},
 	showDialog(dialogName) {
 	  this.dialogVisible[dialogName] = true;
+	  // alert(dialogName)
+	  // if(dialogName=="autobiography")
+	  // {
+		 //  alert(123)
+	  // }
 	},
 	
 	//涓汉鑷紶
 	handleClick(tab, event) {
 	  // console.log(tab, event);
+	  alert(987)
 	  this.getAutobiographyInfor();
 	  // this.getSrc1(typeOptions)
 	},
 	//涓汉鑷紶缂栬緫
 	editData(data) {
+	//	alert(1234)
 	  this.isEdit1 = true; // 璁剧疆涓虹紪杈戞搷浣�
 	  // 灏嗚淇敼鐨勬暟鎹~鍏呭埌formDat瀵硅薄涓�
-	  this.formDat.ageBegin = data.ageBegin;
-	  this.formDat.ageEnd = data.ageEnd;
-	  this.formDat.term = data.term;
-	  this.formDat.content = data.content;
-	
+	  
+	  this.formDat6.ageBegin = data.ageBegin;
+	  this.formDat6.ageEnd = data.ageEnd;
+	  this.formDat6.term = data.term;
+	  this.formDat6.content = data.content;
+
 	  // 鎵撳紑寮圭獥
 	  this.dialogVisible.autobiography = true;
 	},
-	editAutobiography(item) {
+	editAutobiography(data) {
+		//alert(234)
+		//alert(23)
+		console.log(data)
 	  this.isEdit1 = true;
+	  this.formDat6.ageBegin = data.ageBegin;
+	  this.formDat6.ageEnd = data.ageEnd;
+	  this.formDat6.term = data.term;
+	  this.formDat6.content = data.content;
+	 // alert(data.id)
+	  this.formDat6.id = data.id
 	  this.dialogVisible.autobiography = true;
-	  this.formDat = { item };
+	  //this.formDat = { item };
 	},
 	getTypeOptions() {
 	  const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');

--
Gitblit v1.9.1