From cf098d765f103b486b723d406c74a3e71d33bec9 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Tue, 20 Jun 2023 15:52:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=90=8D=E4=B8=8B=E7=9A=84=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E5=88=97=E8=A1=A8=E9=87=8D=E6=9E=84=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/myHasMation/myAssetManagement.js | 15 +++++++++------ .../assetArticlesUse/assetArticlesUseList.html | 2 +- .../tpl/myHasMation/myAssetManagement.html | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) 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 a2919e572..6f5fc3cc3 100644 --- a/admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js +++ b/admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js @@ -15,7 +15,7 @@ layui.config({ id: 'messageTable', elem: '#messageTable', method: 'post', - url: flowableBasePath + 'myhasmation001', + url: sysMainMation.admBasePath + 'myhasmation001', where: getTableParams(), even: true, page: true, @@ -23,14 +23,17 @@ layui.config({ limit: getLimit(), cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'assetName', title: '资产名称', align: 'left', width: 120 }, + { field: 'name', title: '资产名称', align: 'left', width: 120 }, { field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) { return ''; }}, - { field: 'typeName', title: '类型', align: 'left', width: 100 }, + { 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: 'assetAdmin', title: '管理员', align: 'left', width: 120 }, + { field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) { + return isNull(d.assetAdminMation) ? '' : d.assetAdminMation.name; + }}, { field: 'createTime', title: '申领时间', align: 'center', width: 150 }, ]], done: function(json) { @@ -50,7 +53,7 @@ layui.config({ }); form.render(); - $("body").on("click", "#reloadmessageTable", function() { + $("body").on("click", "#reloadTable", function() { loadTable(); }); diff --git a/admin-assistant/src/main/resources/template/tpl/assetArticlesUse/assetArticlesUseList.html b/admin-assistant/src/main/resources/template/tpl/assetArticlesUse/assetArticlesUseList.html index ca755521f..75d0ca342 100644 --- a/admin-assistant/src/main/resources/template/tpl/assetArticlesUse/assetArticlesUseList.html +++ b/admin-assistant/src/main/resources/template/tpl/assetArticlesUse/assetArticlesUseList.html @@ -8,7 +8,7 @@
-
+
diff --git a/admin-assistant/src/main/resources/template/tpl/myHasMation/myAssetManagement.html b/admin-assistant/src/main/resources/template/tpl/myHasMation/myAssetManagement.html index 2bb86c9fa..34219cf57 100644 --- a/admin-assistant/src/main/resources/template/tpl/myHasMation/myAssetManagement.html +++ b/admin-assistant/src/main/resources/template/tpl/myHasMation/myAssetManagement.html @@ -8,8 +8,8 @@
-
- +
+
-- GitLab