From 5416279140524175b03a4d45c0ed85341e90d6eb Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 06 一月 2025 12:00:02 +0800
Subject: [PATCH] 修改旅游模块
---
ruoyi-ui/src/views/travel/index.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index c915e83..f03304f 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -121,12 +121,13 @@
<el-table-column label="鍦扮偣" prop="address" sortable width="200" />
- <el-table-column label="寤虹瓚" prop="scenic" sortable width="100" />
+ <el-table-column label="鏍囬" prop="scenic" sortable width="100" />
<!-- <el-table-column label="鏃呮湡" prop="travelPeriod" sortable width="100" /> -->
<el-table-column label="浣跨敤璇佷欢" prop="document" sortable width="100" />
<el-table-column label="杞︽/鑸彮" prop="flight" sortable width="120px" />
<el-table-column label="椁愯垂" prop="eat" sortable width="80px" />
<el-table-column label="浣忓璐�" prop="stay" sortable width="110px" />
+ <el-table-column label="璐墿" prop="shop" sortable width="110px" />
<el-table-column label="浜ら��" prop="travel" sortable width="80px" />
<el-table-column label="闂ㄧエ" prop="entrance" sortable width="80px" />
<el-table-column label="鍏跺畠璐圭敤" prop="otherCost" sortable width="130px" />
@@ -197,6 +198,8 @@
<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="80px" />
+ <el-table-column label="璐墿璐�" prop="shopTotal" sortable width="80px" />
+
<el-table-column label="浣忓" prop="stayTotal" sortable width="80px" />
<el-table-column label="浜ら��" prop="travelTotal" sortable width="80px" />
<el-table-column label="闂ㄧエ" prop="entranceTotal" sortable width="80px" />
@@ -363,8 +366,8 @@
<el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="寤虹瓚" prop="scenic">
- <el-input v-model="formDat.scenic" placeholder="璇疯緭鍏ュ缓绛�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鏍囬" prop="scenic">
+ <el-input v-model="formDat.scenic" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="鍑鸿鏂瑰紡" prop="travelMode">
@@ -526,6 +529,10 @@
<el-input v-model="formDat.eat" type="number" placeholder="璇疯緭鍏ラ璐圭敤" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
+ <el-form-item label="璐墿璐圭敤" prop="shop">
+ <el-input v-model="formDat.shop" type="number" placeholder="璇疯緭鍏ラ璐圭敤" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
<el-form-item label="闂ㄧエ璐圭敤" prop="entrance">
<el-input v-model="formDat.entrance" type="number" placeholder="璇疯緭鍏ラ棬绁ㄨ垂鐢�" clearable :style="{width: '100%'}" >
</el-input>
@@ -748,7 +755,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[
],
@@ -1102,7 +1109,7 @@
let clanId = this.$store.state.user.clanId
-
+ if(clanId!=null){
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -1120,6 +1127,7 @@
this.loading1 = false;
}
);
+ }
},
// 纭鍒嗕韩
subShare(row) {
--
Gitblit v1.9.1