From 50c63e45765a6b1decd2df08ee5d12febec083d6 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Wed, 2 Nov 2022 22:41:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=9C=B0=E5=9D=80=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/material/materialList.js | 2 +- .../companyDepartmentAdd.js} | 0 .../companyDepartmentChooseList.js | 0 .../companyDepartmentEdit.js} | 4 +- .../companyDepartmentList.js} | 10 +-- .../companyJobAdd.js} | 0 .../companyJobEdit.js} | 2 +- .../companyJobList.js} | 17 ++--- .../companyChooseList.js | 0 .../companyMationAdd.js} | 0 .../companyMationEdit.js} | 0 .../companyMationList.js} | 24 +++---- .../companyDepartmentAdd.html} | 2 +- .../companyDepartmentChooseList.html | 2 +- .../companyDepartmentEdit.html | 65 ++++++++++++++++++ .../companyDepartmentList.html} | 2 +- .../companydepartmenteditTemplate.tpl | 0 .../companyJobAdd.html} | 2 +- .../tpl/companyJob/companyJobEdit.html | 68 +++++++++++++++++++ .../companyJobList.html} | 2 +- .../companyChooseList.html | 2 +- .../companyMationAdd.html} | 2 +- .../companyMationEdit.html} | 2 +- .../companyMationList.html} | 2 +- .../companydepartmentedit.html | 22 ------ .../tpl/companyjob/companyjobedit.html | 22 ------ .../tpl/companyjob/companyjobeditTemplate.tpl | 42 ------------ .../template/js/wagesModel/wagesModelAdd.js | 4 +- .../template/js/wagesModel/wagesModelEdit.js | 4 +- .../wagesSocialSecurityFundAdd.js | 4 +- .../wagesSocialSecurityFundEdit.js | 4 +- 31 files changed, 179 insertions(+), 133 deletions(-) rename organization/src/main/resources/template/js/{companydepartment/companydepartmentadd.js => companyDepartment/companyDepartmentAdd.js} (100%) rename organization/src/main/resources/template/js/{companydepartment => companyDepartment}/companyDepartmentChooseList.js (100%) rename organization/src/main/resources/template/js/{companydepartment/companydepartmentedit.js => companyDepartment/companyDepartmentEdit.js} (96%) rename organization/src/main/resources/template/js/{companydepartment/companydepartmentlist.js => companyDepartment/companyDepartmentList.js} (94%) rename organization/src/main/resources/template/js/{companyjob/companyjobadd.js => companyJob/companyJobAdd.js} (100%) rename organization/src/main/resources/template/js/{companyjob/companyjobedit.js => companyJob/companyJobEdit.js} (99%) rename organization/src/main/resources/template/js/{companyjob/companyjoblist.js => companyJob/companyJobList.js} (93%) rename organization/src/main/resources/template/js/{companymation => companyMation}/companyChooseList.js (100%) rename organization/src/main/resources/template/js/{companymation/companymationadd.js => companyMation/companyMationAdd.js} (100%) rename organization/src/main/resources/template/js/{companymation/companymationedit.js => companyMation/companyMationEdit.js} (100%) rename organization/src/main/resources/template/js/{companymation/companymationlist.js => companyMation/companyMationList.js} (90%) rename organization/src/main/resources/template/tpl/{companydepartment/companydepartmentadd.html => companyDepartment/companyDepartmentAdd.html} (96%) rename organization/src/main/resources/template/tpl/{companydepartment => companyDepartment}/companyDepartmentChooseList.html (96%) create mode 100644 organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentEdit.html rename organization/src/main/resources/template/tpl/{companydepartment/companydepartmentlist.html => companyDepartment/companyDepartmentList.html} (96%) rename organization/src/main/resources/template/tpl/{companydepartment => companyDepartment}/companydepartmenteditTemplate.tpl (100%) rename organization/src/main/resources/template/tpl/{companyjob/companyjobadd.html => companyJob/companyJobAdd.html} (96%) create mode 100644 organization/src/main/resources/template/tpl/companyJob/companyJobEdit.html rename organization/src/main/resources/template/tpl/{companyjob/companyjoblist.html => companyJob/companyJobList.html} (97%) rename organization/src/main/resources/template/tpl/{companymation => companyMation}/companyChooseList.html (96%) rename organization/src/main/resources/template/tpl/{companymation/companymationadd.html => companyMation/companyMationAdd.html} (98%) rename organization/src/main/resources/template/tpl/{companymation/companymationedit.html => companyMation/companyMationEdit.html} (98%) rename organization/src/main/resources/template/tpl/{companymation/companymationlist.html => companyMation/companyMationList.html} (96%) delete mode 100644 organization/src/main/resources/template/tpl/companydepartment/companydepartmentedit.html delete mode 100644 organization/src/main/resources/template/tpl/companyjob/companyjobedit.html delete mode 100644 organization/src/main/resources/template/tpl/companyjob/companyjobeditTemplate.tpl diff --git a/erp/src/main/resources/template/js/material/materialList.js b/erp/src/main/resources/template/js/material/materialList.js index 2cf336ca0..79844a9e0 100644 --- a/erp/src/main/resources/template/js/material/materialList.js +++ b/erp/src/main/resources/template/js/material/materialList.js @@ -27,7 +27,7 @@ layui.config({ cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { field: 'name', title: '商品名称', align: 'left', width: 150, templet: function (d) { - return '' + d.name + ''; + return '' + d.name + ''; }}, { field: 'model', title: '型号', align: 'left', width: 150 }, { field: 'categoryName', title: '所属类型', width: 100 }, diff --git a/organization/src/main/resources/template/js/companydepartment/companydepartmentadd.js b/organization/src/main/resources/template/js/companyDepartment/companyDepartmentAdd.js similarity index 100% rename from organization/src/main/resources/template/js/companydepartment/companydepartmentadd.js rename to organization/src/main/resources/template/js/companyDepartment/companyDepartmentAdd.js diff --git a/organization/src/main/resources/template/js/companydepartment/companyDepartmentChooseList.js b/organization/src/main/resources/template/js/companyDepartment/companyDepartmentChooseList.js similarity index 100% rename from organization/src/main/resources/template/js/companydepartment/companyDepartmentChooseList.js rename to organization/src/main/resources/template/js/companyDepartment/companyDepartmentChooseList.js diff --git a/organization/src/main/resources/template/js/companydepartment/companydepartmentedit.js b/organization/src/main/resources/template/js/companyDepartment/companyDepartmentEdit.js similarity index 96% rename from organization/src/main/resources/template/js/companydepartment/companydepartmentedit.js rename to organization/src/main/resources/template/js/companyDepartment/companyDepartmentEdit.js index a7ee534b9..9e552d4d4 100644 --- a/organization/src/main/resources/template/js/companydepartment/companydepartmentedit.js +++ b/organization/src/main/resources/template/js/companyDepartment/companyDepartmentEdit.js @@ -18,11 +18,10 @@ layui.config({ url: reqBasePath + "companydepartment004", params: {rowId: parent.rowId}, pagination: false, - template: getFileContent('tpl/companydepartment/companydepartmenteditTemplate.tpl'), + template: $("#beanTemplate").html(), ajaxSendLoadBefore: function(hdb) { }, ajaxSendAfter:function (json) { - $("#overtimeSettlementType").val(json.bean.overtimeSettlementType); layedit.set({ @@ -83,7 +82,6 @@ layui.config({ // 加载公司数据 systemCommonUtil.getSysCompanyList(function(data) { - // 加载企业数据 $("#companyId").html(getDataUseHandlebars(getFileContent('tpl/template/select-option.tpl'), data)); $("#companyId").val(json.bean.companyId); }); diff --git a/organization/src/main/resources/template/js/companydepartment/companydepartmentlist.js b/organization/src/main/resources/template/js/companyDepartment/companyDepartmentList.js similarity index 94% rename from organization/src/main/resources/template/js/companydepartment/companydepartmentlist.js rename to organization/src/main/resources/template/js/companyDepartment/companyDepartmentList.js index 3d98e1ebc..86471c9ba 100644 --- a/organization/src/main/resources/template/js/companydepartment/companydepartmentlist.js +++ b/organization/src/main/resources/template/js/companyDepartment/companyDepartmentList.js @@ -93,9 +93,9 @@ layui.config({ function edit(data) { rowId = data.id; _openNewWindows({ - url: "../../tpl/companydepartment/companydepartmentedit.html", + url: "../../tpl/companyDepartment/companyDepartmentEdit.html", title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "companydepartmentedit", + pageId: "companyDepartmentEdit", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); @@ -106,9 +106,9 @@ layui.config({ // 新增 $("body").on("click", "#addBean", function() { _openNewWindows({ - url: "../../tpl/companydepartment/companydepartmentadd.html", + url: "../../tpl/companyDepartment/companyDepartmentAdd.html", title: systemLanguage["com.skyeye.addPageTitle"][languageType], - pageId: "companydepartmentadd", + pageId: "companyDepartmentAdd", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); @@ -137,5 +137,5 @@ layui.config({ } } - exports('companydepartmentlist', {}); + exports('companyDepartmentList', {}); }); diff --git a/organization/src/main/resources/template/js/companyjob/companyjobadd.js b/organization/src/main/resources/template/js/companyJob/companyJobAdd.js similarity index 100% rename from organization/src/main/resources/template/js/companyjob/companyjobadd.js rename to organization/src/main/resources/template/js/companyJob/companyJobAdd.js diff --git a/organization/src/main/resources/template/js/companyjob/companyjobedit.js b/organization/src/main/resources/template/js/companyJob/companyJobEdit.js similarity index 99% rename from organization/src/main/resources/template/js/companyjob/companyjobedit.js rename to organization/src/main/resources/template/js/companyJob/companyJobEdit.js index 16c5826f0..d2b7b2c93 100644 --- a/organization/src/main/resources/template/js/companyjob/companyjobedit.js +++ b/organization/src/main/resources/template/js/companyJob/companyJobEdit.js @@ -22,7 +22,7 @@ layui.config({ url: reqBasePath + "companyjob004", params: {rowId: parent.rowId}, pagination: false, - template: getFileContent('tpl/companyjob/companyjobeditTemplate.tpl'), + template: $("#beanTemplate").html(), ajaxSendLoadBefore: function(hdb) { }, ajaxSendAfter:function (json) { diff --git a/organization/src/main/resources/template/js/companyjob/companyjoblist.js b/organization/src/main/resources/template/js/companyJob/companyJobList.js similarity index 93% rename from organization/src/main/resources/template/js/companyjob/companyjoblist.js rename to organization/src/main/resources/template/js/companyJob/companyJobList.js index 15e2c5d8f..0f948e9ac 100644 --- a/organization/src/main/resources/template/js/companyjob/companyjoblist.js +++ b/organization/src/main/resources/template/js/companyJob/companyJobList.js @@ -54,6 +54,7 @@ layui.config({ url: reqBasePath + 'companyjob001', where: getTableParams(), cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { field: 'jobName', title: '职位名称', width: 180 }, { field: 'id', title: '职位简介', width: 80, align: 'center', templet: function (d) { return ''; @@ -62,7 +63,7 @@ layui.config({ { field: 'companyName', title: '所属公司', width: 150 }, { field: 'departmentName', title: '所属部门', width: 100 }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'} + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar' } ]], done: function(json) { matchingLanguage(); @@ -103,7 +104,7 @@ layui.config({ return false; }); - //删除 + // 删除 function del(data, obj) { layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { layer.close(index); @@ -114,13 +115,13 @@ layui.config({ }); } - //编辑 + // 编辑 function edit(data) { rowId = data.id; _openNewWindows({ - url: "../../tpl/companyjob/companyjobedit.html", + url: "../../tpl/companyJob/companyJobEdit.html", title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "companyjobedit", + pageId: "companyJobEdit", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); @@ -148,9 +149,9 @@ layui.config({ // 新增 $("body").on("click", "#addBean", function() { _openNewWindows({ - url: "../../tpl/companyjob/companyjobadd.html", + url: "../../tpl/companyJob/companyJobAdd.html", title: systemLanguage["com.skyeye.addPageTitle"][languageType], - pageId: "companyjobadd", + pageId: "companyJobAdd", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); @@ -170,5 +171,5 @@ layui.config({ }; } - exports('companyjoblist', {}); + exports('companyJobList', {}); }); diff --git a/organization/src/main/resources/template/js/companymation/companyChooseList.js b/organization/src/main/resources/template/js/companyMation/companyChooseList.js similarity index 100% rename from organization/src/main/resources/template/js/companymation/companyChooseList.js rename to organization/src/main/resources/template/js/companyMation/companyChooseList.js diff --git a/organization/src/main/resources/template/js/companymation/companymationadd.js b/organization/src/main/resources/template/js/companyMation/companyMationAdd.js similarity index 100% rename from organization/src/main/resources/template/js/companymation/companymationadd.js rename to organization/src/main/resources/template/js/companyMation/companyMationAdd.js diff --git a/organization/src/main/resources/template/js/companymation/companymationedit.js b/organization/src/main/resources/template/js/companyMation/companyMationEdit.js similarity index 100% rename from organization/src/main/resources/template/js/companymation/companymationedit.js rename to organization/src/main/resources/template/js/companyMation/companyMationEdit.js diff --git a/organization/src/main/resources/template/js/companymation/companymationlist.js b/organization/src/main/resources/template/js/companyMation/companyMationList.js similarity index 90% rename from organization/src/main/resources/template/js/companymation/companymationlist.js rename to organization/src/main/resources/template/js/companyMation/companyMationList.js index 0cc680803..43008a743 100644 --- a/organization/src/main/resources/template/js/companymation/companymationlist.js +++ b/organization/src/main/resources/template/js/companyMation/companyMationList.js @@ -13,7 +13,6 @@ layui.config({ tableTree = layui.tableTreeDj; authBtn('1552959308337'); - // 公司列表 tableTree.render({ id: 'messageTable', elem: '#messageTable', @@ -21,6 +20,7 @@ layui.config({ url: reqBasePath + 'companymation001', where:{companyName: $("#companyName").val()}, cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { field: 'companyName', width: 300, title: '公司名称'}, { field: 'companyDesc', width: 80, title: '公司简介', align: 'center', templet: function (d) { return ''; @@ -43,8 +43,8 @@ layui.config({ } return str; }}, - { field:'createTime', width:150, align: 'center', title: systemLanguage["com.skyeye.entryTime"][languageType]}, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'} + { field:'createTime', width:150, align: 'center', title: systemLanguage["com.skyeye.entryTime"][languageType] }, + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar' } ]], isPage:false, done: function(json) { @@ -83,7 +83,7 @@ layui.config({ return false; }); - //删除 + // 删除 function del(data, obj) { layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { layer.close(index); @@ -94,13 +94,13 @@ layui.config({ }); } - //编辑 + // 编辑 function edit(data) { rowId = data.id; _openNewWindows({ - url: "../../tpl/companymation/companymationedit.html", + url: "../../tpl/companyMation/companyMationEdit.html", title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "companymationedit", + pageId: "companyMationEdit", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); @@ -108,17 +108,17 @@ layui.config({ }}); } - //刷新数据 + // 刷新数据 $("body").on("click", "#reloadTable", function() { loadTable(); }); - //新增 + // 新增 $("body").on("click", "#addBean", function() { _openNewWindows({ - url: "../../tpl/companymation/companymationadd.html", + url: "../../tpl/companyMation/companyMationAdd.html", title: systemLanguage["com.skyeye.addPageTitle"][languageType], - pageId: "companymationadd", + pageId: "companyMationAdd", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); @@ -130,5 +130,5 @@ layui.config({ tableTree.reload("messageTable", {where:{companyName: $("#companyName").val()}}); } - exports('companymationlist', {}); + exports('companyMationList', {}); }); diff --git a/organization/src/main/resources/template/tpl/companydepartment/companydepartmentadd.html b/organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentAdd.html similarity index 96% rename from organization/src/main/resources/template/tpl/companydepartment/companydepartmentadd.html rename to organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentAdd.html index 836137998..191483c81 100644 --- a/organization/src/main/resources/template/tpl/companydepartment/companydepartmentadd.html +++ b/organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentAdd.html @@ -52,7 +52,7 @@ \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companydepartment/companyDepartmentChooseList.html b/organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentChooseList.html similarity index 96% rename from organization/src/main/resources/template/tpl/companydepartment/companyDepartmentChooseList.html rename to organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentChooseList.html index bdb87ee9b..f643d4868 100644 --- a/organization/src/main/resources/template/tpl/companydepartment/companyDepartmentChooseList.html +++ b/organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentChooseList.html @@ -44,7 +44,7 @@ \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentEdit.html b/organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentEdit.html new file mode 100644 index 000000000..5fa0eb0a4 --- /dev/null +++ b/organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentEdit.html @@ -0,0 +1,65 @@ + + + + + + + + + +
+
+ +
+
+ + + + + + + + + \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companydepartment/companydepartmentlist.html b/organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentList.html similarity index 96% rename from organization/src/main/resources/template/tpl/companydepartment/companydepartmentlist.html rename to organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentList.html index b23ffce47..30a371edf 100644 --- a/organization/src/main/resources/template/tpl/companydepartment/companydepartmentlist.html +++ b/organization/src/main/resources/template/tpl/companyDepartment/companyDepartmentList.html @@ -56,7 +56,7 @@ \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companydepartment/companydepartmenteditTemplate.tpl b/organization/src/main/resources/template/tpl/companyDepartment/companydepartmenteditTemplate.tpl similarity index 100% rename from organization/src/main/resources/template/tpl/companydepartment/companydepartmenteditTemplate.tpl rename to organization/src/main/resources/template/tpl/companyDepartment/companydepartmenteditTemplate.tpl diff --git a/organization/src/main/resources/template/tpl/companyjob/companyjobadd.html b/organization/src/main/resources/template/tpl/companyJob/companyJobAdd.html similarity index 96% rename from organization/src/main/resources/template/tpl/companyjob/companyjobadd.html rename to organization/src/main/resources/template/tpl/companyJob/companyJobAdd.html index ff969484c..c16bb9a85 100644 --- a/organization/src/main/resources/template/tpl/companyjob/companyjobadd.html +++ b/organization/src/main/resources/template/tpl/companyJob/companyJobAdd.html @@ -55,7 +55,7 @@ \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companyJob/companyJobEdit.html b/organization/src/main/resources/template/tpl/companyJob/companyJobEdit.html new file mode 100644 index 000000000..84b452e42 --- /dev/null +++ b/organization/src/main/resources/template/tpl/companyJob/companyJobEdit.html @@ -0,0 +1,68 @@ + + + + + + + + + +
+
+ +
+
+ + + + + + + + + \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companyjob/companyjoblist.html b/organization/src/main/resources/template/tpl/companyJob/companyJobList.html similarity index 97% rename from organization/src/main/resources/template/tpl/companyjob/companyjoblist.html rename to organization/src/main/resources/template/tpl/companyJob/companyJobList.html index 3e9a82126..e9544c6c1 100644 --- a/organization/src/main/resources/template/tpl/companyjob/companyjoblist.html +++ b/organization/src/main/resources/template/tpl/companyJob/companyJobList.html @@ -56,7 +56,7 @@ \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companymation/companyChooseList.html b/organization/src/main/resources/template/tpl/companyMation/companyChooseList.html similarity index 96% rename from organization/src/main/resources/template/tpl/companymation/companyChooseList.html rename to organization/src/main/resources/template/tpl/companyMation/companyChooseList.html index 36002865f..ce75d5c93 100644 --- a/organization/src/main/resources/template/tpl/companymation/companyChooseList.html +++ b/organization/src/main/resources/template/tpl/companyMation/companyChooseList.html @@ -40,7 +40,7 @@ \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companymation/companymationadd.html b/organization/src/main/resources/template/tpl/companyMation/companyMationAdd.html similarity index 98% rename from organization/src/main/resources/template/tpl/companymation/companymationadd.html rename to organization/src/main/resources/template/tpl/companyMation/companyMationAdd.html index 7baa57b02..38f1b061b 100644 --- a/organization/src/main/resources/template/tpl/companymation/companymationadd.html +++ b/organization/src/main/resources/template/tpl/companyMation/companyMationAdd.html @@ -121,7 +121,7 @@ \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companymation/companymationedit.html b/organization/src/main/resources/template/tpl/companyMation/companyMationEdit.html similarity index 98% rename from organization/src/main/resources/template/tpl/companymation/companymationedit.html rename to organization/src/main/resources/template/tpl/companyMation/companyMationEdit.html index a396b87cb..fe4724743 100644 --- a/organization/src/main/resources/template/tpl/companymation/companymationedit.html +++ b/organization/src/main/resources/template/tpl/companyMation/companyMationEdit.html @@ -127,7 +127,7 @@ \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companymation/companymationlist.html b/organization/src/main/resources/template/tpl/companyMation/companyMationList.html similarity index 96% rename from organization/src/main/resources/template/tpl/companymation/companymationlist.html rename to organization/src/main/resources/template/tpl/companyMation/companyMationList.html index 02ca4d5a0..5cf1a400c 100644 --- a/organization/src/main/resources/template/tpl/companymation/companymationlist.html +++ b/organization/src/main/resources/template/tpl/companyMation/companyMationList.html @@ -41,7 +41,7 @@ \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companydepartment/companydepartmentedit.html b/organization/src/main/resources/template/tpl/companydepartment/companydepartmentedit.html deleted file mode 100644 index d83f89db9..000000000 --- a/organization/src/main/resources/template/tpl/companydepartment/companydepartmentedit.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - -
-
- -
-
- - - - - - \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companyjob/companyjobedit.html b/organization/src/main/resources/template/tpl/companyjob/companyjobedit.html deleted file mode 100644 index 701f57555..000000000 --- a/organization/src/main/resources/template/tpl/companyjob/companyjobedit.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - -
-
- -
-
- - - - - - \ No newline at end of file diff --git a/organization/src/main/resources/template/tpl/companyjob/companyjobeditTemplate.tpl b/organization/src/main/resources/template/tpl/companyjob/companyjobeditTemplate.tpl deleted file mode 100644 index aee488aa8..000000000 --- a/organization/src/main/resources/template/tpl/companyjob/companyjobeditTemplate.tpl +++ /dev/null @@ -1,42 +0,0 @@ -{{#bean}} -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - -
-
-{{/bean}} \ No newline at end of file diff --git a/wages/src/main/resources/template/js/wagesModel/wagesModelAdd.js b/wages/src/main/resources/template/js/wagesModel/wagesModelAdd.js index d7be0bd88..584847403 100644 --- a/wages/src/main/resources/template/js/wagesModel/wagesModelAdd.js +++ b/wages/src/main/resources/template/js/wagesModel/wagesModelAdd.js @@ -115,7 +115,7 @@ layui.config({ }); $("body").on("click", "#companySel", function() { _openNewWindows({ - url: "../../tpl/companymation/companyChooseList.html", + url: "../../tpl/companyMation/companyChooseList.html", title: "选择企业", pageId: "companyChooseList", area: ['90vw', '90vh'], @@ -136,7 +136,7 @@ layui.config({ }); $("body").on("click", "#departmentSel", function() { _openNewWindows({ - url: "../../tpl/companydepartment/companyDepartmentChooseList.html", + url: "../../tpl/companyDepartment/companyDepartmentChooseList.html", title: "选择部门", pageId: "companyDepartmentChooseList", area: ['90vw', '90vh'], diff --git a/wages/src/main/resources/template/js/wagesModel/wagesModelEdit.js b/wages/src/main/resources/template/js/wagesModel/wagesModelEdit.js index a2f76db33..01c3a65f2 100644 --- a/wages/src/main/resources/template/js/wagesModel/wagesModelEdit.js +++ b/wages/src/main/resources/template/js/wagesModel/wagesModelEdit.js @@ -179,7 +179,7 @@ layui.config({ // 选择企业 $("body").on("click", "#companySel", function() { _openNewWindows({ - url: "../../tpl/companymation/companyChooseList.html", + url: "../../tpl/companyMation/companyChooseList.html", title: "选择企业", pageId: "companyChooseList", area: ['90vw', '90vh'], @@ -192,7 +192,7 @@ layui.config({ // 选择部门 $("body").on("click", "#departmentSel", function() { _openNewWindows({ - url: "../../tpl/companydepartment/companyDepartmentChooseList.html", + url: "../../tpl/companyDepartment/companyDepartmentChooseList.html", title: "选择部门", pageId: "companyDepartmentChooseList", area: ['90vw', '90vh'], diff --git a/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundAdd.js b/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundAdd.js index d6fd500ab..3b22290ef 100644 --- a/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundAdd.js +++ b/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundAdd.js @@ -100,7 +100,7 @@ layui.config({ }); $("body").on("click", "#companySel", function() { _openNewWindows({ - url: "../../tpl/companymation/companyChooseList.html", + url: "../../tpl/companyMation/companyChooseList.html", title: "选择企业", pageId: "companyChooseList", area: ['90vw', '90vh'], @@ -121,7 +121,7 @@ layui.config({ }); $("body").on("click", "#departmentSel", function() { _openNewWindows({ - url: "../../tpl/companydepartment/companyDepartmentChooseList.html", + url: "../../tpl/companyDepartment/companyDepartmentChooseList.html", title: "选择部门", pageId: "companyDepartmentChooseList", area: ['90vw', '90vh'], diff --git a/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundEdit.js b/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundEdit.js index 353cd2abb..a77422ec1 100644 --- a/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundEdit.js +++ b/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundEdit.js @@ -153,7 +153,7 @@ layui.config({ // 选择企业 $("body").on("click", "#companySel", function() { _openNewWindows({ - url: "../../tpl/companymation/companyChooseList.html", + url: "../../tpl/companyMation/companyChooseList.html", title: "选择企业", pageId: "companyChooseList", area: ['90vw', '90vh'], @@ -166,7 +166,7 @@ layui.config({ // 选择部门 $("body").on("click", "#departmentSel", function() { _openNewWindows({ - url: "../../tpl/companydepartment/companyDepartmentChooseList.html", + url: "../../tpl/companyDepartment/companyDepartmentChooseList.html", title: "选择部门", pageId: "companyDepartmentChooseList", area: ['90vw', '90vh'], -- GitLab