Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js

@@ -76,49 +76,13 @@ layui.config({
 	table.on('tool(messageMyStartTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
-        if (layEvent === 'edit') { //编辑
-        	edit(data);
-        } else if (layEvent === 'details') { //详情
+        if (layEvent === 'details') { //详情
 			activitiUtil.activitiDetails(data);
-        } else if (layEvent === 'revoke') { //撤销
-        	revoke(data);
         } else if (layEvent === 'refreshPic') { //刷新流程图
         	refreshPic(data);
         }
     });
 	
-	//编辑
-	function edit(data) {
-		sequenceId = data.sequenceId;
-		taskId = data.id;
-		processInstanceId = data.processInstanceId;
-		rowId = data.dataId;
-		_openNewWindows({
-			url: data.editPageUrl,
-			title: systemLanguage["com.skyeye.editPageTitle"][languageType],
-			pageId: "myactivitiedit",
-			area: ['90vw', '90vh'],
-			callBack: function (refreshCode) {
-				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
-			}
-		});
-	}
-
-	//撤销
-	function revoke(data) {
-		if(isNull(data.revokeMapping)){//撤销接口为空
-			winui.window.msg('撤销接口调用失败', {icon: 2, time: 2000});
-			return false;
-		}
-		layer.confirm('确定撤销该流程吗？', { icon: 3, title: '撤销操作' }, function (index) {
-			layer.close(index);
-	        AjaxPostUtil.request({url: flowableBasePath + data.revokeMapping, params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
-				winui.window.msg("撤销成功", {icon: 1, time: 2000});
-				reloadMyStartTable();
-			}});
-		});
-	}
-	
 	//刷新流程图
 	function refreshPic(data) {
 		layer.confirm('确认重新生成流程图吗？', { icon: 3, title: '刷新流程图操作' }, function (i) {

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 '<a lay-event="details" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="details" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 	        { field: 'taskType', title: '类型', width: 150, templet: function (d) {
 				return d.processMation.title;

activiti/src/main/resources/template/tpl/myActiviti/initiatedProcess.html

@@ -33,10 +33,6 @@
     <div style="margin:auto 10px;">
         <table id="messageMyStartTable" lay-filter="messageMyStartTable"></table>
         <script type="text/html" id="myStartTableBar">
-			{{# if(d.editRow == 1){ }}
-				<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
-				<a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="revoke">撤销</a>
-			{{# } }}
 			<a class="layui-btn layui-btn-xs" lay-event="details">详情</a>
 			<a class="layui-btn layui-btn-xs" lay-event="refreshPic">刷新流程图</a>
         </script>

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

admin-assistant/src/main/resources/template/js/assetManage/assetManageChoose.js

@@ -138,7 +138,6 @@ layui.config({
 	});
 
 	form.render();
-
 	$("body").on("click", "#reloadTable", function() {
     	loadTable();
     });

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js

@@ -37,10 +37,10 @@ layui.config({
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("assetReportState", 'id', d.state, 'name');
 			}},
 			{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
-				return isNull(d.assetAdminMation) ? '' : d.assetAdminMation.name;
+				return getNotUndefinedVal(d.assetAdminMation?.name);
 			}},
 			{ field: 'useUserMation', title: '申领人', width: 120, templet: function(d) {
-				return isNull(d.useUserMation) ? '' : d.useUserMation.name;
+				return getNotUndefinedVal(d.useUserMation?.name);
 			}},
 			{ field: 'storageArea', title: '存放区域', width: 140 },
 			{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },

admin-assistant/src/main/resources/template/js/assetReportManage/assetReportMyUseChoose.js

@@ -59,7 +59,7 @@ layui.config({
 			{ field: 'assetNum', title: '资产编号', align: 'left', width: 150 },
 			{ field: 'specifications', title: '资产规格', align: 'left', width: 120 },
 			{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
-				return isNull(d.assetAdminMation) ? '' : d.assetAdminMation.name;
+				return getNotUndefinedVal(d.assetAdminMation?.name);
 			}},
 			{ field: 'createTime', title: '申领时间', align: 'center', width: 150 },
 		]],

admin-assistant/src/main/resources/template/js/assetReportManage/assetReportUnUseChoose.js

@@ -59,7 +59,7 @@ layui.config({
 			{ field: 'assetNum', title: '资产编号', width: 160 },
 			{ field: 'storageArea', title: '存放区域', width: 200 },
 			{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
-				return isNull(d.assetAdminMation) ? '' : d.assetAdminMation.name;
+				return getNotUndefinedVal(d.assetAdminMation?.name);
 			}},
 		]],
 	    done: function(res) {

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 	        { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

admin-assistant/src/main/resources/template/js/gw/gwDocumentSeeList.js

+
+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;
+
+	// 加载列表数据权限
+	loadAuthBtnGroup('messageTable', '1714464811697');
+    
+	table.render({
+		id: 'messageTable',
+		elem: '#messageTable',
+		method: 'post',
+		url: sysMainMation.admBasePath + 'queryGwSendDocumentList',
+		where: getTableParams(),
+		even: true,
+		page: true,
+		limits: getLimits(),
+		limit: getLimit(),
+		cols: [[
+			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'title', title: '标题', width: 300 },
+			{ field: 'sendDepartmentMation', title: '发文部门', width: 150, templet: function (d) {
+				return getNotUndefinedVal(d.sendDepartmentMation?.name);
+			}},
+			{ field: 'year', title: '年份', align: 'center', width: 100 },
+			{ field: 'number', title: '第几号文', align: 'center', width: 100 },
+			{ field: 'enterprise', title: '企字', align: 'center', width: 100 },
+			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#messageTableBar' }
+		]],
+		done: function(json) {
+			matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入标题", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
+		}
+	});
+
+	// 操作事件
+	table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'preview') {//预览
+			systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.picPath));
+		} else if (layEvent === 'download') {//下载
+			download(fileBasePath + data.path, data.title);
+		}
+    });
+	
+	form.render();
+	$("body").on("click", "#reloadTable", function() {
+		loadTable();
+	});
+	function loadTable() {
+		table.reloadData("messageTable", {where: getTableParams()});
+	}
+
+	function getTableParams() {
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
+    
+    exports('gwDocumentSeeList', {});
+});

admin-assistant/src/main/resources/template/js/gw/gwReceiveDocumentList.js

+
+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["gwReceiveDocumentService"]["key"];
+	
+	authBtn('1714142882792');
+    
+	table.render({
+		id: 'messageTable',
+		elem: '#messageTable',
+		method: 'post',
+		url: sysMainMation.admBasePath + 'queryGwReceiveDocumentList',
+		where: getTableParams(),
+		even: true,
+		page: true,
+		limits: getLimits(),
+		limit: getLimit(),
+		cols: [[
+			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) {
+				return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+			}},
+			{ field: 'title', title: '标题', width: 300 },
+			{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
+			}},
+			{ field: 'secret', title: '密集级别', width: 90, align: 'center', templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentSecret", 'id', d.secret, 'name');
+			}},
+			{ field: 'period', title: '保密期间', width: 90, align: 'center', templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentPeriod", 'id', d.period, 'name');
+			}},
+			{ field: 'urgency', title: '紧急程度', width: 90, align: 'center', templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentUrgency", 'id', d.urgency, 'name');
+			}},
+			{ field: 'openCategory', title: '公开类别', width: 90, align: 'center', templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentOpenCategory", 'id', d.openCategory, 'name');
+			}},
+			{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
+			}},
+			{ field: 'year', title: '年份', align: 'center', width: 100 },
+			{ field: 'number', title: '第几号文', align: 'center', width: 100 },
+			{ field: 'enterprise', title: '企字', align: 'center', width: 100 },
+			{ 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: '#messageTableBar' }
+		]],
+		done: function(json) {
+			matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，标题", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
+		}
+	});
+
+	// 操作事件
+	table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'details') { //详情
+			details(data);
+        } else if (layEvent === 'processDetails') { //流程详情
+			activitiUtil.activitiDetails(data);
+        } else if (layEvent === 'edit') { //编辑
+			edit(data);
+        } else if (layEvent === 'subApproval') { //提交审批
+        	subApproval(data);
+        } else if (layEvent === 'cancellation') {//作废
+        	cancellation(data);
+        } else if (layEvent === 'revoke') {//撤销
+        	revoke(data);
+        }
+    });
+	
+	// 撤销
+	function revoke(data) {
+		var msg = '确认撤销该申请吗？';
+		layer.confirm(msg, { icon: 3, title: '撤销操作'}, function (index) {
+			layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.admBasePath + "revokeGwReceiveDocument", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
+				winui.window.msg("提交成功", {icon: 1, time: 2000});
+				loadTable();
+    		}});
+		});
+	}
+	
+	// 编辑
+	function edit(data) {
+		_openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024042700006&id=' + data.id, null),
+			title: "外部收文申请",
+			pageId: "gwDocumentEdit",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}
+		});
+	}
+	
+	// 提交审批
+	function subApproval(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.admBasePath + "submitGwReceiveDocumentToApproval", params: params, type: 'json', method: "POST", callback: function (json) {
+					winui.window.msg("提交成功", {icon: 1, time: 2000});
+					loadTable();
+				}});
+			});
+		});
+	}
+	
+	// 作废
+	function cancellation(data) {
+		var msg = '确认作废该申请吗？';
+		layer.confirm(msg, { icon: 3, title: '作废操作' }, function (index) {
+			layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.admBasePath + "invalidGwReceiveDocument", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+    		}});
+		});
+	}
+	
+	// 详情
+	function details(data) {
+		_openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024042700007&id=' + data.id, null),
+			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+			pageId: "gwDocumentDetails",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+			}
+		});
+	}
+	
+	// 添加
+	$("body").on("click", "#addBean", function() {
+    	_openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024042700005', null),
+			title: "外部收文申请",
+			pageId: "gwDocumentAdd",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}});
+    });
+
+	form.render();
+	$("body").on("click", "#reloadTable", function() {
+		loadTable();
+	});
+	function loadTable() {
+		table.reloadData("messageTable", {where: getTableParams()});
+	}
+
+	function getTableParams() {
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
+    
+    exports('gwReceiveDocumentList', {});
+});

admin-assistant/src/main/resources/template/js/gw/gwSendDocumentList.js

+
+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["gwSendDocumentService"]["key"];
+	
+	authBtn('1714130289379');
+
+	// 加载列表数据权限
+	loadAuthBtnGroup('messageTable', '1714130296761');
+    
+	table.render({
+		id: 'messageTable',
+		elem: '#messageTable',
+		method: 'post',
+		url: sysMainMation.admBasePath + 'queryGwSendDocumentList',
+		where: getTableParams(),
+		even: true,
+		page: true,
+		limits: getLimits(),
+		limit: getLimit(),
+		cols: [[
+			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) {
+				return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+			}},
+			{ field: 'title', title: '标题', width: 300 },
+			{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
+			}},
+			{ field: 'secret', title: '密集级别', width: 90, align: 'center', templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentSecret", 'id', d.secret, 'name');
+			}},
+			{ field: 'period', title: '保密期间', width: 90, align: 'center', templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentPeriod", 'id', d.period, 'name');
+			}},
+			{ field: 'urgency', title: '紧急程度', width: 90, align: 'center', templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentUrgency", 'id', d.urgency, 'name');
+			}},
+			{ field: 'openCategory', title: '公开类别', width: 90, align: 'center', templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("gwDocumentOpenCategory", 'id', d.openCategory, 'name');
+			}},
+			{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
+			}},
+			{ field: 'year', title: '年份', align: 'center', width: 100 },
+			{ field: 'number', title: '第几号文', align: 'center', width: 100 },
+			{ field: 'enterprise', title: '企字', align: 'center', width: 100 },
+			{ 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: 280, toolbar: '#messageTableBar' }
+		]],
+		done: function(json) {
+			matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，标题", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
+		}
+	});
+
+	// 操作事件
+	table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'details') { //详情
+			details(data);
+        } else if (layEvent === 'processDetails') { //流程详情
+			activitiUtil.activitiDetails(data);
+        } else if (layEvent === 'edit') { //编辑
+			edit(data);
+        } else if (layEvent === 'subApproval') { //提交审批
+        	subApproval(data);
+        } else if (layEvent === 'cancellation') {//作废
+        	cancellation(data);
+        } else if (layEvent === 'revoke') {//撤销
+        	revoke(data);
+        } else if (layEvent === 'preview') {//预览
+			systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.picPath));
+		} else if (layEvent === 'download') {//下载
+			download(fileBasePath + data.path, data.title);
+		}
+    });
+	
+	// 撤销
+	function revoke(data) {
+		var msg = '确认撤销该申请吗？';
+		layer.confirm(msg, { icon: 3, title: '撤销操作'}, function (index) {
+			layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.admBasePath + "revokeGwSendDocument", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
+				winui.window.msg("提交成功", {icon: 1, time: 2000});
+				loadTable();
+    		}});
+		});
+	}
+	
+	// 编辑
+	function edit(data) {
+		_openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024042700002&id=' + data.id, null),
+			title: "发文申请",
+			pageId: "gwSendDocumentEdit",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}
+		});
+	}
+	
+	// 提交审批
+	function subApproval(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.admBasePath + "submitGwSendDocumentToApproval", params: params, type: 'json', method: "POST", callback: function (json) {
+					winui.window.msg("提交成功", {icon: 1, time: 2000});
+					loadTable();
+				}});
+			});
+		});
+	}
+	
+	// 作废
+	function cancellation(data) {
+		var msg = '确认作废该申请吗？';
+		layer.confirm(msg, { icon: 3, title: '作废操作' }, function (index) {
+			layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.admBasePath + "invalidGwSendDocument", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+    		}});
+		});
+	}
+	
+	// 详情
+	function details(data) {
+		_openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024042700003&id=' + data.id, null),
+			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+			pageId: "gwSendDocumentDetails",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+			}
+		});
+	}
+
+	// 添加
+	$("body").on("click", "#addBean", function() {
+    	_openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024042700001', null),
+			title: "发文申请",
+			pageId: "gwSendDocumentAdd",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}});
+    });
+
+	form.render();
+	$("body").on("click", "#reloadTable", function() {
+		loadTable();
+	});
+	function loadTable() {
+		table.reloadData("messageTable", {where: getTableParams()});
+	}
+
+	function getTableParams() {
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
+    
+    exports('gwSendDocumentList', {});
+});

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js

@@ -32,7 +32,7 @@ layui.config({
 			}},
 			{ field: 'assetNum', title: '资产编号', align: 'left', width: 150 },
 			{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
-				return isNull(d.assetAdminMation) ? '' : d.assetAdminMation.name;
+				return getNotUndefinedVal(d.assetAdminMation?.name);
 			}},
 			{ field: 'createTime', title: '申领时间', align: 'center', width: 150 },
 		]],

admin-assistant/src/main/resources/template/js/myHasMation/myLicenceManagement.js

@@ -26,7 +26,7 @@ layui.config({
 			{ field: 'name', title: '证照名称', align: 'left', width: 140 },
 			{ field: 'licenceNum', title: '证照编号', align: 'left', width: 160 },
 			{ field: 'licenceAdmin', title: '管理员', align: 'left', width: 120, templet: function(d) {
-				return isNull(d.licenceAdminMation) ? '' : d.licenceAdminMation.name;
+				return getNotUndefinedVal(d.licenceAdminMation?.name);
 			}},
 		]],
 		done: function(json) {

admin-assistant/src/main/resources/template/js/myHasMation/mySealManagement.js

@@ -25,7 +25,7 @@ layui.config({
 			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
 			{ field: 'name', title: '印章名称', align: 'left', width: 150 },
 			{ field: 'licenceAdmin', title: '管理员', align: 'left', width: 120, templet: function(d) {
-				return isNull(d.licenceAdminMation) ? '' : d.licenceAdminMation.name;
+				return getNotUndefinedVal(d.licenceAdminMation?.name);
 			}},
 		]],
 		done: function(json) {

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

admin-assistant/src/main/resources/template/tpl/assetManage/assetManageChoose.html

@@ -17,9 +17,7 @@
         </div>
     </div>
     <div style="margin:auto 10px;">
-    	<div style="margin:auto 10px;">
-	        <table id="messageTable" lay-filter="messageTable"></table>
-	    </div>
+        <table id="messageTable" lay-filter="messageTable"></table>
     </div>
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>

admin-assistant/src/main/resources/template/tpl/gw/gwDocumentSeeList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+	<div class="winui-toolbar">
+		<div class="winui-tool">
+			<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+		</div>
+	</div>
+	<div style="margin:auto 10px;">
+		<table id="messageTable" lay-filter="messageTable"></table>
+		<script type="text/html" id="messageTableBar">
+			<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="preview">预览</a>
+			<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="download">下载</a>
+		</script>
+	</div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/gw/'}).use('gwDocumentSeeList');
+    </script>
+</body>
+</html>
\ No newline at end of file

admin-assistant/src/main/resources/template/tpl/gw/gwReceiveDocumentList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+	<div class="winui-toolbar">
+		<div class="winui-tool">
+			<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+			<button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1714142882792"><i class="fa fa-plus" aria-hidden="true"></i>公文收文</button>
+		</div>
+	</div>
+	<div style="margin:auto 10px;">
+		<table id="messageTable" lay-filter="messageTable"></table>
+		<script type="text/html" id="messageTableBar">
+			{{# if(d.editRow == '1') { }}
+				{{# if(auth('1714142890579')) { }}
+					<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
+				{{# } }}
+				{{# if(auth('1714142898447')) { }}
+					<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>
+				{{# } }}
+				{{# if(auth('1714142882792')) { }}
+					<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+				{{# } }}
+			{{# } }}
+			{{# if(d.editRow == '2') { }}
+				{{# if(auth('1714142906241')) { }}
+					<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
+				{{# } }}
+			{{# } }}
+		</script>
+	</div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/gw/'}).use('gwReceiveDocumentList');
+    </script>
+</body>
+</html>
\ No newline at end of file

admin-assistant/src/main/resources/template/tpl/gw/gwSendDocumentList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+	<div class="winui-toolbar">
+		<div class="winui-tool">
+			<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+			<button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1714130289379"><i class="fa fa-plus" aria-hidden="true"></i>公文起草</button>
+		</div>
+	</div>
+	<div style="margin:auto 10px;">
+		<table id="messageTable" lay-filter="messageTable"></table>
+		<script type="text/html" id="messageTableBar">
+			{{# if(d.editRow == '1') { }}
+				{{# if(auth('1714130307180')) { }}
+					<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
+				{{# } }}
+				{{# if(auth('1714130315922')) { }}
+					<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>
+				{{# } }}
+				{{# if(auth('1714130289379')) { }}
+					<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+				{{# } }}
+			{{# } }}
+			{{# if(d.editRow == '2') { }}
+				{{# if(auth('1714130325009')) { }}
+					<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
+				{{# } }}
+			{{# } }}
+			<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="preview">预览</a>
+			<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="download">下载</a>
+		</script>
+	</div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/gw/'}).use('gwSendDocumentList');
+    </script>
+</body>
+</html>
\ No newline at end of file

base-server/src/main/resources/template/js/teamBusiness/teamBusinessDetails.js

@@ -34,23 +34,25 @@ layui.config({
 			});
 			loadTreeTable();
 			// 解析成员信息
-			$.each(json.bean.teamRoleList, function (i, item) {
-				treeTableData.push({
-					id: item.roleId,
-					pId: '0',
-					name: item.name
-				});
-				$.each(item.teamRoleUserList, function (j, bean) {
+			if (!isNull(json.bean.teamRoleList)) {
+				$.each(json.bean.teamRoleList, function (i, item) {
 					treeTableData.push({
-						id: bean.userId,
-						pId: item.roleId,
-						name: bean.userMation.name,
-						departmentName: bean.userMation.departmentName,
-						phone: bean.userMation.phone,
-						email: bean.userMation.email
+						id: item.roleId,
+						pId: '0',
+						name: item.name
+					});
+					$.each(item.teamRoleUserList, function (j, bean) {
+						treeTableData.push({
+							id: bean.userId,
+							pId: item.roleId,
+							name: bean.userMation.name,
+							departmentName: bean.userMation.departmentName,
+							phone: bean.userMation.phone,
+							email: bean.userMation.email
+						});
 					});
 				});
-			});
+			}
 
 			// 解析权限信息
 			$.each(json.bean.teamObjectPermissionList, function (i, item) {

base-server/src/main/resources/template/js/teamBusiness/teamBusinessEdit.js

@@ -37,23 +37,25 @@ layui.config({
 			});
 
 			// 解析成员信息
-			$.each(json.bean.teamRoleList, function (i, item) {
-				treeTableData.push({
-					id: item.roleId,
-					pId: '0',
-					name: item.name
-				});
-				$.each(item.teamRoleUserList, function (j, bean) {
+			if (!isNull(json.bean.teamRoleList)) {
+				$.each(json.bean.teamRoleList, function (i, item) {
 					treeTableData.push({
-						id: bean.userId,
-						pId: item.roleId,
-						name: bean.userMation.name,
-						departmentName: bean.userMation.departmentName,
-						phone: bean.userMation.phone,
-						email: bean.userMation.email
+						id: item.roleId,
+						pId: '0',
+						name: item.name
+					});
+					$.each(item.teamRoleUserList, function (j, bean) {
+						treeTableData.push({
+							id: bean.userId,
+							pId: item.roleId,
+							name: bean.userMation.name,
+							departmentName: bean.userMation.departmentName,
+							phone: bean.userMation.phone,
+							email: bean.userMation.email
+						});
 					});
 				});
-			});
+			}
 
 			// 解析权限信息
 			$.each(json.bean.teamObjectPermissionList, function (i, item) {

base-server/src/main/resources/template/js/teamTemplate/teamTemplateDetails.js

@@ -29,23 +29,25 @@ layui.config({
 		ajaxSendAfter: function (json) {
 			loadTreeTable();
 			// 解析成员信息
-			$.each(json.bean.teamRoleList, function (i, item) {
-				treeTableData.push({
-					id: item.roleId,
-					pId: '0',
-					name: item.name
-				});
-				$.each(item.teamRoleUserList, function (j, bean) {
+			if (!isNull(json.bean.teamRoleList)) {
+				$.each(json.bean.teamRoleList, function (i, item) {
 					treeTableData.push({
-						id: bean.userId,
-						pId: item.roleId,
-						name: bean.userMation.name,
-						departmentName: bean.userMation.departmentName,
-						phone: bean.userMation.phone,
-						email: bean.userMation.email
+						id: item.roleId,
+						pId: '0',
+						name: item.name
+					});
+					$.each(item.teamRoleUserList, function (j, bean) {
+						treeTableData.push({
+							id: bean.userId,
+							pId: item.roleId,
+							name: bean.userMation.name,
+							departmentName: bean.userMation.departmentName,
+							phone: bean.userMation.phone,
+							email: bean.userMation.email
+						});
 					});
 				});
-			});
+			}
 
 			// 解析权限信息
 			$.each(json.bean.teamObjectPermissionList, function (i, item) {

base-server/src/main/resources/template/js/teamTemplate/teamTemplateEdit.js

@@ -38,23 +38,25 @@ layui.config({
 
 			loadTreeTable();
 			// 解析成员信息
-			$.each(json.bean.teamRoleList, function (i, item) {
-				treeTableData.push({
-					id: item.roleId,
-					pId: '0',
-					name: item.name
-				});
-				$.each(item.teamRoleUserList, function (j, bean) {
+			if (!isNull(json.bean.teamRoleList)) {
+				$.each(json.bean.teamRoleList, function (i, item) {
 					treeTableData.push({
-						id: bean.userId,
-						pId: item.roleId,
-						name: bean.userMation.name,
-						departmentName: bean.userMation.departmentName,
-						phone: bean.userMation.phone,
-						email: bean.userMation.email
+						id: item.roleId,
+						pId: '0',
+						name: item.name
+					});
+					$.each(item.teamRoleUserList, function (j, bean) {
+						treeTableData.push({
+							id: bean.userId,
+							pId: item.roleId,
+							name: bean.userMation.name,
+							departmentName: bean.userMation.departmentName,
+							phone: bean.userMation.phone,
+							email: bean.userMation.email
+						});
 					});
 				});
-			});
+			}
 
 			// 解析权限信息
 			$.each(json.bean.teamObjectPermissionList, function (i, item) {

boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js

@@ -31,17 +31,17 @@ layui.config({
                 return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
             }},
             { field: 'interviewMation', title: '面试者', width: 100, templet: function (d) {
-                return d.interviewMation.name;
+                return getNotUndefinedVal(d.interviewMation?.name);
             }},
             { field: 'recruitDepartmentMation', title: '面试部门', width: 140, templet: function (d) {
-                return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitDepartmentMation.name;
+                return getNotUndefinedVal(d.personRequireMation?.recruitDepartmentMation?.name);
             }},
             { field: 'recruitJobMation', title: '面试岗位', width: 150, templet: function (d) {
-                return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitJobMation.name;
+                return getNotUndefinedVal(d.personRequireMation?.recruitJobMation?.name);
             }},
             { field: 'interviewTime', title: '面试时间', width: 140, align: 'center' },
             { field: 'interviewer', title: '面试官', width: 120, templet: function (d) {
-                return isNull(d.interviewerMation) ? '' : d.interviewerMation.name;
+                return getNotUndefinedVal(d.interviewerMation?.name);
             }},
             { field: 'state', title: '面试状态', width: 160, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossInterviewArrangementState", 'id', d.state, 'name');

boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewerList.js

@@ -27,17 +27,17 @@ layui.config({
                 return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
             }},
             { field: 'interviewMation', title: '面试者', width: 100, templet: function (d) {
-                return d.interviewMation.name;
+                return getNotUndefinedVal(d.interviewMation?.name);
             }},
             { field: 'recruitDepartmentMation', title: '面试部门', width: 140, templet: function (d) {
-                return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitDepartmentMation.name;
+                return getNotUndefinedVal(d.personRequireMation?.recruitDepartmentMation?.name);
             }},
             { field: 'recruitJobMation', title: '面试岗位', width: 150, templet: function (d) {
-                return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitJobMation.name;
+                return getNotUndefinedVal(d.personRequireMation?.recruitJobMation?.name);
             }},
             { field: 'interviewTime', title: '面试时间', width: 140, align: 'center' },
             { field: 'interviewer', title: '面试官', width: 120, templet: function (d) {
-                return isNull(d.interviewerMation) ? '' : d.interviewerMation.name;
+                return getNotUndefinedVal(d.interviewerMation?.name);
             }},
             { field: 'state', title: '面试状态', width: 160, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossInterviewArrangementState", 'id', d.state, 'name');

boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js

@@ -62,6 +62,7 @@ layui.config({
             form.on('submit(formSubBean)', function(data) {
                 if(winui.verifyForm(data.elem)) {
                     var state = $("input[name='state']:checked").val();
+                    var inductionState = $("#inductionState").val();
                     if (state == 6) {
                         // 同意入职
                         if (isNull($("#entryTime").val())) {
@@ -80,7 +81,6 @@ layui.config({
                             winui.window.msg('请选择入职状态', {icon: 2, time: 2000});
                             return false;
                         }
-                        var inductionState = $("#inductionState").val();
                         if (inductionState == '4' && isNull($("#trialTime").val())) {
                             winui.window.msg('请选择预计试用结束日期', {icon: 2, time: 2000});
                             return false;
@@ -93,10 +93,10 @@ layui.config({
                         entryTime: $("#entryTime").val(),
                         workTime: $("#workTime").val(),
                         userIdCard: $("#userIdCard").val(),
-                        inductionState: inductionState,
+                        inductionState: getNotUndefinedVal(inductionState),
                         trialTime: $("#trialTime").val()
                     };
-                    AjaxPostUtil.request({url: sysMainMation.bossBasePath + "setInductionResult", params: params, type: 'json', method: "PUT", callback: function(json) {
+                    AjaxPostUtil.request({url: sysMainMation.bossBasePath + "setInductionResult", params: params, type: 'json', method: "POST", callback: function(json) {
                         parent.layer.close(index);
                         parent.refreshCode = '0';
                     }});

boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js

@@ -31,7 +31,7 @@ layui.config({
                 return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
             }},
             { field: 'transferStaffMation', title: '申请人', rowspan: '2', width: 140, templet: function(d) {
-                return isNull(d.transferStaffMation) ? '' : d.transferStaffMation.name;
+                return getNotUndefinedVal(d.transferStaffMation?.name);
             }},
             { title: '原岗位信息', align: 'center', colspan: '4'},
             { title: '申请岗位信息', align: 'center', colspan: '4'},
@@ -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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function(d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
@@ -52,28 +52,28 @@ layui.config({
         ],
             [
                 { field: 'primaryCompanyName', title: '企业', align: 'left', width: 150, templet: function(d) {
-                    return d.primaryCompanyMation.name;
+                    return getNotUndefinedVal(d.primaryCompanyMation?.name);
                 }},
                 { field: 'primaryDepartmentName', title: '部门', align: 'left', width: 150, templet: function(d) {
-                    return isNull(d.primaryDepartmentMation) ? '' : d.primaryDepartmentMation.name;
+                    return getNotUndefinedVal(d.primaryDepartmentMation?.name);
                 }},
                 { field: 'primaryJobName', title: '岗位', align: 'left', width: 150, templet: function(d) {
-                    return isNull(d.primaryJobMation) ? '' : d.primaryJobMation.name;
+                    return getNotUndefinedVal(d.primaryJobMation?.name);
                 }},
                 { field: 'primaryJobScoreName', title: '岗位定级', align: 'left', width: 150, templet: function(d) {
-                    return isNull(d.primaryJobScoreMation) ? '' : d.primaryJobScoreMation.name;
+                    return getNotUndefinedVal(d.primaryJobScoreMation?.name);
                 }},
                 { field: 'currentCompanyName', title: '企业', align: 'left', width: 150, templet: function(d) {
-                    return d.currentCompanyMation.name;
+                    return getNotUndefinedVal(d.currentCompanyMation?.name);
                 }},
                 { field: 'currentDepartmentName', title: '部门', align: 'left', width: 150, templet: function(d) {
-                    return isNull(d.currentDepartmentMation) ? '' : d.currentDepartmentMation.name;
+                    return getNotUndefinedVal(d.currentDepartmentMation?.name);
                 }},
                 { field: 'currentJobName', title: '岗位', align: 'left', width: 150, templet: function(d) {
-                    return isNull(d.currentJobMation) ? '' : d.currentJobMation.name;
+                    return getNotUndefinedVal(d.currentJobMation?.name);
                 }},
                 { field: 'currentJobScoreName', title: '岗位定级', align: 'left', width: 150, templet: function(d) {
-                    return isNull(d.currentJobScoreMation) ? '' : d.currentJobScoreMation.name;
+                    return getNotUndefinedVal(d.currentJobScoreMation?.name);
                 }}
             ]
         ],
@@ -162,7 +162,7 @@ layui.config({
     function cancellation(data) {
         layer.confirm('确认作废该申请吗？', { icon: 3, title: '作废操作' }, function (index) {
             layer.close(index);
-            AjaxPostUtil.request({url: sysMainMation.bossBasePath + "invalidJobTransfer", params: {id: data.id}, type: 'json', method: "PUT", callback: function (json) {
+            AjaxPostUtil.request({url: sysMainMation.bossBasePath + "invalidJobTransfer", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) {
                 winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
                 loadTable();
             }});

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerList.js

@@ -31,14 +31,14 @@ layui.config({
                 return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
             }},
             { field: 'departmentMation', title: '转正部门', width: 140, templet: function (d) {
-                return isNull(d.departmentMation) ? "" : d.departmentMation.name;
+                return getNotUndefinedVal(d.departmentMation?.name);
             }},
             { field: 'jobMation', title: '转正岗位', width: 150, templet: function (d) {
-                return isNull(d.jobMation) ? "" : d.jobMation.name;
+                return getNotUndefinedVal(d.jobMation?.name);
             }},
             { field: 'regularTime', title: '转正日期', align: 'center', width: 100 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function(d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

boss/src/main/resources/template/js/bossInterviewer/arrangeInterviewerIsMyList.js

@@ -28,17 +28,17 @@ layui.config({
                 return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
             }},
             { field: 'interviewMation', title: '面试者', width: 100, templet: function (d) {
-                return d.interviewMation.name;
+                return getNotUndefinedVal(d.interviewMation?.name);
             }},
             { field: 'recruitDepartmentMation', title: '面试部门', width: 140, templet: function (d) {
-                return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitDepartmentMation.name;
+                return getNotUndefinedVal(d.personRequireMation?.recruitDepartmentMation?.name);
             }},
             { field: 'recruitJobMation', title: '面试岗位', width: 150, templet: function (d) {
-                return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitJobMation.name;
+                return getNotUndefinedVal(d.personRequireMation?.recruitJobMation?.name);
             }},
             { field: 'interviewTime', title: '面试时间', width: 120, align: 'center' },
             { field: 'interviewer', title: '面试官', width: 120, templet: function (d) {
-                return isNull(d.interviewerMation) ? '' : d.interviewerMation.name;
+                return getNotUndefinedVal(d.interviewerMation?.name);
             }},
             { field: 'state', title: '面试状态', width: 160, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossInterviewArrangementState", 'id', d.state, 'name');

boss/src/main/resources/template/js/bossInterviewer/interviewerResult.js

@@ -33,7 +33,7 @@ layui.config({
                         state: $("input[name='state']:checked").val(),
                         evaluation: $("#evaluation").val()
                     };
-                    AjaxPostUtil.request({url: sysMainMation.bossBasePath + "setBossInterviewResult", params: params, type: 'json', method: "PUT", callback: function(json) {
+                    AjaxPostUtil.request({url: sysMainMation.bossBasePath + "setBossInterviewResult", params: params, type: 'json', method: "POST", callback: function(json) {
                         parent.layer.close(index);
                         parent.refreshCode = '0';
                     }});

boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireAllList.js

@@ -28,15 +28,16 @@ layui.config({
             }},
             { field: 'createName', title: '申请人', width: 120},
             { field: 'recruitDepartmentMation', title: '需求部门', width: 140, templet: function (d) {
-                return d.recruitDepartmentMation.name;
+                return getNotUndefinedVal(d.recruitDepartmentMation?.name);
             }},
             { field: 'recruitJobMation', title: '需求岗位', width: 150, templet: function (d) {
-                return d.recruitJobMation.name;
+                return getNotUndefinedVal(d.recruitJobMation?.name);
             }},
             { field: 'wages', title: '薪资范围', width: 120 },
             { field: 'recruitNum', title: '需求人数', width: 100 },
+            { field: 'recruitedNum', title: '已招聘人数', width: 100 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name');

boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireList.js

@@ -30,19 +30,20 @@ layui.config({
                 return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
             }},
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'recruitDepartmentId', title: '需求部门', align: 'left', width: 140, templet: function (d) {
-                return d.recruitDepartmentMation.name;
+                return getNotUndefinedVal(d.recruitDepartmentMation?.name);
             }},
             { field: 'recruitJobId', title: '需求岗位', align: 'left', width: 150, templet: function (d) {
-                return d.recruitJobMation.name;
+                return getNotUndefinedVal(d.recruitJobMation?.name);
             }},
             { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name');
             }},
             { field: 'wages', title: '薪资范围', width: 120 },
             { field: 'recruitNum', title: '需求人数', width: 100 },
+            { field: 'recruitedNum', title: '已招聘人数', width: 100 },
             { 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 },

boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeList.js

@@ -27,19 +27,20 @@ layui.config({
                 return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
             }},
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'recruitDepartmentId', title: '需求部门', align: 'left', width: 140, templet: function (d) {
-                return d.recruitDepartmentMation.name;
+                return getNotUndefinedVal(d.recruitDepartmentMation?.name);
             }},
             { field: 'recruitJobId', title: '需求岗位', align: 'left', width: 150, templet: function (d) {
-                return d.recruitJobMation.name;
+                return getNotUndefinedVal(d.recruitJobMation?.name);
             }},
             { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name');
             }},
             { field: 'wages', title: '薪资范围', width: 120 },
             { field: 'recruitNum', title: '需求人数', width: 100 },
+            { field: 'recruitedNum', title: '已招聘人数', width: 100 },
             { 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 },

boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeListChoose.js

@@ -28,16 +28,17 @@ layui.config({
                 return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
             }},
             { field: 'recruitDepartmentId', title: '需求部门', align: 'left', width: 140, templet: function (d) {
-                return d.recruitDepartmentMation.name;
+                return getNotUndefinedVal(d.recruitDepartmentMation?.name);
             }},
             { field: 'recruitJobId', title: '需求岗位', align: 'left', width: 150, templet: function (d) {
-                return d.recruitJobMation.name;
+                return getNotUndefinedVal(d.recruitJobMation?.name);
             }},
             { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name');
             }},
             { field: 'wages', title: '薪资范围', width: 120 },
             { field: 'recruitNum', title: '需求人数', width: 100 },
+            { field: 'recruitedNum', title: '已招聘人数', width: 100 },
             { 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 },
@@ -47,7 +48,7 @@ layui.config({
             matchingLanguage();
             for (var i = 0; i < res.rows.length; i++) {
                 // 招聘结束的设置为不可选中
-                if(res.rows[i].state == 'endRecruitment'){
+                if (res.rows[i].state == 'endRecruitment') {
                     systemCommonUtil.disabledRow(res.rows[i].LAY_TABLE_INDEX, 'radio');
                 }
             }

checkwork/src/main/resources/template/js/checkWorkAbnormalAttendance/checkWorkAbnormalAttendanceList.js

@@ -30,7 +30,7 @@ layui.config({
 				return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
 			}},
 			{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
-				return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

checkwork/src/main/resources/template/js/checkWorkTime/checkWorkTimeList.js

@@ -44,7 +44,7 @@ layui.config({
             { 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: '最后修改时间', align: 'center', width: 150},
-	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'}
+	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
 	    ]],
 	    done: function(json) {
 	    	matchingLanguage();
@@ -63,7 +63,9 @@ layui.config({
         	delet(data);
         } else if (layEvent === 'details') { //详情
         	details(data);
-        }
+        } else if (layEvent === 'setOnline') { //线上打卡信息
+			setOnline(data);
+		}
     });
 	
 	// 添加
@@ -104,6 +106,19 @@ layui.config({
 			}
 		});
 	}
+
+	// 线上打卡信息
+	function setOnline(data) {
+		_openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024042800001&id=' + data.id, null),
+			title: "设置线上打卡信息",
+			pageId: "setOnline",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}});
+	}
 	
 	// 详情
 	function details(data) {

checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeAdd.html

@@ -64,15 +64,15 @@
 				<span class="hr-title">作息时间</span><hr>
 			</div>
 			<div class="layui-form-item layui-col-xs6">
-				<label class="layui-form-label">开始时间<i class="red">*</i></label>
+				<label class="layui-form-label">开始时间</label>
 				<div class="layui-input-block">
-					<input type="text" id="restStartTime" name="restStartTime" win-verify="" placeholder="请选择开始时间" class="layui-input"/>
+					<input type="text" id="restStartTime" name="restStartTime" placeholder="请选择开始时间" class="layui-input"/>
 				</div>
 			</div>
 			<div class="layui-form-item layui-col-xs6">
-				<label class="layui-form-label">结束时间<i class="red">*</i></label>
+				<label class="layui-form-label">结束时间</label>
 				<div class="layui-input-block">
-					<input type="text" id="restEndTime" name="restEndTime" win-verify="" placeholder="请选择结束时间" class="layui-input"/>
+					<input type="text" id="restEndTime" name="restEndTime" placeholder="请选择结束时间" class="layui-input"/>
 				</div>
 			</div>
 		    <div class="layui-form-item layui-col-xs12">

checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeEdit.html

@@ -70,15 +70,15 @@
 				<span class="hr-title">作息时间</span><hr>
 			</div>
 			<div class="layui-form-item layui-col-xs6">
-				<label class="layui-form-label">开始时间<i class="red">*</i></label>
+				<label class="layui-form-label">开始时间</label>
 				<div class="layui-input-block">
-					<input type="text" id="restStartTime" name="restStartTime" win-verify="" placeholder="请选择开始时间" class="layui-input" value="{{restStartTime}}"/>
+					<input type="text" id="restStartTime" name="restStartTime" placeholder="请选择开始时间" class="layui-input" value="{{restStartTime}}"/>
 				</div>
 			</div>
 			<div class="layui-form-item layui-col-xs6">
-				<label class="layui-form-label">结束时间<i class="red">*</i></label>
+				<label class="layui-form-label">结束时间</label>
 				<div class="layui-input-block">
-					<input type="text" id="restEndTime" name="restEndTime" win-verify="" placeholder="请选择结束时间" class="layui-input" value="{{restEndTime}}"/>
+					<input type="text" id="restEndTime" name="restEndTime" placeholder="请选择结束时间" class="layui-input" value="{{restEndTime}}"/>
 				</div>
 			</div>
 		    <div class="layui-form-item layui-col-xs12">

checkwork/src/main/resources/template/tpl/checkWorkTime/checkWorkTimeList.html

@@ -23,6 +23,9 @@
 			{{# if(auth('1603026192319')) { }}
             	<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delet"><language showName="com.skyeye.deleteBtn"></language></a>
 			{{# } }}
+            {{# if(auth('1714276416911')) { }}
+                <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="setOnline">线上打卡信息</a>
+            {{# } }}
         </script>
     </div>
     <script src="../../assets/lib/layui/layui.js"></script>

crm/src/main/resources/template/js/crmContract/crmContractList.js

@@ -38,9 +38,11 @@ layui.config({
 			}},
 			{ field: 'oddNumber', title: '合同编号', align: 'left', width: 120 },
 			{ field: 'price', title: '合同金额（元）', align: 'left', width: 120 },
+			{ field: 'paymentPrice', title: '已回款金额（元）', align: 'left', width: 140 },
+			{ 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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("crmContractStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("crmOpportunityStateEnum", 'id', d.state, 'name');

crm/src/main/resources/template/js/follow/crmFollowList.js

+
+var objectKey = "";
+var objectId = "";
+
+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;
+    objectKey = GetUrlParam("objectKey");
+    objectId = GetUrlParam("objectId");
+    if (isNull(objectKey) || isNull(objectId)) {
+        winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+        return false;
+    }
+
+    var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'crmFollowUpAuthEnum');
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        url: sysMainMation.crmBasePath + 'queryFollowUpList',
+        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: 150, templet: function (d) {
+                return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+            }},
+            { field: 'contractId', title: '合同', width: 200, templet: function (d) {
+                return getNotUndefinedVal(d.contractMation?.title);
+            }},
+            { field: 'typeId', title: '类型', align: 'center', width: 120, templet: function (d) {
+                return sysDictDataUtil.getDictDataNameByCodeAndKey('FOLLOW_UP_TYPE', d.typeId);
+            }},
+            { field: 'contacts', title: '联系人', width: 120, templet: function (d) {
+                return getNotUndefinedVal(d.contactsMation?.name);
+            }},
+            { field: 'satisfaction', title: '客户满意度', align: 'center', width: 120, templet: function (d) {
+                return sysDictDataUtil.getDictDataNameByCodeAndKey('FOLLOW_UP_SATISFACTION', d.satisfaction);
+            }},
+            { field: 'followUserId', title: '回访人', width: 120, templet: function (d) {
+                return getNotUndefinedVal(d.followUserMation?.name);
+            }},
+            { field: 'followTime', title: '回访时间', align: 'center', width: 100 },
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', 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: 150, templet: function (d) {
+                var str = '';
+                if (authPermission['edit']) {
+                    str += '<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>'
+                }
+                if (authPermission['delete']) {
+                    str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>'
+                }
+                return str;
+            }}
+        ]],
+        done: function(json) {
+            matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入回访编号", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
+        }
+    });
+
+    table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'edit') {
+            edit(data);
+        } else if (layEvent === 'delete') {
+            del(data);
+        } else if (layEvent === 'details') {
+            details(data);
+        }
+    });
+
+
+    // 新增
+    $("body").on("click", "#addBean", function() {
+        parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2024050200001&objectId=' + objectId + '&objectKey=' + objectKey, null),
+            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+            pageId: "crmFollowAdd",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    });
+
+    // 编辑
+    function edit(data) {
+        parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2024050200002&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+            pageId: "crmFollowEdit",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
+    // 详情
+    function details(data) {
+        parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2024050200003&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "crmFollowDetails",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
+    // 删除
+    function del(data, obj) {
+        layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+            layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.crmBasePath + "deleteFollowUpById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+                winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+        });
+    }
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('crmFollowList', {});
+});
\ No newline at end of file

crm/src/main/resources/template/js/invoice/crmInvoiceList.js

+
+var objectKey = "";
+var objectId = "";
+
+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;
+	objectKey = GetUrlParam("objectKey");
+	objectId = GetUrlParam("objectId");
+	if (isNull(objectKey) || isNull(objectId)) {
+		winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+		return false;
+	}
+
+	var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'crmInvoiceAuthEnum');
+
+	table.render({
+	    id: 'messageTable',
+	    elem: '#messageTable',
+	    method: 'post',
+	    url: sysMainMation.crmBasePath + 'queryInvoiceList',
+	    where: getTableParams(),
+	    even: true,
+	    page: true,
+	    limits: getLimits(),
+	    limit: getLimit(),
+	    cols: [[
+	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'oddNumber', title: '单据编号', align: 'center', width: 150, templet: function (d) {
+				return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+			}},
+			{ field: 'invoicTime', title: '开票日期', align: 'center', width: 100 },
+			{ field: 'contractId', title: '合同', width: 200, templet: function (d) {
+				return getNotUndefinedVal(d.contractMation?.title);
+			}},
+			{ field: 'contractId1', title: '合同金额(元)', width: 120, templet: function (d) {
+				return getNotUndefinedVal(d.contractMation?.price);
+			}},
+			{ field: 'price', title: '开票金额（元）', width: 120 },
+			{ field: 'typeId', title: '开票类型', width: 150, templet: function (d) {
+				return sysDictDataUtil.getDictDataNameByCodeAndKey('INVOICE_TYPE', d.typeId);
+			}},
+			{ field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) {
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
+			}},
+			{ field: 'invoiceHeaderId', title: '发票抬头', width: 120, templet: function (d) {
+				return getNotUndefinedVal(d.invoiceHeaderMation?.name);
+			}},
+			{ field: 'state', title: '状态', width: 90, templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
+			}},
+	        { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', 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: 250, templet: function (d) {
+				var str = '';
+				if (d.editRow == 1) {
+					if (authPermission['submitToApproval']) {
+						str += '<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>';
+					}
+					if (authPermission['edit']) {
+						str += '<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>';
+					}
+					if (authPermission['delete']) {
+						str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">删除</a>';
+					}
+					if (authPermission['invalid']) {
+						str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>';
+					}
+				}
+				if (d.editRow == 2 && d.state == 'inExamine') {
+					if (authPermission['revoke']) {
+						str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>';
+					}
+				}
+				return str;
+			}}
+	    ]],
+	    done: function(json) {
+	    	matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
+	    }
+	});
+	
+	table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+		if (layEvent === 'edit') { //编辑
+			edit(data);
+		} else if (layEvent === 'details'){ //详情
+			details(data);
+		} else if (layEvent === 'processDetails') { //流程详情
+			activitiUtil.activitiDetails(data);
+		} else if (layEvent === 'subApproval') { //提交审批
+			subApproval(data);
+		} else if (layEvent === 'del') { //删除
+			del(data);
+		} else if (layEvent === 'cancellation') { //作废
+			cancellation(data);
+		} else if (layEvent === 'revoke') { //撤销
+			revoke(data);
+		}
+    });
+
+	// 新增
+	$("body").on("click", "#addBean", function() {
+    	parent._openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024050300005&objectId=' + objectId + '&objectKey=' + objectKey, null),
+			title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+			pageId: "crmContractAdd",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}});
+    });
+	
+	// 编辑
+	function edit(data) {
+		parent._openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024050300006&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+			title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+			pageId: "crmContractEdit",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}});
+	}
+
+	// 详情
+	function details(data) {
+		parent._openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024050300007&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+			pageId: "crmContractDetails",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+			}});
+	}
+	
+	// 提交审批
+	function subApproval(data) {
+		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
+			layer.close(index);
+			activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) {
+				var params = {
+					id: data.id,
+					approvalId: approvalId
+				};
+				AjaxPostUtil.request({url: sysMainMation.crmBasePath + "submitInvoiceToApproval", params: params, type: 'json', method: 'POST', callback: function (json) {
+					winui.window.msg("提交成功", {icon: 1, time: 2000});
+					loadTable();
+				}});
+			});
+		});
+	}
+
+	// 删除
+	function del(data, obj) {
+		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+			layer.close(index);
+			AjaxPostUtil.request({url: sysMainMation.crmBasePath + "deleteInvoiceById", 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 cancellation(data, obj) {
+		var msg = '确认作废该条数据吗？';
+		layer.confirm(msg, { icon: 3, title: '作废操作' }, function (index) {
+			layer.close(index);
+			AjaxPostUtil.request({url: sysMainMation.crmBasePath + "invalidInvoice", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}});
+		});
+	}
+
+	// 撤销
+	function revoke(data) {
+		var msg = '确认撤销该数据吗？';
+		layer.confirm(msg, { icon: 3, title: '撤销申请提交' }, function (index) {
+			layer.close(index);
+			AjaxPostUtil.request({url: sysMainMation.crmBasePath + "revokeInvoice", params: {processInstanceId: data.processInstanceId}, type: 'json', method: 'PUT', 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 getTableParams() {
+		return $.extend(true, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
+	
+    exports('crmInvoiceList', {});
+});
\ No newline at end of file

crm/src/main/resources/template/js/invoiceHeader/crmInvoiceHeaderList.js

+
+var objectKey = "";
+var objectId = "";
+
+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;
+    objectKey = GetUrlParam("objectKey");
+    objectId = GetUrlParam("objectId");
+    if (isNull(objectKey) || isNull(objectId)) {
+        winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+        return false;
+    }
+
+    var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'crmInvoiceHeaderAuthEnum');
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        url: sysMainMation.crmBasePath + 'queryInvoiceHeaderList',
+        where: getTableParams(),
+        even: true,
+        page: true,
+        limits: getLimits(),
+        limit: getLimit(),
+        cols: [[
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+            { field: 'name', title: '发票抬头', align: 'left', width: 150, templet: function (d) {
+                return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
+            }},
+            { field: 'identificationNumber', title: '纳税识别号', width: 150 },
+            { field: 'openingBank', title: '开户行', width: 150 },
+            { field: 'openingAccount', title: '开户帐号', width: 150 },
+            { field: 'billingAddress', title: '开票地址', width: 200 },
+            { field: 'phone', title: '电话', width: 120 },
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', 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: 150, templet: function (d) {
+                var str = '';
+                if (authPermission['edit']) {
+                    str += '<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>'
+                }
+                if (authPermission['delete']) {
+                    str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>'
+                }
+                return str;
+            }}
+        ]],
+        done: function(json) {
+            matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入发票抬头，纳税识别号", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
+        }
+    });
+
+    table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'edit') {
+            edit(data);
+        } else if (layEvent === 'delete') {
+            del(data);
+        } else if (layEvent === 'details') {
+            details(data);
+        }
+    });
+
+    // 新增
+    $("body").on("click", "#addBean", function() {
+        parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2024050300002&objectId=' + objectId + '&objectKey=' + objectKey, null),
+            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+            pageId: "crmInvoiceHeaderAdd",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    });
+
+    // 编辑
+    function edit(data) {
+        parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2024050300003&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+            pageId: "crmInvoiceHeaderEdit",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
+    // 详情
+    function details(data) {
+        parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2024050300004&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "crmInvoiceHeaderDetails",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
+    // 删除
+    function del(data, obj) {
+        layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+            layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.crmBasePath + "deleteInvoiceHeaderById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+                winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+        });
+    }
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('crmInvoiceHeaderList', {});
+});
\ No newline at end of file

crm/src/main/resources/template/js/payment/crmPaymentCollectionList.js

+
+var objectKey = "";
+var objectId = "";
+
+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;
+	objectKey = GetUrlParam("objectKey");
+	objectId = GetUrlParam("objectId");
+	if (isNull(objectKey) || isNull(objectId)) {
+		winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+		return false;
+	}
+
+	var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'crmPaymentCollectionAuthEnum');
+
+	table.render({
+	    id: 'messageTable',
+	    elem: '#messageTable',
+	    method: 'post',
+	    url: sysMainMation.crmBasePath + 'queryPaymentCollectionList',
+	    where: getTableParams(),
+	    even: true,
+	    page: true,
+	    limits: getLimits(),
+	    limit: getLimit(),
+	    cols: [[
+	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'oddNumber', title: '单据编号', align: 'center', width: 150, templet: function (d) {
+				return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+			}},
+			{ field: 'price', title: '回款金额（元）', width: 120 },
+			{ field: 'invoicePrice', title: '已开票金额（元）', align: 'left', width: 140 },
+			{ field: 'collectionTime', title: '回款日期', align: 'center', width: 100 },
+			{ field: 'processInstanceId', title: '流程ID', align: 'center', width: 100, templet: function (d) {
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
+			}},
+			{ field: 'typeId', title: '回款方式', width: 120, templet: function (d) {
+				return sysDictDataUtil.getDictDataNameByCodeAndKey('PAYMENT_COLLECTION_TYPE', d.typeId);
+			}},
+			{ field: 'state', title: '状态', width: 90, templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
+			}},
+	        { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', 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: 250, templet: function (d) {
+				var str = '';
+				if (d.editRow == 1) {
+					if (authPermission['submitToApproval']) {
+						str += '<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>';
+					}
+					if (authPermission['edit']) {
+						str += '<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>';
+					}
+					if (authPermission['delete']) {
+						str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">删除</a>';
+					}
+					if (authPermission['invalid']) {
+						str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>';
+					}
+				}
+				if (d.editRow == 2 && d.state == 'inExamine') {
+					if (authPermission['revoke']) {
+						str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>';
+					}
+				}
+				return str;
+			}}
+	    ]],
+	    done: function(json) {
+	    	matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
+	    }
+	});
+	
+	table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+		if (layEvent === 'edit') { //编辑
+			edit(data);
+		} else if (layEvent === 'details'){ //详情
+			details(data);
+		} else if (layEvent === 'processDetails') { //流程详情
+			activitiUtil.activitiDetails(data);
+		} else if (layEvent === 'subApproval') { //提交审批
+			subApproval(data);
+		} else if (layEvent === 'del') { //删除
+			del(data);
+		} else if (layEvent === 'cancellation') { //作废
+			cancellation(data);
+		} else if (layEvent === 'revoke') { //撤销
+			revoke(data);
+		}
+    });
+
+	// 新增
+	$("body").on("click", "#addBean", function() {
+    	parent._openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024050200004&objectId=' + objectId + '&objectKey=' + objectKey, null),
+			title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+			pageId: "crmContractAdd",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}});
+    });
+	
+	// 编辑
+	function edit(data) {
+		parent._openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024050200005&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+			title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+			pageId: "crmContractEdit",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}});
+	}
+
+	// 详情
+	function details(data) {
+		parent._openNewWindows({
+			url: systemCommonUtil.getUrl('FP2024050200006&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+			pageId: "crmContractDetails",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+			}});
+	}
+	
+	// 提交审批
+	function subApproval(data) {
+		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
+			layer.close(index);
+			activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) {
+				var params = {
+					id: data.id,
+					approvalId: approvalId
+				};
+				AjaxPostUtil.request({url: sysMainMation.crmBasePath + "submitPaymentCollectionToApproval", params: params, type: 'json', method: 'POST', callback: function (json) {
+					winui.window.msg("提交成功", {icon: 1, time: 2000});
+					loadTable();
+				}});
+			});
+		});
+	}
+
+	// 删除
+	function del(data, obj) {
+		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+			layer.close(index);
+			AjaxPostUtil.request({url: sysMainMation.crmBasePath + "deletePaymentCollectionById", 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 cancellation(data, obj) {
+		var msg = '确认作废该条数据吗？';
+		layer.confirm(msg, { icon: 3, title: '作废操作' }, function (index) {
+			layer.close(index);
+			AjaxPostUtil.request({url: sysMainMation.crmBasePath + "invalidPaymentCollection", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}});
+		});
+	}
+
+	// 撤销
+	function revoke(data) {
+		var msg = '确认撤销该数据吗？';
+		layer.confirm(msg, { icon: 3, title: '撤销申请提交' }, function (index) {
+			layer.close(index);
+			AjaxPostUtil.request({url: sysMainMation.crmBasePath + "revokePaymentCollection", params: {processInstanceId: data.processInstanceId}, type: 'json', method: 'PUT', 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 getTableParams() {
+		return $.extend(true, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
+	
+    exports('crmPaymentCollectionList', {});
+});
\ No newline at end of file

crm/src/main/resources/template/tpl/follow/crmFollowList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+    <div class="winui-toolbar">
+        <div class="winui-tool">
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="add"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+        </div>
+    </div>
+    <div style="margin:auto 10px;">
+        <table id="messageTable" lay-filter="messageTable"></table>
+    </div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/follow/'}).use('crmFollowList');
+    </script>
+</body>
+</html>
\ No newline at end of file

crm/src/main/resources/template/tpl/invoice/crmInvoiceList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+    <div class="winui-toolbar">
+        <div class="winui-tool">
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="add"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+        </div>
+    </div>
+    <div style="margin:auto 10px;">
+        <table id="messageTable" lay-filter="messageTable"></table>
+    </div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/invoice/'}).use('crmInvoiceList');
+    </script>
+</body>
+</html>
\ No newline at end of file

crm/src/main/resources/template/tpl/invoiceHeader/crmInvoiceHeaderList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+    <div class="winui-toolbar">
+        <div class="winui-tool">
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="add"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+        </div>
+    </div>
+    <div style="margin:auto 10px;">
+        <table id="messageTable" lay-filter="messageTable"></table>
+    </div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/invoiceHeader/'}).use('crmInvoiceHeaderList');
+    </script>
+</body>
+</html>
\ No newline at end of file

crm/src/main/resources/template/tpl/payment/crmPaymentCollectionList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+    <div class="winui-toolbar">
+        <div class="winui-tool">
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="add"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+        </div>
+    </div>
+    <div style="margin:auto 10px;">
+        <table id="messageTable" lay-filter="messageTable"></table>
+    </div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/payment/'}).use('crmPaymentCollectionList');
+    </script>
+</body>
+</html>
\ No newline at end of file

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', rowspan: '2', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("machinStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("productionState", 'id', d.state, 'name');

erp-produce/src/main/resources/template/js/erpWorkProcedure/erpWorkProcedureChoose.js

@@ -63,7 +63,7 @@ layui.config({
 	            { field: 'number', title: '工序编号', align: 'left',width: 120 },
 	            { field: 'unitPrice', title: '参考单价', align: 'left',width: 100 },
 	            { field: 'departmentMation', title: '执行部门', align: 'left',width: 100, templet: function (d) {
-					return d.departmentMation.name;
+					return getNotUndefinedVal(d.departmentMation?.name);
 				}},
 	            { field: 'content', title: '工序内容', align: 'left',width: 200 }
 		    ]],

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

erp/src/main/resources/template/js/erpstatistics/customerreconciliation.js

@@ -31,7 +31,7 @@ layui.config({
 			}},
 			{ field: 'serviceName', title: '单据类型', align: 'left', width: 100 },
 			{ field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) {
-				return d.holderMation.name;
+				return getNotUndefinedVal(d.holderMation?.name);
 			}},
 			{ field: 'totalPrice', title: '合计金额', align: 'left', width: 100},
 			{ field: 'operTime', title: '单据日期', align: 'center', width: 150}

erp/src/main/resources/template/js/erpstatistics/supplierreconciliation.js

@@ -31,7 +31,7 @@ layui.config({
 			}},
 			{ field: 'serviceName', title: '单据类型', align: 'left', width: 100 },
 			{ field: 'holderMation', title: '供应商', align: 'left', width: 150, templet: function (d) {
-				return d.holderMation.name;
+				return getNotUndefinedVal(d.holderMation?.name);
 			}},
 			{ field: 'totalPrice', title: '合计金额', align: 'left', width: 100},
 			{ field: 'operTime', title: '单据日期', align: 'center', width: 150}

erp/src/main/resources/template/js/holder/holderNormsList.js

@@ -32,10 +32,10 @@ layui.config({
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
 			{ field: 'materialId', title: '产品名称', align: 'left',width: 150, templet: function (d) {
-				return isNull(d.materialMation) ? '' : d.materialMation.name;
+				return getNotUndefinedVal(d.materialMation?.name);
 			}},
 			{ field: 'normsId', title: '产品规格', align: 'left',width: 400, templet: function (d) {
-				return isNull(d.normsMation) ? '' : d.normsMation.name;
+				return getNotUndefinedVal(d.normsMation?.name);
 			}}
 	    ]],
 	    done: function(json) {

erp/src/main/resources/template/js/materialNormInitStock/materialNormInitStockList.js

@@ -24,7 +24,7 @@ layui.config({
         data: $.extend(true, [], normsStock),
 	    cols: [[
 		    { field: 'name', title: '仓库', align: 'left', width: 200, templet: function (d) {
-				return d.depotMation.name;
+				return getNotUndefinedVal(d.depotMation?.name);
 			}},
 	        { field: 'stock', title: '初始数量', align: 'left', width: 80 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#tableBar'}

erp/src/main/resources/template/js/otherOutlets/otherOutletsList.js

@@ -28,12 +28,12 @@ layui.config({
 		        return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
 		    }},
             { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) {
-                return d.holderMation.name;
+                return getNotUndefinedVal(d.holderMation?.name);
             }},
             { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
             { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');

erp/src/main/resources/template/js/otherWarehous/otherWarehousList.js

@@ -28,12 +28,12 @@ layui.config({
 		        return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
 		    }},
             { field: 'holderMation', title: '供应商', align: 'left', width: 150, templet: function (d) {
-                return d.holderMation.name;
+                return getNotUndefinedVal(d.holderMation?.name);
             }},
             { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
             { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');

erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js

@@ -28,12 +28,12 @@ layui.config({
                 return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
             }},
             { field: 'holderMation', title: '供应商', align: 'left', width: 150, templet: function (d) {
-                return d.holderMation.name;
+                return getNotUndefinedVal(d.holderMation?.name);
             }},
             { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
             { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');

erp/src/main/resources/template/js/purchasePut/purchasePutList.js

@@ -32,12 +32,12 @@ layui.config({
 		        return str;
 		    }},
             { field: 'holderMation', title: '供应商', align: 'left', width: 150, templet: function (d) {
-                return d.holderMation.name;
+                return getNotUndefinedVal(d.holderMation?.name);
             }},
             { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
             { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

erp/src/main/resources/template/js/purchaseReturns/purchaseReturnsList.js

@@ -28,12 +28,12 @@ layui.config({
                 return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
 		    }},
             { field: 'holderMation', title: '供应商', align: 'left', width: 150, templet: function (d) {
-                return d.holderMation.name;
+                return getNotUndefinedVal(d.holderMation?.name);
             }},
             { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
             { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

erp/src/main/resources/template/js/retailOutlet/retailOutletList.js

@@ -28,12 +28,12 @@ layui.config({
 		        return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
 		    }},
             { field: 'holderMation', title: '会员', align: 'left', width: 150, templet: function (d) {
-                return d.holderMation.name;
+                return getNotUndefinedVal(d.holderMation?.name);
             }},
             { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
             { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

erp/src/main/resources/template/js/retailReturns/retailReturnsList.js

@@ -30,12 +30,12 @@ layui.config({
 		        return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
 		    }},
             { field: 'holderMation', title: '会员', align: 'left', width: 150, templet: function (d) {
-                return d.holderMation.name;
+                return getNotUndefinedVal(d.holderMation?.name);
             }},
             { field: 'totalPrice', title: '退款总金额', align: 'left', width: 120 },
             { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

erp/src/main/resources/template/js/salesOrder/salesOrderChoose.js

@@ -74,9 +74,15 @@ layui.config({
 		    cols: [[
 		    	{ type: 'radio'},
 		        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-				{ field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) {return d.materialMation.name}},
-				{ field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) {return d.materialMation.model}},
-				{ field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return d.normsMation.name}},
+				{ field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) {
+					return getNotUndefinedVal(d.materialMation?.name)
+				}},
+				{ field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) {
+					return getNotUndefinedVal(d.materialMation?.model)
+				}},
+				{ field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {
+					return getNotUndefinedVal(d.normsMation?.name)
+				}},
 				{ field: 'operNumber', title: '数量', align: 'left', width: 80 },
 				{ field: 'unitPrice', title: '单价', align: 'left', width: 120 },
 		        { field: 'allPrice', title: '金额', align: 'left', width: 80 },

erp/src/main/resources/template/js/salesOrder/salesOrderList.js

@@ -27,13 +27,13 @@ layui.config({
             { field: 'oddNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) {
 		        return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
 		    }},
-            { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) {
-                return d.holderMation.name;
+            { field: 'holderMation', title: '客户', align: 'left', width: 200, templet: function (d) {
+                return getNotUndefinedVal(d.holderMation?.name);
             }},
             { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
             { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');

erp/src/main/resources/template/js/salesOutlet/salesOutletList.js

@@ -32,12 +32,12 @@ layui.config({
 		        return str;
 		    }},
             { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) {
-                return d.holderMation.name;
+                return getNotUndefinedVal(d.holderMation?.name);
             }},
             { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
             { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');

erp/src/main/resources/template/js/salesReturns/salesReturnsList.js

@@ -32,12 +32,12 @@ layui.config({
 		        return str;
 		    }},
             { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) {
-                return d.holderMation.name;
+                return getNotUndefinedVal(d.holderMation?.name);
             }},
             { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
             { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
             { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("supplierContractStateEnum", 'id', d.state, 'name');

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 '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
                 }},
                 { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-                    return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+                    return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
                 }},
                 { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
                     return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
@@ -49,7 +51,7 @@ layui.config({
                     return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("correspondentEnterEnum", 'id', d.holderKey, 'name');
                 }},
                 { field: 'holderMation', title: '往来单位', align: 'left', width: 150, templet: function (d) {
-                    return d.holderMation.name;
+                    return getNotUndefinedVal(d.holderMation?.name);
                 }},
                 { field: 'handsPersonName', title: '经手人', align: 'left', width: 120 },
                 { field: 'operTime', title: '单据日期', align: 'center', width: 120 },
@@ -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', {});

ifs/src/main/resources/template/js/loan/loanBorrowList.js

+
+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["loanBorrowService"]["key"];
+
+    authBtn('1714910702062');//新增
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        url: sysMainMation.ifsBasePath + 'queryLoanBorrowList',
+        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 '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+            }},
+            { 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 '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
+            }},
+            { 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('FP2024050500005', null),
+            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+            pageId: "loanBorrowAdd",
+            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('FP2024050500006&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+            pageId: "loanBorrowEdit",
+            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('FP2024050500007&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "loanBorrowInfo",
+            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 + "deleteLoanBorrowById", 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 + "revokeLoanBorrow", 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 + "submitLoanBorrowToApproval", 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('loanBorrowList', {});
+});

ifs/src/main/resources/template/js/loan/loanRepayList.js

+
+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["loanRepayService"]["key"];
+
+    authBtn('1714910816333');//新增
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        url: sysMainMation.ifsBasePath + 'queryLoanRepayList',
+        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 '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+            }},
+            { 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 '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
+            }},
+            { 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('FP2024050500008', null),
+            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+            pageId: "loanRepayAdd",
+            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('FP2024050500009&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+            pageId: "loanRepayEdit",
+            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('FP2024050500010&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "loanRepayInfo",
+            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 + "deleteLoanRepayById", 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 + "revokeLoanRepay", 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 + "submitLoanRepayToApproval", 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('loanRepayList', {});
+});

ifs/src/main/resources/template/js/reimbursement/reimbursementList.js

+
+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 '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+            }},
+            { 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 '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
+            }},
+            { 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', {});
+});

ifs/src/main/resources/template/tpl/loan/loanBorrowList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+	<div class="winui-toolbar">
+	    <div class="winui-tool">
+	        <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+	        <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1714910702062"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+	    </div>
+	</div>
+	<div style="margin: auto 10px;">
+		<table id="messageTable" lay-filter="messageTable"></table>
+	</div>
+
+	<script type="text/html" id="tableBar">
+		{{# if (d.editRow == '1') { }}
+			{{# if (auth('1714910725373')) { }}
+				<a class="layui-btn layui-btn-xs" lay-event="subExamine">提交审批</a>
+			{{# } }}
+			{{# if (auth('1714910714820')) { }}
+				<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
+			{{# } }}
+			{{# if (auth('1714910702062')) { }}
+				<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+			{{# } }}
+		{{# } }}
+		{{# if (d.editRow == '2') { }}
+			{{# if (auth('1714910733052')) { }}
+				<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
+			{{# } }}
+		{{# } }}
+	</script>
+
+	<script src="../../assets/lib/layui/layui.js"></script>
+	<script src="../../assets/lib/layui/custom.js"></script>
+	<script type="text/javascript">
+	    layui.config({base: '../../js/loan/'}).use('loanBorrowList');
+	</script>
+</body>
+</html>
\ No newline at end of file

ifs/src/main/resources/template/tpl/loan/loanRepayList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+	<div class="winui-toolbar">
+	    <div class="winui-tool">
+	        <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+	        <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1714910816333"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+	    </div>
+	</div>
+	<div style="margin: auto 10px;">
+		<table id="messageTable" lay-filter="messageTable"></table>
+	</div>
+
+	<script type="text/html" id="tableBar">
+		{{# if (d.editRow == '1') { }}
+			{{# if (auth('1714910833787')) { }}
+				<a class="layui-btn layui-btn-xs" lay-event="subExamine">提交审批</a>
+			{{# } }}
+			{{# if (auth('1714910825479')) { }}
+				<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
+			{{# } }}
+			{{# if (auth('1714910816333')) { }}
+				<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+			{{# } }}
+		{{# } }}
+		{{# if (d.editRow == '2') { }}
+			{{# if (auth('1714910841416')) { }}
+				<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
+			{{# } }}
+		{{# } }}
+	</script>
+
+	<script src="../../assets/lib/layui/layui.js"></script>
+	<script src="../../assets/lib/layui/custom.js"></script>
+	<script type="text/javascript">
+	    layui.config({base: '../../js/loan/'}).use('loanRepayList');
+	</script>
+</body>
+</html>
\ No newline at end of file

ifs/src/main/resources/template/tpl/reimbursement/reimbursementList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+	<div class="winui-toolbar">
+	    <div class="winui-tool">
+	        <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+	        <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1714869454529"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+	    </div>
+	</div>
+	<div style="margin: auto 10px;">
+		<table id="messageTable" lay-filter="messageTable"></table>
+	</div>
+
+	<script type="text/html" id="tableBar">
+		{{# if (d.editRow == '1') { }}
+			{{# if (auth('1714869476939')) { }}
+				<a class="layui-btn layui-btn-xs" lay-event="subExamine">提交审批</a>
+			{{# } }}
+			{{# if (auth('1714869465652')) { }}
+				<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
+			{{# } }}
+			{{# if (auth('1714869454529')) { }}
+				<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+			{{# } }}
+		{{# } }}
+		{{# if (d.editRow == '2') { }}
+			{{# if (auth('1714869485320')) { }}
+				<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
+			{{# } }}
+		{{# } }}
+	</script>
+
+	<script src="../../assets/lib/layui/layui.js"></script>
+	<script src="../../assets/lib/layui/custom.js"></script>
+	<script type="text/javascript">
+	    layui.config({base: '../../js/reimbursement/'}).use('reimbursementList');
+	</script>
+</body>
+</html>
\ No newline at end of file

knowlg/src/main/resources/template/js/knowlgExamine/knowlgExamineList.js

@@ -57,7 +57,7 @@ layui.config({
 		if (clickId == "checkedList") {
 			// 已审核
 			cols.push({ field: 'examineId', title: '审核人', width: 120, templet: function (d) {
-				return isNull(d.examineMation) ? "" : d.examineMation.name;
+				return getNotUndefinedVal(d.examineMation?.name);
 			}});
 			cols.push({ field: 'examineTime', title: '审核时间', align: 'center', width: 150 });
 			cols.push({ field: 'state', title: '审核结果', align: 'center', width: 100, templet: function (d) {

pom.xml

@@ -25,7 +25,6 @@
         <module>seal-service</module>
         <module>school</module>
         <module>schedule</module>
-        <module>rmprogram</module>
         <module>quartz</module>
         <module>pro</module>
         <module>planpro</module>

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("taskStateEnum", 'id', d.state, 'name');

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 '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+				return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 			}},
 			{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("projectStateEnum", 'id', d.state, 'name');

report/src/main/resources/template/assets/report/css/ruler.css

@@ -111,7 +111,7 @@ body {
 }
 
 .hd-main .navs {
-	padding: 0 0 0px 25px;
+	padding: 0px;
 	height: 100%;
 	float: left;
 }
@@ -225,14 +225,6 @@ body {
 	line-height: 0;
 }
 
-.logo-title{
-	float: left;
-	line-height: 60px;
-	color: cornflowerblue;
-	font-size: 16px;
-	font-family: cursive;
-}
-
 .kuang {
 	box-sizing: border-box;
 	border: 1px solid darkgray;
@@ -304,9 +296,15 @@ body {
 	cursor: e-resize;
 }
 
-.echarts-box{
+.echarts-box {
+	width: 100%;
+	height: 100%;
+}
+
+.table-box {
 	width: 100%;
 	height: 100%;
+	position: absolute;
 }
 
 .word-box{