提交 f91aafd2 编写于 作者: Skyeye云's avatar Skyeye云

feat: 资产明细修改

上级 6b192c26
// 已经选择的资产集合key:表格的行trId,value:资产信息
var allChooseAsset = {};
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form;
let assetId = getNotUndefinedVal(GetUrlParam("assetId"));
let assetMap = {};
initTableChooseUtil.initTable({
id: "assetList",
cols: [
{id: 'assetId', title: '资产', formType: 'chooseInput', width: '150', iconClassName: 'chooseAssetBtn', verify: 'required'},
{id: 'operNumber', title: '条形码数量', formType: 'input', width: '140', verify: 'required|number', value: '1'}
],
deleteRowCallback: function (trcusid) {
delete allChooseAsset[trcusid];
},
addRowCallback: function (trcusid) {
if (!isNull(assetId)) {
if (isNull(assetMap[assetId])) {
AjaxPostUtil.request({url: sysMainMation.admBasePath + "queryAssetById", params: {"id": assetId}, type: 'json', method: 'GET', callback: function (json) {
assetMap[assetId] = json.bean
}, async: false});
}
let chooseAssetMation = assetMap[assetId]
// 获取表格行号
var thisRowKey = trcusid.replace("tr", "");
// 资产名称赋值
$("#assetId" + thisRowKey).val(chooseAssetMation.name);
$("#assetId" + thisRowKey).attr(initTableChooseUtil.chooseInputDataIdKey, chooseAssetMation.id);
// 资产赋值
allChooseAsset[trcusid] = chooseAssetMation;
}
},
form: form,
minData: 1
});
$("body").on("click", ".chooseAssetBtn", function (e) {
var trId = $(this).parent().parent().attr("trcusid");
adminAssistantUtil.assetCheckType = false; // 选择类型,默认单选,true:多选,false:单选
adminAssistantUtil.openAssetChoosePage(function (checkAssetMation){
// 获取表格行号
var thisRowKey = trId.replace("tr", "");
$("#assetId" + thisRowKey.toString()).attr(initTableChooseUtil.chooseInputDataIdKey, checkAssetMation.id);
$("#assetId" + thisRowKey.toString()).val(checkAssetMation.name);
allChooseAsset[trId] = checkAssetMation;
});
});
matchingLanguage();
form.render();
form.on('submit(formAddBean)', function (data) {
if (winui.verifyForm(data.elem)) {
var result = initTableChooseUtil.getDataList('assetList');
if (!result.checkResult) {
return false;
}
var noError = false;
var tableData = [];
$.each(result.dataList, function(i, item) {
// 获取行编号
var thisRowKey = item["trcusid"].replace("tr", "");
if (parseInt(item.operNumber) == 0) {
$("#operNumber" + thisRowKey).addClass("layui-form-danger");
$("#operNumber" + thisRowKey).focus();
winui.window.msg('数量不能为0', {icon: 2, time: 2000});
noError = true;
return false;
}
// 资产对象
var asset = allChooseAsset["tr" + thisRowKey];
if (inTableDataArrayByAssetarId(asset.id, tableData)) {
winui.window.msg('一张单中不允许出现相同的资产信息.', {icon: 2, time: 2000});
noError = true;
return false;
}
item["assetId"] = asset.id;
tableData.push(item);
});
if (noError) {
return false;
}
var params = {
list: JSON.stringify(tableData),
};
AjaxPostUtil.request({url: sysMainMation.admBasePath + "insertAssetReport", params: params, type: 'json', method: 'POST', callback: function (json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
return false;
});
// 判断选中的资产是否也在数组中
function inTableDataArrayByAssetarId(assetId, array) {
var isIn = false;
$.each(array, function(i, item) {
if(item.assetId === assetId) {
isIn = true;
return false;
}
});
return isIn;
}
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
\ No newline at end of file
......@@ -25,6 +25,9 @@ layui.config({
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'assetMation', title: '资产名称', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.name);
}},
{ field: 'assetNum', title: '资产编号', width: 160 },
{ field: 'unitPrice', title: '采购单价', width: 100 },
{ field: 'fromId', title: '资产来源', width: 120, templet: function(d) {
......@@ -62,20 +65,60 @@ layui.config({
var layEvent = obj.event;
if (layEvent === 'barCode') { // 条形码预览
systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.barCodeMation.imagePath));
} else if (layEvent === 'delete') { // 删除
delet(data);
}
});
// 删除
function delet(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
layer.close(index);
AjaxPostUtil.request({url: sysMainMation.admBasePath + "deleteAssetReportById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
}
// 新增
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: "../../tpl/materialCode/materialCodeAdd.html?assetId=" + assetId,
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "materialCodeAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 批量复制
$("body").on("click", "#batchCopy", function() {
_openNewWindows({
url: "../../tpl/materialCode/batchCopy.html?assetId=" + assetId,
title: '批量复制',
pageId: "materialCodeBatchCopy",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
});
form.render();
$("body").on("click", "#reloadTable", function() {
loadassetTable();
loadTable();
});
function loadassetTable() {
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {assetId: assetId}, initTableSearchUtil.getSearchValue("messageTable"));
let params = {
assetId: assetId
}
return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('assetReportList', {});
......
......@@ -39,7 +39,7 @@ layui.config({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.admBasePath + 'myhasmation001',
url: sysMainMation.admBasePath + 'queryAssetReportList',
where: getTableParams(),
even: true,
page: true,
......@@ -130,7 +130,7 @@ layui.config({
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
return $.extend(true, {state: "myUse"}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('assetReportUnUseChoose', {});
......
......@@ -39,7 +39,7 @@ layui.config({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.admBasePath + 'queryUnUseAssetReportList',
url: sysMainMation.admBasePath + 'queryAssetReportList',
where: getTableParams(),
even: true,
page: true,
......@@ -128,7 +128,7 @@ layui.config({
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
return $.extend(true, {state: "unUse"}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('assetReportUnUseChoose', {});
......
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'form', 'textool'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
textool = layui.textool,
form = layui.form;
var assetId = getNotUndefinedVal(GetUrlParam("assetId"));
if (!isNull(assetId)) {
AjaxPostUtil.request({url: sysMainMation.admBasePath + "queryAssetById", params: {"id": assetId}, type: 'json', method: 'GET', callback: function (json) {
// 资产名称赋值
$("#assetId").val(json.bean.name);
$("#assetId").attr(initTableChooseUtil.chooseInputDataIdKey, json.bean.id);
}});
}
textool.init({
eleId: 'barCode',
tools: ['copy', 'reset', 'clear']
});
$("body").on("click", ".chooseAssetBtn", function (e) {
adminAssistantUtil.assetCheckType = false; // 选择类型,默认单选,true:多选,false:单选
adminAssistantUtil.openAssetChoosePage(function (checkAssetMation){
// 获取表格行号
$("#assetId").attr(initTableChooseUtil.chooseInputDataIdKey, checkAssetMation.id);
$("#assetId").val(checkAssetMation.name);
});
});
matchingLanguage();
form.render();
form.on('submit(getBean)', function (data) {
if (winui.verifyForm(data.elem)) {
let params = {
assetId: getNotUndefinedVal($("#assetId").attr(initTableChooseUtil.chooseInputDataIdKey)),
state: $("#state").val(),
limit: $("#number").val(),
page: 1
}
AjaxPostUtil.request({url: sysMainMation.admBasePath + "queryAssetReportCodeList", params: params, type: 'json', method: 'POST', callback: function (json) {
$("#barCode").val(json.rows.join('\n'));
$("#tips").html("共计获取个" + json.total + "条形码");
}});
}
return false;
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
\ No newline at end of file
......@@ -15,7 +15,7 @@ layui.config({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.admBasePath + 'myhasmation001',
url: sysMainMation.admBasePath + 'queryAssetReportList',
where: getTableParams(),
even: true,
page: true,
......@@ -62,7 +62,7 @@ layui.config({
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
return $.extend(true, {state: "myUse"}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('myAssetManagement', {});
......
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<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="" autocomplete="off">
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">基本信息</span><hr>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">资产明细</label>
<div class="layui-input-block" id="assetList">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button>
</div>
</div>
</form>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base : '../../js/assetReportManage/'}).use('assetReportAdd');
</script>
</body>
</html>
\ No newline at end of file
......@@ -7,13 +7,23 @@
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div class="winui-tip alert-info" id="showInfo">
只有状态为空的条形码可以删除。
</div>
<div class="winui-toolbar">
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
</div>
<button id="addBean" class="winui-toolbtn search-table-btn-right"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
<button id="batchCopy" class="winui-toolbtn search-table-btn-right"><i class="fa fa-copy" aria-hidden="true"></i>批量复制</button>
</div>
</div>
<div style="margin: auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
{{# if (isNull(d.state)) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
......
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<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="" autocomplete="off">
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">基本信息</span><hr>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">资产</label>
<div class="layui-input-block input-add-icon">
<input type="text" id="assetId" name="assetId" placeholder="请选择资产" class="layui-input" readonly="readonly"/>
<i class="fa fa-plus-circle input-icon chooseAssetBtn"></i>
</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="state" name="state" lay-filter="state" lay-search="">
<option value="">请选择</option>
<option value="unUse">未使用</option>
<option value="unPut">未入库</option>
</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="number" name="number" win-verify="required|number" placeholder="请输入获取编码的数量" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">条形码</label>
<div class="layui-input-block">
<textarea id="barCode" name="barCode" class="layui-textarea" style="height: 200px;"></textarea>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">获取结果:</label>
<div class="layui-input-block ver-center" id="tips">
</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="getBean">获取</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/assetReportManage/'}).use('batchCopy');
</script>
</body>
</html>
\ No newline at end of file
......@@ -29,7 +29,6 @@ layui.config({
},
addRowCallback: function (trcusid) {
if (!isNull(materialId)) {
$("#materialId").val(materialId);
if (isNull(materialMap[materialId])) {
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryMaterialListById", params: {"id": materialId}, type: 'json', method: 'GET', callback: function (json) {
materialMap[materialId] = json.bean
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册