Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1431
Star 162
Fork 130
S
Skyeye
提交 2ba9f08b 编写于 作者: L LAPTOP-UV1MNL38\18023
浏览文件
操作

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

上级 5eba2484 a9cf7c5f
隐藏空白更改
内联 并排
Showing with 83 addition and 333 deletion
erp-produce/src/main/resources/template/js/departmentMachining/productionPlanToDepartmentMachining.js 0 → 100644
浏览文件 @ 2ba9f08b
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
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 serviceClassName = sysServiceMation["materialReceiptForm"]["key"];
// 生产计划转部门加工单
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryProductionTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
data.machinChildList=data.productionChildList
//部门加工单的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2023100300002', data, {
savePreParams: function (params) {
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertProductionToMachin", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
// 转的时候隐藏来源单据
loadComponentCallback: function () {
$("div[controlType='productionFromType']").remove();
},
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
$("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
$("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
}
});
}});
});
\ No newline at end of file
erp-produce/src/main/resources/template/js/erpPreProductionPlan/erpPreProductionPlanList.js
浏览文件 @ 2ba9f08b
......@@ -89,7 +89,7 @@ layui.config({
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071100001', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "erpProductionAdd",
pageId: "erpPreProductionAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
......@@ -102,7 +102,7 @@ layui.config({
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071100002&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "erpProductionEdit",
pageId: "erpPreProductionEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
......@@ -115,7 +115,7 @@ layui.config({
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071100003&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "erpProductionDetail",
pageId: "erpPreProductionDetail",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
......
erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js
浏览文件 @ 2ba9f08b
......@@ -108,7 +108,7 @@ layui.config({
// 转加工单
function turnConversionProcessingOrder(data) {
_openNewWindows({
url: "../../tpl/wholeOut/productionPlanToOutsourcing.html?id=" + data.id,
url: "../../tpl/departmentMachining/productionPlanToDepartmentMachining.html?id=" + data.id,
title: "转加工单",
pageId: "turnConversionProcessingOrder",
area: ['90vw', '90vh'],
......
erp-produce/src/main/resources/template/tpl/departmentMachining/productionPlanToDepartmentMachining.html 0 → 100644
浏览文件 @ 2ba9f08b
<!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;padding:20px;">
<form class="layui-form" action="" id="showForm" autocomplete="off">
<div id="content"></div>
<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>
</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/departmentMachining/'}).use('productionPlanToDepartmentMachining');
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/js/material/materialReserveList.js
浏览文件 @ 2ba9f08b
......@@ -54,6 +54,9 @@ layui.config({
}},
{ field: 'norms', title: '库存', width: 500, templet: function (d) {
var str = "";
if (isNull(d.materialNorms)) {
return "";
}
$.each(d.materialNorms, function(i, item) {
if (!isNull(item.overAllStock)) {
str += '<span class="layui-badge layui-bg-blue">' + item.name + '【' + item.overAllStock.allStock + '】</span><br>';
......
erp/src/main/resources/template/js/storeHouseInventory/storeHouseInventoryHistory.js 已删除 100644 → 0
浏览文件 @ 5eba2484
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'flow'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
flow = layui.flow;
flow.load({
elem: '#historyList', //指定列表容器
scrollElem: '#historyList',
isAuto: true,
done: function(page, next) { //到达临界点（默认滚动触发），触发下一页
var lis = [];
//以jQuery的Ajax请求为例，请求下一页数据（注意：page是从2开始返回）
var params = {
page: page,
limit: 15,
normsId: parent.normsId,
depotId: parent.depotId
};
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpstockinventory003", params: params, type: 'json', method: 'POST', callback: function (json) {
var jsonStr = "";//实体json对象
$.each(json.rows, function(index, bean) {
bean.showClass = 'date02';
jsonStr = {
bean: bean
};
lis.push(getDataUseHandlebars($("#treeHistory").html(), jsonStr));
});
next(lis.join(''), (page * 1000) < json.total);
}});
}
});
matchingLanguage();
exports('storeHouseInventoryHistory', {});
});
erp/src/main/resources/template/js/storeHouseInventory/storeHouseInventoryList.js 已删除 100644 → 0
浏览文件 @ 5eba2484
var rowId = "";
var normsId = "";
var depotId = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'soulTable', 'fsTree'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
table = layui.table,
fsTree = layui.fsTree,
soulTable = layui.soulTable;
/********* tree 处理 start *************/
var ztree;
fsTree.render({
id: "treeDemo",
url: sysMainMation.erpBasePath + "storehouse009",
checkEnable: false,
showLine: false,
showIcon: true,
addDiyDom: ztreeUtil.addDiyDom,
clickCallback: onClickTree,
onDblClick: onClickTree
}, function(id) {
ztree = $.fn.zTree.getZTreeObj(id);
var zTreeChecked = ztree.getCheckedNodes(false);
if (zTreeChecked.length == 0) {
return false;
}
ztree.selectNode(zTreeChecked[0], true, true);
fuzzySearch(id, '#name', null, true);
depotId = zTreeChecked[0].id;
initTable();
ztreeUtil.initEventListener(id);
});
//异步加载的方法
function onClickTree(event, treeId, treeNode) {
if(treeNode == undefined) {
depotId = "";
} else {
depotId = treeNode.id;
}
loadTable();
}
function initTable(){
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.erpBasePath + 'erpstockinventory002',
where: getTableParams(),
even: true,
page: true,
overflow: {
type: 'tips',
hoverTime: 300, // 悬停时间，单位ms, 悬停 hoverTime 后才会显示，默认为 0
minWidth: 150, // 最小宽度
maxWidth: 500 // 最大宽度
},
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
{ field: 'name', title: '产品名称', rowspan: '2', align: 'left', width: 150 },
{ field: 'model', title: '型号', rowspan: '2', align: 'left', width: 150 },
{ field: 'type', title: '产品类型', rowspan: '2', align: 'left', width: 100, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialType", 'id', d.type, 'name');
}},
{ field: 'fromType', title: '产品来源', rowspan: '2', align: 'center', width: 100, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialFromType", 'id', d.fromType, 'name');
}},
{ title: '库存', colspan: '4', align: 'center', width: 80},
{ field: 'id', title: '盘点历史', rowspan: '2', align: 'center', width: 80, templet: function (d) {
return '<a lay-event="historyDetails" class="notice-title-click">盘点历史</a>';
}},
{ field: 'enabled', title: '规格状态', rowspan: '2', align: 'center', width: 80, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonEnable", 'id', d.materialNorms.enabled, 'name');
}}
], [
{ field: 'materialNorms', title: '规格', align: 'left', width: 140, templet: function (d) {
return d.materialNorms.name;
}},
{ field: 'allStock', title: '总库存', align: 'center', width: 80, templet: function (d) {
if (isNull(d.materialNorms.depotTock)) {
return '0';
}
return d.materialNorms.depotTock.allStock;
}},
{ field: 'initialTock', title: '初始库存', align: 'center', width: 80, templet: function (d) {
if (isNull(d.materialNorms.depotTock)) {
return '0';
}
return d.materialNorms.depotTock.initialTock;
}},
{ field: 'stockNum', title: '可盘点库存', align: 'center', width: 120, edit: 'text', templet: function (d) {
if (isNull(d.materialNorms.depotTock)) {
return '0';
}
return d.materialNorms.depotTock.inventoryTock;
}}
]],
done: function(json) {
matchingLanguage();
soulTable.render(this);
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'historyDetails') { // 盘点历史
historyDetails(data);
}
});
table.on('edit(messageTable)', function(obj){
var data = obj.data;
var value = obj.value;
if (isNull(value)) {
winui.window.msg("请填写盘点数量.", {icon: 2, time: 2000});
} else {
if ((/^(\+|-)?\d+$/.test(value)) && value >= 0) {
var params = {
materialId: data.id,
normsId: data.normsId,
number: value,
depotId: depotId
};
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpstockinventory001", params: params, type: 'json', method: 'POST', callback: function(json) {
winui.window.msg("盘点成功", {icon: 1, time: 2000});
loadTable();
}});
} else {
winui.window.msg("请填写盘点数量.", {icon: 2, time: 2000});
}
}
});
}
// 盘点历史详情
function historyDetails(data) {
normsId = data.normsId;
_openNewWindows({
url: "../../tpl/storeHouseInventory/storeHouseInventoryHistory.html",
title: "盘点历史",
pageId: "storeHouseInventoryHistory",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {depotId: depotId}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('storeHouseInventoryList', {});
});
erp/src/main/resources/template/tpl/storeHouseInventory/storeHouseInventoryHistory.html 已删除 100644 → 0
浏览文件 @ 5eba2484
<!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" />
<link href="../../assets/lib/layui/lay/modules/timeaxis/timeaxis.css" rel="stylesheet" />
<style type="text/css">
.history-date h2{
margin-bottom: 0px;
}
.history-date h2 a{
font-size: 12px;
}
.history-date ul li h3 a{
color: currentColor;
font-size: 15px;
}
</style>
</head>
<body>
<div style="margin: 0 auto; padding-top: 10px;">
<form class="layui-form layui-form-pane" action="" autocomplete="off">
<div class="history" id="historyList">
</div>
</form>
</div>
<!-- 时间线审批历史列表模板 -->
<script type="text/x-handlebars-template" id="treeHistory">
{{#bean}}
<div class="history-date">
<h2 class="{{showClass}}"><a href="#nogo">{{createTime}}</a></h2>
<ul>
<li class="green">
<h3>
<a>{{materialMation.name}}[{{materialMation.model}}] {{normsMation.name}}</a>
<span>盘点人：{{createName}}</span>
</h3>
<div>
盘点前数量：{{originalNumber}} -> 盘点后数量：{{number}}
<br/>
盘点时间：{{{createTime}}}
</div>
</li>
</ul>
</div>
{{/bean}}
</script>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/storeHouseInventory/'}).use('storeHouseInventoryHistory');
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/storeHouseInventory/storeHouseInventoryList.html 已删除 100644 → 0
浏览文件 @ 5eba2484
<!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" />
<link href="../../assets/lib/layui/lay/modules/ztree/css/zTreeStyle/zTreeStyle.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/customer/ztree/common-tree.css" rel="stylesheet" />
<style>
.layui-table-cell {
height: auto;
text-overflow: inherit;
overflow: visible;
white-space: normal;
word-wrap: break-word;
}
</style>
</head>
<body>
<div class="winui-toolbar">
<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>
</div>
</div>
<div style="margin: auto 10px;">
<div style="width: 240px; float: left; height: 100%; overflow: auto; padding: 5px;">
<input type="text" id="name" name="name" placeholder="请输入要搜索的节点" class="layui-input" />
<ul id="treeDemo" class="ztree fsTree" method="get" isRoot="0"
treeIdKey="id" inputs="parentId" treePIdKey="pId" clickCallbackInputs="parentId:$id" treeName="name"></ul>
</div>
<div style="width: calc(100% - 250px); float: left;">
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
</div>
</div>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/jquery-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/fuzzysearch.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/storeHouseInventory/'}).use('storeHouseInventoryList');
</script>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或