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/self/memo.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index ac2c327..f834056 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -4,11 +4,6 @@
<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"
@@ -17,7 +12,7 @@
</el-input>
</el-form-item>
- <el-form-item label="鏃堕棿">
+ <el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
style="width: 197px;
@@ -165,15 +160,16 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url !== ','"
+ v-if="!(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>
@@ -454,6 +450,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 +476,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 +599,7 @@
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
+ this.handleRemove(this.fileList[0]);
},
requestUpload(params)
{
--
Gitblit v1.9.1