From 32daf3b6f128f80e2db63f591ed16df613513668 Mon Sep 17 00:00:00 2001 From: "WJ-202301081617\\Wlos" <1762697860@qq.com> Date: Tue, 16 Jul 2024 09:23:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assetReportMyUseChoose.js | 5 ++-- .../js/myHasMation/myAssetManagement.js | 4 +-- .../js/turnIocatorManage/turnIocatorManage.js | 25 ++++++++++++++----- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportMyUseChoose.js b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportMyUseChoose.js index f391ec594..8aecc639d 100644 --- a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportMyUseChoose.js +++ b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportMyUseChoose.js @@ -52,6 +52,7 @@ layui.config({ { field: 'name', title: '资产名称', width: 120, templet: function(d) { return getNotUndefinedVal(d.assetMation?.name); }}, + { field: 'assetNum', title: '资产编号', align: 'left', width: 150 }, { field: 'specifications', title: '资产规格', width: 120, templet: function(d) { return getNotUndefinedVal(d.assetMation?.specifications); }}, @@ -62,7 +63,7 @@ layui.config({ { field: 'typeId', title: '资产类型', width: 120, templet: function(d) { return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId); }}, - { field: 'assetNum', title: '资产编号', align: 'left', width: 150 }, + // { field: 'specifications', title: '资产规格', align: 'left', width: 120 }, { field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) { return getNotUndefinedVal(d.assetAdminMation?.name); @@ -72,7 +73,7 @@ layui.config({ done: function(res) { matchingLanguage(); - initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入资产名称，资产编号", function () { + initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入资产编号", function () { table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); }); if (myUseAssetReportCheckType) { diff --git a/admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js b/admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js index 4a25498a4..ca00d55e8 100644 --- a/admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js +++ b/admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js @@ -23,6 +23,7 @@ layui.config({ limit: getLimit(), cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, + { field: 'assetNum', title: '资产编号', align: 'left', width: 200 }, { field: 'name', title: '资产名称', width: 120, templet: function(d) { return getNotUndefinedVal(d.assetMation?.name); }}, @@ -32,7 +33,6 @@ layui.config({ { field: 'typeId', title: '资产类型', width: 120, templet: function(d) { return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.assetMation.typeId); }}, - { field: 'assetNum', title: '资产编号', align: 'left', width: 150 }, { field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) { return getNotUndefinedVal(d.assetAdminMation?.name); }}, @@ -40,7 +40,7 @@ layui.config({ ]], done: function(json) { matchingLanguage(); - initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入资产名称，资产编号", function () { + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入资产编号", function () { table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); }); } diff --git a/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js b/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js index e3f0b2549..cf7c2add3 100644 --- a/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js +++ b/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js @@ -1,15 +1,22 @@ + +var rowId = ""; + +var parentNode = null; + + layui.config({ base: basePath, version: skyeyeVersion }).extend({ window: 'js/winui.window' -}).define(['window', 'jquery', 'winui', 'dropdown', 'fsCommon', 'fsTree', 'table', 'form'], function (exports) { +}).define(['window', 'tableTreeDj','jquery', 'winui', 'dropdown', 'fsCommon', 'fsTree', 'table', 'form'], function (exports) { winui.renderColor(); var $ = layui.$, fsTree = layui.fsTree, form = layui.form, - table = layui.table; + // table = layui.table; + tableTree = layui.tableTreeDj; var ztree; var id = GetUrlParam("id"); var objectKey = GetUrlParam("objectKey") @@ -50,7 +57,7 @@ layui.config({ } function initLoadTable() { - table.render({ + tableTree.render({ id: 'messageTable', elem: '#messageTable', method: 'post', @@ -71,12 +78,18 @@ layui.config({ done: function(json) { matchingLanguage(); initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入编号", function () { - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + tableTree.reload("messageTable", {page: {curr: 1}, where: getTableParams()}); }); } - }); + } + // , { + // keyId: 'id', + // keyPid: 'parentId', + // title: 'dictName', + // } + ); - table.on('tool(messageTable)', function (obj) { + tableTree.getTable().on('tool(messageTable)', function (obj) { var data = obj.data; var layEvent = obj.event; if (layEvent === 'edit') { //编辑 -- GitLab