Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1440
Star 162
Fork 130
S
Skyeye
提交 996ee626 编写于 作者: W weizhiqiang
浏览文件
操作

【ADM】资产管理整改

上级 a201214d
隐藏空白更改
内联 并排
Showing with 245 addition and 239 deletion
admin-assistant/src/main/resources/template/js/assetArticles/assetArticlesDetails.js
浏览文件 @ 996ee626
......@@ -16,7 +16,7 @@ layui.config({
params: {rowId: parent.rowId},
pagination: false,
template: $("#beanTemplate").html(),
ajaxSendLoadBefore: function(hdb){
ajaxSendLoadBefore: function(hdb) {
},
ajaxSendAfter:function (json) {
// 附件回显
......
admin-assistant/src/main/resources/template/js/assetManage/assetManageAdd.js
浏览文件 @ 996ee626
......@@ -53,11 +53,11 @@ layui.config({
employeeId: systemCommonUtil.tagEditorGetItemData('employeeId', employeeuserList),
assetImg: $("#assetImg").find("input[type='hidden'][name='upload']").attr("oldurl")
};
if(isNull(params.assetImg)){
winui.window.msg('请上传资产图片', {icon: 2, time: 2000});
return false;
}
AjaxPostUtil.request({url: flowableBasePath + "asset002", params: params, type: 'json', callback: function (json) {
if (isNull(params.assetImg)) {
winui.window.msg('请上传资产图片', {icon: 2, time: 2000});
return false;
}
AjaxPostUtil.request({url: flowableBasePath + "writeAssetMation", params: params, type: 'json', method: "POST", callback: function (json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
......
admin-assistant/src/main/resources/template/js/assetManage/assetManageDetails.js
浏览文件 @ 996ee626
......@@ -15,11 +15,11 @@ layui.config({
showGrid({
id: "showForm",
url: flowableBasePath + "asset006",
params: {rowId:parent.rowId},
params: {rowId: parent.rowId},
pagination: false,
template: getFileContent('tpl/assetManage/assetManageDetailsTemplate.tpl'),
ajaxSendLoadBefore: function(hdb){
hdb.registerHelper("compare2", function(v1, options){
template: $("#beanTemplate").html(),
ajaxSendLoadBefore: function(hdb) {
hdb.registerHelper("compare2", function (v1, options) {
return v1.replace(reg, "\n");
});
},
......
admin-assistant/src/main/resources/template/js/assetManage/assetManageEdit.js
浏览文件 @ 996ee626
......@@ -18,19 +18,19 @@ layui.config({
showGrid({
id: "showForm",
url: flowableBasePath + "asset004",
params: {rowId:parent.rowId},
params: {rowId: parent.rowId},
pagination: false,
template: getFileContent('tpl/assetManage/assetManageEditTemplate.tpl'),
ajaxSendLoadBefore: function(hdb){
hdb.registerHelper("compare1", function(v1, options){
if(isNull(v1)){
template: $("#beanTemplate").html(),
ajaxSendLoadBefore: function(hdb) {
hdb.registerHelper("compare1", function (v1, options) {
if (isNull(v1)) {
return path + "assets/img/uploadPic.png";
} else {
return basePath + v1;
}
});
},
ajaxSendAfter:function (json) {
ajaxSendAfter: function (json) {
// 生产日期
laydate.render({elem: '#manufacturerTime', type: 'date', max: getFormatDate(), trigger: 'click'});
......@@ -84,7 +84,7 @@ layui.config({
form.on('submit(formEditBean)', function (data) {
if (winui.verifyForm(data.elem)) {
var params = {
rowId: parent.rowId,
id: parent.rowId,
assetName: $("#assetName").val(),
assetNum: $("#assetNum").val(),
specifications: $("#specifications").val(),
......@@ -102,11 +102,11 @@ layui.config({
employeeId: systemCommonUtil.tagEditorGetItemData('employeeId', employeeuserList),
assetImg: $("#assetImg").find("input[type='hidden'][name='upload']").attr("oldurl")
};
if(isNull(params.assetImg)) {
winui.window.msg('请上传资产图片', {icon: 2, time: 2000});
return false;
}
AjaxPostUtil.request({url: flowableBasePath + "asset005", params: params, type: 'json', callback: function (json) {
if (isNull(params.assetImg)) {
winui.window.msg('请上传资产图片', {icon: 2, time: 2000});
return false;
}
AjaxPostUtil.request({url: flowableBasePath + "writeAssetMation", params: params, type: 'json', method: "POST", callback: function (json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
......
admin-assistant/src/main/resources/template/js/assetManage/assetManageList.js
浏览文件 @ 996ee626
......@@ -9,9 +9,7 @@ layui.config({
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
laydate = layui.laydate,
......
admin-assistant/src/main/resources/template/tpl/assetManage/assetManageDetails.html
浏览文件 @ 996ee626
......@@ -12,6 +12,114 @@
</form>
</div>
<script type="text/x-handlebars-template" id="beanTemplate">
{{#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">
<label class="layui-form-label">资产名称：</label>
<div class="layui-input-block ver-center">
{{assetName}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">图片：</label>
<div class="layui-input-block ver-center">
<img src="" class="photo-img" id="assetImg">
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产类型：</label>
<div class="layui-input-block ver-center">
{{typeId}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产来源：</label>
<div class="layui-input-block ver-center">
{{fromId}}
</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 class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产规格：</label>
<div class="layui-input-block ver-center">
{{specifications}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<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">
{{assetAdmin}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关描述：</label>
<div class="layui-input-block ver-center">
{{roomAddDesc}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关附件：</label>
<div class="layui-input-block ver-center" id="enclosureUpload">
</div>
</div>
{{/bean}}
</script>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
......
admin-assistant/src/main/resources/template/tpl/assetManage/assetManageDetailsTemplate.tpl 已删除 100644 → 0
浏览文件 @ a201214d
{{#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">
<label class="layui-form-label">资产名称：</label>
<div class="layui-input-block ver-center">
{{assetName}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">图片：</label>
<div class="layui-input-block ver-center">
<img src="" class="photo-img" id="assetImg">
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产类型：</label>
<div class="layui-input-block ver-center">
{{typeId}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产来源：</label>
<div class="layui-input-block ver-center">
{{fromId}}
</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 class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产规格：</label>
<div class="layui-input-block ver-center">
{{specifications}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<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">
{{assetAdmin}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关描述：</label>
<div class="layui-input-block ver-center">
{{roomAddDesc}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关附件：</label>
<div class="layui-input-block ver-center" id="enclosureUpload">
</div>
</div>
{{/bean}}
\ No newline at end of file
admin-assistant/src/main/resources/template/tpl/assetManage/assetManageEdit.html
浏览文件 @ 996ee626
......@@ -12,6 +12,120 @@
</form>
</div>
<script type="text/x-handlebars-template" id="beanTemplate">
{{#bean}}
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">资产名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="assetName" name="assetName" win-verify="required" placeholder="请输入资产名称" class="layui-input" value="{{assetName}}"/>
<div class="layui-form-mid layui-word-aux">新增的资产，状态默认为正常。</div>
</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">
<div class="upload" id="assetImg"></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="typeId" name="typeId" lay-filter="typeId" lay-search="" win-verify="required">
</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">
<select id="fromId" name="fromId" lay-filter="fromId" lay-search="" win-verify="required">
</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 class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产规格</label>
<div class="layui-input-block">
<input type="text" id="specifications" name="specifications" placeholder="请输入资产规格" class="layui-input" value="{{specifications}}"/>
</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="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">
<input type="text" id="assetAdmin" name="assetAdmin" placeholder="请选择资产管理人" class="layui-input" value="{{assetAdmin}}"/>
<i class="fa fa-user-plus input-icon" id="userNameSelPeople"></i>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关描述</label>
<div class="layui-input-block">
<textarea id="roomAddDesc" name="roomAddDesc" placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200">{{roomAddDesc}}</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="formEditBean"><language showName="com.skyeye.save"></language></button>
</div>
</div>
{{/bean}}
</script>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
......
admin-assistant/src/main/resources/template/tpl/assetManage/assetManageEditTemplate.tpl 已删除 100644 → 0
浏览文件 @ a201214d
{{#bean}}
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">资产名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="assetName" name="assetName" win-verify="required" placeholder="请输入资产名称" class="layui-input" value="{{assetName}}"/>
<div class="layui-form-mid layui-word-aux">新增的资产，状态默认为正常。</div>
</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">
<div class="upload" id="assetImg"></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="typeId" name="typeId" lay-filter="typeId" lay-search="" win-verify="required">
</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">
<select id="fromId" name="fromId" lay-filter="fromId" lay-search="" win-verify="required">
</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 class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产规格</label>
<div class="layui-input-block">
<input type="text" id="specifications" name="specifications" placeholder="请输入资产规格" class="layui-input" value="{{specifications}}"/>
</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="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">
<input type="text" id="assetAdmin" name="assetAdmin" placeholder="请选择资产管理人" class="layui-input" value="{{assetAdmin}}"/>
<i class="fa fa-user-plus input-icon" id="userNameSelPeople"></i>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关描述</label>
<div class="layui-input-block">
<textarea id="roomAddDesc" name="roomAddDesc" placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200">{{roomAddDesc}}</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="formEditBean"><language showName="com.skyeye.save"></language></button>
</div>
</div>
{{/bean}}
\ No newline at end of file
admin-assistant/src/main/resources/template/tpl/assetManage/assetManageList.html
浏览文件 @ 996ee626
......@@ -64,7 +64,7 @@
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="assetlistrepair">维修</a>
{{# } }}
{{# } }}
{{# if(auth('1566466124392')){ }}
{{# if(auth('1566465526122')){ }}
<a class="layui-btn layui-btn-xs" lay-event="assetlistedit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1566466151326')){ }}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或