Skip to content

S
Skyeye

doc_wei / Skyeye

通知 1195
Star 154
Fork 127
S
Skyeye
提交 178080a3 编写于 作者: doc_wei's avatar doc_wei
浏览文件
操作

资产领用托管到表单布局

上级 12b365b0
隐藏空白更改
内联 并排
Showing with 100 addition and 686 deletion
admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js
浏览文件 @ 178080a3
......@@ -40,7 +40,7 @@ layui.config({
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar' }
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#messageTableBar' }
]],
done: function(json) {
matchingLanguage();
......
admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js
浏览文件 @ 178080a3
......@@ -40,7 +40,7 @@ layui.config({
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar' }
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#messageTableBar' }
]],
done: function(json) {
matchingLanguage();
......
admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js
浏览文件 @ 178080a3
......@@ -41,7 +41,7 @@ layui.config({
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#messageTableBar'}
]],
done: function(json) {
matchingLanguage();
......
admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseAdd.js 已删除 100644 → 0
浏览文件 @ 12b365b0
// 资产领用
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'fileUpload', 'form'], function(exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form;
var serviceClassName = sysServiceMation["assetManageUse"]["key"];
var allChooseAssetReport = {};
// 获取当前登录员工信息
systemCommonUtil.getSysCurrentLoginUserMation(function (data) {
$("#useTitle").html("资产领用申请单-" + getYMDFormatDate() + '-' + data.bean.userName);
$("#useName").html(data.bean.userName);
});
skyeyeEnclosure.init('enclosureUpload');
// 资产
initTableChooseUtil.initTable({
id: "assetReportList",
cols: [
{id: 'assetReportId', title: '资产', formType: 'chooseInput', width: '150', iconClassName: 'chooseAssetReportBtn', verify: 'required'},
{id: 'specifications', title: '规格', formType: 'detail', width: '150'},
{id: 'assetNum', title: '编号', formType: 'detail', width: '150'},
{id: 'assetImg', title: '图片', formType: 'detail', width: '80'},
{id: 'storageArea', title: '存放区域', formType: 'detail', width: '150'},
{id: 'remark', title: '备注', formType: 'input', width: '100'}
],
deleteRowCallback: function (trcusid) {
delete allChooseAssetReport[trcusid];
},
addRowCallback: function (trcusid) {
},
form: form,
minData: 1
});
matchingLanguage();
form.render();
// 保存为草稿
form.on('submit(formAddBean)', function(data) {
if(winui.verifyForm(data.elem)) {
saveData("1", "");
}
return false;
});
// 提交审批
form.on('submit(formSubBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
return false;
});
function saveData(subType, approvalId) {
var result = initTableChooseUtil.getDataList('assetReportList');
if (!result.checkResult) {
return false;
}
var tableData = new Array();
var noError = false;
$.each(result.dataList, function(i, item) {
// 获取行编号
var thisRowKey = item["trcusid"].replace("tr", "");
var assetReport = allChooseAssetReport["tr" + thisRowKey];
if (judgeInPoingArr(tableData, "assetReportId", assetReport.id)) {
winui.window.msg('领用单存在相同的资产', {icon: 2, time: 2000});
noError = true;
return false;
}
item["assetReportId"] = assetReport.id;
tableData.push(item);
});
if (noError) {
return false;
}
var params = {
title: $("#useTitle").html(),
remark: $("#remark").val(),
assetReportListStr: JSON.stringify(tableData),
enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'),
subType: subType, // 表单类型 1.保存草稿 2.提交审批
approvalId: approvalId
};
AjaxPostUtil.request({url: flowableBasePath + "asset012", params: params, type: 'json', callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
$("body").on("click", ".chooseAssetReportBtn", function() {
var trId = $(this).parent().parent().attr("trcusid");
adminAssistantUtil.assetReportCheckType = false; // 选择类型，默认单选，true:多选，false:单选
adminAssistantUtil.openAssetReportChoosePage(function (checkAssetReportMation){
// 获取表格行号
var thisRowKey = trId.replace("tr", "");
$("#assetReportId" + thisRowKey.toString()).val(checkAssetReportMation.assetName);
$("#specifications" + thisRowKey.toString()).html(checkAssetReportMation.specifications);
$("#assetNum" + thisRowKey.toString()).html(checkAssetReportMation.assetNum);
$("#assetImg" + thisRowKey.toString()).html('<img src="' + systemCommonUtil.getFilePath(checkAssetReportMation.assetImg) + '" class="photo-img">');
$("#storageArea" + thisRowKey.toString()).html(checkAssetReportMation.storageArea);
allChooseAssetReport[trId] = checkAssetReportMation;
});
});
// 图片查看
$("body").on("click", ".photo-img", function() {
systemCommonUtil.showPicImg($(this).attr("src"));
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
\ No newline at end of file
admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseDetails.js 已删除 100644 → 0
浏览文件 @ 12b365b0
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.$;
AjaxPostUtil.request({url: flowableBasePath + "asset013", params: {rowId: parent.rowId}, type: 'json', method: "GET", callback: function (json) {
json.bean.stateName = activitiUtil.showStateName2(json.bean.state, 1);
$("#showForm").html(getDataUseHandlebars($("#useTemplate").html(), json));
// 附件回显
skyeyeEnclosure.showDetails({"enclosureUploadBtn": json.bean.enclosureInfo});
matchingLanguage();
}});
// 图片查看
$("body").on("click", ".photo-img", function() {
systemCommonUtil.showPicImg($(this).attr("src"));
});
});
});
\ No newline at end of file
admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseEdit.js 已删除 100644 → 0
浏览文件 @ 12b365b0
// 资产领用
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'fileUpload', 'form'], function(exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form;
var serviceClassName = sysServiceMation["assetManageUse"]["key"];
var allChooseAssetReport = {};
AjaxPostUtil.request({url: flowableBasePath + "asset014", params: {rowId: parent.rowId}, type: 'json', callback: function(json) {
$("#useTitle").html(json.bean.title);
$("#useName").html(json.bean.userName);
$("#remark").val(json.bean.remark);
// 附件回显
skyeyeEnclosure.initTypeISData({'enclosureUpload': json.bean.enclosureInfo});
if(json.bean.state == '1'){
$(".typeTwo").removeClass("layui-hide");
} else {
$(".typeOne").removeClass("layui-hide");
}
// 资产
initTableChooseUtil.initTable({
id: "assetReportList",
cols: [
{id: 'assetReportId', title: '资产', formType: 'chooseInput', width: '150', iconClassName: 'chooseAssetReportBtn', verify: 'required'},
{id: 'specifications', title: '规格', formType: 'detail', width: '150'},
{id: 'assetNum', title: '编号', formType: 'detail', width: '150'},
{id: 'assetImg', title: '图片', formType: 'detail', width: '80'},
{id: 'storageArea', title: '存放区域', formType: 'detail', width: '150'},
{id: 'remark', title: '备注', formType: 'input', width: '100'}
],
deleteRowCallback: function (trcusid) {
delete allChooseAssetReport[trcusid];
},
addRowCallback: function (trcusid) {
},
form: form,
minData: 1
});
initTableChooseUtil.deleteAllRow('assetReportList');
$.each(json.bean.goods, function(i, item) {
var params = {
"assetReportId": item.assetName,
"specifications": item.specifications,
"assetNum": item.assetNum,
"assetImg": '<img src="' + systemCommonUtil.getFilePath(item.assetImg) + '" class="photo-img">',
"storageArea": item.storageArea,
"remark": item.remark
};
var trcusid = initTableChooseUtil.resetData('assetReportList', params);
item["id"] = item.assetReportId;
allChooseAssetReport[trcusid] = item;
});
matchingLanguage();
}});
// 保存为草稿
form.on('submit(formEditBean)', function(data) {
if(winui.verifyForm(data.elem)) {
saveData('1', "");
}
return false;
});
// 提交审批
form.on('submit(formSubBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
return false;
});
// 工作流中保存
form.on('submit(subBean)', function(data) {
if(winui.verifyForm(data.elem)) {
saveData('3', "");
}
return false;
});
function saveData(subType, approvalId) {
var result = initTableChooseUtil.getDataList('assetReportList');
if (!result.checkResult) {
return false;
}
var tableData = new Array();
var noError = false;
$.each(result.dataList, function(i, item) {
// 获取行编号
var thisRowKey = item["trcusid"].replace("tr", "");
var assetReport = allChooseAssetReport["tr" + thisRowKey];
if (judgeInPoingArr(tableData, "assetReportId", assetReport.id)) {
winui.window.msg('领用单存在相同的资产', {icon: 2, time: 2000});
noError = true;
return false;
}
item["assetReportId"] = assetReport.id;
tableData.push(item);
});
if (noError) {
return false;
}
var params = {
remark: $("#remark").val(),
assetListStr: JSON.stringify(tableData),
rowId: parent.rowId,
enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'),
subType: subType, // 1：保存为草稿 2.提交到工作流 3.在工作流中编辑
approvalId: approvalId,
};
AjaxPostUtil.request({url: flowableBasePath + "asset015", params: params, type: 'json', callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
$("body").on("click", ".chooseAssetReportBtn", function() {
var trId = $(this).parent().parent().attr("trcusid");
adminAssistantUtil.assetReportCheckType = false; // 选择类型，默认单选，true:多选，false:单选
adminAssistantUtil.openAssetReportChoosePage(function (checkAssetReportMation){
// 获取表格行号
var thisRowKey = trId.replace("tr", "");
$("#assetReportId" + thisRowKey.toString()).val(checkAssetReportMation.assetName);
$("#specifications" + thisRowKey.toString()).html(checkAssetReportMation.specifications);
$("#assetNum" + thisRowKey.toString()).html(checkAssetReportMation.assetNum);
$("#assetImg" + thisRowKey.toString()).html('<img src="' + systemCommonUtil.getFilePath(checkAssetReportMation.assetImg) + '" class="photo-img">');
$("#storageArea" + thisRowKey.toString()).html(checkAssetReportMation.storageArea);
allChooseAssetReport[trId] = checkAssetReportMation;
});
});
// 图片查看
$("body").on("click", ".photo-img", function() {
systemCommonUtil.showPicImg($(this).attr("src"));
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
\ No newline at end of file
admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js
浏览文件 @ 178080a3
......@@ -8,7 +8,7 @@ layui.config({
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
......@@ -19,15 +19,12 @@ layui.config({
// 新增资产领用申请
authBtn('1597242249453');
// '资产领用'页面的选取时间段表格
laydate.render({elem: '#createTime', range: '~'});
// 资产领用管理开始
table.render({
id: 'lingyongTable',
elem: '#lingyongTable',
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'asset010',
url: sysMainMation.admBasePath + 'asset010',
where: getTableParams(),
even: true,
page: true,
......@@ -35,37 +32,43 @@ layui.config({
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'title', title: '标题', width: 300, templet: function (d) {
return '<a lay-event="lingyongDedails" class="notice-title-click">' + d.title + '</a>';
{ field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}},
{ field: 'oddNum', title: '单号', width: 200, align: 'center' },
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
return '<a lay-event="lingyongProcessDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
}},
{ field: 'stateName', title: '状态', width: 90, align: 'center', templet: function (d) {
return activitiUtil.showStateName2(d.state, 1);
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150, align: 'center' },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#lingyongTableBar'}
{ 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 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#messageTableBar'}
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，标题", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
// 资产领用的操作事件
table.on('tool(lingyongTable)', function (obj) {
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'lingyongDedails') { //领用详情
lingyongDedails(data);
} else if (layEvent === 'lingyongEdit') { //编辑领用申请
lingyongEdit(data);
if (layEvent === 'details') { //领用详情
details(data);
} else if (layEvent === 'edit') { //编辑领用申请
edit(data);
} else if (layEvent === 'subApproval') { //提交审批
subApproval(data);
} else if (layEvent === 'cancellation') {//领用作废
cancellation(data);
} else if (layEvent === 'lingyongProcessDetails') {//领用流程详情
} else if (layEvent === 'processDetails') {//领用流程详情
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') {//撤销领用申请
revoke(data);
......@@ -73,10 +76,9 @@ layui.config({
});
// 资产领用详情
function lingyongDedails(data) {
rowId = data.id;
function details(data) {
_openNewWindows({
url: "../../tpl/assetManageUse/assetManageUseDetails.html",
url: systemCommonUtil.getUrl('FP2023062000003&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "assetManageUseDetails",
area: ['90vw', '90vh'],
......@@ -90,9 +92,9 @@ layui.config({
var msg = '确认撤销该资产领用申请吗？';
layer.confirm(msg, { icon: 3, title: '撤销操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: flowableBasePath + "asset036", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
AjaxPostUtil.request({url: sysMainMation.admBasePath + "asset036", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadLingyongTable();
loadTable();
}});
});
}
......@@ -100,27 +102,26 @@ layui.config({
// 新增资产领用
$("body").on("click", "#addUseBean", function() {
_openNewWindows({
url: "../../tpl/assetManageUse/assetManageUseAdd.html",
url: systemCommonUtil.getUrl('FP2023062000001', null),
title: "资产领用申请",
pageId: "assetManageUseAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadLingyongTable();
loadTable();
}});
});
// 编辑资产领用申请
function lingyongEdit(data) {
rowId = data.id;
function edit(data) {
_openNewWindows({
url: "../../tpl/assetManageUse/assetManageUseEdit.html",
url: systemCommonUtil.getUrl('FP2023062000002&id=' + data.id, null),
title: "编辑资产领用申请",
pageId: "assetManageUseEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadLingyongTable();
loadTable();
}
});
}
......@@ -130,9 +131,9 @@ layui.config({
var msg = '确认作废该条领用申请吗？';
layer.confirm(msg, { icon: 3, title: '作废操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: flowableBasePath + "asset016", params: {rowId: data.id}, type: 'json', callback: function (json) {
AjaxPostUtil.request({url: sysMainMation.admBasePath + "asset016", params: {id: data.id}, type: 'json', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadLingyongTable();
loadTable();
}});
});
}
......@@ -143,47 +144,28 @@ layui.config({
layer.close(index);
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
var params = {
rowId: data.id,
id: data.id,
approvalId: approvalId
};
AjaxPostUtil.request({url: flowableBasePath + "asset017", params: params, type: 'json', callback: function (json) {
AjaxPostUtil.request({url: sysMainMation.admBasePath + "asset017", params: params, type: 'json', callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadLingyongTable();
loadTable();
}});
});
});
}
form.render();
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
table.reloadData("lingyongTable", {page: {curr: 1}, where: getTableParams()});
}
return false;
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
// 刷新领用数据
$("body").on("click", "#reloadLingyongTable", function() {
loadLingyongTable();
});
// 刷新领用列表数据
function loadLingyongTable(){
table.reloadData("lingyongTable", {where: getTableParams()});
}
function getTableParams() {
var startTime = "", endTime = "";
if (!isNull($("#createTime").val())) {
startTime = $("#createTime").val().split('~')[0].trim() + ' 00:00:00';
endTime = $("#createTime").val().split('~')[1].trim() + ' 23:59:59';
}
return {
state: $("#lingyongState").val(),
startTime: startTime,
endTime: endTime
};
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('assetManageUseList', {});
});
admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js
浏览文件 @ 178080a3
......@@ -36,7 +36,7 @@ layui.config({
{ field: 'state', title: '状态', align: 'center', width: 100, templet: function(d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("assetReportState", 'id', d.state, 'name');
}},
{ field: 'assetAdminMation', title: '管理员', width: 80, templet: function(d) {
{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
return isNull(d.assetAdminMation) ? '' : d.assetAdminMation.name;
}},
{ field: 'useUserMation', title: '申领人', width: 120, templet: function(d) {
......
admin-assistant/src/main/resources/template/js/assetReportManage/assetReportUnUseChoose.js
浏览文件 @ 178080a3
......@@ -19,22 +19,15 @@ layui.config({
var s = '资产明细选择规则：';
if(assetReportCheckType){
s += '1.多选；如没有查到要选择的资产信息，请检查资产信息是否满足当前规则。';
// 多选保存的资产对象信息
var checkAssetReportMation = [].concat(parent.adminAssistantUtil.checkAssetReportMation);
// 初始化值
var ids = [];
$.each(checkAssetReportMation, function(i, item) {
$.each(parent.adminAssistantUtil.checkAssetReportMation, function(i, item) {
ids.push(item.id);
});
tableCheckBoxUtil.setIds({
gridId: 'messageTable',
fieldName: 'id',
ids: ids
});
tableCheckBoxUtil.init({
gridId: 'messageTable',
filterId: 'messageTable',
fieldName: 'id'
fieldName: 'id',
ids: ids
});
} else {
s += '双击要选择的数据即可选中';
......@@ -46,7 +39,7 @@ layui.config({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'queryUnUseAssetReportList',
url: sysMainMation.admBasePath + 'queryUnUseAssetReportList',
where: getTableParams(),
even: true,
page: true,
......@@ -55,14 +48,19 @@ layui.config({
cols: [[
{ type: assetReportCheckType ? 'checkbox' : 'radio', rowspan: '3', fixed: 'left' },
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '3', fixed: 'left', type: 'numbers' },
{ field: 'assetName', title: '资产名称', width: 120 },
{ field: 'name', title: '资产名称', width: 120 },
{ field: 'specifications', title: '资产规格', width: 140 },
{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
}},
{ field: 'typeName', title: '资产类型', width: 100 },
{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId);
}},
{ field: 'assetNum', title: '资产编号', width: 160 },
{ field: 'storageArea', title: '存放区域', width: 80 },
{ field: 'assetAdmin', title: '负责人', width: 120 }
{ field: 'storageArea', title: '存放区域', width: 200 },
{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
return isNull(d.assetAdminMation) ? '' : d.assetAdminMation.name;
}},
]],
done: function(res) {
matchingLanguage();
......@@ -115,11 +113,9 @@ layui.config({
winui.window.msg("请选择资产", {icon: 2, time: 2000});
return false;
}
AjaxPostUtil.request({url: flowableBasePath + "queryAssetReportListByIds", params: {ids: selectedData.toString()}, type: 'json', method: "POST", callback: function (json) {
parent.adminAssistantUtil.checkAssetReportMation = [].concat(json.rows);
parent.layer.close(index);
parent.refreshCode = '0';
}});
parent.adminAssistantUtil.checkAssetReportMation = [].concat(selectedData);
parent.layer.close(index);
parent.refreshCode = '0';
});
form.render();
......
admin-assistant/src/main/resources/template/tpl/assetManageUse/assetManageUseAdd.html 已删除 100644 → 0
浏览文件 @ 12b365b0
<!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">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">标题<i class="red">*</i></label>
<div class="layui-input-block ver-center" id="useTitle">
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">步骤</label>
<div class="layui-input-block ver-center">
填单
</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 ver-center" id="useName">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">资产<i class="red">*</i></label>
<div class="layui-input-block" id="assetReportList">
</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="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200"></textarea>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关附件</label>
<div class="layui-input-block" id="enclosureUpload">
</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">保存为草稿</button>
<button class="winui-btn" lay-submit lay-filter="formSubBean">提交审批</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/assetManageUse/'}).use('assetManageUseAdd');
</script>
</body>
</html>
\ No newline at end of file
admin-assistant/src/main/resources/template/tpl/assetManageUse/assetManageUseDetails.html 已删除 100644 → 0
浏览文件 @ 12b365b0
<!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">
</form>
</div>
<!-- useTemplate -->
<script type="text/x-handlebars-template" id="useTemplate">
{{#bean}}
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">标题：</label>
<div class="layui-input-block ver-center">
{{title}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">单号：</label>
<div class="layui-input-block ver-center">
{{oddNumber}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">状态：</label>
<div class="layui-input-block ver-center">
{{{stateName}}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">步骤：</label>
<div class="layui-input-block ver-center">
填单
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">责任人：</label>
<div class="layui-input-block ver-center">
{{userName}}
</div>
</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>资产</th>
<th style="width: 150px;">规格</th>
<th style="width: 150px;">编号</th>
<th style="width: 80px;">图片</th>
<th style="width: 150px;">存放区域</th>
<th>状态</th>
<th>备注</th>
</tr>
</thead>
<tbody id="useTable" class="insurance-table">
{{#each goods}}
<tr>
<td>{{assetName}}</td>
<td>{{specifications}}</td>
<td>{{assetNum}}</td>
<td><img src="{{assetImg}}" class="photo-img"></td>
<td>{{storageArea}}</td>
<td>{{stateName}}</td>
<td>{{remark}}</td>
</tr>
{{/each}}
</tbody>
</table>
</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">
<label class="layui-form-label">相关附件：</label>
<div class="layui-input-block ver-center" id="enclosureUploadBtn">
</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/assetManageUse/'}).use('assetManageUseDetails');
</script>
</body>
</html>
\ No newline at end of file
admin-assistant/src/main/resources/template/tpl/assetManageUse/assetManageUseEdit.html 已删除 100644 → 0
浏览文件 @ 12b365b0
<!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">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">标题<i class="red">*</i></label>
<div class="layui-input-block ver-center" id="useTitle">
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">步骤</label>
<div class="layui-input-block ver-center">
填单
</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 ver-center" id="useName">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">资产<i class="red">*</i></label>
<div class="layui-input-block" id="assetReportList">
</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="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200"></textarea>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关附件</label>
<div class="layui-input-block" id="enclosureUpload">
</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 typeOne layui-hide" lay-submit lay-filter="formEditBean">保存为草稿</button>
<button class="winui-btn typeOne layui-hide" lay-submit lay-filter="formSubBean">提交审批</button>
<button class="winui-btn typeTwo layui-hide" lay-submit lay-filter="subBean"><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/assetManageUse/'}).use('assetManageUseEdit');
</script>
</body>
</html>
\ No newline at end of file
admin-assistant/src/main/resources/template/tpl/assetManageUse/assetManageUseList.html
浏览文件 @ 178080a3
......@@ -7,64 +7,34 @@
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="margin:0 auto; height: 100%;">
<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">
<select id="lingyongState">
<option value="">全部</option>
<option value="0">草稿</option>
<option value="1">审核中</option>
<option value="2">审核通过</option>
<option value="3">审核不通过</option>
<option value="4">作废</option>
<option value="5">撤销</option>
</select>
</div>
<label class="layui-form-label">申请时间</label>
<div class="layui-input-inline">
<input type="text" id="createTime" name="createTime" 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 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="addUseBean" class="winui-toolbtn search-table-btn-right" auth="1597242249453"><i class="fa fa-plus" aria-hidden="true"></i>资产领用申请</button>
</div>
<div class="winui-toolbar">
<div class="winui-tool" style="text-align: left;">
<button id="reloadLingyongTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="addUseBean" class="winui-toolbtn" auth="1597242249453"><i class="fa fa-plus" aria-hidden="true"></i>资产领用申请</button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="lingyongTable" lay-filter="lingyongTable"></table>
<script type="text/html" id="lingyongTableBar">
{{# if(d.editRow == '1'){ }}
{{# if(auth('1597242226894')){ }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if(auth('1597242217618')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>
{{# } }}
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="messageTableBar">
{{# if(d.editRow == '1'){ }}
{{# if(auth('1597242226894')){ }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if(d.editRow == '1' || d.editRow == '2'){ }}
{{# if(auth('1597242285664')){ }}
<a class="layui-btn layui-btn-xs" lay-event="lingyongEdit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1597242217618')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>
{{# } }}
{{# if(d.editRow == '2'){ }}
{{# if(auth('1597242206890')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# if(auth('1597242249453')){ }}
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
</script>
</div>
{{# } }}
{{# if(d.editRow == '2'){ }}
{{# if(auth('1597242206890')){ }}
<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">
......
common/src/main/resources/template/js/dsFormPage/editPageContent.js
浏览文件 @ 178080a3
......@@ -234,7 +234,7 @@ layui.config({
</div>`,
};
// 详情类布局才展示的组件属性
var detailsPageAttr = ['attrKeyBox', 'titleBox', 'widthBox', 'tableAttrBox'];
var detailsPageAttr = ['attrKeyBox', 'titleBox', 'widthBox', 'tableAttrBox', 'editEchoScriptBox'];
// 加载组件关联的属性
$.each(html, function (key, value) {
......
web/src/main/resources/template/assets/lib/layui/customer/adminAssistantUtil.js
浏览文件 @ 178080a3
......@@ -37,7 +37,7 @@ var adminAssistantUtil = {
},
/**
* 未申领资产明细选择页面
* 未申领资产明细选择页面---组件管理使用
*
* @param callback 回调函数
*/
......
web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js
浏览文件 @ 178080a3
......@@ -430,7 +430,7 @@ var dsFormUtil = {
$("#" + boxId).append(str);
if (showType == 5) { // 表格展示
var result = dsFormUtil.resetTableValue(value, content.attrTransformTableList);
var result = dsFormUtil.resetTableValue(value, content);
dsFormTableUtil.intStaticTable("messageTable" + content.orderBy, result, content.attrTransformTableList);
} else if (showType == 6) { // 凭证展示
var boxId = "showVoucher" + content.orderBy;
......@@ -442,12 +442,17 @@ var dsFormUtil = {
return content;
},
resetTableValue: function (data, attrTransformTableList) {
if (isNull(data)) {
resetTableValue: function (value, content) {
var attrTransformTableList = content.attrTransformTableList;
if (isNull(value)) {
return [];
}
// 进行表格的列数据转换
if (!isNull(content.editEchoScript)) {
eval(content.editEchoScript);
}
var result = [];
$.each(data, function (i, itemVal) {
$.each(value, function (i, itemVal) {
var map = {};
$.each(itemVal, function (key, val) {
var attrTransformTable = getInPoingArr(attrTransformTableList, 'attrKey', key);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或