From fa3615d2dcad3eb020a7ac59581546a6560e37ae Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期五, 10 五月 2024 16:06:41 +0800
Subject: [PATCH] 解决了其他附件封面问题
---
ruoyi-ui/src/views/self/show.vue | 357 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 307 insertions(+), 50 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index ec4ab2b..0e8b1ae 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,31 +328,81 @@
</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=""
:file-list="fileListOther"
class="upload-demo"
multiple
-
+ ref="upload1"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ list-type="picture-card"
:on-remove="handleRemove"
:http-request="requestUpload1m"
:show-file-list="true"
>
- <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
- <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
- <template #tip>
- <div class="el-upload__tip">
- </div>
- </template>
+
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ style="width: 147px; height: 147px"
+ fit="cover"
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 100%; height: 100%"
+ fit="cover"></img>
+
+ <span class="el-upload-list__item-actions">
+ <span class="el-upload-list__item-name">{{ file.name }}</span>
+ <span
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+
+ <span
+
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+ </div>
+
</el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
</el-form>
<h4 class="form-header"> </h4>
<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 +417,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 +923,8 @@
data() {
return {
+ uploadFileList: [],
+ uploadFileList1: [],
// 閬僵灞�
disabled: false,
@@ -940,7 +996,7 @@
// 寮瑰嚭灞傛爣棰�
title: "",
- // open:true,
+ open:false,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
openDataScope: false,
menuExpand: false,
@@ -954,6 +1010,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 +1042,7 @@
momId:undefined,
birth:undefined,
familyId:undefined,
-
+ url: '',
//涓昏瀛︿範鍙婂伐浣滅粡鍘�
id:undefined,
@@ -1011,7 +1068,7 @@
startTime:undefined,
endTime:undefined,
cause:undefined,
- url: undefined,
+
//鑷紶
ageBegin:undefined,
ageEnd:undefined,
@@ -1049,6 +1106,21 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
+ happenTime: [{
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿',
+ trigger: 'blur'
+ }],
+ people: [{
+ required: true,
+ message: '璇疯緭鍏ヤ汉鐗�',
+ trigger: 'blur'
+ }],
+ title: [{
+ required: true,
+ message: '璇疯緭鍏ヤ簨浠舵爣棰�',
+ trigger: 'blur'
+ }],
//鍩烘湰淇℃伅
nickName: [{
// required: true,
@@ -1144,6 +1216,74 @@
trigger: 'blur'
}],
+ relation: [{
+ required: true,
+ message: '璇疯緭鍏ュ叧绯�',
+ trigger: 'blur'
+ }],
+ otherName: [{
+ required: true,
+ message: '璇疯緭鍏ュ鍚�',
+ trigger: 'blur'
+ }],
+ otherUnit: [{
+ required: true,
+ message: '璇疯緭鍏ュ崟浣�',
+ trigger: 'blur'
+ }],
+ otherPosition: [{
+ required: true,
+ message: '璇疯緭鍏ヨ亴鍔�',
+ trigger: 'blur'
+ }],
+ otherPolitical: [{
+ required: true,
+ message: '璇疯緭鍏ユ斂娌婚潰璨�',
+ trigger: 'blur'
+ }],
+
+ cerName: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉浠跺悕绉�',
+ trigger: 'blur'
+ }],
+ type: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉浠剁被鍨�',
+ trigger: 'blur'
+ }],
+ ownStatus: [{
+ required: true,
+ message: '璇疯緭鍏ユ寔鏈夋儏鍐�',
+ trigger: 'blur'
+ }],
+ idNo: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉浠跺彿鐮�',
+ trigger: 'blur'
+ }],
+
+ startTime: [{
+ required: true,
+ message: '璇疯緭鍏ュ紑濮嬫椂闂�',
+ trigger: 'blur'
+ }],
+ endTime: [{
+ required: true,
+ message: '璇疯緭鍏ョ粨鏉熸椂闂�',
+ trigger: 'blur'
+ }],
+ destination: [{
+ required: true,
+ message: '璇疯緭鍏ユ墍鍒板湴鍖�',
+ trigger: 'blur'
+ }],
+ cause: [{
+ required: true,
+ message: '璇疯緭鍏ヤ簨鐢�',
+ trigger: 'blur'
+ }]
+
},
selectedOption:'',
typeOptions:[],
@@ -1158,8 +1298,113 @@
},
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);
+ }
+ }
+ },
+
+ fileUpload(){
+ // var file = params.file;
+
+ var formData = new FormData();
+ this.$refs.upload1.submit();
+ // formData.append('uploadFile', file);
+ if(this.uploadFileList1.length==0){
+ this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
+ return
+ }
+ this.uploadFileList1.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+
+ let _this = this
+
+ this.uploading = true;
+ uploadPic(formData).then(response => {
+ _this.uploadFileList1 = []
+ _this.formDat.url = _this.formDat.url+","+response.fileNames
+ _this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
+ })
+
+ },
+
+ 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("files", elem)
+
+ })
+ //alert(90)
+ let _this = this
+ //alert(9)
+ uploadPic(formData).then(response => {
+ // console.log(response,'123123123')
+ // console.log(_this.formDat.url,'666')
+ _this.formDat.url = _this.formDat.url+","+response.fileNames
+
+ // 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 +1412,7 @@
this.dialogVisible.autobiography=false;
this.isEdit1 = false;
this.reset();
+ // alert(32)
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
@@ -1178,7 +1424,7 @@
},
//涓嬫媺
- handleChange(activeNames) {
+ handleChange5(activeNames) {
// console.log(activeNames);
this.reset();
},
@@ -1246,7 +1492,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;
@@ -1431,7 +1677,7 @@
{
var file = params.file;
var formData = new FormData();
- formData.append('uploadFile', file);
+ formData.append('files', file);
let _this = this
this.uploading = true;
uploadPic(formData).then(response => {
@@ -1440,7 +1686,7 @@
this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ _this.fileList.push({name:response.fileNames, "url":response.data.url})
}
})
},
@@ -1448,7 +1694,7 @@
{
var file = params.file;
var formData = new FormData();
- formData.append('uploadFile', file);
+ formData.append('files', file);
let _this = this
this.uploading1 = true;
uploadPic(formData).then(response => {
@@ -1457,7 +1703,7 @@
this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) !== true)
{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ _this.fileListOther.push({name:response.fileNames, url:response.data.url})
}
})
},
@@ -1500,18 +1746,20 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScopem: function() {
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.formDat.url = ul+","+uls
+ // let ul = this.fileList.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // let uls = this.fileListOther.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // this.formDat.url = ul+","+uls
this.$refs["elForm"].validate(valid => {
if (valid) {
addNote(this.formDat).then(response => {
+ console.log(this.formDat)
this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.getList();
this.open = false;
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
@@ -1580,7 +1828,13 @@
saveAs(blob, filename)
})
},
+ cancelDataPer()
+ {
+ this.open = false;
+ // alert(123)
+ // alert(this.open)
+ },
/** 鏌ヨ鑷紶淇℃伅 */
getAutobiographyInfor()
@@ -1609,11 +1863,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 +1883,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 +1979,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 +1996,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 +2017,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 +2038,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 +2059,8 @@
} else {
this.$modal.msgError("淇敼澶辫触");
}
- }
- });
+ // }
+ // });
this.$set(row, 'isEdit', false);
this.$set(this.editStatus, row.id, false);
},
--
Gitblit v1.9.1