From 1870c6d392aada4cd48fb148a12c5bd6e2838159 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期日, 22 十月 2023 23:31:48 +0800
Subject: [PATCH] 1022 修正保洁收纳导入
---
ruoyi-ui/src/views/secret/index.vue | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 49ba28a..b755735 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -1,11 +1,24 @@
<template>
<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="phone wx qq timeLimit type happenTime">
+ <el-input
+ v-model="queryParams.searchText"
+ placeholder="鍦ㄢ�滆储浜р�濅腑鎼滅储"
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuer1(queryParams)">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 240px;"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -13,12 +26,16 @@
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
+
<el-form-item label="绫诲埆" prop="type">
<el-input
v-model="queryParams.type"
placeholder="璇疯緭鍏ョ被鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -27,6 +44,18 @@
<el-input
v-model="queryParams.accNo"
placeholder="璇疯緭鍏ヨ处鍙�"
+ clearable
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鏈熼檺" prop="timeLimit">
+ <el-input
+ v-model="queryParams.timeLimit"
+ placeholder="璇疯緭鍏ユ湡闄�"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
@@ -100,13 +129,13 @@
<el-table v-loading="loading" :data="secretList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<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">
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
+ <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center">
<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="accNo" sortable width="100" />
- <el-table-column label="鏈夋晥鏈�" prop="validityDate" sortable width="100" align="center">
+ <el-table-column label="鏈夋晥鏈�" prop="validityDate" sortable width="150" align="center">
<template slot-scope="scope">{{scope.row.validityDate? scope.row.validityDate: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="瀵嗙爜" prop="password" sortable width="100" />
@@ -186,12 +215,10 @@
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
- <el-form-item label="鏃堕棿" prop="happenTime">
- <el-input
- v-model='formDat.happenTime'
- type='date'
- placeholder='閫夋嫨鏃ユ湡'
- ></el-input>
+ <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>
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
<el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" ></el-input>
@@ -247,7 +274,7 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -288,7 +315,8 @@
:http-request="requestUpload"
:show-file-list="true"
>
- <el-button type="primary">涓婁紶</el-button>
+ <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -363,6 +391,7 @@
],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
type: undefined,
happenTime: undefined,
@@ -387,7 +416,7 @@
type:undefined,
accNo:undefined,
happenTime:undefined,
- useFor:undefined,
+ timeLimit:undefined,
},
// 琛ㄥ崟鍙傛暟
@@ -582,6 +611,7 @@
this.queryParams.pageNum = 1;
this.getList();
},
+
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
@@ -665,10 +695,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})
--
Gitblit v1.9.1