更新流程，优化菜单名称
This commit is contained in:
12888491
parent
44a8f9fd49
commit
05dd263b76
1
.gitignore
vendored
1
.gitignore
vendored
@ -341,3 +341,4 @@ ASALocalRun/
|
||||
healthchecksdb
|
||||
/WaterCloud.Web/DataProtection
|
||||
/操作手册
|
||||
/WaterCloud.WebApi/DataProtection/key-b88755a6-8db4-4ef4-9e6f-0632160bc5f6.xml
|
||||
|
||||
@ -3,60 +3,11 @@
|
||||
Layout = "~/Views/Shared/_Form.cshtml";
|
||||
}
|
||||
<link href="~/js/lay-module/flow/WaterFlow.css" rel="stylesheet" />
|
||||
@*<link href="~/lib/ueditor/formdesign/bootstrap/css/bootstrap.css" rel="stylesheet" />*@
|
||||
<style>
|
||||
|
||||
/* 图片上传 */
|
||||
.uploader-list {
|
||||
margin-left: -15px;
|
||||
}
|
||||
|
||||
.uploader-list .info {
|
||||
position: relative;
|
||||
margin-top: -25px;
|
||||
background-color: black;
|
||||
color: white;
|
||||
filter: alpha(Opacity=80);
|
||||
-moz-opacity: 0.5;
|
||||
opacity: 0.5;
|
||||
width: 100px;
|
||||
height: 25px;
|
||||
text-align: center;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.uploader-list .handle {
|
||||
position: relative;
|
||||
background-color: black;
|
||||
color: white;
|
||||
filter: alpha(Opacity=80);
|
||||
-moz-opacity: 0.5;
|
||||
opacity: 0.5;
|
||||
width: 100px;
|
||||
text-align: right;
|
||||
height: 18px;
|
||||
margin-bottom: -18px;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.uploader-list .handle i {
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.uploader-list .handle i:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.uploader-list .file-iteme {
|
||||
margin: 12px 0 0 15px;
|
||||
padding: 1px;
|
||||
float: left;
|
||||
}
|
||||
</style>
|
||||
<link href="~/js/lay-module/formDesigner/formPreview.css" rel="stylesheet" />
|
||||
<script>
|
||||
//只读参数
|
||||
var readonly = true;
|
||||
layui.use(['form', 'layer', 'jquery', 'waterflow', 'flowlayout', 'common', 'element', 'formPreview', 'optimizeSelectOption'], function () {
|
||||
layui.use(['form', 'layer', 'jquery', 'waterflow', 'flowlayout', 'common','formPreview', 'element', 'optimizeSelectOption'], function () {
|
||||
var form = layui.form, element = layui.element,
|
||||
layer = layui.layer,
|
||||
common = layui.common,
|
||||
@ -171,7 +122,8 @@
|
||||
//表单设计器
|
||||
formPreview.render({
|
||||
data: JSON.parse(data.F_Content),
|
||||
elem: '#frmPreview'
|
||||
elem: '#frmPreview',
|
||||
readonly:true
|
||||
});
|
||||
}
|
||||
else {
|
||||
@ -204,9 +156,14 @@
|
||||
<div class="layui-tab-content">
|
||||
<input type="text" name="valueList" id="valueList" class="layui-hide" hidden>
|
||||
<div class="layui-tab-item layui-fluid layui-show">
|
||||
<div id="frmPreview"></div>
|
||||
<form class="layui-form layuimini-form">
|
||||
<div class="layui-form-item">
|
||||
<fieldset class="layui-elem-field" style="padding-top:15px;">
|
||||
<div id="frmPreview"></div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="layui-tab-item">
|
||||
<div id="flowPanel" style=""></div>
|
||||
</div>
|
||||
|
||||
@ -3,61 +3,12 @@
|
||||
Layout = "~/Views/Shared/_Form.cshtml";
|
||||
}
|
||||
<link href="~/js/lay-module/flow/WaterFlow.css" rel="stylesheet" />
|
||||
@*<link href="/css/formpreview.css" rel="stylesheet" />*@
|
||||
<link href="~/css/stepcss.css" rel="stylesheet" />
|
||||
<style>
|
||||
|
||||
/* 图片上传 */
|
||||
.uploader-list {
|
||||
margin-left: -15px;
|
||||
}
|
||||
|
||||
.uploader-list .info {
|
||||
position: relative;
|
||||
margin-top: -25px;
|
||||
background-color: black;
|
||||
color: white;
|
||||
filter: alpha(Opacity=80);
|
||||
-moz-opacity: 0.5;
|
||||
opacity: 0.5;
|
||||
width: 100px;
|
||||
height: 25px;
|
||||
text-align: center;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.uploader-list .handle {
|
||||
position: relative;
|
||||
background-color: black;
|
||||
color: white;
|
||||
filter: alpha(Opacity=80);
|
||||
-moz-opacity: 0.5;
|
||||
opacity: 0.5;
|
||||
width: 100px;
|
||||
text-align: right;
|
||||
height: 18px;
|
||||
margin-bottom: -18px;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.uploader-list .handle i {
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.uploader-list .handle i:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.uploader-list .file-iteme {
|
||||
margin: 12px 0 0 15px;
|
||||
padding: 1px;
|
||||
float: left;
|
||||
}
|
||||
</style>
|
||||
<link href="~/js/lay-module/formDesigner/formPreview.css" rel="stylesheet" />
|
||||
<script>
|
||||
//只读参数
|
||||
var readonly = true;
|
||||
layui.use(['form', 'layer', 'element', 'jquery', 'table', 'waterflow', 'flowlayout', 'common', 'step', 'formPreview', 'optimizeSelectOption'], function () {
|
||||
layui.use(['form', 'layer', 'element', 'jquery', 'table', 'waterflow', 'flowlayout', 'common', 'step','formPreview', 'optimizeSelectOption'], function () {
|
||||
var form = layui.form,
|
||||
element = layui.element,
|
||||
layer = layui.layer,
|
||||
@ -127,7 +78,8 @@
|
||||
//表单设计器
|
||||
formPreview.render({
|
||||
data: JSON.parse(data.F_Content),
|
||||
elem: '#frmPreview'
|
||||
elem: '#frmPreview',
|
||||
readonly:true
|
||||
});
|
||||
}
|
||||
else {
|
||||
@ -396,9 +348,11 @@
|
||||
<option value="" selected>请选择</option>
|
||||
</select>
|
||||
</div>
|
||||
<fieldset class="layui-elem-field">
|
||||
<div id="frmPreview"></div>
|
||||
</fieldset>
|
||||
<div class="layui-form-item">
|
||||
<fieldset class="layui-elem-field" style="padding-top:15px;">
|
||||
<div id="frmPreview"></div>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="form-group-bottom text-right">
|
||||
<div class="layui-input-block">
|
||||
<button type="button" class="layui-btn layui-btn-primary pre">上一步</button>
|
||||
|
||||
@ -42,10 +42,10 @@
|
||||
</fieldset>
|
||||
<script type="text/html" id="toolbarDemo">
|
||||
<div class="layui-btn-container" id="toolbar">
|
||||
<button id="NF-add" name="NF-add" authorize class="layui-btn layui-btn-sm data-add-btn" lay-event="add"><i class="layui-icon"></i>新增</button>
|
||||
<button id="NF-edit" name="NF-edit" authorize class="layui-btn layui-btn-sm layui-btn-warm data-edit-btn layui-hide" lay-event="edit"><i class="layui-icon"></i>修改</button>
|
||||
<button id="NF-delete" name="NF-delete" authorize class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn layui-hide" lay-event="delete"> <i class="layui-icon"></i>删除</button>
|
||||
<button id="NF-details" name="NF-details" authorize class="layui-btn layui-btn-sm layui-btn-normal data-info-btn layui-hide" lay-event="details"> <i class="layui-icon"></i>预览</button>
|
||||
<button id="NF-add" name="NF-add" authorize class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon"></i>新增</button>
|
||||
<button id="NF-edit" name="NF-edit" authorize class="layui-btn layui-btn-sm layui-btn-warm layui-hide" lay-event="edit"><i class="layui-icon"></i>修改</button>
|
||||
<button id="NF-delete" name="NF-delete" authorize class="layui-btn layui-btn-sm layui-btn-danger layui-hide" lay-event="delete"> <i class="layui-icon"></i>删除</button>
|
||||
<button id="NF-details" name="NF-details" authorize class="layui-btn layui-btn-sm layui-btn-normal layui-hide" lay-event="details"> <i class="layui-icon"></i>预览</button>
|
||||
</div>
|
||||
</script>
|
||||
<table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
|
||||
@ -64,29 +64,28 @@
|
||||
var ItemId;
|
||||
//权限控制(js是值传递)
|
||||
toolbarDemo.innerHTML = common.authorizeButtonNew(toolbarDemo.innerHTML);
|
||||
var rendertree = common.rendertreetable({
|
||||
var options = {
|
||||
elem: '#currentTable',
|
||||
id: 'currentTable',
|
||||
url: '/SystemOrganize/Organize/GetTreeGridJson',
|
||||
defaultToolbar: [],
|
||||
toolbar: false,
|
||||
search: false,
|
||||
height: 'full-110',
|
||||
treeColIndex: 0,
|
||||
height: 'full-130',
|
||||
treeIdName: 'F_Id', // id字段名称
|
||||
treePidName: 'F_ParentId', // pid字段名称
|
||||
cols: [[
|
||||
{ field: 'F_FullName', title: '部门名称', width: 250 },
|
||||
{ field: 'F_EnCode', title: '部门编号', width: 180 },
|
||||
{ field: 'F_FullName', title: '部门名称', width: 250, filter: true },
|
||||
{ field: 'F_EnCode', title: '部门编号', width: 180, filter: true },
|
||||
{
|
||||
field: 'F_CategoryId', title: '部门分类', width: 120,
|
||||
field: 'F_CategoryId', title: '部门分类', width: 120, filter: true,
|
||||
templet: function (d) {
|
||||
return top.clients.dataItems["OrganizeCategory"][d.F_CategoryId] == null ? "" : top.clients.dataItems["OrganizeCategory"][d.F_CategoryId];
|
||||
}
|
||||
}
|
||||
]],
|
||||
done: function () {
|
||||
//展开全部
|
||||
rendertree.expandAll();
|
||||
}
|
||||
});
|
||||
};
|
||||
commonTable.rendertreetable(options);
|
||||
commonTable.rendertable({
|
||||
elem: '#currentTableId',
|
||||
id: 'currentTableId',
|
||||
@ -99,7 +98,8 @@
|
||||
, last: false //不显示尾页
|
||||
},
|
||||
search: false,
|
||||
height: 'full-160',
|
||||
height: 'full-130',
|
||||
autoSort: true,
|
||||
cols: [[
|
||||
{ type: "radio", width: 50 },
|
||||
{ field: 'F_SchemeCode', title: '流程编号', width: 150, sort: true },
|
||||
@ -118,7 +118,14 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'F_CreatorTime', title: '创建时间', width: 160
|
||||
field: 'F_CreatorTime', title: '创建时间', width: 120,
|
||||
templet: function (d) {
|
||||
if (d.F_CreatorTime) {
|
||||
var time = new Date(d.F_CreatorTime);
|
||||
return time.Format("yyyy-MM-dd");
|
||||
}
|
||||
return '';
|
||||
}
|
||||
},
|
||||
]]
|
||||
});
|
||||
@ -126,9 +133,8 @@
|
||||
form.on('submit(temp-search-btn)', function (data) {
|
||||
var queryJson = data.field.temp_keyword;
|
||||
//执行搜索重载
|
||||
common.reloadtreetable(rendertree, {
|
||||
where: { keyword: queryJson },
|
||||
});
|
||||
options.where = { keyword: queryJson };
|
||||
commonTable.reloadtabletree(options);
|
||||
itemId = null;
|
||||
return false;
|
||||
});
|
||||
@ -151,7 +157,7 @@
|
||||
//行点击事件监听，控制按钮显示
|
||||
var oneList = ["NF-edit", "NF-delete", "NF-details"];//选择1条显示
|
||||
commonTable.tableRowClick("radio", "currentTableFilter", "currentTableId", oneList);
|
||||
treeTable.on('row(currentTable)', function (obj) {
|
||||
table.on('row(currentTable)', function (obj) {
|
||||
obj.tr.addClass("layui-table-click").siblings().removeClass("layui-table-click");
|
||||
ItemId = obj.data.F_Id;
|
||||
$('button[lay-filter="data-search-btn"]').click();//按钮刷新
|
||||
|
||||
@ -221,12 +221,11 @@
|
||||
var form = layui.form,
|
||||
$ = layui.$,
|
||||
common = layui.common;
|
||||
var parentform = window.name;
|
||||
//不同弹窗
|
||||
if (fields == '申请人') {
|
||||
common.modalOpen({
|
||||
title: "选择用户",
|
||||
url: "/SystemOrganize/User/AddForm?parentform=" + parentform + "&name=" + "ComparesName" + data + "&value=" + "ComparesValue" + data,
|
||||
url: "/SystemOrganize/User/AddForm?name=" + "ComparesName" + data + "&value=" + "ComparesValue" + data,
|
||||
width: "650px",
|
||||
height: "600px",
|
||||
});
|
||||
@ -234,7 +233,7 @@
|
||||
else if (fields == '所属部门') {
|
||||
common.modalOpen({
|
||||
title: "选择组织",
|
||||
url: "/SystemOrganize/Organize/AddForm?parentform=" + parentform + "&name=" + "ComparesName" + data + "&value=" + "ComparesValue" + data,
|
||||
url: "/SystemOrganize/Organize/AddForm?name=" + "ComparesName" + data + "&value=" + "ComparesValue" + data,
|
||||
width: "650px",
|
||||
height: "600px",
|
||||
});
|
||||
|
||||
@ -164,7 +164,7 @@
|
||||
field: 'F_CompanyName', title: '公司名称', width: 120, sort: true
|
||||
},
|
||||
{
|
||||
field: 'F_DepartmentName', title: '部门名称', width: 120, sort: true
|
||||
field: 'F_OrganizeName', title: '部门名称', width: 120, sort: true
|
||||
},
|
||||
{
|
||||
field: 'F_EnabledMark', title: '状态', width: 100, sort: true,
|
||||
|
||||
@ -2,68 +2,27 @@
|
||||
ViewBag.Title = "Form";
|
||||
Layout = "~/Views/Shared/_Form.cshtml";
|
||||
}
|
||||
<style>
|
||||
|
||||
/* 图片上传 */
|
||||
.uploader-list {
|
||||
margin-left: -15px;
|
||||
}
|
||||
|
||||
.uploader-list .info {
|
||||
position: relative;
|
||||
margin-top: -25px;
|
||||
background-color: black;
|
||||
color: white;
|
||||
filter: alpha(Opacity=80);
|
||||
-moz-opacity: 0.5;
|
||||
opacity: 0.5;
|
||||
width: 100px;
|
||||
height: 25px;
|
||||
text-align: center;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.uploader-list .handle {
|
||||
position: relative;
|
||||
background-color: black;
|
||||
color: white;
|
||||
filter: alpha(Opacity=80);
|
||||
-moz-opacity: 0.5;
|
||||
opacity: 0.5;
|
||||
width: 100px;
|
||||
text-align: right;
|
||||
height: 18px;
|
||||
margin-bottom: -18px;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.uploader-list .handle i {
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.uploader-list .handle i:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.uploader-list .file-iteme {
|
||||
margin: 12px 0 0 15px;
|
||||
padding: 1px;
|
||||
float: left;
|
||||
}
|
||||
</style>
|
||||
<link href="~/js/lay-module/formDesigner/formPreview.css" rel="stylesheet" />
|
||||
<div class="layuimini-container">
|
||||
<div class="layuimini-main">
|
||||
<div id="frmPreview"></div>
|
||||
<form class="layui-form layuimini-form">
|
||||
<div class="layui-form-item">
|
||||
<fieldset class="layui-elem-field" style="padding-top:15px;">
|
||||
<div id="frmPreview"></div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
//只读参数
|
||||
var readonly = true;
|
||||
layui.use(['jquery', 'form', 'common', 'formPreview'], function () {
|
||||
var dataJson=[];
|
||||
layui.use(['jquery', 'form', 'common','formPreview'], function () {
|
||||
var form = layui.form,
|
||||
common = layui.common,
|
||||
$ = layui.jquery,
|
||||
formPreview = layui.formPreview;
|
||||
formPreview = layui.formPreview,
|
||||
$ = layui.jquery;
|
||||
var keyValue = $.request("keyValue");
|
||||
$(function () {
|
||||
common.ajax({
|
||||
@ -77,11 +36,12 @@
|
||||
}
|
||||
else {
|
||||
//表单设计器
|
||||
formPreview.render({
|
||||
data: JSON.parse(data.F_Content),
|
||||
elem: '#frmPreview'
|
||||
dataJson = JSON.parse(data.F_Content);
|
||||
renderForm = formPreview.render({
|
||||
elem: '#frmPreview',
|
||||
data: dataJson,
|
||||
readonly: true
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Layout = "~/Views/Shared/_Form.cshtml";
|
||||
}
|
||||
<link href="~/css/stepcss.css" rel="stylesheet" />
|
||||
<link href="~/js/lay-module/formDesigner/formDesigner.css" rel="stylesheet" />
|
||||
<link href="~/js/lay-module/formDesigner/formPreview.css" rel="stylesheet" />
|
||||
<div class="layuimini-container">
|
||||
<div class="layuimini-main">
|
||||
<div class="layui-carousel" id="adminform" lay-filter="adminform">
|
||||
@ -72,9 +72,9 @@
|
||||
</div>
|
||||
<div>
|
||||
<form class="layui-form layuimini-form">
|
||||
<div id="commonform">
|
||||
<div id="formdesigner">
|
||||
</div>
|
||||
<div id="commonform" >
|
||||
<iframe src="~/page/designer.html" id="formdesigner" onload="setIframeHeight(this)"style="width:100%;min-height:400px">
|
||||
</iframe>
|
||||
</div>
|
||||
<fieldset class="layui-elem-field">
|
||||
<div id="frmPreview"></div>
|
||||
@ -93,21 +93,16 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--建议手动加在语言，避免在ie下有时因为加载语言失败导致编辑器加载失败-->
|
||||
<!--这里加载的语言文件会覆盖你在配置项目里添加的语言类型，比如你在配置项目里配置的是英文，这里加载的中文，那最后就是中文-->
|
||||
<script type="text/javascript" charset="utf-8" src="~/js/lay-module/formDesigner/Sortable/Sortable.min.js"></script>
|
||||
<script type="text/javascript" charset="utf-8" src="~/js/lay-module/htmlformat.js"></script>
|
||||
<script type="text/javascript" charset="utf-8" src="~/js/lay-module/jsformat.js"></script>
|
||||
<script>
|
||||
//只读参数
|
||||
var designJson = {};
|
||||
var readonly = true;
|
||||
layui.use(['jquery', 'form', 'common', 'element', 'step', 'formDesigner'], function () {
|
||||
layui.use(['jquery', 'form', 'common', 'element', 'step'], function () {
|
||||
var form = layui.form,
|
||||
$ = layui.$,
|
||||
common = layui.common,
|
||||
step = layui.step,
|
||||
element = layui.element;
|
||||
var formDesigner = layui.formDesigner;
|
||||
var keyValue = $.request("keyValue");
|
||||
var ItemId = $.request("ItemId");
|
||||
step.render({
|
||||
@ -148,12 +143,8 @@
|
||||
$('#commonform').removeClass('layui-hide');
|
||||
$('#frmPreview').addClass('layui-hide');
|
||||
$('#frmPreview').parent().addClass('layui-hide');
|
||||
//表单设计器
|
||||
formDesigner.render({
|
||||
data: JSON.parse(data.F_Content),
|
||||
elem: '#formdesigner',
|
||||
headerHide: false
|
||||
});
|
||||
designJson=JSON.parse(data.F_Content);
|
||||
$("#formdesigner").attr('src',document.location.origin + '/page/designer.html');
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -162,13 +153,13 @@
|
||||
common.ajax({
|
||||
url: document.location.origin + '/json/demo.json',
|
||||
success: function (result) {
|
||||
formDesigner.render({
|
||||
data: result,
|
||||
elem: '#formdesigner',
|
||||
headerHide: false
|
||||
});
|
||||
designJson = result;
|
||||
}
|
||||
});
|
||||
$('#commonform').removeClass('layui-hide');
|
||||
$('#frmPreview').addClass('layui-hide');
|
||||
$('#frmPreview').parent().addClass('layui-hide');
|
||||
$("#formdesigner").attr('src',document.location.origin + '/page/designer.html');
|
||||
}
|
||||
form.render();
|
||||
});
|
||||
@ -203,6 +194,8 @@
|
||||
form.on('select(WebId)',
|
||||
function (data) {
|
||||
if (!!data.value) {
|
||||
$('#frmPreview').removeClass('layui-hide');
|
||||
$('#commonform').addClass('layui-hide');
|
||||
$("#frmPreview").load(document.location.origin + '/form/' + data.value + '.html');
|
||||
form.render();
|
||||
}
|
||||
@ -232,8 +225,9 @@
|
||||
var formeditor = '';
|
||||
if (postData.F_FrmType != 1) {
|
||||
//获取表单设计器里的内容
|
||||
$('#generateSetValue').click();
|
||||
formeditor = document.getElementById('generate-code-view').value;
|
||||
document.querySelector("iframe").contentWindow.document
|
||||
.getElementsByClassName('saveJson')[0].click();
|
||||
formeditor =window.localStorage.getItem('layui_form_json');
|
||||
if (!formeditor) {
|
||||
common.modalMsg("请编辑设计器", "warning");
|
||||
return false;
|
||||
|
||||
@ -42,10 +42,10 @@
|
||||
</fieldset>
|
||||
<script type="text/html" id="toolbarDemo">
|
||||
<div class="layui-btn-container" id="toolbar">
|
||||
<button id="NF-add" name="NF-add" authorize class="layui-btn layui-btn-sm data-add-btn" lay-event="add"><i class="layui-icon"></i>新增</button>
|
||||
<button id="NF-edit" name="NF-edit" authorize class="layui-btn layui-btn-sm layui-btn-warm data-edit-btn layui-hide" lay-event="edit"><i class="layui-icon"></i>修改</button>
|
||||
<button id="NF-delete" name="NF-delete" authorize class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn layui-hide" lay-event="delete"> <i class="layui-icon"></i>删除</button>
|
||||
<button id="NF-details" name="NF-details" authorize class="layui-btn layui-btn-sm layui-btn-normal data-info-btn layui-hide" lay-event="details"> <i class="layui-icon"></i>预览</button>
|
||||
<button id="NF-add" name="NF-add" authorize class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon"></i>新增</button>
|
||||
<button id="NF-edit" name="NF-edit" authorize class="layui-btn layui-btn-sm layui-btn-warm layui-hide" lay-event="edit"><i class="layui-icon"></i>修改</button>
|
||||
<button id="NF-delete" name="NF-delete" authorize class="layui-btn layui-btn-sm layui-btn-danger layui-hide" lay-event="delete"> <i class="layui-icon"></i>删除</button>
|
||||
<button id="NF-details" name="NF-details" authorize class="layui-btn layui-btn-sm layui-btn-normal layui-hide" lay-event="details"> <i class="layui-icon"></i>预览</button>
|
||||
</div>
|
||||
</script>
|
||||
<table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
|
||||
@ -63,29 +63,28 @@
|
||||
var ItemId;
|
||||
//权限控制(js是值传递)
|
||||
toolbarDemo.innerHTML = common.authorizeButtonNew(toolbarDemo.innerHTML);
|
||||
var rendertree = common.rendertreetable({
|
||||
var options = {
|
||||
elem: '#currentTable',
|
||||
id: 'currentTable',
|
||||
url: '/SystemOrganize/Organize/GetTreeGridJson',
|
||||
defaultToolbar: [],
|
||||
toolbar: false,
|
||||
search: false,
|
||||
height: 'full-110',
|
||||
treeColIndex: 0,
|
||||
height: 'full-130',
|
||||
treeIdName: 'F_Id', // id字段名称
|
||||
treePidName: 'F_ParentId', // pid字段名称
|
||||
cols: [[
|
||||
{ field: 'F_FullName', title: '部门名称', width: 250 },
|
||||
{ field: 'F_EnCode', title: '部门编号', width: 180 },
|
||||
{ field: 'F_FullName', title: '部门名称', width: 250, filter: true },
|
||||
{ field: 'F_EnCode', title: '部门编号', width: 180, filter: true},
|
||||
{
|
||||
field: 'F_CategoryId', title: '部门分类', width: 120,
|
||||
field: 'F_CategoryId', title: '部门分类', width: 120, filter: true,
|
||||
templet: function (d) {
|
||||
return top.clients.dataItems["OrganizeCategory"][d.F_CategoryId] == null ? "" : top.clients.dataItems["OrganizeCategory"][d.F_CategoryId];
|
||||
}
|
||||
}
|
||||
]],
|
||||
done: function () {
|
||||
//展开全部
|
||||
rendertree.expandAll();
|
||||
}
|
||||
});
|
||||
};
|
||||
commonTable.rendertreetable(options);
|
||||
commonTable.rendertable({
|
||||
elem: '#currentTableId',
|
||||
id: 'currentTableId',
|
||||
@ -98,7 +97,8 @@
|
||||
, last: false //不显示尾页
|
||||
},
|
||||
search:false,
|
||||
height: 'full-160',
|
||||
height: 'full-130',
|
||||
autoSort: true,
|
||||
cols: [[
|
||||
{ type: "radio", width: 50 },
|
||||
{ field: 'F_Name', title: '表单名称', width: 150, sort: true },
|
||||
@ -120,7 +120,14 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'F_CreatorTime', title: '创建时间', width: 160, sort: true
|
||||
field: 'F_CreatorTime', title: '创建时间', width: 120, sort: true,
|
||||
templet: function (d) {
|
||||
if (d.F_CreatorTime) {
|
||||
var time = new Date(d.F_CreatorTime);
|
||||
return time.Format("yyyy-MM-dd");
|
||||
}
|
||||
return '';
|
||||
}
|
||||
},
|
||||
|
||||
]]
|
||||
@ -129,9 +136,8 @@
|
||||
form.on('submit(temp-search-btn)', function (data) {
|
||||
var queryJson = data.field.temp_keyword;
|
||||
//执行搜索重载
|
||||
common.reloadtreetable(rendertree, {
|
||||
where: { keyword: queryJson },
|
||||
});
|
||||
options.where = { keyword: queryJson };
|
||||
commonTable.reloadtabletree(options);
|
||||
itemId = null;
|
||||
return false;
|
||||
});
|
||||
@ -149,7 +155,7 @@
|
||||
return false;
|
||||
});
|
||||
wcLoading.close();
|
||||
treeTable.on('row(currentTable)', function (obj) {
|
||||
table.on('row(currentTable)', function (obj) {
|
||||
obj.tr.addClass("layui-table-click").siblings().removeClass("layui-table-click");
|
||||
ItemId = obj.data.F_Id;
|
||||
$('button[lay-filter="data-search-btn"]').click();//按钮刷新
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -2320,11 +2320,11 @@ CREATE TABLE `sys_module` (
|
||||
-- Records of sys_module
|
||||
-- ----------------------------
|
||||
INSERT INTO `sys_module` VALUES ('01849cc9-c6da-4184-92f8-34875dac1d42', '462027E0-0848-41DD-BCC3-025DCAE65555', 2, 'CodeGenerator', '代码生成', 'fa fa-code', '/SystemManage/CodeGenerator/Index', 'iframe', 1, 0, 0, 0, 0, 0, 2, 0, 1, '', '2020-05-06 13:11:32', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', '2020-06-16 09:27:33', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, 0, NULL);
|
||||
INSERT INTO `sys_module` VALUES ('08d92a3f-bdb2-42be-89c7-fae5d3a4fec3', '83e2713c-3b2b-4795-8e48-646785a1936b', 3, 'EqpPqcCheckItem', '设备点检项维护', 'fa fa-cc-diners-club', '/EquipmentManage/EqpPqcCheckItem/Index', 'iframe', 1, 0, 0, 0, 0, 0, 5, 0, 1, '', '2021-06-08 13:39:10', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, NULL, NULL, 0, '');
|
||||
INSERT INTO `sys_module` VALUES ('08d92a3f-bdb2-42be-89c7-fae5d3a4fec3', '83e2713c-3b2b-4795-8e48-646785a1936b', 3, 'EqpPqcCheckItem', '设备点检项', 'fa fa-cc-diners-club', '/EquipmentManage/EqpPqcCheckItem/Index', 'iframe', 1, 0, 0, 0, 0, 0, 5, 0, 1, '', '2021-06-08 13:39:10', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', '2022-10-24 13:40:34', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, 0, '');
|
||||
INSERT INTO `sys_module` VALUES ('08d92af0-e091-40c3-8a90-914a3266dafc', '83e2713c-3b2b-4795-8e48-646785a1936b', 3, 'EqpPqcCheckMD', '设备日点检', 'fa fa-adjust', '/EquipmentManage/EqpPqcCheckMD/Index', 'iframe', 1, 0, 0, 0, 0, 0, 6, 0, 1, '', '2021-06-09 10:47:10', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, NULL, NULL, 0, '');
|
||||
INSERT INTO `sys_module` VALUES ('08d92be4-74ba-4edf-8357-49547cae7fbc', '83e2713c-3b2b-4795-8e48-646785a1936b', 3, 'EqpStopRecord', '设备停机', 'fa fa-exclamation-triangle', '/EquipmentManage/EqpStopRecord/Index', 'iframe', 1, 0, 0, 0, 0, 0, 7, 0, 1, '', '2021-06-10 15:50:46', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', '2021-08-27 10:12:23', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, 0, '');
|
||||
INSERT INTO `sys_module` VALUES ('08d92fa2-7423-43dc-8839-359e00c53878', '08d935e2-5205-4f27-8a80-331f2856ee0e', 3, 'WorkPlan', '生产计划', 'fa fa-paper-plane-o', '/ProcessManage/WorkPlan/Index', 'iframe', 1, 0, 0, 0, 0, 0, 0, 0, 1, '', '2021-06-15 10:08:23', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', '2021-06-23 09:04:03', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, 0, '');
|
||||
INSERT INTO `sys_module` VALUES ('08d92fb7-7754-4c3b-8341-c60bc590212d', '83e2713c-3b2b-4795-8e48-646785a1936b', 3, 'EqpRepair', '设备维修记录表', NULL, '/EquipmentManage/EqpRepair/Index', 'iframe', 1, 0, 0, 0, 0, 0, 8, 0, 1, NULL, '2021-06-15 12:38:48', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, NULL, NULL, 0, NULL);
|
||||
INSERT INTO `sys_module` VALUES ('08d92fb7-7754-4c3b-8341-c60bc590212d', '83e2713c-3b2b-4795-8e48-646785a1936b', 3, 'EqpRepair', '设备维修记录', 'fa fa-bitbucket-square', '/EquipmentManage/EqpRepair/Index', 'iframe', 1, 0, 0, 0, 0, 0, 8, 0, 1, '', '2021-06-15 12:38:48', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', '2022-10-24 13:42:00', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, 0, '');
|
||||
INSERT INTO `sys_module` VALUES ('08d93158-2459-490a-868d-a826777f22e4', '101358e6-eb92-431a-9f05-949f05738506', 3, 'TransferBoxBatch', '条码打印', 'fa fa-print', '/MaterialManage/TransferBoxBatch/Index', 'iframe', 1, 0, 0, 0, 0, 0, 101, 0, 1, '', '2021-06-17 14:21:29', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', '2021-07-05 09:03:46', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, 0, '');
|
||||
INSERT INTO `sys_module` VALUES ('08d935e2-5205-4f27-8a80-331f2856ee0e', 'd5be1a41-547d-4001-8ae7-f6568e4d6cfe', 2, 'PlanManage', '计划管理', 'fa fa-paper-plane', NULL, 'expand', 1, 1, 0, 0, 0, 0, 1, 0, 1, '', '2021-06-23 09:00:40', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, NULL, NULL, 0, '');
|
||||
INSERT INTO `sys_module` VALUES ('08d9360c-dd12-43e8-8ebe-0104c5bd3c08', '08d935e2-5205-4f27-8a80-331f2856ee0e', 3, 'InStoragePlan', '采购计划', 'fa fa-adjust', '/PlanManage/InStoragePlan/Index', 'iframe', 1, 0, 0, 0, 0, 0, 1, 0, 1, '', '2021-06-23 14:05:13', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', '2021-06-23 15:04:16', '9f2ec079-7d0f-4fe2-90ab-8b09a8302aba', NULL, NULL, 0, '');
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user