diff --git a/checkwork/src/main/resources/template/js/checkWorkApprove/checkWorkApproveList.js b/checkwork/src/main/resources/template/js/checkWorkApprove/checkWorkApproveList.js index 608dd08955d6b6f8274a40b133fb88337e5b330e..662faa420e8abfa4785d31a37e3129a8e199b1cf 100644 --- a/checkwork/src/main/resources/template/js/checkWorkApprove/checkWorkApproveList.js +++ b/checkwork/src/main/resources/template/js/checkWorkApprove/checkWorkApproveList.js @@ -67,7 +67,7 @@ layui.config({ elem: '#myGetTable', method: 'post', url: flowableBasePath + 'checkwork007', - where: getTablePatams(), + where: getTableParams(), even: true, page: true, limits: getLimits(), @@ -76,7 +76,7 @@ layui.config({ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { field: 'checkDate', title: '申诉内容', align: 'left', width: 160, templet: function (d) { var text = d.checkDate; - return text += d.situation; + return text + d.situation; }}, { field: 'appealName', title: '申诉原因', align: 'center', width: 100 }, { field: 'appealReason', title: '申诉具体原因', align: 'left', width: 170 }, @@ -141,7 +141,7 @@ layui.config({ // 搜索员工考勤申诉审批 $("body").on("click", "#searchForm2", function() { - table.reloadData("myGetTable", {page: {curr: 1}, where: getTablePatams()}); + table.reloadData("myGetTable", {page: {curr: 1}, where: getTableParams()}); }); // 刷新员工考勤申诉审批 @@ -150,10 +150,10 @@ layui.config({ }); function reloadMyGetTable(){ - table.reloadData("myGetTable", {where: getTablePatams()}); + table.reloadData("myGetTable", {where: getTableParams()}); } - function getTablePatams(){ + function getTableParams(){ if(isNull($("#createId").val())) { createid = ""; } diff --git a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmList.js b/erp-produce/src/main/resources/template/js/erpFarm/erpFarmList.js index 851c763ef357b1610b8fcfd5113b629a5b4f657f..77f0096611762a70000b3bad90bccc7363a750ea 100644 --- a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmList.js +++ b/erp-produce/src/main/resources/template/js/erpFarm/erpFarmList.js @@ -20,7 +20,7 @@ layui.config({ elem: '#messageTable', method: 'post', url: flowableBasePath + 'erpfarm001', - where: getTablePatams(), + where: getTableParams(), even: true, page: true, overflow: { @@ -78,7 +78,7 @@ layui.config({ form.render(); form.on('submit(formSearch)', function (data) { if (winui.verifyForm(data.elem)) { - table.reloadData("messageTable", {page: {curr: 1}, where: getTablePatams()}) + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}) } return false; }); @@ -158,10 +158,10 @@ layui.config({ //刷新 function loadTable() { - table.reloadData("messageTable", {where: getTablePatams()}); + table.reloadData("messageTable", {where: getTableParams()}); } - function getTablePatams(){ + function getTableParams(){ return { farmNumber: $("#farmNumber").val(), farmName: $("#farmName").val(), diff --git a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js index d9c7a1b1cc958a4333892f50be8ccb6e59a6819b..434884121d67cffb5646ca7d5103fa9047012d6c 100644 --- a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js +++ b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js @@ -20,7 +20,7 @@ layui.config({ elem: '#messageTable', method: 'post', url: flowableBasePath + 'erpmachin001', - where: getTablePatams(), + where: getTableParams(), even: true, page: true, overflow: { @@ -168,12 +168,11 @@ layui.config({ loadTable(); }); - // 刷新 function loadTable() { - table.reloadData("messageTable", {where: getTablePatams()}); + table.reloadData("messageTable", {where: getTableParams()}); } - function getTablePatams(){ + function getTableParams(){ return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); } diff --git a/erp-produce/src/main/resources/template/js/erpWayProcedure/erpWayProcedureChoose.js b/erp-produce/src/main/resources/template/js/erpWayProcedure/erpWayProcedureChoose.js index 5f5d4dc1fcdabce7471beda9edd8b1be8b39fe8a..af8df43c58d3dec0ea916c43ea70f095a95fca5d 100644 --- a/erp-produce/src/main/resources/template/js/erpWayProcedure/erpWayProcedureChoose.js +++ b/erp-produce/src/main/resources/template/js/erpWayProcedure/erpWayProcedureChoose.js @@ -16,7 +16,7 @@ layui.config({ elem: '#messageTable', method: 'post', url: flowableBasePath + 'erpwayprocedure009', - where: getTablePatams(), + where: getTableParams(), even: true, page: true, limits: [8, 16, 24, 32, 40, 48, 56], @@ -62,7 +62,7 @@ layui.config({ form.render(); form.on('submit(formSearch)', function (data) { if (winui.verifyForm(data.elem)) { - table.reloadData("messageTable", {page: {curr: 1}, where: getTablePatams()}) + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}) } return false; }); @@ -72,10 +72,10 @@ layui.config({ }); function loadTable() { - table.reloadData("messageTable", {where: getTablePatams()}); + table.reloadData("messageTable", {where: getTableParams()}); } - function getTablePatams(){ + function getTableParams(){ return { wayNumber: $("#wayNumber").val(), wayName: $("#wayName").val() diff --git a/erp-produce/src/main/resources/template/js/erpWayProcedure/erpWayProcedureList.js b/erp-produce/src/main/resources/template/js/erpWayProcedure/erpWayProcedureList.js index 3018c18773dbb2b2de736f705aba64905257d48e..f2537ac897d0f326eb456fa48c647a25be2035c3 100644 --- a/erp-produce/src/main/resources/template/js/erpWayProcedure/erpWayProcedureList.js +++ b/erp-produce/src/main/resources/template/js/erpWayProcedure/erpWayProcedureList.js @@ -20,7 +20,7 @@ layui.config({ elem: '#messageTable', method: 'post', url: flowableBasePath + 'erpwayprocedure001', - where: getTablePatams(), + where: getTableParams(), even: true, page: true, overflow: { @@ -78,7 +78,7 @@ layui.config({ form.render(); form.on('submit(formSearch)', function (data) { if (winui.verifyForm(data.elem)) { - table.reloadData("messageTable", {page: {curr: 1}, where: getTablePatams()}) + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}) } return false; }); @@ -158,10 +158,10 @@ layui.config({ //刷新 function loadTable() { - table.reloadData("messageTable", {where: getTablePatams()}); + table.reloadData("messageTable", {where: getTableParams()}); } - function getTablePatams(){ + function getTableParams(){ return { wayNumber: $("#wayNumber").val(), wayName: $("#wayName").val() diff --git a/exam/src/main/resources/template/js/schoolQuestionBank/schoolQuestionBankCommonList.js b/exam/src/main/resources/template/js/schoolQuestionBank/schoolQuestionBankCommonList.js index 03a1f2830b7235c4e3787560a485e17da58c11d8..2898a8fce3ea4a2c20a87781e7ef1aa59aac7024 100644 --- a/exam/src/main/resources/template/js/schoolQuestionBank/schoolQuestionBankCommonList.js +++ b/exam/src/main/resources/template/js/schoolQuestionBank/schoolQuestionBankCommonList.js @@ -69,7 +69,7 @@ layui.config({ elem: '#messageTable', method: 'post', url: schoolBasePath + 'schoolquestionbank019', - where: getTablePatams(), + where: getTableParams(), even: true, page: true, limits: getLimits(), @@ -86,10 +86,10 @@ layui.config({ return '' + d.typeName + ''; } }}, - { field: 'cName', width: 100, title: '题型'}, - { field: 'schoolName', width: 150, title: '学校'}, - { field: 'gradeName', width: 80, align: 'center', title: '年级'}, - { field: 'subjectName', width: 80, align: 'center', title: '科目'}, + { field: 'cName', width: 100, title: '题型' }, + { field: 'schoolName', width: 150, title: '学校' }, + { field: 'gradeName', width: 80, align: 'center', title: '年级' }, + { field: 'subjectName', width: 80, align: 'center', title: '科目' }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 140 } ]], done: function(json) { @@ -148,10 +148,10 @@ layui.config({ }); function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where: getTablePatams()}); + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); } - function getTablePatams(){ + function getTableParams(){ return { schoolId: $("#schoolId").val(), gradeId: gradeId, diff --git a/exam/src/main/resources/template/js/schoolQuestionBank/schoolQuestionBankList.js b/exam/src/main/resources/template/js/schoolQuestionBank/schoolQuestionBankList.js index b75b29013b9194dcce6f3148e80f012ad791dcc8..e2860beab72630db15bb297f0d351cb8c04ad358 100644 --- a/exam/src/main/resources/template/js/schoolQuestionBank/schoolQuestionBankList.js +++ b/exam/src/main/resources/template/js/schoolQuestionBank/schoolQuestionBankList.js @@ -83,7 +83,7 @@ layui.config({ elem: '#messageTable', method: 'post', url: schoolBasePath + 'schoolquestionbank001', - where: getTablePatams(), + where: getTableParams(), even: true, page: true, limits: getLimits(), @@ -326,14 +326,14 @@ layui.config({ }); function loadTable() { - table.reloadData("messageTable", {where: getTablePatams()}); + table.reloadData("messageTable", {where: getTableParams()}); } function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where: getTablePatams()}); + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); } - function getTablePatams(){ + function getTableParams(){ return { quTitle: $("#quTitle").val(), schoolId: $("#schoolId").val(), diff --git a/organization/src/main/resources/template/js/companyjob/companyjoblist.js b/organization/src/main/resources/template/js/companyjob/companyjoblist.js index 13a54825aafafcac62e43441d7c3be02ec5cb7d7..15e2c5d8fdfa2c0c1990465a4ee48b826ed4ed7c 100644 --- a/organization/src/main/resources/template/js/companyjob/companyjoblist.js +++ b/organization/src/main/resources/template/js/companyjob/companyjoblist.js @@ -46,7 +46,7 @@ layui.config({ }); } - function initloadTable() { + function initLoadTable() { tableTree.render({ id: 'messageTable', elem: '#messageTable', diff --git a/school/src/main/resources/template/js/schoolKnowledgePoints/schoolKnowledgePointsCommonList.js b/school/src/main/resources/template/js/schoolKnowledgePoints/schoolKnowledgePointsCommonList.js index a54c35fa8ba4fd7c6f90416204837ce8cf66d7d4..19f15dea03eaf564494adcd41104bc4f54daa0ac 100644 --- a/school/src/main/resources/template/js/schoolKnowledgePoints/schoolKnowledgePointsCommonList.js +++ b/school/src/main/resources/template/js/schoolKnowledgePoints/schoolKnowledgePointsCommonList.js @@ -69,7 +69,7 @@ layui.config({ elem: '#messageTable', method: 'post', url: schoolBasePath + 'knowledgepoints009', - where: getTablePatams(), + where: getTableParams(), even: true, page: true, limits: getLimits(), @@ -140,10 +140,10 @@ layui.config({ }); function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where: getTablePatams()}); + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); } - function getTablePatams(){ + function getTableParams(){ return { schoolId: $("#schoolId").val(), gradeId: gradeId, diff --git a/school/src/main/resources/template/js/schoolKnowledgePoints/schoolKnowledgePointsList.js b/school/src/main/resources/template/js/schoolKnowledgePoints/schoolKnowledgePointsList.js index 9d8f01e9e1317f70a8b844dc6f85c7966858df95..501a13ca71e7fe41a7c7542faccbede60e2d1893 100644 --- a/school/src/main/resources/template/js/schoolKnowledgePoints/schoolKnowledgePointsList.js +++ b/school/src/main/resources/template/js/schoolKnowledgePoints/schoolKnowledgePointsList.js @@ -74,7 +74,7 @@ layui.config({ elem: '#messageTable', method: 'post', url: schoolBasePath + 'knowledgepoints001', - where: getTablePatams(), + where: getTableParams(), even: true, page: true, limits: getLimits(), @@ -179,14 +179,14 @@ layui.config({ }); function loadTable() { - table.reloadData("messageTable", {where: getTablePatams()}); + table.reloadData("messageTable", {where: getTableParams()}); } function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where: getTablePatams()}); + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); } - function getTablePatams() { + function getTableParams() { return { title: $("#title").val(), schoolId: $("#schoolId").val(), diff --git a/web/src/main/resources/template/assets/lib/layui/custom.js b/web/src/main/resources/template/assets/lib/layui/custom.js index afad914e778e96a4ae2b5369b683e4b09017a7a5..138e08500c036e881747350cbed2656cff5e45f5 100644 --- a/web/src/main/resources/template/assets/lib/layui/custom.js +++ b/web/src/main/resources/template/assets/lib/layui/custom.js @@ -270,7 +270,7 @@ var postDownLoadFile = function(options) { * 权限验证 * @param urlNum */ -function auth(urlNum){ +function auth(urlNum) { var authList = JSON.parse(localStorage.getItem("authpoints")); if (!isNull(authList)) { for (var i = 0; i < authList.length; i++) { diff --git a/web/src/main/resources/template/json/sysServiceMation.json b/web/src/main/resources/template/json/sysServiceMation.json index 8ab52a4614a25621c5b7d6764d0394795e3f62b2..03fe88314c39a4030965d665d4e4f94cdf704065 100644 --- a/web/src/main/resources/template/json/sysServiceMation.json +++ b/web/src/main/resources/template/json/sysServiceMation.json @@ -21,6 +21,14 @@ "assemblySheetOrder": {"name": "组装订单", "key": "com.skyeye.other.service.impl.AssemblySheetServiceImpl"}, "allocationFormOrder": {"name": "调拨订单", "key": "com.skyeye.other.service.impl.AllocationServiceImpl"}, + "putAcceptanceWarehousing": {"name": "验收入库单", "key": "com.skyeye.machin.service.impl.ErpAcceptanceReceiptServiceImpl"}, + "machinHeader": {"name": "加工单", "key": "com.skyeye.machin.service.impl.ErpMachinServiceImpl"}, + "machinChild": {"name": "工序验收单", "key": "com.skyeye.machin.service.impl.ErpProcessAcceptanceSheetServiceImpl"}, + "productionHead": {"name": "生产计划单", "key": "com.skyeye.production.service.impl.ErpProductionServiceImpl"}, + "pickPicking": {"name": "领料单", "key": "com.skyeye.pick.service.impl.RequisitionMaterialServiceImpl"}, + "pickReplenishment": {"name": "补料单", "key": "com.skyeye.pick.service.impl.PatchMaterialServiceImpl"}, + "pickReturn": {"name": "退料单", "key": "com.skyeye.pick.service.impl.ReturnMaterialServiceImpl"}, + "proworkLoad": {"name": "项目工作量审核", "key": "com.skyeye.service.impl.ProWorkloadServiceImpl"}, "proTask": {"name": "项目任务审核", "key": "com.skyeye.service.impl.ProTaskServiceImpl"}, "proProject": {"name": "项目立项审批", "key": "com.skyeye.service.impl.ProProjectServiceImpl"}, @@ -47,14 +55,6 @@ "assetArticlesUse": {"name": "用品领用", "key": "com.skyeye.eve.articles.service.impl.AssetArticlesApplyUseServiceImpl"}, "assetArticlesPurchase": {"name": "用品采购", "key": "com.skyeye.eve.articles.service.impl.AssetArticlesApplyPurchaseServiceImpl"}, - "putAcceptanceWarehousing": {"name": "验收入库单", "key": "com.skyeye.service.impl.AcceptanceReceiptServiceImpl"}, - "machinHeader": {"name": "加工单", "key": "com.skyeye.service.impl.ErpMachinServiceImpl"}, - "machinChild": {"name": "工序验收单", "key": "com.skyeye.service.impl.ErpProcessAcceptanceSheetServiceImpl"}, - "productionHead": {"name": "生产计划单", "key": "com.skyeye.service.impl.ErpProductionServiceImpl"}, - "pickPicking": {"name": "领料单", "key": "com.skyeye.pick.service.impl.RequisitionMaterialServiceImpl"}, - "pickReplenishment": {"name": "补料单", "key": "com.skyeye.pick.service.impl.PatchMaterialServiceImpl"}, - "pickReturn": {"name": "退料单", "key": "com.skyeye.pick.service.impl.ReturnMaterialServiceImpl"}, - "incomeOrder": {"name": "财务明细账", "key": "com.skyeye.service.impl.IncomeServiceImpl"}, "bossPersonRequire": {"name": "人员需求申请", "key": "com.skyeye.service.impl.BossPersonRequireServiceImpl"},