From 5703e99b943f17aa13f55a2f90308f66c1c2fe4f Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 06 十二月 2023 21:04:30 +0800
Subject: [PATCH] 修改标题
---
ruoyi-ui/src/views/travel/index.vue | 784 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 580 insertions(+), 204 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 1575236..15fe14c 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -2,10 +2,13 @@
<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-form-item label="鏃堕棿" prop="startTime" >
<el-date-picker
v-model="dateRange"
- style="width: 240px;"
+ style="width: 240px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd HH-MM"
type="daterange"
range-separator="-"
@@ -13,12 +16,39 @@
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
- <el-form-item label="鎬诲ぉ鏁�" prop="usePeople" >
+ <el-form-item label="鍘诲悜" prop="destination" >
<el-input
- v-model="queryParams.usePeople"
- placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉"
+ v-model="queryParams.destination"
+ placeholder="璇疯緭鍏ュ幓鍚�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鏃呮父鍚嶇О" prop="name" >
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ユ梾娓稿悕绉�"
+ clearable
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鏃呮父鏂瑰紡" prop="manner" >
+ <el-input
+ v-model="queryParams.manner"
+ placeholder="璇疯緭鍏ユ梾娓告柟寮�"
+ clearable
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -48,126 +78,186 @@
icon="el-icon-delete"
size="mini"
:disabled="multiple"
- @click="handleDelete"
+ @click="handleDelete1"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['family:note:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExportTemplate"
- v-hasPermi="['family:note:export']"
- >瀵煎叆妯℃澘涓嬭浇</el-button>
- </el-col>
- <el-col :span="1.2">
- <el-upload
- action=""
- class="upload-demo"
- :show-file-list="false"
- :http-request="handleEnport"
- >
- <el-button size="mini" type="primary"
- plain
- icon="el-icon-plus" >瀵煎叆</el-button>
- </el-upload>
- </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵ｅ垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
<!-- 杩欓噷鏈変釜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 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 v-loading="loading" :data="travelpriceList" @row-click="getRowId" @selection-change="handleSelectionChange" :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="shopping" sortable width="70px" />-->
+ <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="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">
<template slot-scope="scope">{{scope.row.startTime? scope.row.startTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="姝�" prop="endTime" sortable width="100" align="center">
<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="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="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" />
- <el-table-column label="浜ら��" prop="traffic" sortable width="100" />
- <el-table-column label="闂ㄧエ" prop="entrance" sortable width="100" />
- <el-table-column label="璐墿" prop="shopping" sortable width="80" />
+ <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="鎿嶄綔" align="center" sortable width="200" >
+ <el-table-column label="鎿嶄綔" align="center" sortable width="180" >
<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']"
+ v-hasPermi="['person:travel:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
- class="button_delete"
+ icon="el-icon-circle-plus"
+ @click="handleAdd1(scope.row)"
+
+ v-hasPermi="['person:travel:edit']"
+ >鏂板</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
- > <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
+ > 鍒犻櫎</el-button>
+ <!-- <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" v-hasPermi="['system:role:add']">
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
+ </el-dropdown> -->
+ <!-- <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>
</el-table>
+ <div style="background-color: #FEF7FC;">
+ <el-dialog :title="title" :visible.sync="openDataScope" width="1300px" append-to-body >
+ <div style="background-color: #FEF7FC;">
+ <el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
+ <el-table-column type="selection" width="50" align="center" />
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
+ <el-table-column label="鏃堕棿" prop="happenTime" sortable width="150" 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="100px" />
+ <el-table-column label="鎬婚噾棰�" prop="totalCost" sortable :show-overflow-tooltip="true" width="100px" />
+ <el-table-column label="椁愯垂" prop="eat" sortable :show-overflow-tooltip="true" width="100px" />
+ <el-table-column label="浣忓" prop="stay" sortable :show-overflow-tooltip="true" width="100px" />
+ <el-table-column label="浜ら��" prop="traffic" sortable :show-overflow-tooltip="true" width="100px" />
+ <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-dialog :title="title" :visible.sync="openDataScope" width="1500px" append-to-body >
- <div style="background-color: #FEF7FC;">
- <el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
- <el-table-column type="selection" width="50" align="center" />
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
- <el-table-column label="鏃堕棿" prop="happenTime" sortable width="150" 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="160" />
- <el-table-column label="鎬婚噾棰�" prop="totalCost" sortable :show-overflow-tooltip="true" width="160" />
- <el-table-column label="椁愯垂" prop="eat" sortable :show-overflow-tooltip="true" width="160" />
- <el-table-column label="浣忓" prop="stay" sortable :show-overflow-tooltip="true" width="160" />
- <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" sortable class-name="small-padding fixed-width">
+ <template slot-scope="scope" v-if="scope.row.roleId !== 1">
- </el-table>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- style="background: #FEF7FC;"
- />
- </div>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate1(scope.row)"
+ v-hasPermi="['familymodel:economy:info']"
+ >淇敼</el-button>
- </el-dialog>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ style="background: #FEF7FC;"
+ />
+ </div>
+
+ </el-dialog>
+ </div>
<pagination
v-show="total>0"
:total="total"
@@ -177,46 +267,91 @@
style="background: #FEF7FC;"
/>
- <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
- <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-dialog :title="title" :visible.sync="dialog1Visible" width="800px" append-to-body>
+ <el-form ref="elForm2" :model="formDat4" :rules="rules2" size="medium" label-width="100px">
+
+ <el-form-item label="鏍囬" prop="name">
+ <el-input v-model="formDat4.name" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '80%'}" >
+ </el-input>
</el-form-item>
-
- <el-form-item label="鏃堕棿" prop="happenTime">
- <el-date-picker
- v-model='formDat.happenTime'
- type='date'
- placeholder='閫夋嫨鏃ユ湡'
+ <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>
</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-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-date-picker>
+ </el-form-item>
+ <el-form-item label="鍘诲悜" prop="destination">
+ <el-input v-model="formDat4.destination" placeholder="璇疯緭鍏ュ幓鍚�" style="width: 80%;"></el-input>
+
+ </el-form-item>
+ <el-form-item label="鍥㈣垂" prop="groupTotal">
+ <el-input v-model="formDat4.groupTotal" type="number" placeholder="璇疯緭鍏ュ洟璐�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鏃呮父鎬ц川" prop="property">
+ <el-select v-model="formDat4.property" placeholder="璇烽�夋嫨鎬ц川" clearable :style="{width: '80%'}" >
+ <el-option label="鑷垂" value="鑷垂"></el-option>
+ <el-option label="鍏垂" 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 label="鏃呮父鏂瑰紡" prop="manner">
+ <el-input v-model="formDat4.manner" placeholder="璇疯緭鍏ユ梾娓告柟寮�" style="width: 80%;"></el-input>
+
+ </el-form-item>
+
+ </el-form>
+ <h4 class="form-header"> </h4>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
+ <el-button @click="dialog1Visible = false ">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+<!-- 鏂板姣忔棩琛岀▼鍐呭-->
+ <el-dialog title="娣诲姞姣忔棩琛岀▼鍐呭" :visible.sync="centerDialogVisible" width="60%" center append-to-body>
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+ <h4 class="form-header">琛岀▼鍐呭 </h4>
+
+ <el-form-item label="鏃堕棿" prop="happenDate">
+ <el-date-picker v-model="formDat.happenDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
+ </el-form-item>
+ <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="useFor">
- <el-input v-model="formDat.useFor" 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="usePeople">
- <el-input v-model="formDat.usePeople" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" >
+ <el-form-item label="鍑鸿鏂瑰紡" prop="travelMode">
+ <el-input v-model="formDat.travelMode" 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-input>
+ <el-form-item label="鎸佽瘉鏃呮父" prop="certificate">
+ <el-select v-model="formDat.certificate" placeholder="璇烽�夋嫨璇佷欢" clearable :style="{width: '80%'}" >
+ <el-option label="灞呮皯韬唤璇�" value="灞呮皯韬唤璇�"></el-option>
+ <el-option label="涓存椂韬唤璇�" value="涓存椂韬唤璇�"></el-option>
+ <el-option label="鎴峰彛鏈�" value="鎴峰彛鏈�"></el-option>
+ <el-option label="鎶ょ収" value="鎶ょ収"></el-option>
+ <el-option label="瀛︾敓璇�" 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>
+
+ <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="remark">-->
+<!-- <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>-->
+<!-- </el-form-item>-->
+
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
@@ -275,14 +410,37 @@
</el-upload>
</el-form>
+ <el-form ref="elForm" :model="formDat" :rules="rules1" size="medium" label-width="100px">
+ <h4 class="form-header">璐圭敤鏄庣粏 </h4>
+ <el-form-item label="浣忓閰掑簵" prop="hotel">
+ <el-input v-model="formDat.hotel" placeholder="璇疯緭鍏ヤ綇瀹块厭搴�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="浣忓璐圭敤" prop="stay">
+ <el-input v-model="formDat.stay" type="number" placeholder="璇疯緭鍏ヤ綇瀹胯垂鐢�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="浜ら�氳垂鐢�" prop="travel">
+ <el-input v-model="formDat.travel" type="number" placeholder="璇疯緭鍏ヤ氦閫氳垂鐢�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="椁愯垂" prop="eat">
+ <el-input v-model="formDat.eat" 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>
+ </el-form-item>
+
+ </el-form>
<h4 class="form-header"> </h4>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
- <el-button @click="cancelData">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitDataScope1">纭� 瀹�</el-button>
+ <el-button @click="centerDialogVisible = false">鍙� 娑�</el-button>
</div>
</el-dialog>
-
</div>
</template>
@@ -294,7 +452,19 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
-import {listTravelPrice,enload,getTravelPriceInfo,delTravelPrice, addTravelPrice, uploadPic} from "@/api/travel/index";
+import {
+ listTravelPrice,
+ listTravelBase,
+ delTravelBase,
+ delTravelPrice,
+ addTravelPrice,
+ uploadPic,
+ // updateTravelPrice,
+ addTravelBase,
+
+} from "@/api/travel/index";
+import {getSelfEconomyInfo} from "@/api/selfeconomy";
+import {delFamilyevent, listFamilyevent} from "@/api/bignote";
export default {
name: "Role",
@@ -305,7 +475,6 @@
disabled: false,
loading: true,
formData:[],
- detailList:[],
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -316,12 +485,20 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
- // 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
+ //
travelpriceList: [],
+ target:[],
+ travelBase:[],
+ baseData:[],
+ detailList:[],
// 寮瑰嚭灞傛爣棰�
title: "",
+ title1:"",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ centerDialogVisible: false,
+ dialog1Visible: false,
+ dialog2Visible: false,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
openDataScope: false,
menuExpand: false,
@@ -331,7 +508,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:[
@@ -340,14 +520,41 @@
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,
+ groupTotal:undefined,
url: undefined,
- detailList:undefined,
+ },
+ formDat1: {
+ eat: undefined,
+ stay: undefined,
+ traffic: undefined,
+ entrance: undefined,
+ shopping:undefined,
+ content: undefined,
+ },
+ formDat2: {
+ id: undefined,
+ detailList: undefined,
+ },
+ formDat7: {
+ id: undefined,
+ detailList: undefined,
+ },
+ formDat4: {
+ manner: undefined,
+ startTime: undefined,
+ endTime: undefined,
+ property:undefined,
+ name: undefined,
+ destination: undefined,
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -357,10 +564,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- type:undefined,
- useFor:undefined,
- usePeople:undefined,
- createTime:undefined,
},
// 琛ㄥ崟鍙傛暟
@@ -369,53 +572,127 @@
children: "children",
label: "label"
},
- // 琛ㄥ崟鏍￠獙
+ //琛ㄥ崟鏍￠獙
rules: {
- usePeople: [{
+ name: [{
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: '璇疯緭鍏ユ敮浠樻柟寮�',
+ document: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉浠�',
trigger: 'blur'
}],
- createTime: [{
+ happenDate: [{
required: true,
message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
trigger: 'change'
}],
- price: [{
+ manner: [{
required: true,
- message: '璇烽�夋嫨浜嬮」鍐呭',
+ message: '璇疯緭鍏ュ嚭琛屾柟寮�',
+ trigger: 'blur'
+ }],
+ property: [{
+ required: true,
+ message: '璇烽�夋嫨鏃呮父鎬ц川',
+ trigger: 'change'
+ }],
+
+ },
+ rules1: {
+ stay: [{
+ required: true,
+ message: '璇疯緭鍏ヤ綇瀹胯垂',
+ trigger: 'blur'
+ }],
+
+ hotel: [{
+ required: true,
+ message: '璇疯緭鍏ヤ綇瀹块厭搴�',
+ trigger: 'blur'
+ }],
+ travel: [{
+ required: true,
+ message: '璇疯緭鍏ヤ氦閫氳垂',
+ trigger: 'blur'
+ }],
+ entrance: [{
+ required: true,
+ message: '璇疯緭鍏ラ棬绁�',
+ trigger: 'blur'
+ }],
+ eat: [{
+ required: true,
+ message: '璇疯緭鍏ラ璐�',
+ trigger: 'blur'
+ }],
+
+
+ },
+ rules2: {
+ manner: [{
+ required: true,
+ message: '璇疯緭鍏ユ梾娓告柟寮�',
+ trigger: 'blur'
+ }],
+ groupTotal: [{
+ required: true,
+ message: '璇疯緭鍏ュ洟璐�',
+ trigger: 'blur'
+ }],
+ destination: [{
+ required: true,
+ message: '璇烽�夋嫨鍘诲悜',
+ trigger: 'change'
+ }],
+ property: [{
+ required: true,
+ message: '璇疯緭鍏ユ梾娓稿悕绉�',
+ trigger: 'blur'
+ }],
+ startTime: [{
+ required: true,
+ message: '璇烽�夋嫨鏃ユ湡',
+ trigger: 'change'
+ }],
+ endTime: [{
+ required: true,
+ message: '璇烽�夋嫨鏃ユ湡',
+ trigger: 'change'
+ }],
+ name: [{
+ required: true,
+ message: '璇烽�夋嫨鏍囬',
trigger: 'blur'
}],
},
+
typeOptions: [
{
- value: '鏀跺叆',
- label: '鏀跺叆',
+ value: '0',
+ label: '鑷垂',
},
{
- value: '鏀嚭',
- label: '鏀嚭',
+ value: '1',
+ label: '鍏垂',
}],
typeOptions1: [
{
@@ -431,27 +708,20 @@
},
created() {
this.getList();
-
},
methods: {
-
- //鍩洪噾/鍙拌处鐨勯�夋嫨
- getSrc1(type) {
- if (type === 0) {
- return '鍩洪噾'
- }else {
- return '鍙拌处'
- }
+ //灞曞紑琛�
+ expandRowClassName({ row, rowIndex }) {
+ // 杩斿洖瀵瑰簲琛岀殑鏍峰紡閰嶇疆瀵硅薄
+ return {
+ 'expand-row': true, // 娣诲姞鑷畾涔夋牱寮忕被鍚�
+ 'expand-row-height': '40px' // 璁剧疆灞曞紑琛岀殑楂樺害
+ };
},
-
- getSrc2(kind) {
- if (kind == 0) {
- return '鐜伴噾'
- }else {
- return '鑷姩鎵ｅ垝'
- }
+ //棣栬鏍峰紡
+ tableHeaderRowClassName() {
+ return 'custom-header-row';
},
-
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
@@ -466,28 +736,47 @@
return "statistics-warning-row";
}
},
-
+ //闅旇鍙樿壊
+ tableRowClassName1({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "statistics-warning-row3";
+ } else {
+ return "statistics-warning-row2";
+ }
+ },
/** 鏌ヨ瑙掕壊鍒楄〃 */
//鍒楄〃鏄剧ず瀹跺ぇ浜嬭
getList() {
this.loading = true;
- this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
- this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
- // console.log(this.queryParams)
- // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listTravelPrice(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
- this.travelpriceList = response.data.data;
- console.log(this.travelpriceList[0])
- this.total = response.data.total;
- this.loading = false;
+ this.travelpriceList = response.data.data;
+
+ this.total = response.data.total;
+ this.loading = false;
+
+ const travelBaseMap = {};
+
+ // 灏嗘墍鏈夎姹傚瓨鍌ㄨ捣鏉�
+ const promises = [];
+ for (const item of this.travelpriceList) {
+ const promise = listTravelBase({ cid: item.id }).then(result => {
+ travelBaseMap[item.id] = result.data;
+ });
+ promises.push(promise);
}
- );
+
+ // 绛夊緟鎵�鏈夋暟鎹兘璇锋眰瀹屾瘯鍚庡啀璁剧疆travelBase
+ Promise.all(promises).then(() => {
+ this.travelBase = travelBaseMap;
+ });
+ });
+
+
},
+
handleRemove(file) {
for(let i = 0; i < this.fileListOther.length; i++)
{
@@ -504,6 +793,7 @@
getRowId(row)
{
return row.id
+
},
// 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
cancelDataScope() {
@@ -555,20 +845,60 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
- this.open = true;
- this.title = "娣诲姞瀹跺涵鏀舵敮鍙拌处";
+ this.dialog1Visible = true;
+ this.dialog2Visible = false;
+ this.title = "娣诲姞鏃呮父鍐呭";
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd1(row) {
+ const id = row.id
+ this.row = row;
+ this.reset();
+ this.centerDialogVisible = true;
+ this.title1 = "娣诲姞姣忔棩琛岀▼鍐呭";
+
},
+ /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
+ submitDataScope1: async function() {
+ const id = this.row.id
+
+ this.formDat.cid = id;
+ let ul = this.fileList.map(function (elem){
+ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ }).join(",")
+ let uls = this.fileListOther.map(function (elem){
+ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ }).join(",")
+ this.formDat.url = ul+","+uls
+ console.log(this.formDat)
+ this.$refs["elForm"].validate(valid => {
+ if (valid) {
+
+ addTravelBase(this.formDat).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.centerDialogVisible = false;
+ this.getList();
+ });
+ }
+ });
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ this.handleRemove(this.fileList[0]);
+ this.handleRemoveFile(this.fileListOther[0]);
+ },
// 寮圭獥
handleShow(row){
const id = row.id;
+
this.openDataScope = true
// this.getList()
//alert(123)
this.detailList = row.detailList
// alert(row.index)
- this.title = "灞曠ず璇︽儏";
-
+ this.title = "姣忔棩璐圭敤璇︽儏";
+ this.getList1()
},
/** 鏌ョ湅璇︾粏淇℃伅 */
@@ -578,18 +908,35 @@
// alert(row.fee_id)
this.$router.push("/self/travel/Info/" + id);
},
+ handleCheck1(row){
+ const id = row.id;
+ this.$router.push("/self/travel/travelInfo/" + id);
+ },
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
- const id = row.id;
- // let jd = true
- // this.$router.push({
- // path:"/self/travel/edit/" + id,
- // query:{
- // detail:jd
- // }
- // });
- this.$router.push("/self/travel/edit/" + id);
+ const id = row.id;
+ // console.log(id);
+ let jd = true
+ // this.$router.push("/self/travel/edit/" + id);
+ this.$router.push({
+ path:"/self/travel/edit/" + id,
+ query:{
+ detail:jd
+ }
+ });
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate1(row) {
+ const id = row.id;
+ let jd = true
+
+ this.$router.push({
+ path:"/self/travel/travelInfo/" + id,
+ query:{
+ detail:jd
+ }
+ });
},
@@ -600,23 +947,24 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.formDat.url = ul+","+uls
- this.$refs["elForm"].validate(valid => {
- if (valid) {
- addEconomy(this.formDat).then(response => {
+ this.$refs["elForm2"].validate(valid => {
+ if (valid) {
+ console.log(this.formDat4);
+ addTravelPrice(this.formDat4).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
+
+ this.dialog1Visible = false;
this.getList();
});
}
});
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat4).forEach(key => {
+ this.formDat4[key] = '';
+ });
+ this.handleRemove(this.fileList[0]);
+ this.handleRemoveFile(this.fileListOther[0]);
},
requestUpload(params)
{
@@ -648,6 +996,18 @@
return delTravelPrice(Ids);
}).then(() => {
this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete1(row) {
+ const id = row.id || this.ids;
+ console.log(id)
+ this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫変腑鏁版嵁椤癸紵').then(function() {
+ return delTravelBase(id);
+ }).then(() => {
+ this.getList();
+ this.ids = []
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
@@ -702,7 +1062,13 @@
}
.el-table__row.statistics-warning-row1 {
background: #FFEFF2;
+}
+.el-table__row.statistics-warning-row2 {
+ background: #EBFFF2;
+}
+.el-table__row.statistics-warning-row3 {
+ background: #f8f8dc;
}
.button {
background: center no-repeat url('../../assets/images/寮圭獥 1.png') ;
@@ -713,4 +1079,14 @@
/* margin-left: 66vw; */
}
+.custom-header-row {
+ background-color: #EBAFB4 /* 鏇存敼涓轰綘鎯宠鐨勮儗鏅鑹� */
+ /* color: #FFF; 鏇存敼涓轰綘鎯宠鐨勬枃瀛楅鑹� */
+}
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
--
Gitblit v1.9.1