From d7822563b65873c59ad2363db9852782b8d5e609 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期四, 31 八月 2023 16:35:02 +0800
Subject: [PATCH] 各模块时间已改为只可选择不可输入
---
ruoyi-ui/src/views/self/memo.vue | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index ac2c327..c9ca71b 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -1,23 +1,24 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
- <el-input
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- placeholder="鍦ㄢ�滀釜浜鸿浜嬫湰鈥濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+<!-- -->
+<!-- <el-input-->
+<!-- v-model:phone="queryParams.phone"-->
+<!-- placeholder=""-->
+<!-- clearable-->
+<!-- style="width: 240px"-->
+<!-- @keyup.enter.native="handleQuery">-->
+<!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
+<!-- </el-input>-->
+<!-- -->
+ <el-form-item label="" prop="address title remark people happenTime" >
+ <el-input v-model="keyword" placeholder="鍦ㄢ�滀釜浜鸿浜嬫湰鈥濅腑鎼滅储" clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
</el-form-item>
- <el-form-item label="鏃堕棿">
+ <el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
style="width: 197px;
@@ -138,7 +139,7 @@
</div>
<el-table v-loading="loading" :data="noteList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
- <el-table-column type="selection" :reserve-selection="true" width="25" align="center" />
+ <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
<el-table-column label="鏃堕棿" prop="happenTime" sortable :show-overflow-tooltip="true" width="150" align="center" >
@@ -165,15 +166,16 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url !== ','"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
>
<img
+ v-else
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceA.png"
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url ===',' "
+
></div>
</template>
</el-table-column>
@@ -220,8 +222,9 @@
<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='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
- </el-form-item>
+ <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker></el-form-item>
<el-form-item label="浜虹墿" prop="people">
<el-input v-model="formDat.people" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" >
</el-input>
@@ -239,7 +242,7 @@
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
- <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
list-type="picture-card"
@@ -289,6 +292,7 @@
:show-file-list="true"
>
<el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -363,8 +367,9 @@
],
dsb:true,
btn:false,
+ uploading: false,
fit:['fill'],
-
+ keyword:'',
formDat: {
//涓汉璁颁簨鏈鎯�
id:undefined,
@@ -387,7 +392,7 @@
people:undefined,
address:undefined,
title:undefined,
-
+ remark:undefined
},
// searchVal:"",
@@ -436,6 +441,7 @@
// this.formDat[i] = this.contactList[i];
// }
},
+
methods: {
// 鍙栨秷鎸夐挳
cancelData() {
@@ -454,6 +460,8 @@
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listNote(this.queryParams).then(response => {
@@ -478,7 +486,11 @@
})
},
handleRemove(file) {
- alert(323)
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ this.$delete(this.fileList,i);
+ }
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -597,6 +609,7 @@
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
+ this.handleRemove(this.fileList[0]);
},
requestUpload(params)
{
@@ -604,10 +617,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