Skip to content

S
Skyeye

冷月半明 / Skyeye
与 Fork 源项目一致

Fork自 doc_wei / Skyeye

通知 1
Star 1
Fork 0
S
Skyeye

体验新版 GitCode，发现更多精彩内容 >>

提交 e4850957 编写于 作者: doc_wei's avatar doc_wei
浏览文件
操作

【ADM】资产来源迁移到数据字典

上级 a22f303b
隐藏空白更改
内联 并排
Showing with 27 addition and 453 deletion
admin-assistant/src/main/resources/template/js/assetManage/assetManageAdd.js
浏览文件 @ e4850957
......@@ -27,19 +27,8 @@ layui.config({
// 资产类型
sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], 'select', "typeId", '', form);
//资产来源
showGrid({
id: "fromId",
url: flowableBasePath + "assetfrom006",
params: {},
pagination: false,
template: getFileContent('tpl/template/select-option-must.tpl'),
ajaxSendLoadBefore: function(hdb){
},
ajaxSendAfter:function (json) {
form.render('select');
}
});
// 资产来源
sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetFrom"]["key"], 'select', "fromId", '', form);
skyeyeEnclosure.init('enclosureUpload');
matchingLanguage();
......
admin-assistant/src/main/resources/template/js/assetManage/assetManageEdit.js
浏览文件 @ e4850957
......@@ -40,20 +40,8 @@ layui.config({
// 资产类型
sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], 'select', "typeId", json.bean.typeId, form);
//资产来源
showGrid({
id: "fromId",
url: flowableBasePath + "assetfrom006",
params: {},
pagination: false,
template: getFileContent('tpl/template/select-option-must.tpl'),
ajaxSendLoadBefore: function(hdb){
},
ajaxSendAfter:function(j){
$("#fromId").val(json.bean.fromId);
form.render('select');
}
});
// 资产来源
sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetFrom"]["key"], 'select', "fromId", json.bean.fromId, form);
// 初始化上传
$("#assetImg").upload(systemCommonUtil.uploadCommon003Config('assetImg', 6, json.bean.assetImg, 1));
......
admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromAdd.js 已删除 100644 → 0
浏览文件 @ a22f303b
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui'], function (exports) {
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
matchingLanguage();
form.render();
form.on('submit(formAddBean)', function (data) {
if (winui.verifyForm(data.elem)) {
var params = {
fromName: $("#fromName").val()
};
AjaxPostUtil.request({url: flowableBasePath + "assetfrom002", params: params, type: 'json', callback: function (json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
return false;
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
});
\ No newline at end of file
admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromEdit.js 已删除 100644 → 0
浏览文件 @ a22f303b
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui'], function (exports) {
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
showGrid({
id: "showForm",
url: flowableBasePath + "assetfrom004",
params: {rowId:parent.rowId},
pagination: false,
template: getFileContent('tpl/assetManageFrom/assetManageFromEditTemplate.tpl'),
ajaxSendLoadBefore: function(hdb){
},
ajaxSendAfter:function (json) {
matchingLanguage();
form.render();
form.on('submit(formEditBean)', function (data) {
if (winui.verifyForm(data.elem)) {
var params = {
rowId: parent.rowId,
fromName: $("#fromName").val()
};
AjaxPostUtil.request({url: flowableBasePath + "assetfrom005", params: params, type: 'json', callback: function (json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
return false;
});
}
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
});
\ No newline at end of file
admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromList.js 已删除 100644 → 0
浏览文件 @ a22f303b
var rowId = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
table = layui.table;
// 新增来源
authBtn('1596982401332');
showAssetfromList();
// 资产来源管理开始
function showAssetfromList(){
table.render({
id: 'assetfromTable',
elem: '#assetfromTable',
method: 'post',
url: flowableBasePath + 'assetfrom001',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
{ field: 'fromName', title: '来源名称', width: 170 },
{ field: 'state', title: '状态', width: 100, align: 'center', templet: function (d) {
if(d.state == '0'){
return "<span class='state-new'>新建</span>";
}else if(d.state == '1'){
return "<span class='state-up'>线上</span>";
}else if(d.state == '2'){
return "<span class='state-down'>线下</span>";
} else {
return "参数错误";
}
}},
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#assetfromtableBar'}
]],
done: function(){
matchingLanguage();
}
});
}
table.on('tool(assetfromTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'assetfromdelete'){ //删除
assetfromdelet(data);
}else if (layEvent === 'assetfromedit'){ //编辑
assetfromedit(data);
}else if (layEvent === 'assetfromup'){ //上线
assetfromup(data);
}else if (layEvent === 'assetfromdown'){ //下线
assetfromdown(data);
}else if (layEvent === 'assetfromtop'){ //上移
assetfromtopOne(data);
}else if (layEvent === 'assetfromlower'){ //下移
assetfromlowerOne(data);
}
});
form.render();
// 删除
function assetfromdelet(data){
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
layer.close(index);
AjaxPostUtil.request({url: flowableBasePath + "assetfrom003", params:{rowId: data.id}, type: 'json', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadassetfromTable();
}});
});
}
// 新增资产来源
$("body").on("click", "#assetfromaddBean", function() {
_openNewWindows({
url: "../../tpl/assetManageFrom/assetManageFromAdd.html",
title: "新增资产来源",
pageId: "assetManageFromAdd",
area: ['60vw', '30vh'],
callBack: function(refreshCode){
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadassetfromTable();
}});
});
// 编辑资产来源
function assetfromedit(data){
rowId = data.id;
_openNewWindows({
url: "../../tpl/assetManageFrom/assetManageFromEdit.html",
title: "编辑资产来源",
pageId: "assetManageFromEdit",
area: ['60vw', '30vh'],
callBack: function(refreshCode){
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadassetfromTable();
}});
}
// 上线
function assetfromup(data, obj){
var msg = obj ? '确认将【' + obj.data.fromName + '】上线吗？' : '确认将选中数据上线吗？';
layer.confirm(msg, { icon: 3, title: '上线操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: flowableBasePath + "assetfrom007", params:{rowId: data.id}, type: 'json', callback: function (json) {
winui.window.msg("上线成功", {icon: 1, time: 2000});
loadassetfromTable();
}});
});
}
// 下线
function assetfromdown(data, obj){
var msg = obj ? '确认将【' + obj.data.fromName + '】下线吗？' : '确认将选中数据下线吗？';
layer.confirm(msg, { icon: 3, title: '下线操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: flowableBasePath + "assetfrom008", params:{rowId: data.id}, type: 'json', callback: function (json) {
winui.window.msg("下线成功", {icon: 1, time: 2000});
loadassetfromTable();
}});
});
}
// 上移
function assetfromtopOne(data){
AjaxPostUtil.request({url: flowableBasePath + "assetfrom009", params:{rowId: data.id}, type: 'json', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.moveUpOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadassetfromTable();
}});
}
// 下移
function assetfromlowerOne(data){
AjaxPostUtil.request({url: flowableBasePath + "assetfrom010", params:{rowId: data.id}, type: 'json', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.moveDownOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadassetfromTable();
}});
}
// 刷新来源数据
$("body").on("click", "#assetfromreloadTable", function() {
loadassetfromTable();
});
// 刷新来源列表数据
function loadassetfromTable(){
table.reload("assetfromTable", {where: getTableParams()});
}
// 搜索来源列表表单
$("body").on("click", "#assetfromSearch", function() {
table.reload("assetfromTable", {page: {curr: 1}, where: getTableParams()});
});
function getTableParams(){
return {
fromName:$("#fromName").val(),
fromState:$("#fromState").val()
};
}
exports('assetManageFromList', {});
});
admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseAdd.js
浏览文件 @ e4850957
var assetList = new Array(); //资产集合
// 资产采购
layui.config({
base: basePath,
......@@ -13,8 +11,7 @@ layui.config({
var $ = layui.$,
form = layui.form;
var rowNum = 1; //表格的序号
var typeHtml = "";
var fromHtml = "";
var typeHtml = "", fromHtml = "";
var purchasetableTemplate = $("#purchasetableTemplate").html();
var selOption = getFileContent('tpl/template/select-option.tpl');
......@@ -30,16 +27,14 @@ layui.config({
typeHtml = getDataUseHandlebars(selOption, data);
});
initFromHtml();
// 初始化资产来源
function initFromHtml() {
AjaxPostUtil.request({url: flowableBasePath + "assetfrom006", params: {}, type: 'json', async:false, callback: function(json) {
fromHtml = getDataUseHandlebars(selOption, json); //加载资产来源数据
matchingLanguage();
addRow();
form.render();
}});
}
// 资产来源
sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetFrom"]["key"], function (data) {
fromHtml = getDataUseHandlebars(selOption, data);
});
addRow();
matchingLanguage();
form.render();
skyeyeEnclosure.init('enclosureUpload');
// 保存为草稿
......
admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseEdit.js
浏览文件 @ e4850957
var assetList = new Array(); //资产集合
// 资产采购
layui.config({
base: basePath,
......@@ -12,8 +10,8 @@ layui.config({
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form;
var rowNum = 1; //表格的序号
var typeHtml = "";
var rowNum = 1;
var typeHtml = "", fromHtml = "";
var usetableTemplate = $("#usetableTemplate").html();
var selOption = getFileContent('tpl/template/select-option.tpl');
......@@ -33,31 +31,24 @@ layui.config({
$(".typeOne").removeClass("layui-hide");
}
sTableData = json.bean.goods;
initTypeHtml();
matchingLanguage();
}});
//初始化资产类别
function initTypeHtml() {
// 资产类型
sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], function (data) {
typeHtml = getDataUseHandlebars(selOption, data);
});
// 加载表格数据
initTableAssetList();
initFromHtml();
}
// 资产来源
sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetFrom"]["key"], function (data) {
fromHtml = getDataUseHandlebars(selOption, data);
});
//初始化资产来源
function initFromHtml() {
AjaxPostUtil.request({url: flowableBasePath + "assetfrom006", params: {}, type: 'json', async:false, callback: function(json) {
fromHtml = getDataUseHandlebars(selOption, json); //加载资产来源数据
form.render();
}});
}
// 加载表格数据
initTableAssetList();
matchingLanguage();
form.render();
}});
//加载表格数据
// 加载表格数据
function initTableAssetList() {
$.each(sTableData, function(i, item) {
addDataRow(item);
......
admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromAdd.html 已删除 100644 → 0
浏览文件 @ a22f303b
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="padding:20px; margin:0 auto;">
<form class="layui-form" action="" id="showForm">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">来源名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="fromName" name="fromName" win-verify="required" placeholder="请输入来源名称" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button>
</div>
</div>
</form>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/assetManageFrom/'}).use('assetManageFromAdd');
</script>
</body>
</html>
\ No newline at end of file
admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromEdit.html 已删除 100644 → 0
浏览文件 @ a22f303b
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="padding:20px; margin:0 auto;">
<form class="layui-form" action="" id="showForm">
</form>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/assetManageFrom/'}).use('assetManageFromEdit');
</script>
</body>
</html>
\ No newline at end of file
admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromEditTemplate.tpl 已删除 100644 → 0
浏览文件 @ a22f303b
{{#bean}}
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">来源名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="fromName" name="fromName" win-verify="required" placeholder="请输入来源名称" class="layui-input" value="{{fromName}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formEditBean"><language showName="com.skyeye.save"></language></button>
</div>
</div>
{{/bean}}
\ No newline at end of file
admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromList.html 已删除 100644 → 0
浏览文件 @ a22f303b
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="margin:0 auto; height: 100%;">
<div class="txtcenter" style="margin:0 auto; padding-top: 10px;">
<form class="layui-form layui-form-pane" action="" autocomplete="off">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">来源名称</label>
<div class="layui-input-inline">
<input type="text" id="fromName" name="typeName" placeholder="请输入资产来源名称" class="layui-input" />
</div>
<label class="layui-form-label">状态</label>
<div class="layui-input-inline">
<select id="fromState" name="fromState">
<option value="">全部</option>
<option value="0">新建</option>
<option value="1">线上</option>
<option value="2">线下</option>
</select>
</div>
<button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
<button class="layui-btn list-form-search" type="button" id="assetfromSearch"><language showName="com.skyeye.search2"></language></button>
</div>
</div>
</form>
</div>
<div class="winui-toolbar">
<div class="winui-tool" style="text-align: left;">
<button id="assetfromreloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="assetfromaddBean" class="winui-toolbtn" auth="1596982401332"><i class="fa fa-plus" aria-hidden="true"></i>新增资产来源</button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="assetfromTable" lay-filter="assetfromTable"></table>
<script type="text/html" id="assetfromtableBar">
{{# if(d.state == 0 || d.state == 2){ }}
{{# if(auth('1596982411344')){ }}
<a class="layui-btn layui-btn-xs" lay-event="assetfromedit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1596982420366')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="assetfromdelete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# if(auth('1596982429050')){ }}
<a class="layui-btn layui-btn-xs" lay-event="assetfromup">上线</a>
{{# } }}
{{# } }}
{{# if(d.state == 1){ }}
{{# if(auth('1596982435671')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="assetfromdown">下线</a>
{{# } }}
{{# } }}
{{# if(d.orderBy != 1 && auth('1596982443140')){ }}
<a class="layui-btn layui-btn-xs" lay-event="assetfromtop">上移</a>
{{# } }}
{{# if(auth('1596982451894')){ }}
<a class="layui-btn layui-btn-xs" lay-event="assetfromlower">下移</a>
{{# } }}
</script>
</div>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/assetManageFrom/'}).use('assetManageFromList');
</script>
</body>
</html>
\ No newline at end of file
web/src/main/resources/template/json/sysDictData.json
浏览文件 @ e4850957
......@@ -33,6 +33,7 @@
"pmTaskType": {"name": "PM-任务分类", "key": "PM_TASK_TYPE"},
"admAssetArticlesType": {"name": "ADM-用品类别", "key": "ADM_ASSET_ARTICLES_TYPE"},
"admAssetType": {"name": "ADM-资产类型", "key": "ADM_ASSET_TYPE"}
"admAssetType": {"name": "ADM-资产类型", "key": "ADM_ASSET_TYPE"},
"admAssetFrom": {"name": "ADM-资产来源", "key": "ADM_ASSET_FROM"}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或