From 05d623d5b806f6650b9544dcbd4f322d677bf9a8 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 26 三月 2024 16:44:40 +0800
Subject: [PATCH] 完善直播模块2
---
ruoyi-ui/src/views/travel/index.vue | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index a76ac9d..52c771f 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -5,7 +5,7 @@
<el-form-item label="鏃堕棿" prop="startTime" >
<el-date-picker
v-model="dateRange"
- style="width: 200px;
+ style="width: 240px;
height: 35px;
border-radius: 16px 16px 16px 16px;
opacity: 0.5;"
@@ -108,7 +108,9 @@
<el-table-column label="浣忓璐�" prop="stay" sortable width="100px" />
<el-table-column label="浜ら��" prop="travel" sortable width="70px" />
<el-table-column label="闂ㄧエ" prop="entrance" sortable width="70px" />
-<!-- <el-table-column label="璐墿" prop="shopping" sortable width="70px" />-->
+ <el-table-column label="鍏跺畠璐圭敤" prop="otherCost" sortable width="120px" />
+ <el-table-column label="澶囨敞" prop="backInfo" sortable width="120px" />
+
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
<template slot-scope="scope" >
<img
@@ -117,7 +119,7 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="!scope.row.url "
+ v-if="scope.row.url"
>
<img
class="el-upload-list__item-thumbnail"
@@ -125,7 +127,7 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url "
+ v-if="!scope.row.url"
>
</template>
</el-table-column>
@@ -170,6 +172,7 @@
<el-table-column label="鏃呮父鍚嶇О" prop="name" sortable width="200px" />
<el-table-column label="鍘诲悜" prop="destination" sortable width="150px" />
<el-table-column label="鏃呮父鎬ц川" prop="property" sortable width="100" />
+ <el-table-column label="鎰熻█" prop="spee" sortable width="120px" />
<el-table-column label="鏃呮父鏂瑰紡" prop="manner" sortable width="100" />
<el-table-column label="鎬婚噾棰�" prop="totalPrice" sortable width="100" />
<el-table-column label="椁愯垂" prop="eatTotal" sortable width="70px" />
@@ -177,6 +180,7 @@
<el-table-column label="浜ら��" prop="travelTotal" sortable width="70px" />
<el-table-column label="闂ㄧエ" prop="entranceTotal" sortable width="70px" />
<el-table-column label="鍥㈣垂" prop="groupTotal" sortable width="70px" />
+
<el-table-column label="鎿嶄綔" align="center" sortable width="180" >
@@ -277,13 +281,13 @@
</el-input>
</el-form-item>
<el-form-item label="璧峰鏃堕棿" prop="startTime">
- <el-date-picker v-model="formDat.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
- :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ <el-date-picker v-model="formDat4.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd" :style="{width: '100%'}"
></el-date-picker>
</el-form-item>
- <el-form-item label="缁撴潫鏃堕棿" prop="endTime">
- <el-date-picker v-model="formDat.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
- :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ <el-form-item label="缁撴潫鏃堕棿1" prop="endTime">
+ <el-date-picker v-model="formDat4.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :style="{width: '100%'}" value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item label="鍘诲悜" prop="destination">
@@ -304,7 +308,10 @@
<el-input v-model="formDat4.manner" placeholder="璇疯緭鍏ユ梾娓告柟寮�" style="width: 80%;"></el-input>
</el-form-item>
+ <el-form-item label="鎰熻█" prop="spee">
+ <textarea type="textarea" v-model="formDat4.spee" placeholder="璇疯緭鍏ユ梾娓告劅瑷�" style="width: 80%;"></textarea>
+ </el-form-item>
</el-form>
<h4 class="form-header"> </h4>
@@ -335,8 +342,8 @@
<el-input v-model="formDat.travelMode" placeholder="璇疯緭鍏ュ嚭琛屾柟寮�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鎸佽瘉鏃呮父" prop="certificate">
- <el-select v-model="formDat.certificate" placeholder="璇烽�夋嫨璇佷欢" clearable :style="{width: '80%'}" >
+ <el-form-item label="鎸佽瘉鏃呮父" prop="document">
+ <el-select v-model="formDat.document" placeholder="璇烽�夋嫨璇佷欢" clearable :style="{width: '80%'}" >
<el-option label="灞呮皯韬唤璇�" value="灞呮皯韬唤璇�"></el-option>
<el-option label="涓存椂韬唤璇�" value="涓存椂韬唤璇�"></el-option>
<el-option label="鎴峰彛鏈�" value="鎴峰彛鏈�"></el-option>
@@ -348,6 +355,12 @@
<el-form-item label="杞︽/鑸彮" prop="flight">
<el-input v-model="formDat.flight" placeholder="璇疯緭鍏ヨ溅娆�/鑸彮" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
+ <el-form-item label="鍏跺畠璐圭敤" prop="otherCost">
+ <el-input v-model="formDat.otherCost" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="backInfo">
+ <el-input v-model="formDat.backInfo" 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>-->
@@ -508,7 +521,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -522,12 +538,14 @@
happenTime: undefined,
title: undefined,
travelPeriod:undefined,
- certificate: undefined,
+ document: undefined,
totalPrice: undefined,
self: undefined,
remark: undefined,
groupTotal:undefined,
url: undefined,
+ otherCost: undefined,
+ backInfo: undefined
},
formDat1: {
eat: undefined,
@@ -552,6 +570,7 @@
property:undefined,
name: undefined,
destination: undefined,
+ spee: undefined
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -658,7 +677,7 @@
destination: [{
required: true,
message: '璇烽�夋嫨鍘诲悜',
- trigger: 'change'
+ trigger: 'blur'
}],
property: [{
required: true,
@@ -667,13 +686,14 @@
}],
startTime: [{
required: true,
+ type: "string",
message: '璇烽�夋嫨鏃ユ湡',
- trigger: 'change'
+ trigger: 'blur'
}],
endTime: [{
required: true,
message: '璇烽�夋嫨鏃ユ湡',
- trigger: 'change'
+ trigger: 'blur'
}],
name: [{
required: true,
@@ -750,7 +770,9 @@
listTravelPrice(this.queryParams).then(response => {
this.travelpriceList = response.data.data;
-
+ //alert(this.travelpriceList.url)
+ console.log("0000")
+ console.log(this.travelpriceList)
this.total = response.data.total;
this.loading = false;
@@ -760,6 +782,7 @@
const promises = [];
for (const item of this.travelpriceList) {
const promise = listTravelBase({ cid: item.id }).then(result => {
+ console.log(result.data)
travelBaseMap[item.id] = result.data;
});
promises.push(promise);
@@ -1080,4 +1103,10 @@
background-color: #EBAFB4 /* 鏇存敼涓轰綘鎯宠鐨勮儗鏅鑹� */
/* color: #FFF; 鏇存敼涓轰綘鎯宠鐨勬枃瀛楅鑹� */
}
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
--
Gitblit v1.9.1