From 062cafaecdd03f085ab1555b3343c36c18af491e Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 26 三月 2024 16:39:35 +0800
Subject: [PATCH] 完善家庭会议模块2
---
ruoyi-ui/src/views/self/show.vue | 98 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 75 insertions(+), 23 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index fd5e651..2d542b3 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -8,7 +8,8 @@
</el-backtop>
<h1 style="font-size:21px;padding-top:30px;display: flex;">
<span>涓汉璁颁簨鏈�</span>
- <div class="button-container" >
+ <div class="button-container" ></div>
+ <!-- <div class="button-container" >
<el-button
size="mini"
style="background: #E0EEFE;
@@ -36,7 +37,7 @@
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>
@@ -291,6 +292,9 @@
multiple
:http-request="requestUploadm"
:file-list="fileList"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ ref="upload"
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{ file }">
@@ -348,7 +352,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>
@@ -869,6 +873,8 @@
data() {
return {
+ uploadFileList: [],
+ uploadFileList1: [],
// 閬僵灞�
disabled: false,
@@ -940,7 +946,7 @@
// 寮瑰嚭灞傛爣棰�
title: "",
- // open:true,
+ open:false,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
openDataScope: false,
menuExpand: false,
@@ -954,6 +960,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,
@@ -1158,8 +1165,45 @@
},
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);
+ }
+ }
+ },
+ handleChange1(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)
+ },
+
+
+
// 鍙栨秷鎸夐挳
cancelData() {
+ // alert(23)
this.dialogVisible.open = false;
this.dialogVisible.relation1 = false;
this.dialogVisible.certificate =false;
@@ -1167,6 +1211,7 @@
this.dialogVisible.autobiography=false;
this.isEdit1 = false;
this.reset();
+ // alert(32)
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
@@ -1512,6 +1557,7 @@
addNote(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.getList();
this.open = false;
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
@@ -1580,7 +1626,13 @@
saveAs(blob, filename)
})
},
+ cancelDataPer()
+ {
+ this.open = false;
+ // alert(123)
+ // alert(this.open)
+ },
/** 鏌ヨ鑷紶淇℃伅 */
getAutobiographyInfor()
@@ -1615,7 +1667,7 @@
_this.dialogVisible.open = false;
addExperience(_this.formDat).then(response => {
_this.$modal.msgSuccess("鏂板鎴愬姛");
-
+
_this.getList();
});
}
@@ -1632,7 +1684,7 @@
this.dialogVisible.relation1 = false;
addRelation(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
-
+
this.getList();
});
}
@@ -1725,11 +1777,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);
@@ -1742,15 +1794,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);
@@ -1763,15 +1815,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);
@@ -1784,15 +1836,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);
@@ -1805,8 +1857,8 @@
} else {
this.$modal.msgError("淇敼澶辫触");
}
- }
- });
+ // }
+ // });
this.$set(row, 'isEdit', false);
this.$set(this.editStatus, row.id, false);
},
--
Gitblit v1.9.1