feat:物料接收和退货list

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) {

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()});
     }

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()});
     }

erp-produce/src/main/resources/template/tpl/materialReceiptForm/materialReceiptFormList.html

@@ -17,6 +17,22 @@
     <table id="messageTable" lay-filter="messageTable"></table>
 
     <script type="text/html" id="tableBar">
+        {{# if(d.editRow == 1) { }}
+            {{# if(auth('1721114400445')) { }}
+                <a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
+            {{# } }}
+            {{# if(auth('1721028158455')) { }}
+                <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+            {{# } }}
+            {{# if(auth('1721114323209')) { }}
+                <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
+            {{# } }}
+        {{# } }}
+        {{# if(d.editRow == 2) { }}
+            {{# if(auth('1721114309851')) { }}
+                <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
+            {{# } }}
+        {{# } }}
     </script>
 </div>
 

erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderList.html

 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8" />
-  <title></title>
-  <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-  <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+    <meta charset="utf-8"/>
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet"/>
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet"/>
 </head>
 <body>
 
 <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>
+    <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>
 </div>
 <div style="margin:auto 10px;">
-  <table id="messageTable" lay-filter="messageTable"></table>
+    <table id="messageTable" lay-filter="messageTable"></table>
 
-  <script type="text/html" id="tableBar">
-  </script>
+    <script type="text/html" id="tableBar">
+        {{# if(d.editRow == 1) { }}
+            {{# if(auth('1721114400445')) { }}
+                <a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
+            {{# } }}
+            {{# if(auth('1721028158455')) { }}
+                <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+            {{# } }}
+            {{# if(auth('1721114323209')) { }}
+                <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
+            {{# } }}
+        {{# } }}
+        {{# if(d.editRow == 2) { }}
+            {{# if(auth('1721114309851')) { }}
+                <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
+            {{# } }}
+        {{# } }}
+    </script>
 </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/materialReturnOrder/'}).use('materialReturnOrderList');
+    layui.config({base: '../../js/materialReturnOrder/'}).use('materialReturnOrderList');
 </script>
 </body>
 </html>
\ No newline at end of file

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"},