From cf252f50baadfb71f02e06164800446d351784d8 Mon Sep 17 00:00:00 2001 From: "WJ-202301081617\\Wlos" <1762697860@qq.com> Date: Sun, 21 Jul 2024 16:22:05 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BB=93=E5=BA=93=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=88=91=E7=9A=84=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=92=8C=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../complateInventoryChild.js | 71 ++++++++-- .../inventoryTaskList/myTaskInventoryList.js | 34 ++--- .../complateInventoryChild.html | 130 ++++++++++++++---- .../inventoryTaskList/inventoryTaskList.html | 24 ++-- .../myTaskInventoryList.html | 6 +- .../template/js/sealApply/sealApplyList.js | 3 + .../lib/layui/lay/modules/tableSelect.js | 2 +- .../template/json/skyeyeClassEnum.json | 1 + 8 files changed, 197 insertions(+), 74 deletions(-) diff --git a/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js b/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js index 927b8f373..2c2f8729c 100644 --- a/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js +++ b/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js @@ -4,33 +4,82 @@ layui.config({ version: skyeyeVersion }).extend({ window: 'js/winui.window' -}).define(['window', 'jquery', 'winui', 'form', 'textool'], function (exports) { +}).define(['window', 'jquery', 'winui','tableSelect', 'form'], function (exports) { winui.renderColor(); var index = parent.layer.getFrameIndex(window.name); var $ = layui.$, - textool = layui.textool, form = layui.form; - var id = getNotUndefinedVal(GetUrlParam("id")); + tableSelect = layui.tableSelect; + var id = GetUrlParam("id"); - textool.init({ - eleId: 'barCode', - tools: ['copy', 'reset', 'clear'] + showGrid({ + id: "showForm", + url: sysMainMation.erpBasePath + "queryInventoryChildById", + params: {id: id}, + method: 'GET', + pagination: false, + template: $("#beanTemplate").html(), + ajaxSendAfter:function (json) { + matchingLanguage(); + form.render(); + } + }); + + + tableSelect.render({ + elem: '#code', //定义输入框input对象 + checkedKey: 'id', //表格的唯一键值，非常重要，影响到选中状态 必填 + searchKey: 'keyword', //搜索输入框的name值 默认keyword + searchPlaceholder: '请输入编码', //搜索输入框的提示文字 默认关键词搜索 + where: {objectId: id}, + table: { //定义表格参数，与LAYUI的TABLE模块一致，只是无需再定义表格elem + url: sysMainMation.erpBasePath + 'queryInventoryChildCodeList', + method: 'post', + page: true, + limits: [8, 16, 24, 32, 40, 48, 56], + limit: 8, + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'jobNumber', title: '员工工号', width: 100, templet: function (d) { + return '' + d.jobNumber + ''; + }}, + // { field: 'userName', title: '员工姓名', width: 100 }, + // { field: 'userSex', title: '性别', width: 60, rowspan: '2', templet: function (d) { + // return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sexEnum", 'id', d.userSex, 'name'); + // }}, + ]] + }, + done: function (elem, data) { + } }); - matchingLanguage(); - form.render(); + form.on('submit(getBean)', function (data) { + if(isNull($("#profitNum").val()) ){ + $("#profitNum").val(0); + } + if(isNull($("#lossNum").val())){ + $("#lossNum").val(0); + } if (winui.verifyForm(data.elem)) { let params = { id: id, - realNumber: $("#realNumber").val(), + realNumber: $("#realNumber").val(), profitNum: $("#profitNum").val(), lossNum: $("#lossNum").val(), + profitNormsCode: $("#profitNormsCode").val(), + lossNormsCode: $("#lossNormsCode").val(), } - AjaxPostUtil.request({url: sysMainMation.erpBasePath + "complateInventoryChild", params: params, type: 'json', method: 'POST', callback: function (json) { + AjaxPostUtil.request({ + url: sysMainMation.erpBasePath + "complateInventoryChild", + params: params, + type: 'json', + method: 'POST', + callback: function (json) { parent.layer.close(index); parent.refreshCode = '0'; - }}); + } + }); } return false; }); diff --git a/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js b/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js index 73be27cd7..daa57bd7a 100644 --- a/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js +++ b/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js @@ -13,7 +13,7 @@ layui.config({ table.render({ id: 'messageTable', elem: '#messageTable', - method: 'post', + method: 'POST', url: sysMainMation.erpBasePath + 'queryInventoryChildList', where: getTableParams(), even: true, @@ -23,22 +23,17 @@ layui.config({ cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' }, { field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) { - return '' + d.oddNumber + ''; - }}, - // { field: 'operatorId', title: '产品', rowspan: '2', align: 'center', width: 140 }, - // { field: 'normsId', title: '规格', rowspan: '2', align: 'center', width: 140 }, - // { field: 'depotId', title: '仓库', rowspan: '2', align: 'center', width: 140 }, - + return '' + d.oddNumber + ''; + }}, { field: 'materialId', title: '产品名称', align: 'left', width: 150, templet: function (d) { - return getNotUndefinedVal(d.materialMation?.name); - }}, + return getNotUndefinedVal(d.materialMation?.name); + }}, { field: 'normsId', title: '产品规格', align: 'left', width: 150, templet: function (d) { - return getNotUndefinedVal(d.normsMation?.name); - }}, + return getNotUndefinedVal(d.normsMation?.name); + }}, { field: 'depotId', title: "仓库", align: 'left', width: 150, templet: function (d) { - return getNotUndefinedVal(d.depotMation?.name); - }}, - + return getNotUndefinedVal(d.depotMation?.name); + }}, { field: 'planStartTime', title: '计划开始时间', rowspan: '2', align: 'center', width: 140 }, { field: 'planEndTime', title: '计划结束时间', rowspan: '2', align: 'center', width: 140 }, { field: 'lossNum', title: '盘亏数量', rowspan: '2', align: 'center', width: 140 }, @@ -46,11 +41,11 @@ layui.config({ { field: 'profitNum', title: '盘盈数量', rowspan: '2', align: 'center', width: 140 }, { field: 'planNumber', title: '盘点总数量', rowspan: '2', align: 'center', width: 140 }, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); - }}, + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("inventoryChildState", 'id', d.state, 'name'); + }}, { field: 'type', title: '类型', width: 90, align: 'center', templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialNormsCodeType", 'id', d.type, 'name'); - }}, + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialNormsCodeType", 'id', d.type, 'name'); + }}, { field: 'unitPrice', title: '单价', rowspan: '2', align: 'center', width: 140 }, { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} ]], @@ -83,7 +78,6 @@ layui.config({ }}); } - form.render(); $("body").on("click", "#reloadTable", function() { loadTable(); @@ -96,5 +90,5 @@ layui.config({ return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); } - exports('inventoryTaskList', {}); + exports('myTaskInventoryList', {}); }); diff --git a/erp/src/main/resources/template/tpl/inventoryTaskList/complateInventoryChild.html b/erp/src/main/resources/template/tpl/inventoryTaskList/complateInventoryChild.html index 8a474c1d3..0ffc42f0e 100644 --- a/erp/src/main/resources/template/tpl/inventoryTaskList/complateInventoryChild.html +++ b/erp/src/main/resources/template/tpl/inventoryTaskList/complateInventoryChild.html @@ -7,38 +7,112 @@
-
-
- 基本信息
-
+ -
- -
- -
-
-
- -
- -
-
-
- -
- -
+ +
+ + diff --git a/erp/src/main/resources/template/tpl/inventoryTaskList/inventoryTaskList.html b/erp/src/main/resources/template/tpl/inventoryTaskList/inventoryTaskList.html index 9b89b17ca..0c1db6cb0 100644 --- a/erp/src/main/resources/template/tpl/inventoryTaskList/inventoryTaskList.html +++ b/erp/src/main/resources/template/tpl/inventoryTaskList/inventoryTaskList.html @@ -17,20 +17,20 @@
diff --git a/erp/src/main/resources/template/tpl/inventoryTaskList/myTaskInventoryList.html b/erp/src/main/resources/template/tpl/inventoryTaskList/myTaskInventoryList.html index 71f08d32c..be954ee28 100644 --- a/erp/src/main/resources/template/tpl/inventoryTaskList/myTaskInventoryList.html +++ b/erp/src/main/resources/template/tpl/inventoryTaskList/myTaskInventoryList.html @@ -15,8 +15,10 @@
diff --git a/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js b/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js index 04e91c134..88727fcf4 100644 --- a/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js +++ b/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js @@ -33,6 +33,9 @@ layui.config({ { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, + { field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutState", 'id', d.otherState, 'name'); + }}, { field: 'applyTime', title: '申领日期', width: 100, align: 'center' }, { field: 'allPrice', title: '总金额', width: 100, align: 'left' }, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, diff --git a/web/src/main/resources/template/assets/lib/layui/lay/modules/tableSelect.js b/web/src/main/resources/template/assets/lib/layui/lay/modules/tableSelect.js index 29d2a98bd..f30c266cb 100644 --- a/web/src/main/resources/template/assets/lib/layui/lay/modules/tableSelect.js +++ b/web/src/main/resources/template/assets/lib/layui/lay/modules/tableSelect.js @@ -56,7 +56,7 @@ layui.define(['table', 'jquery', 'form'], function (exports) { setChecked(res, curr, count); tableDone(res, curr, count); }; - opt.table.where = {}; + opt.table.where = isNull(opt.where) ? {} : opt.where; opt.table.where[opt.searchKey] = ''; var tableSelect_table = table.render(opt.table); diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json index 6bbdcd100..d11259e7a 100644 --- a/web/src/main/resources/template/json/skyeyeClassEnum.json +++ b/web/src/main/resources/template/json/skyeyeClassEnum.json @@ -227,6 +227,7 @@ "filterValue": "3,4" }, + "inventoryChildState": {"name": "ERP-我的任务盘点状态", "className": "skyeye-erp#com.skyeye.inventory.classenum.InventoryChildState"}, "purchaseRequestChildInquiry": {"name": "ERP-申请单子单据明细是否询价", "className": "skyeye-erp#com.skyeye.request.classenum.PurchaseRequestChildInquiry"}, "purchaseRequestInquiryState": {"name": "ERP-采购申请单询价状态", "className": "skyeye-erp#com.skyeye.request.classenum.PurchaseRequestInquiryState"}, "purchaseRequestStateEnum": {"name": "ERP-采购申请状态", "className": "skyeye-erp#com.skyeye.request.classenum.PurchaseRequestStateEnum"}, -- GitLab