门店信息新增地址字段

shop/src/main/resources/template/js/store/storeAdd.js

@@ -21,13 +21,34 @@ layui.config({
             $("#areaId").html(getDataUseHandlebars(getFileContent('tpl/template/select-option.tpl'), json));
         });
 
+        // 加载行政区划-省
+        loadChildProvinceArea();
+
 	    matchingLanguage();
         form.render();
         form.on('submit(formAddBean)', function (data) {
             if (winui.verifyForm(data.elem)) {
+                var provinceId = "", cityId = "", addressAreaId = "", townshipId = "";
+                if(!isNull($("#provinceId").val())){
+                    provinceId = $("#provinceId").val();
+                }
+                if(!isNull($("#cityId").val())){
+                    cityId = $("#cityId").val();
+                }
+                if(!isNull($("#addressAreaId").val())){
+                    addressAreaId = $("#addressAreaId").val();
+                }
+                if(!isNull($("#townshipId").val())){
+                    townshipId = $("#townshipId").val();
+                }
                 var params = {
                     name: $("#name").val(),
                     areaId: $("#areaId").val(),
+                    provinceId: provinceId,
+                    cityId: cityId,
+                    addressAreaId: addressAreaId,
+                    townshipId: townshipId,
+                    addressDetailed: $("#addressDetailed").val(),
                     remark: $("#remark").val()
                 };
                 AjaxPostUtil.request({url: shopBasePath + "store002", params: params, type: 'json', method: "POST", callback: function(json){
@@ -42,6 +63,96 @@ layui.config({
             return false;
         });
 
+        form.on('select(areaProvince)', function(data){
+            layui.$(data.elem).parent('dd').nextAll().remove();
+            if(isNull(data.value) || data.value == '请选择'){
+            }else{
+                loadChildCityArea();
+            }
+        });
+        form.on('select(areaCity)', function(data){
+            layui.$(data.elem).parent('dd').nextAll().remove();
+            if(isNull(data.value) || data.value == '请选择'){
+            }else{
+                loadChildArea();
+            }
+        });
+        form.on('select(area)', function(data){
+            layui.$(data.elem).parent('dd').nextAll().remove();
+            if(isNull(data.value) || data.value == '请选择'){
+            }else{
+                loadChildAreaTownShip();
+            }
+        });
+
+        // 省级行政区划
+        function loadChildProvinceArea(){
+            AjaxPostUtil.request({url:reqBasePath + "commontarea001", params:{}, type:'json', method: "POST", callback:function(json){
+                if(json.returnCode == 0){
+                    var str = '<dd class="layui-col-xs3"><select id="provinceId" win-verify="required" lay-filter="areaProvince" lay-search=""><option value="">请选择</option>';
+                    for(var i = 0; i < json.rows.length; i++){
+                        str += '<option value="' + json.rows[i].id + '">' + json.rows[i].name + '</option>';
+                    }
+                    str += '</select></dd>';
+                    $("#lockParentSel").append(str);
+                    form.render('select');
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                }
+            }});
+        }
+
+        // 市级行政区划
+        function loadChildCityArea(){
+            AjaxPostUtil.request({url:reqBasePath + "commontarea002", params:{rowId: $("#provinceId").val()}, type:'json', method: "POST", callback:function(json){
+                if(json.returnCode == 0){
+                    var str = '<dd class="layui-col-xs3"><select id="cityId" lay-filter="areaCity" lay-search=""><option value="">请选择</option>';
+                    for(var i = 0; i < json.rows.length; i++){
+                        str += '<option value="' + json.rows[i].id + '">' + json.rows[i].name + '</option>';
+                    }
+                    str += '</select></dd>';
+                    $("#lockParentSel").append(str);
+                    form.render('select');
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                }
+            }});
+        }
+
+        // 县级行政区划
+        function loadChildArea(){
+            AjaxPostUtil.request({url:reqBasePath + "commontarea003", params:{rowId: $("#cityId").val()}, type:'json', method: "POST", callback:function(json){
+                if(json.returnCode == 0){
+                    var str = '<dd class="layui-col-xs3"><select id="addressAreaId" lay-filter="area" lay-search=""><option value="">请选择</option>';
+                    for(var i = 0; i < json.rows.length; i++){
+                        str += '<option value="' + json.rows[i].id + '">' + json.rows[i].name + '</option>';
+                    }
+                    str += '</select></dd>';
+                    $("#lockParentSel").append(str);
+                    form.render('select');
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                }
+            }});
+        }
+
+        // 镇级行政区划
+        function loadChildAreaTownShip(){
+            AjaxPostUtil.request({url:reqBasePath + "commontarea004", params:{rowId: $("#addressAreaId").val()}, type:'json', method: "POST", callback:function(json){
+                if(json.returnCode == 0){
+                    var str = '<dd class="layui-col-xs3"><select id="townshipId" lay-filter="areaTownShip" lay-search=""><option value="">请选择</option>';
+                    for(var i = 0; i < json.rows.length; i++){
+                        str += '<option value="' + json.rows[i].id + '">' + json.rows[i].name + '</option>';
+                    }
+                    str += '</select></dd>';
+                    $("#lockParentSel").append(str);
+                    form.render('select');
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                }
+            }});
+        }
+
         $("body").on("click", "#cancle", function(){
             parent.layer.close(index);
         });

shop/src/main/resources/template/js/store/storeEdit.js

@@ -30,15 +30,36 @@ layui.config({
                     $("#areaId").html(getDataUseHandlebars(getFileContent('tpl/template/select-option.tpl'), json));
                     $("#areaId").val(data.bean.areaId);
                 });
-            	
+
+                // 公司地址
+                initArea(data.bean);//加载省级行政区划
+
 			    matchingLanguage();
                 form.render();
                 form.on('submit(formEditBean)', function (data) {
                     if (winui.verifyForm(data.elem)) {
+                        var provinceId = "", cityId = "", addressAreaId = "", townshipId = "";
+                        if(!isNull($("#provinceId").val())){
+                            provinceId = $("#provinceId").val();
+                        }
+                        if(!isNull($("#cityId").val())){
+                            cityId = $("#cityId").val();
+                        }
+                        if(!isNull($("#addressAreaId").val())){
+                            addressAreaId = $("#addressAreaId").val();
+                        }
+                        if(!isNull($("#townshipId").val())){
+                            townshipId = $("#townshipId").val();
+                        }
                         var params = {
                             rowId: parent.rowId,
                             name: $("#name").val(),
                             areaId: $("#areaId").val(),
+                            provinceId: provinceId,
+                            cityId: cityId,
+                            addressAreaId: addressAreaId,
+                            townshipId: townshipId,
+                            addressDetailed: $("#addressDetailed").val(),
                             remark: $("#remark").val()
                         };
                         AjaxPostUtil.request({url: shopBasePath + "store005", params: params, type: 'json', method: "PUT", callback: function(json){
@@ -55,6 +76,162 @@ layui.config({
             }
         });
 
+        //初始化行政区划-省
+        function initArea(bean){
+            AjaxPostUtil.request({url:reqBasePath + "commontarea001", params:{}, type:'json', method: "POST", callback:function(json){
+                if(json.returnCode == 0){
+                    var str = '<dd class="layui-col-xs3"><select id="provinceId" win-verify="required" lay-filter="areaProvince" lay-search=""><option value="">请选择</option>';
+                    for(var i = 0; i < json.rows.length; i++){
+                        str += '<option value="' + json.rows[i].id + '">' + json.rows[i].name + '</option>';
+                    }
+                    str += '</select></dd>';
+                    $("#lockParentSel").append(str);
+                    if(!isNull(bean.provinceId)){
+                        $("#provinceId").val(bean.provinceId);
+                        initAreaCity(bean);
+                    }
+                    form.render('select');
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                }
+            }});
+        }
+
+        //初始化行政区划-市
+        function initAreaCity(bean){
+            AjaxPostUtil.request({url:reqBasePath + "commontarea002", params:{rowId: $("#provinceId").val()}, type:'json', method: "POST", callback:function(json){
+                if(json.returnCode == 0){
+                    var str = '<dd class="layui-col-xs3"><select id="cityId" lay-filter="areaCity" lay-search=""><option value="">请选择</option>';
+                    for(var i = 0; i < json.rows.length; i++){
+                        str += '<option value="' + json.rows[i].id + '">' + json.rows[i].name + '</option>';
+                    }
+                    str += '</select></dd>';
+                    $("#lockParentSel").append(str);
+                    if(!isNull(bean.cityId)){
+                        $("#cityId").val(bean.cityId);
+                        initAreaChildArea(bean);
+                    }
+                    form.render('select');
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                }
+            }});
+        }
+
+        //初始化行政区划-县
+        function initAreaChildArea(bean){
+            AjaxPostUtil.request({url:reqBasePath + "commontarea003", params:{rowId: $("#cityId").val()}, type:'json', method: "POST", callback:function(json){
+                if(json.returnCode == 0){
+                    var str = '<dd class="layui-col-xs3"><select id="addressAreaId" lay-filter="area" lay-search=""><option value="">请选择</option>';
+                    for(var i = 0; i < json.rows.length; i++){
+                        str += '<option value="' + json.rows[i].id + '">' + json.rows[i].name + '</option>';
+                    }
+                    str += '</select></dd>';
+                    $("#lockParentSel").append(str);
+                    if(!isNull(bean.addressAreaId)){
+                        $("#addressAreaId").val(bean.addressAreaId);
+                        initAreaTownShip(bean);
+                    }
+                    form.render('select');
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                }
+            }});
+        }
+
+        //初始化行政区划-镇
+        function initAreaTownShip(bean){
+            AjaxPostUtil.request({url:reqBasePath + "commontarea004", params:{rowId: $("#addressAreaId").val()}, type:'json', method: "POST", callback:function(json){
+                if(json.returnCode == 0){
+                    var str = '<dd class="layui-col-xs3"><select id="townshipId" lay-filter="areaTownShip" lay-search=""><option value="">请选择</option>';
+                    for(var i = 0; i < json.rows.length; i++){
+                        str += '<option value="' + json.rows[i].id + '">' + json.rows[i].name + '</option>';
+                    }
+                    str += '</select></dd>';
+                    $("#lockParentSel").append(str);
+                    if(!isNull(bean.townshipId)){
+                        $("#townshipId").val(bean.townshipId);
+                    }
+                    form.render('select');
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                }
+            }});
+        }
+
+        form.on('select(areaProvince)', function(data){
+            layui.$(data.elem).parent('dd').nextAll().remove();
+            if(isNull(data.value) || data.value == '请选择'){
+            }else{
+                loadChildCityArea();
+            }
+        });
+        form.on('select(areaCity)', function(data){
+            layui.$(data.elem).parent('dd').nextAll().remove();
+            if(isNull(data.value) || data.value == '请选择'){
+            }else{
+                loadChildArea();
+            }
+        });
+        form.on('select(area)', function(data){
+            layui.$(data.elem).parent('dd').nextAll().remove();
+            if(isNull(data.value) || data.value == '请选择'){
+            }else{
+                loadChildAreaTownShip();
+            }
+        });
+
+        //市级行政区划
+        function loadChildCityArea(){
+            AjaxPostUtil.request({url:reqBasePath + "commontarea002", params:{rowId: $("#provinceId").val()}, type:'json', method: "POST", callback:function(json){
+                if(json.returnCode == 0){
+                    var str = '<dd class="layui-col-xs3"><select id="cityId" lay-filter="areaCity" lay-search=""><option value="">请选择</option>';
+                    for(var i = 0; i < json.rows.length; i++){
+                        str += '<option value="' + json.rows[i].id + '">' + json.rows[i].name + '</option>';
+                    }
+                    str += '</select></dd>';
+                    $("#lockParentSel").append(str);
+                    form.render('select');
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                }
+            }});
+        }
+
+        //县级行政区划
+        function loadChildArea(){
+            AjaxPostUtil.request({url:reqBasePath + "commontarea003", params:{rowId: $("#cityId").val()}, type:'json', method: "POST", callback:function(json){
+                if(json.returnCode == 0){
+                    var str = '<dd class="layui-col-xs3"><select id="addressAreaId" lay-filter="area" lay-search=""><option value="">请选择</option>';
+                    for(var i = 0; i < json.rows.length; i++){
+                        str += '<option value="' + json.rows[i].id + '">' + json.rows[i].name + '</option>';
+                    }
+                    str += '</select></dd>';
+                    $("#lockParentSel").append(str);
+                    form.render('select');
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                }
+            }});
+        }
+
+        //镇级行政区划
+        function loadChildAreaTownShip(){
+            AjaxPostUtil.request({url:reqBasePath + "commontarea004", params:{rowId: $("#addressAreaId").val()}, type:'json', method: "POST", callback:function(json){
+                if(json.returnCode == 0){
+                    var str = '<dd class="layui-col-xs3"><select id="townshipId" lay-filter="areaTownShip" lay-search=""><option value="">请选择</option>';
+                    for(var i = 0; i < json.rows.length; i++){
+                        str += '<option value="' + json.rows[i].id + '">' + json.rows[i].name + '</option>';
+                    }
+                    str += '</select></dd>';
+                    $("#lockParentSel").append(str);
+                    form.render('select');
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                }
+            }});
+        }
+
         $("body").on("click", "#cancle", function(){
             parent.layer.close(index);
         });

shop/src/main/resources/template/tpl/store/storeAdd.html

@@ -9,6 +9,9 @@
 <body>
     <div style="padding:20px; margin:0 auto;">
         <form class="layui-form" action="" id="showForm">
+            <div class="layui-form-item layui-col-xs12">
+                <span class="hr-title">门店信息</span><hr>
+            </div>
             <div class="layui-form-item layui-col-xs6">
                 <label class="layui-form-label">门店<i class="red">*</i></label>
                 <div class="layui-input-block">
@@ -22,6 +25,17 @@
                     </select>
                 </div>
             </div>
+            <div class="layui-form-item layui-col-xs12">
+                <label class="layui-form-label">门店地址<i class="red">*</i></label>
+                <div class="layui-input-block" id="lockParentSel">
+                </div>
+            </div>
+            <div class="layui-form-item layui-col-xs12">
+                <label class="layui-form-label">详细地址<i class="red">*</i></label>
+                <div class="layui-input-block">
+                    <input type="text" id="addressDetailed" name="addressDetailed" win-verify="required" placeholder="请输入公司详细地址" class="layui-input" maxlength="50"/>
+                </div>
+            </div>
             <div class="layui-form-item layui-col-xs12">
                 <label class="layui-form-label">备注</label>
                 <div class="layui-input-block">

shop/src/main/resources/template/tpl/store/storeEdit.html

@@ -15,6 +15,9 @@
 
     <script type="text/x-handlebars-template" id="beanTemplate">
         {{#bean}}
+        <div class="layui-form-item layui-col-xs12">
+            <span class="hr-title">门店信息</span><hr>
+        </div>
         <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">门店<i class="red">*</i></label>
             <div class="layui-input-block">
@@ -28,6 +31,17 @@
                 </select>
             </div>
         </div>
+        <div class="layui-form-item layui-col-xs12">
+            <label class="layui-form-label">门店地址<i class="red">*</i></label>
+            <div class="layui-input-block" id="lockParentSel">
+            </div>
+        </div>
+        <div class="layui-form-item layui-col-xs12">
+            <label class="layui-form-label">详细地址<i class="red">*</i></label>
+            <div class="layui-input-block">
+                <input type="text" id="addressDetailed" name="addressDetailed" win-verify="required" placeholder="请输入公司详细地址" class="layui-input" maxlength="50" value="{{addressDetailed}}"/>
+            </div>
+        </div>
         <div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">备注</label>
             <div class="layui-input-block">

shop/src/main/resources/template/tpl/store/storeInfo.html

@@ -13,6 +13,9 @@
         </form>
         <script type="text/x-handlebars-template" id="simpleTemplate">
             {{#bean}}
+                <div class="layui-form-item layui-col-xs12">
+                    <span class="hr-title">门店信息</span><hr>
+                </div>
                 <div class="layui-form-item layui-col-xs6">
                     <label class="layui-form-label">门店：</label>
                     <div class="layui-input-block ver-center">
@@ -25,6 +28,18 @@
                         {{areaName}}
                     </div>
                 </div>
+                <div class="layui-form-item layui-col-xs12">
+                    <label class="layui-form-label">门店地址：</label>
+                    <div class="layui-input-block ver-center">
+                        {{provinceName}} {{cityName}} {{addressAreaName}} {{townshipName}}
+                    </div>
+                </div>
+                <div class="layui-form-item layui-col-xs12">
+                    <label class="layui-form-label">详细地址：</label>
+                    <div class="layui-input-block ver-center">
+                        {{addressDetailed}}
+                    </div>
+                </div>
                 <div class="layui-form-item layui-col-xs12">
                     <label class="layui-form-label">备注：</label>
                     <div class="layui-input-block ver-center">