From 2eec82ffc96ae02a75b18ee2c426f7a162950b95 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 12 九月 2023 09:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/self/memoInfo.vue | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/self/memoInfo.vue b/ruoyi-ui/src/views/self/memoInfo.vue
index a739a96..44f7c3b 100644
--- a/ruoyi-ui/src/views/self/memoInfo.vue
+++ b/ruoyi-ui/src/views/self/memoInfo.vue
@@ -1,8 +1,17 @@
<template>
- <div class="app-container">
+ <div class="app-container" id="printable-content">
<div class="form-header mt">
- <el-page-header @back="goBack" content="涓汉璁颁簨鏈缁嗕俊鎭�">
- </el-page-header>
+ <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;" >
+ <el-page-header @back="goBack" content="涓汉璁颁簨鏈缁嗕俊鎭�">
+ </el-page-header>
+<!-- <span>涓汉璁颁簨鏈缁嗕俊鎭�</span>-->
+ <div style="display: flex; align-items: center;">
+ <el-button size="mini" type="text" v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
+ <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>
+ </el-button></div>
+ </h1>
<!-- <h4 class="dt h4"> </h4>-->
</div>
<div>
@@ -53,6 +62,8 @@
multiple
:http-request="requestUpload"
:file-list="fileList"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -104,6 +115,8 @@
:on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -189,6 +202,7 @@
remark:undefined,
url: undefined,
},
+ desurl:'',
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
@@ -241,6 +255,7 @@
document.title = "涓汉璁颁簨鏈缁嗕俊鎭�";
this.$route.meta.title = "涓汉璁颁簨鏈缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
this.isShow=false
+ this.btn = false;
}
let _this = this
@@ -431,4 +446,10 @@
display: block;
position: absolute;
}
+.hide .el-upload--picture-card {
+ display: none;
+}
+.form{
+ background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
</style>
--
Gitblit v1.9.1