我名下的资产列表重构完成

cf098d76 · doc_wei · 178080a3 · cf098d76 · cf098d76 · cf098d76
3 changed file
--- 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 '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
 			}},
-			{ 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();
    });


--- 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 @@
 </head>
 <body>
 	<div class="winui-toolbar">
-		<div class="winui-tool" style="text-align: left;">
+		<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>
 			<button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1596957289917"><i class="fa fa-plus" aria-hidden="true"></i>用品领用申请</button>
 		</div>

--- 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 @@
 </head>
 <body>
 	<div class="winui-toolbar">
-		<div class="winui-tool" style="text-align: left;">
-			<button id="reloadmessageTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+		<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>