From 3fea4c6a262e3d5953f8cd528e12dda7eae6e3c9 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期三, 02 十一月 2022 15:51:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/personShiftManage/scheduleManage/schedule/index.vue | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/views/system/personShiftManage/scheduleManage/schedule/index.vue b/src/views/system/personShiftManage/scheduleManage/schedule/index.vue
index 71f7d52..008fb17 100644
--- a/src/views/system/personShiftManage/scheduleManage/schedule/index.vue
+++ b/src/views/system/personShiftManage/scheduleManage/schedule/index.vue
@@ -14,16 +14,15 @@
<div class="main-card">
<el-row class="cardTop">
<el-col :span="12" class="mainCardBtn">
- <el-button type="primary" :icon="Plus" size="default" @click="dialogAddRecord = true">新建</el-button>
+ <el-button type="primary" :icon="Plus" size="default" @click="dialogAddRecord = true">新增</el-button>
<!-- <el-button type="warning" :icon="Edit" size="default" plain>修改</el-button>-->
- <el-button type="danger" :icon="Delete" size="default" plain @click="deleteBatchBtn">删除</el-button>
+<!-- <el-button type="danger" :icon="Delete" size="default" plain @click="deleteBatchBtn">删除</el-button>-->
</el-col>
<el-button type="primary" :icon="Refresh" size="default" @click="reLoadData()" />
</el-row>
<el-table ref="multipleTableRef" :data="tableData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="100" />
<el-table-column property="groupName" label="班组名称" />
- <el-table-column property="groupMembers" label="班组人员" width="180" :show-overflow-tooltip="true" />
+ <el-table-column property="groupMembers" label="班组人员" :show-overflow-tooltip="true" />
<el-table-column property="groupInfo" label="描述" />
<el-table-column fixed="right" label="操作" align="center" width="250">
<template #default="scope">
@@ -302,7 +301,7 @@
if (res.data.code === '200') {
ElMessage({
type: 'success',
- message: res.data.msg
+ message: '添加成功！'
});
getListByPage();
} else {
@@ -327,7 +326,7 @@
if (res.data.code === '200') {
ElMessage({
type: 'success',
- message: res.data.msg
+ message: '修改成功！'
});
getListByPage();
} else {
@@ -368,7 +367,7 @@
if (res.data.code === '200') {
ElMessage({
type: 'success',
- message: res.data.msg
+ message: '删除成功！'
});
getListByPage();
} else {
@@ -391,11 +390,11 @@
};
// 批量删除
- const deleteBatchBtn = async () => {
- ElMessage({
- type: 'warning',
- message: '抱歉，本页面暂不支持批量删除'
- });
+ // const deleteBatchBtn = async () => {
+ // ElMessage({
+ // type: 'warning',
+ // message: '抱歉，本页面暂不支持批量删除'
+ // });
// if (state.deleteArr.length > 0) {
// state.deleteSetDialog = true
// } else {
@@ -404,7 +403,7 @@
// message: '请先选择要删除的记录'
// });
// }
- };
+ // };
// const conFirmDeleteBatch = async () => {
// let res = await teamManageApi().deletBatchRecord({ids: state.deleteArr});
@@ -482,7 +481,6 @@
getListByPage,
reLoadData,
deleteRecord,
- deleteBatchBtn,
handleSizeChange,
handleCurrentChange,
confirmAddRecord,
--
Gitblit v1.9.2