From ef05f1416c204098f003c3f4c3861354d18cd503 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期六, 24 八月 2024 13:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/note/memo.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/note/memo.vue b/ruoyi-ui/src/views/note/memo.vue
index ca6cc0d..65612a3 100644
--- a/ruoyi-ui/src/views/note/memo.vue
+++ b/ruoyi-ui/src/views/note/memo.vue
@@ -4,7 +4,7 @@
<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">
@@ -45,7 +45,7 @@
style="background: #FEF7FC;"
/>
- <el-dialog :title="isEdit1 ? '缂栬緫' : '鏂板'" :visible.sync="open" width="900px" append-to-body>
+ <el-dialog :title="isEdit1 ? '缂栬緫' : '鏂板'" :visible.sync="open" width="900px" append-to-body @close='closeFn'>
<el-col >
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
@@ -199,7 +199,7 @@
<!-- 鏌ョ湅璇︽儏寮圭獥 -->
- <el-dialog title="璇︽儏" :visible.sync="open2" width="900px" append-to-body>
+ <el-dialog title="璇︽儏" :visible.sync="open2" width="900px" append-to-body @close='closeFn'>
<el-col >
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
@@ -478,6 +478,10 @@
},
methods: {
+ closeFn(){
+ this.fileList = []
+ this.fileListOther = []
+ },
// 寮圭獥
handleShow(scope){
@@ -1091,7 +1095,7 @@
.button1 {
background:center no-repeat url('../../assets/icons/add1.png') ;
/* margin-left: 69.5vw; */
- margin-left: 780px;
+ margin-left: 650px;
}
.button_delete {
--
Gitblit v1.9.1