Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerInfo.java

@@ -27,7 +27,7 @@ public class CustomerInfo  implements Serializable {
     private Integer customerCounselType;
     //  用户姓名 
     private String customerName;
-    //  用户手机号码 
+    //  用户手机号码
     private String customerTel;
     //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货  
     private Integer customerIsSolve;
@@ -43,7 +43,6 @@ public class CustomerInfo  implements Serializable {
     private Date customerCreateTime;
     //  修改时间 ,
     private Date customerUpdateTime;
-
     //  问题标题
     private String customerQuestionTitle;
 

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachinePartsService.java

@@ -27,6 +27,12 @@ public interface MachinePartsService {
     List<PtsComponents> listPtsComponents(PtsComponents ptsComponents);
 
     /**
+     * 获取所有的零件
+     * 按照零件编号排序
+     * **/
+    List<PtsComponents> listPtsComponentsOrderByNo(PtsComponents ptsComponents);
+
+    /**
      * 查询零件列表
      * **/
     PagedResult<PtsComponents> listPtsComponents(int pageNO, int pageSize, PtsComponents ptsComponents, boolean isTotalNum);

watero-rst-service/src/main/java/com/iamberry/rst/service/address/mapper/addressMapper.xml

@@ -8,7 +8,10 @@
     from tb_rst_address_province
     <where>
       <if test="countryId !=null and countryId !=''">
-        country_id = #{countryId}
+            country_id = #{countryId}
+      </if>
+      <if test="province !=null and province !=''">
+            AND province like CONCAT('%',#{province},'%')
       </if>
     </where>
   </select>
@@ -24,10 +27,14 @@
       <if test="provinceId !=null and provinceId !=''">
         province_id = #{provinceId}
       </if>
+      <if test="city !=null and city !=''">
+        AND city like CONCAT('%',#{city},'%')
+      </if>
     </where>
   </select>
 
   <select id="listDistrict" resultType="District" parameterType="District" >
+    SELECT
       district_id,
       city_id,
       district,
@@ -37,6 +44,9 @@
       <if test="cityId !=null and cityId !=''">
         city_id = #{cityId}
       </if>
+        <if test="district !=null and district !=''">
+            AND district like CONCAT('%',#{district},'%')
+        </if>
     </where>
   </select>
 

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachinePartsServiceImpl.java

@@ -36,6 +36,10 @@ public class MachinePartsServiceImpl implements MachinePartsService {
         return machinePartsMapper.listPtsComponents(ptsComponents);
     }
 
+    public List<PtsComponents> listPtsComponentsOrderByNo(PtsComponents ptsComponents){
+        return machinePartsMapper.listPtsComponentsOrderByNo(ptsComponents);
+    }
+
     @Override
     public PagedResult<PtsComponents> listPtsComponents(int pageNO, int pageSize, PtsComponents ptsComponents, boolean isTotalNum) {
         PageHelper.startPage(pageNO, pageSize, isTotalNum);

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/MachinePartsMapper.java

@@ -27,6 +27,12 @@ public interface MachinePartsMapper {
     List<PtsComponents> listPtsComponents(PtsComponents ptsComponents);
 
     /**
+     * 获取所有的零件
+     * 按照零件编号排序
+     * **/
+    List<PtsComponents> listPtsComponentsOrderByNo(PtsComponents ptsComponents);
+
+    /**
      * 修改机器零件
      * **/
     Integer updateParts(PtsComponents ptsComponents);

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machinePartsMapper.xml

@@ -100,6 +100,55 @@
         ORDER BY t.components_id DESC
     </select>
 
+    <select id="listPtsComponentsOrderByNo" parameterType="PtsComponents" resultType="PtsComponents" >
+        SELECT
+        t.components_id AS componentsId,
+        t.supplier_id AS supplierId,
+        t.produce_id AS produceId,
+        t.components_no AS componentsNo,
+        t.components_name AS componentsName,
+        t.components_type AS componentsType,
+        t.components_cost AS componentsCost,
+        t.components_weight AS componentsWeight,
+        t.components_material AS componentsMaterial,
+        t.components_mbsc AS componentsMbsc,
+        t.components_specification AS componentsSpecification,
+        t.components_img AS  componentsImg,
+        t.components_status AS componentsStatus,
+        t.components_desc AS componentsDesc,
+        t.components_create_time AS componentsCreateTime,
+        t.components_update_time AS componentsUpdateTime,
+        s.supplier_name AS supplierName,
+        trpp.produce_name AS  produceName
+        FROM
+        tb_rst_pts_components t LEFT JOIN tb_rst_pts_supplier s on t.supplier_id = s.supplier_id
+        LEFT JOIN tb_rst_pts_produce trpp ON t.produce_id = trpp.produce_id
+        <where>
+            <if test="componentsType !=null and componentsType !='' ">
+                AND t.components_type = #{componentsType}
+            </if>
+            <if test="componentsNo !=null and componentsNo !='' ">
+                AND t.components_no like CONCAT('%',#{componentsNo},'%')
+            </if>
+            <if test="produceId !=null and produceId !='' ">
+                AND t.produce_id = #{produceId}
+            </if>
+            <if test="componentsStatus !=null and componentsStatus !='' ">
+                AND t.components_status = #{componentsStatus}
+            </if>
+            <if test="componentsId !=null">
+                AND t.components_id = #{componentsId}
+            </if>
+            <if test="componentsName !=null and componentsName !='' ">
+                AND t.components_name like CONCAT('%',#{componentsName},'%')
+            </if>
+            <if test="supplierId !=null and supplierId !='' ">
+                AND t.supplier_id = #{supplierId}
+            </if>
+        </where>
+        ORDER BY t.components_no
+    </select>
+
     <update id="updateParts" parameterType="PtsComponents" >
         UPDATE tb_rst_pts_components
         <set>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/address/AddressController.java

@@ -8,8 +8,11 @@ import com.iamberry.wechat.tools.ResponseJson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.List;
 
 @Controller
@@ -25,7 +28,7 @@ public class AddressController {
      */
     @ResponseBody
     @RequestMapping(value = "/list_province")
-    ResponseJson listProvince(Province province){
+    public ResponseJson listProvince(Province province) throws UnsupportedEncodingException {
         ResponseJson rj =new ResponseJson(200, "查询成功", 200);
         List<Province> provinceList = addressService.listProvince(province);
         rj.addResponseKeyValue("provinceList", provinceList);
@@ -43,7 +46,7 @@ public class AddressController {
      */
     @ResponseBody
     @RequestMapping(value = "/list_city")
-    ResponseJson listCity(City city){
+    public ResponseJson listCity(City city){
         ResponseJson rj =new ResponseJson(200, "查询成功", 200);
         List<City> cityList = addressService.listCity(city);
         rj.addResponseKeyValue("cityList", cityList);
@@ -61,7 +64,7 @@ public class AddressController {
      */
     @ResponseBody
     @RequestMapping(value = "/list_district")
-    ResponseJson listDistrict(District district){
+    public ResponseJson listDistrict(District district){
         ResponseJson rj =new ResponseJson(200, "查询成功", 200);
         List<District> districtList = addressService.listDistrict(district);
         rj.addResponseKeyValue("cityList", districtList);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminPtsBomController.java

@@ -203,7 +203,7 @@ public class AdminPtsBomController {
         ptsComponents.setProduceId(Integer.valueOf(produceId));
         ptsComponents.setComponentsStatus(1);
         //查询所有零件
-        List<PtsComponents> ptsComponentsList = machinePartsService.listPtsComponents(ptsComponents);
+        List<PtsComponents> ptsComponentsList = machinePartsService.listPtsComponentsOrderByNo(ptsComponents);
 
         if (ptsComponentsList != null) {
             ResponseJson rj = new ResponseJson(200, "SUCCESS", 200);

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -139,14 +139,8 @@
                         <strong>相关QA</strong>
                         <ul id="question">
                             <#--<li class="ask">1、净水机面板操作不灵敏，是怎么回事？</li>
-                            <li class="answer">答：<span>1净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
-                            <li class="ask">2、净水机面板操作不灵敏，是怎么回事？</li>
-                            <li class="answer">答：<span>2净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
-                            <li class="ask">3、净水机面板操作不灵敏，是怎么回事？</li>
-                            <li class="answer">答：<span>3净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
-                            <li class="ask">4、净水机面板操作不灵敏，是怎么回事？</li>
-                            <li class="answer">答：<span>4净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
--->                        </ul>
+                            <li class="answer">答：<span>4净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>-->
+                        </ul>
                     </div>
                 </div>
 
@@ -232,35 +226,57 @@
                 <div class="formControls col-7 col-sm-7 text-c">
                     <table class="table table-border table-bg table-bordered">
                         <tr>
-                            <th>销售</th><th>订单号</th><th>姓名</th><th>电话</th><th>订单金额</th><th>购买产品</th><th>购买日期</th>
+                            <th style="text-align: center;">销售</th>
+                            <th style="text-align: center;">订单号</th>
+                            <th style="text-align: center;">姓名</th>
+                            <th style="text-align: center;">电话</th>
+                            <th style="text-align: center;">订单金额</th>
+                            <th style="text-align: center;">购买产品</th>
+                            <th style="text-align: center;">购买日期</th>
                         </tr>
                         <tr id="showOrder">
-                            <td>爱贝源-微信商城</td>
+                          <#--  <td>爱贝源-微信商城</td>
                             <td>1290387806</td>
                             <td>何小小</td>
                             <td>1882222888</td>
                             <td>¥3680</td>
                             <td>Watero净水机</td>
-                            <td>2017-06-06</td>
-                        </tr>
-                        <tr id="showOrderAddress">
+                            <td>2017-06-06</td>-->
                         </tr>
+                        <#--<tr id="showOrderAddress">-->
+                        <#--</tr>-->
                     </table>
                 </div>
             </div>
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>收件信息：</label>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="何秀刚" placeholder="填写收件人姓名" id="" name="">
+                    <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="sendName">
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="13800138000" placeholder="填写收件人手机号" id="" name="">
+                    <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="sendTel" name="sendTel">
                 </div>
             </div>
             <div class="row cl">
+                <input type="hidden" id="addressInfo">
                 <label class="form-label col-1 col-sm-1"></label>
-                <div class="formControls col-4 col-sm-4">
-                    <div id="province"></div>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                         <select id="province" class="select">
+                         </select>
+                     </span>
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                        <select id="city" class="select">
+                        </select>
+                    </span>
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                        <select id="district" class="select">
+                        </select>
+                    </span>
                 </div>
                 <div class="formControls col-1 col-sm-1">
                     <button type="button" class="btn btn-primary">修改收货地址</button>
@@ -269,7 +285,8 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-5 col-sm-5">
-                    <textarea name="" cols="" rows="2" class="textarea" placeholder="请填写详细地址">莲花街道深南大道特区报业大厦12b</textarea>
+                    <textarea name="" id="sendAddress" cols="" rows="2" class="textarea" placeholder="请填写详细地址"></textarea>
+                    <span id="addrssMsg"></span>
                 </div>
             </div>
             <div class="row cl">
@@ -458,18 +475,18 @@
             radioClass: 'iradio-blue',
             increaseArea: '20%'
         });
-        $("#province").ProvinceCity();
+/*        $("#province").ProvinceCity();
         $('.skin-minimal input').iCheck({
             checkboxClass: 'icheckbox-blue',
             radioClass: 'iradio-blue',
             increaseArea: '20%'
-        });
-        $("#arrcity").suggest(citys,{hot_list:commoncitys,dataContainer:'#arrcity_3word',onSelect:function(result){
+        });*/
+/*        $("#arrcity").suggest(citys,{hot_list:commoncitys,dataContainer:'#arrcity_3word',onSelect:function(result){
             console.log($(this)[0].value);
 //		$("#city2").click()
         },
             attachObject:'#suggest'
-        });
+        });*/
 //$("#city2").suggest(citys,{hot_list:commoncitys,attachObject:"#suggest2"})
     });
 
@@ -479,9 +496,6 @@
 
 </script>
 <script type="text/javascript">
-
-
-
     /*初始化页面参数*/
     $(function () {
 
@@ -502,6 +516,19 @@
         $(document).on('click', '#selectOrder', function() {
             selectOrder();
         });
+
+        /*监听省选择事件*/
+        $(document).on('change', '#province', function() {
+            var proId = $("#province").val();
+            var cityId = setCity("",proId,2)
+            setDistrict("",cityId,2)
+        });
+
+        /*监听市选择事件*/
+        $(document).on('change', '#city', function() {
+            var city = $("#city").val();
+            setDistrict("",city,2)
+        });
     })
 
     /*初始化问题大类*/
@@ -537,7 +564,6 @@
         });
     }
 
-
     /*显示小类*/
     function initComplaintSmallClassInfo(complaintId){
         var html = "";
@@ -622,6 +648,7 @@
      */
     function setSelectOrder(orderId){
         var html = '';
+        var address = ''; //地址
         $.ajax({
             type: "POST",
             data: {
@@ -630,7 +657,6 @@
             url: "${path}/admin/customer/select_salesOrder",
             async: false,
             success: function(data){
-                var address; //地址
                 if (data.returnCode == 200) {
                     for(var i=0;i<data.returnMsg.salesOrderList.length;i++){
                         var salesOrder = data.returnMsg.salesOrderList[i];
@@ -655,9 +681,13 @@
                                 ' <td>'+ productsHtml +'</td>' +
                                 ' <td>'+ time +'</td>' +
                                 '';
-                        address = '<td colspan="1">收货地址</td><td colspan="6" class="td-manage text-c" >'+ salesOrder.salesAddressInfo +'&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #0a6999;text-decoration: underline;" href="javascript:void(0);" title="编辑" onclick="updateAdress()">修改地址</a></td>' ;
+                       //address = '<td colspan="1">收货地址</td><td colspan="6" class="td-manage text-c" >'+ salesOrder.salesAddressInfo +'&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #0a6999;text-decoration: underline;" href="javascript:void(0);" title="编辑" onclick="updateAdress()">修改地址</a></td>' ;
+                        address = salesOrder.salesAddressInfo;
+
+                        $("#sendName").val(salesOrder.salesAddressName); //订单名称
+                        $("#sendTel").val(salesOrder.salesAddressTel);  //订单电话号码
                     }
-                    $("#showOrderAddress").html(address);
+                   // $("#showOrderAddress").html(address);
                 }else{
                     html = '';
                 }
@@ -666,7 +696,7 @@
             error: function(XmlHttpRequest, textStatus, errorThrown){
             }
         });
-
+        $("#addressInfo").val(address);
         setAdress();
     }
 
@@ -674,23 +704,134 @@
      * 设置地址
      */
     function setAdress(){
-        setPro(1);
+        var addres = $("#addressInfo").val();
+
+        $("#addrssMsg").html("");
+        if(addres == null){
+            $("#addrssMsg").html("*未能获取到地址，请手动选择地址");
+            return;
+        }
+        var addresList = addres.split("-");
+        if(addresList[0] == null || addresList[1]==null || addresList[2]==null || addresList[3]==null){
+            $("#addrssMsg").html("*未能获取到地址，请手动选择地址");
+            return;
+        }
+        var proId = setPro(getAddress(addresList[0],0),1);
+        var cityId = setCity(getAddress(addresList[1],1),proId,1);
+        setDistrict(getAddress(addresList[2],2),cityId,1);
+        $("#sendAddress").val(addresList[3]);
+    }
+
+    /***
+     * 删除 “省”，“市”，“区”关键字
+     * type : 0:省   2：市   3：区
+     */
+    function getAddress(addrss,type) {
+        var abbreviation = "";
+        if(addrss == ""){
+            abbreviation = "";
+        }else{
+            switch(type)
+            {
+                case 0:
+                    var proReg = new RegExp("省","g");
+                    abbreviation = addrss.replace(proReg,"");
+                    break;
+                case 1:
+                    var cityReg = new RegExp("市","g");
+                    abbreviation = addrss.replace(cityReg,"");
+                    break;
+                case 2:
+                    var districtReg = new RegExp("市","g");
+                    abbreviation = addrss.replace(districtReg,"");
+                    break;
+                default:
+                    break;
+            }
+        }
+        return abbreviation
     }
 
     /**
      * 设置省
+     * type  1:搜索订单赋值   2：只查询全部，默认第一个
      */
-    function setPro(provinceName) {
+    function setPro(provinceName,type) {
+        var proId = '';
         var province = listProvince();
-        alert(JSON.stringify(province));
+        var selectPro = {};
+        if(type == 1){
+            selectPro = listProvince("",provinceName);
+        }else if(type == 2){
+            selectPro = null;
+        }
         if(province!=null){
             var provinceHtml = ''
             for(var i=0;i<province.length;i++){
-//                if(){
-//
-//                }
-                provinceHtml += '';
+                if(selectPro!= null && province[i].provinceId == selectPro[0].provinceId){
+                    proId = selectPro[0].provinceId;
+                    provinceHtml += '<option value="'+ province[i].provinceId +'" selected>'+ province[i].province +'</option>';
+                }else{
+                    provinceHtml += '<option value="'+ province[i].provinceId +'">'+ province[i].province +'</option>';
+                }
+            }
+            $("#province").html(provinceHtml);
+        }
+        return proId;
+    }
+
+    /**
+     * 设置市
+     * type  1:搜索订单赋值   2：只查询全部，默认第一个
+     */
+    function setCity(cityName,proId,type) {
+        var cityId = '';
+        var city = listCity(proId,"");
+        var selectCity = {};
+        if(type == 1){
+            selectCity = listCity(proId,cityName);
+        }else if(type == 2){
+            selectCity = null;
+            cityId = city[0].cityId;
+        }
+
+        if(city!=null){
+            var cityHtml = ''
+            for(var i=0;i<city.length;i++){
+                if(selectCity != null && city[i].cityId == selectCity[0].cityId){
+                    cityId = city[i].cityId;
+                    cityHtml += '<option value="'+ city[i].cityId +'" selected>'+ city[i].city +'</option>';
+                }else{
+                    cityHtml += '<option value="'+ city[i].cityId +'">'+ city[i].city +'</option>';
+                }
+            }
+            $("#city").html(cityHtml);
+        }
+        return cityId;
+    }
+
+    /**
+     * 设置区
+     * type  1:搜索订单赋值   2：只查询全部，默认第一个
+     */
+    function setDistrict(districtName,cityId,type) {
+        var district = listDistrict(cityId,"");
+        var selectDistrict = {};
+        if(type == 1){
+            selectDistrict = listDistrict(cityId,districtName);
+        }else if(type == 2){
+            selectDistrict = null;
+        }
+        if(district!=null){
+            var districtHtml = ''
+            for(var i=0;i<district.length;i++){
+                if(selectDistrict != null && district[i].districtId == selectDistrict[0].districtId){
+                    districtHtml += '<option value="'+ district[i].districtId +'" selected>'+ district[i].district +'</option>';
+                }else{
+                    districtHtml += '<option value="'+ district[i].districtId +'">'+ district[i].district +'</option>';
+                }
             }
+            $("#district").html(districtHtml);
         }
     }
 </script>

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -83,6 +83,7 @@
                             <option value="18">年糕妈妈</option>
                             <option value="19">快抱团</option>
                             <option value="20">北京北斗</option>
+                            <option value="22">上海-崔玉涛育学园</option>
                         </select>
                     </label>
                 </td>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/bom/add_bom.ftl

@@ -55,7 +55,7 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>Bom名称:</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value="" id="bomName" name="bomName" placeholder="请输入1-20位的名称，支持中文、字母、数字" datatype="/^[a-zA-Z0-9\u4e00-\u9fa5]{1,20}$/" errormsg="请输入1-20位的名称，支持中文、字母、数字！">
+                <input type="text" class="input-text" value="" id="bomName" name="bomName" placeholder="请输入1-20位字符的名称" datatype="*1-20" errormsg="请输入1-20位字符的名称！">
             </div>
         </div>
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/bom/update_bom.ftl

@@ -44,7 +44,7 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>Bom名称:</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value="${ptsBom.bomName}" id="bomName" name="bomName" placeholder="请输入1-20位的名称，支持中文、字母、数字" datatype="/^[a-zA-Z0-9\u4e00-\u9fa5]{1,20}$/" errormsg="请输入1-20位的名称，支持中文、字母、数字！">
+                <input type="text" class="input-text" value="${ptsBom.bomName}" id="bomName" name="bomName" placeholder="请输入1-20位字符的名称"  datatype="*1-20"  errormsg="请输入1-20位字符的名称！">
             </div>
         </div>
 
@@ -120,6 +120,8 @@
     </form>
 </article>
 <script type="text/javascript">
+    /*添加零件模式  1:默认模式   2:添加只添加没有录入的bom */
+    var addComponentsType = 1;
 
     function sumbit_sure(){
         layer.confirm('修改的Bom，会影响已经生成的机器。 如果不是因为录入错误而修改了某个清单的零件、零件数量，建议做增加Bom处理，并做对应软硬件版本升级，您确定需要修改本Bom单吗？', {
@@ -188,7 +190,6 @@
     }
 
     $(function(){
-
     })
 
 

watero-rst-web/src/main/webapp/common/js/common/common.js

@@ -60,13 +60,20 @@ function Trim(str)
 
 /**
  * 获取省
+ * @param provinceId 省id
+ * @param province 省名称（模糊搜索）
+ * @returns {{}}
  */
-function listProvince(){
+function listProvince(provinceId,provinceName){
     var province = {};
     $.ajax({
         type: "get",
         data: {
+            provinceId : provinceId,
+            province : provinceName
         },
+        dataType: "json",
+        contentType:"application/json; charset=utf-8",
         url: root_path +"/address/list_province",
         async: false,
         success: function(data){
@@ -79,17 +86,19 @@ function listProvince(){
         error: function(XmlHttpRequest, textStatus, errorThrown){
         }
     });
+    return province;
 }
 
 /**
  * 获取市
  */
-function listCity(provinceId){
+function listCity(provinceId,cityName){
     var city = {};
     $.ajax({
         type: "get",
         data: {
-            provinceId : provinceId
+            provinceId : provinceId,
+            city : cityName
         },
         url: root_path +"/address/list_city",
         async: false,
@@ -103,17 +112,19 @@ function listCity(provinceId){
         error: function(XmlHttpRequest, textStatus, errorThrown){
         }
     });
+    return city;
 }
 
 /**
  * 获取区
  */
-function listDistrict(cityId){
+function listDistrict(cityId,districtName){
     var district = {};
     $.ajax({
         type: "get",
         data: {
-            cityId : cityId
+            cityId : cityId,
+            district : districtName
         },
         url: root_path +"/address/list_district",
         async: false,
@@ -127,4 +138,5 @@ function listDistrict(cityId){
         error: function(XmlHttpRequest, textStatus, errorThrown){
         }
     });
+    return district;
 }