From b1d994f8afcbe3dc6ae73fbc109840b16ce8256f Mon Sep 17 00:00:00 2001
From: "WJ-202301081617\\Wlos" <1762697860@qq.com>
Date: Sun, 7 Jul 2024 20:25:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B5=84=E4=BA=A7=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=A0=BC=E5=BC=8F?=
=?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../js/assetInventory/assetInventoryList.js | 30 +++++++++----------
.../assetManagePurchaseList.js | 2 +-
.../assetProcurementReturnList.js | 30 +++++++++----------
.../template/json/skyeyeClassEnum.json | 1 +
4 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/admin-assistant/src/main/resources/template/js/assetInventory/assetInventoryList.js b/admin-assistant/src/main/resources/template/js/assetInventory/assetInventoryList.js
index 9fedcca66..137b4f7e1 100644
--- a/admin-assistant/src/main/resources/template/js/assetInventory/assetInventoryList.js
+++ b/admin-assistant/src/main/resources/template/js/assetInventory/assetInventoryList.js
@@ -28,15 +28,15 @@ layui.config({
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) {
- return '' + d.oddNumber + '';
- }},
+ return '' + d.oddNumber + '';
+ }},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + getNotUndefinedVal(d.processInstanceId) + '';
- }},
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
+ }},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
- return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
- }},
+ return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
+ }},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
@@ -88,9 +88,9 @@ layui.config({
layer.confirm(msg, { icon: 3, title: '撤销操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: sysMainMation.admBasePath + "revokeAssetPurchasePut", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
- winui.window.msg("提交成功", {icon: 1, time: 2000});
- loadTable();
- }});
+ winui.window.msg("提交成功", {icon: 1, time: 2000});
+ loadTable();
+ }});
});
}
@@ -126,9 +126,9 @@ layui.config({
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
layer.close(index);
AjaxPostUtil.request({url: sysMainMation.admBasePath + "deleteAssetPurchasePutById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) {
- winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
- loadTable();
- }});
+ winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+ loadTable();
+ }});
});
}
@@ -142,9 +142,9 @@ layui.config({
approvalId: approvalId
};
AjaxPostUtil.request({url: sysMainMation.admBasePath + "submitAssetPurchasePut", params: params, type: 'json', callback: function (json) {
- winui.window.msg("提交成功", {icon: 1, time: 2000});
- loadTable();
- }});
+ winui.window.msg("提交成功", {icon: 1, time: 2000});
+ loadTable();
+ }});
});
});
}
diff --git a/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js b/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js
index d0f09afa0..edfb9acca 100644
--- a/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js
+++ b/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js
@@ -35,7 +35,7 @@ layui.config({
return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
- return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
+ return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("purchaseOrderState", 'id', d.state, 'name');
}},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
diff --git a/admin-assistant/src/main/resources/template/js/assetProcurementReturn/assetProcurementReturnList.js b/admin-assistant/src/main/resources/template/js/assetProcurementReturn/assetProcurementReturnList.js
index 2626d654e..142ee7ba7 100644
--- a/admin-assistant/src/main/resources/template/js/assetProcurementReturn/assetProcurementReturnList.js
+++ b/admin-assistant/src/main/resources/template/js/assetProcurementReturn/assetProcurementReturnList.js
@@ -25,15 +25,15 @@ layui.config({
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) {
- return '' + d.oddNumber + '';
- }},
+ return '' + d.oddNumber + '';
+ }},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + getNotUndefinedVal(d.processInstanceId) + '';
- }},
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
+ }},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
- return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
- }},
+ return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
+ }},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
@@ -111,9 +111,9 @@ layui.config({
layer.confirm(msg, { icon: 3, title: '撤销操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: sysMainMation.admBasePath + "revokeAssetPurchaseReturn", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
- winui.window.msg("提交成功", {icon: 1, time: 2000});
- loadTable();
- }});
+ winui.window.msg("提交成功", {icon: 1, time: 2000});
+ loadTable();
+ }});
});
}
@@ -122,9 +122,9 @@ layui.config({
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
layer.close(index);
AjaxPostUtil.request({url: sysMainMation.admBasePath + "deleteAssetPurchaseReturnById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) {
- winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
- loadTable();
- }});
+ winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+ loadTable();
+ }});
});
}
@@ -139,9 +139,9 @@ layui.config({
approvalId: approvalId
};
AjaxPostUtil.request({url: sysMainMation.admBasePath + "submitAssetPurchaseReturn", params: params, type: 'json', callback: function (json) {
- winui.window.msg("提交成功", {icon: 1, time: 2000});
- loadTable();
- }});
+ winui.window.msg("提交成功", {icon: 1, time: 2000});
+ loadTable();
+ }});
});
});
}
diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json
index c0b49e1bd..14d80745d 100644
--- a/web/src/main/resources/template/json/skyeyeClassEnum.json
+++ b/web/src/main/resources/template/json/skyeyeClassEnum.json
@@ -145,6 +145,7 @@
"clockInTime": {"name": "上班打卡状态", "className": "skyeye-checkwork#com.skyeye.checkwork.classenum.ClockInTime"},
"clockOutTime": {"name": "下班打卡状态", "className": "skyeye-checkwork#com.skyeye.checkwork.classenum.ClockOutTime"},
+ "purchaseOrderState": {"name": "资产采购订单状态", "className": "com.skyeye.eve.assets.classenum.PurchaseOrderStateEnum"},
"assetReportState": {"name": "资产明细状态", "className": "skyeye-adm#com.skyeye.eve.assets.classenum.AssetReportState"},
"conferenceState": {"name": "会议室状态", "className": "skyeye-adm#com.skyeye.eve.conference.classenum.ConferenceState"},
"vehicleState": {"name": "车辆状态", "className": "skyeye-adm#com.skyeye.eve.vehicle.classenum.VehicleState"},
--
GitLab