Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1431
Star 162
Fork 130
S
Skyeye
提交 3f97d9c9 编写于 作者: Skyeye云's avatar Skyeye云
浏览文件
操作

删除多余代码，入库明细整改完成

上级 f84b6eae
隐藏空白更改
内联 并排
Showing with 62 addition and 1028 deletion
erp-produce/src/main/resources/template/js/erpMachin/erpMachinDetails.js
浏览文件 @ 3f97d9c9
...@@ -61,8 +61,6 @@ layui.config({ ...@@ -61,8 +61,6 @@ layui.config({
$.each(json.bean.material, function(i, item) { $.each(json.bean.material, function(i, item) {
item.unitPrice = parseFloat(item.unitPrice).toFixed(2); item.unitPrice = parseFloat(item.unitPrice).toFixed(2);
}); });
$("#contentIframe").attr("src", "../../tpl/erpcommon/erpOrderFlowLine.html?rowId=" + json.bean.id + "&type=3");
}, },
ajaxSendAfter: function (json) { ajaxSendAfter: function (json) {
matchingLanguage(); matchingLanguage();
......
erp-produce/src/main/resources/template/js/erpProduction/erpProductionDetail.js
浏览文件 @ 3f97d9c9
...@@ -28,7 +28,6 @@ layui.config({ ...@@ -28,7 +28,6 @@ layui.config({
}); });
$("#showForm").html(getDataUseHandlebars($("#mainHtml").html(), json)); $("#showForm").html(getDataUseHandlebars($("#mainHtml").html(), json));
$("#contentIframe").attr("src", "../../tpl/erpcommon/erpOrderFlowLine.html?rowId=" + json.bean.id + "&type=2");
matchingLanguage(); matchingLanguage();
form.render(); form.render();
}}); }});
......
erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinDetails.html
浏览文件 @ 3f97d9c9
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<div class="layui-tab"> <div class="layui-tab">
<ul class="layui-tab-title"> <ul class="layui-tab-title">
<li class="layui-this" id="orderMationLi">订单信息</li> <li class="layui-this" id="orderMationLi">订单信息</li>
<li>进度报表</li>
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<div class="layui-tab-item layui-show"> <div class="layui-tab-item layui-show">
...@@ -24,9 +23,6 @@ ...@@ -24,9 +23,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="layui-tab-item" style="height: 100%;">
<iframe style="width: 100%; height: 100%; border: 0px;" id="contentIframe"></iframe>
</div>
</div> </div>
</div> </div>
</div> </div>
......
erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionDetail.html
浏览文件 @ 3f97d9c9
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<div class="layui-tab"> <div class="layui-tab">
<ul class="layui-tab-title"> <ul class="layui-tab-title">
<li class="layui-this" id="orderMationLi">订单信息</li> <li class="layui-this" id="orderMationLi">订单信息</li>
<li>进度报表</li>
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<div class="layui-tab-item layui-show"> <div class="layui-tab-item layui-show">
...@@ -24,9 +23,6 @@ ...@@ -24,9 +23,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="layui-tab-item" style="height: 100%;">
<iframe style="width: 100%; height: 100%; border: 0px;" id="contentIframe"></iframe>
</div>
</div> </div>
</div> </div>
</div> </div>
......
erp/src/main/resources/template/js/erpcommon/erpOrderFlowLine.js 已删除 100644 → 0
浏览文件 @ f84b6eae
var rowId = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'orgChart', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form;
var orderId = GetUrlParam("rowId");
var type = GetUrlParam("type");
// 加载订单流水线信息
AjaxPostUtil.request({url: flowableBasePath + "erpcommon002", params: {rowId: orderId, type: type}, type: 'json', method: 'GET', callback: function(data) {
var newData = dealWithData(data.bean);
$('#chart-container').orgchart({
'data': newData,
'nodeTitle': 'title',
'nodeContent': 'name',
'pan': true,
'zoom': true,
'parentNodeSymbol': 'fa-receipt',
'interactive': false
});
form.render();
$("#chart-container").on("click", ".node", function() {
rowId = $(this).attr("id");
if(isNull(rowId)){
parent.$("#orderMationLi").click();
return false;
}
var type = $(this).find(".customName").attr("type");
var url = erpOrderUtil.getErpDetailUrl({subType: type});
if(isNull(url)){
return false;
}
_openNewWindows({
url: url,
title: "单据详情",
pageId: "orderDetails",
area: ['100vw', '100vh'],
callBack: function (refreshCode) {
}});
});
}});
function dealWithData(bean){
bean.title = '<a type="' + bean.subType + '" class="customName">' + bean.title + '</a>';
bean.name = '<div>' + bean.name + '</div>' +
'<div class="orgIcon"><font class="left-font">状态：</font>' + getStateIcon(bean.subType, bean.state) + '</div>' +
'<div class="fontMation"><font class="left-font">计划完成时间：</font><font class="right-font">' + getDataMation(bean.planComplateDate) + '</font></div>' +
'<div class="fontMation"><font class="left-font">实际完成时间：</font><font class="right-font">' + getDataMation(bean.realComplateDate) + '</font></div>';
if (!isNull(bean.children) && bean.children.length > 0) {
$.each(bean.children, function (i, item) {
bean.children[i] = dealWithData(item);
});
}
return bean;
}
function getStateIcon(subType, state){
var icon = "";
if(subType == 10 || subType == 11){
// 采购订单，销售订单
icon = getErpOrderHeaderState(state);
} else if (subType == 1 || subType == 5 || subType == 15){
// 采购入库，销售出库，验收入库单
icon = getErpHeaderState(state);
} else if (subType == 17){//加工单子单据（工序验收单）
icon = getErpMachinChildState(state);
} else if (subType == 16){//加工单
icon = getErpMachinHeaderState(state);
} else if (subType == 18){//生产计划单
icon = getErpProductionHeaderState(state);
} else if (subType == 19 || subType == 20 || subType == 21){
// 领料单/补料单/退料单
icon = getErpPickHeaderState(state);
}
var stateName = getStateName(icon);
icon = getStateCustom(icon);
icon = '<i class="fa fa-fw ' + icon + '" title="' + stateName + '"></i>';
return icon;
}
function getDataMation(data) {
if (isNull(data)){
return '';
}
return data;
}
/**
* 获取中文对应汉字
* @param icon
* @returns {string}
*/
function getStateName(icon){
if(icon == 'fa-spinner fa-spin'){
return '执行中';
} else if (icon == 'fa-times-circle'){
return '执行异常';
} else if (icon == 'fa-check-circle'){
return '完成';
}
}
/**
* 拼接状态颜色属性
* @param icon
* @returns {string}
*/
function getStateCustom(icon){
if(icon == 'fa-spinner fa-spin'){
return icon + ' running';
} else if (icon == 'fa-times-circle'){
return icon + ' error';
} else if (icon == 'fa-check-circle'){
return icon + ' success';
}
}
/**
* erp订单状态
*
* @param state
* @returns {string}
*/
function getErpOrderHeaderState(state){
var icon = "";
// 0未审核、1.审核中、2.审核通过、3.审核拒绝、4.已转入库|出库，已完成
if(state == 0 || state == 1 || state == 2){
icon = "fa-spinner fa-spin";
} else if (state == 3){
icon = "fa-times-circle";
} else if (state == 4){
icon = "fa-check-circle";
}
return icon;
}
/**
* erp出入库订单状态
*
* @param state
* @returns {string}
*/
function getErpHeaderState(state){
var icon = "";
// 0未审核、1.审核中、2.审核通过、3.审核拒绝、4.已转入库|出库，已完成
if(state == 0 || state == 1 ){
icon = "fa-spinner fa-spin";
} else if (state == 3){
icon = "fa-times-circle";
} else if (state == 2 || state == 4){
icon = "fa-check-circle";
}
return icon;
}
/**
* 加工单状态
* @param state
* @returns {string}
*/
function getErpMachinHeaderState(state){
var icon = "";
// 状态 1.新建 2.审核中 3.审核通过 4.审核拒绝 5.已完成
if(state == 1 || state == 2 || state == 3){
icon = "fa-spinner fa-spin";
} else if (state == 4){
icon = "fa-times-circle";
} else if (state == 5){
icon = "fa-check-circle";
}
return icon;
}
/**
* 加工单子单据状态
* @param state
* @returns {string}
*/
function getErpMachinChildState(state){
var icon = "";
// 状态 1.待验收 2.验收完成
if(state == 1){
icon = "fa-spinner fa-spin";
} else if (state == 2){
icon = "fa-check-circle";
}
return icon;
}
/**
* 生产计划单状态
* @param state
* @returns {string}
*/
function getErpProductionHeaderState(state){
var icon = "";
// 状态 0.删除 1.新建 2.审核中 3.审核通过 4.审核不通过 5.加工完成
if(state == 1 || state == 2 || state == 3){
icon = "fa-spinner fa-spin";
} else if (state == 4){
icon = "fa-times-circle";
} else if (state == 5){
icon = "fa-check-circle";
}
return icon;
}
/**
* 领料单/退料单/补料单状态
* @param state
* @returns {string}
*/
function getErpPickHeaderState(state){
var icon = "";
// 状态 0未审核 1.审核中 2.审核通过-进行领料和退料 3.审核拒绝
if(state == 0 || state == 1){
icon = "fa-spinner fa-spin";
} else if (state == 3){
icon = "fa-times-circle";
} else if (state == 2){
icon = "fa-check-circle";
}
return icon;
}
});
\ No newline at end of file
erp/src/main/resources/template/js/erpstatistics/warehousingdetails.js
浏览文件 @ 3f97d9c9
var rowId = "";
//单据的开始时间、结束时间
var startTime = "", endTime = "";
layui.config({ layui.config({
base: basePath, base: basePath,
version: skyeyeVersion version: skyeyeVersion
}).extend({ }).extend({
window: 'js/winui.window' window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) { }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor(); winui.renderColor();
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
laydate = layui.laydate,
table = layui.table; table = layui.table;
//初始化统计时间 table.render({
startTime = getOneYMDFormatDate();//开始日期为本月一号 id: 'messageTable',
endTime = getYMDFormatDate();//结束今天的日期 elem: '#messageTable',
method: 'post',
//获取本月一号的日期 url: sysMainMation.erpBasePath + 'statistics001',
function getOneYMDFormatDate(){ where: getTableParams(),
var date = new Date; even: true,
var year = date.getFullYear(); page: true,
var month = date.getMonth() + 1; limits: getLimits(),
month = (month < 10 ? "0" + month : month); limit: getLimit(),
return year.toString() + "-" + month.toString() + "-" + "01"; cols: [[
} { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'oddNumber', title: '单据编号', align: 'left', width: 250, templet: function (d) {
//获取今天的时间 var str = d.oddNumber;
function getYMDFormatDate(){ if (!isNull(d.parentOrderId)){
var myDate = new Date(); str += '<span class="state-new">[转]</span>';
var lw = new Date(myDate); }
var lastY = lw.getFullYear(); return str;
var lastM = lw.getMonth() + 1; }},
var lastD = lw.getDate(); { field: 'serviceName', title: '单据类型', align: 'left', width: 100 },
return lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD); { field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) {return d.materialMation.name}},
} { field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) {return d.materialMation.model}},
{ field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return d.normsMation.name}},
laydate.render({elem: '#operTime', range: '~', value: startTime + " ~ " + endTime}); { field: 'unitPrice', title: '单价', align: 'left', width: 120 },
{ field: 'operNumber', title: '入库数量', align: 'left', width: 100 },
var selOption = getFileContent('tpl/template/select-option.tpl'); { field: 'allPrice', title: '金额', align: 'left', width: 120 },
{ field: 'depotName', title: '仓库', align: 'left', width: 140, templet: function (d) {return d.depotMation.name}},
// 初始化仓库 { field: 'operTime', title: '入库日期', align: 'center', width: 140 }
erpOrderUtil.getDepotList(function (json){ ]],
// 加载仓库数据 done: function(json) {
$("#depotId").html(getDataUseHandlebars(selOption, json)); matchingLanguage();
// 初始化表格数据 initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () {
initTable(); table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
}); });
function initTable(){ $("body").on("click", "#reloadTable", function() {
if(isNull($("#operTime").val())) {//一定要记得，当createTime为空时 loadTable();
startTime = ""; });
endTime = "";
}else {
startTime = $("#operTime").val().split('~')[0].trim() + ' 00:00:00';
endTime = $("#operTime").val().split('~')[1].trim() + ' 23:59:59';
}
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'statistics001',
where: getTableParams(),
even: true,
page: true,
limits: [8, 16, 24, 32, 40, 48, 56],
limit: 8,
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'defaultNumber', title: '单据编号', align: 'left', width: 250, templet: function (d) {
var str = '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
if (!isNull(d.linkNumber)){
str += '<span class="state-new">[转]</span>';
if(d.status == 2){
str += '<span class="state-up"> [正常]</span>';
} else {
str += '<span class="state-down"> [预警]</span>';
}
}
return str;
}},
{ field: 'subTypeName', title: '单据类型', align: 'left', width: 100},
{ field: 'materialName', title: '商品名称', align: 'left', width: 150 },
{ field: 'materialModel', title: '商品型号', align: 'left', width: 100},
{ field: 'unitPrice', title: '单价', align: 'left', width: 120},
{ field: 'operNumber', title: '入库数量', align: 'left', width: 100},
{ field: 'allPrice', title: '金额', align: 'left', width: 120 },
{ field: 'depotName', title: '仓库', align: 'left', width: 140 },
{ field: 'operTime', title: '入库日期', align: 'center', width: 140 }
]],
done: function(json) {
matchingLanguage();
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'details') { //详情
details(data);
}
});
form.render();
}
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
loadTable();
}
return false;
});
// 详情 function loadTable() {
function details(data) { table.reloadData("messageTable", {where: getTableParams()});
rowId = data.headerId;
var url = erpOrderUtil.getErpDetailUrl(data);
_openNewWindows({
url: url,
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "warehousingdetailschildpage",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
} }
$("body").on("click", "#reloadTable", function() { function getTableParams() {
loadTable(); return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}); }
$("body").on("click", "#formSearch", function () {
refreshTable();
})
//刷新
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
//搜索
function refreshTable(){
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()})
}
function getTableParams() {
if(isNull($("#operTime").val())) {//一定要记得，当createTime为空时
startTime = "";
endTime = "";
}else {
startTime = $("#operTime").val().split('~')[0].trim() + ' 00:00:00';
endTime = $("#operTime").val().split('~')[1].trim() + ' 23:59:59';
}
return {
materialName: $("#materialName").val(),
depotId: $("#depotId").val(),
startTime: startTime,
endTime: endTime
};
}
exports('warehousingdetails', {}); exports('warehousingdetails', {});
}); });
erp/src/main/resources/template/js/material/materialChooseToProduce.js
浏览文件 @ 3f97d9c9
...@@ -44,19 +44,29 @@ layui.config({ ...@@ -44,19 +44,29 @@ layui.config({
id: 'messageTable', id: 'messageTable',
elem: '#messageTable', elem: '#messageTable',
method: 'post', method: 'post',
url: flowableBasePath + 'material010', url: sysMainMation.erpBasePath + 'material010',
where: getTableParams(), where: getTableParams(),
even: true, even: true,
page: true, page: true,
limits: [8, 16, 24, 32, 40, 48, 56], limits: getLimits(),
limit: 8, limit: getLimit(),
cols: [[ cols: [[
{ type: 'checkbox'}, { type: 'checkbox'},
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'materialName', title: '商品名称', align: 'left', width: 150 }, { field: 'name', title: '商品名称', align: 'left', width: 150 },
{ field: 'materialModel', title: '型号', align: 'left', width: 150 }, { field: 'model', title: '型号', align: 'left', width: 150 },
{ field: 'categoryName', title: '所属类型', align: 'left', width: 100 }, { field: 'categoryId', title: '所属分类', align: 'center', width: 100, templet: function (d) {
{ field: 'typeName', title: '商品来源', align: 'left', width: 100 }, return sysDictDataUtil.getDictDataNameByCodeAndKey("ERP_MATERIAL_CATEGORY", d.categoryId);
}},
{ field: 'fromType', title: '产品来源', align: 'center', width: 100, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialFromType", 'id', d.fromType, 'name');
}},
{ field: 'type', title: '产品类型', align: 'left', width: 100, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialType", 'id', d.type, 'name');
}},
{ field: 'unit', title: '产品规格类型', align: 'center', width: 100, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialUnit", 'id', d.unit, 'name');
}},
{ field: 'procedureMationList', title: '工序', align: 'left', width: 100, templet: function (d) { { field: 'procedureMationList', title: '工序', align: 'left', width: 100, templet: function (d) {
var str = "" var str = ""
$.each(d.procedureMationList, function(i, item) { $.each(d.procedureMationList, function(i, item) {
......
erp/src/main/resources/template/js/storeHouseApproval/storeHouseOtherExamine.js 已删除 100644 → 0
浏览文件 @ f84b6eae
var rowId = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui'], function (exports) {
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
rowId = parent.rowId;
var url = erpOrderUtil.getErpDetailUrl({subType: parent.subType});
$("#showBean").attr("src", url);
//为了iframe高度自适应
var loadNum = 0;
var interval = setInterval(iFrameHeight, 300);
function iFrameHeight() {
var ifm = document.getElementById("showBean");
var subWeb = document.frames ? document.frames["showBean"].document : ifm.contentDocument;
if(ifm != null && subWeb != null) {
ifm.height = subWeb.body.scrollHeight;
loadNum++;
if(loadNum > 10){
clearInterval(interval);//停止
}
}
}
matchingLanguage();
form.render();
form.on('submit(formAddBean)', function (data) {
if (winui.verifyForm(data.elem)) {
var msg = '确认提交吗？';
layer.confirm(msg, { icon: 3, title: '提交审批' }, function (i) {
layer.close(i);
var jStr = {
content: $("#opinion").val(),
status: $("input[name='flag']:checked").val(),
rowId: parent.rowId
};
AjaxPostUtil.request({url: flowableBasePath + "storehouseapproval006", params: jStr, 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
erp/src/main/resources/template/js/storeHouseApproval/storeHouseOtherList.js 已删除 100644 → 0
浏览文件 @ f84b6eae
var rowId = "";
var subType = "";
//单据的开始时间、结束时间
var startTime = "", endTime = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate', 'soulTable'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
laydate = layui.laydate,
soulTable = layui.soulTable,
table = layui.table;
var selOption = getFileContent('tpl/template/select-option-must.tpl');
laydate.render({elem: '#operTime', range: '~'});
initDepotHtml();
//初始化仓库
function initDepotHtml() {
AjaxPostUtil.request({url: flowableBasePath + "storehouse009", params: {}, type: 'json', method: "GET", callback: function(json) {
//加载仓库数据
$("#depotId").html(getDataUseHandlebars(selOption, json));
form.render();
if(json.rows.length > 0){
initTable();
} else {
winui.window.msg("您还未分配仓库，请联系管理员分配.", {icon: 2, time: 2000});
}
}});
}
function initTable(){
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'storehouseapproval005',
where: getTableParams(),
even: true,
page: true,
limits: [8, 16, 24, 32, 40, 48, 56],
overflow: {
type: 'tips',
hoverTime: 300, // 悬停时间，单位ms, 悬停 hoverTime 后才会显示，默认为 0
minWidth: 150, // 最小宽度
maxWidth: 500 // 最大宽度
},
limit: 8,
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'defaultNumber', title: '单据编号', align: 'left', width: 220, templet: function (d) {
var str = '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
return str;
}},
{ field: 'subTypeName', title: '单据类型', align: 'left', width: 100},
{ field: 'materialNames', title: '关联商品', align: 'left', width: 300},
{ field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) {
if(d.status == '0'){
return "<span class='state-down'>未审核</span>";
} else if (d.status == '1'){
return "<span class='state-up'>审核中</span>";
} else if (d.status == '2'){
return "<span class='state-new'>审核通过</span>";
} else if (d.status == '3'){
return "<span class='state-down'>拒绝通过</span>";
} else if (d.status == '4'){
return "<span class='state-new'>已转采购</span>";
} else {
return "参数错误";
}
}},
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120},
{ field: 'taxMoney', title: '含税合计', align: 'left', width: 120 },
{ field: 'discountLastMoney', title: '优惠后金额', align: 'left', width: 120 },
{ field: 'changeAmount', title: '付款', align: 'left', width: 120 },
{ field: 'operPersonName', title: '操作人', align: 'left', width: 100},
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
]],
done: function(json) {
matchingLanguage();
soulTable.render(this);
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'details') { //详情
details(data);
} else if (layEvent === 'examine') { //审核
examine(data);
}
});
}
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
loadTable();
}
return false;
});
//审核
function examine(data) {
rowId = data.id;
subType = data.subType;
_openNewWindows({
url: "../../tpl/storeHouseApproval/storeHouseOtherExamine.html",
title: "审核",
pageId: "storeHouseOtherExamine",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 详情
function details(data) {
rowId = data.id;
var url = erpOrderUtil.getErpDetailUrl(data);
_openNewWindows({
url: url,
title: "单据详情",
pageId: "storeHouseApprovalOrderDetail",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
$("body").on("click", "#reloadTable", function() {
loadTable();
});
$("body").on("click", "#formSearch", function () {
refreshTable();
});
//刷新
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
//搜索
function refreshTable(){
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()})
}
function getTableParams() {
if(isNull($("#operTime").val())) {//一定要记得，当createTime为空时
startTime = "";
endTime = "";
}else {
startTime = $("#operTime").val().split('~')[0].trim() + ' 00:00:00';
endTime = $("#operTime").val().split('~')[1].trim() + ' 23:59:59';
}
return {
defaultNumber: $("#defaultNumber").val(),
startTime: startTime,
endTime: endTime,
depotId: $("#depotId").val()
};
}
exports('storeHouseOtherList', {});
});
erp/src/main/resources/template/js/storeHouseApproval/storeHousePassOtherList.js 已删除 100644 → 0
浏览文件 @ f84b6eae
var rowId = "";
var subType = "";
//单据的开始时间、结束时间
var startTime = "", endTime = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate', 'soulTable'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
laydate = layui.laydate,
soulTable = layui.soulTable,
table = layui.table;
var selOption = getFileContent('tpl/template/select-option-must.tpl');
laydate.render({elem: '#operTime', range: '~'});
initDepotHtml();
//初始化仓库
function initDepotHtml() {
AjaxPostUtil.request({url: flowableBasePath + "storehouse009", params: {}, type: 'json', method: "GET", callback: function(json) {
//加载仓库数据
$("#depotId").html(getDataUseHandlebars(selOption, json));
form.render();
if(json.rows.length > 0){
initTable();
} else {
winui.window.msg("您还未分配仓库，请联系管理员分配.", {icon: 2, time: 2000});
}
}});
}
function initTable(){
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'storehouseapproval009',
where: getTableParams(),
even: true,
page: true,
limits: [8, 16, 24, 32, 40, 48, 56],
overflow: {
type: 'tips',
hoverTime: 300, // 悬停时间，单位ms, 悬停 hoverTime 后才会显示，默认为 0
minWidth: 150, // 最小宽度
maxWidth: 500 // 最大宽度
},
limit: 8,
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'defaultNumber', title: '单据编号', align: 'left', width: 220, templet: function (d) {
var str = '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
return str;
}},
{ field: 'subTypeName', title: '单据类型', align: 'left', width: 100},
{ field: 'materialNames', title: '关联商品', align: 'left', width: 300},
{ field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) {
if(d.status == '0'){
return "<span class='state-down'>未审核</span>";
} else if (d.status == '1'){
return "<span class='state-up'>审核中</span>";
} else if (d.status == '2'){
return "<span class='state-new'>审核通过</span>";
} else if (d.status == '3'){
return "<span class='state-down'>拒绝通过</span>";
} else if (d.status == '4'){
return "<span class='state-new'>已转采购</span>";
} else {
return "参数错误";
}
}},
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120},
{ field: 'taxMoney', title: '含税合计', align: 'left', width: 120 },
{ field: 'discountLastMoney', title: '优惠后金额', align: 'left', width: 120 },
{ field: 'changeAmount', title: '付款', align: 'left', width: 120 },
{ field: 'operPersonName', title: '操作人', align: 'left', width: 100},
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 }
]],
done: function(json) {
matchingLanguage();
soulTable.render(this);
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'details') { //详情
details(data);
}
});
}
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
loadTable();
}
return false;
});
//详情
function details(data) {
rowId = data.id;
var url = erpOrderUtil.getErpDetailUrl(data);
_openNewWindows({
url: url,
title: "单据详情",
pageId: "storeHouseApprovalOrderDetail",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
$("body").on("click", "#reloadTable", function() {
loadTable();
});
$("body").on("click", "#formSearch", function () {
refreshTable();
});
//刷新
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
//搜索
function refreshTable(){
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()})
}
function getTableParams() {
if(isNull($("#operTime").val())) {//一定要记得，当createTime为空时
startTime = "";
endTime = "";
}else {
startTime = $("#operTime").val().split('~')[0].trim() + ' 00:00:00';
endTime = $("#operTime").val().split('~')[1].trim() + ' 23:59:59';
}
return {
defaultNumber: $("#defaultNumber").val(),
startTime: startTime,
endTime: endTime,
depotId: $("#depotId").val()
};
}
exports('storeHousePassOtherList', {});
});
erp/src/main/resources/template/tpl/erpcommon/currentTockQuestion.tpl 已删除 100644 → 0
浏览文件 @ f84b6eae
<ul class="layer_notice layui-layer-wrap">
<li>1.该库存数量不包含当前单据的入库/出库数量</li>
</ul>
erp/src/main/resources/template/tpl/erpcommon/erpOrderFlowLine.html 已删除 100644 → 0
浏览文件 @ f84b6eae
<!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" />
<style>
.orgchart{
min-width: 100% !important;
min-height: 100% !important;
}
.left-font{
}
.orgIcon i{
width: 30px !important;
height: 30px;
line-height: 30px;
font-size: 15px;
}
.orgIcon .running{
color: dodgerblue;
}
.orgIcon .error{
color: red;
}
.orgIcon .success{
color: green;
}
</style>
</head>
<body>
<div style="height: 100%">
<div id="chart-container" style="min-width: 100%; min-height: 100%;">
</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/erpcommon/'}).use('erpOrderFlowLine');
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/erpstatistics/warehousingdetails.html
浏览文件 @ 3f97d9c9
...@@ -7,31 +7,9 @@ ...@@ -7,31 +7,9 @@
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" /> <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head> </head>
<body> <body>
<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="materialName" name="materialName" placeholder="请输入名称" class="layui-input" />
</div>
<label class="layui-form-label">仓库</label>
<div class="layui-input-inline">
<select id="depotId" lay-search></select>
</div>
<label class="layui-form-label">单据日期</label>
<div class="layui-input-inline">
<input type="text" id="operTime" name="operTime" placeholder="请选择单据日期" class="layui-input" />
</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" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
</div>
</div>
</form>
</div>
<div class="winui-toolbar"> <div class="winui-toolbar">
<div class="winui-tool"> <div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn"><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>
</div> </div>
</div> </div>
<div style="margin:auto 10px;"> <div style="margin:auto 10px;">
......
erp/src/main/resources/template/tpl/storeHouseApproval/storeHouseOtherExamine.html 已删除 100644 → 0
浏览文件 @ f84b6eae
<!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">
<span class="hr-title">单据信息</span><hr>
</div>
<div class="layui-form-item layui-col-xs12">
<iframe id="showBean" style="width: 100%; border: 0px;" scrolling="no"></iframe>
</div>
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">审批</span><hr>
</div>
<div class="layui-form-item">
<label class="layui-form-label">审批结果<i class="red">*</i></label>
<div class="layui-input-block winui-radio">
<input type="radio" name="flag" value="1" title="同意" checked="checked"/>
<input type="radio" name="flag" value="0" title="拒绝" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">审批意见</label>
<div class="layui-input-block">
<textarea id="opinion" placeholder="请输入审批意见" maxlength="200" class="layui-textarea" style="height: 100px;"></textarea>
</div>
</div>
<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">提交</button>
</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/storeHouseApproval/'}).use('storeHouseOtherExamine');
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/storeHouseApproval/storeHouseOtherList.html 已删除 100644 → 0
浏览文件 @ f84b6eae
<!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 class="txtcenter" style="margin:0 auto;padding-top:10px;">
<div class="winui-tip alert-info" id="showInfo">
该列表只展示拥有仓库管理权限的其他未审核出入库单据。包含拆分单、组装单、调拨单。
</div>
<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">
<select id="depotId" name="depotId" lay-search="" win-verify="required">
</select>
</div>
<label class="layui-form-label">单据编号</label>
<div class="layui-input-inline">
<input type="text" id="defaultNumber" name="defaultNumber" placeholder="请输入单据编号" class="layui-input" />
</div>
<label class="layui-form-label">单据日期</label>
<div class="layui-input-inline">
<input type="text" id="operTime" name="operTime" placeholder="请选择单据日期" class="layui-input" />
</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" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
</div>
</div>
</form>
</div>
<div class="winui-toolbar">
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
{{# if(d.status == 1){ }}
{{# if(auth('1593057607615')){ }}
<a class="layui-btn layui-btn-xs" lay-event="examine">审核</a>
{{# } }}
{{# } }}
</script>
</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/storeHouseApproval/'}).use('storeHouseOtherList');
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/storeHouseApproval/storeHousePassOtherList.html 已删除 100644 → 0
浏览文件 @ f84b6eae
<!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 class="txtcenter" style="margin:0 auto;padding-top:10px;">
<div class="winui-tip alert-info" id="showInfo">
该列表只展示拥有仓库管理权限的其他已审核出入库单据。包含拆分单、组装单、调拨单。
</div>
<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">
<select id="depotId" name="depotId" lay-search="" win-verify="required">
</select>
</div>
<label class="layui-form-label">单据编号</label>
<div class="layui-input-inline">
<input type="text" id="defaultNumber" name="defaultNumber" placeholder="请输入单据编号" class="layui-input" />
</div>
<label class="layui-form-label">单据日期</label>
<div class="layui-input-inline">
<input type="text" id="operTime" name="operTime" placeholder="请选择单据日期" class="layui-input" />
</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" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
</div>
</div>
</form>
</div>
<div class="winui-toolbar">
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
</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/storeHouseApproval/'}).use('storeHousePassOtherList');
</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.
先完成此消息的编辑！
想要评论请 注册 或