feat:库位管理代码优化

erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevelValue.js

@@ -12,20 +12,16 @@ layui.config({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery'], function (exports) {
     winui.renderColor();
-    var index = parent.layer.getFrameIndex(window.name);
     var $ = layui.$;
     var id = GetUrlParam("id");
     var depotId = GetUrlParam("depotId");
     var parentId = GetUrlParam("parentId");
-    // var depotLevelId = GetUrlParam("depotLevelId");
 
     if (isNull(id)) {
         dsFormUtil.initAddPageForStatic('content', 'FP2024071200007', {
             savePreParams: function (params) {
                 params.depotId = depotId;
-                // params.depotLevelId = depotLevelId;
                 params.parentId = parentId;
-                // params.depotLevelId = depotLevelId;
             }
         });
     }else{
@@ -44,7 +40,6 @@ layui.config({
                 });
             }
         });
-
     }
 
 });
\ No newline at end of file

erp/src/main/resources/template/js/turnIocatorManage/batchAdd.js

@@ -13,8 +13,7 @@ layui.config({
     var parentId = getNotUndefinedVal(GetUrlParam("parentId"));
     var depotId = getNotUndefinedVal(GetUrlParam("depotId"));
 
-    skyeyeClassEnumUtil.showEnumDataListByClassName("generateDepotLevelValType", 'select', "type", '', form);
-    form.render("select");
+    skyeyeClassEnumUtil.showEnumDataListByClassName("generateDepotLevelValType", 'radio', "type", '', form);
 
     textool.init({
         eleId: 'barCode',
@@ -28,11 +27,13 @@ layui.config({
             let params = {
                 parentId: parentId,
                 depotId: depotId,
-                type: $("#type").val(),
+                // type: $("#type").val(),
+                type: $("#type input:radio:checked").val(),
                 number:$("#number").val(),
             }
             AjaxPostUtil.request({url: sysMainMation.erpBasePath + "batchGenerateDepotLevelVal", params: params, type: 'json', method: 'POST', callback: function (json) {
                 parent.layer.close(index);
+                parent.refreshCode = '0';
             }});
         }
         return false;

erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js

 
-
 var rowId = "";
 
 var parentNode = null;
 
-
 layui.config({
     base: basePath,
     version: skyeyeVersion
@@ -15,17 +13,13 @@ layui.config({
     var $ = layui.$,
         fsTree = layui.fsTree,
         form = layui.form,
-        // table = layui.table;
         tableTree = layui.tableTreeDj;
     var ztree;
     var id = GetUrlParam("id");
-    var objectKey = GetUrlParam("objectKey");
-    var objectId = GetUrlParam("objectId");
     var parentId = GetUrlParam("parentId");
     var depotId = GetUrlParam("id");
     var depotLevelId = GetUrlParam("depotLevelId");
 
-
     // 下拉按钮
     var dropdown = new Dropdown();
     dropdown.render();
@@ -72,7 +66,6 @@ layui.config({
             limits: getLimits(),
             limit: getLimit(),
             cols: [[
-                {title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers'},
                 {field: 'number', title: '编号', rowspan: '2', align: 'left', width: 200},
                 { field: 'name', title: '级别', width: 200, templet: function (d) {
                     return getNotUndefinedVal(d.depotLevelMation?.name);
@@ -168,14 +161,14 @@ layui.config({
 
     //批量新增子节点
     function batchAddChildNodes(data){
-
-        console.log('ds',data)
         _openNewWindows({
             url: "../../tpl/turnIocatorManage/batchAdd.html?depotId=" + data.depotId + "&parentId=" + data.id,
             title: '批量新增',
             pageId: "warehouseLevelValueBatchAdd",
             area: ['90vw', '90vh'],
             callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
             }});
     }
 
@@ -189,6 +182,8 @@ layui.config({
             pageId: "warehouseLevelValueBatchAdd",
             area: ['90vw', '90vh'],
             callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
             }});
     });
 
@@ -256,7 +251,6 @@ layui.config({
                 // 重置folderid
                 folderId = selNode.getParentNode().id;
                 ztree.removeNode(selNode);// 移除节点
-            // showListById();// 获取文件夹和笔记列表
         }});
     }
 
@@ -278,7 +272,6 @@ layui.config({
             }});
     });
 
-
     form.render();
     $("body").on("click", "#reloadTable", function() {
         loadTable();
@@ -291,7 +284,7 @@ layui.config({
     function getTableParams() {
         var params = {
             objectId: depotId,
-            holderId: depotLevelId
+            holderId: isNull(depotLevelId) || depotLevelId == 0 ? "" : depotLevelId
         };
         return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
     }

erp/src/main/resources/template/js/turnIocatorManage/writeWarehouseLevel.js

@@ -43,9 +43,6 @@ layui.config({
                             parent.refreshCode = '0';
                         }});
                 },
-                // loadComponentCallback: function () {
-                //     // $("div[controlType='assetPurchasePutFromType']").remove();
-                // },
                 tableAddRowCallback: function (tableId) {
                     $("#addRow" + tableId).remove();
                 }

erp/src/main/resources/template/tpl/turnIocatorManage/addWarehouseLevelValue.html

@@ -13,7 +13,6 @@
         <div class="layui-form-item layui-col-xs12">
             <div class="layui-input-block">
                 <button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-                <!--                <button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>-->
                 <button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
             </div>
         </div>

erp/src/main/resources/template/tpl/turnIocatorManage/batchAdd.html

@@ -11,37 +11,11 @@
         <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">-->
-<!--                <select id="materialId" name="materialId" lay-filter="materialId" lay-search="">-->
 
-<!--                </select>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--        <div class="layui-form-item layui-col-xs6">-->
-<!--            <label class="layui-form-label">规格</label>-->
-<!--            <div class="layui-input-block">-->
-<!--                <select id="normsId" name="normsId" lay-filter="normsId" lay-search="">-->
-
-<!--                </select>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--        <div class="layui-form-item layui-col-xs6">-->
-<!--            <label class="layui-form-label">仓库</label>-->
-<!--            <div class="layui-input-block">-->
-<!--                <select id="depotId" name="depotId" lay-filter="depotId" lay-search="">-->
-
-<!--                </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">
-                <select id="type" name="type" lay-filter="type" lay-search="">
-
-                </select>
-            </div>
+                <div class="layui-input-block winui-radio" id="type">
+                </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">数量<i class="red">*</i></label>
@@ -49,17 +23,6 @@
                 <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">

erp/src/main/resources/template/tpl/turnIocatorManage/turnIocatorManage.html

@@ -60,7 +60,6 @@
     </script>
 
     <ul class="layui-dropdown-menu" id="treeRight">
-
     </ul>
 
     <script src="../../assets/lib/layui/layui.js"></script>

erp/src/main/resources/template/tpl/turnIocatorManage/writeWarehouseLevel.html

@@ -13,7 +13,6 @@
         <div class="layui-form-item layui-col-xs12">
             <div class="layui-input-block">
                 <button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-<!--                <button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>-->
                 <button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
             </div>
         </div>