From 519c01d58b736541e7c859271837c163b4ae304b Mon Sep 17 00:00:00 2001 From: "LAPTOP-UV1MNL38\\18023" <1802330370@qq.com> Date: Tue, 16 Jul 2024 19:47:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=89=A9=E6=96=99=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E5=92=8C=E9=80=80=E8=B4=A7list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/erpPick/erpPickToOut.js | 3 +- .../materialReceiptFormList.js | 64 ++++++++++++++++++- .../materialReturnOrderList.js | 59 +++++++++++++++++ .../materialReceiptFormList.html | 16 +++++ .../materialReturnOrderList.html | 41 ++++++++---- .../template/json/sysServiceMation.json | 2 + 6 files changed, 169 insertions(+), 16 deletions(-) diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js b/erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js index f0bbcdc8d..704e3a5df 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js @@ -33,8 +33,7 @@ layui.config({ }}); }, loadComponentCallback: function () { - $("select[attrkey='holderIdType']").prop('disabled', true); - $("select[attrkey='holderIdType']").parent().next().children('i').remove(); + $("div[controlType='correspondentAllEnter']").remove(); $("div[controlType='depotOutFromType']").remove(); }, tableAddRowCallback: function (tableId) { diff --git a/erp-produce/src/main/resources/template/js/materialReceiptForm/materialReceiptFormList.js b/erp-produce/src/main/resources/template/js/materialReceiptForm/materialReceiptFormList.js index 843ee5459..21a30908a 100644 --- a/erp-produce/src/main/resources/template/js/materialReceiptForm/materialReceiptFormList.js +++ b/erp-produce/src/main/resources/template/js/materialReceiptForm/materialReceiptFormList.js @@ -9,6 +9,7 @@ layui.config({ var $ = layui.$, form = layui.form, table = layui.table; + var serviceClassName = sysServiceMation["materialReceiptForm"]["key"]; //物料接收单 table.render({ @@ -48,9 +49,6 @@ layui.config({ { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, - { field: 'otherState', title: '确认状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutOtherState", 'id', d.otherState, 'name'); - }}, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }, { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 }, @@ -72,8 +70,68 @@ layui.config({ } }); + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'delete') { //删除 + erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'subApproval') { //提交审核 + erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'processDetails') { // 工作流流程详情查看 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'revoke') { //撤销 + erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() { + loadTable(); + }); + } + }); + + // 编辑 + function edit(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024071500004&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "materialReceiptFormEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024071600001&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "materialReceiptFormDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + // 删除 + function del(data) { + layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpcommon005", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); function loadTable() { table.reloadData("messageTable", {where: getTableParams()}); } diff --git a/erp-produce/src/main/resources/template/js/materialReturnOrder/materialReturnOrderList.js b/erp-produce/src/main/resources/template/js/materialReturnOrder/materialReturnOrderList.js index 087a15e68..72e3892be 100644 --- a/erp-produce/src/main/resources/template/js/materialReturnOrder/materialReturnOrderList.js +++ b/erp-produce/src/main/resources/template/js/materialReturnOrder/materialReturnOrderList.js @@ -9,6 +9,7 @@ layui.config({ var $ = layui.$, form = layui.form, table = layui.table; + var serviceClassName = sysServiceMation["materialReturnOrder"]["key"]; //物料退货单 table.render({ @@ -72,6 +73,64 @@ layui.config({ } }); + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'delete') { //删除 + erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'subApproval') { //提交审核 + erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'processDetails') { // 工作流流程详情查看 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'revoke') { //撤销 + erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() { + loadTable(); + }); + } + }); + + // 编辑 + function edit(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024071500005&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "materialReturnOrderEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024070100004&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "materialReturnOrderDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + + // 删除 + function del(data) { + layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpcommon005", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + } + function loadTable() { table.reloadData("messageTable", {where: getTableParams()}); } diff --git a/erp-produce/src/main/resources/template/tpl/materialReceiptForm/materialReceiptFormList.html b/erp-produce/src/main/resources/template/tpl/materialReceiptForm/materialReceiptFormList.html index fcf14fe6d..bf8834840 100644 --- a/erp-produce/src/main/resources/template/tpl/materialReceiptForm/materialReceiptFormList.html +++ b/erp-produce/src/main/resources/template/tpl/materialReceiptForm/materialReceiptFormList.html @@ -17,6 +17,22 @@
diff --git a/erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderList.html b/erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderList.html index 14ce0d6ce..78390294d 100644 --- a/erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderList.html +++ b/erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderList.html @@ -1,29 +1,48 @@ - - - - + + + +
-
- -
+
+ +
-
+
- +
\ No newline at end of file diff --git a/web/src/main/resources/template/json/sysServiceMation.json b/web/src/main/resources/template/json/sysServiceMation.json index 4e340860d..45a9d69d7 100644 --- a/web/src/main/resources/template/json/sysServiceMation.json +++ b/web/src/main/resources/template/json/sysServiceMation.json @@ -28,6 +28,8 @@ "supplementOutList": {"name": "补料出库单", "key": "com.skyeye.pick.service.impl.PatchOutLetServiceImpl"}, "pickReturn": {"name": "退料单", "key": "com.skyeye.pick.service.impl.ReturnMaterialServiceImpl"}, "returnMaterialPutList": {"name": "退料入库单", "key": "com.skyeye.pick.service.impl.ReturnPutServiceImpl"}, + "materialReceiptForm": {"name": "物料接收单", "key": "com.skyeye.pickconfirm.service.impl.ConfirmPutServiceImpl"}, + "returnMaterialPutList": {"name": "物料退货单", "key": "com.skyeye.pickconfirm.service.impl.ConfirmReturnServiceImpl"}, "proworkLoad": {"name": "项目工作量审核", "key": "com.skyeye.service.impl.ProWorkloadServiceImpl"}, "proTask": {"name": "项目任务审核", "key": "com.skyeye.service.impl.ProTaskServiceImpl"}, -- GitLab