|
@@ -4,50 +4,15 @@
|
|
|
<!--用户数据-->
|
|
|
<el-col :span="24" :xs="24">
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
- <el-form-item label="用户名称" prop="name">
|
|
|
+ <el-form-item label="景点名称" prop="name">
|
|
|
<el-input
|
|
|
v-model="queryParams.name"
|
|
|
- placeholder="请输入用户名称"
|
|
|
+ placeholder="请输入景点名称"
|
|
|
clearable
|
|
|
style="width: 240px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="手机号码" prop="mobile">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.mobile"
|
|
|
- placeholder="请输入手机号码"
|
|
|
- clearable
|
|
|
- style="width: 240px"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="状态" prop="status">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.status"
|
|
|
- placeholder="用户状态"
|
|
|
- clearable
|
|
|
- style="width: 240px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in dict.type.sys_normal_disable"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="创建时间">
|
|
|
- <el-date-picker
|
|
|
- v-model="dateRange"
|
|
|
- style="width: 240px"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- type="daterange"
|
|
|
- range-separator="-"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- ></el-date-picker>
|
|
|
- </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -65,7 +30,7 @@
|
|
|
v-hasPermi="configPermi.add"
|
|
|
>新增</el-button>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
+ <el-col :span="1.5" v-if="false">
|
|
|
<el-button
|
|
|
type="danger"
|
|
|
plain
|
|
@@ -76,7 +41,7 @@
|
|
|
v-hasPermi="configPermi.delect"
|
|
|
>删除</el-button>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
+ <el-col :span="1.5" v-if="false">
|
|
|
<el-button
|
|
|
type="info"
|
|
|
plain
|
|
@@ -86,7 +51,7 @@
|
|
|
v-hasPermi="configPermi.upload"
|
|
|
>导入</el-button>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
+ <el-col :span="1.5" v-if="false">
|
|
|
<el-button
|
|
|
type="warning"
|
|
|
plain
|
|
@@ -100,27 +65,22 @@
|
|
|
</el-row>
|
|
|
|
|
|
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
|
|
|
- <el-table-column type="selection" width="50" align="center" />
|
|
|
- <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
|
|
|
- <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
|
|
|
- <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
|
|
|
+ <!-- <el-table-column type="selection" width="50" align="center" /> -->
|
|
|
+ <el-table-column label="景点名称" align="center" key="name" prop="name" v-if="columns[0].visible" />
|
|
|
+ <!-- <el-table-column label="归属景区" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" /> -->
|
|
|
+ <el-table-column label="开/闭园时间" align="center" key="openDate" prop="openDate" v-if="columns[1].visible" :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="开放状态" align="center" key="status" v-if="columns[2].visible">
|
|
|
<template slot-scope="scope">
|
|
|
<el-switch
|
|
|
v-model="scope.row.status"
|
|
|
- active-value="0"
|
|
|
- inactive-value="1"
|
|
|
- @change="handleStatusChange(scope.row)"
|
|
|
+ active-color="#13ce66"
|
|
|
+ inactive-color="#ccc"
|
|
|
+ :active-value="2"
|
|
|
+ :inactive-value="1"
|
|
|
></el-switch>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.createTime) }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column label="景点产品" align="center" key="goodId" prop="goodId" v-if="columns[3].visible" width="120" />
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
align="center"
|
|
@@ -129,6 +89,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope" v-if="scope.row.id !== 1">
|
|
|
<el-button
|
|
|
+ v-if="false"
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-document"
|
|
@@ -164,7 +125,7 @@
|
|
|
</el-row>
|
|
|
|
|
|
<!-- 导入 -->
|
|
|
- <uploadBox ref="upload" @refresh="handleQuery" />
|
|
|
+ <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
|
|
|
<!-- 新增或修改 -->
|
|
|
<addAndEdit ref="addAndEdit" @refresh="getList" />
|
|
|
<!-- 详情 -->
|
|
@@ -175,7 +136,7 @@
|
|
|
<script>
|
|
|
import {
|
|
|
listTableApi,
|
|
|
- delTableApi,
|
|
|
+ delTableParamsApi,
|
|
|
} from "@/api/CURD";
|
|
|
import addAndEdit from "./formBox/navigationManagementForm.vue"
|
|
|
import detailsBox from "./detailsBox/navigationManagementDetails.vue"
|
|
@@ -195,11 +156,11 @@
|
|
|
export: ['system:user:export'],// 导出权限
|
|
|
},
|
|
|
configUrl: {
|
|
|
- list: '/merchant/merchantSysuser/pageList', // 列表地址
|
|
|
- delect: '/merchant/merchantSysuser/', // 删除地址
|
|
|
- upload: 'system/user/importTemplate',// 导入地址
|
|
|
- download:'system/user/importTemplate', // 下载模板地址
|
|
|
- export: '/system/user/importData',// 导出地址
|
|
|
+ list: '/merchant/merchantPoints/pageList', // 列表地址
|
|
|
+ delect: '/merchant/merchantPoints/deleteById/', // 删除地址
|
|
|
+ upload: '',// 导入地址
|
|
|
+ download:'', // 下载模板地址
|
|
|
+ export: '',// 导出地址
|
|
|
},
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
@@ -223,13 +184,11 @@
|
|
|
dateRange: [],
|
|
|
// 控制列表是否显示
|
|
|
columns: [
|
|
|
- { key: 0, label: `用户编号`, visible: true },
|
|
|
- { key: 1, label: `用户名称`, visible: true },
|
|
|
- { key: 2, label: `用户昵称`, visible: true },
|
|
|
- { key: 3, label: `部门`, visible: true },
|
|
|
- { key: 4, label: `手机号码`, visible: true },
|
|
|
- { key: 5, label: `状态`, visible: true },
|
|
|
- { key: 6, label: `创建时间`, visible: true }
|
|
|
+ { key: 0, label: `景点名称`, visible: true },
|
|
|
+ // { key: 1, label: `归属景区`, visible: true },
|
|
|
+ { key: 2, label: `开/闭园时间`, visible: true },
|
|
|
+ { key: 3, label: `开放状态`, visible: true },
|
|
|
+ { key: 4, label: `景点产品`, visible: true },
|
|
|
],
|
|
|
};
|
|
|
},
|
|
@@ -264,6 +223,10 @@
|
|
|
/** 重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
this.dateRange = [];
|
|
|
+ this.queryParams = {
|
|
|
+ pageNum: 1,
|
|
|
+ pageSize: 10,
|
|
|
+ }
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
// 多选框选中数据
|
|
@@ -275,7 +238,7 @@
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
if(this.$refs.addAndEdit) {
|
|
|
- this.$refs.addAndEdit.initData(this.title + '新增', "EDIT",{})
|
|
|
+ this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
|
|
|
}
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
@@ -292,12 +255,16 @@
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const ids = row.id || this.ids;
|
|
|
- this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(function() {
|
|
|
- return delTableApi(configUrl.delect,ids);
|
|
|
+ this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then( () => {
|
|
|
+ return delTableParamsApi(this.configUrl.delect,{
|
|
|
+ id: ids
|
|
|
+ });
|
|
|
}).then(() => {
|
|
|
this.getList();
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
- }).catch(() => {});
|
|
|
+ }).catch((e) => {
|
|
|
+ console.error("删除失败====",e)
|
|
|
+ });
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|