wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

店铺管理 

自配送
This commit is contained in:
wangshuai 2024-07-05 15:04:36 +08:00
parent 5c1830548a
commit 461ffa63af
11 changed files with 752 additions and 492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java
View File

@ -5,6 +5,7 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.business.domain.BusStoreConfigInfo;
import com.ruoyi.business.req.ReqBusStoreConfigInfo;
import com.ruoyi.business.req.ReqBusStoreInfo;
import com.ruoyi.business.resp.RespBusStoreInfo;
import com.ruoyi.business.service.IBusStoreConfigInfoService;
@ -115,9 +116,9 @@ public class BusStoreInfoController extends BaseController
{
BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo();
busStoreConfigInfo.setStoreCode(storeCode);
List<BusStoreConfigInfo> list = iBusStoreConfigInfoService.selectBusStoreConfigInfoList(busStoreConfigInfo);
List<BusStoreConfigInfo> list = iBusStoreConfigInfoService.selectBusStoreConfigInfoListByStoreCode(busStoreConfigInfo);
if(list.size()==0){
return success();
return success("新增配置");
}else if(list.size()==1){
return success(list.get(0));
}else{
@ -125,6 +126,19 @@ public class BusStoreInfoController extends BaseController
}
}
/**
* 新增修改店铺配置信息
*/
@PreAuthorize("@ss.hasPermi('business:store:add')")
@Log(title = "新增修改店铺配置信息", businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdate")
public AjaxResult saveOrUpdate(@RequestBody ReqBusStoreConfigInfo reqBusStoreConfigInfo)
{
BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo();
BeanUtils.copyProperties(reqBusStoreConfigInfo, busStoreConfigInfo);
return toAjax(busStoreInfoService.saveOrUpdateConfig(busStoreConfigInfo));
}
/**
* 导出店铺信息列表
*/

52
ruoyi-system/src/main/java/com/ruoyi/business/domain/BusStoreConfigInfo.java
View File

@ -53,14 +53,14 @@ public class BusStoreConfigInfo extends BaseEntity
private int maxOrderNum;
/** 回访时段start */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "回访时段start", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
// @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "回访时段start", width = 30, dateFormat = "HH:mm:ss")
private String startTime;
/** end */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "end", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
// @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "end", width = 30, dateFormat = "HH:mm:ss")
private String endTime;
/** 是否拼好饭,1:是，2:否 */
@Excel(name = "是否拼好饭,1:是，2:否")
@ -74,6 +74,12 @@ public class BusStoreConfigInfo extends BaseEntity
@Excel(name = "营销限额")
private int quota;
@Excel(name = "备注")
private String remark;
@Excel(name = "归属销售id")
private Long saleBindId;
public void setId(Long id)
{
this.id = id;
@ -155,21 +161,21 @@ public class BusStoreConfigInfo extends BaseEntity
{
return maxOrderNum;
}
public void setStartTime(Date startTime)
public void setStartTime(String startTime)
{
this.startTime = startTime;
}
public Date getStartTime()
public String getStartTime()
{
return startTime;
}
public void setEndTime(Date endTime)
public void setEndTime(String endTime)
{
this.endTime = endTime;
}
public Date getEndTime()
public String getEndTime()
{
return endTime;
}
@ -201,6 +207,31 @@ public class BusStoreConfigInfo extends BaseEntity
return quota;
}
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public Long getSaleBindId() {
return saleBindId;
}
public void setSaleBindId(Long saleBindId) {
this.saleBindId = saleBindId;
}
public BusStoreConfigInfo() {
}
public BusStoreConfigInfo(String storeCode) {
this.storeCode = storeCode;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -219,6 +250,7 @@ public class BusStoreConfigInfo extends BaseEntity
.append("selfDeliveryDuration", getSelfDeliveryDuration())
.append("quota", getQuota())
.append("remark", getRemark())
.append("saleBindId", getSaleBindId())
.toString();
}
}

8
ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreConfigInfoMapper.java
View File

@ -58,4 +58,12 @@ public interface BusStoreConfigInfoMapper
* @return 结果
*/
public int deleteBusStoreConfigInfoByIds(Long[] ids);
/**
* 查询店铺配置信息列表
*
* @param busStoreConfigInfo 店铺配置信息
* @return 店铺配置信息集合
*/
List<BusStoreConfigInfo> selectBusStoreConfigInfoListByStoreCode(BusStoreConfigInfo busStoreConfigInfo);
}

8
ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreConfigInfoService.java
View File

@ -58,4 +58,12 @@ public interface IBusStoreConfigInfoService
* @return 结果
*/
public int deleteBusStoreConfigInfoById(Long id);
/**
* 查询店铺配置信息列表
*
* @param busStoreConfigInfo 店铺配置信息
* @return 店铺配置信息集合
*/
List<BusStoreConfigInfo> selectBusStoreConfigInfoListByStoreCode(BusStoreConfigInfo busStoreConfigInfo);
}

10
ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.business.service;
import java.util.List;
import com.ruoyi.business.domain.BusStoreConfigInfo;
import com.ruoyi.business.domain.BusStoreInfo;
/**
@ -58,4 +60,12 @@ public interface IBusStoreInfoService
* @return 结果
*/
public int deleteBusStoreInfoById(Long id);
/**
* 新增 修改店铺配置表信息
*
* @param busStoreConfigInfo 店铺配置信息
* @return 结果
*/
int saveOrUpdateConfig(BusStoreConfigInfo busStoreConfigInfo);
}

11
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreConfigInfoServiceImpl.java
View File

@ -90,4 +90,15 @@ public class BusStoreConfigInfoServiceImpl implements IBusStoreConfigInfoService
{
return busStoreConfigInfoMapper.deleteBusStoreConfigInfoById(id);
}
/**
* 查询店铺配置信息列表
*
* @param busStoreConfigInfo 店铺配置信息
* @return 店铺配置信息
*/
@Override
public List<BusStoreConfigInfo> selectBusStoreConfigInfoListByStoreCode(BusStoreConfigInfo busStoreConfigInfo) {
return busStoreConfigInfoMapper.selectBusStoreConfigInfoListByStoreCode(busStoreConfigInfo);
}
}

64
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java
View File

@ -1,12 +1,20 @@
package com.ruoyi.business.service.impl;
import java.util.Date;
import java.util.List;
import com.ruoyi.business.domain.BusSaleInfo;
import com.ruoyi.business.domain.BusStoreConfigInfo;
import com.ruoyi.business.mapper.BusSaleInfoMapper;
import com.ruoyi.business.mapper.BusStoreConfigInfoMapper;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.business.mapper.BusStoreInfoMapper;
import com.ruoyi.business.domain.BusStoreInfo;
import com.ruoyi.business.service.IBusStoreInfoService;
import org.springframework.transaction.annotation.Transactional;
/**
* 店铺信息Service业务层处理
@ -20,6 +28,12 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService
@Autowired
private BusStoreInfoMapper busStoreInfoMapper;
@Autowired
private BusStoreConfigInfoMapper busStoreConfigInfoMapper;
@Autowired
private BusSaleInfoMapper busSaleInfoMapper;
/**
* 查询店铺信息
*
@ -92,4 +106,54 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService
{
return busStoreInfoMapper.deleteBusStoreInfoById(id);
}
/**
* 新增 修改店铺配置表信息
*
* @param busStoreConfigInfo 店铺配置信息
* @return 结果
*/
@Override
@Transactional(rollbackFor = ServiceException.class)
public int saveOrUpdateConfig(BusStoreConfigInfo busStoreConfigInfo) {
int count = 0;
try {
BusStoreConfigInfo busStoreConfigInfo1 = new BusStoreConfigInfo(busStoreConfigInfo.getStoreCode());
List<BusStoreConfigInfo> ll = busStoreConfigInfoMapper.selectBusStoreConfigInfoListByStoreCode(busStoreConfigInfo1);
// 配置新增修改
if(ll.size() == 0){
count = busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo);
}else if(ll.size() ==1){
busStoreConfigInfo.setId(ll.get(0).getId());
count = busStoreConfigInfoMapper.updateBusStoreConfigInfo(busStoreConfigInfo);
}else{
throw new ServiceException("店铺配置信息异常！");
}
if(busStoreConfigInfo.getSaleBindId() != null){
// 归属人信息
BusSaleInfo busSaleInfo = busSaleInfoMapper.selectBusSaleInfoById(busStoreConfigInfo.getSaleBindId());
if(busSaleInfo != null){
// 同步店铺主表SaleBind
BusStoreInfo busStoreInfo = new BusStoreInfo();
busStoreInfo.setStoreCode(busStoreConfigInfo.getStoreCode());
List<BusStoreInfo> list = busStoreInfoMapper.selectBusStoreInfoList(busStoreInfo);
if(list.size() == 1){
busStoreInfo.setId(list.get(0).getId());
busStoreInfo.setSaleBindId(busSaleInfo.getId());
busStoreInfo.setSaleBindName(busSaleInfo.getSaleName());
busStoreInfo.setSaleBindTime(new Date());
busStoreInfoMapper.updateBusStoreInfo(busStoreInfo);
}else{
throw new ServiceException("店铺信息异常！");
}
}else {
throw new ServiceException("销售人员信息异常！");
}
}
return count;
}catch (Exception e){
throw new ServiceException(e.getMessage());
}
}
}

15
ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml
View File

@ -20,10 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="selfDeliveryDuration" column="self_delivery_duration" />
<result property="quota" column="quota" />
<result property="remark" column="remark" />
<result property="saleBindId" column="sale_bind_id" />
</resultMap>
<sql id="selectBusStoreConfigInfoVo">
select id, store_code, store_name, content1, content2, content3, content4, min_order_num, max_order_num, start_time, end_time, is_splice_order, self_delivery_duration, quota, remark from bus_store_config_info
select id, store_code, store_name, content1, content2, content3, content4, min_order_num, max_order_num, start_time, end_time, is_splice_order, self_delivery_duration, quota, remark,sale_bind_id from bus_store_config_info
</sql>
<select id="selectBusStoreConfigInfoList" parameterType="BusStoreConfigInfo" resultMap="BusStoreConfigInfoResult">
@ -42,6 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isSpliceOrder != null and isSpliceOrder != ''"> and is_splice_order = #{isSpliceOrder}</if>
<if test="selfDeliveryDuration != null "> and self_delivery_duration = #{selfDeliveryDuration}</if>
<if test="quota != null "> and quota = #{quota}</if>
<if test="remark != null "> and remark = #{remark}</if>
<if test="saleBindId != null "> and sale_bind_id = #{saleBindId}</if>
</where>
</select>
@ -50,6 +53,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<select id="selectBusStoreConfigInfoListByStoreCode" parameterType="BusStoreConfigInfo" resultMap="BusStoreConfigInfoResult">
<include refid="selectBusStoreConfigInfoVo"/>
<where>
<if test="storeCode != null and storeCode != ''"> and store_code = #{storeCode}</if>
</where>
</select>
<insert id="insertBusStoreConfigInfo" parameterType="BusStoreConfigInfo">
insert into bus_store_config_info
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -68,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="selfDeliveryDuration != null">self_delivery_duration,</if>
<if test="quota != null">quota,</if>
<if test="remark != null">remark,</if>
<if test="saleBindId != null">sale_bind_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -85,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="selfDeliveryDuration != null">#{selfDeliveryDuration},</if>
<if test="quota != null">#{quota},</if>
<if test="remark != null">#{remark},</if>
<if test="saleBindId != null">#{saleBindId},</if>
</trim>
</insert>
@ -105,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="selfDeliveryDuration != null">self_delivery_duration = #{selfDeliveryDuration},</if>
<if test="quota != null">quota = #{quota},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="saleBindId != null">sale_bind_id = #{saleBindId},</if>
</trim>
where id = #{id}
</update>

13
ruoyi-ui/src/api/business/store.js
View File

@ -53,10 +53,19 @@ export function changeSelfDeliveryStatus(id, selfDeliveryStatus) {
})
}
// 查询角色详细
// 查询店铺配置详细
export function getStoreConfig(storeCode) {
return request({
url: '/business/store/config/' + storeCode,
method: 'get'
})
}
}
// 新增、修改店铺配置
export function updateStoreConfig(data) {
return request({
url: '/business/store/saveOrUpdate',
method: 'post',
data: data
})
}

843
ruoyi-ui/src/views/market/self/index.vue
View File

@ -1,87 +1,135 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="营销源名称" prop="roleName">
<el-input
v-model="queryParams.roleName"
placeholder="请输入营销源名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="营销源标识" prop="roleKey">
<el-input
v-model="queryParams.roleKey"
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="备注" prop="roleKey">
<el-input
v-model="queryParams.roleKey"
placeholder="备注"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</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>
</el-form-item>
<el-row>
<el-col :span="5">
<el-form-item label="对接平台" prop="platformType" >
<el-select
v-model="queryParams.platformType"
placeholder="选择平台"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_platform_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="店铺名称" prop="storeName">
<el-input
v-model="queryParams.storeName"
placeholder="请输入店铺名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="店铺编号" prop="storeCode">
<el-input
v-model="queryParams.storeCode"
placeholder="请输入店铺编号"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="店铺归属" prop="saleBindId">
<el-select
v-model="queryParams.saleBindId"
placeholder="店铺归属"
filterable
clearable
style="width: 240px"
>
<el-option
v-for="dict in saleList"
:key="dict.id"
:label="dict.saleName+' ：'+dict.id"
:value="dict.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="2"><el-form-item label="门店数量" prop="status"></el-form-item></el-col>
<el-col :span="2"><el-form-item label="掉线数量" prop="status"></el-form-item></el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="登录状态" prop="grantStatus">
<el-select
v-model="queryParams.grantStatus"
placeholder="选择登录状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_grant_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="回访状态" prop="returnVisitStatus">
<el-select
v-model="queryParams.returnVisitStatus"
placeholder="选择回访状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_return_visit_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item></el-form-item>
</el-col>
<el-col :span="5">
<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>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="开启数量" prop="platform"></el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['system:role:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['system:role:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['system:role:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:role:add']"
>授权前置指引</el-button>
</el-col>
<el-col :span="1.5">
<a :href="meituanUrl" style="color: rgb(230, 167, 0);">授权M</a>
<el-tooltip content="请使用鼠标右键点击授权M后选择在隐身窗口中打开链接（新增或更新失效，操作一致）" effect="dark" placement="right">
<i class="el-tooltip el-icon-question" tabindex="0" ></i>
</el-tooltip>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
@ -95,62 +143,68 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="storeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" prop="roleId" width="120" />
<el-table-column label="名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
<el-table-column label="标识" prop="roleKey" :show-overflow-tooltip="true" width="150" />
<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"/>
<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">
<el-table-column label="序号" type="index" ></el-table-column>
<el-table-column label="平台" prop="platformType" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
<dict-tag :options="dict.type.sys_platform_type" :value="scope.row.platformType"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
<el-table-column label="编码" prop="storeCode" :show-overflow-tooltip="true" />
<el-table-column label="名称" prop="storeName" :show-overflow-tooltip="true" />
<el-table-column label="在线状态" prop ="grantStatus" align="center" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_grant_status" :value="scope.row.grantStatus"/>
</template>
</el-table-column>
<el-table-column label="昨日单量" align="center" />
<el-table-column label="昨日好评量" align="center" />
<el-table-column label="昨日五星量" align="center" />
<el-table-column label="昨日回访量" align="center" />
<el-table-column label="昨日营销比(%)" align="center" :render-header="renderPrice"/>
<el-table-column label="今日回访量" align="center" />
<el-table-column label="评分" align="center" />
<el-table-column label="归属" prop="saleBindId" align="center" :formatter="idToName"/>
<el-table-column label="创建时间" align="center" prop="bindTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.bindTime) }}</span>
</template>
</el-table-column>
<el-table-column label="营销用户下单" prop="returnVisitUserRange" align="center" />
<el-table-column label="是否开启" prop="returnVisitStatus" align="center" >
<template slot-scope="scope">
<el-switch
v-model="scope.row.returnVisitStatus"
active-value="1"
inactive-value="2"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width =120>
<template slot-scope="scope">
<el-button v-if="scope.row.returnVisitStatus !== 1"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>修改</el-button>
<el-button
>配置</el-button>
<el-button v-if="scope.row.returnVisitStatus !== 1"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>删除</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>
<el-button
size="mini"
type="text"
icon="el-icon-mouse"
@click="handleOpen(scope.row)"
>后台</el-button>
</template>
</el-table-column>
</el-table>
@ -162,49 +216,127 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改角色配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="form.roleName" placeholder="请输入角色名称" />
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="150px">
<el-form-item label="早高峰时段-方案" prop="content1">
<!-- <el-input v-model="form.storeCode" placeholder="店铺编码" /> -->
<el-select
v-model="form.content1"
placeholder="选择话术"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.bus_script_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item prop="roleKey">
<span slot="label">
<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 label="午高峰时段-方案" prop="content2">
<el-select
v-model="form.content2"
placeholder="选择话术"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.bus_script_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="角色顺序" prop="roleSort">
<el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
<el-form-item label="晚高峰时段-方案" prop="content3">
<el-select
v-model="form.content3"
placeholder="选择话术"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.bus_script_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-form-item label="默认时间段-方案" prop="content4">
<el-select
v-model="form.content4"
placeholder="选择话术"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.bus_script_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="营销用户-下单次数 >=" prop="min_order_num">
<el-input-number v-model="form.minOrderNum" placeholder="请输入营销下单次数" :min="1"/>
</el-form-item>
<el-form-item label="营销用户-下单次数 <=" prop="max_order_num">
<el-input-number v-model="form.maxOrderNum" placeholder="请输入营销下单次数" :min="1"/>
</el-form-item>
<el-form-item label="营销时段" prop="start_time">
<!-- <el-date-picker
v-model="value2"
type="datetimerange"
range-separator="至"
:picker-options="pickerOptions"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker> -->
<el-time-picker
is-range
v-model="timeRange"
value-format = "HH:mm:ss"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
placeholder="选择时间范围">
</el-time-picker>
</el-form-item>
<el-form-item label="营销时长" prop="selfDeliveryDuration">
<el-input-number v-model="form.selfDeliveryDuration" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="营销限额" prop="quota">
<el-input-number v-model="form.quota" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="是否拼好饭">
<el-radio-group v-model="form.isSpliceOrder">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
v-for="dict in dict.type.sys_yes_no"
: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 label="店铺归属" prop="saleBindId">
<!-- <el-input v-model="form.roleSort" controls-position="right"/> -->
<el-select
v-model="form.saleBindId"
placeholder="店铺归属"
filterable
clearable
style="width: 240px"
>
<el-option
v-for="dict in saleList"
:key="dict.id"
:label="dict.saleName+' ：'+dict.id"
:value="dict.id"
/>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item>
@ -214,60 +346,21 @@
<el-button @click="cancel">取 消</el-button>
</div>
</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>
</template>
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
// import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
// import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import { listStore, changeReturnVisitStatus, listSale, getMtUrl, changeSelfDeliveryStatus, getStoreConfig, updateStoreConfig} from "@/api/business/store";
import user from "@/store";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
dicts: ['sys_yes_no','sys_grant_status','sys_platform_type','sys_return_visit_status','bus_script_type'],
data() {
return {
meituanUrl: "https://e.waimai.meituan.com?ABC="+this.$store.state.user.name+":1",
// 遮罩层
loading: true,
// 选中数组
@ -280,55 +373,29 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 角色表格数据
roleList: [],
// 店铺表格数据
storeList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
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: {
pageNum: 1,
pageSize: 10,
roleName: undefined,
roleKey: undefined,
status: undefined
id: undefined,
platformType: undefined,
storeCode: undefined,
storeName: undefined,
saleBindId: undefined,
grantStatus: undefined,
returnVisitStatus: undefined,
selfDeliveryStatus: 2
},
saleList: [],
timeRange: undefined,
// 表单参数
form: {},
defaultProps: {
@ -337,79 +404,92 @@ export default {
},
// 表单校验
rules: {
roleName: [
{ required: true, message: "角色名称不能为空", trigger: "blur" }
// storeCode: undefined,
// content1: undefined,
// content2: undefined,
// content3: undefined,
// content4: undefined,
// minOrderNum: 1,
// maxOrderNum: 1,
// timeRange: '',
// isSpliceOrder: 2,
// selfDeliveryDuration: 1,
// saleBindId: undefined,
// quota: 1,
// remark: undefined
minOrderNum: [
{ required: true, message: "下单次数min不能为空", trigger: "blur" }
],
roleKey: [
{ required: true, message: "权限字符不能为空", trigger: "blur" }
maxOrderNum: [
{ required: true, message: "下单次数max不能为空", trigger: "blur" }
],
roleSort: [
{ required: true, message: "角色顺序不能为空", trigger: "blur" }
timeRange: [
{ required: true, message: "运营时间不能为空", trigger: "blur" }
],
quota: [
{ required: true, message: "限额不能为空", trigger: "blur" }
]
}
};
},
created() {
this.getListSale();
this.getList();
},
methods: {
renderPrice(h, { column, $index }) {
return [
h(
'el-tooltip',
{
props: {
content: '昨日营销量与昨日单量比值', // 鼠标悬停时要展示的文字提示
placement: 'top' // 悬停内容展示的位置
}
},
[h('span', { class: { 'el-icon-question': true }})] // 图标
),
column.label
]
},
/** 查询角色列表 */
getList() {
this.loading = true;
listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.roleList = response.rows;
listStore(this.queryParams).then(response => {
this.storeList = response.rows;
this.total = response.total;
this.loading = false;
}
);
},
/** 查询菜单树结构 */
getMenuTreeselect() {
menuTreeselect().then(response => {
this.menuOptions = response.data;
getListSale() {
listSale(this.queryParams).then(response => {
this.saleList = response.data;
}
);
},
idToName(row, column, cellValue) {
// 查找对应 ID 的姓名
const person = this.saleList.find(p => p.id === parseInt(cellValue));
// 如果找到了对应的人员信息，返回姓名，否则返回空字符串或者错误提示
return person ? person.saleName : '--';
},
handleOpen(row) {
this.queryParams.id = row.id;
getMtUrl(this.queryParams).then(response => {
window.open(response.msg,"_blank");
});
},
// 所有菜单节点数据
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);
let text = row.returnVisitStatus === "1" ? "启用" : "停用";
this.$modal.confirm('确认要"' + text + '""' + row.storeName + '"店铺的运营吗？').then(function() {
console.log(row.id+"====")
return changeReturnVisitStatus(row.id, row.returnVisitStatus);
}).then(() => {
this.$modal.msgSuccess(text + "成功");
}).catch(function() {
row.status = row.status === "0" ? "1" : "0";
row.returnVisitStatus = row.returnVisitStatus === "2" ? "1" : "2";
});
},
// 取消按钮
@ -432,15 +512,19 @@ export default {
this.deptExpand = true,
this.deptNodeAll = false,
this.form = {
roleId: undefined,
roleName: undefined,
roleKey: undefined,
roleSort: 0,
status: "0",
menuIds: [],
deptIds: [],
menuCheckStrictly: true,
deptCheckStrictly: true,
storeCode: undefined,
content1: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
content2: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
content3: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
content4: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
minOrderNum: 1,
maxOrderNum: 1,
startTime: undefined,
endTime: undefined,
isSpliceOrder: 'N',
selfDeliveryDuration: undefined,
saleBindId: undefined,
quota: 1,
remark: undefined
};
this.resetForm("form");
@ -452,7 +536,6 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
@ -462,149 +545,75 @@ export default {
this.single = selection.length!=1
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() {
this.reset();
this.getMenuTreeselect();
this.open = true;
this.title = "添加角色";
var url = 'https://p.kdocs.cn/s/VEQ34BIAIQ';
window.open(url,'_blank');
//
// this.reset();
// this.getMenuTreeselect();
// this.open = true;
// this.title = "添加角色";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const roleId = row.roleId || this.ids
const roleMenu = this.getRoleMenuTreeselect(roleId);
getRole(roleId).then(response => {
this.form = response.data;
getStoreConfig(row.storeCode).then(response => {
this.open = true;
this.$nextTick(() => {
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() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.roleId != undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys();
updateRole(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
this.form.menuIds = this.getMenuAllCheckedKeys();
addRole(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
if(response.data != null){
this.form = response.data;
this.timeRange = [response.data.startTime,response.data.endTime];
this.title = "编辑配置";
}else{
this.form.storeCode = row.storeCode;
this.title = "新增配置";
}
});
},
/** 提交按钮（数据权限） */
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();
});
/** 提交按钮 */
submitForm: function() {
const data = this.form
if(this.timeRange==undefined || this.timeRange.length == 0){
this.$modal.msgSuccess("请填写营销时段！");
return
}
data.startTime = this.timeRange[0]
data.endTime = this.timeRange[1]
this.$refs["form"].validate(valid => {
if (valid) {
updateStoreConfig(data).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const roleIds = row.roleId || this.ids;
this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
return delRole(roleIds);
this.$modal.confirm('是否确认删除解绑编号为"' + row.storeCode + '"的店铺？').then(function() {
return changeSelfDeliveryStatus(row.id, 3);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(function() {
});
},
/** 自配送按钮操作 */
handleSelfDelivery(row) {
this.$modal.confirm('是否确认将营销源 "' + row.storeCode + '" 转为自配送？确认后该营销源会变为自配送营销。').then(function() {
return changeSelfDeliveryStatus(row.id, 2);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(function() {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/role/export', {
this.download('business/store/export', {
...this.queryParams
}, `role_${new Date().getTime()}.xlsx`)
}

202
ruoyi-ui/src/views/market/whole/index.vue
View File

@ -226,33 +226,90 @@
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="150px">
<el-form-item label="早高峰时段-方案" prop="content1">
<el-input v-model="form.content1" placeholder="请输入角色名称" />
<!-- <el-input v-model="form.storeCode" placeholder="店铺编码" /> -->
<el-select
v-model="form.content1"
placeholder="选择话术"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.bus_script_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="午高峰时段-方案" prop="content2">
<el-input v-model="form.content2" placeholder="请输入角色名称" />
<el-select
v-model="form.content2"
placeholder="选择话术"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.bus_script_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="晚高峰时段-方案" prop="content3">
<el-input v-model="form.content3" placeholder="请输入角色名称" />
<el-select
v-model="form.content3"
placeholder="选择话术"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.bus_script_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="默认时间段-方案" prop="content4">
<el-input v-model="form.content4" placeholder="请输入角色名称"/>
<el-select
v-model="form.content4"
placeholder="选择话术"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.bus_script_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="营销用户-下单次数 >=" prop="min_order_num">
<el-input-number v-model="form.minOrderNum" placeholder="请输入角色名称" :min="0"/>
<el-input-number v-model="form.minOrderNum" placeholder="请输入营销下单次数" :min="1"/>
</el-form-item>
<el-form-item label="营销用户-下单次数 <=" prop="max_order_num">
<el-input-number v-model="form.maxOrderNum" placeholder="请输入角色名称" :min="0"/>
<el-input-number v-model="form.maxOrderNum" placeholder="请输入营销下单次数" :min="1"/>
</el-form-item>
<el-form-item label="营销时段" prop="start_time">
<el-date-picker
<!-- <el-date-picker
v-model="value2"
type="datetimerange"
range-separator="至"
:picker-options="pickerOptions"
start-placeholder="开始日期"
end-placeholder="结束日期"
align="right">
</el-date-picker>
end-placeholder="结束日期">
</el-date-picker> -->
<el-time-picker
is-range
v-model="timeRange"
value-format = "HH:mm:ss"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
placeholder="选择时间范围">
</el-time-picker>
</el-form-item>
<el-form-item label="营销时长" prop="selfDeliveryDuration">
<el-input-number v-model="form.selfDeliveryDuration" controls-position="right" :min="0" />
@ -269,10 +326,24 @@
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="店铺归属" prop="saleBindName">
<el-input v-model="form.roleSort" controls-position="right"/>
<el-form-item label="店铺归属" prop="saleBindId">
<!-- <el-input v-model="form.roleSort" controls-position="right"/> -->
<el-select
v-model="form.saleBindId"
placeholder="店铺归属"
filterable
clearable
style="width: 240px"
>
<el-option
v-for="dict in saleList"
:key="dict.id"
:label="dict.saleName+' ：'+dict.id"
:value="dict.id"
/>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item>
@ -288,12 +359,12 @@
<script>
// import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
// import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import { listStore, changeReturnVisitStatus, listSale, getMtUrl, changeSelfDeliveryStatus, getStoreConfig} from "@/api/business/store";
import { listStore, changeReturnVisitStatus, listSale, getMtUrl, changeSelfDeliveryStatus, getStoreConfig, updateStoreConfig} from "@/api/business/store";
import user from "@/store";
export default {
name: "Role",
dicts: ['sys_yes_no','sys_grant_status','sys_platform_type','sys_return_visit_status'],
dicts: ['sys_yes_no','sys_grant_status','sys_platform_type','sys_return_visit_status','bus_script_type'],
data() {
return {
meituanUrl: "https://e.waimai.meituan.com?ABC="+this.$store.state.user.name+":1",
@ -331,6 +402,7 @@ export default {
selfDeliveryStatus: 1
},
saleList: [],
timeRange: undefined,
// 表单参数
form: {},
defaultProps: {
@ -339,14 +411,30 @@ export default {
},
// 表单校验
rules: {
roleName: [
{ required: true, message: "角色名称不能为空", trigger: "blur" }
// storeCode: undefined,
// content1: undefined,
// content2: undefined,
// content3: undefined,
// content4: undefined,
// minOrderNum: 1,
// maxOrderNum: 1,
// timeRange: '',
// isSpliceOrder: 2,
// selfDeliveryDuration: 1,
// saleBindId: undefined,
// quota: 1,
// remark: undefined
minOrderNum: [
{ required: true, message: "下单次数min不能为空", trigger: "blur" }
],
roleKey: [
{ required: true, message: "权限字符不能为空", trigger: "blur" }
maxOrderNum: [
{ required: true, message: "下单次数max不能为空", trigger: "blur" }
],
roleSort: [
{ required: true, message: "角色顺序不能为空", trigger: "blur" }
timeRange: [
{ required: true, message: "运营时间不能为空", trigger: "blur" }
],
quota: [
{ required: true, message: "限额不能为空", trigger: "blur" }
]
}
};
@ -431,13 +519,19 @@ export default {
this.deptExpand = true,
this.deptNodeAll = false,
this.form = {
roleId: undefined,
roleName: undefined,
roleKey: undefined,
roleSort: 0,
status: "0",
menuCheckStrictly: true,
deptCheckStrictly: true,
storeCode: undefined,
content1: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
content2: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
content3: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
content4: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
minOrderNum: 1,
maxOrderNum: 1,
startTime: undefined,
endTime: undefined,
isSpliceOrder: 'N',
selfDeliveryDuration: undefined,
saleBindId: undefined,
quota: 1,
remark: undefined
};
this.resetForm("form");
@ -475,70 +569,58 @@ export default {
this.open = true;
if(response.data != null){
this.form = response.data;
this.timeRange = [response.data.startTime,response.data.endTime];
this.title = "编辑配置";
}else{
this.form.storeCode = row.storeCode;
this.title = "新增配置";
}
this.title = "编辑配置";
});
},
/** 提交按钮 */
submitForm: function() {
const data = this.form
if(this.timeRange==undefined || this.timeRange.length == 0){
this.$modal.msgSuccess("请填写营销时段！");
return
}
data.startTime = this.timeRange[0]
data.endTime = this.timeRange[1]
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.roleId != undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys();
updateRole(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
this.form.menuIds = this.getMenuAllCheckedKeys();
addRole(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
updateStoreConfig(data).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
}
});
},
/** 提交按钮（数据权限） */
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) {
this.$modal.confirm('是否确认删除解绑编号为"' + row.storeCode + '"的店铺？').then(function() {
console.log(row.id+"====")
return changeSelfDeliveryStatus(row.id, 3);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(function() {
});
},
/** 自配送按钮操作 */
handleSelfDelivery(row) {
this.$modal.confirm('是否确认将营销源 "' + row.storeCode + '" 转为自配送？确认后该营销源会变为自配送营销。').then(function() {
console.log(row.id+"====")
return changeSelfDeliveryStatus(row.id, 2);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(function() {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/role/export', {
this.download('business/store/export', {
...this.queryParams
}, `role_${new Date().getTime()}.xlsx`)
}