From 8142b945508cd53a4dfaa739ad066389e8dfe214 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期二, 11 三月 2025 22:31:48 +0800 Subject: [PATCH] 修改了姓 --- ruoyi-ui/src/views/selfeconomy/memo.vue | 800 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 690 insertions(+), 110 deletions(-) diff --git a/ruoyi-ui/src/views/selfeconomy/memo.vue b/ruoyi-ui/src/views/selfeconomy/memo.vue index 7678bc5..a8419cd 100644 --- a/ruoyi-ui/src/views/selfeconomy/memo.vue +++ b/ruoyi-ui/src/views/selfeconomy/memo.vue @@ -4,13 +4,14 @@ <el-button class="button1" size="mini" type="text" @click="handleAdd" v-hasPermi="['system:role:add']"> <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button> - <el-table v-loading="loading" :data="memoList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 60%;"> + <el-table v-loading="loading" border :data="memoList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;width: 60%;"> <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/> <el-table-column label="鏃堕棿" prop="happenTime" sortable width="180px" align="center"> <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"> @@ -28,6 +29,9 @@ @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']" > <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button> + <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:property:info']"> + <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button> + </el-dropdown> </template> </el-table-column> </el-table> @@ -41,8 +45,6 @@ style="background: #FEF7FC;" /> - <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 --> - <el-dialog :title="isEdit1 ? '缂栬緫' : '鏂板'" :visible.sync="open" width="900px" append-to-body> <el-col > <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> @@ -52,6 +54,7 @@ v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡' + value-format="yyyy-MM-dd" ></el-date-picker> </el-form-item> @@ -60,21 +63,273 @@ </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="handleRemove2(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="handleRemoveFile2" + :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> + + <i v-if="true" 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"> + + <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="handleDownload(file.url)" + > + <i class="el-icon-download"></i> + </span> + <span + class="el-upload-list__item-delete" + @click="handleRemoveFile2(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> - </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> + + + <!-- 鏌ョ湅璇︽儏寮圭獥 --> + <el-dialog title="璇︽儏" :visible.sync="open2" width="900px" append-to-body> + <el-col > + <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> + + <el-form-item label="鏃堕棿" prop="happenTime"> + <el-date-picker + v-model='formDat.happenTime' + type='date' + placeholder='閫夋嫨鏃ユ湡' + value-format="yyyy-MM-dd" + disabled + ></el-date-picker> + </el-form-item> + + <el-form-item label="鍐呭" prop="content"> + <el-input v-model="formDat.content" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" disabled> + </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" + disabled + + :auto-upload="false" + ref="upload" + :class="{ hide: no }" + > + <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 + + class="el-upload-list__item-delete" + @click="handleDownload(file.url)" + > + <i class="el-icon-download"></i> + </span> + + </span> + </div> + </el-upload> + <h4 class="form-header">鍏朵粬闄勪欢 </h4> + <el-upload + action="" + :file-list="fileListOther" + class="upload-demo" + multiple + disabled + :on-remove="handleRemoveFile2" + :show-file-list="true" + ref="upload1" + :on-change="handleChange1" + :auto-upload="false" + list-type="picture-card" + :http-request="requestUpload1" + :class="{ hide: no }" + > + + <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"> + + <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="handleDownload(file.url)" + > + <i class="el-icon-download"></i> + </span> + + </span> + + </div> + + + + </el-upload> + + </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> <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� --> <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body> + </el-dialog> + <el-dialog :visible.sync="dialogVisible"> + <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" /> </el-dialog> </div> @@ -87,21 +342,34 @@ //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁� --鎺ュソ浜� -import {addNote, listNote, enload, delNote, uploadPic, updateNote} from "@/api/allmemo/index"; +import {addNote,listNote,updateNote,delNote,enload, uploadPic,download} from "@/api/allmemo/index"; import { TimeSelect } from "element-ui"; +import {blobValidate} from "@/utils/ruoyi"; +import {addAutobiography, updateAutobiography} from "@/api/self"; export default { name: "Role", dicts: ['sys_normal_disable'], data() { return { + no:true, + dialogImageUrl: '', + dialogVisible: false, isEdit1:false, // 閬僵灞� disabled: false, loading: true, - formData:[], + formData:{ + id:undefined, + content: undefined, + happenTime: undefined, + fid:2026, + cid:undefined, + url:'' + }, // 閫変腑鏁扮粍 ids: [], + id:undefined, // 闈炲崟涓鐢� single: true, // 闈炲涓鐢� @@ -111,11 +379,18 @@ // 鎬绘潯鏁� total: 0, // 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁 - memoList: [], + memoList: { + id:undefined, + content: undefined, + happenTime: undefined, + fid:2026, + cid:undefined, + url:''}, // 寮瑰嚭灞傛爣棰� title: "", // 鏄惁鏄剧ず寮瑰嚭灞� open: false, + open2: false, // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛� openDataScope: false, menuExpand: false, @@ -125,20 +400,24 @@ // 鏃ユ湡鑼冨洿 dateRange: [], // 鏁版嵁鑼冨洿閫夐」 - fot:[".jpg",".jif"], + // 鏁版嵁鑼冨洿閫夐」 + fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx','HEIC', + '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'], fileList:[ ], - fileListOther:[ - - ], + fileList1:[], + uploadFileList: [], + uploadFileList1: [], + fileListOther:[], dsb:true, btn:false, formDat: { - + id:undefined, content: undefined, happenTime: undefined, fid:2026, cid:undefined, + url:'' }, // 鑿滃崟鍒楄〃 menuOptions: [], @@ -194,24 +473,207 @@ }, methods: { + // 寮圭獥 + handleShow(scope){ - // 鍙栨秷鎸夐挳 - cancelData() { - this.open = false; - this.reset(); + 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("鏂囦欢涓婁紶鎴愬姛!"); + }) + + }, + // 鏌ョ湅鏂囦欢 + handleFileCardPreview(file){ + this.dialogFileUrl = file.url; + if(this.dialogFileUrl.includes("47.93.189.255")==true) + this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com") + //alert(this.dialogFileUrl) + const Base64 = require('js-base64').Base64 + + this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl)); + let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300'); + }, + picUpload() + { + // alert('1321321') + var formData = new FormData(); + if(this.uploadFileList.length==0){ + this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�"); + return} + this.uploadFileList.forEach((elem)=>{ + formData.append("files", elem) + }) + const cid = this.$route.params && this.$route.params.id; + const fid =2026; + this.formDat.fid = 2026; + this.formDat.cid = parseInt(cid) ; + let _this = this + + if(this.isEdit1){ + uploadPic(formData).then(response => { + + _this.formDat.url = _this.formDat.url+","+response.fileNames + // alert(_this.formDat.url) + _this.uploadFileList = [] + console.log(_this.formDat) + updateNote(_this.formDat).then(response => { + alert('淇敼') + _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛"); + }) + }); + }else{ + uploadPic(formData).then(response => { + _this.formDat.url = _this.formDat.url+","+response.fileNames + // alert('鏂板') + // 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 =2026; + this.formDat.fid = 2026; + this.formDat.cid = cid ; + // 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") + 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(2026,cid); + }).catch(error => { + console.log(error,'erroerro1'); + this.isEdit1 = false; + this.open = false; + }); + } else { + // 鎵ц鏂板鎿嶄綔 + // console.log(this.formDat) + + addNote(this.formDat).then(response => { + // this.formDat.term = selectedOption.label; + 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.getList(2026,cid); + }).catch(error => { + console.log(error,'erroerro2'); + this.open = false; + }); + } + } + }); + + // 閲嶇疆isEdit涓篺alse锛屼互渚夸笅娆$偣鍑绘柊澧炴椂涓烘柊澧炴搷浣� + this.isEdit1 = false; + }, + 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; this.formDat.happenTime = row.happenTime; this.formDat.content = row.content; + this.formDat.url = row.url this.open = true; - console.log(this.formDat) + //console.log(this.formDat) + let paths = this.formDat.url.split(","); + let _this = this + _this.fileList = [] + _this.fileListOther = [] + for(let i = 0; i < paths.length; i++) + { + if(paths[i]!="") { + + let pth = paths[i].substr(paths[i].length - 4, paths[i].length) + // alert(pth) + if (_this.fot.includes(pth) === true) + { + if(paths[i][0]=="/") + _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false}) + else + _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false}) + } + else { + let nms = paths[i].split("\/") + let nm = nms[nms.length - 1] + if(paths[i][0]=="/") + _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false}) + else + _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false}) + + } + } + } + }, + + // 鍙栨秷鎸夐挳 + cancelData() { + this.open = false; + this.open2=false; + this.reset(); }, + //闅旇鍙樿壊 tableRowClassName({ row, rowIndex }) { if (rowIndex % 2 == 0) { @@ -233,75 +695,163 @@ listNote(cid, 2026).then(response => { this.memoList = response.data; - console.log(this.memoList) - // this.total = response.data.total; + // console.log(response,'formDataformDataformDataformDataformData') this.loading = false; - } ); }, - handleRemove(file) { +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); + } + + //alert(this.formData.url) + + } + }, + handleRemoveFile2(file) { + this.formData=this.formDat + //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖 + let res = false + for(let i = 0; i < this.fileListOther.length; i++) + { + if(this.fileListOther[i].url==file.url) + { + if(this.fileListOther[i].res==false) + res = true + else + { + this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1)) + } + this.$delete(this.fileListOther,i); + + } + } + + let ul = "" + this.fileList.map(function (elem){ + if(elem.res==false) + ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + }) + let uls = "" + this.fileListOther.map(function (elem){ + if(elem.res==false) + uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + }) + this.formData.url = ul+","+uls; + // alert(this.formData.url) + if(res==true){ + updateNote(this.formData).then(response => { + this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); + // this.open = false; + + }); + } + }, + handleRemove2(file) { + this.formData=this.formDat + //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖 + let res = false + for(let i = 0; i < this.fileList.length; i++) + { + if(this.fileList[i].url==file.url) + { + //鍘熸潵鍥惧儚鏍囪涓篺alse + //alert(this.fileList[i].res) + if(this.fileList[i].res==false) + res = true + else + { + this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1)) + } + this.$delete(this.fileList,i); + } + } + let ul = "" + this.fileList.map(function (elem){ + if(elem.res==false) + ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + }) + let uls = "" + this.fileListOther.map(function (elem){ + if(elem.res==false) + uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + }) + this.formData.url = ul+","+uls; + console.log(this.fileList,'fileListfileListfileListfileListfileListfileList') + console.log(this.fileListOther,'uploadFileListuploadFileListuploadFileListuploadFileList') + console.log(this.formData,'formDataformDataformDataformDataformDataformDataformData222222222') + if(res==true){ + updateNote(this.formData).then(response => { + this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); + }); + } + + }, + handleCheck(row){ + const id = row.id; + this.formDat.cid = row.cid; + this.formDat.id = row.id; + this.formDat.happenTime = row.happenTime; + this.formDat.content = row.content; + this.formDat.url = row.url + this.open2 = true; + //console.log(this.formDat) + let paths = this.formDat.url.split(","); + let _this = this + _this.fileList = [] + _this.fileListOther = [] + for(let i = 0; i < paths.length; i++) + { + if(paths[i]!="") { + + let pth = paths[i].substr(paths[i].length - 4, paths[i].length) + // alert(pth) + if (_this.fot.includes(pth) === true) + { + if(paths[i][0]=="/") + _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false}) + else + _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false}) + } + else { + let nms = paths[i].split("\/") + let nm = nms[nms.length - 1] + if(paths[i][0]=="/") + _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false}) + else + _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false}) + + } + } + } + }, + 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); + + } } }, - //涓汉鑷紶鐨勪繚瀛� - submitDataScope6: function() { - const cid = this.$route.params && this.$route.params.id; - const fid =2026; - this.formDat.fid = 2026; - this.formDat.cid = cid ; - console.log(this.formDat) - console.log(this.isEdit1) - this.$refs["elForm"].validate(valid => { - if (valid) { - if (this.isEdit1) { - // 鎵ц淇敼鎿嶄綔 - updateNote(this.formDat).then(response => { - console.log("1") - this.$modal.msgSuccess("淇敼鎴愬姛"); - this.open = false; - //娓呯┖formDat瀵硅薄鐨勬暟鎹� - Object.keys(this.formDat).forEach(key => { - this.formDat[key] = ''; - }); - this.isEdit1 = false; - this.getList(2026,cid); - }).catch(error => { - console.log(error); - this.isEdit1 = false; - this.open = false; - }); - } else { - // 鎵ц鏂板鎿嶄綔 - addNote(this.formDat).then(response => { - // this.formDat.term = selectedOption.label; - this.$modal.msgSuccess("鏂板鎴愬姛"); - this.open = false; - //娓呯┖formDat瀵硅薄鐨勬暟鎹� - Object.keys(this.formDat).forEach(key => { - this.formDat[key] = ''; - }); - this.getList(2026,cid); - }).catch(error => { - console.log(error); - this.open = false; - }); - } - } - }); - // 閲嶇疆isEdit涓篺alse锛屼互渚夸笅娆$偣鍑绘柊澧炴椂涓烘柊澧炴搷浣� - this.isEdit1 = false; - }, // 鍙栨秷鎸夐挳 cancel() { this.open = false; this.reset(); }, - + getCid(){ + const cid = this.$route.params && this.$route.params.id; + return cid + }, getRowId(row) { return row.id @@ -316,6 +866,10 @@ if (this.$refs.menu != undefined) { this.$refs.menu.setCheckedKeys([]); } + // this.fileList = [], + // this.fileListOther = [], + // this.formDat.happenTime=undefined, + // this.formDat.content=undefined, this.menuExpand = false, this.menuNodeAll = false, this.deptExpand = true, @@ -336,7 +890,7 @@ }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { - const fid = 2031; + const fid = 2026; const cid = this.$route.params && this.$route.params.id; this.queryParams.pageNum = 1; this.getList(fid,cid); @@ -354,20 +908,49 @@ this.single = selection.length!=1 this.multiple = !selection.length }, + // 涓嬭浇鎸夐挳 + handleDownload(url) { + var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")}; + + let lens = formData.path.split(".") + let suffix = lens[lens.length-1] + download(formData).then(async (response) => { + const isLogin = await blobValidate(response); + let nt = new Date().getTime() + let filename = 'familyevent_'+nt+'.'+suffix + const blob = new Blob([response]) + saveAs(blob, filename) + }) + }, /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { + for(let i=0;i<2;i++){ + //娓呯┖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.reset(); + this.isEdit1=false; this.open = true; - this.title = "鏂板澶囧繕鏈�"; + }, - // /** 淇敼鎸夐挳鎿嶄綔 */ - // handleUpdate(row) { - // const id = row.id; - // - // - // }, + /** 淇敼鎸夐挳鎿嶄綔 */ + handleUpdate(row) { + const id = row.id; + let jd = true + + + }, handlePictureCardPreview(file) { @@ -377,6 +960,7 @@ /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */ submitDataScope: function() { const cid = this.$route.params && this.$route.params.id; + const fid =2026; let ul = this.fileList.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") @@ -386,8 +970,7 @@ this.formDat.fid = 2026; this.formDat.cid = cid ; this.formDat.url = ul+","+uls - console.log(this.formDat) - // debugger + this.$refs["elForm"].validate(valid => { if (valid) { @@ -405,29 +988,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; @@ -468,7 +1049,7 @@ var formData = new FormData(); formData.append('excelImport', file); let _this = this - alert(file) + enload(formData).then(response => { _this.getList(); Message({ message: "瀵煎叆鎴愬姛", type: 'warning' }) @@ -481,12 +1062,8 @@ } }, - // 寮圭獥 - handleShow(scope){ - this.openDataScope = true - this.getList() - } + }; </script> @@ -500,6 +1077,9 @@ background: #FFEFF2; } +.hide .el-upload--picture-card{ + display:none; /* 涓婁紶鎸夐挳闅愯棌 */ +} .button1 { background:center no-repeat url('../../assets/icons/add1.png') ; -- Gitblit v1.9.1