消息功能

This commit is contained in:
yinjinlu-pc\尹金路 2023-03-08 11:13:37 +08:00
parent 53aae96352
commit 4dd6369fac
6 changed files with 811 additions and 4 deletions

44
src/api/system/message.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询消息列表
export function listMessage(query) {
return request({
url: '/system/message/list',
method: 'get',
params: query
})
}
// 查询消息详细
export function getMessage(messageId) {
return request({
url: '/system/message/' + messageId,
method: 'get'
})
}
// 新增消息
export function addMessage(data) {
return request({
url: '/system/message',
method: 'post',
data: data
})
}
// 修改消息
export function updateMessage(data) {
return request({
url: '/system/message',
method: 'put',
data: data
})
}
// 删除消息
export function delMessage(messageId) {
return request({
url: '/system/message/' + messageId,
method: 'delete'
})
}

View File

@ -0,0 +1,170 @@
<template>
<el-dialog title="报表选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
center
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="报表名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入报表名称"
clearable
@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-form>
<el-table v-loading="loading" :data="listData" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center" >
<template v-slot="scope">
<el-radio v-model="selectedReportId" :label="scope.row.id" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template>
</el-table-column>
<el-table-column label="报表名称" align="center" prop="name" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</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="handlePreview(scope.row.name)"
v-hasPermi="['mes:report:edit']"
>预览</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"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect"> </el-button>
<el-button @click="showFlag=false"> </el-button>
</div>
</el-dialog>
</template>
<script>
import { listReport, getReport, delReport, addReport, updateReport } from "@/api/mes/report/ureport";
export default {
name: "ReportSelect",
dicts: ['sys_yes_no'],
data() {
return {
showFlag:false,
selectedReportId: undefined,
selectedRow: undefined,
//
loading: true,
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
listData: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
name: null,
content: null,
createTime: null,
updateTime: null
},
//
form: {},
};
},
created() {
this.getList();
},
methods: {
/** 查询报表管理列表 */
getList() {
this.loading = true;
listReport(this.queryParams).then(response => {
this.listData = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row){
if(row){
this.selectedRow = row;
}
},
//
handleRowDbClick(row){
if(row){
this.selectedRow = row;
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
},
//
handleRowChange(row) {
debugger;
if(row){
this.selectedRow = row;
}
},
/** 报表预览 */
handlePreview(name) {
window.open(`${this.website.reportUrl}/preview?_u=mysql:`+name)
},
//
confirmSelect(){
if(this.selectedReportId ==null || this.selectedReportId==0){
this.$notify({
title:'提示',
type:'warning',
message: '请至少选择一条数据!'
});
return;
}
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
}
};
</script>

View File

@ -0,0 +1,170 @@
<template>
<el-dialog title="批量打印"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
center
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="条码类型" prop="barcodeType">
<el-select v-model="queryParams.barcodeType" placeholder="请选择条码类型">
<el-option
v-for="dict in dict.type.mes_barcode_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</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-form-item label="打印模板" prop="bussinessCode">
<el-input
v-model="queryParams.bussinessCode"
placeholder="请选择打印模板"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="success" icon="el-icon-printer" size="mini" @click="handlePrint">打印</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="barcodeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="条码" align="center">
<template slot-scope="scope">
<el-image @click="handleView(scope.row)" class="barcodeClass" fit="scale-down" :src="scope.row.barcodeUrl">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</template>
</el-table-column>
<el-table-column label="条码格式" align="center" prop="barcodeFormart">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_barcode_formart" :value="scope.row.barcodeFormart"/>
</template>
</el-table-column>
<el-table-column label="条码类型" align="center" prop="barcodeType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_barcode_type" :value="scope.row.barcodeType"/>
</template>
</el-table-column>
<el-table-column label="条码内容" align="center" prop="barcodeContent" />
<el-table-column label="业务编码" align="center" prop="bussinessCode" />
<el-table-column label="业务名称" align="center" prop="bussinessName" />
<el-table-column label="是否生效" align="center" prop="enableFlag" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
</template>
</el-table-column>
<el-table-column label="生成时间" align="center" prop="createTime" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<div slot="footer" class="dialog-footer">
<el-button @click="showFlag=false"> </el-button>
</div>
</el-dialog>
</template>
<script>
import { listBarcode, updateBarcode } from "@/api/mes/wm/barcode";
export default {
name: "BatchPrint",
dicts: ['sys_yes_no', 'mes_barcode_type','mes_barcode_formart'],
data() {
return {
showFlag: false,
//
loading: false,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
barcodeList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
barcodeFormart: null,
barcodeType: null,
barcodeContent: null,
bussinessId: null,
bussinessCode: null,
bussinessName: null,
barcodeUrl: null,
enableFlag: null
}
};
},
created() {
},
methods: {
/** 查询条码清单列表 */
getList() {
this.loading = true;
listBarcode(this.queryParams).then(response => {
this.barcodeList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.configId)
this.single = selection.length!==1
this.multiple = !selection.length
},
//
handlePrint(){
}
}
};
</script>

View File

@ -30,6 +30,15 @@
></el-switch>
</template>
</el-table-column>
<el-table-column label="默认打印模板" align="center" prop="defaultTemplate" >
<template slot-scope="scope">
{{scope.row.defaultTemplate}}
<el-button
type="text"
@click="handleSetReport(scope.row)"
>设置</el-button>
</template>
</el-table-column>
</el-table>
<pagination
@ -39,6 +48,7 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<ReportSelect ref="reportRef" @onSelected="onReportSelected"></ReportSelect>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="showFlag=false"> </el-button>
<el-button @click="showFlag=false"> </el-button>
@ -48,9 +58,10 @@
<script>
import { listBarcodeconfig, getBarcodeconfig, delBarcodeconfig, addBarcodeconfig, updateBarcodeconfig } from "@/api/mes/wm/barcodeconfig";
import ReportSelect from "@/components/reportSelect/single.vue";
export default {
name: "Barcodeconfig",
components: {ReportSelect},
dicts: ['sys_yes_no', 'mes_barcode_type','mes_barcode_formart'],
data() {
return {
@ -59,6 +70,8 @@ export default {
loading: true,
//
ids: [],
//
selectedConfigId: null,
//
single: true,
//
@ -167,7 +180,24 @@ export default {
}
});
},
//
handleSetReport(row){
this.$refs.reportRef.showFlag = true;
this.selectedConfigId = row.configId;
this.form = row;
},
//
onReportSelected(row){
debugger;
if(row != null && this.form !=null ){
this.form.defaultTemplate = row.name;
updateBarcodeconfig(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
}
},
//
handleAutoGenChange(row) {
let text = row.autoGenFlag === "Y" ? "启用" : "停用";

View File

@ -66,7 +66,17 @@
v-hasPermi="['mes:wm:barcode:edit']"
>条码设置</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-printer"
size="mini"
@click="handleBatchPrint"
v-hasPermi="['mes:wm:barcode:view']"
>批量打印</el-button>
</el-col>
<Barcodeconfig ref="barcodeconfig"></Barcodeconfig>
<BarcodeBatchPrint ref="barcodebatchprint"></BarcodeBatchPrint>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -114,7 +124,7 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:wm:barcode:remove']"
>打印</el-button>
>删除</el-button>
</template>
</el-table-column>
</el-table>
@ -283,11 +293,12 @@ import VendorSelect from "@/components/vendorSelect/single.vue";
import PackageSelectSingle from "@/components/package/single.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import Barcodeconfig from "./config.vue"
import BarcodeBatchPrint from "./batchprint.vue"
export default {
name: "Barcode",
dicts: ['mes_barcode_type','mes_barcode_formart','sys_yes_no'],
components: {
ItemSelect,VendorSelect,PackageSelectSingle,Barcodeconfig,WorkstationSelect
ItemSelect,VendorSelect,PackageSelectSingle,Barcodeconfig,WorkstationSelect,BarcodeBatchPrint
},
data() {
return {
@ -502,7 +513,12 @@ export default {
},
handleConfig(){
this.$refs.barcodeconfig.showFlag = true;
},
handleBatchPrint(){
this.$refs.barcodebatchprint.showFlag = true;
}
}
};
</script>

View File

@ -0,0 +1,377 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="消息类型" prop="messageType">
<el-select v-model="queryParams.messageType" placeholder="请选择消息类型" clearable>
<el-option
v-for="dict in dict.type.sys_message_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="消息级别" prop="messageLevel">
<el-select v-model="queryParams.messageLevel" placeholder="请选择消息级别" clearable>
<el-option
v-for="dict in dict.type.sys_message_level"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="发送人" prop="senderNick">
<el-input
v-model="queryParams.senderNick"
placeholder="请输入发送人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="接收人" prop="recipientNick">
<el-input
v-model="queryParams.recipientNick"
placeholder="请输入接收人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.sys_message_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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-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:message:add']"
>测试</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:message:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:message:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="messageList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="消息类型" align="center" prop="messageType">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_message_type" :value="scope.row.messageType"/>
</template>
</el-table-column>
<el-table-column label="消息级别" align="center" prop="messageLevel">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_message_level" :value="scope.row.messageLevel"/>
</template>
</el-table-column>
<el-table-column label="标题" align="center" prop="messageTitle" />
<el-table-column label="内容" align="center" prop="messageContent" />
<el-table-column label="发送人" align="center" prop="senderNick" />
<el-table-column label="接收人" align="center" prop="recipientNick" />
<el-table-column label="处理时间" align="center" prop="processTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.processTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="回调地址" align="center" prop="callBack" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_message_status" :value="scope.row.status"/>
</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="['system:message:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:message: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"
/>
<!-- 添加或修改消息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="消息类型" prop="messageType">
<el-select v-model="form.messageType" placeholder="请选择消息类型">
<el-option
v-for="dict in dict.type.sys_message_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="消息级别" prop="messageLevel">
<el-select v-model="form.messageLevel" placeholder="请选择消息级别">
<el-option
v-for="dict in dict.type.sys_message_level"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="接收人" prop="recipientNick">
<el-input v-model="form.recipientNick" readonly="readonly" placeholder="请选择接收人" >
<el-button slot="append" @click="handleUserSelect" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<UserSingleSelect ref="userSelect" @onSelected="onUserSelected"></UserSingleSelect>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="标题" prop="messageTitle">
<el-input v-model="form.messageTitle" placeholder="请输入标题" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="内容">
<editor v-model="form.messageContent" :min-height="192"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="回调地址" prop="callBack">
<el-input v-model="form.callBack" placeholder="请输入回调地址" />
</el-form-item>
</el-col>
</el-row>
</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 { listMessage, getMessage, delMessage, addMessage, updateMessage } from "@/api/system/message";
import UserSingleSelect from "@/components/userSelect/single.vue"
export default {
name: "Message",
components: {UserSingleSelect},
dicts: ['sys_message_type', 'sys_message_status','sys_message_level'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
messageList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
messageType: null, messageLevel: null, messageTitle: null, messageContent: null, senderId: null, senderName: null, senderNick: null, recipientId: null, recipientName: null, recipientNick: null, processTime: null, callBack: null, status: null, deletedFlag: null, },
//
form: {},
//
rules: {
messageType: [
{ required: true, message: "消息类型不能为空", trigger: "change" }
],
messageLevel: [
{ required: true, message: "消息级别不能为空", trigger: "blur" }
],
messageTitle: [
{ required: true, message: "消息标题不能为空", trigger: "blur" }
],
messageContent: [
{ required: true, message: "消息内容不能为空", trigger: "blur" }
],
recipientName: [
{ required: true, message: "接收人不能为空", trigger: "blur" }
]
}
};
},
created() {
this.getList();
},
methods: {
/** 查询消息列表 */
getList() {
this.loading = true;
listMessage(this.queryParams).then(response => {
this.messageList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
messageId: null, messageType: null, messageLevel: null, messageTitle: null, messageContent: null, senderId: null, senderName: null, senderNick: null, recipientId: null, recipientName: null, recipientNick: null, processTime: null, callBack: null, status: "0", deletedFlag: null, remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.messageId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加消息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const messageId = row.messageId || this.ids
getMessage(messageId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改消息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.messageId != null) {
updateMessage(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addMessage(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const messageIds = row.messageId || this.ids;
this.$modal.confirm('是否确认删除消息编号为"' + messageIds + '"的数据项?').then(function() {
return delMessage(messageIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/message/export', {
...this.queryParams
}, `message_${new Date().getTime()}.xlsx`)
},
handleUserSelect(){
this.$refs.userSelect.showFlag = true;
},
onUserSelected(row){
if(row != null){
debugger;
this.form.recipientId = row.userId;
this.form.recipientName = row.userName;
this.form.recipientNick = row.nickName;
}
}
}
};
</script>