diff --git a/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js b/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js
index 4e10c7c24850748e826fcc867ff421f23a7e0e66..ff1e8d4c8814ad2d0864cbd048e2abdf495dfc8c 100644
--- a/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js
+++ b/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js
@@ -33,7 +33,7 @@ layui.config({
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'processInstanceId', title: '流程ID', width: 280, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'taskType', title: '类型', width: 150, templet: function (d) {
return d.processMation.title;
diff --git a/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js b/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js
index 763c461723105e8c2571c51c9bc0c534627e3d35..79033542a1b21f7c686730092ee68b416849693a 100644
--- a/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js
+++ b/admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js
@@ -31,7 +31,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js b/admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js
index 6ca3bf4487e63742fd13f2038fcda0892eaa3cbc..11922a094e4c6b77224b04858f7c591ac96c71ab 100644
--- a/admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js
+++ b/admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js
@@ -31,7 +31,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
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 568944727e7188f1a08a41ffec70cc682c1b5f00..d0f09afa07df02d22a673c874cac54574fedc9bb 100644
--- a/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js
+++ b/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js
@@ -32,7 +32,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnList.js b/admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnList.js
index c3c6a16a69e365a4f05da2ae535784cb4d5411ff..4ffea078f7d6655d4a883b12d988c2b957746338 100644
--- a/admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnList.js
+++ b/admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnList.js
@@ -32,7 +32,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js b/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js
index 8a977b4f578db49a1c328e1e3bd91c2f7013cd04..adab5381d8ebe1fe46e0d48025926b3d1cb58467 100644
--- a/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js
+++ b/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js
@@ -32,7 +32,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveList.js b/admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveList.js
index 5c9881bdded6811378d7b270b8f23307ba7a9d33..ed057b8b0471b9eed242e7bd14cd59cf2e5f7b9d 100644
--- a/admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveList.js
+++ b/admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveList.js
@@ -32,7 +32,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/admin-assistant/src/main/resources/template/js/gw/gwReceiveDocumentList.js b/admin-assistant/src/main/resources/template/js/gw/gwReceiveDocumentList.js
index 4f58b96da5cdbe16a5c9c15134f22a6bd44d4db4..dba432112c32cc674db563f6bfdb807bfd5cf4d0 100644
--- a/admin-assistant/src/main/resources/template/js/gw/gwReceiveDocumentList.js
+++ b/admin-assistant/src/main/resources/template/js/gw/gwReceiveDocumentList.js
@@ -30,7 +30,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'secret', title: '密集级别', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentSecret", 'id', d.secret, 'name');
diff --git a/admin-assistant/src/main/resources/template/js/gw/gwSendDocumentList.js b/admin-assistant/src/main/resources/template/js/gw/gwSendDocumentList.js
index 43bac0c0813241dbfd96c38439c9ecfb25e97723..a36cd14e9f8a2102a6ea7f488996366a2ceb835d 100644
--- a/admin-assistant/src/main/resources/template/js/gw/gwSendDocumentList.js
+++ b/admin-assistant/src/main/resources/template/js/gw/gwSendDocumentList.js
@@ -33,7 +33,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'secret', title: '密集级别', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentSecret", 'id', d.secret, 'name');
diff --git a/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js b/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js
index 1dad8380b6188038709dbeedb1dc15e443b78b49..ed95bae1232560bc4ee832a115bc6dbc3f98791c 100644
--- a/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js
+++ b/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js
@@ -31,7 +31,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertList.js b/admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertList.js
index a76ad8aff0148b28e3119b361a7061b57ff82fab..82a57b26e67d3ee3a0bc3ae4de13558b4ed665ce 100644
--- a/admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertList.js
+++ b/admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertList.js
@@ -31,7 +31,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowList.js b/admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowList.js
index 8030dc294f554d5da217ccc8abfd7fc5bae9ed85..30c3d2920e7d114988a60c07dc4ddb24b921c074 100644
--- a/admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowList.js
+++ b/admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowList.js
@@ -31,7 +31,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertList.js b/admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertList.js
index 3536e4a208aacf98491351b90f39aec51eb5eb1d..853403b12ca2993eab2f226962cfd57fce489f06 100644
--- a/admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertList.js
+++ b/admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertList.js
@@ -31,7 +31,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseList.js b/admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseList.js
index 3bedb2962ca31a2cec948e5a55b28ea43fa38c4a..846c5300aef2a0f85ec957b899a1f128ed235257 100644
--- a/admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseList.js
+++ b/admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseList.js
@@ -31,7 +31,7 @@ layui.config({
}},
{ field: 'title', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js
index bbebe6d046f29c8df6a0700693a71bdcb863e184..87befd35da7bf9456619800695639ec1742aa83b 100644
--- a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js
+++ b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js
@@ -39,7 +39,7 @@ layui.config({
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossUserTransferType", 'id', d.transferType, 'name');
}},
{ field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function(d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitList.js b/boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitList.js
index 63bb959eb7a1b6aa194aa1132eb1faeb2d31a44b..08bb41f907594edd151166b3397528afa09a6057 100644
--- a/boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitList.js
+++ b/boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitList.js
@@ -35,7 +35,7 @@ layui.config({
}},
{ field: 'leaveTime', title: '离职日期', width: 100 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerList.js b/boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerList.js
index 12936a8f9dc326ec426744c40a05cc8577d969ba..33d201e07e418208b6884e0054a9f0142b8cb1b4 100644
--- a/boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerList.js
+++ b/boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerList.js
@@ -38,7 +38,7 @@ layui.config({
}},
{ field: 'regularTime', title: '转正日期', align: 'center', width: 100 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function(d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireAllList.js b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireAllList.js
index 39c8b31549dbedf21d222cc7c6277baea1613d47..3c3172a4d2e7bda5460a4da9e453c9a526709547 100644
--- a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireAllList.js
+++ b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireAllList.js
@@ -37,7 +37,7 @@ layui.config({
{ field: 'recruitNum', title: '需求人数', width: 100 },
{ field: 'recruitedNum', title: '已招聘人数', width: 100 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name');
diff --git a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireList.js b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireList.js
index 2f0be60df6cacf1ae594feeed4b8800b77a464c7..954ece453c8c362c4914645593882bc207a61032 100644
--- a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireList.js
+++ b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireList.js
@@ -30,7 +30,7 @@ layui.config({
return '' + d.oddNumber + '';
}},
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'recruitDepartmentId', title: '需求部门', align: 'left', width: 140, templet: function (d) {
return getNotUndefinedVal(d.recruitDepartmentMation?.name);
diff --git a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeList.js b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeList.js
index 2732f05ea8ce3ed4544a68212fd5073469d3b64b..d0cc8bc9f07321251a7e7e70769d5d566aa0400c 100644
--- a/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeList.js
+++ b/boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeList.js
@@ -27,7 +27,7 @@ layui.config({
return '' + d.oddNumber + '';
}},
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'recruitDepartmentId', title: '需求部门', align: 'left', width: 140, templet: function (d) {
return getNotUndefinedVal(d.recruitDepartmentMation?.name);
diff --git a/checkwork/src/main/resources/template/js/checkWorkAbnormalAttendance/checkWorkAbnormalAttendanceList.js b/checkwork/src/main/resources/template/js/checkWorkAbnormalAttendance/checkWorkAbnormalAttendanceList.js
index afdd6615cc297bf52af9e9be61ae4802f9cb9b1c..57b6bdc5004686d08f0440e350973c590d37a293 100644
--- a/checkwork/src/main/resources/template/js/checkWorkAbnormalAttendance/checkWorkAbnormalAttendanceList.js
+++ b/checkwork/src/main/resources/template/js/checkWorkAbnormalAttendance/checkWorkAbnormalAttendanceList.js
@@ -30,7 +30,7 @@ layui.config({
return '' + d.oddNumber + '';
}},
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripList.js b/checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripList.js
index 3bff8e2f62d208b3d1797912530997fe04e3cad7..e8e07f13971fefb744c8a78d581b0f8f461be607 100644
--- a/checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripList.js
+++ b/checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripList.js
@@ -31,7 +31,7 @@ layui.config({
}},
{ field: 'name', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveList.js b/checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveList.js
index c7bf2209b833c2e9662f4e33860d5a539ab31577..5938f9055db215a19f1aad5e6c30f8190ef74474 100644
--- a/checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveList.js
+++ b/checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveList.js
@@ -31,7 +31,7 @@ layui.config({
}},
{ field: 'name', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveList.js b/checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveList.js
index d18aacf11667724db684063712fc487e4ba13c40..b85b5afea05351a25a1470c747a1c65f1d9170bc 100644
--- a/checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveList.js
+++ b/checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveList.js
@@ -31,7 +31,7 @@ layui.config({
}},
{ field: 'name', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeList.js b/checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeList.js
index 6495d7734179b1c7030dead471d548d0ba531c06..039ba2b03569796bd2f4e8e9a5bce8905610f4e9 100644
--- a/checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeList.js
+++ b/checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeList.js
@@ -31,7 +31,7 @@ layui.config({
}},
{ field: 'name', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/crm/src/main/resources/template/js/crmContract/crmContractList.js b/crm/src/main/resources/template/js/crmContract/crmContractList.js
index be03b202b8a81889aa34c3a7bf43de667ac9a325..f113bedaaec680150f16b4ebe9777ea449f1aafd 100644
--- a/crm/src/main/resources/template/js/crmContract/crmContractList.js
+++ b/crm/src/main/resources/template/js/crmContract/crmContractList.js
@@ -42,7 +42,7 @@ layui.config({
{ field: 'invoicePrice', title: '已开票金额（元）', align: 'left', width: 140 },
{ field: 'signingTime', title: '签约日期', align: 'center', width: 100 },
{ field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("crmContractStateEnum", 'id', d.state, 'name');
diff --git a/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js b/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js
index 4e0d1be7b0a3dccd7e3ae17558f32a72475a19d4..5fbf43fc99fc4a7985971823f4d8554245d1a6b2 100644
--- a/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js
+++ b/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js
@@ -41,7 +41,7 @@ layui.config({
{ field: 'oddNumber', title: '商机编号', align: 'left', width: 120 },
{ field: 'estimatePrice', title: '预计成交金额', width: 120 },
{ field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("crmOpportunityStateEnum", 'id', d.state, 'name');
diff --git a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js
index 4bb53d13a0b6b7995478850c407b571581d21c55..03b60b8d51d260a0704b3734c5a5fbf6eed97e2e 100644
--- a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js
+++ b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js
@@ -30,7 +30,7 @@ layui.config({
{ field: 'productionMation', rowspan: '2', title: '生产计划单', align: 'center', width: 200, templet: function (d) {return isNull(d.productionMation) ? '' : d.productionMation.oddNumber}},
{ colspan: '3', title: '加工成品信息', align: 'center' },
{ field: 'processInstanceId', rowspan: '2', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', rowspan: '2', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("machinStateEnum", 'id', d.state, 'name');
diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js
index 1443f36aa2a87598aefbb7f4d1cacdd4fa3ea9f8..5932456431c0ef67ce652600d9ca7fde32241c8a 100644
--- a/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js
+++ b/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js
@@ -29,7 +29,7 @@ layui.config({
}},
{ field: 'machinMation', rowspan: '2', title: '加工单', align: 'center', width: 200, templet: function (d) {return isNull(d.machinMation) ? '' : d.machinMation.oddNumber}},
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js
index 5d1bdbcbe29a6c79fc95d12897cf4f8b687f484e..814db8727b1e4364c2e20556c5e4cec74ccab7a1 100644
--- a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js
+++ b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js
@@ -29,7 +29,7 @@ layui.config({
}},
{ field: 'machinMation', rowspan: '2', title: '加工单', align: 'center', width: 200, templet: function (d) {return isNull(d.machinMation) ? '' : d.machinMation.oddNumber}},
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js
index 749b51b999c379cc1ec70d63417023afa9fd9276..cdffd5c71fd40cadf55ca24a99456ab39bfc0b3c 100644
--- a/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js
+++ b/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js
@@ -29,7 +29,7 @@ layui.config({
}},
{ field: 'machinMation', rowspan: '2', title: '加工单', align: 'center', width: 200, templet: function (d) {return isNull(d.machinMation) ? '' : d.machinMation.oddNumber}},
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js b/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js
index adc3c76cf0c6bc4a405788632495ad7fff6065ea..6cfeebacfb55dc1fd1604a891e5696cd6e8781f2 100644
--- a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js
+++ b/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js
@@ -35,7 +35,7 @@ layui.config({
{ field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return isNull(d.normsMation) ? '' : d.normsMation.name}},
{ field: 'number', width: 100, title: '计划生产数量'},
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("productionState", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/allocation/allocationList.js b/erp/src/main/resources/template/js/allocation/allocationList.js
index f7cba4c55bce9504fe33cc93ccfb39fed1fd7699..7df58bfad62f826852d8ac6ab7b6173617e79b38 100644
--- a/erp/src/main/resources/template/js/allocation/allocationList.js
+++ b/erp/src/main/resources/template/js/allocation/allocationList.js
@@ -29,7 +29,7 @@ layui.config({
}},
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/assemblySheet/assemblySheetList.js b/erp/src/main/resources/template/js/assemblySheet/assemblySheetList.js
index 9aca2f5095178e184c6de99bf43439e9c2b41b85..827125d0207a100780c05e21931469fa396a1834 100644
--- a/erp/src/main/resources/template/js/assemblySheet/assemblySheetList.js
+++ b/erp/src/main/resources/template/js/assemblySheet/assemblySheetList.js
@@ -28,7 +28,7 @@ layui.config({
}},
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/otherOutlets/otherOutletsList.js b/erp/src/main/resources/template/js/otherOutlets/otherOutletsList.js
index 100856416ccbdc4da4be27330ebdc58d0dc9eecb..b8656e129cc469c6ec25996ec91e7d0a721afc1e 100644
--- a/erp/src/main/resources/template/js/otherOutlets/otherOutletsList.js
+++ b/erp/src/main/resources/template/js/otherOutlets/otherOutletsList.js
@@ -33,7 +33,7 @@ layui.config({
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/otherWarehous/otherWarehousList.js b/erp/src/main/resources/template/js/otherWarehous/otherWarehousList.js
index 6283b0879efcc95ce11e5ecbab857d822b162bd8..7eca095a151f162d7f4da17f7591b63dcf04eddd 100644
--- a/erp/src/main/resources/template/js/otherWarehous/otherWarehousList.js
+++ b/erp/src/main/resources/template/js/otherWarehous/otherWarehousList.js
@@ -33,7 +33,7 @@ layui.config({
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js b/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js
index e4d94bb54f5b6065acee665ef4cf9b2b8e88fb18..efdde62e6b2c1ecc060477b98fb13c74905da974 100644
--- a/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js
+++ b/erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js
@@ -33,7 +33,7 @@ layui.config({
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/purchasePut/purchasePutList.js b/erp/src/main/resources/template/js/purchasePut/purchasePutList.js
index 602bdd7d2817cee6d1b6216a216d4fd2c92ceacb..1951ebc42cae61b327707ab442e2094227dd6f77 100644
--- a/erp/src/main/resources/template/js/purchasePut/purchasePutList.js
+++ b/erp/src/main/resources/template/js/purchasePut/purchasePutList.js
@@ -37,7 +37,7 @@ layui.config({
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/purchaseReturns/purchaseReturnsList.js b/erp/src/main/resources/template/js/purchaseReturns/purchaseReturnsList.js
index 6b4e6550947bcbb28c0b5d380eb1c8beafe2ee42..201f0936815b0e0e886a0b9df0bd2abc06a3fac3 100644
--- a/erp/src/main/resources/template/js/purchaseReturns/purchaseReturnsList.js
+++ b/erp/src/main/resources/template/js/purchaseReturns/purchaseReturnsList.js
@@ -33,7 +33,7 @@ layui.config({
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/retailOutlet/retailOutletList.js b/erp/src/main/resources/template/js/retailOutlet/retailOutletList.js
index d02cf1de14441f392480623a5006d7de25ef8faf..6d0030c5772a6c681e4f1557319d5bc14988fc2a 100644
--- a/erp/src/main/resources/template/js/retailOutlet/retailOutletList.js
+++ b/erp/src/main/resources/template/js/retailOutlet/retailOutletList.js
@@ -33,7 +33,7 @@ layui.config({
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/retailReturns/retailReturnsList.js b/erp/src/main/resources/template/js/retailReturns/retailReturnsList.js
index a290ab6d1490cbb1ebf0614a39b223c742ed2661..0bd8230a0d33866e6f796d18479aaa1d3701ceaf 100644
--- a/erp/src/main/resources/template/js/retailReturns/retailReturnsList.js
+++ b/erp/src/main/resources/template/js/retailReturns/retailReturnsList.js
@@ -35,7 +35,7 @@ layui.config({
{ field: 'totalPrice', title: '退款总金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/salesOrder/salesOrderList.js b/erp/src/main/resources/template/js/salesOrder/salesOrderList.js
index b72edd277e73d1a8fc3183de8913b75af69a9a4c..79b75b8d34d7723e6792cce84184c20918e44ed2 100644
--- a/erp/src/main/resources/template/js/salesOrder/salesOrderList.js
+++ b/erp/src/main/resources/template/js/salesOrder/salesOrderList.js
@@ -33,7 +33,7 @@ layui.config({
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js b/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js
index a48e2da67aac516a4f4bab666d6d9cc7e2bdeb62..185d267de5a4dff1491a66031ad2990395fdf8da 100644
--- a/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js
+++ b/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js
@@ -37,7 +37,7 @@ layui.config({
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js b/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js
index c1c21b542866062a1aee44e1313e70d7f4101128..6057ea5e4334c1c16b5f5979b6c981f06bae601e 100644
--- a/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js
+++ b/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js
@@ -37,7 +37,7 @@ layui.config({
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/splitDoc/splitDocList.js b/erp/src/main/resources/template/js/splitDoc/splitDocList.js
index 2b94cd2ef5de04ab45e04d9fca8798499f4f7e86..f528600f8ee601de27fa97dffafc4eadfe1571c8 100644
--- a/erp/src/main/resources/template/js/splitDoc/splitDocList.js
+++ b/erp/src/main/resources/template/js/splitDoc/splitDocList.js
@@ -29,7 +29,7 @@ layui.config({
}},
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/erp/src/main/resources/template/js/supplierContract/supplierContractList.js b/erp/src/main/resources/template/js/supplierContract/supplierContractList.js
index 63537af4a04f3a2fb39d05419eaacce570f371b3..59ae8e2cc89ce7de45b3c97ae2c3879517db5539 100644
--- a/erp/src/main/resources/template/js/supplierContract/supplierContractList.js
+++ b/erp/src/main/resources/template/js/supplierContract/supplierContractList.js
@@ -40,7 +40,7 @@ layui.config({
{ field: 'price', title: '合同金额（元）', align: 'left', width: 120 },
{ field: 'signingTime', title: '签约日期', align: 'center', width: 100 },
{ field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("supplierContractStateEnum", 'id', d.state, 'name');
diff --git a/ifs/src/main/resources/template/js/income/incomeList.js b/ifs/src/main/resources/template/js/income/incomeList.js
index b3cb39e358b173015d1b5e86456cbc84768506ae..cfad79461eb0a1c8b9301239352ce348641ec01f 100644
--- a/ifs/src/main/resources/template/js/income/incomeList.js
+++ b/ifs/src/main/resources/template/js/income/incomeList.js
@@ -21,6 +21,8 @@ layui.config({
});
function initTable() {
+ // 加载列表数据权限
+ loadAuthBtnGroup('messageTable', '1571638010771');
table.render({
id: 'messageTable',
elem: '#messageTable',
@@ -37,7 +39,7 @@ layui.config({
return '' + d.oddNumber + '';
}},
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
@@ -175,7 +177,7 @@ layui.config({
}
function getTableParams() {
- return $.extend(true, {orderType: orderType}, initTableSearchUtil.getSearchValue("messageTable"));
+ return $.extend(true, {typeId: orderType}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('incomeList', {});
diff --git a/ifs/src/main/resources/template/js/reimbursement/reimbursementList.js b/ifs/src/main/resources/template/js/reimbursement/reimbursementList.js
new file mode 100644
index 0000000000000000000000000000000000000000..38ee9fa3e624e8578b7b916a16944f27f039bd9a
--- /dev/null
+++ b/ifs/src/main/resources/template/js/reimbursement/reimbursementList.js
@@ -0,0 +1,171 @@
+
+layui.config({
+ base: basePath,
+ version: skyeyeVersion
+}).extend({
+ window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+ winui.renderColor();
+ var $ = layui.$,
+ form = layui.form,
+ table = layui.table;
+ var serviceClassName = sysServiceMation["reimbursement"]["key"];
+
+ // 加载列表数据权限
+ loadAuthBtnGroup('messageTable', '1714869343001');
+ authBtn('1714869454529');//新增
+
+ table.render({
+ id: 'messageTable',
+ elem: '#messageTable',
+ method: 'post',
+ url: sysMainMation.ifsBasePath + 'queryReimbursementList',
+ where: getTableParams(),
+ even: true,
+ page: true,
+ limits: getLimits(),
+ limit: getLimit(),
+ cols: [[
+ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+ { field: 'oddNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) {
+ return '' + d.oddNumber + '';
+ }},
+ { field: 'payTypeId', title: '付款方式', align: 'left', width: 120, templet: function (d) {
+ return sysDictDataUtil.getDictDataNameByCodeAndKey("IFS_PAY_TYPE", d.payTypeId);
+ }},
+ { field: 'price', title: '报销金额', align: 'left', width: 100 },
+ { field: 'collectionName', title: '收款人全称', align: 'left', width: 150 },
+ { field: 'collectionCode', title: '收款账号', align: 'left', width: 120 },
+ { field: 'openingBank', title: '开户行', align: 'center', width: 120 },
+ { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
+ }},
+ { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
+ 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 },
+ { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
+ { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar' }
+ ]],
+ done: function(json) {
+ matchingLanguage();
+ initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () {
+ refreshTable();
+ });
+ }
+ });
+
+ table.on('tool(messageTable)', function (obj) {
+ var data = obj.data;
+ var layEvent = obj.event;
+ if (layEvent === 'delete') { //删除
+ deleteIncome(data);
+ } else if (layEvent === 'details') { //详情
+ details(data);
+ } else if (layEvent === 'edit') { //编辑
+ edit(data);
+ } else if (layEvent === 'subExamine') { //提交审核
+ subExamine(data);
+ } else if (layEvent === 'processDetails') {//采购流程详情
+ activitiUtil.activitiDetails(data);
+ } else if (layEvent === 'revoke') { //撤销
+ revorke(data);
+ }
+ });
+
+ // 添加
+ $("body").on("click", "#addBean", function() {
+ _openNewWindows({
+ url: systemCommonUtil.getUrl('FP2024050500001', null),
+ title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+ pageId: "incomeAdd",
+ area: ['90vw', '90vh'],
+ callBack: function (refreshCode) {
+ winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+ loadTable();
+ }});
+ });
+
+ // 编辑
+ function edit(data) {
+ _openNewWindows({
+ url: systemCommonUtil.getUrl('FP2024050500002&id=' + data.id, null),
+ title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+ pageId: "incomeEdit",
+ area: ['90vw', '90vh'],
+ callBack: function (refreshCode) {
+ winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+ loadTable();
+ }});
+ }
+
+ // 详情
+ function details(data) {
+ _openNewWindows({
+ url: systemCommonUtil.getUrl('FP2024050500003&id=' + data.id, null),
+ title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+ pageId: "incomeInfo",
+ area: ['90vw', '90vh'],
+ callBack: function (refreshCode) {
+ }});
+ }
+
+ // 删除
+ function deleteIncome(data) {
+ layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+ AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "deleteReimbursementById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) {
+ winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+ loadTable();
+ }});
+ });
+ }
+
+ // 撤销申请
+ function revorke(data) {
+ layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) {
+ layer.close(index);
+ AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "revokeReimbursement", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
+ winui.window.msg("提交成功", {icon: 1, time: 2000});
+ loadTable();
+ }});
+ });
+ }
+
+ // 提交数据
+ function subExamine(data){
+ layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
+ layer.close(index);
+ activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
+ var params = {
+ id: data.id,
+ approvalId: approvalId
+ };
+ AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "submitReimbursementToApproval", params: params, type: 'json', callback: function (json) {
+ winui.window.msg("提交成功", {icon: 1, time: 2000});
+ loadTable();
+ }});
+ });
+ });
+ }
+
+ form.render();
+ $("body").on("click", "#reloadTable", function() {
+ loadTable();
+ });
+
+ function loadTable() {
+ table.reloadData("messageTable", {where: getTableParams()});
+ }
+
+ function refreshTable() {
+ table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+ }
+
+ function getTableParams() {
+ return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+ }
+
+ exports('reimbursementList', {});
+});
diff --git a/ifs/src/main/resources/template/tpl/reimbursement/reimbursementList.html b/ifs/src/main/resources/template/tpl/reimbursement/reimbursementList.html
new file mode 100644
index 0000000000000000000000000000000000000000..92078ca159f02dc7964a543d2f515f3aa9478974
--- /dev/null
+++ b/ifs/src/main/resources/template/tpl/reimbursement/reimbursementList.html
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pro/src/main/resources/template/js/proTask/proTaskList.js b/pro/src/main/resources/template/js/proTask/proTaskList.js
index 6676382c29e818a213a45cd0668cebb8b6dd0e47..52a9d589913fb7a70c2b19fb209510c379993cd9 100644
--- a/pro/src/main/resources/template/js/proTask/proTaskList.js
+++ b/pro/src/main/resources/template/js/proTask/proTaskList.js
@@ -60,7 +60,7 @@ layui.config({
{ field: 'estimatedWorkload', title: '预计工作量', align: 'center', width: 120 },
{ field: 'actualWorkload', title: '实际工作量', align: 'center', width: 120 },
{ field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("taskStateEnum", 'id', d.state, 'name');
diff --git a/pro/src/main/resources/template/js/project/projectList.js b/pro/src/main/resources/template/js/project/projectList.js
index 856335b8699aabd923aa3efe695c3a30eb8ad8fc..0b2884bd05c455aaa58077252300f7cd3bb419c1 100644
--- a/pro/src/main/resources/template/js/project/projectList.js
+++ b/pro/src/main/resources/template/js/project/projectList.js
@@ -32,7 +32,7 @@ layui.config({
{ field: 'numberCode', title: '项目单号', width: 200 },
{ field: 'name', title: '项目名称', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("projectStateEnum", 'id', d.state, 'name');
diff --git a/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js b/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js
index cfbdf057a1a39f15e078233dc90a140f9a8c1117..04e91c1348486b62e622e2a9b30507058695dbbe 100644
--- a/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js
+++ b/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js
@@ -28,7 +28,7 @@ layui.config({
return '' + d.oddNumber + '';
}},
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
- return '' + d.processInstanceId + '';
+ return '' + getNotUndefinedVal(d.processInstanceId) + '';
}},
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
diff --git a/web/src/main/resources/template/json/sysServiceMation.json b/web/src/main/resources/template/json/sysServiceMation.json
index 52272e28c349bfe0043b293ad919bec01098c935..796266ebb7b9f9553b21b2e3c099a600f24e51a6 100644
--- a/web/src/main/resources/template/json/sysServiceMation.json
+++ b/web/src/main/resources/template/json/sysServiceMation.json
@@ -52,6 +52,7 @@
"gwReceiveDocumentService": {"name": "公文收文管理", "key": "com.skyeye.eve.gw.service.impl.GwReceiveDocumentServiceImpl"},
"incomeOrder": {"name": "财务明细账", "key": "com.skyeye.order.service.impl.IncomeOrderServiceImpl"},
+ "reimbursement": {"name": "报销订单", "key": "com.skyeye.reimbursement.service.impl.ReimbursementServiceImpl"},
"bossPersonRequire": {"name": "人员需求申请", "key": "com.skyeye.personrequire.service.impl.PersonRequireServiceImpl"},
"bossInterviewRegularWorker": {"name": "转正申请", "key": "com.skyeye.regularworker.service.impl.RegularWorkerServiceImpl"},