Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1283
Star 158
Fork 129
S
Skyeye
提交 7eba8f2e 编写于 作者: Skyeye云's avatar Skyeye云
浏览文件
操作

车间管理托管到表单布局

上级 aaf65246
隐藏空白更改
内联 并排
Showing with 66 addition and 889 deletion
base-server/src/main/resources/template/js/operate/writeOperate.js
浏览文件 @ 7eba8f2e
......@@ -74,10 +74,7 @@ layui.config({
$.each(businessApi.params, function(key, value) {
var params = {
"key": key,
"attrKey": {
"html": attrHtml,
"value": value
}
"attrKey": value
};
initTableChooseUtil.resetData('apiParams', params);
});
......@@ -103,10 +100,7 @@ layui.config({
$.each(operateOpenPage.params, function(key, value) {
var params = {
"key": key,
"attrKey": {
"html": attrHtml,
"value": value
}
"attrKey": value
};
initTableChooseUtil.resetData('pageParams', params);
});
......
erp-produce/src/main/resources/template/js/erpFarm/erpFarmAdd.js 已删除 100644 → 0
浏览文件 @ aaf65246
// 工序选择必备参数
var procedureCheckType = 2;//工序选择类型：1.单选procedureMation；2.多选procedureMationList
var procedureMationList = new Array();
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;
// 车间负责人信息
var chargeUser = [];
var selOption = getFileContent('tpl/template/select-option.tpl');
textool.init({eleId: 'remark', maxlength: 200});
// 获取当前登录用户所属企业的所有部门信息
systemCommonUtil.queryDepartmentListByCurrentUserBelong(function(data) {
$("#departmentId").html(getDataUseHandlebars(selOption, data));
form.render('select');
});
matchingLanguage();
form.render();
form.on('submit(formAddBean)', function (data) {
if (winui.verifyForm(data.elem)) {
if(procedureMationList.length == 0){
winui.window.msg('请选择工序', {icon: 2, time: 2000});
return false;
}
if(chargeUser.length == 0){
winui.window.msg('请选择车间负责人', {icon: 2, time: 2000});
return false;
}
var params = {
farmNumber: $("#farmNumber").val(),
farmName: $("#farmName").val(),
departmentId: $("#departmentId").val(),
desc: $("#remark").val(),
chargePerson: chargeUser[0].id,
farmProcedure: JSON.stringify(procedureMationList)
};
AjaxPostUtil.request({url: flowableBasePath + "erpfarm002", params: params, type: 'json', callback: function (json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
return false;
});
// 工序选择
$("body").on("click", "#procedureChoose", function() {
_openNewWindows({
url: "../../tpl/erpWorkProcedure/erpWorkProcedureChoose.html",
title: "工序选择",
pageId: "erpWorkProcedureChoose",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
var str = "";
$.each(procedureMationList, function(i, item) {
str += '<tr><td>' + item.number + '</td><td>' + item.procedureName + '</td><td>' + item.unitPrice + '</td><td>' + item.departmentName + '</td></tr>';
});
$("#procedureBody").html(str);
}});
});
// 车间负责人选择
$("body").on("click", "#chargeUserIdSelPeople", function (e) {
systemCommonUtil.userReturnList = [].concat(chargeUser);
systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含
systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要
systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选
systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) {
chargeUser = [].concat(userReturnList);
if(chargeUser.length > 0){
$("#chargeUserId").val(chargeUser[0].name);
}
});
});
// 取消
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
});
\ No newline at end of file
erp-produce/src/main/resources/template/js/erpFarm/erpFarmChoose.js
浏览文件 @ 7eba8f2e
......@@ -13,23 +13,12 @@ layui.config({
tableCheckBoxUtil = layui.tableCheckBoxUtil;
var checkType = '1';// 车间选择类型：1.单选；2.多选
if (!isNull(parent.farmCheckType)){
checkType = parent.farmCheckType;
} else {
checkType = GetUrlParam("checkType");
}
var selOption = getFileContent('tpl/template/select-option.tpl');
AjaxPostUtil.request({url: flowableBasePath + "erpworkprocedure009", params: {}, type: 'json', callback: function(json) {
// 加载工序数据
$("#procedureId").html(getDataUseHandlebars(selOption, json));
if (!isNull(parent.procedureId)){
$("#procedureId").val(parent.procedureId);
}
// 初始化表格
initTable();
}});
//设置提示信息
var s = "车间选择规则：";
if(checkType == "1"){
......@@ -41,23 +30,19 @@ layui.config({
}
s += '如没有查到要选择的车间，请检查车间信息是否满足当前规则。';
$("#showInfo").html(s);
initTable();
function initTable(){
if(checkType == '2'){
//初始化值
var ids = [];
$.each(parent.farmMationList, function(i, item) {
ids.push(item.farmId);
});
tableCheckBoxUtil.setIds({
gridId: 'messageTable',
fieldName: 'farmId',
ids: ids
ids.push(item.id);
});
tableCheckBoxUtil.init({
gridId: 'messageTable',
filterId: 'messageTable',
fieldName: 'farmId'
fieldName: 'id',
ids: ids
});
}
......@@ -65,35 +50,27 @@ layui.config({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'erpfarm010',
url: sysMainMation.erpBasePath + 'erpfarm001',
where: getTableParams(),
even: true,
page: true,
limits: [8, 16, 24, 32, 40, 48, 56],
limit: 8,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ type: checkType == '1' ? 'radio' : 'checkbox'},
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'farmNumber', title: '车间编号', align: 'left', width: 100, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.farmNumber + '</a>';
}},
{ field: 'farmName', title: '车间名称', align: 'left', width: 250},
{ field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
if(d.state == '1'){
return "<span class='state-up'>正常</span>";
} else if (d.state == '2'){
return "<span class='state-down'>维修整改</span>";
} else {
return "参数错误";
}
}},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 100 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: '最后修改时间', align: 'center', width: 100}
{ field: 'number', title: '车间编号', align: 'left', width: 100 },
{ field: 'name', title: '名称', align: 'left', width: 250 },
{ field: 'enabled', title: '状态', align: 'center', width: 80, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonEnable", 'id', d.enabled, 'name');
}}
]],
done: function(res, curr, count){
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入名称、车间编号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
if(checkType == '1'){
$('#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");
......@@ -113,11 +90,10 @@ layui.config({
form.render();
})
} else {
//多选
//设置选中
// 多选
tableCheckBoxUtil.checkedDefault({
gridId: 'messageTable',
fieldName: 'procedureId'
fieldName: 'id'
});
}
}
......@@ -131,39 +107,26 @@ layui.config({
var selectedData = tableCheckBoxUtil.getValue({
gridId: 'messageTable'
});
AjaxPostUtil.request({url: flowableBasePath + "erpfarm011", params: {ids: selectedData.toString()}, type: 'json', callback: function (json) {
parent.procedureMationList = [].concat(json.rows);
parent.layer.close(index);
parent.refreshCode = '0';
}});
if (selectedData.length == 0) {
winui.window.msg("请选择车间", {icon: 2, time: 2000});
return false;
}
parent.farmMationList = [].concat(selectedData);
parent.layer.close(index);
parent.refreshCode = '0';
});
form.render();
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
refreshTable();
}
return false;
});
$("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 {
farmNumber: $("#farmNumber").val(),
farmName: $("#farmName").val(),
procedureId: $("#procedureId").val()
};
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('erpFarmChoose', {});
......
erp-produce/src/main/resources/template/js/erpFarm/erpFarmDetail.js 已删除 100644 → 0
浏览文件 @ aaf65246
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui'], function (exports) {
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form;
showGrid({
id: "showForm",
url: flowableBasePath + "erpfarm006",
params: {rowId: parent.rowId},
pagination: false,
template: $("#beanTemplate").html(),
ajaxSendLoadBefore: function(hdb) {
},
ajaxSendAfter: function (json) {
matchingLanguage();
form.render();
}
});
// 取消
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
});
\ No newline at end of file
erp-produce/src/main/resources/template/js/erpFarm/erpFarmEdit.js 已删除 100644 → 0
浏览文件 @ aaf65246
// 工序选择必备参数
var procedureCheckType = 2;//工序选择类型：1.单选procedureMation；2.多选procedureMationList
var procedureMationList = new Array();
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;
// 车间负责人信息
var chargeUser = [];
var selOption = getFileContent('tpl/template/select-option.tpl');
showGrid({
id: "showForm",
url: flowableBasePath + "erpfarm003",
params: {rowId: parent.rowId},
pagination: false,
template: $("#beanTemplate").html(),
ajaxSendLoadBefore: function(hdb) {
},
ajaxSendAfter: function (json) {
procedureMationList = [].concat(json.bean.procedureList);
// 获取当前登录用户所属企业的所有部门信息
systemCommonUtil.queryDepartmentListByCurrentUserBelong(function(data) {
$("#departmentId").html(getDataUseHandlebars(selOption, data));
$("#departmentId").val(json.bean.departmentId);
form.render('select');
});
chargeUser.push({
id: json.bean.chargePerson,
name: json.bean.chargeName
});
textool.init({eleId: 'remark', maxlength: 200});
matchingLanguage();
form.render();
form.on('submit(formEditBean)', function (data) {
if (winui.verifyForm(data.elem)) {
if(procedureMationList.length == 0){
winui.window.msg('请选择工序', {icon: 2, time: 2000});
return false;
}
if(chargeUser.length == 0){
winui.window.msg('请选择车间负责人', {icon: 2, time: 2000});
return false;
}
var params = {
farmNumber: $("#farmNumber").val(),
farmName: $("#farmName").val(),
departmentId: $("#departmentId").val(),
desc: $("#remark").val(),
chargePerson: chargeUser[0].id,
farmProcedure: JSON.stringify(procedureMationList),
rowId: parent.rowId
};
AjaxPostUtil.request({url: flowableBasePath + "erpfarm004", params: params, type: 'json', callback: function (json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
return false;
});
}
});
// 工序选择
$("body").on("click", "#procedureChoose", function() {
_openNewWindows({
url: "../../tpl/erpWorkProcedure/erpWorkProcedureChoose.html",
title: "工序选择",
pageId: "erpWorkProcedureChoose",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
var str = "";
$.each(procedureMationList, function(i, item) {
str += '<tr><td>' + item.number + '</td><td>' + item.procedureName + '</td><td>' + item.unitPrice + '</td><td>' + item.departmentName + '</td></tr>';
});
$("#procedureBody").html(str);
}});
});
// 车间负责人选择
$("body").on("click", "#chargeUserIdSelPeople", function(e) {
systemCommonUtil.userReturnList = [].concat(chargeUser);
systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含
systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要
systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选
systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) {
chargeUser = [].concat(userReturnList);
if(chargeUser.length > 0){
$("#chargeUserId").val(chargeUser[0].name);
}
});
});
// 取消
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
});
\ No newline at end of file
erp-produce/src/main/resources/template/js/erpFarm/erpFarmList.js 已删除 100644 → 0
浏览文件 @ aaf65246
var rowId = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'soulTable'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
soulTable = layui.soulTable,
table = layui.table;
authBtn('1598779841062');// 新增
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'erpfarm001',
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], type: 'numbers' },
{ field: 'farmNumber', title: '车间编号', align: 'left', width: 100, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.farmNumber + '</a>';
}},
{ field: 'farmName', title: '车间名称', align: 'left', width: 250},
{ field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
if(d.state == '1'){
return "<span class='state-up'>正常</span>";
} else if (d.state == '2'){
return "<span class='state-down'>维修整改</span>";
} else {
return "参数错误";
}
}},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 100 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: '最后修改时间', align: 'center', width: 100},
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, 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 === 'delete') { // 删除
deletemember(data);
} else if (layEvent === 'details') { // 详情
details(data);
} else if (layEvent === 'edit') { // 编辑
edit(data);
} else if (layEvent === 'norms') { // 正常
norms(data);
} else if (layEvent === 'rectification') { // 维修整改
rectification(data);
}
});
// 搜索表单
form.render();
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()})
}
return false;
});
// 编辑
function edit(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/erpFarm/erpFarmEdit.html",
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "erpFarmEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 删除
function deletemember(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
AjaxPostUtil.request({url: flowableBasePath + "erpfarm005", params: {rowId: data.id}, type: 'json', 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/erpFarm/erpFarmDetail.html",
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "erpFarmDetail",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
// 恢复正常
function norms(data) {
layer.confirm('确认要恢复正常吗？', { icon: 3, title: '恢复操作' }, function (index) {
AjaxPostUtil.request({url: flowableBasePath + "erpfarm008", params: {rowId: data.id}, type: 'json', callback: function (json) {
winui.window.msg("提交成功。", {icon: 1, time: 2000});
loadTable();
}});
});
}
// 维修整改
function rectification(data) {
layer.confirm('确认要维修整改吗？', { icon: 3, title: '维修整改操作' }, function (index) {
AjaxPostUtil.request({url: flowableBasePath + "erpfarm009", params: {rowId: data.id}, type: 'json', callback: function (json) {
winui.window.msg("提交成功。", {icon: 1, time: 2000});
loadTable();
}});
});
}
//添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: "../../tpl/erpFarm/erpFarmAdd.html",
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "erpFarmAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
$("body").on("click", "#reloadTable", function() {
loadTable();
});
//刷新
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams(){
return {
farmNumber: $("#farmNumber").val(),
farmName: $("#farmName").val(),
state: $("#state").val()
};
}
exports('erpFarmList', {});
});
erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmAdd.html 已删除 100644 → 0
浏览文件 @ aaf65246
<!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 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">
<input type="text" id="farmNumber" name="farmNumber" win-verify="required" placeholder="请填写车间编号" class="layui-input"/>
</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="farmName" name="farmName" placeholder="请填写车间名称" class="layui-input"/>
</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">
<select id="departmentId" name="departmentId" lay-filter="departmentId" win-verify="required" >
</select>
<div class="layui-form-mid layui-word-aux">该列表为当前用户所在企业的部门列表</div>
</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="chargeUserId" name="chargeUserId" placeholder="请选择车间负责人" disabled class="layui-input" win-verify="required"/>
<i class="fa fa-user-plus input-icon" id="chargeUserIdSelPeople"></i>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">备注说明</label>
<div class="layui-input-block">
<textarea id="remark" name="remark" placeholder="请输入备注说明" maxlength="200" class="layui-textarea" style="height: 100px;"></textarea>
</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">工序资料<i class="red">*</i></label>
<div class="layui-input-block">
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="procedureChoose">工序选择</button>
<table class="layui-table">
<thead>
<tr>
<th>工序编号</th>
<th>工序名称</th>
<th>加工单价</th>
<th>加工部门</th>
</tr>
</thead>
<tbody id="procedureBody">
</tbody>
</table>
</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="formAddBean"><language showName="com.skyeye.save"></language></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/erpFarm/'}).use('erpFarmAdd');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmChoose.html
浏览文件 @ 7eba8f2e
......@@ -5,50 +5,20 @@
<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/layui/lay/modules/contextMenu/jquery.contextMenu.min.css" rel="stylesheet" />
</head>
<body>
<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
<div class="winui-tip alert-info" id="showInfo">
<div class="winui-tip alert-info" id="showInfo">
</div>
<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>
<button id="saveCheckBox" class="winui-toolbtn search-table-btn-right" type="button" style="display: none;"><i class="fa fa-save" aria-hidden="true"></i><language showName="com.skyeye.save"></language></button>
</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="procedureId" name="procedureId" lay-search="">
</select>
</div>
<label class="layui-form-label">车间编号</label>
<div class="layui-input-inline">
<input type="text" id="farmNumber" name="farmNumber" placeholder="请输入车间编号" class="layui-input" />
</div>
<label class="layui-form-label">车间名称</label>
<div class="layui-input-inline">
<input type="text" id="farmName" name="farmName" 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>
<button class="layui-btn layui-btn-sm layui-btn-normal" type="button" id="saveCheckBox" style="float: right; display: none;">
<i class="fa fa-save" aria-hidden="true" style="margin-right: 5px"></i>保存
</button>
</div>
</div>
<div style="margin:auto 10px;">
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
</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">
......
erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmDetail.html 已删除 100644 → 0
浏览文件 @ aaf65246
<!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>
<script type="text/x-handlebars-template" id="beanTemplate">
{{#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">
{{farmNumber}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">车间名称：</label>
<div class="layui-input-block ver-center">
{{farmName}}
</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">
{{chargeName}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">备注说明：</label>
<div class="layui-input-block ver-center">
{{desc}}
</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">
<table class="layui-table">
<thead>
<tr>
<th>工序编号</th>
<th>工序名称</th>
<th>加工单价</th>
<th>加工部门</th>
</tr>
</thead>
<tbody id="procedureBody">
{{#each procedureList}}
<tr>
<td>{{number}}</td>
<td>{{procedureName}}</td>
<td>{{unitPrice}}</td>
<td>{{departmentName}}</td>
</tr>
{{/each}}
</tbody>
</table>
</div>
</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/erpFarm/'}).use('erpFarmDetail');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmEdit.html 已删除 100644 → 0
浏览文件 @ aaf65246
<!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>
<script type="text/x-handlebars-template" id="beanTemplate">
{{#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">车间编号<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="farmNumber" name="farmNumber" win-verify="required" placeholder="请填写车间编号" class="layui-input" value="{{farmNumber}}"/>
</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="farmName" name="farmName" placeholder="请填写车间名称" class="layui-input" value="{{farmName}}"/>
</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">
<select id="departmentId" name="departmentId" lay-filter="departmentId" win-verify="required" >
</select>
<div class="layui-form-mid layui-word-aux">该列表为当前用户所在企业的部门列表</div>
</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="chargeUserId" name="chargeUserId" placeholder="请选择车间负责人" disabled class="layui-input" win-verify="required" value="{{chargeName}}"/>
<i class="fa fa-user-plus input-icon" id="chargeUserIdSelPeople"></i>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">备注说明</label>
<div class="layui-input-block">
<textarea id="remark" name="remark" placeholder="请输入备注说明" maxlength="200" class="layui-textarea" style="height: 100px;">{{desc}}</textarea>
</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">工序资料<i class="red">*</i></label>
<div class="layui-input-block">
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="procedureChoose">工序选择</button>
<table class="layui-table">
<thead>
<tr>
<th>工序编号</th>
<th>工序名称</th>
<th>加工单价</th>
<th>加工部门</th>
</tr>
</thead>
<tbody id="procedureBody">
{{#each procedureList}}
<tr>
<td>{{number}}</td>
<td>{{procedureName}}</td>
<td>{{unitPrice}}</td>
<td>{{departmentName}}</td>
</tr>
{{/each}}
</tbody>
</table>
</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="formEditBean"><language showName="com.skyeye.save"></language></button>
</div>
</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/erpFarm/'}).use('erpFarmEdit');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmList.html 已删除 100644 → 0
浏览文件 @ aaf65246
<!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;">
<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="farmNumber" name="farmNumber" placeholder="请输入车间编号" class="layui-input" />
</div>
<label class="layui-form-label">车间名称</label>
<div class="layui-input-inline">
<input type="text" id="farmName" name="farmName" placeholder="请输入车间名称" class="layui-input" />
</div>
<label class="layui-form-label">状态</label>
<div class="layui-input-inline">
<select lay-filter="state" lay-search="" id="state">
<option value="">全部</option>
<option value="1">正常</option>
<option value="2">维修整改</option>
</select>
</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>
<button id="addBean" class="winui-toolbtn" auth="1598779841062"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
{{# if(auth('1598779851230')){ }}
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if((d.state == '1' || d.state == '2') && auth('1598779859073')){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# if(d.state == '2' && auth('1598779878558')){ }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="norms">恢复正常</a>
{{# } }}
{{# if(d.state == '1' && auth('1598779887492')) { }}
<a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="rectification">维修整改</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/erpFarm/'}).use('erpFarmList');
</script>
</body>
</html>
\ No newline at end of file
web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js
浏览文件 @ 7eba8f2e
......@@ -163,7 +163,7 @@ var dsFormUtil = {
if (showType == 8 && dsFormComponent.numCode == 'userStaffChoose') {
var key = attrDefinition.attrKey;
// 例如：将key由relationUserId变为relationUserMation
key = key.replace("Id", "") + "Mation";
key = dsFormUtil.getKeyIdToMation(key);
value = data[key];
if (!isNull(value) && !$.isEmptyObject(value)) {
// 判断值是否为对象，如果是对象，则组装成数组
......@@ -532,7 +532,7 @@ var dsFormUtil = {
if (showType == 8) {
var key = attrDefinition.attrKey;
// 例如：将key由relationUserId变为relationUserMation
key = key.replace("Id", "") + "Mation";
key = dsFormUtil.getKeyIdToMation(key);
value = data[key];
if (!isNull(value) && !$.isEmptyObject(value)) {
// 判断值是否为对象，如果是对象，则组装成数组
......@@ -546,6 +546,10 @@ var dsFormUtil = {
return value;
},
getKeyIdToMation: function (key) {
return key.replace("Id", "") + "Mation";
},
/**
* 目前用于工作流详情展示
*
......
web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js
浏览文件 @ 7eba8f2e
......@@ -63,7 +63,11 @@ var initTableChooseUtil = {
var headerStr = '<th style="width: 30px;"></th>';
$.each(newOptions.cols, function (i, item) {
var colHeaderId = isNull(item.colHeaderId) ? "" : ("id = " + item.colHeaderId);
headerStr += '<th style="width: ' + item.width + 'px; white-space: nowrap;" ' + colHeaderId + '>' + item.title + '</th>';
var bs = '';
if (item.verify.indexOf('required') >= 0) {
bs = '<i class="red">*</i>';
}
headerStr += '<th style="width: ' + item.width + 'px; white-space: nowrap;" ' + colHeaderId + '>' + item.title + bs + '</th>';
});
$("#header" + newOptions.id).html(headerStr);
},
......@@ -191,7 +195,7 @@ var initTableChooseUtil = {
value = $("#" + tdId).val();
} else if (bean.formType == 'detail') {
value = $("#" + tdId).html();
} else if (item.formType == 'chooseInput') {
} else if (bean.formType == 'chooseInput') {
value = $("#" + tdId).attr("data-id");
}
row[bean.id] = value;
......@@ -278,13 +282,15 @@ var initTableChooseUtil = {
if (formType == 'input') {
$("#" + tdId).val(value);
} else if (formType == 'chooseInput') {
$("#" + tdId).val(value);
$("#" + tdId).attr("data-id", value);
var key = dsFormUtil.getKeyIdToMation(bean.id);
value = data[key];
$("#" + tdId).val(value.name || value.title);
} else if (formType == 'select') {
if (!isNull(value["html"])) {
$("#" + tdId).html(value["html"]);
}
$("#" + tdId).val(value["value"]);
$("#" + tdId).val(value);
} else if (formType == 'detail') {
$("#" + tdId).html(value);
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或