Skip to content

S
Skyeye

Skyeye云 / Skyeye

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

【ADM】资产管理整改完成

上级 0f174da2
隐藏空白更改
内联 并排
Showing with 106 addition and 423 deletion
admin-assistant/src/main/resources/template/js/assetManage/assetManageAdd.js
浏览文件 @ 6021d7c5
var userList = new Array();//选择用户返回的集合或者进行回显的集合
var employeeuserList = new Array();//选择用户返回的集合或者进行回显的集合
// 资产信息 // 资产信息
layui.config({ layui.config({
base: basePath, base: basePath,
version: skyeyeVersion version: skyeyeVersion
}).extend({ }).extend({
window: 'js/winui.window' window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'fileUpload', 'tagEditor', 'laydate'], function (exports) { }).define(['window', 'jquery', 'winui', 'fileUpload'], function (exports) {
winui.renderColor(); winui.renderColor();
layui.use(['form'], function (form) { layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$, var $ = layui.$;
laydate = layui.laydate;
// 初始化上传 // 初始化上传
$("#assetImg").upload(systemCommonUtil.uploadCommon003Config('assetImg', 6, '', 1)); $("#assetImg").upload(systemCommonUtil.uploadCommon003Config('assetImg', 6, '', 1));
// 生产日期
laydate.render({elem: '#manufacturerTime', type: 'date', max: getYMDFormatDate(), trigger: 'click'});
// 采购日期
laydate.render({elem: '#purchaseTime', type: 'date', max: getYMDFormatDate(), trigger: 'click'});
// 资产类型 // 资产类型
sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], 'select', "typeId", '', form); sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], 'select', "typeId", '', form);
// 资产来源
sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetFrom"]["key"], 'select', "fromId", '', form);
skyeyeEnclosure.init('enclosureUpload'); skyeyeEnclosure.init('enclosureUpload');
matchingLanguage(); matchingLanguage();
form.render(); form.render();
...@@ -37,20 +24,12 @@ layui.config({ ...@@ -37,20 +24,12 @@ layui.config({
if (winui.verifyForm(data.elem)) { if (winui.verifyForm(data.elem)) {
var params = { var params = {
assetName: $("#assetName").val(), assetName: $("#assetName").val(),
assetNum: $("#assetNum").val(), numberPrefix: $("#numberPrefix").val(),
specifications: $("#specifications").val(), specifications: $("#specifications").val(),
unitPrice: $("#unitPrice").val(), readPrice: $("#readPrice").val(),
manufacturer: $("#manufacturer").val(), describe: $("#describe").val(),
manufacturerTime: $("#manufacturerTime").val(),
supplier: $("#supplier").val(),
purchaseTime: $("#purchaseTime").val(),
storageArea: $("#storageArea").val(),
roomAddDesc: $("#roomAddDesc").val(),
typeId: $("#typeId").val(), typeId: $("#typeId").val(),
fromId: $("#fromId").val(),
enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'), enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'),
assetAdmin: systemCommonUtil.tagEditorGetItemData('assetAdmin', userList),
employeeId: systemCommonUtil.tagEditorGetItemData('employeeId', employeeuserList),
assetImg: $("#assetImg").find("input[type='hidden'][name='upload']").attr("oldurl") assetImg: $("#assetImg").find("input[type='hidden'][name='upload']").attr("oldurl")
}; };
if (isNull(params.assetImg)) { if (isNull(params.assetImg)) {
...@@ -65,47 +44,6 @@ layui.config({ ...@@ -65,47 +44,6 @@ layui.config({
return false; return false;
}); });
//资产管理人
$('#assetAdmin').tagEditor({
initialTags: [],
placeholder: '请选择资产管理人',
editorTag: false,
beforeTagDelete: function(field, editor, tags, val) {
userList = [].concat(arrayUtil.removeArrayPointName(userList, val));
}
});
//资产管理人选择
$("body").on("click", "#userNameSelPeople", function (e) {
systemCommonUtil.userReturnList = [].concat(userList);
systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含
systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要
systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选
systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) {
// 重置数据
userList = [].concat(systemCommonUtil.tagEditorResetData('assetAdmin', userReturnList));
});
});
//资产领用人
$('#employeeId').tagEditor({
initialTags: [],
placeholder: '请选择资产领用人',
editorTag: false,
beforeTagDelete: function(field, editor, tags, val) {
employeeuserList = [].concat(arrayUtil.removeArrayPointName(employeeuserList, val));
}
});
//资产领用人选择
$("body").on("click", "#employeePeople", function (e) {
systemCommonUtil.userReturnList = [].concat(employeeuserList);
systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含
systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要
systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选
systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) {
// 重置数据
employeeuserList = [].concat(systemCommonUtil.tagEditorResetData('employeeId', userReturnList));
});
});
$("body").on("click", "#cancle", function() { $("body").on("click", "#cancle", function() {
parent.layer.close(index); parent.layer.close(index);
}); });
......
admin-assistant/src/main/resources/template/js/assetManage/assetManageDetails.js
浏览文件 @ 6021d7c5
...@@ -10,18 +10,15 @@ layui.config({ ...@@ -10,18 +10,15 @@ layui.config({
layui.use(['form'], function (form) { layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$; var $ = layui.$;
var reg = new RegExp("<br>", "g");
showGrid({ showGrid({
id: "showForm", id: "showForm",
url: flowableBasePath + "asset006", url: flowableBasePath + "asset006",
params: {rowId: parent.rowId}, params: {rowId: parent.rowId},
pagination: false, pagination: false,
template: $("#beanTemplate").html(), template: $("#beanTemplate").html(),
ajaxSendLoadBefore: function(hdb) { ajaxSendLoadBefore: function(hdb, json) {
hdb.registerHelper("compare2", function (v1, options) { json.bean.describe = stringManipulation.textAreaShow(json.bean.describe);
return v1.replace(reg, "\n");
});
}, },
ajaxSendAfter:function (json) { ajaxSendAfter:function (json) {
$("#assetImg").attr("src", fileBasePath + json.bean.assetImg); $("#assetImg").attr("src", fileBasePath + json.bean.assetImg);
......
admin-assistant/src/main/resources/template/js/assetManage/assetManageEdit.js
浏览文件 @ 6021d7c5
var userList = new Array();//选择用户返回的集合或者进行回显的集合
var employeeuserList = new Array();//选择用户返回的集合或者进行回显的集合
// 资产信息 // 资产信息
layui.config({ layui.config({
base: basePath, base: basePath,
version: skyeyeVersion version: skyeyeVersion
}).extend({ }).extend({
window: 'js/winui.window' window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'fileUpload', 'tagEditor', 'laydate'], function (exports) { }).define(['window', 'jquery', 'winui', 'fileUpload'], function (exports) {
winui.renderColor(); winui.renderColor();
layui.use(['form'], function (form) { layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$, var $ = layui.$;
laydate = layui.laydate;
showGrid({ showGrid({
id: "showForm", id: "showForm",
...@@ -31,51 +27,12 @@ layui.config({ ...@@ -31,51 +27,12 @@ layui.config({
}); });
}, },
ajaxSendAfter: function (json) { ajaxSendAfter: function (json) {
// 生产日期
laydate.render({elem: '#manufacturerTime', type: 'date', max: getFormatDate(), trigger: 'click'});
// 采购日期
laydate.render({elem: '#purchaseTime', type: 'date', max: getFormatDate(), trigger: 'click'});
// 资产类型 // 资产类型
sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], 'select', "typeId", json.bean.typeId, form); sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], 'select', "typeId", json.bean.typeId, form);
// 资产来源
sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetFrom"]["key"], 'select', "fromId", json.bean.fromId, form);
// 初始化上传 // 初始化上传
$("#assetImg").upload(systemCommonUtil.uploadCommon003Config('assetImg', 6, json.bean.assetImg, 1)); $("#assetImg").upload(systemCommonUtil.uploadCommon003Config('assetImg', 6, json.bean.assetImg, 1));
var userNames = [];
userList = [].concat(json.bean.assetAdmin);
$.each(json.bean.assetAdmin, function(i, item){
userNames.push(item.name);
});
// 管理人员选择
$('#assetAdmin').tagEditor({
initialTags: userNames,
placeholder: '请选择资产管理人',
editorTag: false,
beforeTagDelete: function(field, editor, tags, val) {
userList = [].concat(arrayUtil.removeArrayPointName(userList, val));
}
});
var employeeuserNames = [];
employeeuserList = [].concat(json.bean.employeeId);
$.each(json.bean.employeeId, function(i, item){
employeeuserNames.push(item.name);
});
// 领用人选择
$('#employeeId').tagEditor({
initialTags: employeeuserNames,
placeholder: '请选择领用人',
editorTag: false,
beforeTagDelete: function(field, editor, tags, val) {
employeeuserList = [].concat(arrayUtil.removeArrayPointName(employeeuserList, val));
}
});
// 附件回显 // 附件回显
skyeyeEnclosure.initTypeISData({'enclosureUpload': json.bean.enclosureInfo}); skyeyeEnclosure.initTypeISData({'enclosureUpload': json.bean.enclosureInfo});
...@@ -85,23 +42,15 @@ layui.config({ ...@@ -85,23 +42,15 @@ layui.config({
if (winui.verifyForm(data.elem)) { if (winui.verifyForm(data.elem)) {
var params = { var params = {
id: parent.rowId, id: parent.rowId,
assetName: $("#assetName").val(), assetName: $("#assetName").val(),
assetNum: $("#assetNum").val(), numberPrefix: $("#numberPrefix").val(),
specifications: $("#specifications").val(), specifications: $("#specifications").val(),
unitPrice: $("#unitPrice").val(), readPrice: $("#readPrice").val(),
manufacturer: $("#manufacturer").val(), describe: $("#describe").val(),
manufacturerTime: $("#manufacturerTime").val(),
supplier: $("#supplier").val(),
purchaseTime: $("#purchaseTime").val(),
storageArea: $("#storageArea").val(),
roomAddDesc: $("#roomAddDesc").val(),
typeId: $("#typeId").val(), typeId: $("#typeId").val(),
fromId: $("#fromId").val(),
enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'), enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'),
assetAdmin: systemCommonUtil.tagEditorGetItemData('assetAdmin', userList),
employeeId: systemCommonUtil.tagEditorGetItemData('employeeId', employeeuserList),
assetImg: $("#assetImg").find("input[type='hidden'][name='upload']").attr("oldurl") assetImg: $("#assetImg").find("input[type='hidden'][name='upload']").attr("oldurl")
}; };
if (isNull(params.assetImg)) { if (isNull(params.assetImg)) {
winui.window.msg('请上传资产图片', {icon: 2, time: 2000}); winui.window.msg('请上传资产图片', {icon: 2, time: 2000});
return false; return false;
...@@ -116,30 +65,6 @@ layui.config({ ...@@ -116,30 +65,6 @@ layui.config({
} }
}); });
// 管理人员选择
$("body").on("click", "#userNameSelPeople", function(e) {
systemCommonUtil.userReturnList = [].concat(userList);
systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含
systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要
systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选
systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) {
// 重置数据
userList = [].concat(systemCommonUtil.tagEditorResetData('assetAdmin', userReturnList));
});
});
// 领用人选择
$("body").on("click", "#employeePeople", function(e) {
systemCommonUtil.userReturnList = [].concat(employeeuserList);
systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含
systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要
systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选
systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) {
// 重置数据
employeeuserList = [].concat(systemCommonUtil.tagEditorResetData('employeeId', userReturnList));
});
});
$("body").on("click", "#cancle", function() { $("body").on("click", "#cancle", function() {
parent.layer.close(index); parent.layer.close(index);
}); });
......
admin-assistant/src/main/resources/template/js/assetManage/assetManageList.js
浏览文件 @ 6021d7c5
var rowId = "";
var taskType = "";//流程详情的主标题 var rowId = "";
var processInstanceId = "";//流程id
layui.config({ layui.config({
base: basePath, base: basePath,
...@@ -17,38 +15,42 @@ layui.config({ ...@@ -17,38 +15,42 @@ layui.config({
// 新增资产 // 新增资产
authBtn('1566465526122'); authBtn('1566465526122');
showAssetList();
// 资产列表管理开始 // 资产列表管理开始
function showAssetList(){ table.render({
table.render({ id: 'assetlistTable',
id: 'assetlistTable', elem: '#assetlistTable',
elem: '#assetlistTable', method: 'post',
method: 'post', url: flowableBasePath + 'asset001',
url: flowableBasePath + 'asset001', where: getTableParams(),
where: getTableParams(), even: true,
even: true, page: true,
page: true, limits: getLimits(),
limits: getLimits(), limit: getLimit(),
limit: getLimit(), cols: [[
cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { field: 'assetName', title: '资产名称', width: 120, templet: function (d) {
{ field: 'companyName', title: '所属公司', align: 'center', width: 170 }, return '<a lay-event="assetlistdetails" class="notice-title-click">' + d.assetName + '</a>';
{ field: 'assetName', title: '名称', width: 120, templet: function (d) { }},
return '<a lay-event="assetlistdetails" class="notice-title-click">' + d.assetName + '</a>'; { field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
}}, return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
{ field: 'typeId', title: '资产所属类型', align: 'center', width: 100 }, }},
{ field: 'assetNum', title: '资产编号', width: 100 }, { field: 'typeId', title: '资产类型', width: 100 },
{ field: 'unitPrice', title: '资产单价', align: 'center', width: 80 }, { field: 'numberPrefix', title: '资产编号前缀', width: 140 },
{ field: 'employeeId', title: '领用人', align: 'center', width: 80 }, { field: 'readPrice', title: '参考价', width: 80 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#assetlisttableBar' } { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
]], { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
done: function(){ { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
matchingLanguage(); { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#assetlisttableBar' }
}); ]],
} done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入资产名称", function () {
table.reload("assetlistTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
// 资产的操作事件
table.on('tool(assetlistTable)', function (obj) { table.on('tool(assetlistTable)', function (obj) {
var data = obj.data; var data = obj.data;
var layEvent = obj.event; var layEvent = obj.event;
...@@ -58,12 +60,12 @@ layui.config({ ...@@ -58,12 +60,12 @@ layui.config({
assetlistdelet(data); assetlistdelet(data);
} else if (layEvent === 'assetlistedit') { // 编辑 } else if (layEvent === 'assetlistedit') { // 编辑
assetlistedit(data); assetlistedit(data);
} else if (layEvent === 'assetImg') { // 图片预览
systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.assetImg));
} }
}); });
form.render(); // 详情
// 资产详情
function assetlistdetails(data){ function assetlistdetails(data){
rowId = data.id; rowId = data.id;
_openNewWindows({ _openNewWindows({
...@@ -86,7 +88,7 @@ layui.config({ ...@@ -86,7 +88,7 @@ layui.config({
}); });
} }
// 新增资产 // 新增
$("body").on("click", "#assetlistaddBean", function() { $("body").on("click", "#assetlistaddBean", function() {
_openNewWindows({ _openNewWindows({
url: "../../tpl/assetManage/assetManageAdd.html", url: "../../tpl/assetManage/assetManageAdd.html",
...@@ -99,7 +101,7 @@ layui.config({ ...@@ -99,7 +101,7 @@ layui.config({
}}); }});
}); });
// 编辑资产 // 编辑
function assetlistedit(data){ function assetlistedit(data){
rowId = data.id; rowId = data.id;
_openNewWindows({ _openNewWindows({
...@@ -113,6 +115,8 @@ layui.config({ ...@@ -113,6 +115,8 @@ layui.config({
}}); }});
} }
form.render();
// 刷新数据
$("body").on("click", "#assetlistreloadTable", function() { $("body").on("click", "#assetlistreloadTable", function() {
loadassetTable(); loadassetTable();
}); });
...@@ -121,15 +125,8 @@ layui.config({ ...@@ -121,15 +125,8 @@ layui.config({
table.reload("assetlistTable", {where: getTableParams()}); table.reload("assetlistTable", {where: getTableParams()});
} }
// 搜索表单
$("body").on("click", "#assetlistSearch", function() {
table.reload("assetlistTable", {page: {curr: 1}, where: getTableParams()});
});
function getTableParams(){ function getTableParams(){
return { return $.extend(true, {}, initTableSearchUtil.getSearchValue("assetlistTable"));
assetName: $("#assetName").val()
};
} }
exports('assetManageList', {}); exports('assetManageList', {});
......
admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnEdit.js
浏览文件 @ 6021d7c5
...@@ -139,8 +139,7 @@ layui.config({ ...@@ -139,8 +139,7 @@ layui.config({
return false; return false;
} }
var row = { var row = {
typeId: $("#typeId" + rowNum).val(), assetReportId: $("#assetId" + rowNum).val(),
assetId: $("#assetId" + rowNum).val(),
remark: $("#remark" + rowNum).val() remark: $("#remark" + rowNum).val()
}; };
tableData.push(row); tableData.push(row);
......
admin-assistant/src/main/resources/template/tpl/assetManage/assetManageAdd.html
浏览文件 @ 6021d7c5
...@@ -30,18 +30,10 @@ ...@@ -30,18 +30,10 @@
</select> </select>
</div> </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">
<select id="fromId" name="fromId" lay-filter="fromId" lay-search="" win-verify="required">
</select>
</div>
</div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产编号<i class="red">*</i></label> <label class="layui-form-label">资产编号前缀<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="assetNum" name="assetNum" win-verify="required" placeholder="请输入资产编号" class="layui-input"/> <input type="text" id="numberPrefix" name="numberPrefix" win-verify="required" placeholder="请输入资产编号前缀" class="layui-input"/>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
...@@ -51,59 +43,15 @@ ...@@ -51,59 +43,15 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产单价<i class="red">*</i></label> <label class="layui-form-label">参考价<i class="red">*</i></label>
<div class="layui-input-block">
<input type="number" id="unitPrice" name="unitPrice" win-verify="required|double" placeholder="请输入资产单价" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">生产商</label>
<div class="layui-input-block">
<input type="text" id="manufacturer" name="manufacturer" placeholder="请输入生产商" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">生产日期</label>
<div class="layui-input-block">
<input type="text" id="manufacturerTime" name="manufacturerTime" placeholder="请选择生产日期" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">供应商</label>
<div class="layui-input-block">
<input type="text" id="supplier" name="supplier" 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="purchaseTime" name="purchaseTime" win-verify="required" placeholder="请选择采购日期" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">存放区域</label>
<div class="layui-input-block">
<input type="text" id="storageArea" name="storageArea" placeholder="请输入存放区域" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">领用人</label>
<div class="layui-input-block">
<input type="text" id="employeeId" name="employeeId" placeholder="请选择资产领用人" class="layui-input"/>
<i class="fa fa-user-plus input-icon" id="employeePeople"></i>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">管理人</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="assetAdmin" name="assetAdmin" placeholder="请选择资产管理人" class="layui-input"/> <input type="text" id="readPrice" name="readPrice" win-verify="required|double" placeholder="请输入参考价" class="layui-input"/>
<i class="fa fa-user-plus input-icon" id="userNameSelPeople"></i>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关描述</label> <label class="layui-form-label">相关描述</label>
<div class="layui-input-block"> <div class="layui-input-block">
<textarea id="roomAddDesc" name="roomAddDesc" placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200"></textarea> <textarea id="describe" name="describe" placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200"></textarea>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
admin-assistant/src/main/resources/template/tpl/assetManage/assetManageDetails.html
浏览文件 @ 6021d7c5
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
<script type="text/x-handlebars-template" id="beanTemplate"> <script type="text/x-handlebars-template" id="beanTemplate">
{{#bean}} {{#bean}}
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">所属公司：</label>
<div class="layui-input-block ver-center">
{{companyName}}
</div>
</div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">资产名称：</label> <label class="layui-form-label">资产名称：</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
...@@ -40,15 +34,9 @@ ...@@ -40,15 +34,9 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产来源：</label> <label class="layui-form-label">资产编号前缀：</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
{{fromId}} {{numberPrefix}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产编号：</label>
<div class="layui-input-block ver-center">
{{assetNum}}
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
...@@ -58,57 +46,15 @@ ...@@ -58,57 +46,15 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产单价：</label> <label class="layui-form-label">参考价：</label>
<div class="layui-input-block ver-center">
{{unitPrice}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">生产商：</label>
<div class="layui-input-block ver-center">
{{manufacturer}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">生产日期：</label>
<div class="layui-input-block ver-center">
{{manufacturerTime}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">供应商：</label>
<div class="layui-input-block ver-center">
{{supplier}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">采购日期：</label>
<div class="layui-input-block ver-center">
{{purchaseTime}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">存放区域：</label>
<div class="layui-input-block ver-center">
{{storageArea}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">领用人：</label>
<div class="layui-input-block ver-center">
{{employeeId}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">管理人：</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
{{assetAdmin}} {{readPrice}}
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关描述：</label> <label class="layui-form-label">相关描述：</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
{{roomAddDesc}} {{describe}}
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
admin-assistant/src/main/resources/template/tpl/assetManage/assetManageEdit.html
浏览文件 @ 6021d7c5
...@@ -37,17 +37,9 @@ ...@@ -37,17 +37,9 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产来源<i class="red">*</i></label> <label class="layui-form-label">资产编号前缀<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<select id="fromId" name="fromId" lay-filter="fromId" lay-search="" win-verify="required"> <input type="text" id="numberPrefix" name="numberPrefix" win-verify="required" placeholder="请输入资产编号前缀" class="layui-input" value="{{numberPrefix}}"/>
</select>
</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="assetNum" name="assetNum" win-verify="required" placeholder="请输入资产编号" class="layui-input" value="{{assetNum}}"/>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
...@@ -57,59 +49,15 @@ ...@@ -57,59 +49,15 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产单价<i class="red">*</i></label> <label class="layui-form-label">参考价<i class="red">*</i></label>
<div class="layui-input-block">
<input type="number" id="unitPrice" name="unitPrice" win-verify="required|double" placeholder="请输入资产单价" class="layui-input" value="{{unitPrice}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">生产商</label>
<div class="layui-input-block">
<input type="text" id="manufacturer" name="manufacturer" placeholder="请输入生产商" class="layui-input" value="{{manufacturer}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">生产日期</label>
<div class="layui-input-block">
<input type="text" id="manufacturerTime" name="manufacturerTime" placeholder="请选择生产日期" class="layui-input" value="{{manufacturerTime}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">供应商</label>
<div class="layui-input-block">
<input type="text" id="supplier" name="supplier" placeholder="请输入供应商" class="layui-input" value="{{supplier}}"/>
</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="purchaseTime" name="purchaseTime" win-verify="required" placeholder="请选择采购日期" class="layui-input" value="{{purchaseTime}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">存放区域</label>
<div class="layui-input-block">
<input type="text" id="storageArea" name="storageArea" placeholder="请输入存放区域" class="layui-input" value="{{storageArea}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">领用人</label>
<div class="layui-input-block">
<input type="text" id="employeeId" name="employeeId" placeholder="请选择资产领用人" class="layui-input" value="{{employeeId}}"/>
<i class="fa fa-user-plus input-icon" id="employeePeople"></i>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">管理人</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="assetAdmin" name="assetAdmin" placeholder="请选择资产管理人" class="layui-input" value="{{assetAdmin}}"/> <input type="text" id="readPrice" name="readPrice" win-verify="required|double" placeholder="请输入参考价" class="layui-input" value="{{readPrice}}"/>
<i class="fa fa-user-plus input-icon" id="userNameSelPeople"></i>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关描述</label> <label class="layui-form-label">相关描述</label>
<div class="layui-input-block"> <div class="layui-input-block">
<textarea id="roomAddDesc" name="roomAddDesc" placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200">{{roomAddDesc}}</textarea> <textarea id="describe" name="describe" placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200">{{roomAddDesc}}</textarea>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
admin-assistant/src/main/resources/template/tpl/assetManage/assetManageList.html
浏览文件 @ 6021d7c5
...@@ -7,39 +7,24 @@ ...@@ -7,39 +7,24 @@
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" /> <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head> </head>
<body> <body>
<div style="margin:0 auto; height: 100%;"> <div class="winui-toolbar">
<div class="txtcenter" style=" margin: 0 auto; padding-top: 10px;"> <div class="winui-tool">
<form class="layui-form layui-form-pane" action="" autocomplete="off"> <button id="assetlistreloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<div class="layui-form-item"> <button id="assetlistaddBean" class="winui-toolbtn search-table-btn-right" auth="1566465526122"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
<div class="layui-inline">
<label class="layui-form-label">资产名称</label>
<div class="layui-input-inline">
<input type="text" id="assetName" name="assetName" 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" type="button" id="assetlistSearch"><language showName="com.skyeye.search2"></language></button>
</div>
</div>
</form>
</div> </div>
<div class="winui-toolbar">
<div class="winui-tool" style="text-align: left;">
<button id="assetlistreloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="assetlistaddBean" class="winui-toolbtn" auth="1566465526122"><i class="fa fa-plus" aria-hidden="true"></i>新增资产</button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="assetlistTable" lay-filter="assetlistTable"></table>
<script type="text/html" id="assetlisttableBar">
{{# if(auth('1566465526122')){ }}
<a class="layui-btn layui-btn-xs" lay-event="assetlistedit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1566466151326')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="assetlistdelet"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
</script>
</div>
</div> </div>
<div style="margin:auto 10px;">
<table id="assetlistTable" lay-filter="assetlistTable"></table>
<script type="text/html" id="assetlisttableBar">
{{# if(auth('1566465526122')){ }}
<a class="layui-btn layui-btn-xs" lay-event="assetlistedit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1566466151326')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="assetlistdelet"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script> <script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script> <script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript"> <script type="text/javascript">
......
userauth/src/main/resources/template/js/sysEveRole/sysEveRoleList.js
浏览文件 @ 6021d7c5
...@@ -32,7 +32,7 @@ layui.config({ ...@@ -32,7 +32,7 @@ layui.config({
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 300, toolbar: '#tableBar' } { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 300, toolbar: '#tableBar' }
]], ]],
done: function(json){ done: function(json) {
matchingLanguage(); matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入角色名称", function () { initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入角色名称", function () {
table.reload("messageTable", {page: {curr: 1}, where: getTableParams()}); table.reload("messageTable", {page: {curr: 1}, where: getTableParams()});
......
userauth/src/main/resources/template/js/syseveuserstaff/syseveuserstafflist.js
浏览文件 @ 6021d7c5
...@@ -127,21 +127,21 @@ layui.config({ ...@@ -127,21 +127,21 @@ layui.config({
table.on('tool(messageTable)', function (obj) { table.on('tool(messageTable)', function (obj) {
var data = obj.data; var data = obj.data;
var layEvent = obj.event; var layEvent = obj.event;
if (layEvent === 'edit') { //编辑 if (layEvent === 'edit') { //编辑
edit(data); edit(data);
}else if (layEvent === 'userPhoto') { //头像预览 } else if (layEvent === 'userPhoto') { //头像预览
systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.userPhoto)); systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.userPhoto));
}else if (layEvent === 'details') { //员工详情 } else if (layEvent === 'details') { //员工详情
details(data); details(data);
}else if (layEvent === 'leave'){ //离职 } else if (layEvent === 'leave') { //离职
leave(data); leave(data);
}else if (layEvent === 'turnTeacher'){ //转教职工 } else if (layEvent === 'turnTeacher') { //转教职工
turnTeacher(data); turnTeacher(data);
}else if (layEvent === 'addCertificate'){ //录入证书 } else if (layEvent === 'addCertificate') { //录入证书
addCertificate(data); addCertificate(data);
}else if (layEvent === 'addEducation'){ //录入教育背景 } else if (layEvent === 'addEducation') { //录入教育背景
addEducation(data); addEducation(data);
} }
}); });
// 编辑 // 编辑
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或