Skip to content

S
Skyeye

Skyeye云 / Skyeye

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

加工单修改

上级 1c91c803
隐藏空白更改
内联 并排
Showing with 269 addition and 453 deletion
erp-produce/src/main/resources/template/js/erpMachin/erpMachinAdd.js
浏览文件 @ f317c98d
......@@ -261,7 +261,7 @@ layui.config({
//计划加工单选择
$("body").on("click", "#productionOrderSel", function (e) {
_openNewWindows({
url: "../../tpl/erpProduction/erpProductionNoSuccessChooseProcedure.html",
url: "../../tpl/erpProduction/erpProductionNoComplateList.html",
title: "选择生产计划单",
pageId: "erpProductionNoSuccessChooseProcedure",
area: ['90vw', '90vh'],
......
erp-produce/src/main/resources/template/js/erpMachin/erpMachinExamine.js 已删除 100644 → 0
浏览文件 @ 1c91c803
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'textool'], function (exports) {
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form,
textool = layui.textool;
showGrid({
id: "showForm",
url: flowableBasePath + "erpmachin006",
params: {id: parent.rowId},
pagination: false,
method: 'GET',
template: $("#useTemplate").html(),
ajaxSendLoadBefore: function(hdb) {
hdb.registerHelper('compare1', function(v1, v2, options) {
return (parseFloat(v1) * parseFloat(v2)).toFixed(2);
});
},
ajaxSendAfter: function (json) {
textool.init({eleId: 'opinion', maxlength: 200});
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 + "erpmachin008", params: jStr, type: 'json', callback: function (json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
});
}
return false;
});
}
});
// 图片预览
$("body").on("click", ".barCode", function (e) {
systemCommonUtil.showPicImg(fileBasePath + $(this).attr("src"));
});
// 取消
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
});
\ No newline at end of file
erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js
浏览文件 @ f317c98d
var rowId = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'soulTable'], function (exports) {
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
soulTable = layui.soulTable,
table = layui.table;
authBtn('1593442212544');// 新增
......@@ -19,49 +16,36 @@ layui.config({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'erpmachin001',
url: sysMainMation.erpBasePath + 'erpmachin001',
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: 'orderNum', rowspan: '2', title: '单据编号', align: 'center', width: 180, templet: function (d) {
{ field: 'oddNumber', rowspan: '2', title: '单据编号', align: 'center', width: 180, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.orderNum + '</a>';
}},
{ field: 'productionNumber', rowspan: '2', title: '生产计划单', align: 'center', width: 200 },
{ field: 'productionMation', rowspan: '2', title: '生产计划单', align: 'center', width: 200, templet: function (d) {return isNull(d.productionMation) ? '' : d.productionMation.oddNumber}},
{ colspan: '3', title: '加工成品信息', align: 'center' },
{ field: 'state', rowspan: '2', title: '状态', align: 'left', width: 80, templet: function (d) {
if(d.state == '1'){
return "<span class='state-down'>未审核</span>";
} else if (d.state == '2'){
return "<span class='state-up'>审核中</span>";
} else if (d.state == '3'){
return "<span class='state-new'>审核通过</span>";
} else if (d.state == '4'){
return "<span class='state-down'>拒绝通过</span>";
} else if (d.state == '5'){
return "<span class='state-up'>已完成</span>";
} else {
return "参数错误";
}
}},
{ colspan: '3', title: '加工信息', align: 'center'},
{ field: 'createName', rowspan: '2', title: '录入人', align: 'left', width: 120 },
{ field: 'createTime', rowspan: '2', title: '录入日期', align: 'center', width: 150 },
{ field: 'processInstanceId', rowspan: '2', title: '流程ID', width: 100, templet: function (d) {
return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
}},
{ field: 'state', rowspan: '2', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("machinStateEnum", 'id', d.state, 'name');
}},
{ colspan: '3', title: '加工信息', align: 'center' },
{ field: 'createName', rowspan: '2', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
{ field: 'createTime', rowspan: '2', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', rowspan: '2', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', rowspan: '2', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
],[
{ field: 'materialName', title: '名称', align: 'left', width: 120 },
{ field: 'unitName', title: '规格', align: 'center', width: 80 },
{ field: 'materialMation', title: '名称', align: 'left', width: 120, templet: function (d) {return isNull(d.materialMation) ? '' : d.materialMation.name}},
{ field: 'normsMation', title: '规格', align: 'left', width: 80, templet: function (d) {return isNull(d.normsMation) ? '' : d.normsMation.name}},
{ field: 'needNum', title: '加工数量', align: 'center', width: 80 },
{ field: 'departmentName', title: '部门', align: 'left', width: 100 },
{ field: 'departmentMation', title: '加工部门', align: 'left', width: 100, templet: function (d) {return isNull(d.departmentMation) ? '' : d.departmentMation.name}},
{ field: 'startTime', title: '开始时间', align: 'center', width: 150 },
{ field: 'endTime', title: '结束时间', align: 'center', width: 150 }
]],
......@@ -70,31 +54,44 @@ layui.config({
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
soulTable.render(this);
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'delete') { // 删除
deletemember(data);
if (layEvent === 'del') { // 删除
del(data);
} else if (layEvent === 'details') { // 详情
details(data);
} else if (layEvent === 'edit') { // 编辑
edit(data);
} else if (layEvent === 'subExamine') { // 提交审核
subExamine(data);
} else if (layEvent === 'examine') { // 审核
examine(data);
} else if (layEvent === 'subApproval') { // 提交审核
subApproval(data);
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
revoke(data);
}
});
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "erpMachinAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 编辑
function edit(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/erpMachin/erpMachinEdit.html",
url: systemCommonUtil.getUrl('&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "erpMachinEdit",
area: ['90vw', '90vh'],
......@@ -104,64 +101,54 @@ layui.config({
}});
}
// 详情
function details(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "erpMachinDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
// 删除
function deletemember(data) {
function del(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
AjaxPostUtil.request({url: flowableBasePath + "erpmachin005", params: {rowId: data.id}, type: 'json', callback: function (json) {
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpmachin005", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
}
// 详情
function details(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/erpMachin/erpMachinDetails.html",
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "erpMachinDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
// 提交审批
function subExamine(data) {
layer.confirm('确认要提交审核吗？', { icon: 3, title: '提交审核操作' }, function (index) {
AjaxPostUtil.request({url: flowableBasePath + "erpmachin007", params: {rowId: data.id}, type: 'json', callback: function (json) {
winui.window.msg("提交成功。", {icon: 1, time: 2000});
loadTable();
}});
function subApproval(data) {
layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
layer.close(index);
activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) {
var params = {
id: data.id,
approvalId: approvalId
};
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpmachin007", params: params, type: 'json', method: 'POST', callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadTable();
}});
});
});
}
// 审核
function examine(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/erpMachin/erpMachinExamine.html",
title: "审核",
pageId: "erpMachinExamine",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: "../../tpl/erpMachin/erpMachinAdd.html",
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "erpMachinAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
// 撤销
function revoke(data) {
layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokeProduction", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadTable();
}});
});
});
}
form.render();
$("body").on("click", "#reloadTable", function() {
......
erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js
浏览文件 @ f317c98d
......@@ -40,8 +40,8 @@ layui.config({
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("productionState", 'id', d.state, 'name');
}},
{ field: 'planStartDate', width: 140, align: 'center', title: '计划开始时间'},
{ field: 'planComplateDate', width: 140, align: 'center', title: '计划结束时间'},
{ field: 'planStartDate', width: 150, align: 'center', title: '计划开始时间'},
{ field: 'planComplateDate', width: 150, align: 'center', title: '计划结束时间'},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
......
erp-produce/src/main/resources/template/js/erpProduction/erpProductionNoSuccessChooseProcedure.js → erp-produce/src/main/resources/template/js/erpProduction/erpProductionNoComplateProcedureList.js
浏览文件 @ f317c98d
var rowId = "";
layui.config({
base: basePath,
......@@ -12,35 +11,35 @@ layui.config({
form = layui.form,
table = layui.table;
// 设置提示信息
var s = '生产计划单选择规则：1.单选，单击击指定行数据即可选中；2.已审批通过的未完成的生产计划单。如没有查到要选择的单据，请检查单据信息是否满足当前规则。';
$("#showInfo").html(s);
var chooseMation = {};
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'erpproduction009',
url: sysMainMation.erpBasePath + 'erpproduction009',
where: getTableParams(),
even: true,
page: false,
cols: [[
{ type: 'radio'},
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'defaultNumber', title: '生产单号', align: 'center', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
{ field: 'oddNumber', title: '生产单号', align: 'center', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}},
{ field: 'salesOrderNum', width: 200, title: '关联销售单', align: 'center'},
{ field: 'materialName', width: 150, title: '商品名称'},
{ field: 'materialModel', width: 150, title: '商品型号'},
{ field: 'number', width: 80, title: '计划数量'},
{ field: 'planStartDate', width: 140, align: 'center', title: '计划开始时间'},
{ field: 'planComplateDate', width: 140, align: 'center', title: '计划结束时间'}
{ field: 'salesOrderNum', width: 200, title: '关联销售单', align: 'center', templet: function (d) {return isNull(d.sealOrderMation) ? '' : d.sealOrderMation.oddNumber}},
{ field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) {return isNull(d.materialMation) ? '' : d.materialMation.name}},
{ field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) {return isNull(d.materialMation) ? '' : d.materialMation.model}},
{ field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return isNull(d.normsMation) ? '' : d.normsMation.name}},
{ field: 'number', width: 100, title: '计划生产数量'},
{ field: 'planStartDate', width: 150, align: 'center', title: '计划开始时间'},
{ field: 'planComplateDate', width: 150, align: 'center', title: '计划结束时间'}
]],
done: function(res, curr, count){
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入生产单号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){
var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
dubClick.find("input[type='radio']").prop("checked", true);
......@@ -66,13 +65,10 @@ layui.config({
}
});
form.render();
// 详情
function details(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/erpProduction/erpProductionDetail.html",
url: systemCommonUtil.getUrl('FP2023092200003&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "erpProductionDetail",
area: ['90vw', '90vh'],
......@@ -80,14 +76,6 @@ layui.config({
}});
}
// 搜索表单
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
refreshTable();
}
return false;
});
var $step = $("#step");
$step.step({
index: 0,
......@@ -95,108 +83,66 @@ layui.config({
title: ["选择计划单", "选择工序"]
});
// 自己构造的合并相同部门后的工序
var procedureList = new Array();
// 下一步
$("body").on("click", "#nextTab", function() {
if(isNull(chooseMation.id)){
if (isNull(chooseMation.id)) {
winui.window.msg("请选择生产计划单.", {icon: 2, time: 2000});
return false;
}
// 加载工序信息
$.each(chooseMation.procedureMationList, function(i, item) {
var inListIndex = -1;
$.each(procedureList, function(j, bean){
if(bean.departmentId == item.departmentId){
inListIndex = j;
return false;
}
});
if(inListIndex >= 0){
procedureList[inListIndex].procedureArray.push(item);
} else {
if(item.state == 1){
item.checkBoxHtml = '<input type="radio" name="procedureListName" value="' + item.departmentId + '">';
item.stateName = "<span class='state-down'>待下达</span>";
} else if (item.state == 2){
item.checkBoxHtml = '<input type="radio" name="procedureListName" value="' + item.departmentId + '" disabled="disabled">';
item.stateName = "<span class='state-up'>已下达</span>"
}
var procedureArray = new Array();
procedureArray.push(item);
//深层复制
var proItem = $.extend(true, {}, item);
proItem.procedureArray = procedureArray;
procedureList.push(proItem);
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryProductionById", params: {id: chooseMation.id}, type: 'json', method: 'GET', callback: function(json) {
var procedureList = json.bean.productionProcedureList;
if (!isNull(procedureList)) {
// 加载工序信息
$.each(procedureList, function(i, item) {
if (item.state == '1') {
item.checkBoxHtml = '<input type="radio" name="procedureListName" value="' + item.procedureMation.id + '">';
item.stateName = "<span class='state-down'>待下达</span>";
} else if (item.state == '2') {
item.checkBoxHtml = '<input type="radio" name="procedureListName" value="' + item.procedureMation.id + '" disabled="disabled">';
item.stateName = "<span class='state-up'>已下达</span>"
}
});
$("#tBody").html(getDataUseHandlebars($("#tableBody").html(), {procedureList: procedureList}));
form.render();
$step.nextStep();
$("#firstTab").hide();
$("#secondTab").show();
}
});
$("#tBody").html(getDataUseHandlebars($("#tableBody").html(), {procedureList: procedureList}));
form.render();
$step.nextStep();
$("#firstTab").hide();
$("#secondTab").show();
}});
});
//上一步
// 上一步
$("body").on("click", "#prevTab", function() {
$step.prevStep();
$("#firstTab").show();
$("#secondTab").hide();
});
//保存
// 保存
$("body").on("click", "#saveChoose", function() {
if(isNull(chooseMation.id)){
winui.window.msg("请选择生产计划单.", {icon: 2, time: 2000});
return false;
}
var chooseProcedure = $("input[name='procedureListName']:checked").val();
if(isNull(chooseProcedure)){
if (isNull(chooseProcedure)) {
winui.window.msg("请选择工序信息.", {icon: 2, time: 2000});
return false;
}
//获取选择的工序
var chooseIndex = -1;
$.each(procedureList, function(i, item) {
if(item.departmentId == chooseProcedure){
chooseIndex = i;
return false;
}
});
//根据生产计划单id获取该单据下的所有外购商品以及剩余数量
//chooseType：根据生产计划单选择工序时，加工单需要回显自产和外购两种类型的商品
AjaxPostUtil.request({url: flowableBasePath + "erpproduction010", params: {orderId: chooseMation.id, chooseType: "2"}, type: 'json', callback: function(json) {
chooseMation.norms = [].concat(json.rows);
chooseMation.procedureList = procedureList[chooseIndex].procedureArray;
parent.productionMation = chooseMation;
parent.refreshCode = '0';
parent.layer.close(index);
}});
chooseMation.chooseProcedure = chooseProcedure;
parent.productionMation = chooseMation;
parent.refreshCode = '0';
parent.layer.close(index);
});
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function refreshTable(){
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
}
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return {
materialName: $("#materialName").val(),
materialModel: $("#materialModel").val(),
defaultNumber: $("#defaultNumber").val(),
salesOrderNum: $("#salesOrderNum").val()
};
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('erpProductionNoSuccessChooseProcedure', {});
exports('erpProductionNoComplateProcedureList', {});
});
\ No newline at end of file
erp-produce/src/main/resources/template/js/erpProduction/erpProductionNoSuccessChoose.js
浏览文件 @ f317c98d
var rowId = "";
layui.config({
base: basePath,
......@@ -12,49 +11,42 @@ layui.config({
form = layui.form,
table = layui.table;
//设置提示信息
var s = '生产计划单选择规则：1.单选，双击指定行数据即可选中；2.已审批通过的未完成的生产计划单。如没有查到要选择的单据，请检查单据信息是否满足当前规则。';
$("#showInfo").html(s);
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'erpproduction009',
url: sysMainMation.erpBasePath + 'erpproduction009',
where: getTableParams(),
even: true,
page: false,
cols: [[
{ type: 'radio'},
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'defaultNumber', title: '生产单号', align: 'center', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
{ field: 'oddNumber', title: '生产单号', align: 'center', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}},
{ field: 'salesOrderNum', width: 200, title: '关联销售单', align: 'center'},
{ field: 'materialName', width: 150, title: '商品名称'},
{ field: 'materialModel', width: 150, title: '商品型号'},
{ field: 'number', width: 80, title: '计划数量'},
{ field: 'planStartDate', width: 140, align: 'center', title: '计划开始时间'},
{ field: 'planComplateDate', width: 140, align: 'center', title: '计划结束时间'}
{ field: 'salesOrderNum', width: 200, title: '关联销售单', align: 'center', templet: function (d) {return isNull(d.sealOrderMation) ? '' : d.sealOrderMation.oddNumber}},
{ field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) {return isNull(d.materialMation) ? '' : d.materialMation.name}},
{ field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) {return isNull(d.materialMation) ? '' : d.materialMation.model}},
{ field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return isNull(d.normsMation) ? '' : d.normsMation.name}},
{ field: 'number', width: 100, title: '计划生产数量'},
{ field: 'planStartDate', width: 150, align: 'center', title: '计划开始时间'},
{ field: 'planComplateDate', width: 150, align: 'center', title: '计划结束时间'}
]],
done: function(res, curr, count){
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入生产单号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){
var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
dubClick.find("input[type='radio']").prop("checked", true);
form.render();
var chooseIndex = JSON.stringify(dubClick.data('index'));
var obj = res.rows[chooseIndex];
//根据生产计划单id获取该单据下的所有外购商品以及剩余数量
//chooseType：根据生产计划单选择工序时，采购订单需要回显外购一种类型的商品
AjaxPostUtil.request({url: flowableBasePath + "erpproduction010", params: {orderId: obj.id, chooseType: "1"}, type: 'json', callback: function(json) {
obj.norms = [].concat(json.rows);
parent.productionMation = obj;
parent.refreshCode = '0';
parent.layer.close(index);
}});
parent.productionMation = obj;
parent.refreshCode = '0';
parent.layer.close(index);
});
$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){
......@@ -73,46 +65,27 @@ layui.config({
}
});
form.render();
// 详情
function details(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/erpProduction/erpProductionDetail.html",
url: systemCommonUtil.getUrl('FP2023092200003&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "erpProductionDetail",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
refreshTable();
}
return false;
});
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function refreshTable(){
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
}
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return {
materialName: $("#materialName").val(),
materialModel: $("#materialModel").val(),
defaultNumber: $("#defaultNumber").val(),
salesOrderNum: $("#salesOrderNum").val()
};
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('erpProductionNoSuccessChoose', {});
......
erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinExamine.html 已删除 100644 → 0
浏览文件 @ 1c91c803
<!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">
</form>
</div>
<!-- useTemplate -->
<script type="text/x-handlebars-template" id="useTemplate">
{{#bean}}
<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">加工单单号：</label>
<div class="layui-input-block ver-center">
{{orderNum}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">条形码：</label>
<div class="layui-input-block ver-center">
<img class="barCode" src="{{barCode}}" style="width: 150px;"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">加工商品：</label>
<div class="layui-input-block ver-center">
{{materialName}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">生产计划单：</label>
<div class="layui-input-block ver-center">
{{productionNumber}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">商品型号：</label>
<div class="layui-input-block ver-center">
{{materialModel}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">计量单位：</label>
<div class="layui-input-block ver-center">
{{unitName}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">加工数量：</label>
<div class="layui-input-block ver-center">
{{needNum}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">部门：</label>
<div class="layui-input-block ver-center">
{{departmentName}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">计划开始时间：</label>
<div class="layui-input-block ver-center">
{{startTime}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">计划结束时间：</label>
<div class="layui-input-block ver-center">
{{endTime}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">备注说明：</label>
<div class="layui-input-block ver-center">
{{remark}}
</div>
</div>
<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">工序资料：</label>
<div class="layui-input-block">
<table class="layui-table">
<thead>
<tr>
<th>工序编号</th>
<th>工序名称</th>
<th>加工单价</th>
<th>加工部门</th>
<th>条形码</th>
</tr>
</thead>
<tbody id="procedureBody">
{{#each procedure}}
<tr>
<td>{{number}}</td>
<td>{{procedureName}}</td>
<td>{{unitPrice}}</td>
<td>{{departmentName}}</td>
<td><img class="barCode" src="{{barCode}}" style="width: 150px;"/></td>
</tr>
{{/each}}
</tbody>
</table>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">工序物料</span><hr>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">列表项：</label>
<div class="layui-input-block">
<table class="layui-table">
<thead>
<tr>
<th style="width: 150px;">商品(型号)</th>
<th style="width: 50px;">单位</th>
<th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th>
<th style="width: 80px;">金额</th>
</tr>
</thead>
<tbody id="useTable" class="insurance-table">
{{#each material}}
<tr>
<td>{{materialName}}({{materialModel}})</td>
<td>{{unitName}}</td>
<td>{{needNumber}}</td>
<td>{{unitPrice}}</td>
<td>{{#compare1 needNumber unitPrice}}{{/compare1}}</td>
</tr>
{{/each}}
</tbody>
</table>
</div>
</div>
<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">录入人：</label>
<div class="layui-input-block ver-center">
{{createName}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">录入时间：</label>
<div class="layui-input-block ver-center">
{{createTime}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">审批</span><hr>
</div>
<form class="layui-form" action="">
<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>
{{/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/erpMachin/'}).use('erpMachinExamine');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinList.html
浏览文件 @ f317c98d
......@@ -17,19 +17,20 @@
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
{{# if(d.state == 1 || d.state == 4){ }}
{{# if(auth('1593616376462')){ }}
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# if(d.editRow == 1) { }}
{{# if(auth('1593700472791')) { }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if(auth('1593697910273')){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# if(auth('1593442212544')) { }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1593700472791')){ }}
<a class="layui-btn layui-btn-xs" lay-event="subExamine">提交审核</a>
{{# if(auth('1593697910273')) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# } else if(d.state == 2) { }}
{{# if(auth('1593702369415')){ }}
<a class="layui-btn layui-btn-xs" lay-event="examine">审核</a>
{{# } }}
{{# if(d.editRow == 2) { }}
{{# if(auth('')) { }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
</script>
......
erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionNoSuccessChooseProcedure.html → erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionNoComplateProcedureList.html
浏览文件 @ f317c98d
......@@ -12,27 +12,11 @@
<div id="firstTab">
<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
<div class="winui-tip alert-info" id="showInfo">
生产计划单选择规则：1.单选，单击击指定行数据即可选中；2.已审批通过的未完成的生产计划单。如没有查到要选择的单据，请检查单据信息是否满足当前规则。
</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">
<input id="defaultNumber" name="defaultNumber" class="layui-input" placeholder="请输入计划单号"/>
</div>
<label class="layui-form-label">销售单号</label>
<div class="layui-input-inline">
<input id="salesOrderNum" name="salesOrderNum" class="layui-input" placeholder="请输入销售单号"/>
</div>
<label class="layui-form-label">商品名称</label>
<div class="layui-input-inline">
<input id="materialName" name="materialName" class="layui-input" placeholder="请输入商品名称"/>
</div>
<label class="layui-form-label">商品型号</label>
<div class="layui-input-inline">
<input id="materialModel" name="materialModel" class="layui-input" placeholder="请输入商品型号"/>
</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>
......@@ -81,13 +65,9 @@
{{#each procedureList}}
<tr>
<td>{{{checkBoxHtml}}}</td>
<td>{{number}}</td>
<td>
{{#each procedureArray}}
{{{procedureName}}}
{{/each}}
</td>
<td>{{departmentName}}</td>
<td>{{procedureMation.number}}</td>
<td>{{procedureMation.name}}</td>
<td>{{procedureMation.departmentMation.name}}</td>
<td>{{{stateName}}}</td>
</tr>
{{/each}}
......@@ -98,7 +78,7 @@
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/jquery-min.js"></script>
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/jqueryStep/js/jquery.step.min.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/erpProduction/'}).use('erpProductionNoSuccessChooseProcedure');
layui.config({base: '../../js/erpProduction/'}).use('erpProductionNoComplateProcedureList');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionNoSuccessChoose.html
浏览文件 @ f317c98d
......@@ -9,27 +9,11 @@
<body>
<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
<div class="winui-tip alert-info" id="showInfo">
生产计划单选择规则：1.单选，双击指定行数据即可选中；2.已审批通过的未完成的生产计划单。如没有查到要选择的单据，请检查单据信息是否满足当前规则。
</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">
<input id="defaultNumber" name="defaultNumber" class="layui-input" placeholder="请输入计划单号"/>
</div>
<label class="layui-form-label">销售单号</label>
<div class="layui-input-inline">
<input id="salesOrderNum" name="salesOrderNum" class="layui-input" placeholder="请输入销售单号"/>
</div>
<label class="layui-form-label">商品名称</label>
<div class="layui-input-inline">
<input id="materialName" name="materialName" class="layui-input" placeholder="请输入商品名称"/>
</div>
<label class="layui-form-label">商品型号</label>
<div class="layui-input-inline">
<input id="materialModel" name="materialModel" class="layui-input" placeholder="请输入商品型号"/>
</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>
......
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @ f317c98d
......@@ -42,6 +42,7 @@
"supplierContractStateEnum": {"name": "供应商合同状态", "className": "skyeye-erp#com.skyeye.contract.classenum.SupplierContractStateEnum"},
"supplierContractAuthEnum": {"name": "供应商合同权限", "className": "skyeye-erp#com.skyeye.contract.classenum.SupplierContractAuthEnum", "pageUrl": "../../tpl/supplierContract/supplierContractList.html"},
"productionState": {"name": "生产计划单状态", "className": "skyeye-erp#com.skyeye.production.classenum.ProductionStateEnum"},
"machinStateEnum": {"name": "加工单状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinStateEnum"},
"skyeyeView": {"name": "视图类型", "className": "skyeye-pro#com.skyeye.common.SkyeyeViewEnum"},
"widthScale": {"name": "宽度比例", "className": "skyeye-pro#com.skyeye.attr.classenum.WidthScale"},
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或