From 76a3eb05129f0af9f9b5798b1c8abbf9afaf7f19 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 27 八月 2024 17:59:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/bignote/index.vue | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 926c621..6b06362 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container" style="opacity: 1;">
+ <div class="app-container" style="opacity: 1;" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<el-form-item label="澶т簨鏍囬" prop="title">
@@ -244,7 +244,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+ <el-dialog :title="title" @click.native="handleDialogClick" :visible.sync="open" width="800px" :append-to-body="true">
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
@@ -262,8 +262,12 @@
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
- <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
- :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ @click.native.stop
+ ref="datePicker"
+
+
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
@@ -529,6 +533,8 @@
dicts: ['sys_normal_disable'],
data() {
return {
+
+ total1: 0,
// 鍒嗕韩缁欒皝鐨刲ist
listRoot: [],
open1:false,
@@ -667,14 +673,22 @@
typeOptions: [],
};
},
+
created() {
this.getList();
// this.getCateInfor()
this.getInfo()
this.getList1();
+
+
},
methods: {
+ handleDialogClick()
+ {
+ // 鍏抽棴鏃ユ湡閫夋嫨鍣�
+ this.$refs.datePicker.handleClose();
+ },
// 鍒嗛〉
fenYe(){
// @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
@@ -860,8 +874,16 @@
isInFot(fileName) {
return this.fot.includes(fileName);
},
+
+ close(){
+ //alert(234)
+
+
+ this.open = false
+ },
// 鍙栨秷鎸夐挳
cancelData() {
+
this.open = false;
this.reset();
},
--
Gitblit v1.9.1