From 07613b212320d088235217f1c994c747295df315 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 01 八月 2023 21:04:08 +0800
Subject: [PATCH] 旅游修改
---
ruoyi-ui/src/views/travel/Info.vue | 177 +++++++++++++++++---------------------------
ruoyi-ui/src/views/travel/index.vue | 36 +++-----
2 files changed, 82 insertions(+), 131 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/Info.vue b/ruoyi-ui/src/views/travel/Info.vue
index 5c933ef..f3538b3 100644
--- a/ruoyi-ui/src/views/travel/Info.vue
+++ b/ruoyi-ui/src/views/travel/Info.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container" style="opacity: 1;">
- <h2>鏃呮父缁忓巻琛�</h2>
+ <h2>姣忔棩琛岀▼</h2>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="鏃堕棿" >
@@ -151,55 +151,6 @@
</el-table-column>
</el-table>
- <el-dialog :title="title" :visible.sync="openDataScope" width="1000px" append-to-body>
-
- <el-table v-loading="loading" :data="travelpriceList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" >
- <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="content" sortable :show-overflow-tooltip="true" width="150" />
- <el-table-column label="鎬婚噾棰�" prop="totalcost" sortable :show-overflow-tooltip="true" width="150" />
- <el-table-column label="椁愯垂" prop="eat" sortable :show-overflow-tooltip="true" width="150" />
- <el-table-column label="浣忓" prop="stay" sortable :show-overflow-tooltip="true" width="150" />
- <el-table-column label="浜ら��" prop="traffic" sortable :show-overflow-tooltip="true" width="150" />
- <el-table-column label="闂ㄧエ" prop="entrance" sortable :show-overflow-tooltip="true" width="150" />
- <el-table-column label="璐墿" prop="shopping" sortable :show-overflow-tooltip="true" width="150" />
- <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:property: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>
-
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
-
- />
-
-
- </el-dialog>
-
<pagination
v-show="total>0"
:total="total"
@@ -213,9 +164,6 @@
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
- <el-form-item label="鍙拌处" prop="type">
- <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input>
- </el-form-item>
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
@@ -224,27 +172,41 @@
placeholder='閫夋嫨鏃ユ湡'
></el-date-picker>
</el-form-item>
- <el-form-item label="鏀跺叆/鏀嚭" prop="price">
+ <el-form-item label="鍦扮偣" prop="address">
+ <el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <!-- <el-form-item label="鍦扮偣" prop="price">
<el-select v-model="formDat.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
- </el-form-item>
- <el-form-item label="閲戦" prop="balance">
- <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" >
+ </el-form-item> -->
+ <el-form-item label="浜虹墿" prop="people">
+ <el-input v-model="formDat.people" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鐢ㄩ��" prop="useFor">
- <el-input v-model="formDat.useFor" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鏍囬" prop="title">
+ <el-input v-model="formDat.title" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="浣跨敤浜�" prop="usePeople">
- <el-input v-model="formDat.usePeople" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" >
+ <el-form-item label="鏃呮湡" prop="travelPeriod">
+ <el-input v-model="formDat.travelPeriod" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鏀粯鏂瑰紡" prop="kind">
- <el-input v-model="formDat.kind" placeholder="璇疯緭鍏ユ敮浠樻柟寮�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鎸佽瘉鏃呮父" prop="certificate">
+ <el-input v-model="formDat.certificate" placeholder="璇疯緭鍏ヨ瘉浠�" clearable :style="{width: '100%'}" >
</el-input>
+ </el-form-item>
+ <el-form-item label="璐圭敤" prop="totalPrice">
+ <el-input v-model="formDat.totalPrice" placeholder="璇疯緭鍏ユ�诲叡璐圭敤" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鍏垂/鑷垂" prop="self">
+ <el-select v-model="formDat.self" placeholder="璇烽�夋嫨鑷垂/鍏垂" clearable :style="{width: '100%'}" >
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
@@ -295,7 +257,7 @@
class="upload-demo"
multiple
- :on-remove="handleRemoveFile"
+ :on-remove="handleRemove"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -330,7 +292,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
-import {listTravelPrice,listTravelBase,enload,getTravelPriceInfo,delTravelPrice, addTravelPrice, uploadPic} from "@/api/travel/index";
+import {addTravelBase,listTravelBase,enload,delTravelBase, uploadPic} from "@/api/travel/index";
export default {
name: "Role",
@@ -375,11 +337,14 @@
dsb:true,
btn:false,
formDat: {
- type: undefined,
- createTime: undefined,
- useFor: undefined,
- usePeople: undefined,
- kind:undefined,
+ people: undefined,
+ address: undefined,
+ happenTime: undefined,
+ title: undefined,
+ travelPeriod:undefined,
+ certificate: undefined,
+ totalPrice: undefined,
+ self: undefined,
remark: undefined,
url: undefined,
},
@@ -405,51 +370,57 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
- usePeople: [{
+ people: [{
required: true,
- message: '璇疯緭鍏ヤ娇鐢ㄤ汉',
+ message: '璇疯緭鍏ヤ汉鐗�',
trigger: 'blur'
}],
- useFor: [{
+ address: [{
required: true,
- message: '璇疯緭鍏ョ敤閫�',
+ message: '璇疯緭鍏ュ湴鐐�',
trigger: 'blur'
}],
- type: [{
+ title: [{
required: true,
- message: '璇疯緭鍏ュ彴璐﹀唴瀹�',
+ message: '璇疯緭鍏ユ爣棰�',
trigger: 'blur'
}],
- balance: [{
+ travelPeriod: [{
required: true,
- message: '璇疯緭鍏ラ噾棰�',
+ message: '璇疯緭鍏ユ梾鏈�',
trigger: 'blur'
}],
- kind: [{
- // required: true,
- message: '璇疯緭鍏ユ敮浠樻柟寮�',
+ certificate: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉浠�',
trigger: 'blur'
}],
- createTime: [{
+ happenTime: [{
required: true,
message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
trigger: 'change'
}],
- price: [{
+ totalPrice: [{
required: true,
- message: '璇烽�夋嫨浜嬮」鍐呭',
+ message: '璇烽�夋嫨璐圭敤',
trigger: 'blur'
}],
+ self: [{
+ required: true,
+ message: '璇烽�夋嫨鍏垂/鑷垂',
+ trigger: 'change'
+ }],
+
},
typeOptions: [
{
- value: '鏀跺叆',
- label: '鏀跺叆',
+ value: '0',
+ label: '鑷垂',
},
{
- value: '鏀嚭',
- label: '鏀嚭',
+ value: '1',
+ label: '鍏垂',
}],
typeOptions1: [
{
@@ -464,7 +435,9 @@
};
},
created() {
+
const id = this.$route.params && this.$route.params.id;
+
this.getList(id);
},
@@ -508,10 +481,11 @@
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.fid = fid
- console.log(this.queryParams)
+
+ // console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listTravelBase(this.queryParams).then(response => {
// alert(123)
@@ -524,13 +498,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)
@@ -598,7 +565,7 @@
handleAdd() {
this.reset();
this.open = true;
- this.title = "娣诲姞瀹跺涵鏀舵敮鍙拌处";
+ this.title = "娣诲姞姣忔棩琛岀▼鍐呭";
},
@@ -638,19 +605,13 @@
this.$refs["elForm"].validate(valid => {
if (valid) {
- addEconomy(this.formDat).then(response => {
+ addTravelBase(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
- this.getList();
+ this.getList(fid);
});
}
});
- // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
- Object.keys(this.formDat).forEach(key => {
- this.formDat[key] = '';
- });
- this.handleRemove(this.fileList[0]);
- this.handleRemoveFile(this.fileListOther[0]);
},
requestUpload(params)
{
@@ -678,8 +639,8 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
- return delEconomy(Ids);
+ this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
+ return delTravelBase(Ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 02a0f51..1575236 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>
@@ -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