diff --git a/service-department/src/main/resources/templates/department/save-merge.html b/service-department/src/main/resources/templates/department/save-merge.html index 0452f3eb..4db43f56 100644 --- a/service-department/src/main/resources/templates/department/save-merge.html +++ b/service-department/src/main/resources/templates/department/save-merge.html @@ -12,6 +12,10 @@ @@ -141,9 +145,17 @@
-
+
+
+ + +
@@ -242,32 +254,40 @@ } } }); - }) + }); - $('#departmentAreaName').on('click', function() { - top.dialog.open({ - title: '选择地区', - url: top.restAjax.path('route/area/get-select?areaName={departmentAreaName}', [encodeURI($('#departmentAreaName').val())]), - width: '600px', - height: '225px', - onClose: function() { - var selectedAreaArray = top.dialog.dialogData.selectedAreaArray; - var areaCode = ''; - var areaName = ''; - if(selectedAreaArray.length > 0) { - areaCode = selectedAreaArray[selectedAreaArray.length - 1].areaCode; - for(var i = 0, item; item = selectedAreaArray[i++];) { - if(areaName) { - areaName += '/'; + // 区域选择 + (function() { + $('#areaSelectBtn').on('click', function() { + top.dialog.open({ + title: '选择地区', + url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#departmentAreaName').val())]), + width: '600px', + height: '225px', + onClose: function() { + var selectedAreaArray = top.dialog.dialogData.selectedAreaArray; + if(selectedAreaArray.length > 0) { + var areaCode = ''; + var areaName = ''; + areaCode = selectedAreaArray[selectedAreaArray.length - 1].areaCode; + for(var i = 0, item; item = selectedAreaArray[i++];) { + if(areaName) { + areaName += ' / '; + } + areaName += item.areaName; } - areaName += item.areaName; + $('#departmentAreaCode').val(areaCode); + $('#departmentAreaName').val(areaName); } } - $('#departmentAreaCode').val(departmentAreaCode); - $('#departmentAreaName').val(areaName); - } + }) + }); + $('#areaCleanBtn').on('click', function () { + $('#departmentAreaCode').val(''); + $('#departmentAreaName').val(''); }) - }); + })(); + $('.close').on('click', function() { closeBox(); diff --git a/service-department/src/main/resources/templates/department/save-split.html b/service-department/src/main/resources/templates/department/save-split.html index 9d28dd82..34ac4d6e 100644 --- a/service-department/src/main/resources/templates/department/save-split.html +++ b/service-department/src/main/resources/templates/department/save-split.html @@ -12,6 +12,10 @@ @@ -147,9 +151,17 @@
-
+
+
+ + +
@@ -245,30 +257,37 @@ closeBox(); }); - $('#departmentAreaName').on('click', function() { - top.dialog.open({ - title: '选择地区', - url: top.restAjax.path('route/area/get-select?areaName={departmentAreaName}', [encodeURI($('#departmentAreaName').val())]), - width: '600px', - height: '225px', - onClose: function() { - var selectedAreaArray = top.dialog.dialogData.selectedAreaArray; - var areaCode = ''; - var areaName = ''; - if(selectedAreaArray.length > 0) { - areaCode = selectedAreaArray[selectedAreaArray.length - 1].areaCode; - for(var i = 0, item; item = selectedAreaArray[i++];) { - if(areaName) { - areaName += '/'; + // 区域选择 + (function() { + $('#areaSelectBtn').on('click', function() { + top.dialog.open({ + title: '选择地区', + url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#departmentAreaName').val())]), + width: '600px', + height: '225px', + onClose: function() { + var selectedAreaArray = top.dialog.dialogData.selectedAreaArray; + if(selectedAreaArray.length > 0) { + var areaCode = ''; + var areaName = ''; + areaCode = selectedAreaArray[selectedAreaArray.length - 1].areaCode; + for(var i = 0, item; item = selectedAreaArray[i++];) { + if(areaName) { + areaName += ' / '; + } + areaName += item.areaName; } - areaName += item.areaName; + $('#departmentAreaCode').val(areaCode); + $('#departmentAreaName').val(areaName); } } - $('#departmentAreaCode').val(departmentAreaCode); - $('#departmentAreaName').val(areaName); - } + }) + }); + $('#areaCleanBtn').on('click', function () { + $('#departmentAreaCode').val(''); + $('#departmentAreaName').val(''); }) - }); + })(); // 校验部门是否存在 var checkDepartmentNameTimeout; diff --git a/service-department/src/main/resources/templates/department/save.html b/service-department/src/main/resources/templates/department/save.html index 9d5e0742..f7bcea5c 100644 --- a/service-department/src/main/resources/templates/department/save.html +++ b/service-department/src/main/resources/templates/department/save.html @@ -12,6 +12,10 @@ @@ -154,9 +158,17 @@
-
+
+
+ + +
@@ -296,30 +308,37 @@ closeBox(); }); - $('#departmentAreaName').on('click', function() { - top.dialog.open({ - title: '选择地区', - url: top.restAjax.path('route/area/get-select?areaName={departmentAreaName}', [encodeURI($('#departmentAreaName').val())]), - width: '600px', - height: '225px', - onClose: function() { - var selectedAreaArray = top.dialog.dialogData.selectedAreaArray; - var areaCode = ''; - var areaName = ''; - if(selectedAreaArray.length > 0) { - areaCode = selectedAreaArray[selectedAreaArray.length - 1].areaCode; - for(var i = 0, item; item = selectedAreaArray[i++];) { - if(areaName) { - areaName += '/'; + // 区域选择 + (function() { + $('#areaSelectBtn').on('click', function() { + top.dialog.open({ + title: '选择地区', + url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#departmentAreaName').val())]), + width: '600px', + height: '225px', + onClose: function() { + var selectedAreaArray = top.dialog.dialogData.selectedAreaArray; + if(selectedAreaArray.length > 0) { + var areaCode = ''; + var areaName = ''; + areaCode = selectedAreaArray[selectedAreaArray.length - 1].areaCode; + for(var i = 0, item; item = selectedAreaArray[i++];) { + if(areaName) { + areaName += ' / '; + } + areaName += item.areaName; } - areaName += item.areaName; + $('#departmentAreaCode').val(areaCode); + $('#departmentAreaName').val(areaName); } } - $('#departmentAreaCode').val(areaCode); - $('#departmentAreaName').val(areaName); - } + }) + }); + $('#areaCleanBtn').on('click', function () { + $('#departmentAreaCode').val(''); + $('#departmentAreaName').val(''); }) - }); + })(); var checkDepartmentNameTimeout; $(document).on('keydown', '#departmentName', function() { diff --git a/service-department/src/main/resources/templates/department/update-split.html b/service-department/src/main/resources/templates/department/update-split.html index fd8942d9..4447c4f9 100644 --- a/service-department/src/main/resources/templates/department/update-split.html +++ b/service-department/src/main/resources/templates/department/update-split.html @@ -12,6 +12,10 @@ @@ -137,9 +141,17 @@
-
+
+
+ + +
@@ -267,32 +279,39 @@ } } }); - }) + }); - $('#departmentAreaName').on('click', function() { - top.dialog.open({ - title: '选择地区', - url: top.restAjax.path('route/area/get-select?areaName={departmentAreaName}', [encodeURI($('#departmentAreaName').val())]), - width: '600px', - height: '225px', - onClose: function() { - var selectedAreaArray = top.dialog.dialogData.selectedAreaArray; - var areaCode = ''; - var areaName = ''; - if(selectedAreaArray.length > 0) { - areaCode = selectedAreaArray[selectedAreaArray.length - 1].areaCode; - for(var i = 0, item; item = selectedAreaArray[i++];) { - if(areaName) { - areaName += '/'; + // 区域选择 + (function() { + $('#areaSelectBtn').on('click', function() { + top.dialog.open({ + title: '选择地区', + url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#departmentAreaName').val())]), + width: '600px', + height: '225px', + onClose: function() { + var selectedAreaArray = top.dialog.dialogData.selectedAreaArray; + if(selectedAreaArray.length > 0) { + var areaCode = ''; + var areaName = ''; + areaCode = selectedAreaArray[selectedAreaArray.length - 1].areaCode; + for(var i = 0, item; item = selectedAreaArray[i++];) { + if(areaName) { + areaName += ' / '; + } + areaName += item.areaName; } - areaName += item.areaName; + $('#departmentAreaCode').val(areaCode); + $('#departmentAreaName').val(areaName); } } - $('#departmentAreaCode').val(departmentAreaCode); - $('#departmentAreaName').val(areaName); - } + }) + }); + $('#areaCleanBtn').on('click', function () { + $('#departmentAreaCode').val(''); + $('#departmentAreaName').val(''); }) - }); + })(); $('.close').on('click', function() { closeBox(); diff --git a/service-department/src/main/resources/templates/department/update.html b/service-department/src/main/resources/templates/department/update.html index 903e6dd9..eb5949fb 100644 --- a/service-department/src/main/resources/templates/department/update.html +++ b/service-department/src/main/resources/templates/department/update.html @@ -12,6 +12,10 @@ @@ -154,9 +158,17 @@
-
+
+
+ + +
@@ -271,30 +283,37 @@ }); }); - $('#departmentAreaName').on('click', function() { - top.dialog.open({ - title: '选择地区', - url: top.restAjax.path('route/area/get-select?areaName={departmentAreaName}', [encodeURI($('#departmentAreaName').val())]), - width: '600px', - height: '225px', - onClose: function() { - var selectedAreaArray = top.dialog.dialogData.selectedAreaArray; - var areaCode = ''; - var areaName = ''; - if(selectedAreaArray.length > 0) { - areaCode = selectedAreaArray[selectedAreaArray.length - 1].areaCode; - for(var i = 0, item; item = selectedAreaArray[i++];) { - if(areaName) { - areaName += '/'; + // 区域选择 + (function() { + $('#areaSelectBtn').on('click', function() { + top.dialog.open({ + title: '选择地区', + url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#departmentAreaName').val())]), + width: '600px', + height: '225px', + onClose: function() { + var selectedAreaArray = top.dialog.dialogData.selectedAreaArray; + if(selectedAreaArray.length > 0) { + var areaCode = ''; + var areaName = ''; + areaCode = selectedAreaArray[selectedAreaArray.length - 1].areaCode; + for(var i = 0, item; item = selectedAreaArray[i++];) { + if(areaName) { + areaName += ' / '; + } + areaName += item.areaName; } - areaName += item.areaName; + $('#departmentAreaCode').val(areaCode); + $('#departmentAreaName').val(areaName); } } - $('#departmentAreaCode').val(areaCode); - $('#departmentAreaName').val(areaName); - } + }) + }); + $('#areaCleanBtn').on('click', function () { + $('#departmentAreaCode').val(''); + $('#departmentAreaName').val(''); }) - }); + })(); // 提交表单 form.on('submit(submitForm)', function(formData) {