From 6afb98b81fa4b4b3223d53d42a891fb89862d38b Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期一, 14 八月 2023 16:36:29 +0800
Subject: [PATCH] 新增家谱图，完善各模块新增时的电子文件上传功能，在上传期间显示正在上传
---
ruoyi-ui/src/views/secret/secretInfo.vue | 55 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue
index 9b65ef2..7ae6dd3 100644
--- a/ruoyi-ui/src/views/secret/secretInfo.vue
+++ b/ruoyi-ui/src/views/secret/secretInfo.vue
@@ -1,20 +1,28 @@
<template>
<div class="app-container">
<div class="form-header mt">
- <h4 class="dt h4">闅愮璇︾粏淇℃伅 </h4>
-
+ <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
+ <span>闅愮璇︽儏</span>
+ <div style="display: flex; align-items: center;">
+ <el-button size="mini" type="text" @click="checkNote()" v-hasPermi="['person:information:memo']">
+ <div class="form" ><el-icon style="padding-right:110px;"></el-icon>
+ <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">澶囧繕鏈�</span></div>
+ </el-button>
+ </div>
+ </h1>
</div>
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
- <el-input v-model="formData.happenTime" placeholder="璇烽�夋嫨鏃堕棿" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-model="formData.happenTime" placeholder="璇烽�夋嫨鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
<el-form-item label="绫诲瀷" prop="type">
<el-select v-model="formData.type" placeholder="璇烽�夋嫨鍩洪噾/鍙拌处" clearable :style="{width: '100%'}" :disabled="dsb" >
</el-select>
</el-form-item>
<el-form-item label="鏈夋晥鏈�" prop="validityDate">
- <el-input v-model="formData.validityDate" placeholder="璇烽�夋嫨鏃堕棿" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-model="formData.validityDate" placeholder="璇烽�夋嫨鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
<el-form-item label="璐﹀彿" prop="accNo">
<el-input v-model="formData.accNo" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" :disabled="dsb">
@@ -48,7 +56,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -60,14 +69,14 @@
>
<span class="el-upload-list__item-actions">
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -98,9 +107,9 @@
:http-request="requestUpload"
:show-file-list="true"
>
-
- <i slot="default" class="el-icon-plus"></i>
- <div slot="file" slot-scope="{file}">
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
src="../../assets/401_images/401.gif"
@@ -110,14 +119,14 @@
>
<span class="el-upload-list__item-actions">
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
@click="handleRemove(file)"
class="el-upload-list__item-delete"
@@ -173,13 +182,13 @@
dsb:true,
btn:false,
isShow:true,
+ uploading: false,
formData: {
type: undefined,
happenTime: undefined,
accNo:undefined,
validityDate:undefined,
password:undefined,
- validityDate:undefined,
isFinger:undefined,
isFace:undefined,
isPrivate:undefined,
@@ -266,7 +275,7 @@
let _this = this
if (id) {
this.loading = true;
- getSecretInfo(id).then((response) => {
+ getSecretInfo({id}).then((response) => {
this.formData = response.data;
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
@@ -401,10 +410,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -424,7 +434,14 @@
this.download('/zfEconomy/export', {
...this.queryParams
}, `zfEconomy_${new Date().getTime()}.xlsx`)
- }
+ },
+ // 鏌ョ湅澶囧繕鏈�
+ checkNote(row){
+ // const id =row.id;
+ const id = this.$route.params && this.$route.params.id;
+ // const fid =2031
+ this.$router.push("/self/secret/memo/" + id);
+ },
}
}
@@ -445,4 +462,8 @@
display: block;
position: absolute;
}
+
+ .form{
+ background:center/11% no-repeat url('../../assets/icons/form.png') ;
+ }
</style>
--
Gitblit v1.9.1