mirror of https://gitee.com/stylefeng/guns
parent
d209613553
commit
d7d3d64f57
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -19,22 +19,16 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util'], function () {
|
||||||
{field: 'messageTitle', sort: true, title: '消息标题'},
|
{field: 'messageTitle', sort: true, title: '消息标题'},
|
||||||
// {field: 'messageType', sort: true, title: '消息类型'},
|
// {field: 'messageType', sort: true, title: '消息类型'},
|
||||||
// {field: 'priorityLevelValue', sort: true, title: '优先级'},
|
// {field: 'priorityLevelValue', sort: true, title: '优先级'},
|
||||||
{field: 'priorityLevel', sort: true, title: '优先级', templet: function (d) {
|
{field: 'priorityLevelValue', sort: true, title: '优先级'},
|
||||||
if (d.priorityLevel === "high") {
|
{field: 'readFlagValue', sort: true, title: '阅读状态'
|
||||||
return "高";
|
// , templet: function (d) {
|
||||||
} else if (d.priorityLevel === "middle") {
|
// if (d.readFlag === 0) {
|
||||||
return "中";
|
// return "未读";
|
||||||
} else {
|
// } else {
|
||||||
return "低";
|
// return "已读";
|
||||||
}
|
// }
|
||||||
}},
|
// }
|
||||||
{field: 'readFlag', sort: true, title: '阅读状态', templet: function (d) {
|
},
|
||||||
if (d.readFlag === 0) {
|
|
||||||
return "未读";
|
|
||||||
} else {
|
|
||||||
return "已读";
|
|
||||||
}
|
|
||||||
}},
|
|
||||||
{field: 'messageSendTime', sort: true, title: '收到时间'},
|
{field: 'messageSendTime', sort: true, title: '收到时间'},
|
||||||
{align: 'center', toolbar: '#tableBar', title: '操作'}
|
{align: 'center', toolbar: '#tableBar', title: '操作'}
|
||||||
]];
|
]];
|
||||||
|
|
|
@ -1,16 +1,17 @@
|
||||||
layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest'], function () {
|
layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest', 'xmSelect'], function () {
|
||||||
var $ = layui.jquery;
|
var $ = layui.jquery;
|
||||||
var HttpRequest = layui.HttpRequest;
|
var HttpRequest = layui.HttpRequest;
|
||||||
var form = layui.form;
|
var form = layui.form;
|
||||||
var admin = layui.admin;
|
var admin = layui.admin;
|
||||||
var layer = layui.layer;
|
var layer = layui.layer;
|
||||||
var laydate = layui.laydate;
|
var laydate = layui.laydate;
|
||||||
|
var xmSelect = layui.xmSelect;
|
||||||
|
|
||||||
|
|
||||||
lay('input.date-input').each(function(){
|
lay('input.date-input').each(function () {
|
||||||
laydate.render({
|
laydate.render({
|
||||||
elem: this
|
elem: this
|
||||||
,trigger: 'click'
|
, trigger: 'click'
|
||||||
, type: 'datetime'
|
, type: 'datetime'
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -34,31 +35,39 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest'], function () {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
/*
|
||||||
//实例化编辑器
|
//实例化编辑器
|
||||||
var ue = UE.getEditor('container', {
|
var ue = UE.getEditor('container', {
|
||||||
enableAutoSave: false,
|
enableAutoSave: false,
|
||||||
autoHeightEnabled: true,
|
autoHeightEnabled: true,
|
||||||
autoFloatEnabled: false,
|
autoFloatEnabled: false,
|
||||||
scaleEnabled: true, //滚动条
|
scaleEnabled: true, //滚动条
|
||||||
initialFrameHeight: 400 //默认的编辑区域高度
|
initialFrameHeight: 400 //默认的编辑区域高度
|
||||||
});
|
});
|
||||||
|
|
||||||
UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl;
|
UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl;
|
||||||
UE.Editor.prototype.getActionUrl = function (action) {
|
UE.Editor.prototype.getActionUrl = function (action) {
|
||||||
if (action === 'uploadimage' || action === 'uploadscrawl' || action === 'uploadimage') {
|
if (action === 'uploadimage' || action === 'uploadscrawl' || action === 'uploadimage') {
|
||||||
return Feng.ctxPath + '/ueditor/imgUpdate';
|
return Feng.ctxPath + '/ueditor/imgUpdate';
|
||||||
} else if (action === 'uploadfile') {
|
} else if (action === 'uploadfile') {
|
||||||
return Feng.ctxPath + '/ueditor/uploadfile';
|
return Feng.ctxPath + '/ueditor/uploadfile';
|
||||||
} else if (action === 'uploadvideo') {
|
} else if (action === 'uploadvideo') {
|
||||||
return Feng.ctxPath + '/ueditor/uploadvideo';
|
return Feng.ctxPath + '/ueditor/uploadvideo';
|
||||||
} else {
|
} else {
|
||||||
return this._bkGetActionUrl.call(this, action);
|
return this._bkGetActionUrl.call(this, action);
|
||||||
}
|
}
|
||||||
};*/
|
};*/
|
||||||
|
|
||||||
|
$("#test").click(function (){
|
||||||
|
var select = userSelect.getValue('valueStr');
|
||||||
|
alert(select)
|
||||||
|
console.log(select)
|
||||||
|
return;
|
||||||
|
})
|
||||||
|
|
||||||
// 表单提交事件
|
// 表单提交事件
|
||||||
form.on('submit(btnSubmit)', function (data) {
|
form.on('submit(btnSubmit)', function (data) {
|
||||||
|
|
||||||
var request = new HttpRequest(Feng.ctxPath + "/sysNotice/add", 'post', function (data) {
|
var request = new HttpRequest(Feng.ctxPath + "/sysNotice/add", 'post', function (data) {
|
||||||
admin.closeThisDialog();
|
admin.closeThisDialog();
|
||||||
Feng.success("添加成功!");
|
Feng.success("添加成功!");
|
||||||
|
@ -74,4 +83,63 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest'], function () {
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
var userSelect = xmSelect.render({
|
||||||
|
el: '#userSelect',
|
||||||
|
autoRow: true,
|
||||||
|
filterable: true,
|
||||||
|
filterMethod: function (val, item, index, prop) {
|
||||||
|
|
||||||
|
if (item.name.indexOf(val) != -1) {//名称中包含的搜索出来
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
// 添加拼音检索
|
||||||
|
try {
|
||||||
|
if (Pinyin.GetJP(item.name).indexOf(val) != -1 || Pinyin.GetQP(item.name).indexOf(val) != -1) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e.message);
|
||||||
|
}
|
||||||
|
return false;//不知道的就不管了
|
||||||
|
},
|
||||||
|
tree: {
|
||||||
|
show: true,
|
||||||
|
showFolderIcon: true,
|
||||||
|
showLine: true,
|
||||||
|
indent: 20,
|
||||||
|
expandedKeys: true,
|
||||||
|
},
|
||||||
|
toolbar: {
|
||||||
|
show: true,
|
||||||
|
list: ['ALL', 'REVERSE', 'CLEAR']
|
||||||
|
},
|
||||||
|
height: 'auto',
|
||||||
|
data: function () {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
name: '销售员', value: -1, disabled: true, children: [
|
||||||
|
{name: '张三1', value: 1, selected: true, children: []},
|
||||||
|
{name: '李四1', value: 2, selected: true},
|
||||||
|
{name: '王五1', value: 3, disabled: true},
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: '奖品', value: -2, children: [
|
||||||
|
{
|
||||||
|
name: '奖品3', value: -3, children: [
|
||||||
|
{name: '苹果3', value: 14, selected: true},
|
||||||
|
{name: '香蕉3', value: 15},
|
||||||
|
{name: '葡萄3', value: 16},
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{name: '苹果2', value: 4, selected: true, disabled: true},
|
||||||
|
{name: '香蕉2', value: 5},
|
||||||
|
{name: '葡萄2', value: 6},
|
||||||
|
]
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
});
|
});
|
|
@ -73,6 +73,9 @@ ${layoutContent}
|
||||||
@if(array.contain(plugins,"tinymce")){
|
@if(array.contain(plugins,"tinymce")){
|
||||||
<script src="${ctxPath}/assets/common/libs/tinymce/tinymce.min.js"></script>
|
<script src="${ctxPath}/assets/common/libs/tinymce/tinymce.min.js"></script>
|
||||||
@}
|
@}
|
||||||
|
@if(array.contain(plugins,"pinyin")){
|
||||||
|
<script type="text/javascript" src="${ctxPath}/assets/common/libs/py/ChinesePY.js"></script>
|
||||||
|
@}
|
||||||
@}
|
@}
|
||||||
|
|
||||||
@if(isNotEmpty(js)){
|
@if(isNotEmpty(js)){
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
<div class="layui-inline layui-col-md12">
|
<div class="layui-inline layui-col-md12">
|
||||||
<label class="layui-form-label">优先级</label>
|
<label class="layui-form-label">优先级</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
<input id="priorityLevel" name="priorityLevel" placeholder="请输入优先级" type="text" class="layui-input" lay-verify="" required viewForm="textinput"/>
|
<input id="priorityLevelValue" name="priorityLevelValue" placeholder="请输入优先级" type="text" class="layui-input" lay-verify="" required viewForm="textinput"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="layui-inline layui-col-md12">
|
<div class="layui-inline layui-col-md12">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
@layout("/layout/_form.html",{js:["/assets/modular/system/notice/notice_add.js"],plugins:["tinymce"]}){
|
@layout("/layout/_form.html",{js:["/assets/modular/system/notice/notice_add.js"],plugins:["tinymce","pinyin"]}){
|
||||||
|
|
||||||
<form class="layui-form" id="noticeForm" lay-filter="noticeForm">
|
<form class="layui-form" id="noticeForm" lay-filter="noticeForm">
|
||||||
<div class="layui-fluid" style="padding-bottom: 75px;">
|
<div class="layui-fluid" style="padding-bottom: 75px;">
|
||||||
|
@ -49,6 +49,12 @@
|
||||||
<input name="noticeScope" placeholder="请输入通知范围" type="text" class="layui-input" lay-verify="" />
|
<input name="noticeScope" placeholder="请输入通知范围" type="text" class="layui-input" lay-verify="" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="layui-inline layui-col-md12">
|
||||||
|
<label class="layui-form-label">通知范围</label>
|
||||||
|
<div class="layui-input-block">
|
||||||
|
<div id="userSelect" class="xm-select"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="layui-inline layui-col-md12">
|
<div class="layui-inline layui-col-md12">
|
||||||
<label class="layui-form-label">通知内容</label>
|
<label class="layui-form-label">通知内容</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
|
@ -63,6 +69,7 @@
|
||||||
<div class="form-group-bottom text-center">
|
<div class="form-group-bottom text-center">
|
||||||
<button class="layui-btn" lay-filter="btnSubmit" lay-submit> 提交 </button>
|
<button class="layui-btn" lay-filter="btnSubmit" lay-submit> 提交 </button>
|
||||||
<button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog"> 取消 </button>
|
<button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog"> 取消 </button>
|
||||||
|
<button id="test" class="layui-btn layui-btn-primary" > 测试 </button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@}
|
@}
|
Loading…
Reference in New Issue