From 5a643d05479504adca94d23abbbbbfccf2283f0c Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期日, 30 七月 2023 17:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/secret/index.vue | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 3d94ca3..66c906e 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -2,11 +2,11 @@
<div class="app-container" style="opacity: 1;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="鏃堕棿" >
+ <el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
- v-model="queryParams.happenTime"
+ v-model="dateRange"
style="width: 240px;"
- value-format="yyyy-MM-dd HH-MM"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -23,9 +23,9 @@
/>
</el-form-item>
- <el-form-item label="璐﹀彿" prop="useFor">
+ <el-form-item label="璐﹀彿" prop="accNo">
<el-input
- v-model="queryParams.useFor"
+ v-model="queryParams.accNo"
placeholder="璇疯緭鍏ヨ处鍙�"
clearable
style="width: 240px"
@@ -102,12 +102,12 @@
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
<el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="100" align="center">
- <template slot-scope="scope">{{scope.row.happenTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
+ <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="绫诲瀷" prop="type" sortable width="100" />
+ <el-table-column label="绫诲埆" prop="type" sortable width="100" />
<el-table-column label="璐﹀彿" prop="accNo" sortable width="100" />
<el-table-column label="鏈夋晥鏈�" prop="validityDate" sortable width="100" align="center">
- <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
+ <template slot-scope="scope">{{scope.row.validityDate? scope.row.validityDate: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="瀵嗙爜" prop="password" sortable width="100" />
<el-table-column label="鏄惁寮�鍚寚绾�" prop="isFinger" sortable width="120" >
@@ -283,7 +283,7 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -340,7 +340,7 @@
// 鎬绘潯鏁�
total: 0,
// 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
- economyList: [],
+ secretList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -366,10 +366,9 @@
type: undefined,
happenTime: undefined,
accNo:undefined,
- validityDate:undefined,
password:undefined,
- validityDate:undefined,
isFinger:undefined,
+ validityDate:undefined,
isFace:undefined,
isPrivate:undefined,
location:undefined,
@@ -386,7 +385,8 @@
pageSize: 10,
type:undefined,
accNo:undefined,
- createTime:undefined,
+ happenTime:undefined,
+ useFor:undefined,
},
// 琛ㄥ崟鍙傛暟
@@ -434,9 +434,10 @@
message: '璇烽�夋嫨鏈夋晥鏈�',
trigger: 'change'
}],
+
happenTime: [{
required: true,
- message: '璇烽�夋嫨鏈夋晥鏈�',
+ message: '璇烽�夋嫨鍙戠敓鏃堕棿',
trigger: 'change'
}],
@@ -524,6 +525,13 @@
);
},
handleRemove(file) {
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ this.$delete(this.fileList,i);
+ }
+ },
+ handleRemoveFile(file) {
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
@@ -638,6 +646,12 @@
});
}
});
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ this.handleRemove(this.fileList[0]);
+ this.handleRemoveFile(this.fileListOther[0]);
},
requestUpload(params)
{
--
Gitblit v1.9.1