From 7fbd5de83dff2ec24946a627f713f60dca874465 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sun, 5 May 2024 10:33:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=8A=A5=E9=94=80?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/myActiviti/pendingProcess.js | 2 +- .../assetArticlesPurchaseList.js | 2 +- .../assetArticlesUse/assetArticlesUseList.js | 2 +- .../assetManagePurchaseList.js | 2 +- .../assetManageReturnList.js | 2 +- .../js/assetManageUse/assetManageUseList.js | 2 +- .../conFerenceRoomReserveList.js | 2 +- .../template/js/gw/gwReceiveDocumentList.js | 2 +- .../template/js/gw/gwSendDocumentList.js | 2 +- .../licenceManageBorrowList.js | 2 +- .../licenceManageRevertList.js | 2 +- .../sealManageBorrow/sealManageBorrowList.js | 2 +- .../sealManageRevert/sealManageRevertList.js | 2 +- .../vehicleManageUse/vehicleManageUseList.js | 2 +- .../bossInterviewJobTransferList.js | 2 +- .../bossInterviewQuitList.js | 2 +- .../bossInterviewRegularWorkerList.js | 2 +- .../bossPersonRequireAllList.js | 2 +- .../bossPersonRequireList.js | 2 +- .../bossPersonRequireMyChargeList.js | 2 +- .../checkWorkAbnormalAttendanceList.js | 2 +- .../checkWorkBusinessTripList.js | 2 +- .../checkWorkCancelLeaveList.js | 2 +- .../js/checkWorkLeave/checkWorkLeaveList.js | 2 +- .../checkWorkOvertimeList.js | 2 +- .../js/crmContract/crmContractList.js | 2 +- .../js/crmOpportunity/crmOpportunityList.js | 2 +- .../template/js/erpMachin/erpMachinList.js | 2 +- .../template/js/erpPick/erpPatchPickList.js | 2 +- .../js/erpPick/erpRequisitionPickList.js | 2 +- .../template/js/erpPick/erpReturnPickList.js | 2 +- .../js/erpProduction/erpProductionList.js | 2 +- .../template/js/allocation/allocationList.js | 2 +- .../js/assemblySheet/assemblySheetList.js | 2 +- .../js/otherOutlets/otherOutletsList.js | 2 +- .../js/otherWarehous/otherWarehousList.js | 2 +- .../js/purchaseOrder/purchaseOrderList.js | 2 +- .../js/purchasePut/purchasePutList.js | 2 +- .../js/purchaseReturns/purchaseReturnsList.js | 2 +- .../js/retailOutlet/retailOutletList.js | 2 +- .../js/retailReturns/retailReturnsList.js | 2 +- .../template/js/salesOrder/salesOrderList.js | 2 +- .../js/salesOutlet/salesOutletList.js | 2 +- .../js/salesReturns/salesReturnsList.js | 2 +- .../template/js/splitDoc/splitDocList.js | 2 +- .../supplierContract/supplierContractList.js | 2 +- .../template/js/income/incomeList.js | 6 +- .../js/reimbursement/reimbursementList.js | 171 ++++++++++++++++++ .../tpl/reimbursement/reimbursementList.html | 45 +++++ .../template/js/proTask/proTaskList.js | 2 +- .../template/js/project/projectList.js | 2 +- .../template/js/sealApply/sealApplyList.js | 2 +- .../template/json/sysServiceMation.json | 1 + 53 files changed, 270 insertions(+), 51 deletions(-) create mode 100644 ifs/src/main/resources/template/js/reimbursement/reimbursementList.js create mode 100644 ifs/src/main/resources/template/tpl/reimbursement/reimbursementList.html diff --git a/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js b/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js index 4e10c7c24..ff1e8d4c8 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 763c46172..79033542a 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 6ca3bf448..11922a094 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 568944727..d0f09afa0 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 c3c6a16a6..4ffea078f 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 8a977b4f5..adab5381d 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 5c9881bdd..ed057b8b0 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 4f58b96da..dba432112 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 43bac0c08..a36cd14e9 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 1dad8380b..ed95bae12 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 a76ad8aff..82a57b26e 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 8030dc294..30c3d2920 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 3536e4a20..853403b12 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 3bedb2962..846c5300a 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 bbebe6d04..87befd35d 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 63bb959eb..08bb41f90 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 12936a8f9..33d201e07 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 39c8b3154..3c3172a4d 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 2f0be60df..954ece453 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 2732f05ea..d0cc8bc9f 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 afdd6615c..57b6bdc50 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 3bff8e2f6..e8e07f139 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 c7bf2209b..5938f9055 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 d18aacf11..b85b5afea 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 6495d7734..039ba2b03 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 be03b202b..f113bedaa 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 4e0d1be7b..5fbf43fc9 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 4bb53d13a..03b60b8d5 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 1443f36aa..593245643 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 5d1bdbcbe..814db8727 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 749b51b99..cdffd5c71 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 adc3c76cf..6cfeebacf 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 f7cba4c55..7df58bfad 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 9aca2f509..827125d02 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 100856416..b8656e129 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 6283b0879..7eca095a1 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 e4d94bb54..efdde62e6 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 602bdd7d2..1951ebc42 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 6b4e65509..201f09368 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 d02cf1de1..6d0030c57 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 a290ab6d1..0bd8230a0 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 b72edd277..79b75b8d3 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 a48e2da67..185d267de 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 c1c21b542..6057ea5e4 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 2b94cd2ef..f528600f8 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 63537af4a..59ae8e2cc 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 b3cb39e35..cfad79461 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 000000000..38ee9fa3e --- /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 000000000..92078ca15 --- /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 6676382c2..52a9d5899 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 856335b86..0b2884bd0 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 cfbdf057a..04e91c134 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 52272e28c..796266ebb 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"}, -- GitLab