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/travel/index.vue | 40 +++++++++++++++-------------------------
1 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 02a0f51..8dd1d80 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container" style="opacity: 1;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-
+ <h1 style="font-size:21px">瀹岀編鏃呴��</h1>
<el-form-item label="鏃堕棿" prop="startTime">
<el-date-picker
v-model="dateRange"
@@ -91,8 +91,10 @@
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
<el-table v-loading="loading" :data="travelpriceList" @selection-change="handleSelectionChange" @row-click="handleShow" :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 fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="40"/>
+ <el-table-column label="鏃呮父鍚嶇О" prop="tableName" sortable width="100" />
+ <el-table-column label="鏍囬" prop="title" sortable width="100" />
+ <el-table-column label="鍘诲悜" prop="destination" sortable width="50" />
<el-table-column label="璧�" prop="startTime" sortable width="100" align="center">
<template slot-scope="scope">{{scope.row.startTime? scope.row.startTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -100,8 +102,9 @@
<template slot-scope="scope">{{scope.row.endTime? scope.row.endTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鎬诲ぉ鏁�" prop="totalDay" sortable width="100" />
- <el-table-column label="鏍囬" prop="title" sortable width="100" />
+ <el-table-column label="鏃呮父鎬ц川" prop="property" sortable width="100" />
+ <el-table-column label="鏃呮父鏂瑰紡" prop="type" sortable width="100" />
<el-table-column label="鎬婚噾棰�" prop="totalCost" sortable width="100" />
<el-table-column label="椁愯垂" prop="eat" sortable width="100" />
<el-table-column label="浣忓" prop="stay" sortable width="100" />
@@ -110,7 +113,7 @@
<el-table-column label="璐墿" prop="shopping" sortable width="80" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" sortable width="200" >
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@@ -130,7 +133,7 @@
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</el-dropdown>
- <el-button class="button" size="mini" type="text" @click="handleShow">
+ <el-button class="button" size="mini" type="text" @click="handleShow" v-hasPermi="['system:role:add']">
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
</template>
</el-table-column>
@@ -183,11 +186,11 @@
</el-form-item>
<el-form-item label="鏃堕棿" prop="happenTime">
- <el-date-picker
+ <el-input
v-model='formDat.happenTime'
type='date'
placeholder='閫夋嫨鏃ユ湡'
- ></el-date-picker>
+ ></el-input>
</el-form-item>
<el-form-item label="鏀跺叆/鏀嚭" prop="price">
<el-select v-model="formDat.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" >
@@ -260,11 +263,11 @@
class="upload-demo"
multiple
- :on-remove="handleRemoveFile"
+ :on-remove="handleRemove"
:http-request="requestUpload"
:show-file-list="true"
>
- <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <el-button type="primary">涓婁紶</el-button>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -486,13 +489,6 @@
);
},
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)
@@ -621,12 +617,6 @@
});
}
});
- // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
- Object.keys(this.formDat).forEach(key => {
- this.formDat[key] = '';
- });
- this.handleRemove(this.fileList[0]);
- this.handleRemoveFile(this.fileListOther[0]);
},
requestUpload(params)
{
@@ -654,8 +644,8 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
- return delEconomy(Ids);
+ this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
+ return delTravelPrice(Ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
--
Gitblit v1.9.1