From 28301a7a64c7092e985d2c4f261d4892245995de Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期一, 15 四月 2024 09:42:05 +0800
Subject: [PATCH] 备忘录修改
---
ruoyi-ui/src/views/note/memo.vue | 253 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 208 insertions(+), 45 deletions(-)
diff --git a/ruoyi-ui/src/views/note/memo.vue b/ruoyi-ui/src/views/note/memo.vue
index 3b19f64..bae35f5 100644
--- a/ruoyi-ui/src/views/note/memo.vue
+++ b/ruoyi-ui/src/views/note/memo.vue
@@ -11,6 +11,7 @@
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鍐呭" prop="content" sortable width="180px" />
+
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
@@ -59,10 +60,84 @@
</el-input>
</el-form-item>
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+ <el-upload
+ action="#"
+ list-type="picture-card"
+ multiple
+ :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}">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 126px; height: 126px"
+ fit="cover"
+ :preview-src-list="[file.url]"
+ >
+ <span class="el-upload-list__item-actions">
+ <span
+ class="el-upload-list__item-preview"
+ @click="handlePictureCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+
+ <span
+ v-if="!disabled"
+ class="el-upload-list__item-delete"
+ @click="handleRemove(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+ </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
+
+ :on-remove="handleRemoveFile"
+ :show-file-list="true"
+ ref="upload1"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ list-type="picture-card"
+ :http-request="requestUpload1"
+ >
+ <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <template #tip>
+ <div class="el-upload__tip">
+ </div>
+ </template>
+ </el-upload>
+
+<el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
</el-form>
-
</el-col>
+
<h4 class="form-header"> </h4>
<div slot="footer" class="dialog-footer">
@@ -95,6 +170,8 @@
dicts: ['sys_normal_disable'],
data() {
return {
+ // dialogImageUrl: '',
+ // dialogVisible: false,
isEdit1:false,
// 閬僵灞�
disabled: false,
@@ -117,7 +194,8 @@
content: undefined,
happenTime: undefined,
fid:2007,
- cid:undefined,},
+ cid:undefined,
+ url:''},
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -134,12 +212,12 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
fileList:[
],
- fileListOther:[
-
- ],
+ fileList1:[],
+ uploadFileList: [],
+ uploadFileList1: [],
+ fileListOther:[],
dsb:true,
btn:false,
formDat: {
@@ -148,6 +226,7 @@
happenTime: undefined,
fid:2007,
cid:undefined,
+ url:''
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -203,39 +282,100 @@
},
methods: {
+ // 寮圭獥
+ handleShow(scope){
+
+ this.openDataScope = true
+ this.getList()
+ },
+ 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()
+ {
+ // alert('1321321')
+ var formData = new FormData();
+ if(this.uploadFileList.length==0){
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ return}
+ this.uploadFileList.forEach((elem)=>{
+ formData.append("files", elem)
+ })
+
+ let _this = this
+
+ uploadPic(formData).then(response => {
+
+ _this.formDat.url = _this.formDat.url+","+response.fileNames
+ alert(_this.formDat.url)
+ _this.uploadFileList = []
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+
+ });
+ console.log(this.formDat,'formDatformDatformDatformDat')
+ },
//涓汉鑷紶鐨勪繚瀛�
submitDataScope6: function() {
-
+
const cid = this.$route.params && this.$route.params.id;
const fid =2007;
this.formDat.fid = 2007;
this.formDat.cid = cid ;
- console.log(this.formDat)
- console.log(this.isEdit1)
+ // console.log(this.formDat,'formDatformDatformDatformDat')
+ // console.log(this.isEdit1)
this.$refs["elForm"].validate(valid => {
if (valid) {
if (this.isEdit1) {
// 鎵ц淇敼鎿嶄綔
updateNote(this.formDat).then(response => {
- console.log("1")
+ // console.log("1")
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
//娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
+ for(let i = 0; i <= this.fileList.length; i++)
+ {
+ this.handleRemove(this.fileList[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
this.isEdit1 = false;
this.getList(2007,cid);
}).catch(error => {
- console.log(error);
+ console.log(error,'erroerro1');
this.isEdit1 = false;
this.open = false;
});
} else {
// 鎵ц鏂板鎿嶄綔
- console.log(this.formDat)
-
+ // console.log(this.formDat)
+
addNote(this.formDat).then(response => {
// this.formDat.term = selectedOption.label;
this.$modal.msgSuccess("鏂板鎴愬姛");
@@ -244,9 +384,16 @@
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
+ for(let i = 0; i <= this.fileList.length; i++)
+ {
+ this.handleRemove(this.fileList[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
this.getList(2007,cid);
}).catch(error => {
- console.log(error);
+ console.log(error,'erroerro2');
this.open = false;
});
}
@@ -259,8 +406,8 @@
editAutobiography(row) {
const id = row.id;
- console.log(id)
- console.log(row.content)
+ // console.log(id)
+ // console.log(row.content)
this.isEdit1 = true;
this.formDat.cid = row.cid;
this.formDat.id = row.id;
@@ -297,16 +444,38 @@
listNote(cid, 2007).then(response => {
this.memoList = response.data;
- console.log(this.memoList)
+ console.log(response,'11111111111111111111111')
this.loading = false;
}
);
},
+ // handleRemove(file) {
+ // for(let i = 0; i < this.fileListOther.length; i++)
+ // {
+ // if(this.fileListOther[i].url==file.url)
+ // this.$delete(this.fileListOther,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);
+ }
+ }
+ },
+ 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);
+
+ }
}
},
@@ -424,29 +593,27 @@
});
},
- requestUpload(params)
- {
- var file = params.file;
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
-
- uploadPic(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
- if(_this.fot.includes(pth) === true)
- {
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
- }
-
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
- }
- })
-
+ requestUpload(params) {
+ //alert(98)
+ // this.uploadFileList.push(params.file);
},
+ requestUpload1(params)
+ {
+ // this.uploadFileList1.push(params.file);
+ },
+ handleChange(file, fileList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+ console.log("=========5555=========")
+ console.log(file)
+ this.uploadFileList.push(file.raw);
+ this.fileList.push({name:file.name,url:file.url})
+ },
+ handleChange1(file, fileOtherList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url})
+ console.log("=========5555=========")
+ },
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const id = row.id || this.id;
@@ -487,7 +654,7 @@
var formData = new FormData();
formData.append('excelImport', file);
let _this = this
-
+
enload(formData).then(response => {
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
@@ -500,12 +667,8 @@
}
},
- // 寮圭獥
- handleShow(scope){
- this.openDataScope = true
- this.getList()
- }
+
};
</script>
--
Gitblit v1.9.1