From c4d4c5d25cd78fa302fe07a824c8d7b3412bd9f1 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 16:42:15 +0800
Subject: [PATCH] 修改内容
---
ruoyi-ui/src/views/travel/Info.vue | 181 ++++++++++++++++++++++++++-------------------
1 files changed, 105 insertions(+), 76 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/Info.vue b/ruoyi-ui/src/views/travel/Info.vue
index 4b856dc..8fcee82 100644
--- a/ruoyi-ui/src/views/travel/Info.vue
+++ b/ruoyi-ui/src/views/travel/Info.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container" style="opacity: 1;">
<h2>姣忔棩琛岀▼</h2>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="鏃堕棿" >
<el-date-picker
@@ -28,9 +28,9 @@
<el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;border-radius:6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
<el-button size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius:6px 6px 6px 6px;opacity: 1;">閲嶇疆</el-button>
</el-form-item>
- </el-form>
+ </el-form> -->
- <el-row :gutter="10" class="mb8">
+<!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
@@ -73,7 +73,7 @@
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.2">
+ <el-col :span="1.5">
<el-upload
action=""
class="upload-demo"
@@ -82,71 +82,77 @@
>
<el-button size="mini" type="primary"
plain
- icon="el-icon-plus" >瀵煎叆</el-button>
+ icon="el-icon-top">瀵煎叆</el-button>
</el-upload>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
+ </el-row> -->
- <el-table v-loading="loading" :data="travelBase" @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="happenTime" sortable width="100" align="center">
- <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
- </el-table-column>
-
- <el-table-column label="鍦扮偣" prop="address" sortable width="100" />
-
- <el-table-column label="鎸佽瘉鏃呮父" prop="certificate" sortable width="100" />
- <el-table-column label="璐圭敤" prop="totalPrice" sortable width="100" />
- <el-table-column label="鍏垂/鑷垂" prop="self" sortable width="100" >
- <template slot-scope="scope">{{scope.row.self==0?'鍏垂':'鑷垂'}}</template>
- </el-table-column>
- <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 !== ','"
- >
- <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 === ','"
- >
- </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">
- <template slot-scope="scope" v-if="scope.row.roleId !== 1">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['familymodel:economy:info']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
-
- </template>
- </el-table-column>
- </el-table>
+ <el-table v-loading="loading" :data="travelBase" 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>
<pagination
v-show="total>0"
@@ -353,8 +359,16 @@
deptNodeAll: false,
// 鏃ユ湡鑼冨洿
dateRange: [],
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+
+ },
// 鏁版嵁鑼冨洿閫夐」
- 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:[
@@ -510,7 +524,7 @@
const id = this.$route.params && this.$route.params.id;
- this.getList1();
+ // this.getList1();
this.getList(id);
},
@@ -555,18 +569,20 @@
getList(fid) {
this.loading = true;
this.queryParams.fid = fid
- this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
- this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+ // this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ // this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
- // console.log(this.queryParams)
+ let _this = this
+ // // console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- listTravelBase(this.queryParams).then(response => {
+ listTravelBase(fid).then(response => {
// alert(123)
- // console.log(response.data)
- this.travelBase = response.data.data;
+ console.log(response.data)
+ // console.log(response.data.data)
+ _this.travelBase = response.data;
// console.log(this.travelBase)
- this.total = response.data.total;
- this.loading = false;
+
+ _this.loading = false;
}
);
@@ -582,7 +598,7 @@
this.loading = false;
const detailList = filteredData.detailList;
// console.log(detailList);
- resolve(detailList);
+ // resolve(detailList);
}).catch(error => {
console.error("璇锋眰閿欒:", error);
reject(error);
@@ -632,7 +648,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -855,6 +871,19 @@
// this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// }).catch(() => {});
// },
+ //闅旇鍙樿壊
+ tableRowClassName1({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "statistics-warning-row1";
+ } else {
+ return "statistics-warning-row";
+ }
+ },
+ handleCheck1(row){
+ const id = row.id;
+ // alert(id)
+ this.$router.push("/self/travel/travelInfo/" + id);
+ },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const Ids = this.ids;
--
Gitblit v1.9.1