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 | 195 +++++++++++++++++++-----------------------------
1 files changed, 76 insertions(+), 119 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index c8d917f..f03304f 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -113,26 +113,27 @@
<template slot-scope="props">
<div >
<el-table :header-row-class-name="tableHeaderRowClassName" v-loading="loading" :data="travelBase[props.row.id]" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;" :row-class-name="tableRowClassName1" >
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="50px"/>
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="114px"/>
<el-table-column label="鏃堕棿" prop="happenDate" sortable width="100" align="center" >
<template slot-scope="scope">{{scope.row.happenDate? scope.row.happenDate: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍦扮偣" prop="address" sortable width="100" />
+ <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="70px" />
- <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="otherCost" sortable width="120px" />
- <el-table-column label="澶囨敞" prop="backInfo" 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" />
+ <el-table-column label="澶囨敞" prop="backInfo" sortable width="130px" />
- <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="201px" >
<template slot-scope="scope" >
<img
class="el-upload-list__item-thumbnail"
@@ -155,7 +156,7 @@
<!-- <el-table-column label="澶囨敞" prop="remark" sortable width="100" />-->
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding " v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"
@@ -190,21 +191,23 @@
<template slot-scope="scope">{{scope.row.endTime? scope.row.endTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<!-- <el-table-column label="鎬诲ぉ鏁�" prop="totalDay" sortable width="85px" />-->
- <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="name" sortable width="160px" />
+ <el-table-column label="鍘诲悜" prop="destination" sortable width="120px" />
+ <el-table-column label="鏃呮父鎬ц川" prop="property" sortable width="100px" />
<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" />
- <el-table-column label="浣忓" prop="stayTotal" sortable width="70px" />
- <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="椁愯垂" 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" />
+ <el-table-column label="鍥㈣垂" prop="groupTotal" sortable width="80px" />
- <el-table-column label="鎿嶄綔" align="center" sortable width="250" v-if="userId != 2">
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" sortable width="250px" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"
@@ -264,7 +267,7 @@
<el-table-column label="闂ㄧエ" prop="entrance" sortable :show-overflow-tooltip="true" width="100px" />
<el-table-column label="璐墿" prop="shopping" sortable :show-overflow-tooltip="true" width="100px" />
- <el-table-column label="鎿嶄綔" align="center" sortable class-name="small-padding fixed-width" v-if="userId != 2">
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" sortable class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@@ -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>
@@ -546,12 +553,12 @@
<el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1" @selection-change="handleSelectionChange1" :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 fixed label="搴忓彿" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
- <el-table-column label="韬唤" prop="identity" sortable width="130" >
+ <!-- <el-table-column label="韬唤" prop="identity" sortable width="130" >
<template slot-scope="scope" >
<span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
<span v-else>鈥斺��</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
</el-table>
@@ -580,78 +587,7 @@
<el-table v-loading="loading2" border :data="shareList1" :row-key="getRowId2" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
- <el-table-column type="expand" :cell-class-name="expandRowClassName">
- <template slot-scope="props">
- <div >
- <el-table :header-row-class-name="tableHeaderRowClassName" v-loading="loading" :data="travelBase[props.row.id]" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;" :row-class-name="tableRowClassName1" >
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="50px"/>
-
- <el-table-column label="鏃堕棿" prop="happenDate" sortable width="100" align="center" >
- <template slot-scope="scope">{{scope.row.happenDate? scope.row.happenDate: '鈥斺�斺�斺��'}}</template>
- </el-table-column>
-
- <el-table-column label="鍦扮偣" prop="address" 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="70px" />
- <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="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
- 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"
- >
- </template>
- </el-table-column>
- <!-- <el-table-column label="澶囨敞" prop="remark" sortable width="100" />-->
-
-
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
- <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-<!-- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate1(scope.row)"
- v-hasPermi="['familymodel:economy:info']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete1(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button> -->
- <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck1(scope.row)">鏌ョ湅璇︽儏</el-button>
-
- </template>
- </el-table-column>
- </el-table>
- </div>
-
-
- </template>
- </el-table-column>
+
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60px"/>
<el-table-column label="璧�" prop="startTime" sortable width="100" align="center">
@@ -735,13 +671,15 @@
shareToWho2,getWhoShare2,showShareData2
} from "@/api/travel/index";
+import {showShareUser} from "@/api/bignote/index";
+import {getAllInfo} from "@/api/system/user"
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
import {getSelfEconomyInfo} from "@/api/selfeconomy";
import {delFamilyevent, listFamilyevent} from "@/api/bignote";
export default {
- name: "Role",
+ name: "Ztravel",
dicts: ['sys_normal_disable'],
data() {
return {
@@ -817,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:[
],
@@ -1155,25 +1093,41 @@
return row.id
},
getList1() {
- this.loading1 = true;
- this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
- this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
- listUserAll(this.queryParams1).then(response => {
- this.listRoot = response.data.data;
- const kon = {}
- this.listRoot.forEach(element => {
- kon[element['nickName']] = element['userId']
- })
- for(let i in kon){
- this.userOptions.push({label: i,value: kon[i]})
- }
- for(let i in this.userOptions){
- this.userList.push(this.userOptions[i].value)
- }
- console.log(this.userList,'userListuserListuserList')
- this.loading1 = false;
- }
- );
+ this.loading1 = true;
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+
+ showShareUser(userId, 2055).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+
+
+
+ let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
+ getAllInfo(clanId).then(response => {
+ this.listRoot = response.data;
+ const kon = {}
+ console.log(response.data,'userListuserListuserList99999999999999')
+ this.listRoot.forEach(element => {
+ kon[element['nickName']] = element['userId']
+ })
+ // for(let i in kon){
+ // this.userOptions.push({label: i,value: kon[i]})
+ // }
+ // for(let i in this.userOptions){
+ // this.userList.push(this.userOptions[i].value)
+ // }
+ // console.log(this.userList,'userListuserListuserList99999999999999')
+ this.loading1 = false;
+ }
+ );
+ }
},
// 纭鍒嗕韩
subShare(row) {
@@ -1186,6 +1140,7 @@
}).then(() => {
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
@@ -1255,7 +1210,7 @@
// 灏嗘墍鏈夎姹傚瓨鍌ㄨ捣鏉�
const promises = [];
for (const item of this.travelpriceList) {
- const promise = listTravelBase({ cid: item.id }).then(result => {
+ const promise = listTravelBase(item.id).then(result => {
console.log(result.data)
travelBaseMap[item.id] = result.data;
});
@@ -1423,12 +1378,14 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+ this.open2 = false;
// alert(id)
// alert(row.fee_id)
this.$router.push("/self/travel/Info/" + id);
},
handleCheck1(row){
const id = row.id;
+ // alert(id)
this.$router.push("/self/travel/travelInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.1