Skip to content

S
Skyeye

doc_wei / Skyeye

通知 1171
Star 154
Fork 127
S
Skyeye
提交 e7dc22d1 编写于 作者: L LAPTOP-NDCM9L6Q\王丽雅
浏览文件
操作

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

上级 23ff4930 8753f738
隐藏空白更改
内联 并排
Showing with 213 addition and 104 deletion
admin-assistant/src/main/resources/template/js/assetReportManage/assetReportUnUseChoose.js
浏览文件 @ e7dc22d1
......@@ -51,6 +51,7 @@ layui.config({
{ field: 'name', title: '资产名称', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.name);
}},
{ field: 'assetNum', title: '资产编号', width: 200 },
{ field: 'specifications', title: '资产规格', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.specifications);
}},
......@@ -60,7 +61,6 @@ layui.config({
{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.assetMation?.typeId);
}},
{ field: 'assetNum', title: '资产编号', width: 160 },
{ field: 'storageArea', title: '存放区域', width: 200 },
{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetAdminMation?.name);
......@@ -69,7 +69,7 @@ layui.config({
done: function(res) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入资产名称，资产编号", function () {
initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入资产编号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
if (assetReportCheckType) {
......
erp/src/main/resources/template/js/depotOut/list.js
浏览文件 @ e7dc22d1
......@@ -41,8 +41,8 @@ layui.config({
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
}},
{ field: 'otherState', title: '出库状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutState", 'id', d.otherState, 'name');
{ field: 'otherState', title: '确认状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutOtherState", 'id', d.otherState, 'name');
}},
{ title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
]],
......
erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevelValue.js
浏览文件 @ e7dc22d1
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
var objectParams = {};
// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
......@@ -11,39 +12,34 @@ layui.config({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var id = GetUrlParam("id");
var depotId = GetUrlParam("depotId");
var parentId = GetUrlParam("parentId");
// 根据仓库id获取仓库级别信息
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelValById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
// 仓库级别的值的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024071200008', data, {
if (isNull(id)) {
dsFormUtil.initAddPageForStatic('content', 'FP2024071200007', {
savePreParams: function (params) {
params.parentId=data.parentId
params.depotId=data.depotId
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "writeDepotLevelVal", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
// loadComponentCallback: function () {
// // $("div[controlType='assetPurchasePutFromType']").remove();
// },
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
// $("div[controlType='simpleTable']").find(".assetId").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".fromId").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".chooseAssetBtn").prop('disabled', true);
params.depotId = depotId;
params.parentId = parentId;
}
});
}else{
AjaxPostUtil.request({
url: sysMainMation.erpBasePath + "queryDepotLevelValById",
params: {id: id},
type: 'json',
method: 'GET',
callback: function (json) {
let data = json.bean;
dsFormUtil.initEditPageForStatic('content', 'FP2024071200008', data, {
savePreParams: function (params) {
params.parentId = parentId;
params.depotId = depotId;
}
});
}
});
}});
}
});
\ No newline at end of file
erp/src/main/resources/template/js/turnIocatorManage/batchAdd.js 0 → 100644
浏览文件 @ e7dc22d1
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'form', 'textool'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
textool = layui.textool,
form = layui.form;
var parentId = getNotUndefinedVal(GetUrlParam("parentId"));
var depotId = getNotUndefinedVal(GetUrlParam("depotId"));
skyeyeClassEnumUtil.showEnumDataListByClassName("generateDepotLevelValType", 'radio', "type", '', form);
textool.init({
eleId: 'barCode',
tools: ['copy', 'reset', 'clear']
});
matchingLanguage();
form.render();
form.on('submit(getBean)', function (data) {
if (winui.verifyForm(data.elem)) {
let params = {
parentId: parentId,
depotId: depotId,
// type: $("#type").val(),
type: $("#type input:radio:checked").val(),
number:$("#number").val(),
}
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "batchGenerateDepotLevelVal", params: params, type: 'json', method: 'POST', callback: function (json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
return false;
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js
浏览文件 @ e7dc22d1
var rowId = "";
var parentNode = null;
layui.config({
base: basePath,
version: skyeyeVersion
......@@ -15,12 +13,12 @@ layui.config({
var $ = layui.$,
fsTree = layui.fsTree,
form = layui.form,
// table = layui.table;
tableTree = layui.tableTreeDj;
var ztree;
var id = GetUrlParam("id");
var objectKey = GetUrlParam("objectKey")
var objectId = GetUrlParam("objectId")
var parentId = GetUrlParam("parentId");
var depotId = GetUrlParam("id");
var depotLevelId = GetUrlParam("depotLevelId");
// 下拉按钮
var dropdown = new Dropdown();
......@@ -49,9 +47,9 @@ layui.config({
//异步加载的方法
function onClickTree(event, treeId, treeNode) {
if(treeNode == undefined) {
dictTypeId = "";
depotLevelId = "";
} else {
dictTypeId = treeNode.id;
depotLevelId = treeNode.id;
}
loadTable();
}
......@@ -68,44 +66,51 @@ layui.config({
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
{ field: 'number', title: '编号', rowspan: '2', align: 'left', width: 350 },
{ 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: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150 },
{field: 'number', title: '编号', rowspan: '2', align: 'left', width: 200},
{ field: 'name', title: '级别', width: 200, templet: function (d) {
return getNotUndefinedVal(d.depotLevelMation?.name);
}},
{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: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120},
{field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150},
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 350, toolbar: '#tableBar' }
]],
done: function(json) {
done: function (json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入编号", function () {
tableTree.reload("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
}
// , {
// keyId: 'id',
// keyPid: 'parentId',
// title: 'dictName',
// }
);
tableTree.getTable().on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'details'){ //详情
details(data);
} else if (layEvent === 'del') { //删除
del(data);
}
}, {
keyId: 'id',
keyPid: 'parentId',
title: 'number',
showCache: "turnIocatorManageStatus"
});
}
tableTree.getTable().on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'batchAddChildNodes') { //批量新增子节点
batchAddChildNodes(data);
} else if (layEvent === 'del') { //删除
del(data);
} else if(layEvent ==='add') { //新增子节点
parentId = data.id;
addChildNodes(data)
}
});
// 添加
$("body").on("click", "#addBean", function() {
parentId = 0;
_openNewWindows({
url: "../../tpl/turnIocatorManage/addWarehouseLevelValue.html?id=" + id,
url: "../../tpl/turnIocatorManage/addWarehouseLevelValue.html?depotId=" + id
+ "&parentId=" + parentId,
title: "新增仓库级别的值",
pageId: "warehouseLevelValueAdd",
area: ['90vw', '90vh'],
......@@ -113,27 +118,15 @@ layui.config({
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
// _openNewWindows({
// url: "../../tpl/turnIocatorManage/writeWarehouseLevel.html?id=" + id,
// title: "新增仓库级别",
// pageId: "addWarehouseLevel",
// area: ['90vw', '90vh'],
// callBack: function (refreshCode) {
// winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
// // 刷新节点
// var nownode = ztree.getNodesByParam("id", "0", null);
// ztree.reAsyncChildNodes(nownode[0], "refresh");
// }});
});
// 编辑
function edit(data) {
console.log('11',data)
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071200008&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
url: "../../tpl/turnIocatorManage/addWarehouseLevelValue.html?id=" + data.id
+ "&parentId=" + data.parentId +"&depotId=" + data.depotId,
title: "编辑仓库级别的值",
pageId: "warehouseLevelValueEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
......@@ -142,18 +135,6 @@ layui.config({
}});
}
// 详情
function details(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071200009&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "warehouseLevelValueDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
// 删除
function del(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
......@@ -165,6 +146,47 @@ layui.config({
});
}
function addChildNodes(data){
_openNewWindows({
url: "../../tpl/turnIocatorManage/addWarehouseLevelValue.html?depotId=" + data.depotId
+ "&parentId=" + data.id,
title: "新增子节点仓库级别的值",
pageId: "warehouseLevelValueAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
//批量新增子节点
function batchAddChildNodes(data){
_openNewWindows({
url: "../../tpl/turnIocatorManage/batchAdd.html?depotId=" + data.depotId + "&parentId=" + data.id,
title: '批量新增',
pageId: "warehouseLevelValueBatchAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 批量新增
$("body").on("click", "#batchAdd", function() {
parentId = 0
_openNewWindows({
url: "../../tpl/turnIocatorManage/batchAdd.html?depotId=" + depotId + "&parentId=" + parentId,
title: '批量新增',
pageId: "warehouseLevelValueBatchAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 树节点右键
function onRightClick(event, treeId, treeNode) {
......@@ -207,6 +229,7 @@ layui.config({
function chooseNodeSelect(nodeId){
var selNode = ztree.getNodeByParam("id", nodeId, null);
ztree.selectNode(selNode);
depotLevelId = nodeId;
}
// 树操作--文件夹或者文件删除
......@@ -228,7 +251,6 @@ layui.config({
// 重置folderid
folderId = selNode.getParentNode().id;
ztree.removeNode(selNode);// 移除节点
// showListById();// 获取文件夹和笔记列表
}});
}
......@@ -250,18 +272,21 @@ layui.config({
}});
});
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reload("messageTable", {where: getTableParams()});
tableTree.reload("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {objectKey:objectKey,objectId:objectId}, initTableSearchUtil.getSearchValue("messageTable"));
var params = {
objectId: depotId,
holderId: isNull(depotLevelId) || depotLevelId == 0 ? "" : depotLevelId
};
return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('turnIocatorManage', {});
......
erp/src/main/resources/template/js/turnIocatorManage/writeWarehouseLevel.js
浏览文件 @ e7dc22d1
......@@ -43,9 +43,6 @@ layui.config({
parent.refreshCode = '0';
}});
},
// loadComponentCallback: function () {
// // $("div[controlType='assetPurchasePutFromType']").remove();
// },
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
}
......
erp/src/main/resources/template/tpl/turnIocatorManage/addWarehouseLevelValue.html
浏览文件 @ e7dc22d1
......@@ -13,7 +13,6 @@
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<!-- <button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>-->
<button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
</div>
</div>
......@@ -23,7 +22,7 @@
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/turnIocatorManage/'}).use('addWarehouseLevel');
layui.config({base: '../../js/turnIocatorManage/'}).use('addWarehouseLevelValue');
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/turnIocatorManage/batchAdd.html 0 → 100644
浏览文件 @ e7dc22d1
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<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;padding:20px;">
<form class="layui-form" action="" autocomplete="off">
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">基本信息</span><hr>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">类型<i class="red">*</i></label>
<div class="layui-input-block winui-radio" id="type">
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">数量<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="number" name="number" win-verify="required|number" 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="getBean">批量生成</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/turnIocatorManage/'}).use('batchAdd');
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/turnIocatorManage/turnIocatorManage.html
浏览文件 @ e7dc22d1
......@@ -14,6 +14,7 @@
<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="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>
<button id="batchAdd" class="winui-toolbtn search-table-btn-right" auth="1721184331706"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn">批量新增</language></button>
</div>
</div>
......@@ -31,6 +32,8 @@
</div>
<script type="text/html" id="tableBar">
{{# if(auth('1720752315835')){ }}
<a class="layui-btn layui-btn-xs" lay-event="add">新增子节点</a>
<a class="layui-btn layui-btn-xs" lay-event="batchAddChildNodes">批量新增子节点</a>
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1720752347259')){ }}
......@@ -57,7 +60,6 @@
</script>
<ul class="layui-dropdown-menu" id="treeRight">
</ul>
<script src="../../assets/lib/layui/layui.js"></script>
......
erp/src/main/resources/template/tpl/turnIocatorManage/writeWarehouseLevel.html
浏览文件 @ e7dc22d1
......@@ -13,7 +13,6 @@
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<!-- <button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>-->
<button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
</div>
</div>
......
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @ e7dc22d1
......@@ -87,6 +87,7 @@
"depotOutState": {"name": "仓库出库单出库状态", "className": "skyeye-erp#com.skyeye.depot.classenum.DepotOutState"},
"depotPutFromType": {"name": "仓库入库单来源单据类型", "className": "skyeye-erp#com.skyeye.depot.classenum.DepotPutFromType"},
"depotPutState": {"name": "仓库入库单入库状态", "className": "skyeye-erp#com.skyeye.depot.classenum.DepotPutState"},
"generateDepotLevelValType": {"name": "ERP-批量生成仓库级别的值的类型", "className": "skyeye-erp#com.skyeye.depot.classenum.GenerateDepotLevelValType"},
"productionChildFromType": {"name": "生产计划单子单据生产类型", "className": "skyeye-erp#com.skyeye.production.classenum.ProductionChildType"},
"skyeyeView": {"name": "视图类型", "className": "skyeye-pro#com.skyeye.common.SkyeyeViewEnum"},
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或