From 3910b79b0549b583387ff96ef5a21a2ad5313631 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 15 十一月 2024 10:43:02 +0800
Subject: [PATCH] 修改了相关bug
---
ruoyi-ui/src/views/self/memo.vue | 192 +++++++++++++++++++++++++++++-------------------
1 files changed, 116 insertions(+), 76 deletions(-)
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index e752d65..1f660e0 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;" >
@@ -278,11 +278,11 @@
</el-container>
</el-form-item>
</el-form>
-
+
</div>
-
+
</el-collapse-item> -->
-
+
<!--涓昏瀛︿範鍙婂伐浣滅粡鍘�-->
<el-collapse-item name="1" >
<template v-slot:title>
@@ -529,24 +529,25 @@
<el-tab-pane v-for="(item, index) in AutobiographyList"
:key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'">
<div>{{ item.content }}</div>
- <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:40px;top:5px;'>
+ <div style="margin-bottom: 20px;">
+ <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='right:40px;top:5px;'>
<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
</el-button>
-
- <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='position: absolute;right:10px;top:5px;'>
+
+ <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='right:10px;top:5px;'>
<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
</el-button>
-
+ </div>
</el-tab-pane>
</el-tabs></div>
</el-container>
</el-collapse-item>
-
+
</el-collapse>
-
-
-
-
+
+
+
+
<pagination
v-show="total>0"
:total="total"
@@ -554,7 +555,7 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
-
+
<!-- 鏂板涓昏缁忓巻淇℃伅閰嶇疆瀵硅瘽妗� -->
<el-dialog title="鏂板涓昏缁忓巻淇℃伅" :visible.sync="dialogVisible.open" width="900px" append-to-body>
<el-form ref="elForm1" :model="formDat" :rules="rules" size="medium" label-width="140px">
@@ -576,10 +577,10 @@
<el-input v-model="formDat.witness" placeholder="璇疯緭鍏ヨ瘉鏄庝汉" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
-
+
</el-form>
<h4 class="form-header"> </h4>
-
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
@@ -607,10 +608,10 @@
<el-input v-model="formDat.otherPolitical" placeholder="璇疯緭鍏ユ斂娌婚潰璨�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
-
+
</el-form>
<h4 class="form-header"> </h4>
-
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope2">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
@@ -628,8 +629,8 @@
<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">
<el-input v-model="formDat.ownStatus" placeholder="璇疯緭鍏ユ寔鏈夋儏鍐�" clearable :style="{width: '100%'}" >
@@ -650,7 +651,7 @@
></el-date-picker></el-form-item>
</el-form>
<h4 class="form-header"> </h4>
-
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope4">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
@@ -676,10 +677,10 @@
<el-input v-model="formDat.cause" placeholder="璇疯緭鍏ヤ簨鐢�(鏃呮父銆佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠�)" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
-
+
</el-form>
<h4 class="form-header"> </h4>
-
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope5">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
@@ -688,7 +689,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 +698,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,24 +710,24 @@
<!-- <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>
</el-form>
</el-col>
<h4 class="form-header"> </h4>
-
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope6">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
</el-dialog>
-
+
</div>
</template>
@@ -742,7 +743,7 @@
} from "@/api/self/index";
import {getAllInfo} from "@/api/system/user"
import {showShareUser} from "@/api/bignote/index";
-import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index";
+import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic,uploadPics} from "@/api/memo/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
@@ -750,6 +751,7 @@
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
inds:undefined,
@@ -759,7 +761,7 @@
formData:[],
// 閫変腑鏁扮粍
ids: [],
- fit:['cover'],
+ fit:'cover',
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -795,22 +797,22 @@
abroad:false,
autobiography:false
},
-
+
// 涓汉缁忓巻鏁版嵁
- experienceList: [],
+ experienceList: undefined,
// isEdit:true,
editStatus: {},
//瀹跺涵鎴愬憳鍏崇郴鏁版嵁
- relationList:[],
+ relationList: undefined,
//鍑哄叆澧冭瘉浠舵儏鍐�
certificateList:[],
typeList:[],
//鍑哄浗鎯呭喌
AbroadList:[],
-
+
uploading: false,
uploading1: false,
- fit:['fill'],
+ fit1: ['fill'],
keyword:'',
rules: {
//鍩烘湰淇℃伅
@@ -899,19 +901,20 @@
}],
ageBegin: [{
required: true,
- message: '',
+ message: '璇疯緭鍏ュ紑濮嬫椂闂�',
trigger: 'blur'
}],
ageEnd: [{
required: true,
- message: '',
+ message: '璇疯緭鍏ョ粨鏉熸椂闂�',
trigger: 'blur'
}],
},
-
-
+
+
open:false,
+ formDat6: {},
formDat: {
//涓汉璁颁簨鏈鎯�
id:undefined,
@@ -923,6 +926,7 @@
url: undefined,
},
individualList:[],
+ newOption: undefined,
// 鑿滃崟鍒楄〃
menuOptions: [],
// 閮ㄩ棬鍒楄〃
@@ -977,6 +981,7 @@
trigger: 'blur'
}],
},
+ typeOption: [],
typeOptions: [],
isShow:true,
dsb:true,
@@ -1000,16 +1005,16 @@
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;
let userId = this.$store.state.user.userId
// alert(userId)
-
+
showShareUser(userId, 2062).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -1125,7 +1130,7 @@
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
- this.reset();
+ // this.reset();
},
getRowId(row)
{
@@ -1208,17 +1213,19 @@
requestUpload(params)
{
var file = params.file;
+ console.log(file)
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+console.log(formData)
+ console.log('dddddddd===========')
// console.log(this.individualList)
this.$refs.uploadDemo.clearFiles();
// alert(234)
- uploadPic(formData).then(response => {
- // alert(response.data.url)
- // alert(response.data.originalFilename)
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ uploadPics(formData).then(response => {
+ // alert(response.data.url)
+ // // alert(response.data.originalFilename)
+ let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
if(_this.fot.includes(pth) === true)
{
@@ -1232,6 +1239,7 @@
}
_this.individualList.img = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
_this.individualList.url = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ console.log(_this.individualList)
updateIndividual(_this.individualList).then(response => {
// 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
// this.formDat.term = selectedOption.value;
@@ -1375,7 +1383,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 +1394,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 +1425,7 @@
}
}
});
- // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
- Object.keys(this.formDat).forEach(key => {
- this.formDat[key] = '';
- });
- // 閲嶇疆isEdit涓篺alse锛屼互渚夸笅娆＄偣鍑绘柊澧炴椂涓烘柊澧炴搷浣�
- this.isEdit1 = false;
+
},
editRow(row) {
@@ -1564,7 +1581,7 @@
response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
const label = elem.split(":")[0].trim();
const value = parseInt(elem.split(":")[1].trim());
-
+
// 鍒ゆ柇 typeOptions 鏁扮粍涓槸鍚﹀凡瀛樺湪鐩稿悓鐨� value
if (!_this.typeOptions.some(option => option.value === value)) {
_this.typeOptions.push({ "label": label, "value": value });
@@ -1573,9 +1590,9 @@
// _this.getSrc1(value)
});
});
-
+
},
-
+
// 鍙栨秷鎸夐挳
cancelData() {
// alert(23)
@@ -1585,49 +1602,71 @@
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) {
// 澶勭悊鏂囦欢涓婁紶鎴愬姛鍚庣殑鍥炶皟
this.individualList.img = response.url;
},
-
+
//涓嬫媺
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 !== '');
@@ -1644,7 +1683,7 @@
}
return options;
}, []);
-
+
},
//闅旇鍙樿壊
tableRowClassName({row, rowIndex}) {
@@ -1699,9 +1738,10 @@
.btn_edit{
background:center no-repeat url('../../assets/icons/edit.png') ;
+ float:right;
}
.btn_del{
- background:center no-repeat url('../../assets/images/鍒犻櫎2.png') ;
+ background:center no-repeat url('../../assets/images/鍒犻櫎2.png') ;float:right;
}
.button-container {
text-align: right;
--
Gitblit v1.9.1