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

README.md

@@ -16,14 +16,6 @@
 - **五人团已凑齐三人，差两人开团**
 - 作者本人承诺，知识星球人数达到1000人，即开放所有功能模块源代码(仅供星球内部成员使用)
 
-### 演示视频
-
-- 视频一：[多桌面任务](https://www.bilibili.com/video/BV1yb41127oB/)
-- 视频二：[聊天](https://www.bilibili.com/video/BV11b41127FV)
-- 视频三：[日程](https://www.bilibili.com/video/BV1vb411i75M)
-- 视频四：[ERP + 生产 202007版](https://www.bilibili.com/video/BV1yA411e7mm)
-- 视频五：[ERP + 生产 202109升级模块](https://www.bilibili.com/video/BV1vR4y1p7ka)
-
 ### 联系作者
 
 | QQ交流群/或者搜索 1016439713(禁止发广告，进群后自行修改备注：岗位-城市-备注，不改者五分钟内自动请出。) | 企业版设计思路知识星球 | 扫码进微信群畅聊(禁止发广告，进群后自行修改备注：岗位-城市-备注，不改者五分钟内自动请出。)|

activiti/src/main/resources/template/js/actBaseClass/actBaseClassList.js

@@ -29,7 +29,7 @@ layui.config({
 	        { field: 'desc', title: '描述', align: 'left', width: 400 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

activiti/src/main/resources/template/js/actGroup/actGroupList.js

@@ -175,7 +175,7 @@ layui.config({
 		        { field: 'email', title: '邮箱', align: 'left', width: 200 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 80, toolbar: '#tableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

activiti/src/main/resources/template/js/activitimodel/activitimodellist.js

@@ -42,7 +42,7 @@ layui.config({
 	        { field: 'metaInfo', title: '元数据', width: 120},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 340, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

activiti/src/main/resources/template/js/actmodletype/actmodletypelist.js

@@ -283,7 +283,7 @@ layui.config({
 		        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#tableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

activiti/src/main/resources/template/js/addSignTask/afterAddSignTask.js

@@ -36,7 +36,7 @@ layui.config({
             }},
             { field: 'email', title: '邮箱', align: 'left', width: 200}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
             soulTable.render(this);
         }

activiti/src/main/resources/template/js/addSignTask/beforeAddSignTask.js

@@ -36,7 +36,7 @@ layui.config({
             }},
             { field: 'email', title: '邮箱', align: 'left', width: 200}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
             soulTable.render(this);
         }

activiti/src/main/resources/template/js/allactiviti/allcomplatepossess.js

@@ -33,7 +33,7 @@ layui.config({
 	        { field: 'agencyName', title: '审批人', width: 120},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#myAllComplateTableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

activiti/src/main/resources/template/js/allactiviti/alltodopossess.js

@@ -39,7 +39,7 @@ layui.config({
 	        }},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#allConductTableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessList.js

@@ -41,7 +41,7 @@ layui.config({
 	        }},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#myStartTableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

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

@@ -62,7 +62,7 @@ layui.config({
 	        }},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#myStartTableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

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

@@ -50,7 +50,7 @@ layui.config({
 	        }},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 100, toolbar: '#myNeedDealtTableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

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

@@ -53,7 +53,7 @@ layui.config({
 	        }},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#myHistoryTaskTableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

admin-assistant/src/main/resources/template/js/assetArticles/assetArticlesList.js

@@ -37,7 +37,7 @@ layui.config({
 			{ field: 'company', title: '所属公司', width: 170 },
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#liebiaoTableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js

@@ -44,7 +44,7 @@ layui.config({
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150 },
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#caigouTableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js

@@ -44,7 +44,7 @@ layui.config({
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#lingyongTableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js

@@ -44,7 +44,7 @@ layui.config({
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150 },
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#caigouTableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnList.js

@@ -47,7 +47,7 @@ layui.config({
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150, align: 'center'},
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#returnTableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js

@@ -47,7 +47,7 @@ layui.config({
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150, align: 'center' },
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#lingyongTableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

admin-assistant/src/main/resources/template/js/conFerenceRoom/conFerenceRoomList.js

@@ -56,7 +56,7 @@ layui.config({
 	        { field: 'roomAdmin', title: '管理人员', align: 'center', width: 100 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveList.js

@@ -48,7 +48,7 @@ layui.config({
 	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150, align: 'center'},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#reserveTableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

admin-assistant/src/main/resources/template/js/licenceManage/licenceManageList.js

@@ -41,7 +41,7 @@ layui.config({
 		        { field: 'borrowName', title: '借用人', align: 'center', width: 100 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#licencelisttableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js

@@ -48,7 +48,7 @@ layui.config({
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150, align: 'center'},
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#borrowTableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertDetails.js

@@ -12,20 +12,7 @@ layui.config({
 	    var revertTemplate = $("#revertTemplate").html();
 	    
 	    AjaxPostUtil.request({url: flowableBasePath + "licencerevert003", params: {rowId: parent.rowId}, type: 'json', callback: function (json) {
-			//状态
-			if(json.bean.state == '0'){
-				json.bean.stateName = "<span>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '1'){
-				json.bean.stateName = "<span class='state-new'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '2'){
-				json.bean.stateName = "<span class='state-up'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '3'){
-				json.bean.stateName = "<span class='state-down'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '4'){
-				json.bean.stateName = "<span class='state-down'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '5'){
-				json.bean.stateName = "<span class='state-error'>" + json.bean.stateName + "</span>";
-			}
+			json.bean.stateName = activitiUtil.showStateName2(json.bean.state, 1);
 
 			$("#showForm").html(getDataUseHandlebars(revertTemplate, json));
 

admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertList.js

@@ -43,24 +43,12 @@ layui.config({
 				}
 			}},
 			{ field: 'stateName', title: '状态', width: 90, align: 'center', templet: function (d) {
-				if(d.state == '0'){
-					return "<span>" + d.stateName + "</span>";
-				}else if(d.state == '1'){
-					return "<span class='state-new'>" + d.stateName + "</span>";
-				}else if(d.state == '2'){
-					return "<span class='state-up'>" + d.stateName + "</span>";
-				}else if(d.state == '3'){
-					return "<span class='state-down'>" + d.stateName + "</span>";
-				}else if(d.state == '4'){
-					return "<span class='state-down'>" + d.stateName + "</span>";
-				}else if(d.state == '5'){
-					return "<span class='state-error'>" + d.stateName + "</span>";
-				}
+				return activitiUtil.showStateName2(d.state, 1);
 			}},
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150, align: 'center'},
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#revertTableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

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

@@ -39,7 +39,7 @@ layui.config({
 				{ field: 'oddNumber', title: '单据编号', align: 'center', width: 180},
 				{ field: 'oddCreateTime', title: '单据日期', align: 'center', width: 140}
 			]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

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

@@ -31,7 +31,7 @@ layui.config({
 			{ field: 'specifications', title: '资产规格', align: 'left', width: 120 },
 			{ field: 'assetAdmin', title: '管理员', align: 'left', width: 120 },
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

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

@@ -32,7 +32,7 @@ layui.config({
 				{ field: 'borrowName', title: '领用人', align: 'left', width: 80 },
 				{ field: 'licenceAdmin', title: '管理员', align: 'left', width: 80 },
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

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

@@ -32,7 +32,7 @@ layui.config({
 				{ field: 'borrowName', title: '领用人', align: 'left', width: 80 },
 				{ field: 'sealAdmin', title: '管理员', align: 'left', width: 80 },
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

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

@@ -41,7 +41,7 @@ layui.config({
 				{ field: 'oddNumber', title: '单据编号', align: 'center', width: 180},
 				{ field: 'oddCreateTime', title: '单据日期', align: 'center', width: 140}
 			]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

admin-assistant/src/main/resources/template/js/sealManage/sealManageList.js

@@ -43,7 +43,7 @@ layui.config({
 		        { field: 'sealAdmin', title: '管理人', align: 'center', width: 100 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#seallisttableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowDetails.js

@@ -13,20 +13,8 @@ layui.config({
 	    var useTemplate = $("#useTemplate").html();
 	    
 	    AjaxPostUtil.request({url: flowableBasePath + "sealborrow003", params: {rowId: parent.rowId}, type: 'json', callback: function (json) {
-			// 状态
-			if(json.bean.state == '0'){
-				json.bean.stateName = "<span>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '1'){
-				json.bean.stateName = "<span class='state-new'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '2'){
-				json.bean.stateName = "<span class='state-up'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '3'){
-				json.bean.stateName = "<span class='state-down'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '4'){
-				json.bean.stateName = "<span class='state-down'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '5'){
-				json.bean.stateName = "<span class='state-error'>" + json.bean.stateName + "</span>";
-			}
+			json.bean.stateName = activitiUtil.showStateName2(json.bean.state, 1);
+
 			$("#showForm").html(getDataUseHandlebars(useTemplate, json));
 
 			// 附件回显

admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowList.js

@@ -42,24 +42,12 @@ layui.config({
 				}
 			}},
 			{ field: 'stateName', title: '状态', width: 90, align: 'center', templet: function (d) {
-				if(d.state == '0'){
-					return "<span>" + d.stateName + "</span>";
-				}else if(d.state == '1'){
-					return "<span class='state-new'>" + d.stateName + "</span>";
-				}else if(d.state == '2'){
-					return "<span class='state-up'>" + d.stateName + "</span>";
-				}else if(d.state == '3'){
-					return "<span class='state-down'>" + d.stateName + "</span>";
-				}else if(d.state == '4'){
-					return "<span class='state-down'>" + d.stateName + "</span>";
-				}else if(d.state == '5'){
-					return "<span class='state-error'>" + d.stateName + "</span>";
-				}
+				return activitiUtil.showStateName2(d.state, 1);
 			}},
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150, align: 'center'},
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#borrowTableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertDetails.js

@@ -13,20 +13,7 @@ layui.config({
 	    var useTemplate = $("#useTemplate").html();
 	    
 	    AjaxPostUtil.request({url: flowableBasePath + "sealrevert003", params: {rowId: parent.rowId}, type: 'json', callback: function (json) {
-			//状态
-			if(json.bean.state == '0'){
-				json.bean.stateName = "<span>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '1'){
-				json.bean.stateName = "<span class='state-new'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '2'){
-				json.bean.stateName = "<span class='state-up'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '3'){
-				json.bean.stateName = "<span class='state-down'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '4'){
-				json.bean.stateName = "<span class='state-down'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '5'){
-				json.bean.stateName = "<span class='state-error'>" + json.bean.stateName + "</span>";
-			}
+			json.bean.stateName = activitiUtil.showStateName2(json.bean.state, 1);
 
 			$("#showForm").html(getDataUseHandlebars(useTemplate, json));
 

admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertList.js

@@ -43,24 +43,12 @@ layui.config({
 				}
 			}},
 			{ field: 'stateName', title: '状态', width: 90, align: 'center', templet: function (d) {
-				if(d.state == '0'){
-					return "<span>" + d.stateName + "</span>";
-				}else if(d.state == '1'){
-					return "<span class='state-new'>" + d.stateName + "</span>";
-				}else if(d.state == '2'){
-					return "<span class='state-up'>" + d.stateName + "</span>";
-				}else if(d.state == '3'){
-					return "<span class='state-down'>" + d.stateName + "</span>";
-				}else if(d.state == '4'){
-					return "<span class='state-down'>" + d.stateName + "</span>";
-				}else if(d.state == '5'){
-					return "<span class='state-error'>" + d.stateName + "</span>";
-				}
+				return activitiUtil.showStateName2(d.state, 1);
 			}},
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150, align: 'center'},
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#revertTableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

admin-assistant/src/main/resources/template/js/vehicleManage/vehicleManageList.js

@@ -58,7 +58,7 @@ layui.config({
 		        { field: 'prevMaintainTime', title: '上次保养日期', align: 'center', width: 100 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 220, toolbar: '#vehicletableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

admin-assistant/src/main/resources/template/js/vehicleManageAccident/vehicleManageAccidentList.js

@@ -45,7 +45,7 @@ layui.config({
 		        { field: 'accidentArea', title: '事故地点', width: 300 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#accidenttableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

admin-assistant/src/main/resources/template/js/vehicleManageInspection/vehicleManageInspectionList.js

@@ -45,7 +45,7 @@ layui.config({
 		        { field: 'inspectionPrice', title: '年检费用（元）', width: 120},
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#inspectiontableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

admin-assistant/src/main/resources/template/js/vehicleManageInsurance/vehicleManageInsuranceList.js

@@ -45,7 +45,7 @@ layui.config({
                 { field: 'insuranceCompany', title: '投保公司', width: 170 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#insurancetableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

admin-assistant/src/main/resources/template/js/vehicleManageMaintenance/vehicleManageMaintenanceList.js

@@ -45,7 +45,7 @@ layui.config({
 		        { field: 'maintenancePrice', title: '费用（元）', width: 150 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#maintenancetableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

admin-assistant/src/main/resources/template/js/vehicleManageOiling/vehicleManageOilingList.js

@@ -48,7 +48,7 @@ layui.config({
 		        { field: 'userName', title: '申请人', align: 'center', width: 100 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#oilingtableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseDetails.js

@@ -13,20 +13,8 @@ layui.config({
 	    var useTemplate = $("#useTemplate").html();
 	    
 	    AjaxPostUtil.request({url: flowableBasePath + "vehicle016", params: {rowId: parent.rowId}, type: 'json', callback: function (json) {
-			// 状态
-			if(json.bean.state == '0'){
-				json.bean.stateName = "<span>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '1'){
-				json.bean.stateName = "<span class='state-new'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '2'){
-				json.bean.stateName = "<span class='state-up'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '3'){
-				json.bean.stateName = "<span class='state-down'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '4'){
-				json.bean.stateName = "<span class='state-down'>" + json.bean.stateName + "</span>";
-			}else if(json.bean.state == '5'){
-				json.bean.stateName = "<span class='state-error'>" + json.bean.stateName + "</span>";
-			}
+			json.bean.stateName = activitiUtil.showStateName2(json.bean.state, 1);
+
 			if(json.bean.vehicleState == '1'){
 				json.bean.vehicleStateName = "<span class='state-up'>" + json.bean.vehicleStateName + "</span>";
 			}else if(json.bean.vehicleState == '2'){

admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseList.js

@@ -39,24 +39,12 @@ layui.config({
 				return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
 			}},
 			{ field: 'stateName', title: '状态', width: 90, align: 'center', templet: function (d) {
-				if(d.state == '0'){
-					return "<span>" + d.stateName + "</span>";
-				}else if(d.state == '1'){
-					return "<span class='state-new'>" + d.stateName + "</span>";
-				}else if(d.state == '2'){
-					return "<span class='state-up'>" + d.stateName + "</span>";
-				}else if(d.state == '3'){
-					return "<span class='state-down'>" + d.stateName + "</span>";
-				}else if(d.state == '4'){
-					return "<span class='state-down'>" + d.stateName + "</span>";
-				}else if(d.state == '5'){
-					return "<span class='state-error'>" + d.stateName + "</span>";
-				}
+				return activitiUtil.showStateName2(d.state, 1);
 			}},
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150, align: 'center'},
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#useTableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

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

@@ -41,7 +41,7 @@ layui.config({
             { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

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

@@ -38,7 +38,7 @@ layui.config({
             { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

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

@@ -59,7 +59,7 @@ layui.config({
                 { field: 'currentJobScoreName', title: '岗位定级', align: 'left', width: 150}
             ]
         ],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitList.js

@@ -47,7 +47,7 @@ layui.config({
             { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

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

@@ -46,7 +46,7 @@ layui.config({
             { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

boss/src/main/resources/template/js/bossInterviewee/myChargeBossIntervieweeList.js

@@ -37,7 +37,7 @@ layui.config({
             { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

boss/src/main/resources/template/js/bossInterviewee/myEnterBossIntervieweeList.js

@@ -39,7 +39,7 @@ layui.config({
             { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

boss/src/main/resources/template/js/bossIntervieweeFrom/bossIntervieweeFromList.js

@@ -33,7 +33,7 @@ layui.config({
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

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

@@ -38,7 +38,7 @@ layui.config({
             { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

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

@@ -48,7 +48,7 @@ layui.config({
             { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

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

@@ -51,7 +51,7 @@ layui.config({
             { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

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

@@ -39,7 +39,7 @@ layui.config({
             }},
             { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], width: 150}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

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

@@ -99,7 +99,7 @@ layui.config({
 		        { field: 'approvalTime', title: '审批时间', align: 'center', width: 150 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 100, toolbar: '#tableBar1'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

checkwork/src/main/resources/template/js/checkWorkApprove/checkWorkApproveList.js

@@ -96,7 +96,7 @@ layui.config({
 		        { field: 'approvalTime', title: '审批时间', align: 'center', width: 150 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#tableBar2'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripList.js

@@ -47,7 +47,7 @@ layui.config({
             { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveList.js

@@ -35,31 +35,19 @@ layui.config({
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
             { field: 'title', title: '标题', width: 300, templet: function (d) {
-                    return '<a lay-event="dedails" class="notice-title-click">' + d.title + '</a>';
-                }},
+                return '<a lay-event="dedails" class="notice-title-click">' + d.title + '</a>';
+            }},
             { field: 'oddNum', title: '单号', width: 200 },
             { 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">' + d.processInstanceId + '</a>';
+            }},
             { field: 'stateName', title: '状态', width: 90, templet: function (d) {
-                    if(d.state == '0'){
-                        return "<span>" + d.stateName + "</span>";
-                    }else if(d.state == '1'){
-                        return "<span class='state-new'>" + d.stateName + "</span>";
-                    }else if(d.state == '2'){
-                        return "<span class='state-up'>" + d.stateName + "</span>";
-                    }else if(d.state == '3'){
-                        return "<span class='state-down'>" + d.stateName + "</span>";
-                    }else if(d.state == '4'){
-                        return "<span class='state-down'>" + d.stateName + "</span>";
-                    }else if(d.state == '5'){
-                        return "<span class='state-error'>" + d.stateName + "</span>";
-                    }
-                }},
+                return activitiUtil.showStateName2(d.state, 1);
+            }},
             { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveList.js

@@ -35,31 +35,19 @@ layui.config({
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
             { field: 'title', title: '标题', width: 300, templet: function (d) {
-                    return '<a lay-event="dedails" class="notice-title-click">' + d.title + '</a>';
-                }},
+                return '<a lay-event="dedails" class="notice-title-click">' + d.title + '</a>';
+            }},
             { field: 'oddNum', title: '单号', width: 200 },
             { 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">' + d.processInstanceId + '</a>';
+            }},
             { field: 'stateName', title: '状态', width: 90, templet: function (d) {
-                    if(d.state == '0'){
-                        return "<span>" + d.stateName + "</span>";
-                    }else if(d.state == '1'){
-                        return "<span class='state-new'>" + d.stateName + "</span>";
-                    }else if(d.state == '2'){
-                        return "<span class='state-up'>" + d.stateName + "</span>";
-                    }else if(d.state == '3'){
-                        return "<span class='state-down'>" + d.stateName + "</span>";
-                    }else if(d.state == '4'){
-                        return "<span class='state-down'>" + d.stateName + "</span>";
-                    }else if(d.state == '5'){
-                        return "<span class='state-error'>" + d.stateName + "</span>";
-                    }
-                }},
+                return activitiUtil.showStateName2(d.state, 1);
+            }},
             { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

checkwork/src/main/resources/template/js/checkWorkMyAttendanceStatistics/checkWorkMyAttendanceStatistics.js

@@ -121,7 +121,7 @@ layui.config({
 		        	}
 		        }}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeList.js

@@ -35,31 +35,19 @@ layui.config({
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
             { field: 'title', title: '标题', width: 300, templet: function (d) {
-                    return '<a lay-event="dedails" class="notice-title-click">' + d.title + '</a>';
-                }},
+                return '<a lay-event="dedails" class="notice-title-click">' + d.title + '</a>';
+            }},
             { field: 'oddNum', title: '单号', width: 200 },
             { 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">' + d.processInstanceId + '</a>';
+            }},
             { field: 'stateName', title: '状态', width: 90, templet: function (d) {
-                    if(d.state == '0'){
-                        return "<span>" + d.stateName + "</span>";
-                    }else if(d.state == '1'){
-                        return "<span class='state-new'>" + d.stateName + "</span>";
-                    }else if(d.state == '2'){
-                        return "<span class='state-up'>" + d.stateName + "</span>";
-                    }else if(d.state == '3'){
-                        return "<span class='state-down'>" + d.stateName + "</span>";
-                    }else if(d.state == '4'){
-                        return "<span class='state-down'>" + d.stateName + "</span>";
-                    }else if(d.state == '5'){
-                        return "<span class='state-error'>" + d.stateName + "</span>";
-                    }
-                }},
+                return activitiUtil.showStateName2(d.state, 1);
+            }},
             { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });

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

@@ -59,7 +59,7 @@ layui.config({
             { field: 'lastUpdateTime', title: '最后修改时间', align: 'center', width: 100},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

checkwork/src/main/resources/template/js/checkwork/checkworkreport.js

@@ -145,7 +145,7 @@ layui.config({
 		        }}
 		        ]
 			],
-	        done: function(){
+	        done: function(json) {
 	        	matchingLanguage();
 	        	$('table.layui-table thead tr th:eq(1)').addClass('layui-hide');
 	        }

checkwork/src/main/resources/template/js/checkwork/echartsdetail.js

@@ -99,7 +99,7 @@ layui.config({
 		        	}
 		        }}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 	});

checkwork/src/main/resources/template/js/checkwork/reportdetail.js

@@ -98,7 +98,7 @@ layui.config({
 	        	}
 	        }}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

code-doc/src/main/resources/template/js/codemodel/codemodellist.js

@@ -39,7 +39,7 @@ layui.config({
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

code-doc/src/main/resources/template/js/codemodelgroup/codemodelgrouplist.js

@@ -38,7 +38,7 @@ layui.config({
 			{ 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: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

code-doc/src/main/resources/template/js/codemodelhistory/codemodelhistorylist.js

@@ -32,7 +32,7 @@ layui.config({
 	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 180 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

code-doc/src/main/resources/template/js/sysdevelopdoc/sysdevelopdocconsolelist.js

@@ -34,7 +34,7 @@ layui.config({
 	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 180 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

code-doc/src/main/resources/template/js/sysdevelopdoc/sysdevelopdoclist.js

@@ -27,7 +27,7 @@ layui.config({
             {field:'createTime', width: 130, align: 'center', title: systemLanguage["com.skyeye.createTime"][languageType]},
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 300, toolbar: '#tableBar'}
         ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    },
     }, {

common/src/main/resources/template/js/sysDictData/sysDictDataList.js

@@ -57,7 +57,7 @@ layui.config({
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 180, toolbar: '#tableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

common/src/main/resources/template/js/sysDictType/sysDictTypeList.js

@@ -49,7 +49,7 @@ layui.config({
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
 			{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 180, toolbar: '#tableBar'}
 		]],
-		done: function(){
+		done: function(json) {
 			matchingLanguage();
 		}
 	});

common/src/main/resources/template/js/sysEveModel/sysEveModelList.js

@@ -48,7 +48,7 @@ layui.config({
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 180, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

common/src/main/resources/template/js/sysEveModelType/sysEveModelTypeList.js

@@ -29,7 +29,7 @@ layui.config({
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 130, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	}, {

common/src/main/resources/template/js/sysenclosure/mysysenclosure.js

@@ -93,7 +93,7 @@ layui.config({
 			        { field: 'createTime', title: '上传时间', align: 'center', width: 150 },
 			        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
 			    ]],
-			    done: function(){
+			    done: function(json) {
 			    	matchingLanguage();
 			    }
 			});

crm/src/main/resources/template/js/crmCustomerContact/crmCustomerContactList.js

@@ -39,7 +39,7 @@ layui.config({
 	        { field: 'lastUpdateTime', title: '最后修改时间', align: 'center', width: 100},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js

@@ -70,7 +70,7 @@ layui.config({
 	        }},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 230, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

crm/src/main/resources/template/js/crmOpportunity/myCrmOpportunityList.js

@@ -68,7 +68,7 @@ layui.config({
 	        }},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 230, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

crm/src/main/resources/template/js/crmcontractmanage/crmcontractlist.js

@@ -74,7 +74,7 @@ layui.config({
 	        	}
 	        }}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

crm/src/main/resources/template/js/crmcontractmanage/mycrmcontractlist.js

@@ -74,7 +74,7 @@ layui.config({
 	        }},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

crm/src/main/resources/template/js/crmdiscuss/alldiscusslist.js

@@ -36,7 +36,7 @@ layui.config({
 	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 120 },
 	        { field: 'recoveryTime', title: '最后回复时间', align: 'center', width: 120 }
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

crm/src/main/resources/template/js/crmdiscuss/discussnumlist.js

@@ -36,7 +36,7 @@ layui.config({
 	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 120 },
 	        { field: 'recoveryTime', title: '最后回复时间', align: 'center', width: 120 }
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

crm/src/main/resources/template/js/documentarymanage/documentarylist.js

@@ -39,7 +39,7 @@ layui.config({
 	        { field: 'createName', title: '跟单人', align: 'center', width: 120 },
 	        { field: 'detail', title: '详细内容', align: 'center', width: 220 }
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

crm/src/main/resources/template/js/documentarymanage/mydocumentarylist.js

@@ -41,7 +41,7 @@ layui.config({
 	        { field: 'detail', title: '详细内容', align: 'center', width: 220 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

disk-cloud/src/main/resources/template/js/fileconsole/recycleBinList.js

@@ -27,7 +27,7 @@ layui.config({
 	        { field: 'createTime', title: '删除时间', width: 180 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

disk-cloud/src/main/resources/template/js/fileconsole/shareFileList.js

@@ -28,7 +28,7 @@ layui.config({
 	        { field: 'createTime', title: '分享时间', width: 150 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    	//复制
 	    	clipboard = new ClipboardJS('.copyUrl');

dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js

@@ -46,7 +46,7 @@ layui.config({
             { 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(){
+        done: function(json) {
             matchingLanguage();
         }
     });

dsform/src/main/resources/template/js/dsFormPage/pageList.js

@@ -39,7 +39,7 @@ layui.config({
 	        { field: 'pageNum', title: '页面编号', align: 'center', width: 150 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

dsform/src/main/resources/template/js/dsFormPageType/dsFormPageTypeList.js

@@ -31,7 +31,7 @@ layui.config({
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 130, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	}, {

dsform/src/main/resources/template/js/dsformcontent/dsformcontentlist.js

@@ -44,7 +44,7 @@ layui.config({
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

dsform/src/main/resources/template/js/dsformdisplaytemplate/dsformdisplaytemplatelist.js

@@ -50,7 +50,7 @@ layui.config({
 	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

dsform/src/main/resources/template/js/dsformlimitrequirement/dsformlimitrequirementlist.js

@@ -32,7 +32,7 @@ layui.config({
 	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
 	    ]],
-	    done: function(){
+	    done: function(json) {
 	    	matchingLanguage();
 	    }
 	});

ehr/src/main/resources/template/js/sysStaffArchives/sysStaffAllArchivesList.js

@@ -57,7 +57,7 @@ layui.config({
                 { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], align: 'center', width: 100},
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 100, toolbar: '#tableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

ehr/src/main/resources/template/js/sysStaffArchives/sysStaffLeaveArchivesList.js

@@ -58,7 +58,7 @@ layui.config({
                 { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], align: 'center', width: 100},
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 100, toolbar: '#tableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

ehr/src/main/resources/template/js/sysStaffArchives/sysStaffNoArchivesList.js

@@ -53,7 +53,7 @@ layui.config({
                 { field: 'workTime', title: '工作时间', align: 'center', width: 100},
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 100, toolbar: '#tableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

ehr/src/main/resources/template/js/sysStaffArchives/sysStaffNotInArchivesList.js

@@ -58,7 +58,7 @@ layui.config({
                 { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], align: 'center', width: 100},
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 100, toolbar: '#tableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

ehr/src/main/resources/template/js/sysStaffCertificate/sysStaffCertificateList.js

@@ -57,7 +57,7 @@ layui.config({
                 { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], align: 'center', width: 100},
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 100, toolbar: '#tableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

ehr/src/main/resources/template/js/sysStaffCertificate/sysStaffCertificateMyList.js

@@ -65,7 +65,7 @@ layui.config({
                 { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], align: 'center', width: 100},
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 100, toolbar: '#tableBar'}
 		    ]],
-		    done: function(){
+		    done: function(json) {
 		    	matchingLanguage();
 		    }
 		});

ehr/src/main/resources/template/js/sysStaffContract/sysStaffContractList.js

@@ -57,7 +57,7 @@ layui.config({
             { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], align: 'center', width: 100},
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 100, toolbar: '#tableBar'}
         ]],
-        done: function(){
+        done: function(json) {
             matchingLanguage();
         }
     });