feat: 修改显示undefined的问题

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 d.assetAdminMation?.name;
+				return getNotUndefinedVal(d.assetAdminMation?.name);
 			}},
 			{ field: 'useUserMation', title: '申领人', width: 120, templet: function(d) {
-				return 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 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 d.assetAdminMation?.name;
+				return getNotUndefinedVal(d.assetAdminMation?.name);
 			}},
 		]],
 	    done: function(res) {

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

@@ -27,7 +27,7 @@ layui.config({
 			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
 			{ field: 'title', title: '标题', width: 300 },
 			{ field: 'sendDepartmentMation', title: '发文部门', width: 150, templet: function (d) {
-				return d.sendDepartmentMation?.name;
+				return getNotUndefinedVal(d.sendDepartmentMation?.name);
 			}},
 			{ field: 'year', title: '年份', align: 'center', width: 100 },
 			{ field: 'number', title: '第几号文', align: 'center', width: 100 },

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 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 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 d.licenceAdminMation?.name;
+				return getNotUndefinedVal(d.licenceAdminMation?.name);
 			}},
 		]],
 		done: function(json) {

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 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 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/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 d.transferStaffMation?.name;
+                return getNotUndefinedVal(d.transferStaffMation?.name);
             }},
             { title: '原岗位信息', align: 'center', colspan: '4'},
             { title: '申请岗位信息', align: 'center', colspan: '4'},
@@ -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 d.primaryDepartmentMation?.name;
+                    return getNotUndefinedVal(d.primaryDepartmentMation?.name);
                 }},
                 { field: 'primaryJobName', title: '岗位', align: 'left', width: 150, templet: function(d) {
-                    return d.primaryJobMation?.name;
+                    return getNotUndefinedVal(d.primaryJobMation?.name);
                 }},
                 { field: 'primaryJobScoreName', title: '岗位定级', align: 'left', width: 150, templet: function(d) {
-                    return 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 d.currentDepartmentMation?.name;
+                    return getNotUndefinedVal(d.currentDepartmentMation?.name);
                 }},
                 { field: 'currentJobName', title: '岗位', align: 'left', width: 150, templet: function(d) {
-                    return d.currentJobMation?.name;
+                    return getNotUndefinedVal(d.currentJobMation?.name);
                 }},
                 { field: 'currentJobScoreName', title: '岗位定级', align: 'left', width: 150, templet: function(d) {
-                    return d.currentJobScoreMation?.name;
+                    return getNotUndefinedVal(d.currentJobScoreMation?.name);
                 }}
             ]
         ],

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

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

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 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/bossPersonRequire/bossPersonRequireAllList.js

@@ -28,10 +28,10 @@ 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 },

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

@@ -33,10 +33,10 @@ layui.config({
                 return '<a lay-event="processDetails" class="notice-title-click">' + 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');

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

@@ -30,10 +30,10 @@ layui.config({
                 return '<a lay-event="processDetails" class="notice-title-click">' + 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');

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

@@ -28,10 +28,10 @@ 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');

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

@@ -37,19 +37,19 @@ layui.config({
                 return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
             }},
             { field: 'contractId', title: '合同', width: 200, templet: function (d) {
-                return d.contractMation?.title;
+                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 d.contactsMation?.name;
+                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 d.followUserMation?.name;
+                return getNotUndefinedVal(d.followUserMation?.name);
             }},
             { field: 'followTime', title: '回访时间', align: 'center', width: 100 },
             { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },

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

@@ -34,12 +34,12 @@ layui.config({
 	    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.title + '</a>';
+				return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
 			}},
 			{ field: 'price', title: '回款金额（元）', width: 120 },
 			{ 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">' + d.processInstanceId + '</a>';
+				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);

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/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 d.materialMation?.name;
+				return getNotUndefinedVal(d.materialMation?.name);
 			}},
 			{ field: 'normsId', title: '产品规格', align: 'left',width: 400, templet: function (d) {
-				return 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,7 +28,7 @@ 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 },

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

@@ -28,7 +28,7 @@ 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 },

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

@@ -28,7 +28,7 @@ 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 },

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

@@ -32,7 +32,7 @@ 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 },

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

@@ -28,7 +28,7 @@ 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 },

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

@@ -28,7 +28,7 @@ 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 },

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

@@ -30,7 +30,7 @@ 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 },

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,8 +27,8 @@ 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 },

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

@@ -32,7 +32,7 @@ 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 },

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

@@ -32,7 +32,7 @@ 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 },

ifs/src/main/resources/template/js/income/incomeList.js

@@ -49,7 +49,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 },

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 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) {

seal-service/src/main/resources/template/js/myParts/myPartsList.js

@@ -24,10 +24,10 @@ layui.config({
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
 			{ field: 'materialId', title: '产品', align: 'left', width: 150, templet: function (d) {
-				return d.materialMation?.name;
+				return getNotUndefinedVal(d.materialMation?.name);
 			}},
 			{ field: 'normsId', title: '规格', align: 'left', width: 400, templet: function (d) {
-				return d.normsMation?.name;
+				return getNotUndefinedVal(d.normsMation?.name);
 			}},
 	        { field: 'stock', title: '剩余数量', align: 'left', width: 100 }
 	    ]],

userauth/src/main/resources/template/js/appWorkPage/appWorkPageList.js

@@ -35,7 +35,7 @@ layui.config({
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("menuType", 'id', d.type, 'name');
 			}},
 			{ field: 'desktopId', title: '所属桌面', align: 'left', width: 120, templet: function (d) {
-				return d.desktopMation?.name;
+				return getNotUndefinedVal(d.desktopMation?.name)
 			}},
 			{ field: 'url', title: '页面路径', align: 'left', width: 300},
 			{ field: 'orderBy', title: '排序号', align: 'left', width: 80},

userauth/src/main/resources/template/js/sysEveMenu/sysEveMenuList.js

@@ -37,7 +37,7 @@ layui.config({
 		        	return d.level == 0 ? '父菜单' : '子菜单';
 		        }},
 		        { field: 'desktopName', title: '所属桌面', width: 120, templet: function (d) {
-					return d.desktopMation?.name;
+					return getNotUndefinedVal(d.desktopMation?.name)
 				}},
 		        { field: 'isShare', title: '共享', align: 'center', width: 80, templet: function (d) {
 					return d.isShare == 0 ? '否' : '是';

web/src/main/resources/template/assets/lib/layui/layui.js

@@ -232,6 +232,10 @@ function isNull(str) {
 	}
 }
 
+function getNotUndefinedVal(val) {
+	return isNull(val) ? '' : val
+}
+
 /**
  * 存入cookie
  */