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 a2919e5721dafe941c46c182921a23ecf59f9ed6..6f5fc3cc3cf7351da1fd5b95c6e1d317da3417ee 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 ca755521fb1ed62e8d0418234cd98cfc0615caab..75d0ca3421b9db5b9c3044b526588510cb0b5883 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 2bb86c9fa70269f446d9ddaa28b2c22476131a8a..34219cf5716026de18d4998d994bd029da336468 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 @@
-
- +
+