From 38e3523c6883eb3eaaf58995a9ad6db888ee4c43 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期六, 30 三月 2024 17:44:25 +0800
Subject: [PATCH] 修改了魅宠饮食习惯
---
ruoyi-ui/src/views/self/show.vue | 167 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 135 insertions(+), 32 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index ec4ab2b..72919db 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -7,8 +7,9 @@
></el-button>
</el-backtop>
<h1 style="font-size:21px;padding-top:30px;display: flex;">
- <span>涓汉绠�鍘�</span>
- <div class="button-container" >
+ <span>涓汉璁颁簨鏈�</span>
+ <div class="button-container" ></div>
+ <!-- <div class="button-container" >
<el-button
size="mini"
style="background: #E0EEFE;
@@ -36,12 +37,12 @@
v-print="'#printable-content'"
v-hasPermi="['family:note:export']"
>鎵撳嵃</el-button>
- </div>
+ </div> -->
<div style="display: flex; align-items: center;">
<el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px">
<div class="form" ><el-icon style="padding-right:100px;"></el-icon>
<span class="text" style="width: 69px;height: 26px;font-size: 16px;
- font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">涓汉璁颁簨鏈�</span></div>
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">涓汉绠�鍘�</span></div>
</el-button>
</div>
</h1>
@@ -289,8 +290,11 @@
accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
list-type="picture-card"
multiple
- :http-request="requestUploadm"
+ :http-request="requestUpload"
:file-list="fileList"
+ :on-change="handleChange"
+ :auto-upload="false"
+ ref="upload"
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{ file }">
@@ -324,6 +328,13 @@
</div>
</el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action=""
@@ -348,7 +359,7 @@
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScopem">淇� 瀛�</el-button>
- <el-button @click="cancelData">鍙� 娑�</el-button>
+ <el-button @click="cancelDataPer">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -363,7 +374,7 @@
<!--鎶樺彔闈㈡澘-->
- <el-collapse v-model="activeNames" @change="handleChange">
+ <el-collapse v-model="activeNames" @change="handleChange5">
<!-- <el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" >
<div>
<el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
@@ -869,6 +880,8 @@
data() {
return {
+ uploadFileList: [],
+ uploadFileList1: [],
// 閬僵灞�
disabled: false,
@@ -940,7 +953,7 @@
// 寮瑰嚭灞傛爣棰�
title: "",
- // open:true,
+ open:false,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
openDataScope: false,
menuExpand: false,
@@ -954,6 +967,7 @@
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ fileList1:[],
fileList:[],
fileListOther:[],
dsb:true,
@@ -985,7 +999,7 @@
momId:undefined,
birth:undefined,
familyId:undefined,
-
+ url: '',
//涓昏瀛︿範鍙婂伐浣滅粡鍘�
id:undefined,
@@ -1011,7 +1025,7 @@
startTime:undefined,
endTime:undefined,
cause:undefined,
- url: undefined,
+
//鑷紶
ageBegin:undefined,
ageEnd:undefined,
@@ -1158,8 +1172,86 @@
},
methods: {
+ handleRemoveFile(file) {
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ {
+ this.$delete(this.fileListOther,i);
+ this.$delete(this.uploadFileList1,i);
+ }
+ }
+ },
+ handleRemove(file) {
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ {
+ this.$delete(this.fileList,i);
+ this.$delete(this.uploadFileList,i);
+ }
+ }
+ },
+
+ picUpload()
+ {
+ var formData = new FormData();
+ //alert(976)
+ //this.$refs.upload.submit();
+ //alert(8)
+ //alert(this.uploadFileList.length)
+ if(this.uploadFileList.length==0){
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ return}
+ //console.log(this.uploadFileList)
+ // alert(this.uploadFileList)
+ this.uploadFileList.forEach((elem)=>{
+ formData.append("uploadFile", elem)
+
+ })
+ //alert(90)
+ let _this = this
+ //alert(9)
+ uploadPic(formData).then(response => {
+ // console.log(response)
+ // console.log(_this.formDat.url,'666')
+ _this.formDat.url = _this.formDat.url+","+response.data.fileName
+ // alert(_this.formDat.url)
+ _this.uploadFileList = []
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+
+ });
+ },
+
+ handleChange(file, fileList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ //alert(file)
+ this.uploadFileList.push(file.raw);
+ this.fileList.push({name:file.name,url:file.url})
+ //alert(fileList1.length)
+ },
+ handleChange1(file, fileOtherList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url})
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ //console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ },
+
+
+
// 鍙栨秷鎸夐挳
cancelData() {
+ // alert(23)
this.dialogVisible.open = false;
this.dialogVisible.relation1 = false;
this.dialogVisible.certificate =false;
@@ -1167,6 +1259,7 @@
this.dialogVisible.autobiography=false;
this.isEdit1 = false;
this.reset();
+ // alert(32)
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
@@ -1178,7 +1271,7 @@
},
//涓嬫媺
- handleChange(activeNames) {
+ handleChange5(activeNames) {
// console.log(activeNames);
this.reset();
},
@@ -1246,7 +1339,7 @@
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listNote(this.queryParams1).then(response => {
- alert(321)
+ // alert(321)
// console.log(response.data)
this.noteList = response.data.data;
@@ -1512,6 +1605,7 @@
addNote(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.getList();
this.open = false;
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
@@ -1580,7 +1674,13 @@
saveAs(blob, filename)
})
},
+ cancelDataPer()
+ {
+ this.open = false;
+ // alert(123)
+ // alert(this.open)
+ },
/** 鏌ヨ鑷紶淇℃伅 */
getAutobiographyInfor()
@@ -1609,11 +1709,13 @@
//鏂板涓昏缁忓巻鐨勪繚瀛�
submitDataScope: function() {
let _this = this
- this.$refs["elForm"].validate(valid => {
+ this.$refs["elForm1"].validate(valid => {
if (valid) {
+ //alert(1235)
+ _this.dialogVisible.open = false;
addExperience(_this.formDat).then(response => {
_this.$modal.msgSuccess("鏂板鎴愬姛");
- _this.dialogVisible.open = false;
+
_this.getList();
});
}
@@ -1627,9 +1729,10 @@
submitDataScope2: function() {
this.$refs["elForm"].validate(valid => {
if (valid) {
+ this.dialogVisible.relation1 = false;
addRelation(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
- this.dialogVisible.relation1 = false;
+
this.getList();
});
}
@@ -1722,11 +1825,11 @@
},
//淇敼鍚庣殑淇濆瓨
-
+
//涓昏缁忓巻
saveRowExperienceList(row) {
- this.$refs['elForm'].validate(valid => {
- if (valid) {
+ // this.$refs['elForm'].validate(valid => {
+ // if (valid) {
const foundIndex = this.experienceList.findIndex(item => item.id === row.id);
if (foundIndex !== -1) {
const updatedData = Object.assign({}, this.experienceList[foundIndex], row);
@@ -1739,15 +1842,15 @@
} else {
this.$modal.msgError("淇敼澶辫触");
}
- }
- });
+ //}
+ // });
this.$set(row, 'isEdit', false);
this.$set(this.editStatus, row.id, false);
},
//鎴愬憳鍏崇郴
saveRowRelationList(row) {
- this.$refs['elForm'].validate(valid => {
- if (valid) {
+ // this.$refs['elForm'].validate(valid => {
+ // if (valid) {
const foundIndex = this.relationList.findIndex(item => item.id === row.id);
if (foundIndex !== -1) {
const updatedData = Object.assign({}, this.relationList[foundIndex], row);
@@ -1760,15 +1863,15 @@
} else {
this.$modal.msgError("淇敼澶辫触");
}
- }
- });
+ // }
+ // });
this.$set(row, 'isEdit', false);
this.$set(this.editStatus, row.id, false);
},
//璇佷欢鎯呭喌
saveRowCertificateList(row) {
- this.$refs['elForm'].validate(valid => {
- if (valid) {
+ // this.$refs['elForm'].validate(valid => {
+ // if (valid) {
const foundIndex = this.certificateList.findIndex(item => item.id === row.id);
if (foundIndex !== -1) {
const updatedData = Object.assign({}, this.certificateList[foundIndex], row);
@@ -1781,15 +1884,15 @@
} else {
this.$modal.msgError("淇敼澶辫触");
}
- }
- });
+ // }
+ //});
this.$set(row, 'isEdit', false);
this.$set(this.editStatus, row.id, false);
},
//鍑哄浗鎯呭喌
saveRowAbroadList(row) {
- this.$refs['elForm'].validate(valid => {
- if (valid) {
+ // this.$refs['elForm'].validate(valid => {
+ // if (valid) {
const foundIndex = this.AbroadList.findIndex(item => item.id === row.id);
if (foundIndex !== -1) {
const updatedData = Object.assign({}, this.AbroadList[foundIndex], row);
@@ -1802,8 +1905,8 @@
} else {
this.$modal.msgError("淇敼澶辫触");
}
- }
- });
+ // }
+ // });
this.$set(row, 'isEdit', false);
this.$set(this.editStatus, row.id, false);
},
--
Gitblit v1.9.1