Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整权限标识

Browse Source
This commit is contained in:
huangdeliang
2021-03-02 15:33:53 +08:00
parent 4dd7a6f643
commit ecbc4705a2
14 changed files with 403 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanController.java
View File

@ -31,7 +31,7 @@ public class SysRecipesPlanController extends BaseController
/**
* 查询食谱计划列表
*/
@PreAuthorize("@ss.hasPermi('recipes:recipesPlan:list')")
@PreAuthorize("@ss.hasPermi('recipes:plan:list')")
@GetMapping("/list")
public TableDataInfo list(SysRecipesPlan sysRecipesPlan)
{
@ -48,7 +48,7 @@ public class SysRecipesPlanController extends BaseController
/**
* 根据订单查询完整食谱计划列表
*/
@PreAuthorize("@ss.hasPermi('recipes:recipesPlan:list')")
@PreAuthorize("@ss.hasPermi('recipes:plan:list')")
@GetMapping("/getAllPlanByOrderId")
public TableDataInfo getAllPlanByOrderId(SysRecipesPlan sysRecipesPlan)
{
@ -57,7 +57,7 @@ public class SysRecipesPlanController extends BaseController
return getDataTable(list);
}
@PreAuthorize("@ss.hasPermi('recipes:recipesPlan:list')")
@PreAuthorize("@ss.hasPermi('recipes:plan:list')")
@GetMapping(value = "/list/{cusId}")
public AjaxResult getAllPlanByCusId(@PathVariable Long cusId) {
return AjaxResult.success(sysRecipesPlanService.selectPlanListByCusId(cusId));
@ -66,7 +66,7 @@ public class SysRecipesPlanController extends BaseController
/**
* 获取食谱计划详细信息
*/
@PreAuthorize("@ss.hasPermi('recipes:recipesPlan:query')")
@PreAuthorize("@ss.hasPermi('recipes:plan:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@ -76,7 +76,7 @@ public class SysRecipesPlanController extends BaseController
/**
* 修改食谱计划
*/
@PreAuthorize("@ss.hasPermi('recipes:recipesPlan:edit')")
@PreAuthorize("@ss.hasPermi('recipes:plan:edit')")
@Log(title = "食谱计划", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SysRecipesPlan sysRecipesPlan)
@ -87,7 +87,7 @@ public class SysRecipesPlanController extends BaseController
/**
* 导出食谱计划列表
*/
@PreAuthorize("@ss.hasPermi('recipes:recipesPlan:export')")
@PreAuthorize("@ss.hasPermi('recipes:plan:export')")
@Log(title = "食谱计划", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(SysRecipesPlan sysRecipesPlan)

10
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java
View File

@ -26,7 +26,7 @@ public class SysRecipesTemplateController extends BaseController {
/**
* 查询
*/
@PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:list')")
@PreAuthorize("@ss.hasPermi('recipes:template:list')")
@GetMapping("/list")
public TableDataInfo list(SysRecipesTemplate sysRecipesTemplate) {
startPage();
@ -34,7 +34,7 @@ public class SysRecipesTemplateController extends BaseController {
return getDataTable(list);
}
@PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:list')")
@PreAuthorize("@ss.hasPermi('recipes:template:list')")
@GetMapping(value = "/{id}")
public AjaxResult detail(@PathVariable Long id) {
return AjaxResult.success(iSysRecipesTemplateService.getRecipesTemplateById(id));
@ -43,7 +43,7 @@ public class SysRecipesTemplateController extends BaseController {
/**
* 添加
*/
@PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:edit')")
@PreAuthorize("@ss.hasPermi('recipes:template:edit')")
@PostMapping("/add")
public AjaxResult add(@RequestBody SysRecipesTemplate sysRecipesTemplate) {
return toAjax(iSysRecipesTemplateService.insertRecipsesTemplate(sysRecipesTemplate));
@ -52,7 +52,7 @@ public class SysRecipesTemplateController extends BaseController {
/**
* 更新
*/
@PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:list')")
@PreAuthorize("@ss.hasPermi('recipes:template:list')")
@PutMapping(value = "/update")
public AjaxResult update(@RequestBody SysRecipesTemplate sysRecipesTemplate) {
return toAjax(iSysRecipesTemplateService.updateRecipesTemplate(sysRecipesTemplate));
@ -61,7 +61,7 @@ public class SysRecipesTemplateController extends BaseController {
/**
* 删除
*/
@PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:query')")
@PreAuthorize("@ss.hasPermi('recipes:template:query')")
@DeleteMapping(value = "/delete/{id}")
public AjaxResult delete(@PathVariable("id") Long id) {
return AjaxResult.success(iSysRecipesTemplateService.removeRecipesTemplate(id));

1
stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml
View File

@ -44,6 +44,7 @@
<if test="reviewStatus != null and type != ''"> and review_status = #{reviewStatus}</if>
<if test="isMain != null and type != ''"> and is_main = #{isMain}</if>
</where>
order by id desc
</select>
<sql id="selectSysIngreditentsByIdVo">

12
stdiet-ui/src/api/custom/orderPause.js → stdiet-ui/src/api/custom/recipesPause.js
View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询订单服务暂停列表
export function listPause(query) {
return request({
url: '/orderPause/pause/list',
url: '/recipes/pause/list',
method: 'get',
params: query
})
@ -12,7 +12,7 @@ export function listPause(query) {
// 查询订单服务暂停详细
export function getPause(id) {
return request({
url: '/orderPause/pause/' + id,
url: '/recipes/pause/' + id,
method: 'get'
})
}
@ -20,7 +20,7 @@ export function getPause(id) {
// 新增订单服务暂停
export function addPause(data) {
return request({
url: '/orderPause/pause',
url: '/recipes/pause',
method: 'post',
data: data
})
@ -29,7 +29,7 @@ export function addPause(data) {
// 修改订单服务暂停
export function updatePause(data) {
return request({
url: '/orderPause/pause',
url: '/recipes/pause',
method: 'put',
data: data
})
@ -38,7 +38,7 @@ export function updatePause(data) {
// 删除订单服务暂停
export function delPause(id) {
return request({
url: '/orderPause/pause/' + id,
url: '/recipes/pause/' + id,
method: 'delete'
})
}
@ -46,7 +46,7 @@ export function delPause(id) {
// 导出订单服务暂停
export function exportPause(query) {
return request({
url: '/orderPause/pause/export',
url: '/recipes/pause/export',
method: 'get',
params: query
})

367
stdiet-ui/src/components/RecipesPlanDrawer/PlanPauseDrawer/index.vue Normal file
View File

@ -0,0 +1,367 @@
<template>
<el-drawer
:title="drawerTitle"
:append-to-body="true"
:close-on-press-escape="false"
:visible.sync="visible"
size="35%"
>
<div class="plan_pause_drawer_wrapper">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['orderPause:pause:add']"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['orderPause:pause:export']"
>导出</el-button
>
</el-col>
</el-row>
<el-table v-loading="loading" :data="pauseList" height="80%">
<el-table-column label="时间" align="center" width="120">
<template slot-scope="scope">
<div>
{{ scope.row.pauseStartDate }}
</div>
至
<div>
{{ scope.row.pauseEndDate }}
</div>
</template>
</el-table-column>
<el-table-column label="暂停理由" align="center" prop="reason">
<template slot-scope="scope">
<el-popover
v-if="scope.row.reason != null && scope.row.reason.length > 10"
placement="top"
title="事由"
width="200"
trigger="hover"
:content="scope.row.reason"
>
<el-button slot="reference" type="text">详情 </el-button>
</el-popover>
<span v-else>{{ scope.row.reason }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remarks">
<template slot-scope="scope">
<el-popover
v-if="scope.row.remarks != null && scope.row.remarks.length > 10"
placement="top"
title="备注"
width="200"
trigger="hover"
:content="scope.row.remarks"
>
<el-button slot="reference" type="text">详情 </el-button>
</el-popover>
<span v-else>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="120"
>
<template slot-scope="scope">
<div v-for="str in scope.row.createTime.split(' ')" :key="str">
{{ str }}
</div>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="120"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['orderPause:pause:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['orderPause:pause:remove']"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
layout="total, slot, prev, pager, next, jumper"
/>
<!-- 添加或修改订单服务暂停对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
width="500px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="时间范围" prop="dateScope">
<el-date-picker
v-model="dateScope"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
:picker-options="orderPickerOptions"
>
</el-date-picker>
</el-form-item>
<el-form-item label="事由" prop="reason">
<el-input
type="textarea"
placeholder="请输入暂停事由"
v-model="form.reason"
maxlength="200"
show-word-limit
rows="5"
></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input
type="textarea"
placeholder="请输入备注"
v-model="form.remarks"
maxlength="200"
show-word-limit
rows="5"
></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</el-drawer>
</template>
<script>
import {
listPause,
getPause,
delPause,
addPause,
updatePause,
exportPause,
} from "@/api/custom/recipesPause";
import dayjs from "dayjs";
const beginTime = dayjs().startOf("month").format("YYYY-MM-DD");
const endTime = dayjs().format("YYYY-MM-DD");
export default {
name: "Pause",
data() {
const checkcDateScope = (rule, value, callback) => {
if (
this.dateScope == null ||
this.dateScope == undefined ||
this.dateScope.length == 0
) {
return callback(new Error("日期范围不能为空"));
}
callback();
};
return {
// 遮罩层
loading: true,
drawerTitle: "",
//
visible: false,
data: undefined,
// 总条数
total: 0,
// 订单服务暂停表格数据
pauseList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
cusId: undefined,
},
// 表单参数
form: {},
dateScope: [beginTime, endTime],
// 表单校验
rules: {
dateScope: [
{ required: true, trigger: "blur", validator: checkcDateScope },
],
reason: [
{ required: true, message: "暂停理由不能为空", trigger: "blur" },
],
},
orderPickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 24 * 60 * 60 * 1000;
},
},
};
},
methods: {
/** 查询订单服务暂停列表 */
getList() {
this.loading = true;
listPause(this.queryParams).then((response) => {
this.pauseList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
pauseStartDate: null,
pauseEndDate: null,
reason: null,
remarks: null,
};
this.resetForm("form");
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.dateScope = [];
this.open = true;
this.title = "添加暂停记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
getPause(row.id).then((response) => {
this.form = response.data;
this.dateScope = [];
this.dateScope[0] = this.form.pauseStartDate;
this.dateScope[1] = this.form.pauseEndDate;
this.open = true;
this.title = "修改暂停记录";
});
},
showDrawer(data) {
// console.log(data);
if (!data) {
return;
}
this.data = data;
this.visible = true;
this.drawerTitle = `「${this.data.name}」暂停记录`;
this.queryParams.cusId = this.data.id;
this.getList();
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
this.form.pauseStartDate = this.dateScope[0];
this.form.pauseEndDate = this.dateScope[1];
this.form.cusId = this.data.id;
if (this.form.id != null) {
updatePause(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
addPause(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
}
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
this.$confirm('是否确认删除暂停编号为"' + row.id + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return delPause(row.id);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
})
.catch(function () {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm("是否确认导出所有暂停记录数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return exportPause(queryParams);
})
.then((response) => {
this.download(response.msg);
})
.catch(function () {});
},
},
};
</script>
<style lang="scss" scoped>
.plan_pause_drawer_wrapper {
padding: 20px;
height: calc(100vh - 77px);
overflow: auto;
}
</style>

36
stdiet-ui/src/components/RecipesPlanDrawer/index.vue
View File

@ -4,7 +4,7 @@
:close-on-press-escape="false"
:visible.sync="visible"
@closed="handleOnClosed"
size="40%"
size="45%"
>
<div class="app-container recipes_plan_drawer_wrapper">
<el-row :gutter="10" class="mb8">
@ -26,7 +26,7 @@
</el-col>
</el-row>
<el-table :data="planList" v-loading="planLoading" height="90%">
<el-table :data="planList" v-loading="planLoading" height="80%">
<el-table-column label="审核状态" align="center" width="80">
<template slot-scope="scope">
<el-tag :type="scope.row.reviewStatus ? 'success' : 'danger'">{{
@ -60,41 +60,23 @@
</el-table>
<!-- 暂停记录抽屉 -->
<el-drawer
:title="innerTitle"
:append-to-body="true"
:close-on-press-escape="false"
:visible.sync="innerVisible"
@closed="handleOnInnerClosed"
>
<div class="app-container">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleInnerOpen"
>增加暂停记录
</el-button>
</el-col>
</el-row>
</div>
</el-drawer>
<PlanPauseDrawer ref="planPauseRef" />
</div>
</el-drawer>
</template>
<script>
import Clipboard from "clipboard";
import { listRecipesPlanByCusId } from "@/api/custom/recipesPlan";
import PlanPauseDrawer from "./PlanPauseDrawer";
export default {
name: "RecipesPlanDrawer",
components: {
PlanPauseDrawer,
},
data() {
return {
visible: false,
innerVisible: false,
title: "",
innerTitle: "",
cusOutId: "",
copyValue: "",
planLoading: false,
@ -119,7 +101,7 @@ export default {
}
return str;
}, "");
console.log(this.planList);
// console.log(this.planList);
this.planLoading = false;
});
},
@ -128,6 +110,7 @@ export default {
this.cusOutId = "";
},
handleInnerOpen() {
this.$refs["planPauseRef"].showDrawer(this.data);
this.innerVisible = true;
this.innerTitle = `「${this.data.name}」暂停记录`;
},
@ -142,7 +125,6 @@ export default {
type: "success",
});
},
handleOnInnerClosed() {},
handleOnRecipesEditClick(data) {
// console.log(data);
const { id, name } = this.data;

14
stdiet-ui/src/router/index.js
View File

@ -71,20 +71,6 @@ export const constantRoutes = [
}
]
},
{
path: "/order",
component: Layout,
hidden: true,
children: [
{
path: "orderPause/:orderId",
component: resolve =>
require(["@/views/custom/order/orderPause"], resolve),
name: "orderPause",
meta: { title: "订单暂停记录" }
}
]
},
{
path: "/user",
component: Layout,

2
stdiet-ui/src/views/custom/customer/index.vue
View File

@ -208,7 +208,7 @@
<el-table-column
label="食谱计划"
align="center"
v-hasPermi="['recipes:recipesPlan:list']"
v-hasPermi="['recipes:plan:list']"
>
<template slot-scope="scope">
<el-button

6
stdiet-ui/src/views/custom/dishes/index.vue
View File

@ -191,7 +191,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否主食" prop="type">
<el-form-item label="是否主食" prop="isMain">
<el-radio-group v-model="form.isMain">
<el-radio :label="0">是</el-radio>
<el-radio :label="1">否</el-radio>
@ -296,8 +296,6 @@
</el-table-column>
<el-table-column prop="carbonRatio" label="碳水/100g">
</el-table-column>
<!-- <el-table-column prop="remark" label="备注">
</el-table-column> -->
</el-table>
</el-form-item>
</el-col>
@ -525,7 +523,7 @@ export default {
updateBy: null,
updateTime: null,
igdList: [],
isMain: 0,
isMain: 1,
};
this.selIngIds = [];
this.selIngList = [];

22
stdiet-ui/src/views/custom/order/index.vue
View File

@ -407,14 +407,14 @@
@click="handleUpdate(scope.row)"
>修改
</el-button>
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-s-data"
@click="orderPauseManage(scope.row)"
v-hasPermi="['orderPause:pause:query']"
>暂停记录管理
</el-button>
</el-button> -->
<el-button
size="mini"
v-if="
@ -445,22 +445,6 @@
>
</pagination>
<!-- 暂停记录管理 -->
<el-dialog
:title="pauseTitle"
v-if="openPause"
:visible.sync="openPause"
width="900px"
append-to-body
>
<span style="color: #e6a23c; font-family: PingFang SC">
注意事项：
<br />1、日期包含当天，如：2021-01-01到2021-01-07，总共暂停七天，2021-01-08继续服务
<br />2、每条暂停记录的时间范围不能重叠</span
>
<orderPause v-bind:orderPauseId="orderPauseId"></orderPause>
</el-dialog>
<!-- 订单详情 -->
<order-detail ref="orderDetailRef" />
<!-- 订单修改 -->
@ -471,7 +455,6 @@
<script>
import { delOrder, exportOrder, listOrder } from "@/api/custom/order";
import dayjs from "dayjs";
import orderPause from "./orderPause";
import * as orderTypeData from "@/utils/orderType";
import OrderDetail from "@/components/OrderDetail";
import OrderEdit from "@/components/OrderEdit";
@ -486,7 +469,6 @@ const endTime = dayjs().format("YYYY-MM-DD");
export default {
name: "Order",
components: {
orderPause,
"auto-hide-message": AutoHideMessage,
"order-detail": OrderDetail,
"order-edit": OrderEdit,

415
stdiet-ui/src/views/custom/order/orderPause.vue
View File

@ -1,415 +0,0 @@
<template>
<div class="app-container">
<!--<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单id" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入订单id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createDate" label-width="120px">
<el-date-picker
v-model="queryParams.createDate"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<!--<el-form-item label="服务暂停理由" prop="reason">
<el-input
v-model="queryParams.reason"
placeholder="请输入服务暂停理由"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input
v-model="queryParams.remarks"
placeholder="请输入备注"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="cyan" 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-form>-->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['orderPause:pause:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['orderPause:pause:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['orderPause:pause:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['orderPause:pause:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="pauseList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!--<el-table-column label="订单成交时间" align="center" prop="orderTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="客户姓名" align="center" prop="customer" />-->
<el-table-column label="暂停开始日期" align="center" prop="pauseStartDate" width="120">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.pauseStartDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="暂停结束日期" align="center" prop="pauseEndDate" width="120">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.pauseEndDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="暂停理由" align="center" prop="reason">
<template slot-scope="scope">
<el-button v-show="scope.row.reason != null && scope.row.reason.length > 10" type="text" @click="openFormDialog('暂停理由', scope.row.reason)">点击查看</el-button>
<span v-show="scope.row.reason == null || scope.row.reason.length <= 10">{{scope.row.reason}}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remarks">
<template slot-scope="scope">
<el-button v-show="scope.row.remarks != null && scope.row.remarks.length > 10" type="text" @click="openFormDialog('备注', scope.row.remarks)">点击查看</el-button>
<span v-show="scope.row.remarks == null || scope.row.remarks.length <= 10">{{scope.row.remarks}}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['orderPause:pause:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['orderPause:pause:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page-sizes="[5,10]"
@pagination="getList"
/>
<el-dialog :title="formDialog.title" :visible.sync="formDialog.show" width="30%" append-to-body center>
<span>{{formDialog.content}}</span>
<span slot="footer" class="dialog-footer">
<el-button @click="formDialog.show = false">取 消</el-button>
<!--<el-button type="primary" @click="experience_dialog = false">确 定</el-button>-->
</span>
</el-dialog>
<!-- 添加或修改订单服务暂停对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<!--<el-form-item label="订单id" prop="orderId">
<el-input v-model="form.orderId" placeholder="请输入订单id" />
</el-form-item>-->
<el-form-item label="暂停日期范围" prop="dateScope" label-width="120px">
<el-date-picker
v-model="dateScope"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<!--<el-date-picker clearable size="small" style="width: 200px"
v-model="form.pauseStartDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择服务暂停开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="暂停结束时间" prop="pauseEndDate">
<el-date-picker clearable size="small" style="width: 200px"
v-model="form.pauseEndDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择服务暂停结束时间">
</el-date-picker>-->
</el-form-item>
<el-form-item label="暂停理由" prop="reason" label-width="120px">
<el-input type="textarea" placeholder="请输入暂停理由" v-model="form.reason" maxlength="200" show-word-limit rows="5"></el-input>
<!--<el-input v-model="form.reason" placeholder="请输入暂停理由" />-->
</el-form-item>
<el-form-item label="备注" prop="remarks" label-width="120px">
<el-input type="textarea" placeholder="请输入备注" v-model="form.remarks" maxlength="200" show-word-limit rows="5"></el-input>
<!--<el-input v-model="form.remarks" placeholder="请输入备注" />-->
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listPause, getPause, delPause, addPause, updatePause, exportPause } from "@/api/custom/orderPause";
import dayjs from 'dayjs';
const beginTime = dayjs().startOf('month').format('YYYY-MM-DD');
const endTime = dayjs().format('YYYY-MM-DD');
export default {
name: "Pause",
data() {
const checkcDateScope = (rule, value, callback) => {
if (this.dateScope == null || this.dateScope == undefined || this.dateScope.length == 0) {
return callback(new Error('日期范围不能为空'))
}
callback();
}
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 订单服务暂停表格数据
pauseList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 5,
orderId: null,
createDate: null,
pauseEndDate: null
//reason: null,
//remarks: null,
},
orderId: null,
// 表单参数
form: {
},
dateScope:[beginTime, endTime],
// 表单校验
rules: {
dateScope: [
{required: true, trigger: "blur", validator: checkcDateScope}
],
reason: [
{required: true, message: "暂停理由不能为空", trigger: "blur"}
]
},
//查看表单内容
formDialog:{
title: "",
show: false,
content: ""
}
};
},
props: {
orderPauseId: {
type: Number,
default: 0
},
},
created() {
this.getList();
},
mounted() {
this.orderId = this.orderPauseId;
this.queryParams.orderId = this.orderPauseId;
},
methods: {
/** 查询订单服务暂停列表 */
getList() {
this.loading = true;
listPause(this.queryParams).then(response => {
this.pauseList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
orderId: null,
pauseStartDate: null,
pauseEndDate: null,
reason: null,
remarks: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
// console.log(this.queryParams.pauseStartDate);
//this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.dateScope = [];
this.open = true;
this.title = "添加暂停记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getPause(id).then(response => {
this.form = response.data;
this.dateScope = [];
this.dateScope[0] = this.form.pauseStartDate;
this.dateScope[1] = this.form.pauseEndDate;
this.open = true;
this.title = "修改暂停记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.pauseStartDate = dayjs(this.dateScope[0]).format("YYYY-MM-DD");
this.form.pauseEndDate = dayjs(this.dateScope[1]).format("YYYY-MM-DD");
// console.log(this.form.pauseStartDate + "-" + this.form.pauseEndDate);
if (this.form.id != null) {
updatePause(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
this.form.orderId = this.orderId;
addPause(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
}
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除订单服务暂停编号为"' + ids + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delPause(ids);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(function() {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有订单服务暂停数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return exportPause(queryParams);
}).then(response => {
this.download(response.msg);
}).catch(function() {});
},
openFormDialog(title, content){
this.formDialog.title = title;
this.formDialog.content = content;
this.formDialog.show = true;
}
}
};
</script>

2
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue
View File

@ -12,7 +12,7 @@
trigger="click"
title="修改审核状态"
style="margin-right: 12px"
v-hasPermi="['recipes:recipesPlan:review']"
v-hasPermi="['recipes:plan:review']"
>
<div>
<el-button size="mini" type="success" @click="hanldeOnReveiwChange(2)"

4
stdiet-ui/src/views/custom/recipesPlan/index.vue
View File

@ -95,7 +95,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['recipes:recipesPlan:export']"
v-hasPermi="['recipes:plan:export']"
>导出
</el-button>
</el-col>
@ -164,7 +164,7 @@
<el-button
size="mini"
type="text"
v-hasPermi="['recipes:recipesPlan:edit']"
v-hasPermi="['recipes:plan:edit']"
:icon="`${
scope.row.recipesId ? 'el-icon-edit' : 'el-icon-edit-outline'
}`"

2
stdiet-ui/src/views/custom/recipesTemplate/index.vue
View File

@ -152,7 +152,7 @@
<el-button
size="mini"
type="text"
v-hasPermi="['recipes:recipesTemplate:edit']"
v-hasPermi="['recipes:template:edit']"
:icon="`${
scope.row.recipesId ? 'el-icon-edit' : 'el-icon-edit-outline'
}`"