From 1a55d5008d2484e4730a5e8919cdb95e14da98d5 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期三, 09 八月 2023 23:51:37 +0800
Subject: [PATCH] 完善各模块的视频上传功能，显示正在上传和上传完成提示
---
ruoyi-ui/src/views/economy/index.vue | 149 ++++++++++++++++++++++++++-----------------------
1 files changed, 78 insertions(+), 71 deletions(-)
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 5c818e4..d9e3c65 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/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="createTime">
<el-date-picker
v-model="dateRange"
style="width: 240px;"
- value-format="yyyy-MM-dd HH-MM"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -22,15 +22,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="绫诲瀷" prop="type">
- <el-input
- v-model="queryParams.type"
- placeholder="璇疯緭鍏ョ被鍨�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
+
<el-form-item label="鐢ㄩ��" prop="useFor">
<el-input
@@ -109,47 +101,48 @@
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
<el-table v-loading="loading" :data="economyList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" 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="type" sortable width="120" >
- <template slot-scope="scope">
- {{ getSrc1(scope.row.type) }}
- </template>
- </el-table-column>
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+
<el-table-column label="鍙戠敓鏃堕棿" prop="createTime" sortable width="100" align="center">
<template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鍙拌处" prop="type" sortable width="100" />
- <el-table-column label="鏀跺叆/鏀嚭" prop="price" sortable width="100" />
+ <el-table-column label="鏀跺叆/鏀嚭" prop="price" sortable width="100" >
+
+ </el-table-column>
+ <el-table-column label="閲戦" prop="balance" sortable width="100" />
<el-table-column label="鐢ㄩ��" prop="useFor" sortable width="100" />
<el-table-column label="浣跨敤浜�" prop="usePeople" sortable width="100" />
<el-table-column label="鐜伴噾/鑷姩鎵ｅ垝" prop="kind" sortable width="130" >
- <template slot-scope="scope">
- {{ getSrc2(scope.row.kind) }}
- </template>
+ <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="浣欓" prop="balance" sortable width="100" />
+
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable width="110" >
<template slot-scope="scope" >
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceLis.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url !== ','"
- >
- <img
- 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 @click="handleCheck(scope.row)">
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ 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"
+
+ ></div>
</template>
</el-table-column>
- <el-table-column label="澶囨敞" prop="remark" sortable width="100" />
+ <el-table-column label="澶囨敞" prop="remark" sortable width="100" >
+ <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@@ -187,22 +180,26 @@
<!-- 璁惧鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佸娉ㄣ�佺數瀛愭枃浠� -->
<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="type">
- <el-select v-model="formDat.type" placeholder="璇烽�夋嫨鍩洪噾/鍙拌处" clearable :style="{width: '100%'}" >
+ <el-form-item label="鍙拌处" prop="type">
+ <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input>
+ </el-form-item>
+
+ <el-form-item label="鏃堕棿" prop="createTime">
+ <el-input
+ v-model='formDat.createTime'
+ type='date'
+ placeholder='閫夋嫨鏃ユ湡'
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="鏀跺叆/鏀嚭" prop="price">
+ <el-select v-model="formDat.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
</el-form-item>
-
- <el-form-item label="鏃堕棿" prop="happenTime">
- <el-date-picker
- v-model='formDat.happenTime'
- type='date'
- placeholder='閫夋嫨鏃ユ湡'
- ></el-date-picker>
- </el-form-item>
- <el-form-item label="鏀跺叆/鏀嚭" prop="price">
- <el-input v-model="formDat.price" placeholder="璇疯緭鍏ユ敹鍏�/鏀嚭" clearable :style="{width: '100%'}" ></el-input>
+ <el-form-item label="閲戦" prop="balance">
+ <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ラ噾棰�" clearable :style="{width: '100%'}" >
+ </el-input>
</el-form-item>
<el-form-item label="鐢ㄩ��" prop="useFor">
<el-input v-model="formDat.useFor" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" >
@@ -212,16 +209,12 @@
<el-input v-model="formDat.usePeople" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鐜伴噾/鑷姩鎵ｅ垝" prop="kind">
- <el-select v-model="formDat.kind" placeholder="璇烽�夋嫨鐜伴噾/鑷姩鎵ｅ垝" clearable :style="{width: '100%'}" >
- <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="浣欓" prop="balance">
- <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鏀粯鏂瑰紡" prop="kind">
+ <el-input v-model="formDat.kind" placeholder="璇疯緭鍏ユ敮浠樻柟寮�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
+
+
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
@@ -271,7 +264,7 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -370,7 +363,8 @@
type:undefined,
useFor:undefined,
usePeople:undefined,
- createTime:undefined,
+
+ createTime:undefined
},
// 琛ㄥ崟鍙傛暟
@@ -394,17 +388,17 @@
}],
type: [{
required: true,
- message: '璇烽�夋嫨鍩洪噾/鍙拌处',
- trigger: 'change'
+ message: '璇疯緭鍏ュ彴璐﹀唴瀹�',
+ trigger: 'blur'
}],
balance: [{
required: true,
- message: '璇疯緭鍏ヤ綑棰�',
+ message: '璇疯緭鍏ラ噾棰�',
trigger: 'blur'
}],
kind: [{
- required: true,
- message: '璇疯緭鍏ュ搴彿',
+ // required: true,
+ message: '璇疯緭鍏ユ敮浠樻柟寮�',
trigger: 'blur'
}],
createTime: [{
@@ -420,12 +414,12 @@
},
typeOptions: [
{
- value: '0',
- label: '鍩洪噾',
+ value: '鏀跺叆',
+ label: '鏀跺叆',
},
{
- value: '1',
- label: '鍙拌处',
+ value: '鏀嚭',
+ label: '鏀嚭',
}
],
typeOptions1: [
@@ -501,6 +495,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)
@@ -620,6 +621,12 @@
});
}
});
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ this.handleRemove(this.fileList[0]);
+ this.handleRemoveFile(this.fileListOther[0]);
},
requestUpload(params)
{
@@ -647,7 +654,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
return delEconomy(Ids);
}).then(() => {
this.getList();
--
Gitblit v1.9.1