From 7eb199649939226c3f11fd6f4cda830a389253b8 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 20 四月 2025 19:14:09 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/self/memo.vue | 140 ++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 61 deletions(-)
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 24212d6..e23049e 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -77,12 +77,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 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-model="individualList.sex === 0 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</template>
<template v-else>
<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-option label="鐢�" value='0'></el-option>
+ <el-option label="濂�" value='1'></el-option>
</el-select>
</template>
</el-form-item>
@@ -117,15 +117,16 @@
<el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="70px">
<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===1" placeholder="鍒濆"></el-input>
+ <el-input v-if="individualList.maritalStatus===2" placeholder="绂诲"></el-input>
+ <el-input v-if="individualList.maritalStatus===3" placeholder="鍐嶅"></el-input>
</template>
<template v-else>
<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='1'></el-option>
<el-option label="绂诲" value='2'></el-option>
+ <el-option label="鍐嶅" value='3'></el-option>
</el-select>
</template>
</el-form-item>
@@ -149,7 +150,7 @@
accept="image/*"
:multiple="false"
:http-request="requestUpload"
-
+
:limit="1">
<el-avatar shape="square" style="width: 200px;;height: 200px;" >
@@ -278,11 +279,11 @@
</el-container>
</el-form-item>
</el-form>
-
+
</div>
-
+
</el-collapse-item> -->
-
+
<!--涓昏瀛︿範鍙婂伐浣滅粡鍘�-->
<el-collapse-item name="1" >
<template v-slot:title>
@@ -533,7 +534,7 @@
<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='right:10px;top:5px;'>
<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
</el-button>
@@ -542,12 +543,12 @@
</el-tabs></div>
</el-container>
</el-collapse-item>
-
+
</el-collapse>
-
-
-
-
+
+
+
+
<pagination
v-show="total>0"
:total="total"
@@ -555,7 +556,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">
@@ -577,10 +578,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>
@@ -608,10 +609,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>
@@ -630,7 +631,7 @@
></el-option>
</el-select>
<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%'}" >
@@ -651,7 +652,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>
@@ -677,10 +678,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>
@@ -721,13 +722,13 @@
</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>
@@ -743,7 +744,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 {
@@ -785,7 +786,7 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ fot:[".jpg",".jif",'.M4A'],
fileList:[],
fileListOther:[],
//涓嬫媺瀹炵幇
@@ -797,7 +798,7 @@
abroad:false,
autobiography:false
},
-
+
// 涓汉缁忓巻鏁版嵁
experienceList: undefined,
// isEdit:true,
@@ -809,7 +810,7 @@
typeList:[],
//鍑哄浗鎯呭喌
AbroadList:[],
-
+
uploading: false,
uploading1: false,
fit1: ['fill'],
@@ -911,8 +912,8 @@
}],
},
-
-
+
+
open:false,
formDat6: {},
formDat: {
@@ -1014,7 +1015,7 @@
this.loading1 = true;
let userId = this.$store.state.user.userId
// alert(userId)
-
+
showShareUser(userId, 2062).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -1028,6 +1029,7 @@
// // alert(this.$store.state.user.clanId)
// this.listRoot = []
let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -1045,6 +1047,7 @@
this.loading1 = false;
}
);
+ }
},
/** 鏌ヨ璁板綍鍒楄〃 */
@@ -1147,9 +1150,11 @@
if(this.individualList.maritalStatus == 0)
this.mrs = '鏈'
else if(this.individualList.maritalStatus == 1)
- this.mrs = '宸插'
- else
+ this.mrs = '鍒濆'
+ else if(this.individualList.maritalStatus == 2)
this.mrs = '绂诲'// this.isEdit=false
+ else
+ this.mrs = '鍐嶅'// this.isEdit=false
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -1159,16 +1164,23 @@
}, `self_${new Date().getTime()}.xlsx`)
}, //涓汉鍩烘湰淇℃伅
submitForm() {
- if(this.inds=='1')
+
+ if(this.inds=='1'||this.inds=='濂�')
this.individualList.sex = 1;
else
this.individualList.sex = 0;
- if(this.mrs=='0')
+
+ if(this.mrs=='0'||this.mrs=='鏈')
this.individualList.maritalStatus = 0
- else if(this.mrs == '1')
+ else if(this.mrs == '1'||this.mrs=='鍒濆')
this.individualList.maritalStatus = 1
- else
+ else if(this.mrs == '2'||this.mrs=='绂诲')
this.individualList.maritalStatus = 2
+ else
+ this.individualList.maritalStatus = 3
+
+
+ //alert(123)
// alert(10)
// let ul = this.fileList.map(function (elem){
// return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -1184,15 +1196,18 @@
updateIndividual(this.individualList).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
// 寮哄埗鏇存柊鐩稿叧缁勪欢
- this.individualList={...this.individualList}
-
- // this.open = false;
+
+ // this.individualList={...this.individualList}
+ // alert(this.individualList.sex)
+
+ // // this.open = false;
this.dsb = true
this.btn=false
this.isShow_2=false
this.isShow=true
this.isEditing = false
- });
+ //this.getList()
+ })
} else {
this.$modal.msgSuccess("淇敼澶辫触");
@@ -1213,17 +1228,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)
{
@@ -1237,6 +1254,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;
@@ -1380,7 +1398,7 @@
if (this.isEdit1) {
// 鎵ц淇敼鎿嶄綔
-
+
console.log(this.formDat6)
updateAutobiography(this.formDat6).then(response => {
// 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
@@ -1395,7 +1413,7 @@
Object.keys(this.formDat6).forEach(key => {
this.formDat6[key] = '';
});
-
+
}).catch(error => {
// alert(24)
console.log(error);
@@ -1422,7 +1440,7 @@
}
}
});
-
+
},
editRow(row) {
@@ -1578,7 +1596,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 });
@@ -1587,9 +1605,9 @@
// _this.getSrc1(value)
});
});
-
+
},
-
+
// 鍙栨秷鎸夐挳
cancelData() {
// alert(23)
@@ -1609,13 +1627,13 @@
Object.keys(this.formDat6).forEach(key => {
this.formDat6[key] = '';
});
-
+
},
handleUploadSuccess(response, file) {
// 澶勭悊鏂囦欢涓婁紶鎴愬姛鍚庣殑鍥炶皟
this.individualList.img = response.url;
},
-
+
//涓嬫媺
handleChange5(activeNames) {
// console.log(activeNames);
@@ -1629,7 +1647,7 @@
// alert(123)
// }
},
-
+
//涓汉鑷紶
handleClick(tab, event) {
// console.log(tab, event);
@@ -1642,7 +1660,7 @@
// alert(1234)
this.isEdit1 = true; // 璁剧疆涓虹紪杈戞搷浣�
// 灏嗚淇敼鐨勬暟鎹～鍏呭埌formDat瀵硅薄涓�
-
+
this.formDat6.ageBegin = data.ageBegin;
this.formDat6.ageEnd = data.ageEnd;
this.formDat6.term = data.term;
@@ -1680,7 +1698,7 @@
}
return options;
}, []);
-
+
},
//闅旇鍙樿壊
tableRowClassName({row, rowIndex}) {
--
Gitblit v1.9.1