Skip to content

S
Skyeye

doc_wei / Skyeye

通知 1194
Star 154
Fork 127
S
Skyeye
提交 b980394a 编写于 作者: W WJ-202301081617\Wlos
浏览文件
操作

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

上级 da8652da 8266b3f5
隐藏空白更改
内联 并排
Showing with 899 addition and 156 deletion
erp-produce/src/main/resources/template/js/erpDepartStock/departmentalInventoryDetails.js 0 → 100644
浏览文件 @ b980394a
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
table = layui.table;
var materialId = GetUrlParam("materialId");
var normsId = GetUrlParam("normsId");
var departmentId = GetUrlParam("departmentId");
//车间选择商品当前库存信息
initTable()
function initTable() {
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.erpBasePath + 'queryNormsStockDetailList',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
{
field: 'materialMation', title: '产品', align: 'left', width: 120, templet: function (d) {
return isNull(d.materialMation) ? '' : d.materialMation.name
}
},
{
field: 'normsMation', title: '规格', align: 'left', width: 200, templet: function (d) {
return isNull(d.normsMation) ? '' : d.normsMation.name
}
},
{field: 'codeNum', title: '条形码', align: 'center', width: 250},
{
field: 'departmentMation', title: '来源部门', align: 'left', width: 200, templet: function (d) {
return isNull(d.departmentMation) ? '' : d.departmentMation.name
}
},
{
field: 'depotMation', title: '来源仓库', align: 'left', width: 200, templet: function (d) {
return isNull(d.depotMation) ? '' : d.depotMation.name
}
}
]],
done: function (json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "暂不支持搜索", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
var params = {
materialId: materialId,
normsId: normsId,
departmentId: departmentId
}
return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('departmentalInventoryDetails', {});
});
erp-produce/src/main/resources/template/js/erpDepartStock/erpDepartStockList.js
浏览文件 @ b980394a
......@@ -25,7 +25,9 @@ layui.config({
{ field: 'materialMation', title: '产品', align: 'left', width: 120, templet: function (d) {return isNull(d.materialMation) ? '' : d.materialMation.name}},
{ field: 'normsMation', title: '规格', align: 'left', width: 200, templet: function (d) {return isNull(d.normsMation) ? '' : d.normsMation.name}},
{ field: 'departmentMation', title: '处理部门', align: 'left', width: 200, templet: function (d) {return isNull(d.departmentMation) ? '' : d.departmentMation.name}},
{ field: 'stock', title: '部门库存', align: 'center', width: 80 }
{ field: 'stock', title: '部门库存', align: 'center', width: 80,templet: function (d) {
var str = '<a lay-event="inventory" class="notice-title-click">' + d.stock + '</a>';
return str;}},
]],
done: function(json) {
matchingLanguage();
......@@ -35,6 +37,28 @@ layui.config({
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'inventory') { //详情
inventory(data);
}
});
// 部门商品库存详情
function inventory(data) {
_openNewWindows({
url: "../../tpl/erpDepartStock/departmentalInventoryDetails.html?materialId=" + data.materialId
+ "&normsId="+data.normsId + "&departmentId=" + data.departmentId,
title: "部门商品库存详情",
pageId: "productInventoryDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
......
erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js
浏览文件 @ b980394a
......@@ -33,8 +33,7 @@ layui.config({
}});
},
loadComponentCallback: function () {
$("select[attrkey='holderIdType']").prop('disabled', true);
$("select[attrkey='holderIdType']").parent().next().children('i').remove();
$("div[controlType='correspondentAllEnter']").remove();
$("div[controlType='depotOutFromType']").remove();
},
tableAddRowCallback: function (tableId) {
......
erp-produce/src/main/resources/template/js/erpPick/erpReturnPickToPut.js
浏览文件 @ b980394a
......@@ -33,8 +33,7 @@ layui.config({
}});
},
loadComponentCallback: function () {
$("select[attrkey='holderIdType']").prop('disabled', true);
$("select[attrkey='holderIdType']").parent().next().children('i').remove();
$("div[controlType='correspondentEnter']").remove();
$("div[controlType='depotPutFromType']").remove();
},
tableAddRowCallback: function (tableId) {
......
erp-produce/src/main/resources/template/js/erpPick/turnReturnMaterialToPut.js
浏览文件 @ b980394a
......@@ -39,7 +39,7 @@ layui.config({
loadComponentCallback: function () {
$("select[attrkey='departmentId']").prop('disabled', true);
$("select[attrkey='farmId']").prop('disabled', true);
$("div[controlType='requisitionOutLetFromType']").remove();
$("div[controlType='returnPutFromType']").remove();
},
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
......
erp-produce/src/main/resources/template/js/erpPreProductionPlan/preProductionTurnToProduction.js
浏览文件 @ b980394a
......@@ -38,9 +38,8 @@ layui.config({
// 新增行的回调函数
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
$("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
$("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
}
});
}});
......
erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js
浏览文件 @ b980394a
......@@ -57,7 +57,7 @@ layui.config({
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入生产单号", function () {
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
......
erp-produce/src/main/resources/template/js/materialReceiptForm/materialReceiptFormList.js
浏览文件 @ b980394a
......@@ -9,6 +9,7 @@ layui.config({
var $ = layui.$,
form = layui.form,
table = layui.table;
var serviceClassName = sysServiceMation["materialReceiptForm"]["key"];
//物料接收单
table.render({
......@@ -48,9 +49,6 @@ layui.config({
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'otherState', title: '确认状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutOtherState", 'id', d.otherState, 'name');
}},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 },
......@@ -72,8 +70,68 @@ layui.config({
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'delete') { //删除
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'details') { //详情
details(data);
} else if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'subApproval') { //提交审核
erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
});
// 编辑
function edit(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071500004&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "materialReceiptFormEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 详情
function details(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071600001&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "materialReceiptFormDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
// 删除
function del(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpcommon005", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
......
erp-produce/src/main/resources/template/js/materialReceiptForm/materialsAwaitingToReceipt.js
浏览文件 @ b980394a
......@@ -17,38 +17,34 @@ layui.config({
// 待确认物料转物料接收
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotOutTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
// 物料接收的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024071500004', data, {
savePreParams: function (params) {
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertDepotOutToTurnPut", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
loadComponentCallback: function () {
$("select[attrkey='departmentId']").prop('disabled', true);
$("select[attrkey='farmId']").prop('disabled', true);
$("div[controlType='userStaffChoose']").children().children('i').remove();
$("div[controlType='userStaffChoose']").children().children().children().children().children('i').remove();
$("div[controlType='confirmFromType']").remove();
},
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
$("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
$("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
$("div[controlType='simpleTable']").find(".warehouse").prop('disabled', true);
}
});
}});
let data = json.bean;
// 物料接收的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024071500004', data, {
savePreParams: function (params) {
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertDepotOutToTurnPut", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
loadComponentCallback: function () {
$("div[controlType='confirmFromType']").remove();
},
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
$("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
$("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
$("div[controlType='simpleTable']").find(".warehouse").prop('disabled', true);
}
});
}});
});
\ No newline at end of file
erp-produce/src/main/resources/template/js/materialReturnOrder/materialReturnOrderList.js
浏览文件 @ b980394a
......@@ -9,6 +9,7 @@ layui.config({
var $ = layui.$,
form = layui.form,
table = layui.table;
var serviceClassName = sysServiceMation["materialReturnOrder"]["key"];
//物料退货单
table.render({
......@@ -48,8 +49,8 @@ layui.config({
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'otherState', title: '确认状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutOtherState", 'id', d.otherState, 'name');
{ field: 'otherState', title: '入库状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutState", 'id', d.otherState, 'name');
}},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
......@@ -72,6 +73,69 @@ layui.config({
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'delete') { //删除
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'details') { //详情
details(data);
} else if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'subApproval') { //提交审核
erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
});
// 编辑
function edit(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071500005&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "materialReturnOrderEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 详情
function details(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024070100004&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "materialReturnOrderDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
// 删除
function del(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpcommon005", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
......
erp-produce/src/main/resources/template/js/materialReturnOrder/materialReturnOrderToPut.js 0 → 100644
浏览文件 @ b980394a
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var id = GetUrlParam("id");
// 物料退货转仓库入库
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryConfirmReturnTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
console.log(data)
// 仓库入库的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024070100009', data, {
savePreParams: function (params) {
params.holderId=data.holderId
params.holderKey=data.holderKey
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertConfirmReturnToTurnDepot", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
loadComponentCallback: function () {
$("select[attrkey='holderIdType']").prop('disabled', true);
$("select[attrkey='holderIdType']").parent().next().children('i').remove();
$("div[controlType='correspondentEnter']").remove();
$("div[controlType='depotPutFromType']").remove();
},
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
$("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
$("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
$("div[controlType='simpleTable']").find(".warehouse").prop('disabled', true);
}
});
}});
});
\ No newline at end of file
erp-produce/src/main/resources/template/js/materialReturnOrder/materialsAwaitingToReturn.js
浏览文件 @ b980394a
......@@ -30,9 +30,6 @@ layui.config({
}});
},
loadComponentCallback: function () {
$("select[attrkey='departmentId']").prop('disabled', true);
$("select[attrkey='farmId']").prop('disabled', true);
$("div[controlType='userStaffChoose']").children().children('i').remove();
$("div[controlType='confirmFromType']").remove();
},
tableAddRowCallback: function (tableId) {
......
erp-produce/src/main/resources/template/js/materialsAwaitingConfirmation/materialsAwaitingConfirmationList.js
浏览文件 @ b980394a
......@@ -81,6 +81,8 @@ layui.config({
materialReceipt(data);
} else if (layEvent === 'materialReturn'){ // 物料退货
materialReturn(data);
}else if (layEvent === 'details') { //详情
details(data);
}
});
......@@ -111,6 +113,17 @@ layui.config({
}});
}
// 详情
function details(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024070100007&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "materialsAwaitingConfirmationDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
......
erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js
浏览文件 @ b980394a
......@@ -27,20 +27,38 @@ layui.config({
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'oddNumber', title: '单号', align: 'center', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
{ field: 'oddNumber', title: '单号', rowspan: '2', align: 'left', width: 220, templet: function (d) {
var str = '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
if (!isNull(d.fromId)) {
str += '<span class="state-new">[转]</span>';
}
return str;
}},
{ field: 'accountId', width: 150, title: '账户', align: 'center'},
// { field: 'departmentId', width: 150, title: '部门', align: 'center',templet: function (d) {
// if (!isNull(d.departmentMation)) {
// return d.departmentMation.name;
// }
// return '';
// }},
// // { field: 'farmId', width: 150, title: '车间', align: 'center'},
//
// { field: 'farmId', title: '车间', align: 'left', width: 150, templet: function (d) {
// if (!isNull(d.farmMation)) {
// return d.farmMation.name;
// }
// return '';
// }},
//
{ field: 'operTime', width: 150, title: '单据日期', align: 'center'},
{ field: 'farmId', width: 150, title: '车间', align: 'center'},
{ field: 'holderId', width: 150, title: '客户', align: 'center'},
{ field: 'departmentId', width: 120, title: '部门', align: 'center'},
{ field: 'salesman', width: 150, title: '业务员', align: 'center'},
{ field: 'planComplateTime', width: 140, title: '计划完成时间', align: 'center'},
{ field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'center', width: 120 },
// { field: 'farmId', width: 150, title: '车间', align: 'center'},
{ field: 'holderMation', title: '客户', rowspan: '2', align: 'center', width: 150, templet: function (d) {
return getNotUndefinedVal(d.holderMation?.name);
}},
{ field: 'processInstanceId', width: 200, title: '流程ID', align: 'center'},
// { field: 'state', title: '状态', width: 90, templet: function (d) {
// return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("purchaseOrderState", 'id', d.state, 'name');
// }},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
}},
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
......@@ -49,7 +67,7 @@ layui.config({
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入生产单号", function () {
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
......
erp-produce/src/main/resources/template/js/workshopMaterialInventory/productInventoryDetails.js 0 → 100644
浏览文件 @ b980394a
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
table = layui.table;
var materialId = GetUrlParam("materialId");
var normsId = GetUrlParam("normsId");
var farmId = GetUrlParam("farmId");
//车间选择商品当前库存信息
initTable()
function initTable() {
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.erpBasePath + 'queryNormsStockDetailList',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
{
field: 'materialMation', title: '产品', align: 'left', width: 120, templet: function (d) {
return isNull(d.materialMation) ? '' : d.materialMation.name
}
},
{
field: 'normsMation', title: '规格', align: 'left', width: 200, templet: function (d) {
return isNull(d.normsMation) ? '' : d.normsMation.name
}
},
{field: 'codeNum', title: '条形码', align: 'center', width: 250},
{
field: 'departmentMation', title: '来源部门', align: 'left', width: 200, templet: function (d) {
return isNull(d.departmentMation) ? '' : d.departmentMation.name
}
},
{
field: 'depotMation', title: '来源仓库', align: 'left', width: 200, templet: function (d) {
return isNull(d.depotMation) ? '' : d.depotMation.name
}
}
]],
done: function (json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "暂不支持搜索", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
}
form.render();
$("body").on("click", "#reloadTable", function () {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
var params = {
materialId: materialId,
normsId: normsId,
farmId: farmId
}
return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('productInventoryDetails', {});
});
erp-produce/src/main/resources/template/js/workshopMaterialInventory/workshopMaterialInventoryList.js
浏览文件 @ b980394a
......@@ -10,7 +10,7 @@ layui.config({
form = layui.form,
table = layui.table;
var selTemplate = getFileContent('tpl/template/select-option.tpl');
//车间物料库存
// 加载当前用户所属车间
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryStaffBelongFarmList", params: {}, type: 'json', method: "GET", callback: function(json) {
$("#workshopId").html(getDataUseHandlebars(selTemplate, json));
......@@ -38,24 +38,13 @@ layui.config({
limit: getLimit(),
cols: [[
{title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
{
field: 'materialMation', title: '产品', align: 'left', width: 120, templet: function (d) {
return isNull(d.materialMation) ? '' : d.materialMation.name
}
},
{
field: 'normsMation', title: '规格', align: 'left', width: 200, templet: function (d) {
return isNull(d.normsMation) ? '' : d.normsMation.name
}
},
{
field: 'departmentMation', title: '处理车间', align: 'left', width: 200, templet: function (d) {
return isNull(d.departmentMation) ? '' : d.departmentMation.name
}
},
{field: 'stock', title: '车间库存', align: 'center', width: 80}
]],
done: function (json) {
{field: 'materialMation', title: '产品', align: 'left', width: 120, templet: function (d) {return isNull(d.materialMation) ? '' : d.materialMation.name}},
{field: 'normsMation', title: '规格', align: 'left', width: 200, templet: function (d) {return isNull(d.normsMation) ? '' : d.normsMation.name}},
{field: 'departmentMation', title: '来源部门', align: 'left', width: 200, templet: function (d) {return isNull(d.departmentMation) ? '' : d.departmentMation.name}},
{field: 'stock', title: '车间库存', align: 'center', width: 80,templet: function (d) {
var str = '<a lay-event="inventory" class="notice-title-click">' + d.stock + '</a>';
return str;}},]],
done: function (json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "暂不支持搜索", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
......@@ -64,6 +53,28 @@ layui.config({
});
}
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'inventory') { //详情
inventory(data);
}
});
// 车间商品库存详情
function inventory(data) {
_openNewWindows({
url: "../../tpl/workshopMaterialInventory/productInventoryDetails.html?materialId=" + data.materialId
+ "&normsId="+data.normsId + "&farmId=" + data.farmId,
title: "车间商品库存详情",
pageId: "productInventoryDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
......
erp-produce/src/main/resources/template/tpl/erpDepartStock/departmentalInventoryDetails.html 0 → 100644
浏览文件 @ b980394a
<!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="winui-toolbar">
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i>
<language showName="com.skyeye.refreshDataBtn"></language>
</button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
</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/erpDepartStock/'}).use('departmentalInventoryDetails');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionList.html
浏览文件 @ b980394a
......@@ -32,6 +32,19 @@
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
{{# if (d.state == 'pass' || d.state == 'partiallyCompleted') { }}
{{# if (d.productionType == 1) { }}
{{# if (auth('1720796297124')) { }}
<a class="layui-btn layui-btn-xs" lay-event="turnPurchase">转加工单</a>
{{# } }}
{{# } }}
{{# if (d.productionType == 2 ) { }}
{{# if (auth('1720835673573')) { }}
<a class="layui-btn layui-btn-xs" lay-event="transferToWaybill">转整单委外单</a>
{{# } }}
{{# } }}
{{# } }}
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
......
erp-produce/src/main/resources/template/tpl/materialReceiptForm/materialReceiptFormList.html
浏览文件 @ b980394a
......@@ -17,6 +17,22 @@
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
{{# if(d.editRow == 1) { }}
{{# if(auth('1721114400445')) { }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if(auth('1721028158455')) { }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1721114323209')) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# } }}
{{# if(d.editRow == 2) { }}
{{# if(auth('1721114309851')) { }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
</script>
</div>
......
erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderList.html
浏览文件 @ b980394a
<!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" />
<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="winui-toolbar">
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
</div>
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh"
aria-hidden="true"></i>
<language showName="com.skyeye.refreshDataBtn"></language>
</button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
</script>
<script type="text/html" id="tableBar">
{{# if(d.editRow == 1) { }}
{{# if(auth('1721114400445')) { }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if(auth('1721028158455')) { }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1721114323209')) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# } }}
{{# if(d.editRow == 2) { }}
{{# if(auth('1721114309851')) { }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</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/materialReturnOrder/'}).use('materialReturnOrderList');
layui.config({base: '../../js/materialReturnOrder/'}).use('materialReturnOrderList');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderToPut.html 0 → 100644
浏览文件 @ b980394a
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="margin:0 auto;padding:20px;">
<form class="layui-form" action="" id="showForm" autocomplete="off">
<div id="content"></div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>`
<button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
</div>
</div>
</form>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/materialReturnOrder/'}).use('materialReturnOrderToPut');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/workshopMaterialInventory/productInventoryDetails.html 0 → 100644
浏览文件 @ b980394a
<!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="winui-toolbar">
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i>
<language showName="com.skyeye.refreshDataBtn"></language>
</button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
</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/workshopMaterialInventory/'}).use('productInventoryDetails');
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/js/depotPut/transList.js
浏览文件 @ b980394a
......@@ -94,7 +94,7 @@ layui.config({
pageUrl = 'FP2024070100003';
} else if (type == 6) {
// 物料退货单
pageUrl = 'FP2024070100004';
pageUrl = 'FP2024071500005';
}
_openNewWindows({
url: systemCommonUtil.getUrl(pageUrl + '&id=' + data.id, null),
......@@ -126,7 +126,7 @@ layui.config({
pageUrl = '../../tpl/erpPick/erpReturnPickToPut.html';
} else if (type == 6) {
// 物料退货单
pageUrl = '';
pageUrl = '../../tpl/materialReturnOrder/materialReturnOrderToPut.html';
}
_openNewWindows({
url: pageUrl + '?id=' + data.id,
......
erp/src/main/resources/template/js/salesOrder/chooseList.js
浏览文件 @ b980394a
......@@ -36,6 +36,7 @@ layui.config({
{ field: 'holderMation', title: '客户', rowspan: '2', align: 'left', width: 150, templet: function (d) {
return getNotUndefinedVal(d.holderMation?.name);
}},
{ field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 },
{ colspan: '2', title: '来源单据信息', align: 'center' },
......
erp/src/main/resources/template/js/salesOrder/salesOrderToOutlet.js
浏览文件 @ b980394a
......@@ -18,7 +18,6 @@ layui.config({
// 销售订单转销售出库
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "querySealsOrderTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
console.log(5555,data)
// 销售出库的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2023042700002', data, {
savePreParams: function (params) {
......
school/src/main/resources/template/js/schoolteacher/schoolteacherlist.js
浏览文件 @ b980394a
......@@ -45,17 +45,9 @@ layui.config({
}
}},
{ field: 'userIdCard', title: '身份证', align: 'center', width: 160 },
{ field: 'userSex', title: '性别', width: 60, align: 'center', templet: function (d) {
if(d.userSex == '0'){
return "保密";
} else if (d.userSex == '1'){
return "男";
} else if (d.userSex == '2'){
return "女";
} else {
return "参数错误";
}
}},
{ field: 'userSex', title: '性别', width: 60, rowspan: '2', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sexEnum", 'id', d.userSex, 'name');
}},
{ field: 'state', title: '状态', width: 60, align: 'center', templet: function (d) {
if(d.state == '1'){
return "<span class='state-up'>在职</span>";
......
userauth/src/main/resources/template/js/sysEveUser/resetUserEffectiveDate.js 0 → 100644
浏览文件 @ b980394a
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'laydate', 'form'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form,
laydate = layui.laydate;
var id = GetUrlParam("id");
var startTime = laydate.render({
elem: '#startTime', //指定元素
format: 'yyyy-MM-dd',
min: minDate(),
theme: 'grid',
done:function(value, date){
endTime.config.min = {
year: date.year,
month: date.month - 1,//关键
date: date.date,
hours: date.hours,
minutes: date.minutes,
seconds: date.seconds
};
}
});
var endTime = laydate.render({
elem: '#endTime', //指定元素
format: 'yyyy-MM-dd',
min: minDate(),
theme: 'grid',
done:function(value, date){
startTime.config.max = {
year: date.year,
month: date.month - 1,//关键
date: date.date,
hours: date.hours,
minutes: date.minutes,
seconds: date.seconds
}
}
});
// 设置最小可选的日期
function minDate(){
var now = new Date();
return now.getFullYear() + "-" + (now.getMonth() + 1) + "-" + now.getDate();
}
AjaxPostUtil.request({url: reqBasePath + "querySysEveUserById", params: {id: id}, type: 'json', method: "GET", callback: function (json) {
skyeyeClassEnumUtil.showEnumDataListByClassName("userIsTermOfValidity", 'radio', "isTermOfValidity", json.bean.isTermOfValidity, form);
if (json.bean.isTermOfValidity == 1) {
$(".effectiveDate").hide();
} else if (json.bean.isTermOfValidity == 2) {
$(".effectiveDate").show();
$("#startTime").val(json.bean.startTime);
$("#endTime").val(json.bean.endTime);
}
}});
form.on('radio(isTermOfValidityFilter)', function (data) {
let val = data.value;
if (val == 1) {
$(".effectiveDate").hide();
} else if (val == 2) {
$(".effectiveDate").show();
}
});
matchingLanguage();
form.render();
form.on('submit(resetUserEffectiveDate)', function(data) {
if (winui.verifyForm(data.elem)) {
var params = {
id: id,
isTermOfValidity: dataShowType.getData('isTermOfValidity'),
startTime: $("#startTime").val(),
endTime: $("#endTime").val()
};
AjaxPostUtil.request({url: reqBasePath + "resetUserEffectiveDate", params: params, type: 'json', method: "POST", callback: function (json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
return false;
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
\ No newline at end of file
userauth/src/main/resources/template/js/sysEveUser/sysEveUserAdd.js
浏览文件 @ b980394a
......@@ -8,13 +8,64 @@ layui.config({
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'tableSelect'], function (exports) {
}).define(['window', 'table', 'jquery', 'winui', 'tableSelect', 'laydate'], function (exports) {
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
tableSelect = layui.tableSelect;
tableSelect = layui.tableSelect,
laydate = layui.laydate;
var startTime = laydate.render({
elem: '#startTime', //指定元素
format: 'yyyy-MM-dd',
min: minDate(),
theme: 'grid',
done:function(value, date){
endTime.config.min = {
year: date.year,
month: date.month - 1,//关键
date: date.date,
hours: date.hours,
minutes: date.minutes,
seconds: date.seconds
};
}
});
var endTime = laydate.render({
elem: '#endTime', //指定元素
format: 'yyyy-MM-dd',
min: minDate(),
theme: 'grid',
done:function(value, date){
startTime.config.max = {
year: date.year,
month: date.month - 1,//关键
date: date.date,
hours: date.hours,
minutes: date.minutes,
seconds: date.seconds
}
}
});
// 设置最小可选的日期
function minDate(){
var now = new Date();
return now.getFullYear() + "-" + (now.getMonth() + 1) + "-" + now.getDate();
}
skyeyeClassEnumUtil.showEnumDataListByClassName("userIsTermOfValidity", 'radio', "isTermOfValidity", '', form);
$(".effectiveDate").hide();
form.on('radio(isTermOfValidityFilter)', function (data) {
let val = data.value;
if (val == 1) {
$(".effectiveDate").hide();
} else if (val == 2) {
$(".effectiveDate").show();
}
});
form.verify({
password : function(value, item) {
if(value.length < 6){
......@@ -46,17 +97,9 @@ layui.config({
return '<a rowId="' + d.id + '" class="notice-title-click">' + d.jobNumber + '</a>';
}},
{ field: 'userName', title: '员工姓名', width: 100 },
{ field: 'userSex', title: '性别', width: 60, templet: function (d) {
if(d.userSex == '0'){
return "保密";
} else if (d.userSex == '1'){
return "男";
} else if (d.userSex == '2'){
return "女";
} else {
return "参数错误";
}
}}
{ field: 'userSex', title: '性别', width: 60, rowspan: '2', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sexEnum", 'id', d.userSex, 'name');
}},
]]
},
done: function (elem, data) {
......@@ -88,7 +131,9 @@ layui.config({
staffId: staffId,
userCode: $("#userCode").val(),
password: $("#password").val(),
isTermOfValidity: $("#isTermOfValidity").val()
isTermOfValidity: dataShowType.getData('isTermOfValidity'),
startTime: $("#startTime").val(),
endTime: $("#endTime").val()
}
AjaxPostUtil.request({url: reqBasePath + "sysAdd005", params: params, type: 'json', method: "POST", callback: function (json) {
parent.layer.close(index);
......
userauth/src/main/resources/template/js/sysEveUser/sysEveUserList.js
浏览文件 @ b980394a
......@@ -23,33 +23,32 @@ layui.config({
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', fixed: 'left' },
{ field: 'userCode', title: '账号', width: 120, fixed: 'left' },
{ field: 'userName', title: '姓名', align: 'left', width: 100, fixed: 'left', templet: function (d) {
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2', fixed: 'left' },
{ field: 'userCode', title: '账号', width: 120, fixed: 'left', rowspan: '2' },
{ field: 'userName', title: '姓名', align: 'left', width: 100, fixed: 'left', rowspan: '2', templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.userName + '</a>';
}},
{ field: 'jobNumber', title: '工号', align: 'left', width: 100, fixed: 'left'},
{ field: 'email', title: '邮箱', width: 100 },
{ field: 'sexName', title: '性别', width: 60, templet: function (d) {
if(d.sexName == '0') {
return "保密";
} else if (d.sexName == '1'){
return "男";
} else if (d.sexName == '2'){
return "女";
} else {
return "参数错误";
}
{ field: 'jobNumber', title: '工号', align: 'left', width: 100, fixed: 'left', rowspan: '2' },
{ field: 'state', title: '有效期', align: 'center', width: 90, colspan: 3},
{ field: 'email', title: '邮箱', width: 100, rowspan: '2' },
{ field: 'userSex', title: '性别', width: 60, rowspan: '2', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sexEnum", 'id', d.userSex, 'name');
}},
{ field: 'companyName', title: '所属公司', width: 150 },
{ field: 'departmentName', title: '所属部门', width: 120},
{ field: 'jobName', title: '担任职位', width: 120},
{ field: 'userLock', title: '是否锁定', align: 'center', width: 90, templet: '#checkboxTpl', unresize: true},
{ field: 'roleName', title: '角色', width: 120},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]],
{ field: 'companyName', title: '所属公司', rowspan: '2', width: 150 },
{ field: 'departmentName', title: '所属部门', rowspan: '2', width: 120},
{ field: 'jobName', title: '担任职位', rowspan: '2', width: 120},
{ field: 'userLock', title: '是否锁定', rowspan: '2', align: 'center', width: 90, templet: '#checkboxTpl', unresize: true},
{ field: 'roleName', title: '角色', rowspan: '2', width: 120},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', rowspan: '2', width: 250, toolbar: '#tableBar'}
], [
{ field: 'isTermOfValidity', title: '类型', align: 'center', width: 100, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("userIsTermOfValidity", 'id', d.isTermOfValidity, 'name');
}},
{ field: 'startTime', title: '开始时间', align: 'center', width: 100 },
{ field: 'endTime', title: '结束时间', align: 'center', width: 100 },
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入账号、员工姓名、员工工号", function () {
......@@ -71,6 +70,8 @@ layui.config({
systemCommonUtil.showPicImg(fileBasePath + data.userPhoto);
} else if (layEvent === 'details') { // 员工详情
details(data);
} else if (layEvent === 'resetUserEffectiveDate') { // 重置有效期
resetUserEffectiveDate(data);
}
});
......@@ -78,7 +79,7 @@ layui.config({
// 监听锁定操作
form.on('checkbox(lockDemo)', function(obj) {
if(obj.elem.checked){
if (obj.elem.checked) {
// 锁定
lock(obj.value);
} else {
......@@ -88,15 +89,15 @@ layui.config({
});
// 锁定
function lock(id){
AjaxPostUtil.request({url: reqBasePath + "sys002", params: {rowId: id}, type: 'json', method: "PUT", callback: function (json) {
function lock(id) {
AjaxPostUtil.request({url: reqBasePath + "sys002", params: {id: id}, type: 'json', method: "PUT", callback: function (json) {
winui.window.msg("已成功锁定，该账号目前无法登录.", {icon: 1, time: 2000});
}});
}
// 解锁
function unlock(id){
AjaxPostUtil.request({url: reqBasePath + "sys003", params: {rowId: id}, type: 'json', method: "PUT", callback: function (json) {
function unlock(id) {
AjaxPostUtil.request({url: reqBasePath + "sys003", params: {id: id}, type: 'json', method: "PUT", callback: function (json) {
winui.window.msg("账号恢复正常.", {icon: 1, time: 2000});
}});
}
......@@ -114,6 +115,19 @@ layui.config({
loadTable();
}});
}
// 重置有效期
function resetUserEffectiveDate(data) {
_openNewWindows({
url: "../../tpl/sysEveUser/resetUserEffectiveDate.html?id=" + data.id,
title: "重置有效期",
pageId: "resetUserEffectiveDate",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 绑定角色
function bindRole(data) {
......
userauth/src/main/resources/template/js/sysEveUser/sysEveUserPasswordEdit.js
浏览文件 @ b980394a
......@@ -28,7 +28,7 @@ layui.config({
form.on('submit(formEditPwdBean)', function (data) {
if (winui.verifyForm(data.elem)) {
var params = {
rowId: parent.rowId,
id: parent.rowId,
password: $("#password").val(),
};
......
userauth/src/main/resources/template/tpl/sysEveUser/resetUserEffectiveDate.html 0 → 100644
浏览文件 @ b980394a
<!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" autocomplete="off">
<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">有效期<i class="red">*</i></label>
<div class="layui-input-block winui-radio" id="isTermOfValidity">
</div>
</div>
<div class="layui-form-item layui-col-xs6 effectiveDate">
<label class="layui-form-label">有效开始时间<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="startTime" name="startTime" placeholder="请选择开始时间" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6 effectiveDate">
<label class="layui-form-label">有效结束时间<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="endTime" name="endTime" placeholder="请选择结束时间" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="resetUserEffectiveDate"><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/sysEveUser/'}).use('resetUserEffectiveDate');
</script>
</body>
</html>
\ No newline at end of file
userauth/src/main/resources/template/tpl/sysEveUser/sysEveUserAdd.html
浏览文件 @ b980394a
......@@ -21,10 +21,21 @@
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">有效期<i class="red">*</i></label>
<div class="layui-input-block winui-radio">
<input type="radio" id="isTermOfValidity" name="isTermOfValidity" value="1" title="长期有效" checked="checked"/>
<div class="layui-input-block winui-radio" id="isTermOfValidity">
</div>
</div>
<div class="layui-form-item layui-col-xs6 effectiveDate">
<label class="layui-form-label">有效开始时间<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="startTime" name="startTime" placeholder="请选择开始时间" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6 effectiveDate">
<label class="layui-form-label">有效结束时间<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="endTime" name="endTime" 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">
......
userauth/src/main/resources/template/tpl/sysEveUser/sysEveUserList.html
浏览文件 @ b980394a
......@@ -21,12 +21,15 @@
</script>
<script type="text/html" id="tableBar">
{{# if(auth('1552960326068')){ }}
{{# if (auth('1552960326068')) { }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit">重置密码</a>
{{# } }}
{{# if(auth('1552960399251')){ }}
{{# if (auth('1552960399251')) { }}
<a class="layui-btn layui-btn-xs" lay-event="bindRole">绑定角色</a>
{{# } }}
{{# if (auth('1721130435799')) { }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="resetUserEffectiveDate">重置有效期</a>
{{# } }}
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
......
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @ b980394a
......@@ -18,6 +18,7 @@
"checkDayType": {"name": "日程插件上的类型(包含日程的)", "className": "skyeye-pro#com.skyeye.common.enumeration.CheckDayType"},
"userStaffType": {"name": "员工类型", "className": "skyeye-pro#com.skyeye.personnel.classenum.UserStaffType"},
"pageOpenType": {"name": "页面布局打开方式", "className": "skyeye-pro#com.skyeye.operate.classenum.PageOpenType"},
"userIsTermOfValidity": {"name": "用户是否长期有效", "className": "skyeye-pro#com.skyeye.personnel.classenum.UserIsTermOfValidity"},
"menuType": {"name": "APP菜单类型", "className": "skyeye-pro#com.skyeye.menu.classenum.MenuType"},
"urlType": {"name": "APP菜单URL类型", "className": "skyeye-pro#com.skyeye.menu.classenum.UrlType"},
......
web/src/main/resources/template/json/sysServiceMation.json
浏览文件 @ b980394a
......@@ -28,6 +28,8 @@
"supplementOutList": {"name": "补料出库单", "key": "com.skyeye.pick.service.impl.PatchOutLetServiceImpl"},
"pickReturn": {"name": "退料单", "key": "com.skyeye.pick.service.impl.ReturnMaterialServiceImpl"},
"returnMaterialPutList": {"name": "退料入库单", "key": "com.skyeye.pick.service.impl.ReturnPutServiceImpl"},
"materialReceiptForm": {"name": "物料接收单", "key": "com.skyeye.pickconfirm.service.impl.ConfirmPutServiceImpl"},
"materialReturnOrder": {"name": "物料退货单", "key": "com.skyeye.pickconfirm.service.impl.ConfirmReturnServiceImpl"},
"proworkLoad": {"name": "项目工作量审核", "key": "com.skyeye.service.impl.ProWorkloadServiceImpl"},
"proTask": {"name": "项目任务审核", "key": "com.skyeye.service.impl.ProTaskServiceImpl"},
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或