Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1436
Star 162
Fork 130
S
Skyeye
提交 d3f298f2 编写于 作者: X xqz
浏览文件
操作

Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

上级 647808af 4feabee1
隐藏空白更改
内联 并排
Showing with 36 addition and 29 deletion
admin-assistant/src/main/resources/template/js/assetReportManage/assetReportMyUseChoose.js
浏览文件 @ d3f298f2
...@@ -48,16 +48,22 @@ layui.config({ ...@@ -48,16 +48,22 @@ layui.config({
cols: [[ cols: [[
{ type: myUseAssetReportCheckType ? 'checkbox' : 'radio', rowspan: '3', fixed: 'left' }, { type: myUseAssetReportCheckType ? 'checkbox' : 'radio', rowspan: '3', fixed: 'left' },
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '3', fixed: 'left', type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '3', fixed: 'left', type: 'numbers' },
{ field: 'name', title: '资产名称', width: 120 }, // { field: 'name', title: '资产名称', width: 120 },
{ field: 'specifications', title: '资产规格', width: 140 }, { field: 'name', title: '资产名称', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.name);
}},
{ field: 'specifications', title: '资产规格', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.specifications);
}},
// { field: 'specifications', title: '资产规格', width: 140 },
{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) { { field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">'; return '<img src="' + systemCommonUtil.getFilePath(d.assetMation?.assetImg) + '" class="photo-img" lay-event="assetImg">';
}}, }},
{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) { { field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId); return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId);
}}, }},
{ field: 'assetNum', title: '资产编号', align: 'left', width: 150 }, { field: 'assetNum', title: '资产编号', align: 'left', width: 150 },
{ field: 'specifications', title: '资产规格', align: 'left', width: 120 }, // { field: 'specifications', title: '资产规格', align: 'left', width: 120 },
{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) { { field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetAdminMation?.name); return getNotUndefinedVal(d.assetAdminMation?.name);
}}, }},
......
admin-assistant/src/main/resources/template/js/assetReportManage/assetReportUnUseChoose.js
浏览文件 @ d3f298f2
...@@ -48,13 +48,17 @@ layui.config({ ...@@ -48,13 +48,17 @@ layui.config({
cols: [[ cols: [[
{ type: assetReportCheckType ? 'checkbox' : 'radio', rowspan: '3', fixed: 'left' }, { type: assetReportCheckType ? 'checkbox' : 'radio', rowspan: '3', fixed: 'left' },
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '3', fixed: 'left', type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '3', fixed: 'left', type: 'numbers' },
{ field: 'name', title: '资产名称', width: 120 }, { field: 'name', title: '资产名称', width: 120, templet: function(d) {
{ field: 'specifications', title: '资产规格', width: 140 }, return getNotUndefinedVal(d.assetMation?.name);
}},
{ field: 'specifications', title: '资产规格', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.specifications);
}},
{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) { { field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">'; return '<img src="' + systemCommonUtil.getFilePath(d.assetMation?.assetImg) + '" class="photo-img" lay-event="assetImg">';
}}, }},
{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) { { field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId); return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.assetMation?.typeId);
}}, }},
{ field: 'assetNum', title: '资产编号', width: 160 }, { field: 'assetNum', title: '资产编号', width: 160 },
{ field: 'storageArea', title: '存放区域', width: 200 }, { field: 'storageArea', title: '存放区域', width: 200 },
......
admin-assistant/src/main/resources/template/js/assetReportManage/batchCopy.js
浏览文件 @ d3f298f2
...@@ -42,11 +42,12 @@ layui.config({ ...@@ -42,11 +42,12 @@ layui.config({
assetId: getNotUndefinedVal($("#assetId").attr(initTableChooseUtil.chooseInputDataIdKey)), assetId: getNotUndefinedVal($("#assetId").attr(initTableChooseUtil.chooseInputDataIdKey)),
state: $("#state").val(), state: $("#state").val(),
limit: $("#number").val(), limit: $("#number").val(),
number:$("#number").val(),
page: 1 page: 1
} }
AjaxPostUtil.request({url: sysMainMation.admBasePath + "queryAssetReportCodeList", params: params, type: 'json', method: 'POST', callback: function (json) { AjaxPostUtil.request({url: sysMainMation.admBasePath + "queryAssetReportCodeList", params: params, type: 'json', method: 'POST', callback: function (json) {
$("#barCode").val(json.rows.join('\n')); $("#barCode").val(json.rows.join('\n'));
$("#tips").html("共计获取个" + json.total + "条形码"); $("#tips").html("共计获取" + json.total + "个条形码");
}}); }});
} }
return false; return false;
......
admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js
浏览文件 @ d3f298f2
...@@ -23,12 +23,14 @@ layui.config({ ...@@ -23,12 +23,14 @@ layui.config({
limit: getLimit(), limit: getLimit(),
cols: [[ cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'name', title: '资产名称', align: 'left', width: 120 }, { field: 'name', title: '资产名称', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.name);
}},
{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) { { field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">'; return '<img src="' + systemCommonUtil.getFilePath(d.assetMation.assetImg) + '" class="photo-img" lay-event="assetImg">';
}}, }},
{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) { { field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId); return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.assetMation.typeId);
}}, }},
{ field: 'assetNum', title: '资产编号', align: 'left', width: 150 }, { field: 'assetNum', title: '资产编号', align: 'left', width: 150 },
{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) { { field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
......
admin-assistant/src/main/resources/template/tpl/assetReportManage/assetReportList.html
浏览文件 @ d3f298f2
...@@ -19,13 +19,12 @@ ...@@ -19,13 +19,12 @@
</div> </div>
<div style="margin: auto 10px;"> <div style="margin: auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table> <table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar"> <script type="text/html" id="messageTableBar">
{{# if (isNull(d.state)) { }} {{# if (isNull(d.state)) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a> <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }} {{# } }}
</script> </script>
</div> </div>
<script src="../../assets/lib/layui/layui.js"></script> <script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script> <script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript"> <script type="text/javascript">
......
erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevel.js
浏览文件 @ d3f298f2
...@@ -15,7 +15,7 @@ layui.config({ ...@@ -15,7 +15,7 @@ layui.config({
var $ = layui.$; var $ = layui.$;
var id = GetUrlParam("id"); var id = GetUrlParam("id");
// 资产采购订单转资产采购入库 // 根据仓库id获取仓库级别信息
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelValById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelValById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean; let data = json.bean;
// 仓库级别的值的【编辑布局】 // 仓库级别的值的【编辑布局】
......
erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js
浏览文件 @ d3f298f2
...@@ -10,7 +10,11 @@ layui.config({ ...@@ -10,7 +10,11 @@ layui.config({
fsTree = layui.fsTree, fsTree = layui.fsTree,
form = layui.form, form = layui.form,
table = layui.table; table = layui.table;
// tableTree = layui.tableTreeDj;
var ztree; var ztree;
var id = GetUrlParam("id");
var objectKey = GetUrlParam("objectKey")
var objectId = GetUrlParam("objectId")
// 下拉按钮 // 下拉按钮
var dropdown = new Dropdown(); var dropdown = new Dropdown();
...@@ -20,7 +24,7 @@ layui.config({ ...@@ -20,7 +24,7 @@ layui.config({
/********* tree 处理 start *************/ /********* tree 处理 start *************/
fsTree.render({ fsTree.render({
id: "treeDemo", id: "treeDemo",
url: sysMainMation.erpBasePath + "queryDepotLevelById", url: sysMainMation.erpBasePath + "queryDepotLevelById?id=" + id,
checkEnable: false, checkEnable: false,
showLine: false, showLine: false,
showIcon: true, showIcon: true,
...@@ -59,17 +63,7 @@ layui.config({ ...@@ -59,17 +63,7 @@ layui.config({
limit: getLimit(), limit: getLimit(),
cols: [[ cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
// { field: 'name', title: '名称', rowspan: '2', align: 'left', width: 300, templet: function (d) {
// return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
// }},
{ field: 'number', title: '编号', rowspan: '2', align: 'left', width: 350 }, { field: 'number', title: '编号', rowspan: '2', align: 'left', width: 350 },
// { field: 'warehousing', title: '仓储费', rowspan: '2', align: 'left', width: 150 },
// { field: 'truckage', title: '搬运费', rowspan: '2', align: 'left', width: 150 },
// // { field: 'isDefault', title: '是否默认', rowspan: '2', align: 'left', width: 100 },
// { field: 'isDefault', title: '是否默认', width: 100, align: "center", templet: function (d) {
// // return shopUtil.getMealOrderWhetherGiveName(d);
// return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonIsDefault", 'id', d.isDefault, 'name');
// }},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', align: 'left', width: 120 }, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', align: 'left', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 }, { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 },
...@@ -234,11 +228,11 @@ layui.config({ ...@@ -234,11 +228,11 @@ layui.config({
}); });
function loadTable() { function loadTable() {
tableTree.reload("messageTable", {where: getTableParams()}); table.reload("messageTable", {where: getTableParams()});
} }
function getTableParams() { function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); return $.extend(true, {objectKey:objectKey,objectId:objectId}, initTableSearchUtil.getSearchValue("messageTable"));
} }
exports('turnIocatorManage', {}); exports('turnIocatorManage', {});
......
erp/src/main/resources/template/tpl/turnIocatorManage/turnIocatorManage.html
浏览文件 @ d3f298f2
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="winui-toolbar"> <div class="winui-toolbar">
<div class="winui-tool"> <div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button> <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1656776769966"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button> <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1720752315835"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn">新增仓库级别的值</language></button>
</div> </div>
</div> </div>
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/contextMenu/jquery.contextMenu.min.js"></script> <script type="text/javascript" src="../../assets/lib/layui/lay/modules/contextMenu/jquery.contextMenu.min.js"></script>
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.all.min.js"></script> <script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.all.min.js"></script>
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.exhide.min.js"></script> <script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.exhide.min.js"></script>
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/fuzzysearch.js"></script>
<script src="../../js/commonFile/fileConsoleListCommon.js"></script> <script src="../../js/commonFile/fileConsoleListCommon.js"></script>
<script type="text/javascript"> <script type="text/javascript">
layui.config({base: '../../js/turnIocatorManage/'}).use('turnIocatorManage'); layui.config({base: '../../js/turnIocatorManage/'}).use('turnIocatorManage');
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或