Skip to content

S
Skyeye

doc_wei / Skyeye

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

ERP库存盘点列表查询修改

上级 9cc540bd
显示空白变更内容
内联 并排
Showing with 51 addition and 63 deletion
erp/src/main/resources/template/js/storeHouseInventory/storeHouseInventoryList.js
浏览文件 @ 4c4aaf2b
......@@ -54,29 +54,28 @@ layui.config({
limit: 8,
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
{ field: 'name', title: '商品名称', rowspan: '2', align: 'left', width: 150, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
{ field: 'materialName', title: '商品名称', rowspan: '2', align: 'left', width: 150, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.materialName + '</a>';
}},
{ field: 'model', title: '型号', rowspan: '2', align: 'left', width: 150 },
{ field: 'categoryName', title: '所属类型', rowspan: '2', align: 'center', width: 100 },
{ field: 'typeName', title: '商品来源', rowspan: '2', align: 'left', width: 100 },
{ title: '库存', colspan: '3', align: 'center', width: 80},
{ field: 'materialModel', title: '型号', rowspan: '2', align: 'left', width: 150 },
{ field: 'materialCategoryName', title: '所属类型', rowspan: '2', align: 'center', width: 100 },
{ field: 'materialTypeName', title: '商品来源', rowspan: '2', align: 'left', width: 100 },
{ title: '库存', colspan: '4', align: 'center', width: 80},
{ field: 'id', title: '盘点历史', rowspan: '2', align: 'center', width: 80, templet: function (d) {
return '<a lay-event="historyDetails" class="notice-title-click">盘点历史</a>';
}},
{ field: 'unitName', title: '单位', rowspan: '2', align: 'center', width: 80},
{ field: 'enabled', title: '状态', rowspan: '2', align: 'center', width: 60, templet: function (d) {
if(d.enabled == '0'){
return "<span class='state-down'>禁用</span>";
} else if (d.enabled == '1'){
return "<span class='state-up'>启用</span>";
}
}},
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }
}}
],[
{ field: 'allTock', title: '总库存', align: 'center', width: 80},
{ field: 'initialTock', title: '初始库存', align: 'center', width: 80},
{ field: 'stockNum', title: '可盘点库存', align: 'center', width: 120, edit: 'text'}
{ field: 'unitName', title: '规格', align: 'center', width: 80 },
{ field: 'allTock', title: '总库存', align: 'center', width: 80 },
{ field: 'initialTock', title: '初始库存', align: 'center', width: 80 },
{ field: 'stockNum', title: '可盘点库存', align: 'center', width: 120, edit: 'text' }
]],
done: function(json) {
matchingLanguage();
......@@ -147,7 +146,6 @@ layui.config({
}
form.render();
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
refreshloadTable();
......@@ -195,10 +193,8 @@ layui.config({
function getTableParams() {
return {
materialName: $("#materialName").val(),
model: $("#model").val(),
categoryId: isNull($("#categoryId").val()) ? "" : $("#categoryId").attr("categoryId"),
typeNum: $("#typeNum").val(),
typeFrom: $("#typeFrom").val(),
enabled: $("#enabled").val(),
depotId: $("#depotId").val()
};
......
erp/src/main/resources/template/tpl/storeHouseInventory/storeHouseInventoryList.html
浏览文件 @ 4c4aaf2b
......@@ -26,14 +26,6 @@
</select>
</div>
<label class="layui-form-label">商品名称</label>
<div class="layui-input-inline">
<input type="text" id="materialName" name="materialName" placeholder="请输入商品名称" class="layui-input" />
</div>
<label class="layui-form-label">型号</label>
<div class="layui-input-inline">
<input type="text" id="model" name="model" placeholder="请输入产品型号" class="layui-input" />
</div>
<label class="layui-form-label">所属类型</label>
<div class="layui-input-inline">
<input type="text" id="categoryId" name="categoryId" placeholder="请选择商品类型" class="layui-input" readonly="readonly" categoryId=""/>
......@@ -41,7 +33,7 @@
</div>
<label class="layui-form-label">商品来源</label>
<div class="layui-input-inline">
<select lay-filter="typeNum" lay-search="" id="typeNum">
<select lay-filter="typeFrom" lay-search="" id="typeFrom">
<option value="">全部</option>
<option value="1">自产</option>
<option value="2">外购</option>
......
web/src/main/resources/template/json/activitiNameKey.json
浏览文件 @ 4c4aaf2b
{
"vehicleManageUse": {"name": "用车申请", "key": "../../tpl/vehicleManageUse/vehicleManageUseAdd.html", "complate": true},
"sealManageRevert": {"name": "印章归还", "key": "../../tpl/sealManageRevert/sealManageRevertAdd.html", "complate": true},
"sealManageBorrow": {"name": "印章借用", "key": "../../tpl/sealManageBorrow/sealManageBorrowAdd.html", "complate": true},
"putIsSalesReturns": {"name": "销售退货单申请", "key": "../../tpl/salesreturns/salesreturnsadd.html", "complate": true},
"outIsSalesOutlet": {"name": "销售出库单申请", "key": "../../tpl/salesoutlet/salesoutletadd.html", "complate": true},
"outchaseOrder": {"name": "销售订单申请", "key": "../../tpl/salesorder/salesorderadd.html", "complate": true},
"putIsRetailReturns": {"name": "零售退货单申请", "key": "../../tpl/retailreturns/retailreturnsadd.html", "complate": true},
"outIsRetail": {"name": "零售出库单申请", "key": "../../tpl/retailoutlet/retailoutletadd.html", "complate": true},
"outIsPurchaseReturns": {"name": "采购退货单申请", "key": "../../tpl/purchasereturns/purchasereturnsadd.html", "complate": true},
"putIsPurchase": {"name": "采购入库单申请", "key": "../../tpl/purchaseput/purchaseputadd.html", "complate": true},
"purchaseOrder": {"name": "采购订单申请", "key": "../../tpl/purchaseorder/purchaseorderadd.html", "complate": true},
"proworkLoad": {"name": "项目工作量审核", "key": "../../tpl/proworkload/proworkloadadd.html", "complate": true},
"proTask": {"name": "项目任务审核", "key": "../../tpl/protask/protaskadd.html", "complate": true},
"proProject": {"name": "项目立项审批", "key": "../../tpl/proproject/proprojectadd.html", "complate": true},
"proFile": {"name": "项目文档审核", "key": "../../tpl/profile/profileadd.html", "complate": true},
"proCostExpense": {"name": "项目费用报销审核", "key": "../../tpl/procostexpense/procostexpenseadd.html", "complate": true},
"putIsOthers": {"name": "其他入库单申请", "key": "../../tpl/otherwarehous/otherwarehousadd.html", "complate": true},
"outIsOthers": {"name": "其他出库单申请", "key": "../../tpl/otheroutlets/otheroutletsadd.html", "complate": true},
"licenceManageRevert": {"name": "证照归还", "key": "../../tpl/licenceManageRevert/licenceManageRevertAdd.html", "complate": true},
"licenceManageBorrow": {"name": "证照借用", "key": "../../tpl/licenceManageBorrow/licenceManageBorrowAdd.html", "complate": true},
"crmOpportUnity": {"name": "商机审核一阶段", "key": "../../tpl/crmopportunity/crmopportunityadd.html", "complate": true},
"myCrmContract": {"name": "合同审批", "key": "../../tpl/crmcontractmanage/mycrmcontractadd.html", "complate": true},
"conFerenceRoomReserve": {"name": "会议室预定", "key": "../../tpl/conFerenceRoomReserve/conFerenceRoomReserveAdd.html", "complate": true},
"checkWorkOvertime": {"name": "加班申请", "key": "../../tpl/checkWorkOvertime/checkWorkOvertimeAdd.html", "complate": true},
"checkWorkLeave": {"name": "请假申请", "key": "../../tpl/checkWorkLeave/checkWorkLeaveAdd.html", "complate": true},
"checkWorkCancelLeave": {"name": "销假申请", "key": "../../tpl/checkWorkCancelLeave/checkWorkCancelLeaveAdd.html", "complate": true},
"checkWorkBusinessTrip": {"name": "出差申请", "key": "../../tpl/checkWorkBusinessTrip/checkWorkBusinessTripAdd.html", "complate": true},
"assetManageUse": {"name": "资产领用", "key": "../../tpl/assetManageUse/assetManageUseAdd.html", "complate": true},
"assetManageReturn": {"name": "资产归还", "key": "../../tpl/assetManageReturn/assetManageReturnAdd.html", "complate": true},
"assetManagePurchase": {"name": "资产采购", "key": "../../tpl/assetManagePurchase/assetManagePurchaseAdd.html", "complate": true},
"assetArticlesUse": {"name": "用品领用", "key": "../../tpl/assetArticlesUse/assetArticlesUseAdd.html", "complate": true},
"assetArticlesPurchase": {"name": "用品采购", "key": "../../tpl/assetArticlesPurchase/assetArticlesPurchaseAdd.html", "complate": true},
"vehicleManageUse": {"name": "用车申请", "key": "../../tpl/vehicleManageUse/vehicleManageUseAdd.html"},
"sealManageRevert": {"name": "印章归还", "key": "../../tpl/sealManageRevert/sealManageRevertAdd.html"},
"sealManageBorrow": {"name": "印章借用", "key": "../../tpl/sealManageBorrow/sealManageBorrowAdd.html"},
"putIsSalesReturns": {"name": "销售退货单申请", "key": "../../tpl/salesreturns/salesreturnsadd.html"},
"outIsSalesOutlet": {"name": "销售出库单申请", "key": "../../tpl/salesoutlet/salesoutletadd.html"},
"outchaseOrder": {"name": "销售订单申请", "key": "../../tpl/salesorder/salesorderadd.html"},
"putIsRetailReturns": {"name": "零售退货单申请", "key": "../../tpl/retailreturns/retailreturnsadd.html"},
"outIsRetail": {"name": "零售出库单申请", "key": "../../tpl/retailoutlet/retailoutletadd.html"},
"outIsPurchaseReturns": {"name": "采购退货单申请", "key": "../../tpl/purchasereturns/purchasereturnsadd.html"},
"putIsPurchase": {"name": "采购入库单申请", "key": "../../tpl/purchaseput/purchaseputadd.html"},
"purchaseOrder": {"name": "采购订单申请", "key": "../../tpl/purchaseorder/purchaseorderadd.html"},
"proworkLoad": {"name": "项目工作量审核", "key": "../../tpl/proworkload/proworkloadadd.html"},
"proTask": {"name": "项目任务审核", "key": "../../tpl/protask/protaskadd.html"},
"proProject": {"name": "项目立项审批", "key": "../../tpl/proproject/proprojectadd.html"},
"proFile": {"name": "项目文档审核", "key": "../../tpl/profile/profileadd.html"},
"proCostExpense": {"name": "项目费用报销审核", "key": "../../tpl/procostexpense/procostexpenseadd.html"},
"putIsOthers": {"name": "其他入库单申请", "key": "../../tpl/otherwarehous/otherwarehousadd.html"},
"outIsOthers": {"name": "其他出库单申请", "key": "../../tpl/otheroutlets/otheroutletsadd.html"},
"licenceManageRevert": {"name": "证照归还", "key": "../../tpl/licenceManageRevert/licenceManageRevertAdd.html"},
"licenceManageBorrow": {"name": "证照借用", "key": "../../tpl/licenceManageBorrow/licenceManageBorrowAdd.html"},
"crmOpportUnity": {"name": "商机审核一阶段", "key": "../../tpl/crmopportunity/crmopportunityadd.html"},
"myCrmContract": {"name": "合同审批", "key": "../../tpl/crmcontractmanage/mycrmcontractadd.html"},
"conFerenceRoomReserve": {"name": "会议室预定", "key": "../../tpl/conFerenceRoomReserve/conFerenceRoomReserveAdd.html"},
"checkWorkOvertime": {"name": "加班申请", "key": "../../tpl/checkWorkOvertime/checkWorkOvertimeAdd.html"},
"checkWorkLeave": {"name": "请假申请", "key": "../../tpl/checkWorkLeave/checkWorkLeaveAdd.html"},
"checkWorkCancelLeave": {"name": "销假申请", "key": "../../tpl/checkWorkCancelLeave/checkWorkCancelLeaveAdd.html"},
"checkWorkBusinessTrip": {"name": "出差申请", "key": "../../tpl/checkWorkBusinessTrip/checkWorkBusinessTripAdd.html"},
"assetManageUse": {"name": "资产领用", "key": "../../tpl/assetManageUse/assetManageUseAdd.html"},
"assetManageReturn": {"name": "资产归还", "key": "../../tpl/assetManageReturn/assetManageReturnAdd.html"},
"assetManagePurchase": {"name": "资产采购", "key": "../../tpl/assetManagePurchase/assetManagePurchaseAdd.html"},
"assetArticlesUse": {"name": "用品领用", "key": "../../tpl/assetArticlesUse/assetArticlesUseAdd.html"},
"assetArticlesPurchase": {"name": "用品采购", "key": "../../tpl/assetArticlesPurchase/assetArticlesPurchaseAdd.html"},
"incomeOrder": {"name": "财务明细账", "key": "../../tpl/income/incomeAdd.html", "complate": true},
"incomeOrder": {"name": "财务明细账", "key": "../../tpl/income/incomeAdd.html"},
"bossPersonRequire": {"name": "人员需求申请", "key": "../../tpl/bossPersonRequire/bossPersonRequireAdd.html", "complate": true},
"bossInterviewRegularWorker": {"name": "转正申请", "key": "../../tpl/bossInterviewRegularWorker/bossInterviewRegularWorkerAdd.html", "complate": true},
"bossInterviewQuit": {"name": "离职申请", "key": "../../tpl/bossInterviewQuit/bossInterviewQuitAdd.html", "complate": true},
"bossInterviewJobTransfer": {"name": "岗位调动申请", "key": "../../tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html", "complate": true}
"bossPersonRequire": {"name": "人员需求申请", "key": "../../tpl/bossPersonRequire/bossPersonRequireAdd.html"},
"bossInterviewRegularWorker": {"name": "转正申请", "key": "../../tpl/bossInterviewRegularWorker/bossInterviewRegularWorkerAdd.html"},
"bossInterviewQuit": {"name": "离职申请", "key": "../../tpl/bossInterviewQuit/bossInterviewQuitAdd.html"},
"bossInterviewJobTransfer": {"name": "岗位调动申请", "key": "../../tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html"}
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或