xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

Browse Source
This commit is contained in:
orgin 2024-01-18 11:41:02 +08:00
commit b083dbed80
6 changed files with 124 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/jeecgbiz/JSelectUserByDep.vue
View File

@ -2,11 +2,11 @@
<div> <div>
<a-input-search <a-input-search
v-model="textVals" v-model="textVals"
placeholder="请先选择用户" placeholder="Please select the user first"
readOnly readOnly
unselectable="on" unselectable="on"
@search="onSearchDepUser"> @search="onSearchDepUser">
<a-button slot="enterButton" :disabled="disabled">选择用户</a-button> <a-button slot="enterButton" :disabled="disabled">Select user</a-button>
</a-input-search> </a-input-search>
<j-select-user-by-dep-modal <j-select-user-by-dep-modal
ref="selectModal" ref="selectModal"
@ -120,7 +120,7 @@
this.$refs.selectModal.showModal() this.$refs.selectModal.showModal()
}, },
selectOK(rows) { selectOK(rows) {
console.log("当前选中用户", rows) console.log("Currently selected user", rows)
if (!rows) { if (!rows) {
this.storeVals = '' this.storeVals = ''
this.textVals = '' this.textVals = ''

62
src/views/modules/message/SysMessageList.vue
View File

@ -6,28 +6,28 @@
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="消息标题"> <a-form-item label="Message header">
<a-input placeholder="请输入消息标题" v-model="queryParam.esTitle"></a-input> <a-input placeholder="Please enter the message title" v-model="queryParam.esTitle"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="发送内容"> <a-form-item label="Send content">
<a-input placeholder="请输入发送内容" v-model="queryParam.esContent"></a-input> <a-input placeholder="Please enter the content to send" v-model="queryParam.esContent"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="接收人"> <a-form-item label="receiver">
<a-input placeholder="请输入接收人" v-model="queryParam.esReceiver"></a-input> <a-input placeholder="Please enter the recipient" v-model="queryParam.esReceiver"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</template> </template>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">Search</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">Reset</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px"> <a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }} {{ toggleSearchStatus ? 'Pack up' : 'unfold' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a> </a>
</span> </span>
@ -39,20 +39,20 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" v-show="show" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" v-show="show" type="primary" icon="plus">ADD</a-button>
<a-button type="primary" v-show="show" icon="download" @click="handleExportXls('消息')">导出</a-button> <a-button type="primary" v-show="show" icon="download" @click="handleExportXls('消息')">Export</a-button>
<a-upload v-show="show" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <a-upload v-show="show" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel"> @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">Import</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"> <a-menu-item key="1" @click="batchDel">
<a-icon type="delete"/> <a-icon type="delete"/>
删除 Delete
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-button style="margin-left: 8px"> Batch operation
<a-icon type="down"/> <a-icon type="down"/>
</a-button> </a-button>
</a-dropdown> </a-dropdown>
@ -61,9 +61,9 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ <i class="anticon anticon-info-circle ant-alert-icon"></i> Selected <a style="font-weight: 600">{{
selectedRowKeys.length }}</a>项 selectedRowKeys.length }}</a>item
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <a style="margin-left: 24px" @click="onClearSelected">Clear</a>
</div> </div>
<a-table <a-table
@ -84,17 +84,17 @@
</span> </span>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a href="javascript:;" @click="handleDetail(record)">详情</a> <a href="javascript:;" @click="handleDetail(record)">Details</a>
<a-divider type="vertical"/> <a-divider type="vertical"/>
<a-dropdown> <a-dropdown>
<a class="ant-dropdown-link">更多<a-icon type="down"/></a> <a class="ant-dropdown-link">More<a-icon type="down"/></a>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item v-show="show"> <a-menu-item v-show="show">
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">Edit</a>
</a-menu-item> </a-menu-item>
<a-menu-item> <a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="Are you sure to delete it?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>Delete</a>
</a-popconfirm> </a-popconfirm>
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
@ -124,7 +124,7 @@
}, },
data() { data() {
return { return {
description: '消息管理页面', description: 'Message management page',
// 新增修改按钮是否显示 // 新增修改按钮是否显示
show: false, show: false,
// 表头 // 表头
@ -140,43 +140,43 @@
} }
}, },
{ {
title: '消息标题', title: 'Message header',
align: "center", align: "center",
dataIndex: 'esTitle' dataIndex: 'esTitle'
}, },
{ {
title: '发送内容', title: 'Send content',
align: "center", align: "center",
dataIndex: 'esContent', dataIndex: 'esContent',
scopedSlots: {customRender: 'esContent'}, scopedSlots: {customRender: 'esContent'},
}, },
{ {
title: '接收人', title: 'receiver',
align: "center", align: "center",
dataIndex: 'esReceiver' dataIndex: 'esReceiver'
}, },
{ {
title: '发送次数', title: 'Transmission times',
align: "center", align: "center",
dataIndex: 'esSendNum' dataIndex: 'esSendNum'
}, },
{ {
title: '发送状态', title: 'Send state',
align: 'center', align: 'center',
dataIndex: 'esSendStatus_dictText' dataIndex: 'esSendStatus_dictText'
}, },
{ {
title: '发送时间', title: 'Send time',
align: "center", align: "center",
dataIndex: 'esSendTime' dataIndex: 'esSendTime'
}, },
{ {
title: '发送方式', title: 'Send mode',
align: 'center', align: 'center',
dataIndex: 'esType_dictText' dataIndex: 'esType_dictText'
}, },
{ {
title: '操作', title: 'Operation',
dataIndex: 'action', dataIndex: 'action',
align: "center", align: "center",
scopedSlots: {customRender: 'action'}, scopedSlots: {customRender: 'action'},

78
src/views/modules/message/SysMessageTemplateList.vue
View File

@ -7,33 +7,33 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="模板CODE"> <a-form-item label="TEMPLATE CODE">
<a-input placeholder="请输入模板CODE" v-model="queryParam.templateCode"></a-input> <a-input placeholder="Please enter the template CODE" v-model="queryParam.templateCode"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="模板内容"> <a-form-item label="TEMPLATE Content">
<a-input placeholder="请输入模板内容" v-model="queryParam.templateContent"></a-input> <a-input placeholder="Please enter the template content" v-model="queryParam.templateContent"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="模板标题"> <a-form-item label="TEMPLATE Title">
<a-input placeholder="请输入模板标题" v-model="queryParam.templateName"></a-input> <a-input placeholder="Please enter the template title" v-model="queryParam.templateName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="模板类型"> <a-form-item label="TEMPLATE Type">
<j-dict-select-tag placeholder="请选择模板类型" v-model="queryParam.templateType" dictCode="msgType"></j-dict-select-tag> <j-dict-select-tag placeholder="Please check the template type" v-model="queryParam.templateType" dictCode="msgType"></j-dict-select-tag>
</a-form-item> </a-form-item>
</a-col> </a-col>
</template> </template>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">Search</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">Reset</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px"> <a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }} {{ toggleSearchStatus ? 'Pack up' : 'unfold' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a> </a>
</span> </span>
@ -45,11 +45,11 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">ADD</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('消息模板')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('消息模版')">Export</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel"> @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">Import</a-button>
</a-upload> </a-upload>
<!-- <a-dropdown v-if="selectedRowKeys.length > 0"> <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay"> <a-menu slot="overlay">
@ -67,9 +67,9 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ <i class="anticon anticon-info-circle ant-alert-icon"></i> Selected <a style="font-weight: 600">{{
selectedRowKeys.length }}</a>项 selectedRowKeys.length }}</a>item
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <a style="margin-left: 24px" @click="onClearSelected">Clear</a>
</div> </div>
<a-table <a-table
@ -91,26 +91,26 @@
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleMyEdit(record)">编辑</a> <a @click="handleMyEdit(record)">Edit</a>
<a-divider type="vertical"/> <a-divider type="vertical"/>
<a-dropdown> <a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down"/></a> <a class="ant-dropdown-link">More <a-icon type="down"/></a>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item> <a-menu-item>
<a @click="handleUse(record)">应用</a> <a @click="handleUse(record)">Use</a>
</a-menu-item> </a-menu-item>
<a-menu-item> <a-menu-item>
<a @click="handleNotUse(record)">停用</a> <a @click="handleNotUse(record)">NotUse</a>
</a-menu-item> </a-menu-item>
<a-menu-item> <a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record)"> <a-popconfirm title="Are you sure to delete it?" @confirm="() => handleDelete(record)">
<a>删除</a> <a>Delete</a>
</a-popconfirm> </a-popconfirm>
</a-menu-item> </a-menu-item>
<a-menu-item> <a-menu-item>
<a @click="handleTest(record)">发送测试</a> <a @click="handleTest(record)">Send test</a>
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</a-dropdown> </a-dropdown>
@ -148,7 +148,7 @@
}, },
data() { data() {
return { return {
description: '消息模板管理页面', description: 'Message template Management page',
// 表头 // 表头
columns: [ columns: [
{ {
@ -162,48 +162,48 @@
} }
}, },
{ {
title: '模板CODE', title: 'templateCode',
align: "center", align: "center",
dataIndex: 'templateCode' dataIndex: 'templateCode'
}, },
{ {
title: '模板标题', title: 'templateTitle',
align: "center", align: "center",
dataIndex: 'templateName' dataIndex: 'templateName'
}, },
{ {
title: '模板内容', title: 'templateContent',
align: "center", align: "center",
dataIndex: 'templateContent', dataIndex: 'templateContent',
scopedSlots: {customRender: 'templateContent'}, scopedSlots: {customRender: 'templateContent'},
}, },
{ {
title: '模板类型', title: 'templateType',
align: "center", align: "center",
dataIndex: 'templateType', dataIndex: 'templateType',
customRender: function (text) { customRender: function (text) {
if(text=='1') { if(text=='1') {
return "文本"; return "TEXT";
} }
if(text=='2') { if(text=='2') {
return "富文本"; return "Rich text";
} }
} }
}, },
{ {
title: '是否应用', title: 'useStatus',
align: "center", align: "center",
dataIndex: 'useStatus', dataIndex: 'useStatus',
customRender: function (text) { customRender: function (text) {
if(text=='1') { if(text=='1') {
return "是"; return "YES";
}else{ }else{
return '否' return 'NO'
} }
} }
}, },
{ {
title: '操作', title: 'action',
dataIndex: 'action', dataIndex: 'action',
align: "center", align: "center",
scopedSlots: {customRender: 'action'}, scopedSlots: {customRender: 'action'},
@ -226,7 +226,7 @@
methods: { methods: {
handleTest(record){ handleTest(record){
this.$refs.testModal.open(record); this.$refs.testModal.open(record);
this.$refs.testModal.title = "发送测试"; this.$refs.testModal.title = "Send test";
}, },
//update-begin-author:taoyan date:2022-7-8 for: 修改应用状态 //update-begin-author:taoyan date:2022-7-8 for: 修改应用状态
updateUseStatus(record, useStatus){ updateUseStatus(record, useStatus){
@ -251,7 +251,7 @@
}, },
handleMyEdit(record){ handleMyEdit(record){
if(record.useStatus == '1'){ if(record.useStatus == '1'){
this.$message.warning('此模板已被应用，禁止编辑!'); this.$message.warning('This template has been applied and editing is prohibited!');
}else{ }else{
this.handleEdit(record); this.handleEdit(record);
} }
@ -260,11 +260,11 @@
handleDelete: function (record) { handleDelete: function (record) {
if(!this.url.delete){ if(!this.url.delete){
this.$message.error("请设置url.delete属性!") this.$message.error("Please set the url.delete property!")
return return
} }
if(record.useStatus=='1'){ if(record.useStatus=='1'){
this.$message.error("该模板已被应用禁止删除!") this.$message.error("The template is prohibited from being deleted by the application!")
return return
} }
let id = record.id; let id = record.id;

38
src/views/modules/message/modules/SysMessageModal.vue
View File

@ -15,70 +15,70 @@
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="消息标题"> label="Message header">
<a-input placeholder="请输入消息标题" v-decorator="['esTitle', {}]"/> <a-input placeholder="Please enter the message title" v-decorator="['esTitle', {}]"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="发送内容"> label="Send content">
<a-input placeholder="请输入发送内容" v-decorator="['esContent', {}]"/> <a-input placeholder="Please enter the content to send" v-decorator="['esContent', {}]"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="发送所需参数"> label="Send required parameters">
<a-input placeholder="请输入发送所需参数Json格式" v-decorator="['esParam', {}]"/> <a-input placeholder="Please enter the required parameters in Json format" v-decorator="['esParam', {}]"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="接收人"> label="receiver">
<a-input placeholder="请输入接收人" v-decorator="['esReceiver', {}]"/> <a-input placeholder="Please enter the recipient" v-decorator="['esReceiver', {}]"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="发送方式"> label="Sending mode">
<j-dict-select-tag :triggerChange="true" dictCode="msgType" v-decorator="[ 'esType', {}]" placeholder="请选择发送方式"> <j-dict-select-tag :triggerChange="true" dictCode="msgType" v-decorator="[ 'esType', {}]" placeholder="Please select a sending method">
</j-dict-select-tag> </j-dict-select-tag>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="发送时间"> label="Sending time">
<a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'esSendTime', {}]"/> <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'esSendTime', {}]"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="发送状态"> label="Sending state">
<j-dict-select-tag :triggerChange="true" dictCode="msgSendStatus" v-decorator="[ 'esSendStatus', {}]" placeholder="请选择发送状态"> <j-dict-select-tag :triggerChange="true" dictCode="msgSendStatus" v-decorator="[ 'esSendStatus', {}]" placeholder="Please select Send status">
</j-dict-select-tag> </j-dict-select-tag>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="发送次数"> label="Transmission times">
<a-input-number v-decorator="[ 'esSendNum', {}]"/> <a-input-number v-decorator="[ 'esSendNum', {}]"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="发送失败原因"> label="Cause of sending failure">
<a-input v-decorator="['esResult', {}]"/> <a-input v-decorator="['esResult', {}]"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="备注"> label="remark">
<a-input v-decorator="['remark', {}]"/> <a-input v-decorator="['remark', {}]"/>
</a-form-item> </a-form-item>
</a-form> </a-form>
</a-spin> </a-spin>
<div v-show="!disableSubmit"> <div v-show="!disableSubmit">
<a-button style="margin-right: .8rem" @confirm="handleCancel">取消</a-button> <a-button style="margin-right: .8rem" @confirm="handleCancel">Cancel</a-button>
<a-button @click="handleOk" type="primary" :loading="confirmLoading">提交</a-button> <a-button @click="handleOk" type="primary" :loading="confirmLoading">Submit</a-button>
</div> </div>
</a-drawer> </a-drawer>
</template> </template>
@ -92,7 +92,7 @@
name: "SysMessageModal", name: "SysMessageModal",
data() { data() {
return { return {
title: "操作", title: "Operation",
visible: false, visible: false,
model: {}, model: {},
labelCol: { labelCol: {

47
src/views/modules/message/modules/SysMessageTemplateModal.vue
View File

@ -6,70 +6,67 @@
:confirmLoading="confirmLoading" :confirmLoading="confirmLoading"
@ok="handleOk" @ok="handleOk"
@cancel="handleCancel" @cancel="handleCancel"
cancelText="关闭"> cancelText="Cancel">
<a-spin :spinning="confirmLoading"> <a-spin :spinning="confirmLoading">
<a-form :form="form"> <a-form :form="form">
<a-row :gutter="{ xs: 8, sm: 16, md: 24, lg: 32 }"> <a-row class="form-row" :gutter="24" >
<a-col :span="12"> <a-col :span="24">
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="模板CODE" label="Template Code"
style="margin-right: -35px"
> >
<a-input <a-input
:disabled="disable" :disabled="disable"
placeholder="请输入模板编码" placeholder="Please enter the template code"
v-decorator="['templateCode', validatorRules.templateCode ]" v-decorator="['templateCode', validatorRules.templateCode ]"
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="24">
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="模板类型"> label="Template type">
<j-dict-select-tag @change="handleChangeTemplateType" :triggerChange="true" dictCode="msgType" v-decorator="['templateType', validatorRules.templateType ]" placeholder="请选择模板类型"> <j-dict-select-tag @change="handleChangeTemplateType" :triggerChange="true" dictCode="msgType" v-decorator="['templateType', validatorRules.templateType ]" placeholder="Please select a template type">
</j-dict-select-tag> </j-dict-select-tag>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24" > <a-row class="form-row" :gutter="24" >
<a-col :span="24" pull="2"> <a-col :span="24">
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="模板标题" label="Template title">
style="margin-left: -15px">
<a-input <a-input
placeholder="请输入模板标题" placeholder="Please enter the template title"
v-decorator="['templateName', validatorRules.templateName]" v-decorator="['templateName', validatorRules.templateName]"
style="width: 122%" style="width: 100%"
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24" > <a-row class="form-row" :gutter="24" >
<a-col :span="24" pull="2"> <a-col :span="24">
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="是否应用" label="useStatus"
style="margin-left: -15px"> style="margin-left: -15px">
<j-switch v-decorator="['useStatus', validatorRules.useStatus]" :options="['1', '0']"></j-switch> <j-switch v-decorator="['useStatus', validatorRules.useStatus]" :options="['1', '0']"></j-switch>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="24" pull="4"> <a-col :span="24">
<a-form-item <a-form-item
v-show="!useEditor" v-show="!useEditor"
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="模板内容" label="Template content">
style="margin-left: 4px;width: 126%"> <a-textarea placeholder="Please enter the template content" v-decorator="['templateContent', validatorRules.templateContent ]" :autosize="{ minRows: 8, maxRows: 8 }"/>
<a-textarea placeholder="请输入模板内容" v-decorator="['templateContent', validatorRules.templateContent ]" :autosize="{ minRows: 8, maxRows: 8 }"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -79,7 +76,7 @@
v-show="useEditor" v-show="useEditor"
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="模板内容" label="Template content"
style="margin-left: 4px;width: 126%"> style="margin-left: 4px;width: 126%">
<j-editor v-model="templateEditorContent"></j-editor> <j-editor v-model="templateEditorContent"></j-editor>
</a-form-item> </a-form-item>
@ -106,7 +103,7 @@
}, },
data() { data() {
return { return {
title: "操作", title: "Operation",
visible: false, visible: false,
disable: true, disable: true,
model: {}, model: {},
@ -121,11 +118,11 @@
confirmLoading: false, confirmLoading: false,
form: this.$form.createForm(this), form: this.$form.createForm(this),
validatorRules: { validatorRules: {
templateCode: {rules: [{required: true, message: '请输入模板CODE!' },{validator: this.validateTemplateCode}]}, templateCode: {rules: [{required: true, message: 'Please enter the template Code!' },{validator: this.validateTemplateCode}]},
templateName: {rules: [{required: true, message: '请输入模板标题!'}]}, templateName: {rules: [{required: true, message: 'Please enter the template title!'}]},
templateContent: {rules: []}, templateContent: {rules: []},
useStatus:{rules: []}, useStatus:{rules: []},
templateType: {rules: [{required: true, message: '请输入模板类型!'}]}, templateType: {rules: [{required: true, message: 'Please enter the template type!'}]},
}, },
url: { url: {
add: "/sys/message/sysMessageTemplate/add", add: "/sys/message/sysMessageTemplate/add",

20
src/views/modules/message/modules/SysMessageTestModal.vue
View File

@ -6,43 +6,43 @@
:confirmLoading="confirmLoading" :confirmLoading="confirmLoading"
@ok="handleOk" @ok="handleOk"
@cancel="handleCancel" @cancel="handleCancel"
cancelText="关闭"> cancelText="Cancel">
<a-spin :spinning="confirmLoading"> <a-spin :spinning="confirmLoading">
<a-form> <a-form>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="模板标题"> label="Template title">
<a-input disabled v-model="templateName"/> <a-input disabled v-model="templateName"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="模板内容"> label="Template content">
<a-textarea disabled v-model="templateContent" :autosize="{ minRows: 5, maxRows: 8 }"/> <a-textarea disabled v-model="templateContent" :autosize="{ minRows: 5, maxRows: 8 }"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="测试数据"> label="Test data">
<a-textarea placeholder="请输入json格式测试数据" v-model="testData" :autosize="{ minRows: 5, maxRows: 8 }"/> <a-textarea placeholder="Please enter the test data in json format" v-model="testData" :autosize="{ minRows: 5, maxRows: 8 }"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="消息类型"> label="Message type">
<j-dict-select-tag <j-dict-select-tag
v-model="msgType" v-model="msgType"
type="radio" type="radio"
placeholder="请选择消息类型" placeholder="Please select a message type"
dictCode="messageType"/> dictCode="messageType"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="消息接收方"> label="Message receiver">
<j-select-user-by-dep placeholder="请选择消息接收方" v-model="receiver"></j-select-user-by-dep> <j-select-user-by-dep placeholder="Please select a message recipient" v-model="receiver"></j-select-user-by-dep>
</a-form-item> </a-form-item>
</a-form> </a-form>
</a-spin> </a-spin>
@ -60,7 +60,7 @@
}, },
data() { data() {
return { return {
title: "操作", title: "Operation",
visible: false, visible: false,
model: {}, model: {},
labelCol: { labelCol: {